From 5b158dbcfbe99eddc06eb7d931e7ef5ac8fbc58c Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Mon, 1 Apr 2013 12:26:11 +0800
Subject: [PATCH 01/67] Make the content type available after calling fetch_url

---
 boot.php            | 9 +++++++++
 include/network.php | 1 +
 2 files changed, 10 insertions(+)

diff --git a/boot.php b/boot.php
index faaa124e0a..a445793231 100644
--- a/boot.php
+++ b/boot.php
@@ -401,6 +401,7 @@ if(! class_exists('App')) {
 		private $db;
 
 		private $curl_code;
+		private $curl_content_type;
 		private $curl_headers;
 
 		private $cached_profile_image;
@@ -673,6 +674,14 @@ if(! class_exists('App')) {
 			return $this->curl_code;
 		}
 
+		function set_curl_content_type($content_type) {
+			$this->curl_content_type = $content_type;
+		}
+
+		function get_curl_content_type() {
+			return $this->curl_content_type;
+		}
+
 		function set_curl_headers($headers) {
 			$this->curl_headers = $headers;
 		}
diff --git a/include/network.php b/include/network.php
index e4d01c00fb..5a36bd6a00 100644
--- a/include/network.php
+++ b/include/network.php
@@ -101,6 +101,7 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
 	}
 
 	$a->set_curl_code($http_code);
+	$a->set_curl_content_type($curl_info['content_type']);
 
 	$body = substr($s,strlen($header));
 	$a->set_curl_headers($header);

From ee07251d38a02254bad60238734045458e762731 Mon Sep 17 00:00:00 2001
From: pixelroot <info@pixelbits.de>
Date: Mon, 1 Apr 2013 19:36:22 +0200
Subject: [PATCH 02/67] 	modified:   view/theme/smoothly/style.css 
 modified:   view/theme/smoothly/theme.php

---
 view/theme/smoothly/style.css | 75 +++++++++++++++++++++++++----------
 view/theme/smoothly/theme.php |  5 ++-
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index c4883d373a..51775d5291 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -1,8 +1,8 @@
 /*
   	style.css
-  	Smoothly
-   
-	Created by alex@friendica.pixelbits.de on 2013-03-27
+  	Theme: Smoothly
+	Maintainer: alex@friendica.pixelbits.de
+	last change: 2013-04-01
 
 ** Colors ** 
 Blue links - #1873a2
@@ -16,6 +16,28 @@ Orange - #fec01d
 
 @import url('css/typography.css');
 
+@media only screen and (device-width: 768px) {
+/* For general iPad layouts */
+#page {
+	-moz-background-clip: border; 
+	-moz-background-origin: pdading; 
+	-moz-background-size: auto auto; 
+	background-attachment: scroll; 
+	background-color: transparent; 
+	background-image: url( ); 
+	background-position: center top; 
+	background-repeat: no-repeat;
+	} 
+}
+
+@media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:portrait) {
+/* For portrait layouts only */
+}
+	 
+@media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:landscape) {
+/* For landscape layouts only */
+}
+
 .lockview {
 	cursor: pointer;
 }
@@ -128,15 +150,15 @@ section {
 }
 
 .mframe {
-	padding: 0;
-	/*background: none repeat scroll 0 0 #FFFFFF;
+	padding: 1px;
+	background: none repeat scroll 0 0 #FFFFFF;
 	border: 1px solid #7C7D7B;
 	border-radius: 3px;
 		-moz-border-radius: 3px;
 		-webkit-border-radius: 3px;
 	box-shadow: 0 0 8px #BDBDBD;
 		-moz-box-shadow: 0 0 8px #BDBDBD;
-		-webkit-box-shadow: 0 0 8px #BDBDBD;*/
+		-webkit-box-shadow: 0 0 8px #BDBDBD;
 }
 
 #wall-item-lock {
@@ -1047,6 +1069,14 @@ ul .sidebar-group-li .icon {
 /* = Jot = */
 /* ======= */
 
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 100%;
+  margin: 0px 2em 20px 0px;
+}
+
 #profile-jot-text-loading,
 #profile-jot-text {
 	height: 20px;
@@ -1096,10 +1126,6 @@ ul .sidebar-group-li .icon {
 	border: 1px solid #cccccc;
 }
 
-.jothidden {
-	display: none; 
-}
-
 .preview {
 	background: #FFFFC8;
 }
@@ -1244,11 +1270,12 @@ ul .sidebar-group-li .icon {
 	border-bottom: 0px;
 	padding: 5px;
 }
+
 #profile-jot-acl-wrapper {
 	margin: 0px 10px;
 	border: 1px solid #eeeeee;
 	border-top: 0px;
-    display:block!important;
+    	display: block !important;
 }
 
 #profile-video-wrapper,
@@ -1427,14 +1454,13 @@ ul .sidebar-group-li .icon {
 }
 
 .wall-item-photo { 
-
-	border: 1px solid #7C7D7B;
-	border-radius: 5px;
-		-webkit-border-radius: 5px;
-		-moz-border-radius: 5px;
-	box-shadow: 0 0 8px #BDBDBD;
+	border: 0px solid #7C7D7B;
+	border-radius: 2px;
+		-webkit-border-radius: 2px;
+		-moz-border-radius: 2px;
+	/*box-shadow: 0 0 8px #BDBDBD;
 		-moz-box-shadow: 0 0 8px #BDBDBD;
-		-webkit-box-shadow: 0 0 8px #BDBDBD;
+		-webkit-box-shadow: 0 0 8px #BDBDBD;*/
 }
 
 .wall-item-tools { 
@@ -1534,7 +1560,8 @@ ul .sidebar-group-li .icon {
 
 .wall-item-body img { 
 	max-width: 100%; 
-	height: auto; 
+	height: auto;
+	border-radius: 0;
 }
 
 .wall-item-body p {
@@ -1747,11 +1774,17 @@ code {
 .wall-item-outside-wrapper.comment .wall-item-photo {
 	width: 40px!important;
 	height: 40px!important;
+	border-radius: 3px;
+		-webkit-border-radius: 3px;
+		-moz-border-radius: 3px;
 }
 
 .wall-item-outside-wrapper.comment .wall-item-photo-wrapper {
 	width: 40px; 
-	height: 40px; 
+	height: 40px;
+	border-radius: 3px;
+		-webkit-border-radius: 3px;
+		-moz-border-radius: 3px;
 }
 
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
@@ -3774,7 +3807,7 @@ margin-left: 0px;
 .sparkle {
 	cursor: url('lock.cur'), pointer;
 	width: 100%;
-	height: 100%;
+	height: auto;
 	/*border: 1px solid #7C7D7B;
 	border-radius: 3px;
 		-moz-border-radius: 3px;
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index ba064380d9..be63b4d542 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,8 +3,9 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme optimized for iPad[2].
- * Version: Version 2013-03-27.1
- * Author: Alex <https://friendica.pixelbits.de/profile/alex>
+ * Version: Version 2013-04-1
+ * Author: Anne Walk
+ * Author: Devlon Duthied
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>
  */

From 13e315e004ee09804fad8b2b75b84d527289c100 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 2 Apr 2013 09:16:24 -0400
Subject: [PATCH 03/67] uimport: check table columns before import

---
 include/uimport.php | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/include/uimport.php b/include/uimport.php
index 38b1772475..9cfb183f6e 100644
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -24,13 +24,43 @@ function last_insert_id(){
     return $db->error;
  }
  
+ /**
+  * Remove columns from array $arr that aren't in table $table
+  * 
+  * @param string $table Table name
+  * @param array &$arr Column=>Value array from json (by ref)
+  */
+ function check_cols($table, &$arr){
+ 	$query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table));
+ 	logger("uimport: $query", LOGGER_DEBUG);
+	$r = q($query);
+	$tcols = array();
+	// get a plain array of column names
+	foreach($r as $tcol) {
+		$tcols[] = $tcol['Field'];
+	}
+	// remove inexistent columns
+	foreach($arr as $icol=>$ival) {
+		if (!in_array($icol, $tcols)) {
+			unset($arr[$icol]);
+		}
+	}
+ }
+ 
+ /**
+  * Import data into table $table
+  * 
+  * @param string $table Table name
+  * @param array $arr Column=>Value array from json
+  */
  function db_import_assoc($table, $arr){
-    if (IMPORT_DEBUG) return true;
     if (isset($arr['id'])) unset($arr['id']);
+    check_cols($table, $arr);
     $cols = implode("`,`", array_map('dbesc', array_keys($arr)));
     $vals = implode("','", array_map('dbesc', array_values($arr)));
     $query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
     logger("uimport: $query",LOGGER_TRACE);
+    if (IMPORT_DEBUG) return true;
     return q($query);
  }
 

From 1442fecd148b388f5e92c1fded252e1aeeb77d3f Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 2 Apr 2013 09:44:19 -0400
Subject: [PATCH 04/67] uimport: fix file formatting

---
 include/uimport.php | 467 ++++++++++++++++++++++----------------------
 1 file changed, 230 insertions(+), 237 deletions(-)

diff --git a/include/uimport.php b/include/uimport.php
index 9cfb183f6e..12e85c61ad 100644
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * import account file exported from mod/uexport
  * args:
@@ -8,272 +9,264 @@
 require_once("include/Photo.php");
 define("IMPORT_DEBUG", False);
 
-function last_insert_id(){
-    global $db; 
-    if (IMPORT_DEBUG) return 1;
-    if($db->mysqli){
-        $thedb = $db->getdb();
-        return $thedb->insert_id;
-    } else {
-        return mysql_insert_id();
-    }
- }
- 
- function last_error(){
-    global $db; 
-    return $db->error;
- }
- 
- /**
-  * Remove columns from array $arr that aren't in table $table
-  * 
-  * @param string $table Table name
-  * @param array &$arr Column=>Value array from json (by ref)
-  */
- function check_cols($table, &$arr){
- 	$query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table));
- 	logger("uimport: $query", LOGGER_DEBUG);
+function last_insert_id() {
+	global $db;
+	if (IMPORT_DEBUG)
+		return 1;
+	if ($db->mysqli) {
+		$thedb = $db->getdb();
+		return $thedb->insert_id;
+	} else {
+		return mysql_insert_id();
+	}
+}
+
+function last_error() {
+	global $db;
+	return $db->error;
+}
+
+/**
+ * Remove columns from array $arr that aren't in table $table
+ * 
+ * @param string $table Table name
+ * @param array &$arr Column=>Value array from json (by ref)
+ */
+function check_cols($table, &$arr) {
+	$query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table));
+	logger("uimport: $query", LOGGER_DEBUG);
 	$r = q($query);
 	$tcols = array();
 	// get a plain array of column names
-	foreach($r as $tcol) {
+	foreach ($r as $tcol) {
 		$tcols[] = $tcol['Field'];
 	}
 	// remove inexistent columns
-	foreach($arr as $icol=>$ival) {
+	foreach ($arr as $icol => $ival) {
 		if (!in_array($icol, $tcols)) {
 			unset($arr[$icol]);
 		}
 	}
- }
- 
- /**
-  * Import data into table $table
-  * 
-  * @param string $table Table name
-  * @param array $arr Column=>Value array from json
-  */
- function db_import_assoc($table, $arr){
-    if (isset($arr['id'])) unset($arr['id']);
-    check_cols($table, $arr);
-    $cols = implode("`,`", array_map('dbesc', array_keys($arr)));
-    $vals = implode("','", array_map('dbesc', array_values($arr)));
-    $query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
-    logger("uimport: $query",LOGGER_TRACE);
-    if (IMPORT_DEBUG) return true;
-    return q($query);
- }
+}
+
+/**
+ * Import data into table $table
+ * 
+ * @param string $table Table name
+ * @param array $arr Column=>Value array from json
+ */
+function db_import_assoc($table, $arr) {
+	if (isset($arr['id']))
+		unset($arr['id']);
+	check_cols($table, $arr);
+	$cols = implode("`,`", array_map('dbesc', array_keys($arr)));
+	$vals = implode("','", array_map('dbesc', array_values($arr)));
+	$query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
+	logger("uimport: $query", LOGGER_TRACE);
+	if (IMPORT_DEBUG)
+		return true;
+	return q($query);
+}
 
 function import_cleanup($newuid) {
-    q("DELETE FROM `user` WHERE uid = %d", $newuid);
-    q("DELETE FROM `contact` WHERE uid = %d", $newuid);
-    q("DELETE FROM `profile` WHERE uid = %d", $newuid);
-    q("DELETE FROM `photo` WHERE uid = %d", $newuid);
-    q("DELETE FROM `group` WHERE uid = %d", $newuid);
-    q("DELETE FROM `group_member` WHERE uid = %d", $newuid);
-    q("DELETE FROM `pconfig` WHERE uid = %d", $newuid);
-
+	q("DELETE FROM `user` WHERE uid = %d", $newuid);
+	q("DELETE FROM `contact` WHERE uid = %d", $newuid);
+	q("DELETE FROM `profile` WHERE uid = %d", $newuid);
+	q("DELETE FROM `photo` WHERE uid = %d", $newuid);
+	q("DELETE FROM `group` WHERE uid = %d", $newuid);
+	q("DELETE FROM `group_member` WHERE uid = %d", $newuid);
+	q("DELETE FROM `pconfig` WHERE uid = %d", $newuid);
 }
 
 function import_account(&$a, $file) {
-    logger("Start user import from ".$file['tmp_name']);
-    /*
-        STEPS
-        1. checks
-        2. replace old baseurl with new baseurl
-        3. import data (look at user id and contacts id)
-        4. archive non-dfrn contacts
-        5. send message to dfrn contacts
-     */
+	logger("Start user import from " . $file['tmp_name']);
+	/*
+	  STEPS
+	  1. checks
+	  2. replace old baseurl with new baseurl
+	  3. import data (look at user id and contacts id)
+	  4. archive non-dfrn contacts
+	  5. send message to dfrn contacts
+	 */
+
+	$account = json_decode(file_get_contents($file['tmp_name']), true);
+	if ($account === null) {
+		notice(t("Error decoding account file"));
+		return;
+	}
+
+
+	if (!x($account, 'version')) {
+		notice(t("Error! No version data in file! This is not a Friendica account file?"));
+		return;
+	}
+
+	if ($account['schema'] != DB_UPDATE_VERSION) {
+		notice(t("Error! I can't import this file: DB schema version is not compatible."));
+		return;
+	}
 
-    $account = json_decode(file_get_contents($file['tmp_name']), true);
-    if ($account===null) {
-        notice(t("Error decoding account file"));
-        return;
-    }
-       
 
-    if (!x($account, 'version')) { 
-        notice(t("Error! No version data in file! This is not a Friendica account file?"));
-        return;
-    }
-   
-    if ($account['schema'] != DB_UPDATE_VERSION) {
-        notice(t("Error! I can't import this file: DB schema version is not compatible."));
-        return;
-    }
-   
-	
 	// check for username
 	$r = q("SELECT uid FROM user WHERE nickname='%s'", $account['user']['nickname']);
-	if ($r===false) {
-		logger("uimport:check nickname : ERROR : ".last_error(), LOGGER_NORMAL);
+	if ($r === false) {
+		logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL);
 		notice(t('Error! Cannot check nickname'));
 		return;
 	}
-	if (count($r)>0) {
-		notice(sprintf(t("User '%s' already exists on this server!"),$account['user']['nickname']));
+	if (count($r) > 0) {
+		notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
 		return;
 	}
 
-    $oldbaseurl  = $account['baseurl'];
-    $newbaseurl = $a->get_baseurl();
-    $olduid = $account['user']['uid'];
-  
-    unset($account['user']['uid']);
-    foreach($account['user'] as $k => &$v) {
-        $v = str_replace($oldbaseurl, $newbaseurl, $v);
-    }
+	$oldbaseurl = $account['baseurl'];
+	$newbaseurl = $a->get_baseurl();
+	$olduid = $account['user']['uid'];
 
-    
-    // import user
-    $r = db_import_assoc('user', $account['user']);
-    if ($r===false) {
-        //echo "<pre>"; var_dump($r, $query, mysql_error()); killme();
-        logger("uimport:insert user : ERROR : ".last_error(), LOGGER_NORMAL);
-        notice(t("User creation error"));
-        return;
-    }
-    $newuid = last_insert_id();
-    //~ $newuid = 1;
-    
+	unset($account['user']['uid']);
+	foreach ($account['user'] as $k => &$v) {
+		$v = str_replace($oldbaseurl, $newbaseurl, $v);
+	}
 
 
-    foreach($account['profile'] as &$profile) {
-        foreach($profile as $k=>&$v) {
-            $v = str_replace($oldbaseurl, $newbaseurl, $v);
-            foreach(array("profile","avatar") as $k)
-                $v = str_replace($newbaseurl."/photo/".$k."/".$olduid.".jpg", $newbaseurl."/photo/".$k."/".$newuid.".jpg", $v);
-        }
-        $profile['uid'] = $newuid;
-        $r = db_import_assoc('profile', $profile);
-        if ($r===false) {
-            logger("uimport:insert profile ".$profile['profile-name']." : ERROR : ".last_error(), LOGGER_NORMAL);
-            info(t("User profile creation error"));
-            import_cleanup($newuid);
-            return;
-        }
-    }
-
-    $errorcount=0;
-    foreach($account['contact'] as &$contact) {
-        if ($contact['uid'] == $olduid && $contact['self'] == '1'){
-            foreach($contact as $k=>&$v) {
-                $v = str_replace($oldbaseurl, $newbaseurl, $v);
-                foreach(array("profile","avatar","micro") as $k)
-                    $v = str_replace($newbaseurl."/photo/".$k."/".$olduid.".jpg", $newbaseurl."/photo/".$k."/".$newuid.".jpg", $v);
-            }
-        }
-         if ($contact['uid'] == $olduid && $contact['self'] == '0') {
-            switch ($contact['network']){
-                case NETWORK_DFRN:
-                    //  send relocate message (below)
-                    break;
-                case NETWORK_ZOT:
-                    // TODO handle zot network
-                    break;
-                case NETWORK_MAIL2:
-                    // TODO ?
-                    break;
-                case NETWORK_FEED:
-                case NETWORK_MAIL:
-                    // Nothing to do
-                    break;
-                default:
-                    // archive other contacts
-                    $contact['archive'] = "1";
-            }
-        }
-        $contact['uid'] = $newuid;
-        $r = db_import_assoc('contact', $contact);
-        if ($r===false) {
-            logger("uimport:insert contact ".$contact['nick'].",".$contact['network']." : ERROR : ".last_error(), LOGGER_NORMAL);
-            $errorcount++;
-        } else {
-            $contact['newid'] = last_insert_id();
-        }
-    }
-    if ($errorcount>0) {
-        notice( sprintf(tt("%d contact not imported", "%d contacts not imported", $errorcount), $errorcount) );
-    }
-
-    foreach($account['group'] as &$group) {
-        $group['uid'] = $newuid;
-        $r = db_import_assoc('group', $group);
-        if ($r===false) {
-            logger("uimport:insert group ".$group['name']." : ERROR : ".last_error(), LOGGER_NORMAL);
-        } else {
-            $group['newid'] = last_insert_id();
-        }
-    }
-
-    foreach($account['group_member'] as &$group_member) {
-        $group_member['uid'] = $newuid;
-        
-        $import = 0;
-        foreach($account['group'] as $group) {
-            if ($group['id'] == $group_member['gid'] && isset($group['newid'])) {
-                $group_member['gid'] = $group['newid'];
-                $import++;
-                break;
-            }
-        }
-        foreach($account['contact'] as $contact) {
-            if ($contact['id'] == $group_member['contact-id'] && isset($contact['newid'])) {
-                $group_member['contact-id'] = $contact['newid'];
-                $import++;
-                break;
-            }
-        }
-        if ($import==2) {
-            $r = db_import_assoc('group_member', $group_member);
-            if ($r===false) {
-                logger("uimport:insert group member ".$group_member['id']." : ERROR : ".last_error(), LOGGER_NORMAL);
-            }
-        }
-    }
+	// import user
+	$r = db_import_assoc('user', $account['user']);
+	if ($r === false) {
+		//echo "<pre>"; var_dump($r, $query, mysql_error()); killme();
+		logger("uimport:insert user : ERROR : " . last_error(), LOGGER_NORMAL);
+		notice(t("User creation error"));
+		return;
+	}
+	$newuid = last_insert_id();
+	//~ $newuid = 1;
 
 
 
-    
-    
-    foreach($account['photo'] as &$photo) {
-        $photo['uid'] = $newuid;
-        $photo['data'] = hex2bin($photo['data']);
-        
-        $p = new Photo($photo['data'], $photo['type']);
-        $r = $p->store(
-            $photo['uid'],
-            $photo['contact-id'], //0
-            $photo['resource-id'],
-            $photo['filename'],
-            $photo['album'],
-            $photo['scale'],
-            $photo['profile'], //1
-            $photo['allow_cid'],
-            $photo['allow_gid'],
-            $photo['deny_cid'],
-            $photo['deny_gid']
-        );
-        
-        if ($r===false) {
-            logger("uimport:insert photo ".$photo['resource-id'].",". $photo['scale']. " : ERROR : ".last_error(), LOGGER_NORMAL);
-        }
-    } 
-    
-    foreach($account['pconfig'] as &$pconfig) {
-        $pconfig['uid'] = $newuid;
-        $r = db_import_assoc('pconfig', $pconfig);
-        if ($r===false) {
-            logger("uimport:insert pconfig ".$pconfig['id']. " : ERROR : ".last_error(), LOGGER_NORMAL);
-        }
-    } 
-    
-    // send relocate messages
-    proc_run('php', 'include/notifier.php', 'relocate' , $newuid);
-    
-    info(t("Done. You can now login with your username and password"));
-    goaway( $a->get_baseurl() ."/login");
-    
-    
+	foreach ($account['profile'] as &$profile) {
+		foreach ($profile as $k => &$v) {
+			$v = str_replace($oldbaseurl, $newbaseurl, $v);
+			foreach (array("profile", "avatar") as $k)
+				$v = str_replace($newbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
+		}
+		$profile['uid'] = $newuid;
+		$r = db_import_assoc('profile', $profile);
+		if ($r === false) {
+			logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+			info(t("User profile creation error"));
+			import_cleanup($newuid);
+			return;
+		}
+	}
+
+	$errorcount = 0;
+	foreach ($account['contact'] as &$contact) {
+		if ($contact['uid'] == $olduid && $contact['self'] == '1') {
+			foreach ($contact as $k => &$v) {
+				$v = str_replace($oldbaseurl, $newbaseurl, $v);
+				foreach (array("profile", "avatar", "micro") as $k)
+					$v = str_replace($newbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
+			}
+		}
+		if ($contact['uid'] == $olduid && $contact['self'] == '0') {
+			switch ($contact['network']) {
+				case NETWORK_DFRN:
+					//  send relocate message (below)
+					break;
+				case NETWORK_ZOT:
+					// TODO handle zot network
+					break;
+				case NETWORK_MAIL2:
+					// TODO ?
+					break;
+				case NETWORK_FEED:
+				case NETWORK_MAIL:
+					// Nothing to do
+					break;
+				default:
+					// archive other contacts
+					$contact['archive'] = "1";
+			}
+		}
+		$contact['uid'] = $newuid;
+		$r = db_import_assoc('contact', $contact);
+		if ($r === false) {
+			logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+			$errorcount++;
+		} else {
+			$contact['newid'] = last_insert_id();
+		}
+	}
+	if ($errorcount > 0) {
+		notice(sprintf(tt("%d contact not imported", "%d contacts not imported", $errorcount), $errorcount));
+	}
+
+	foreach ($account['group'] as &$group) {
+		$group['uid'] = $newuid;
+		$r = db_import_assoc('group', $group);
+		if ($r === false) {
+			logger("uimport:insert group " . $group['name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+		} else {
+			$group['newid'] = last_insert_id();
+		}
+	}
+
+	foreach ($account['group_member'] as &$group_member) {
+		$group_member['uid'] = $newuid;
+
+		$import = 0;
+		foreach ($account['group'] as $group) {
+			if ($group['id'] == $group_member['gid'] && isset($group['newid'])) {
+				$group_member['gid'] = $group['newid'];
+				$import++;
+				break;
+			}
+		}
+		foreach ($account['contact'] as $contact) {
+			if ($contact['id'] == $group_member['contact-id'] && isset($contact['newid'])) {
+				$group_member['contact-id'] = $contact['newid'];
+				$import++;
+				break;
+			}
+		}
+		if ($import == 2) {
+			$r = db_import_assoc('group_member', $group_member);
+			if ($r === false) {
+				logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+			}
+		}
+	}
+
+
+
+
+
+	foreach ($account['photo'] as &$photo) {
+		$photo['uid'] = $newuid;
+		$photo['data'] = hex2bin($photo['data']);
+
+		$p = new Photo($photo['data'], $photo['type']);
+		$r = $p->store(
+				$photo['uid'], $photo['contact-id'], //0
+				$photo['resource-id'], $photo['filename'], $photo['album'], $photo['scale'], $photo['profile'], //1
+				$photo['allow_cid'], $photo['allow_gid'], $photo['deny_cid'], $photo['deny_gid']
+		);
+
+		if ($r === false) {
+			logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+		}
+	}
+
+	foreach ($account['pconfig'] as &$pconfig) {
+		$pconfig['uid'] = $newuid;
+		$r = db_import_assoc('pconfig', $pconfig);
+		if ($r === false) {
+			logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+		}
+	}
+
+	// send relocate messages
+	proc_run('php', 'include/notifier.php', 'relocate', $newuid);
+
+	info(t("Done. You can now login with your username and password"));
+	goaway($a->get_baseurl() . "/login");
 }

From e77521c42ffbd6983ea20d32a3a5ca3de834d238 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 3 Apr 2013 09:28:37 +0200
Subject: [PATCH 05/67] PL: update to the strings

---
 view/pl/messages.po | 6 +++---
 view/pl/strings.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/view/pl/messages.po b/view/pl/messages.po
index e02bfdf711..17bb722206 100644
--- a/view/pl/messages.po
+++ b/view/pl/messages.po
@@ -32,7 +32,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
 "POT-Creation-Date: 2013-03-19 03:30-0700\n"
-"PO-Revision-Date: 2013-03-25 12:31+0000\n"
+"PO-Revision-Date: 2013-04-02 08:42+0000\n"
 "Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -6782,7 +6782,7 @@ msgstr "włącz status gwiazdy"
 
 #: ../../mod/content.php:781 ../../object/Item.php:216
 msgid "starred"
-msgstr ""
+msgstr "gwiazdką"
 
 #: ../../mod/content.php:782 ../../object/Item.php:221
 msgid "add tag"
@@ -7097,4 +7097,4 @@ msgstr "Tylko ty możesz to zobaczyć"
 
 #: ../../index.php:405
 msgid "toggle mobile"
-msgstr ""
+msgstr "przełącz na mobilny"
diff --git a/view/pl/strings.php b/view/pl/strings.php
index 6e14394887..466daf2320 100644
--- a/view/pl/strings.php
+++ b/view/pl/strings.php
@@ -1577,7 +1577,7 @@ $a->strings["Video"] = "Video";
 $a->strings["add star"] = "dodaj gwiazdkę";
 $a->strings["remove star"] = "anuluj gwiazdkę";
 $a->strings["toggle star status"] = "włącz status gwiazdy";
-$a->strings["starred"] = "";
+$a->strings["starred"] = "gwiazdką";
 $a->strings["add tag"] = "dodaj tag";
 $a->strings["save to folder"] = "zapisz w folderze";
 $a->strings["to"] = "do";
@@ -1648,4 +1648,4 @@ $a->strings["Status Messages and Posts"] = "Status wiadomości i postów";
 $a->strings["Profile Details"] = "Szczegóły profilu";
 $a->strings["Events and Calendar"] = "Wydarzenia i kalendarz";
 $a->strings["Only You Can See This"] = "Tylko ty możesz to zobaczyć";
-$a->strings["toggle mobile"] = "";
+$a->strings["toggle mobile"] = "przełącz na mobilny";

From db0bb50e37c4094c650a7205eeace6e1aa90aa6f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 3 Apr 2013 16:28:49 -0700
Subject: [PATCH 06/67] rev update

---
 boot.php         |   2 +-
 util/messages.po | 882 +++++++++++++++++++++++------------------------
 2 files changed, 442 insertions(+), 442 deletions(-)

diff --git a/boot.php b/boot.php
index faaa124e0a..e70bd64f7c 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1644' );
+define ( 'FRIENDICA_VERSION',      '3.1.1659' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/util/messages.po b/util/messages.po
index c5595622b2..796c185b5c 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1644\n"
+"Project-Id-Version: 3.1.1659\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-19 03:30-0700\n"
+"POT-Creation-Date: 2013-04-03 00:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2190,7 +2190,7 @@ msgstr ""
 msgid "Site map"
 msgstr ""
 
-#: ../../include/network.php:875
+#: ../../include/network.php:876
 msgid "view full size"
 msgstr ""
 
@@ -2412,18 +2412,18 @@ msgstr ""
 #: ../../mod/profiles.php:626 ../../mod/contacts.php:386
 #: ../../mod/settings.php:560 ../../mod/settings.php:670
 #: ../../mod/settings.php:739 ../../mod/settings.php:811
-#: ../../mod/settings.php:1037 ../../mod/crepair.php:166
-#: ../../mod/poke.php:199 ../../mod/admin.php:480 ../../mod/admin.php:751
+#: ../../mod/settings.php:1037 ../../mod/admin.php:480 ../../mod/admin.php:751
 #: ../../mod/admin.php:890 ../../mod/admin.php:1090 ../../mod/admin.php:1177
-#: ../../mod/events.php:478 ../../mod/fsuggest.php:107 ../../mod/group.php:87
-#: ../../mod/invite.php:140 ../../mod/localtime.php:45
-#: ../../mod/manage.php:110 ../../mod/message.php:335
-#: ../../mod/message.php:564 ../../mod/mood.php:137 ../../mod/photos.php:1078
-#: ../../mod/photos.php:1199 ../../mod/photos.php:1501
-#: ../../mod/photos.php:1552 ../../mod/photos.php:1596
-#: ../../mod/photos.php:1679 ../../mod/install.php:248
-#: ../../mod/install.php:286 ../../mod/content.php:733
-#: ../../object/Item.php:653 ../../view/theme/cleanzero/config.php:80
+#: ../../mod/crepair.php:166 ../../mod/poke.php:199 ../../mod/events.php:478
+#: ../../mod/fsuggest.php:107 ../../mod/group.php:87 ../../mod/invite.php:140
+#: ../../mod/localtime.php:45 ../../mod/manage.php:110
+#: ../../mod/message.php:335 ../../mod/message.php:564 ../../mod/mood.php:137
+#: ../../mod/photos.php:1078 ../../mod/photos.php:1199
+#: ../../mod/photos.php:1501 ../../mod/photos.php:1552
+#: ../../mod/photos.php:1596 ../../mod/photos.php:1679
+#: ../../mod/install.php:248 ../../mod/install.php:286
+#: ../../mod/content.php:733 ../../object/Item.php:653
+#: ../../view/theme/cleanzero/config.php:80
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/diabook/theme.php:642 ../../view/theme/dispy/config.php:70
 #: ../../view/theme/quattro/config.php:64
@@ -3359,7 +3359,7 @@ msgid "Add application"
 msgstr ""
 
 #: ../../mod/settings.php:562 ../../mod/settings.php:588
-#: ../../mod/crepair.php:148 ../../mod/admin.php:754 ../../mod/admin.php:765
+#: ../../mod/admin.php:754 ../../mod/admin.php:765 ../../mod/crepair.php:148
 msgid "Name"
 msgstr ""
 
@@ -3825,431 +3825,6 @@ msgstr ""
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/share.php:44
-msgid "link"
-msgstr ""
-
-#: ../../mod/crepair.php:102
-msgid "Contact settings applied."
-msgstr ""
-
-#: ../../mod/crepair.php:104
-msgid "Contact update failed."
-msgstr ""
-
-#: ../../mod/crepair.php:129 ../../mod/dfrn_confirm.php:118
-#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
-msgid "Contact not found."
-msgstr ""
-
-#: ../../mod/crepair.php:135
-msgid "Repair Contact Settings"
-msgstr ""
-
-#: ../../mod/crepair.php:137
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
-"information your communications with this contact may stop working."
-msgstr ""
-
-#: ../../mod/crepair.php:138
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
-msgstr ""
-
-#: ../../mod/crepair.php:144
-msgid "Return to contact editor"
-msgstr ""
-
-#: ../../mod/crepair.php:149
-msgid "Account Nickname"
-msgstr ""
-
-#: ../../mod/crepair.php:150
-msgid "@Tagname - overrides Name/Nickname"
-msgstr ""
-
-#: ../../mod/crepair.php:151
-msgid "Account URL"
-msgstr ""
-
-#: ../../mod/crepair.php:152
-msgid "Friend Request URL"
-msgstr ""
-
-#: ../../mod/crepair.php:153
-msgid "Friend Confirm URL"
-msgstr ""
-
-#: ../../mod/crepair.php:154
-msgid "Notification Endpoint URL"
-msgstr ""
-
-#: ../../mod/crepair.php:155
-msgid "Poll/Feed URL"
-msgstr ""
-
-#: ../../mod/crepair.php:156
-msgid "New photo from this URL"
-msgstr ""
-
-#: ../../mod/delegate.php:95
-msgid "No potential page delegates located."
-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 ""
-
-#: ../../mod/delegate.php:124
-msgid "Existing Page Managers"
-msgstr ""
-
-#: ../../mod/delegate.php:126
-msgid "Existing Page Delegates"
-msgstr ""
-
-#: ../../mod/delegate.php:128
-msgid "Potential Delegates"
-msgstr ""
-
-#: ../../mod/delegate.php:130 ../../mod/tagrm.php:93
-msgid "Remove"
-msgstr ""
-
-#: ../../mod/delegate.php:131
-msgid "Add"
-msgstr ""
-
-#: ../../mod/delegate.php:132
-msgid "No entries."
-msgstr ""
-
-#: ../../mod/poke.php:192
-msgid "Poke/Prod"
-msgstr ""
-
-#: ../../mod/poke.php:193
-msgid "poke, prod or do other things to somebody"
-msgstr ""
-
-#: ../../mod/poke.php:194
-msgid "Recipient"
-msgstr ""
-
-#: ../../mod/poke.php:195
-msgid "Choose what you wish to do to recipient"
-msgstr ""
-
-#: ../../mod/poke.php:198
-msgid "Make this post private"
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:119
-msgid ""
-"This may occasionally happen if contact was requested by both persons and it "
-"has already been approved."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:237
-msgid "Response from remote site was not understood."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:246
-msgid "Unexpected response from remote site: "
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:254
-msgid "Confirmation completed successfully."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
-#: ../../mod/dfrn_confirm.php:277
-msgid "Remote site reported: "
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:268
-msgid "Temporary failure. Please wait and try again."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:275
-msgid "Introduction failed or was revoked."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:420
-msgid "Unable to set contact photo."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:562
-#, php-format
-msgid "No user record found for '%s' "
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:572
-msgid "Our site encryption key is apparently messed up."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:583
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:604
-msgid "Contact record was not found for you on our site."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:618
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:638
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:649
-msgid "Unable to set your contact credentials on our system."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:716
-msgid "Unable to update your contact profile details on our system"
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:751
-#, php-format
-msgid "Connection accepted at %s"
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:800
-#, php-format
-msgid "%1$s has joined %2$s"
-msgstr ""
-
-#: ../../mod/dfrn_poll.php:101 ../../mod/dfrn_poll.php:534
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:93
-msgid "This introduction has already been accepted."
-msgstr ""
-
-#: ../../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:518
-msgid "Warning: profile location has no identifiable owner name."
-msgstr ""
-
-#: ../../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: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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/dfrn_request.php:170
-msgid "Introduction complete."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:209
-msgid "Unrecoverable protocol error."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:237
-msgid "Profile unavailable."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:262
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:263
-msgid "Spam protection measures have been invoked."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:264
-msgid "Friends are advised to please try again in 24 hours."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:326
-msgid "Invalid locator"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:335
-msgid "Invalid email address."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:362
-msgid "This account has not been configured for email. Request failed."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:458
-msgid "Unable to resolve your name at the provided location."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:471
-msgid "You have already introduced yourself here."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:475
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:496
-msgid "Invalid profile URL."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:592
-msgid "Your introduction has been sent."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:645
-msgid "Please login to confirm introduction."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:659
-msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:670
-msgid "Hide this contact"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:673
-#, php-format
-msgid "Welcome home %s."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:674
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:675
-msgid "Confirm"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:811
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:827
-msgid "<strike>Connect as an email follower</strike> (Coming soon)"
-msgstr ""
-
-#: ../../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:832
-msgid "Friend/Connection Request"
-msgstr ""
-
-#: ../../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:834
-msgid "Please answer the following:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:835
-#, php-format
-msgid "Does %s know you?"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:838
-msgid "Add a personal note:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:841
-msgid "StatusNet/Federated Social Web"
-msgstr ""
-
-#: ../../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:844
-msgid "Your Identity Address:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:847
-msgid "Submit Request"
-msgstr ""
-
-#: ../../mod/subthread.php:103
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr ""
-
-#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
-msgid "Global Directory"
-msgstr ""
-
-#: ../../mod/directory.php:57
-msgid "Find on this site"
-msgstr ""
-
-#: ../../mod/directory.php:60
-msgid "Site Directory"
-msgstr ""
-
-#: ../../mod/directory.php:114
-msgid "Gender: "
-msgstr ""
-
-#: ../../mod/directory.php:187
-msgid "No entries (some entries may be hidden)."
-msgstr ""
-
-#: ../../mod/suggest.php:27
-msgid "Do you really want to delete this suggestion?"
-msgstr ""
-
-#: ../../mod/suggest.php:72
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr ""
-
-#: ../../mod/suggest.php:90
-msgid "Ignore/Hide"
-msgstr ""
-
-#: ../../mod/dirfind.php:26
-msgid "People Search"
-msgstr ""
-
-#: ../../mod/dirfind.php:60 ../../mod/match.php:65
-msgid "No matches"
-msgstr ""
-
 #: ../../mod/admin.php:55
 msgid "Theme settings updated."
 msgstr ""
@@ -4969,7 +4544,7 @@ msgid "Clear"
 msgstr ""
 
 #: ../../mod/admin.php:1184
-msgid "Debugging"
+msgid "Enable Debugging"
 msgstr ""
 
 #: ../../mod/admin.php:1185
@@ -5006,6 +4581,431 @@ msgstr ""
 msgid "FTP Password"
 msgstr ""
 
+#: ../../mod/share.php:44
+msgid "link"
+msgstr ""
+
+#: ../../mod/crepair.php:102
+msgid "Contact settings applied."
+msgstr ""
+
+#: ../../mod/crepair.php:104
+msgid "Contact update failed."
+msgstr ""
+
+#: ../../mod/crepair.php:129 ../../mod/dfrn_confirm.php:118
+#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+msgid "Contact not found."
+msgstr ""
+
+#: ../../mod/crepair.php:135
+msgid "Repair Contact Settings"
+msgstr ""
+
+#: ../../mod/crepair.php:137
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
+"information your communications with this contact may stop working."
+msgstr ""
+
+#: ../../mod/crepair.php:138
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
+msgstr ""
+
+#: ../../mod/crepair.php:144
+msgid "Return to contact editor"
+msgstr ""
+
+#: ../../mod/crepair.php:149
+msgid "Account Nickname"
+msgstr ""
+
+#: ../../mod/crepair.php:150
+msgid "@Tagname - overrides Name/Nickname"
+msgstr ""
+
+#: ../../mod/crepair.php:151
+msgid "Account URL"
+msgstr ""
+
+#: ../../mod/crepair.php:152
+msgid "Friend Request URL"
+msgstr ""
+
+#: ../../mod/crepair.php:153
+msgid "Friend Confirm URL"
+msgstr ""
+
+#: ../../mod/crepair.php:154
+msgid "Notification Endpoint URL"
+msgstr ""
+
+#: ../../mod/crepair.php:155
+msgid "Poll/Feed URL"
+msgstr ""
+
+#: ../../mod/crepair.php:156
+msgid "New photo from this URL"
+msgstr ""
+
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+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 ""
+
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
+msgstr ""
+
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr ""
+
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr ""
+
+#: ../../mod/delegate.php:130 ../../mod/tagrm.php:93
+msgid "Remove"
+msgstr ""
+
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr ""
+
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr ""
+
+#: ../../mod/poke.php:192
+msgid "Poke/Prod"
+msgstr ""
+
+#: ../../mod/poke.php:193
+msgid "poke, prod or do other things to somebody"
+msgstr ""
+
+#: ../../mod/poke.php:194
+msgid "Recipient"
+msgstr ""
+
+#: ../../mod/poke.php:195
+msgid "Choose what you wish to do to recipient"
+msgstr ""
+
+#: ../../mod/poke.php:198
+msgid "Make this post private"
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:119
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it "
+"has already been approved."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:237
+msgid "Response from remote site was not understood."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:246
+msgid "Unexpected response from remote site: "
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:254
+msgid "Confirmation completed successfully."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
+#: ../../mod/dfrn_confirm.php:277
+msgid "Remote site reported: "
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:268
+msgid "Temporary failure. Please wait and try again."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:275
+msgid "Introduction failed or was revoked."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:420
+msgid "Unable to set contact photo."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:562
+#, php-format
+msgid "No user record found for '%s' "
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:572
+msgid "Our site encryption key is apparently messed up."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:583
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:604
+msgid "Contact record was not found for you on our site."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:618
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:638
+msgid ""
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:649
+msgid "Unable to set your contact credentials on our system."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:716
+msgid "Unable to update your contact profile details on our system"
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:751
+#, php-format
+msgid "Connection accepted at %s"
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:800
+#, php-format
+msgid "%1$s has joined %2$s"
+msgstr ""
+
+#: ../../mod/dfrn_poll.php:101 ../../mod/dfrn_poll.php:534
+#, php-format
+msgid "%1$s welcomes %2$s"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:93
+msgid "This introduction has already been accepted."
+msgstr ""
+
+#: ../../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:518
+msgid "Warning: profile location has no identifiable owner name."
+msgstr ""
+
+#: ../../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: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"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/dfrn_request.php:170
+msgid "Introduction complete."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:209
+msgid "Unrecoverable protocol error."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:237
+msgid "Profile unavailable."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:262
+#, php-format
+msgid "%s has received too many connection requests today."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:263
+msgid "Spam protection measures have been invoked."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:264
+msgid "Friends are advised to please try again in 24 hours."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:326
+msgid "Invalid locator"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:335
+msgid "Invalid email address."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:362
+msgid "This account has not been configured for email. Request failed."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:458
+msgid "Unable to resolve your name at the provided location."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:471
+msgid "You have already introduced yourself here."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:475
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:496
+msgid "Invalid profile URL."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:592
+msgid "Your introduction has been sent."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:645
+msgid "Please login to confirm introduction."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:659
+msgid ""
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:670
+msgid "Hide this contact"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:673
+#, php-format
+msgid "Welcome home %s."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:674
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:675
+msgid "Confirm"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:811
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:827
+msgid "<strike>Connect as an email follower</strike> (Coming soon)"
+msgstr ""
+
+#: ../../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:832
+msgid "Friend/Connection Request"
+msgstr ""
+
+#: ../../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:834
+msgid "Please answer the following:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:835
+#, php-format
+msgid "Does %s know you?"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:838
+msgid "Add a personal note:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:841
+msgid "StatusNet/Federated Social Web"
+msgstr ""
+
+#: ../../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:844
+msgid "Your Identity Address:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:847
+msgid "Submit Request"
+msgstr ""
+
+#: ../../mod/subthread.php:103
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
+msgid "Global Directory"
+msgstr ""
+
+#: ../../mod/directory.php:57
+msgid "Find on this site"
+msgstr ""
+
+#: ../../mod/directory.php:60
+msgid "Site Directory"
+msgstr ""
+
+#: ../../mod/directory.php:114
+msgid "Gender: "
+msgstr ""
+
+#: ../../mod/directory.php:187
+msgid "No entries (some entries may be hidden)."
+msgstr ""
+
+#: ../../mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
+msgstr ""
+
+#: ../../mod/suggest.php:72
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr ""
+
+#: ../../mod/suggest.php:90
+msgid "Ignore/Hide"
+msgstr ""
+
+#: ../../mod/dirfind.php:26
+msgid "People Search"
+msgstr ""
+
+#: ../../mod/dirfind.php:60 ../../mod/match.php:65
+msgid "No matches"
+msgstr ""
+
 #: ../../mod/tagrm.php:41
 msgid "Tag removed"
 msgstr ""

From bee80004db9fdc1f48034007471056e6a405a10b Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 4 Apr 2013 17:27:49 +0200
Subject: [PATCH 07/67] DE: update to the strings

---
 view/de/messages.po | 882 ++++++++++++++++++++++----------------------
 view/de/strings.php | 200 +++++-----
 2 files changed, 541 insertions(+), 541 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index 07fa3ddcd8..649f79e10f 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -25,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2013-03-19 03:30-0700\n"
-"PO-Revision-Date: 2013-03-28 06:48+0000\n"
+"POT-Creation-Date: 2013-04-03 00:02-0700\n"
+"PO-Revision-Date: 2013-04-04 15:25+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"
@@ -2208,7 +2208,7 @@ msgstr "Navigation"
 msgid "Site map"
 msgstr "Sitemap"
 
-#: ../../include/network.php:875
+#: ../../include/network.php:876
 msgid "view full size"
 msgstr "Volle Größe anzeigen"
 
@@ -2430,18 +2430,18 @@ msgstr "Profil bearbeiten"
 #: ../../mod/profiles.php:626 ../../mod/contacts.php:386
 #: ../../mod/settings.php:560 ../../mod/settings.php:670
 #: ../../mod/settings.php:739 ../../mod/settings.php:811
-#: ../../mod/settings.php:1037 ../../mod/crepair.php:166
-#: ../../mod/poke.php:199 ../../mod/admin.php:480 ../../mod/admin.php:751
+#: ../../mod/settings.php:1037 ../../mod/admin.php:480 ../../mod/admin.php:751
 #: ../../mod/admin.php:890 ../../mod/admin.php:1090 ../../mod/admin.php:1177
-#: ../../mod/events.php:478 ../../mod/fsuggest.php:107 ../../mod/group.php:87
-#: ../../mod/invite.php:140 ../../mod/localtime.php:45
-#: ../../mod/manage.php:110 ../../mod/message.php:335
-#: ../../mod/message.php:564 ../../mod/mood.php:137 ../../mod/photos.php:1078
-#: ../../mod/photos.php:1199 ../../mod/photos.php:1501
-#: ../../mod/photos.php:1552 ../../mod/photos.php:1596
-#: ../../mod/photos.php:1679 ../../mod/install.php:248
-#: ../../mod/install.php:286 ../../mod/content.php:733
-#: ../../object/Item.php:653 ../../view/theme/cleanzero/config.php:80
+#: ../../mod/crepair.php:166 ../../mod/poke.php:199 ../../mod/events.php:478
+#: ../../mod/fsuggest.php:107 ../../mod/group.php:87 ../../mod/invite.php:140
+#: ../../mod/localtime.php:45 ../../mod/manage.php:110
+#: ../../mod/message.php:335 ../../mod/message.php:564 ../../mod/mood.php:137
+#: ../../mod/photos.php:1078 ../../mod/photos.php:1199
+#: ../../mod/photos.php:1501 ../../mod/photos.php:1552
+#: ../../mod/photos.php:1596 ../../mod/photos.php:1679
+#: ../../mod/install.php:248 ../../mod/install.php:286
+#: ../../mod/content.php:733 ../../object/Item.php:653
+#: ../../view/theme/cleanzero/config.php:80
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/diabook/theme.php:642 ../../view/theme/dispy/config.php:70
 #: ../../view/theme/quattro/config.php:64
@@ -3378,7 +3378,7 @@ msgid "Add application"
 msgstr "Programm hinzufügen"
 
 #: ../../mod/settings.php:562 ../../mod/settings.php:588
-#: ../../mod/crepair.php:148 ../../mod/admin.php:754 ../../mod/admin.php:765
+#: ../../mod/admin.php:754 ../../mod/admin.php:765 ../../mod/crepair.php:148
 msgid "Name"
 msgstr "Name"
 
@@ -3845,431 +3845,6 @@ msgstr "Erweiterte Konto-/Seitentyp-Einstellungen"
 msgid "Change the behaviour of this account for special situations"
 msgstr "Verhalten dieses Kontos in bestimmten Situationen:"
 
-#: ../../mod/share.php:44
-msgid "link"
-msgstr "Link"
-
-#: ../../mod/crepair.php:102
-msgid "Contact settings applied."
-msgstr "Einstellungen zum Kontakt angewandt."
-
-#: ../../mod/crepair.php:104
-msgid "Contact update failed."
-msgstr "Konnte den Kontakt nicht aktualisieren."
-
-#: ../../mod/crepair.php:129 ../../mod/dfrn_confirm.php:118
-#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
-msgid "Contact not found."
-msgstr "Kontakt nicht gefunden."
-
-#: ../../mod/crepair.php:135
-msgid "Repair Contact Settings"
-msgstr "Kontakteinstellungen reparieren"
-
-#: ../../mod/crepair.php:137
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
-" information your communications with this contact may stop working."
-msgstr "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."
-
-#: ../../mod/crepair.php:138
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
-msgstr "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst."
-
-#: ../../mod/crepair.php:144
-msgid "Return to contact editor"
-msgstr "Zurück zum Kontakteditor"
-
-#: ../../mod/crepair.php:149
-msgid "Account Nickname"
-msgstr "Konto-Spitzname"
-
-#: ../../mod/crepair.php:150
-msgid "@Tagname - overrides Name/Nickname"
-msgstr "@Tagname - überschreibt Name/Spitzname"
-
-#: ../../mod/crepair.php:151
-msgid "Account URL"
-msgstr "Konto-URL"
-
-#: ../../mod/crepair.php:152
-msgid "Friend Request URL"
-msgstr "URL für Freundschaftsanfragen"
-
-#: ../../mod/crepair.php:153
-msgid "Friend Confirm URL"
-msgstr "URL für Bestätigungen von Freundschaftsanfragen"
-
-#: ../../mod/crepair.php:154
-msgid "Notification Endpoint URL"
-msgstr "URL-Endpunkt für Benachrichtigungen"
-
-#: ../../mod/crepair.php:155
-msgid "Poll/Feed URL"
-msgstr "Pull/Feed-URL"
-
-#: ../../mod/crepair.php:156
-msgid "New photo from this URL"
-msgstr "Neues Foto von dieser URL"
-
-#: ../../mod/delegate.php:95
-msgid "No potential page delegates located."
-msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden."
-
-#: ../../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 "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!"
-
-#: ../../mod/delegate.php:124
-msgid "Existing Page Managers"
-msgstr "Vorhandene Seiten Manager"
-
-#: ../../mod/delegate.php:126
-msgid "Existing Page Delegates"
-msgstr "Vorhandene Bevollmächtigte für die Seite"
-
-#: ../../mod/delegate.php:128
-msgid "Potential Delegates"
-msgstr "Potentielle Bevollmächtigte"
-
-#: ../../mod/delegate.php:130 ../../mod/tagrm.php:93
-msgid "Remove"
-msgstr "Entfernen"
-
-#: ../../mod/delegate.php:131
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: ../../mod/delegate.php:132
-msgid "No entries."
-msgstr "Keine Einträge"
-
-#: ../../mod/poke.php:192
-msgid "Poke/Prod"
-msgstr "Anstupsen etc."
-
-#: ../../mod/poke.php:193
-msgid "poke, prod or do other things to somebody"
-msgstr "Stupse Leute an oder mache anderes mit ihnen"
-
-#: ../../mod/poke.php:194
-msgid "Recipient"
-msgstr "Empfänger"
-
-#: ../../mod/poke.php:195
-msgid "Choose what you wish to do to recipient"
-msgstr "Was willst du mit dem Empfänger machen:"
-
-#: ../../mod/poke.php:198
-msgid "Make this post private"
-msgstr "Diesen Beitrag privat machen"
-
-#: ../../mod/dfrn_confirm.php:119
-msgid ""
-"This may occasionally happen if contact was requested by both persons and it"
-" has already been approved."
-msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."
-
-#: ../../mod/dfrn_confirm.php:237
-msgid "Response from remote site was not understood."
-msgstr "Antwort der Gegenstelle unverständlich."
-
-#: ../../mod/dfrn_confirm.php:246
-msgid "Unexpected response from remote site: "
-msgstr "Unerwartete Antwort der Gegenstelle: "
-
-#: ../../mod/dfrn_confirm.php:254
-msgid "Confirmation completed successfully."
-msgstr "Bestätigung erfolgreich abgeschlossen."
-
-#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
-#: ../../mod/dfrn_confirm.php:277
-msgid "Remote site reported: "
-msgstr "Gegenstelle meldet: "
-
-#: ../../mod/dfrn_confirm.php:268
-msgid "Temporary failure. Please wait and try again."
-msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal."
-
-#: ../../mod/dfrn_confirm.php:275
-msgid "Introduction failed or was revoked."
-msgstr "Kontaktanfrage schlug fehl oder wurde zurückgezogen."
-
-#: ../../mod/dfrn_confirm.php:420
-msgid "Unable to set contact photo."
-msgstr "Konnte das Bild des Kontakts nicht speichern."
-
-#: ../../mod/dfrn_confirm.php:562
-#, php-format
-msgid "No user record found for '%s' "
-msgstr "Für '%s' wurde kein Nutzer gefunden"
-
-#: ../../mod/dfrn_confirm.php:572
-msgid "Our site encryption key is apparently messed up."
-msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung."
-
-#: ../../mod/dfrn_confirm.php:583
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden."
-
-#: ../../mod/dfrn_confirm.php:604
-msgid "Contact record was not found for you on our site."
-msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."
-
-#: ../../mod/dfrn_confirm.php:618
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server."
-
-#: ../../mod/dfrn_confirm.php:638
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
-msgstr "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."
-
-#: ../../mod/dfrn_confirm.php:649
-msgid "Unable to set your contact credentials on our system."
-msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."
-
-#: ../../mod/dfrn_confirm.php:716
-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:751
-#, php-format
-msgid "Connection accepted at %s"
-msgstr "Auf %s wurde die Verbindung akzeptiert"
-
-#: ../../mod/dfrn_confirm.php:800
-#, php-format
-msgid "%1$s has joined %2$s"
-msgstr "%1$s ist %2$s beigetreten"
-
-#: ../../mod/dfrn_poll.php:101 ../../mod/dfrn_poll.php:534
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr "%1$s heißt %2$s herzlich willkommen"
-
-#: ../../mod/dfrn_request.php:93
-msgid "This introduction has already been accepted."
-msgstr "Diese Kontaktanfrage wurde bereits akzeptiert."
-
-#: ../../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: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: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: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"
-msgstr[0] "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden"
-msgstr[1] "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden"
-
-#: ../../mod/dfrn_request.php:170
-msgid "Introduction complete."
-msgstr "Kontaktanfrage abgeschlossen."
-
-#: ../../mod/dfrn_request.php:209
-msgid "Unrecoverable protocol error."
-msgstr "Nicht behebbarer Protokollfehler."
-
-#: ../../mod/dfrn_request.php:237
-msgid "Profile unavailable."
-msgstr "Profil nicht verfügbar."
-
-#: ../../mod/dfrn_request.php:262
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr "%s hat heute zu viele Freundschaftsanfragen erhalten."
-
-#: ../../mod/dfrn_request.php:263
-msgid "Spam protection measures have been invoked."
-msgstr "Maßnahmen zum Spamschutz wurden ergriffen."
-
-#: ../../mod/dfrn_request.php:264
-msgid "Friends are advised to please try again in 24 hours."
-msgstr "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."
-
-#: ../../mod/dfrn_request.php:326
-msgid "Invalid locator"
-msgstr "Ungültiger Locator"
-
-#: ../../mod/dfrn_request.php:335
-msgid "Invalid email address."
-msgstr "Ungültige E-Mail Adresse."
-
-#: ../../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: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:471
-msgid "You have already introduced yourself here."
-msgstr "Du hast dich hier bereits vorgestellt."
-
-#: ../../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:496
-msgid "Invalid profile URL."
-msgstr "Ungültige Profil-URL."
-
-#: ../../mod/dfrn_request.php:592
-msgid "Your introduction has been sent."
-msgstr "Deine Kontaktanfrage wurde gesendet."
-
-#: ../../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: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:670
-msgid "Hide this contact"
-msgstr "Verberge diesen Kontakt"
-
-#: ../../mod/dfrn_request.php:673
-#, php-format
-msgid "Welcome home %s."
-msgstr "Willkommen zurück %s."
-
-#: ../../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:675
-msgid "Confirm"
-msgstr "Bestätigen"
-
-#: ../../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: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: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:832
-msgid "Friend/Connection Request"
-msgstr "Freundschafts-/Kontaktanfrage"
-
-#: ../../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:834
-msgid "Please answer the following:"
-msgstr "Bitte beantworte Folgendes:"
-
-#: ../../mod/dfrn_request.php:835
-#, php-format
-msgid "Does %s know you?"
-msgstr "Kennt %s dich?"
-
-#: ../../mod/dfrn_request.php:838
-msgid "Add a personal note:"
-msgstr "Eine persönliche Notiz beifügen:"
-
-#: ../../mod/dfrn_request.php:841
-msgid "StatusNet/Federated Social Web"
-msgstr "StatusNet/Federated Social Web"
-
-#: ../../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:844
-msgid "Your Identity Address:"
-msgstr "Adresse deines Profils:"
-
-#: ../../mod/dfrn_request.php:847
-msgid "Submit Request"
-msgstr "Anfrage abschicken"
-
-#: ../../mod/subthread.php:103
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s folgt %2$s %3$s"
-
-#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
-msgid "Global Directory"
-msgstr "Weltweites Verzeichnis"
-
-#: ../../mod/directory.php:57
-msgid "Find on this site"
-msgstr "Auf diesem Server suchen"
-
-#: ../../mod/directory.php:60
-msgid "Site Directory"
-msgstr "Verzeichnis"
-
-#: ../../mod/directory.php:114
-msgid "Gender: "
-msgstr "Geschlecht:"
-
-#: ../../mod/directory.php:187
-msgid "No entries (some entries may be hidden)."
-msgstr "Keine Einträge (einige Einträge könnten versteckt sein)."
-
-#: ../../mod/suggest.php:27
-msgid "Do you really want to delete this suggestion?"
-msgstr "Möchtest du wirklich diese Empfehlung löschen?"
-
-#: ../../mod/suggest.php:72
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."
-
-#: ../../mod/suggest.php:90
-msgid "Ignore/Hide"
-msgstr "Ignorieren/Verbergen"
-
-#: ../../mod/dirfind.php:26
-msgid "People Search"
-msgstr "Personensuche"
-
-#: ../../mod/dirfind.php:60 ../../mod/match.php:65
-msgid "No matches"
-msgstr "Keine Übereinstimmungen"
-
 #: ../../mod/admin.php:55
 msgid "Theme settings updated."
 msgstr "Themeneinstellungen aktualisiert."
@@ -4990,7 +4565,7 @@ msgid "Clear"
 msgstr "löschen"
 
 #: ../../mod/admin.php:1184
-msgid "Debugging"
+msgid "Enable Debugging"
 msgstr "Protokoll führen"
 
 #: ../../mod/admin.php:1185
@@ -5027,6 +4602,431 @@ msgstr "FTP Nutzername"
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
+#: ../../mod/share.php:44
+msgid "link"
+msgstr "Link"
+
+#: ../../mod/crepair.php:102
+msgid "Contact settings applied."
+msgstr "Einstellungen zum Kontakt angewandt."
+
+#: ../../mod/crepair.php:104
+msgid "Contact update failed."
+msgstr "Konnte den Kontakt nicht aktualisieren."
+
+#: ../../mod/crepair.php:129 ../../mod/dfrn_confirm.php:118
+#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+msgid "Contact not found."
+msgstr "Kontakt nicht gefunden."
+
+#: ../../mod/crepair.php:135
+msgid "Repair Contact Settings"
+msgstr "Kontakteinstellungen reparieren"
+
+#: ../../mod/crepair.php:137
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
+" information your communications with this contact may stop working."
+msgstr "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."
+
+#: ../../mod/crepair.php:138
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
+msgstr "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst."
+
+#: ../../mod/crepair.php:144
+msgid "Return to contact editor"
+msgstr "Zurück zum Kontakteditor"
+
+#: ../../mod/crepair.php:149
+msgid "Account Nickname"
+msgstr "Konto-Spitzname"
+
+#: ../../mod/crepair.php:150
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@Tagname - überschreibt Name/Spitzname"
+
+#: ../../mod/crepair.php:151
+msgid "Account URL"
+msgstr "Konto-URL"
+
+#: ../../mod/crepair.php:152
+msgid "Friend Request URL"
+msgstr "URL für Freundschaftsanfragen"
+
+#: ../../mod/crepair.php:153
+msgid "Friend Confirm URL"
+msgstr "URL für Bestätigungen von Freundschaftsanfragen"
+
+#: ../../mod/crepair.php:154
+msgid "Notification Endpoint URL"
+msgstr "URL-Endpunkt für Benachrichtigungen"
+
+#: ../../mod/crepair.php:155
+msgid "Poll/Feed URL"
+msgstr "Pull/Feed-URL"
+
+#: ../../mod/crepair.php:156
+msgid "New photo from this URL"
+msgstr "Neues Foto von dieser URL"
+
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden."
+
+#: ../../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 "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!"
+
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
+msgstr "Vorhandene Seiten Manager"
+
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr "Vorhandene Bevollmächtigte für die Seite"
+
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Potentielle Bevollmächtigte"
+
+#: ../../mod/delegate.php:130 ../../mod/tagrm.php:93
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Keine Einträge"
+
+#: ../../mod/poke.php:192
+msgid "Poke/Prod"
+msgstr "Anstupsen etc."
+
+#: ../../mod/poke.php:193
+msgid "poke, prod or do other things to somebody"
+msgstr "Stupse Leute an oder mache anderes mit ihnen"
+
+#: ../../mod/poke.php:194
+msgid "Recipient"
+msgstr "Empfänger"
+
+#: ../../mod/poke.php:195
+msgid "Choose what you wish to do to recipient"
+msgstr "Was willst du mit dem Empfänger machen:"
+
+#: ../../mod/poke.php:198
+msgid "Make this post private"
+msgstr "Diesen Beitrag privat machen"
+
+#: ../../mod/dfrn_confirm.php:119
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."
+
+#: ../../mod/dfrn_confirm.php:237
+msgid "Response from remote site was not understood."
+msgstr "Antwort der Gegenstelle unverständlich."
+
+#: ../../mod/dfrn_confirm.php:246
+msgid "Unexpected response from remote site: "
+msgstr "Unerwartete Antwort der Gegenstelle: "
+
+#: ../../mod/dfrn_confirm.php:254
+msgid "Confirmation completed successfully."
+msgstr "Bestätigung erfolgreich abgeschlossen."
+
+#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
+#: ../../mod/dfrn_confirm.php:277
+msgid "Remote site reported: "
+msgstr "Gegenstelle meldet: "
+
+#: ../../mod/dfrn_confirm.php:268
+msgid "Temporary failure. Please wait and try again."
+msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal."
+
+#: ../../mod/dfrn_confirm.php:275
+msgid "Introduction failed or was revoked."
+msgstr "Kontaktanfrage schlug fehl oder wurde zurückgezogen."
+
+#: ../../mod/dfrn_confirm.php:420
+msgid "Unable to set contact photo."
+msgstr "Konnte das Bild des Kontakts nicht speichern."
+
+#: ../../mod/dfrn_confirm.php:562
+#, php-format
+msgid "No user record found for '%s' "
+msgstr "Für '%s' wurde kein Nutzer gefunden"
+
+#: ../../mod/dfrn_confirm.php:572
+msgid "Our site encryption key is apparently messed up."
+msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung."
+
+#: ../../mod/dfrn_confirm.php:583
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden."
+
+#: ../../mod/dfrn_confirm.php:604
+msgid "Contact record was not found for you on our site."
+msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."
+
+#: ../../mod/dfrn_confirm.php:618
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server."
+
+#: ../../mod/dfrn_confirm.php:638
+msgid ""
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
+msgstr "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."
+
+#: ../../mod/dfrn_confirm.php:649
+msgid "Unable to set your contact credentials on our system."
+msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."
+
+#: ../../mod/dfrn_confirm.php:716
+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:751
+#, php-format
+msgid "Connection accepted at %s"
+msgstr "Auf %s wurde die Verbindung akzeptiert"
+
+#: ../../mod/dfrn_confirm.php:800
+#, php-format
+msgid "%1$s has joined %2$s"
+msgstr "%1$s ist %2$s beigetreten"
+
+#: ../../mod/dfrn_poll.php:101 ../../mod/dfrn_poll.php:534
+#, php-format
+msgid "%1$s welcomes %2$s"
+msgstr "%1$s heißt %2$s herzlich willkommen"
+
+#: ../../mod/dfrn_request.php:93
+msgid "This introduction has already been accepted."
+msgstr "Diese Kontaktanfrage wurde bereits akzeptiert."
+
+#: ../../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: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: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: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"
+msgstr[0] "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden"
+msgstr[1] "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden"
+
+#: ../../mod/dfrn_request.php:170
+msgid "Introduction complete."
+msgstr "Kontaktanfrage abgeschlossen."
+
+#: ../../mod/dfrn_request.php:209
+msgid "Unrecoverable protocol error."
+msgstr "Nicht behebbarer Protokollfehler."
+
+#: ../../mod/dfrn_request.php:237
+msgid "Profile unavailable."
+msgstr "Profil nicht verfügbar."
+
+#: ../../mod/dfrn_request.php:262
+#, php-format
+msgid "%s has received too many connection requests today."
+msgstr "%s hat heute zu viele Freundschaftsanfragen erhalten."
+
+#: ../../mod/dfrn_request.php:263
+msgid "Spam protection measures have been invoked."
+msgstr "Maßnahmen zum Spamschutz wurden ergriffen."
+
+#: ../../mod/dfrn_request.php:264
+msgid "Friends are advised to please try again in 24 hours."
+msgstr "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."
+
+#: ../../mod/dfrn_request.php:326
+msgid "Invalid locator"
+msgstr "Ungültiger Locator"
+
+#: ../../mod/dfrn_request.php:335
+msgid "Invalid email address."
+msgstr "Ungültige E-Mail Adresse."
+
+#: ../../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: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:471
+msgid "You have already introduced yourself here."
+msgstr "Du hast dich hier bereits vorgestellt."
+
+#: ../../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:496
+msgid "Invalid profile URL."
+msgstr "Ungültige Profil-URL."
+
+#: ../../mod/dfrn_request.php:592
+msgid "Your introduction has been sent."
+msgstr "Deine Kontaktanfrage wurde gesendet."
+
+#: ../../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: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:670
+msgid "Hide this contact"
+msgstr "Verberge diesen Kontakt"
+
+#: ../../mod/dfrn_request.php:673
+#, php-format
+msgid "Welcome home %s."
+msgstr "Willkommen zurück %s."
+
+#: ../../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:675
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#: ../../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: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: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:832
+msgid "Friend/Connection Request"
+msgstr "Freundschafts-/Kontaktanfrage"
+
+#: ../../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:834
+msgid "Please answer the following:"
+msgstr "Bitte beantworte Folgendes:"
+
+#: ../../mod/dfrn_request.php:835
+#, php-format
+msgid "Does %s know you?"
+msgstr "Kennt %s dich?"
+
+#: ../../mod/dfrn_request.php:838
+msgid "Add a personal note:"
+msgstr "Eine persönliche Notiz beifügen:"
+
+#: ../../mod/dfrn_request.php:841
+msgid "StatusNet/Federated Social Web"
+msgstr "StatusNet/Federated Social Web"
+
+#: ../../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:844
+msgid "Your Identity Address:"
+msgstr "Adresse deines Profils:"
+
+#: ../../mod/dfrn_request.php:847
+msgid "Submit Request"
+msgstr "Anfrage abschicken"
+
+#: ../../mod/subthread.php:103
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s folgt %2$s %3$s"
+
+#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
+msgid "Global Directory"
+msgstr "Weltweites Verzeichnis"
+
+#: ../../mod/directory.php:57
+msgid "Find on this site"
+msgstr "Auf diesem Server suchen"
+
+#: ../../mod/directory.php:60
+msgid "Site Directory"
+msgstr "Verzeichnis"
+
+#: ../../mod/directory.php:114
+msgid "Gender: "
+msgstr "Geschlecht:"
+
+#: ../../mod/directory.php:187
+msgid "No entries (some entries may be hidden)."
+msgstr "Keine Einträge (einige Einträge könnten versteckt sein)."
+
+#: ../../mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
+msgstr "Möchtest du wirklich diese Empfehlung löschen?"
+
+#: ../../mod/suggest.php:72
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."
+
+#: ../../mod/suggest.php:90
+msgid "Ignore/Hide"
+msgstr "Ignorieren/Verbergen"
+
+#: ../../mod/dirfind.php:26
+msgid "People Search"
+msgstr "Personensuche"
+
+#: ../../mod/dirfind.php:60 ../../mod/match.php:65
+msgid "No matches"
+msgstr "Keine Übereinstimmungen"
+
 #: ../../mod/tagrm.php:41
 msgid "Tag removed"
 msgstr "Tag entfernt"
diff --git a/view/de/strings.php b/view/de/strings.php
index 297573c395..e5e5e57dee 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -898,105 +898,6 @@ $a->strings["You are tagged in a post"] = "– du in einem Beitrag erwähnt wirs
 $a->strings["You are poked/prodded/etc. in a post"] = "– du von jemandem angestupst oder sonstwie behandelt wirst";
 $a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Konto-/Seitentyp-Einstellungen";
 $a->strings["Change the behaviour of this account for special situations"] = "Verhalten dieses Kontos in bestimmten Situationen:";
-$a->strings["link"] = "Link";
-$a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt.";
-$a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren.";
-$a->strings["Contact not found."] = "Kontakt nicht gefunden.";
-$a->strings["Repair Contact Settings"] = "Kontakteinstellungen reparieren";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst.";
-$a->strings["Return to contact editor"] = "Zurück zum Kontakteditor";
-$a->strings["Account Nickname"] = "Konto-Spitzname";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname";
-$a->strings["Account URL"] = "Konto-URL";
-$a->strings["Friend Request URL"] = "URL für Freundschaftsanfragen";
-$a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Freundschaftsanfragen";
-$a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen";
-$a->strings["Poll/Feed URL"] = "Pull/Feed-URL";
-$a->strings["New photo from this URL"] = "Neues Foto von dieser URL";
-$a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden.";
-$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."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!";
-$a->strings["Existing Page Managers"] = "Vorhandene Seiten Manager";
-$a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite";
-$a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
-$a->strings["Remove"] = "Entfernen";
-$a->strings["Add"] = "Hinzufügen";
-$a->strings["No entries."] = "Keine Einträge";
-$a->strings["Poke/Prod"] = "Anstupsen etc.";
-$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
-$a->strings["Recipient"] = "Empfänger";
-$a->strings["Choose what you wish to do to recipient"] = "Was willst du mit dem Empfänger machen:";
-$a->strings["Make this post private"] = "Diesen Beitrag privat machen";
-$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde.";
-$a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich.";
-$a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: ";
-$a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen.";
-$a->strings["Remote site reported: "] = "Gegenstelle meldet: ";
-$a->strings["Temporary failure. Please wait and try again."] = "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal.";
-$a->strings["Introduction failed or was revoked."] = "Kontaktanfrage schlug fehl oder wurde zurückgezogen.";
-$a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern.";
-$a->strings["No user record found for '%s' "] = "Für '%s' wurde kein Nutzer gefunden";
-$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung.";
-$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden.";
-$a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden.";
-$a->strings["Site public key not available in contact record for URL %s."] = "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server.";
-$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal.";
-$a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden.";
-$a->strings["Unable to update your contact profile details on our system"] = "Die Updates für dein Profil konnten nicht gespeichert werden";
-$a->strings["Connection accepted at %s"] = "Auf %s wurde die Verbindung akzeptiert";
-$a->strings["%1\$s has joined %2\$s"] = "%1\$s ist %2\$s beigetreten";
-$a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen";
-$a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert.";
-$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung.";
-$a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden.";
-$a->strings["Warning: profile location has no profile photo."] = "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden.";
-$a->strings["%d required parameter was not found at the given location"] = array(
-	0 => "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden",
-	1 => "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden",
-);
-$a->strings["Introduction complete."] = "Kontaktanfrage abgeschlossen.";
-$a->strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler.";
-$a->strings["Profile unavailable."] = "Profil nicht verfügbar.";
-$a->strings["%s has received too many connection requests today."] = "%s hat heute zu viele Freundschaftsanfragen erhalten.";
-$a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen.";
-$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen.";
-$a->strings["Invalid locator"] = "Ungültiger Locator";
-$a->strings["Invalid email address."] = "Ungültige E-Mail Adresse.";
-$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen.";
-$a->strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen an der angegebenen Stelle nicht finden.";
-$a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
-$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits mit %s befreundet bist.";
-$a->strings["Invalid profile URL."] = "Ungültige Profil-URL.";
-$a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
-$a->strings["Please login to confirm introduction."] = "Bitte melde dich an, um die Kontaktanfrage zu bestätigen.";
-$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
-$a->strings["Hide this contact"] = "Verberge diesen Kontakt";
-$a->strings["Welcome home %s."] = "Willkommen zurück %s.";
-$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Kontaktanfrage bei %s.";
-$a->strings["Confirm"] = "Bestätigen";
-$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:";
-$a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "<strike>Als E-Mail-Kontakt verbinden</strike> (In Kürze verfügbar)";
-$a->strings["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>."] = "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.";
-$a->strings["Friend/Connection Request"] = "Freundschafts-/Kontaktanfrage";
-$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
-$a->strings["Please answer the following:"] = "Bitte beantworte Folgendes:";
-$a->strings["Does %s know you?"] = "Kennt %s dich?";
-$a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:";
-$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
-$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste.";
-$a->strings["Your Identity Address:"] = "Adresse deines Profils:";
-$a->strings["Submit Request"] = "Anfrage abschicken";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s";
-$a->strings["Global Directory"] = "Weltweites Verzeichnis";
-$a->strings["Find on this site"] = "Auf diesem Server suchen";
-$a->strings["Site Directory"] = "Verzeichnis";
-$a->strings["Gender: "] = "Geschlecht:";
-$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
-$a->strings["Do you really want to delete this suggestion?"] = "Möchtest du wirklich diese Empfehlung löschen?";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
-$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
-$a->strings["People Search"] = "Personensuche";
-$a->strings["No matches"] = "Keine Übereinstimmungen";
 $a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert.";
 $a->strings["Site"] = "Seite";
 $a->strings["Users"] = "Nutzer";
@@ -1163,7 +1064,7 @@ $a->strings["[Experimental]"] = "[Experimentell]";
 $a->strings["[Unsupported]"] = "[Nicht unterstützt]";
 $a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert.";
 $a->strings["Clear"] = "löschen";
-$a->strings["Debugging"] = "Protokoll führen";
+$a->strings["Enable Debugging"] = "Protokoll führen";
 $a->strings["Log file"] = "Protokolldatei";
 $a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis.";
 $a->strings["Log level"] = "Protokoll-Level";
@@ -1172,6 +1073,105 @@ $a->strings["FTP Host"] = "FTP Host";
 $a->strings["FTP Path"] = "FTP Pfad";
 $a->strings["FTP User"] = "FTP Nutzername";
 $a->strings["FTP Password"] = "FTP Passwort";
+$a->strings["link"] = "Link";
+$a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt.";
+$a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren.";
+$a->strings["Contact not found."] = "Kontakt nicht gefunden.";
+$a->strings["Repair Contact Settings"] = "Kontakteinstellungen reparieren";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst.";
+$a->strings["Return to contact editor"] = "Zurück zum Kontakteditor";
+$a->strings["Account Nickname"] = "Konto-Spitzname";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname";
+$a->strings["Account URL"] = "Konto-URL";
+$a->strings["Friend Request URL"] = "URL für Freundschaftsanfragen";
+$a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Freundschaftsanfragen";
+$a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen";
+$a->strings["Poll/Feed URL"] = "Pull/Feed-URL";
+$a->strings["New photo from this URL"] = "Neues Foto von dieser URL";
+$a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden.";
+$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."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!";
+$a->strings["Existing Page Managers"] = "Vorhandene Seiten Manager";
+$a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite";
+$a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
+$a->strings["Remove"] = "Entfernen";
+$a->strings["Add"] = "Hinzufügen";
+$a->strings["No entries."] = "Keine Einträge";
+$a->strings["Poke/Prod"] = "Anstupsen etc.";
+$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
+$a->strings["Recipient"] = "Empfänger";
+$a->strings["Choose what you wish to do to recipient"] = "Was willst du mit dem Empfänger machen:";
+$a->strings["Make this post private"] = "Diesen Beitrag privat machen";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde.";
+$a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich.";
+$a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: ";
+$a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen.";
+$a->strings["Remote site reported: "] = "Gegenstelle meldet: ";
+$a->strings["Temporary failure. Please wait and try again."] = "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal.";
+$a->strings["Introduction failed or was revoked."] = "Kontaktanfrage schlug fehl oder wurde zurückgezogen.";
+$a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern.";
+$a->strings["No user record found for '%s' "] = "Für '%s' wurde kein Nutzer gefunden";
+$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung.";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden.";
+$a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden.";
+$a->strings["Site public key not available in contact record for URL %s."] = "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server.";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal.";
+$a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden.";
+$a->strings["Unable to update your contact profile details on our system"] = "Die Updates für dein Profil konnten nicht gespeichert werden";
+$a->strings["Connection accepted at %s"] = "Auf %s wurde die Verbindung akzeptiert";
+$a->strings["%1\$s has joined %2\$s"] = "%1\$s ist %2\$s beigetreten";
+$a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen";
+$a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert.";
+$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung.";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden.";
+$a->strings["Warning: profile location has no profile photo."] = "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden.";
+$a->strings["%d required parameter was not found at the given location"] = array(
+	0 => "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden",
+	1 => "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden",
+);
+$a->strings["Introduction complete."] = "Kontaktanfrage abgeschlossen.";
+$a->strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler.";
+$a->strings["Profile unavailable."] = "Profil nicht verfügbar.";
+$a->strings["%s has received too many connection requests today."] = "%s hat heute zu viele Freundschaftsanfragen erhalten.";
+$a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen.";
+$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen.";
+$a->strings["Invalid locator"] = "Ungültiger Locator";
+$a->strings["Invalid email address."] = "Ungültige E-Mail Adresse.";
+$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen.";
+$a->strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen an der angegebenen Stelle nicht finden.";
+$a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
+$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits mit %s befreundet bist.";
+$a->strings["Invalid profile URL."] = "Ungültige Profil-URL.";
+$a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
+$a->strings["Please login to confirm introduction."] = "Bitte melde dich an, um die Kontaktanfrage zu bestätigen.";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
+$a->strings["Hide this contact"] = "Verberge diesen Kontakt";
+$a->strings["Welcome home %s."] = "Willkommen zurück %s.";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Kontaktanfrage bei %s.";
+$a->strings["Confirm"] = "Bestätigen";
+$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:";
+$a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "<strike>Als E-Mail-Kontakt verbinden</strike> (In Kürze verfügbar)";
+$a->strings["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>."] = "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.";
+$a->strings["Friend/Connection Request"] = "Freundschafts-/Kontaktanfrage";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
+$a->strings["Please answer the following:"] = "Bitte beantworte Folgendes:";
+$a->strings["Does %s know you?"] = "Kennt %s dich?";
+$a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:";
+$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
+$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste.";
+$a->strings["Your Identity Address:"] = "Adresse deines Profils:";
+$a->strings["Submit Request"] = "Anfrage abschicken";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s";
+$a->strings["Global Directory"] = "Weltweites Verzeichnis";
+$a->strings["Find on this site"] = "Auf diesem Server suchen";
+$a->strings["Site Directory"] = "Verzeichnis";
+$a->strings["Gender: "] = "Geschlecht:";
+$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
+$a->strings["Do you really want to delete this suggestion?"] = "Möchtest du wirklich diese Empfehlung löschen?";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
+$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
+$a->strings["People Search"] = "Personensuche";
+$a->strings["No matches"] = "Keine Übereinstimmungen";
 $a->strings["Tag removed"] = "Tag entfernt";
 $a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen";
 $a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: ";

From 9660117c7037799be2ecd8523edfbb18bc7427c8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 4 Apr 2013 15:10:14 -0700
Subject: [PATCH 08/67] sync username when changed in either the default
 profile or the settings page

---
 boot.php         |    2 +-
 mod/profiles.php |    4 +
 mod/settings.php |    2 +
 util/messages.po | 2062 +++++++++++++++++++++++-----------------------
 4 files changed, 1043 insertions(+), 1027 deletions(-)

diff --git a/boot.php b/boot.php
index 32af504677..22af8ef570 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1659' );
+define ( 'FRIENDICA_VERSION',      '3.1.1660' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/mod/profiles.php b/mod/profiles.php
index f517478a1a..148c632914 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -455,6 +455,10 @@ function profiles_post(&$a) {
 				dbesc(datetime_convert()),
 				intval(local_user())
 			);
+			$r = q("UPDATE `user` set `username` = '%s' where `uid` = %d limit 1",
+				dbesc($name),
+				intval(local_user())
+			);
 		}
 
 		if($is_default) {
diff --git a/mod/settings.php b/mod/settings.php
index 75c11e8819..38bfedbb1c 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -489,10 +489,12 @@ function settings_post(&$a) {
 
 	$r = q("UPDATE `profile` 
 		SET `publish` = %d, 
+		`name` = '%s',
 		`net-publish` = %d,
 		`hide-friends` = %d
 		WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval($publish),
+		dbesc($username),
 		intval($net_publish),
 		intval($hide_friends),
 		intval(local_user())
diff --git a/util/messages.po b/util/messages.po
index 796c185b5c..a8ee559c95 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1659\n"
+"Project-Id-Version: 3.1.1660\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-03 00:02-0700\n"
+"POT-Creation-Date: 2013-04-04 00:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
 #: ../../include/nav.php:77 ../../mod/profperm.php:103
 #: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88
-#: ../../boot.php:1868
+#: ../../boot.php:1877
 msgid "Profile"
 msgstr ""
 
@@ -30,7 +30,7 @@ msgid "Full Name:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
-#: ../../boot.php:1408
+#: ../../boot.php:1417
 msgid "Gender:"
 msgstr ""
 
@@ -51,7 +51,7 @@ msgid "Age:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
-#: ../../boot.php:1411
+#: ../../boot.php:1420
 msgid "Status:"
 msgstr ""
 
@@ -65,7 +65,7 @@ msgid "Sexual Preference:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
-#: ../../boot.php:1413
+#: ../../boot.php:1422
 msgid "Homepage:"
 msgstr ""
 
@@ -401,306 +401,306 @@ msgstr ""
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/text.php:276
+#: ../../include/text.php:313
 msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:278
+#: ../../include/text.php:315
 msgid "first"
 msgstr ""
 
-#: ../../include/text.php:307
+#: ../../include/text.php:344
 msgid "last"
 msgstr ""
 
-#: ../../include/text.php:310
+#: ../../include/text.php:347
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:328
+#: ../../include/text.php:371
 msgid "newer"
 msgstr ""
 
-#: ../../include/text.php:332
+#: ../../include/text.php:375
 msgid "older"
 msgstr ""
 
-#: ../../include/text.php:697
+#: ../../include/text.php:837
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:706
+#: ../../include/text.php:846
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:718 ../../mod/viewcontacts.php:76
+#: ../../include/text.php:858 ../../mod/viewcontacts.php:76
 msgid "View Contacts"
 msgstr ""
 
-#: ../../include/text.php:778 ../../include/text.php:779
+#: ../../include/text.php:935 ../../include/text.php:936
 #: ../../include/nav.php:118 ../../mod/search.php:99
 msgid "Search"
 msgstr ""
 
-#: ../../include/text.php:781 ../../mod/notes.php:63 ../../mod/filer.php:31
+#: ../../include/text.php:938 ../../mod/notes.php:63 ../../mod/filer.php:31
 msgid "Save"
 msgstr ""
 
-#: ../../include/text.php:819
+#: ../../include/text.php:987
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:819 ../../include/conversation.php:211
+#: ../../include/text.php:987 ../../include/conversation.php:211
 msgid "poked"
 msgstr ""
 
-#: ../../include/text.php:820
+#: ../../include/text.php:988
 msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:820
+#: ../../include/text.php:988
 msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:821
+#: ../../include/text.php:989
 msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:821
+#: ../../include/text.php:989
 msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:990
 msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:990
 msgid "slapped"
 msgstr ""
 
-#: ../../include/text.php:823
+#: ../../include/text.php:991
 msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:823
+#: ../../include/text.php:991
 msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:824
+#: ../../include/text.php:992
 msgid "rebuff"
 msgstr ""
 
-#: ../../include/text.php:824
+#: ../../include/text.php:992
 msgid "rebuffed"
 msgstr ""
 
-#: ../../include/text.php:836
+#: ../../include/text.php:1006
 msgid "happy"
 msgstr ""
 
-#: ../../include/text.php:837
+#: ../../include/text.php:1007
 msgid "sad"
 msgstr ""
 
-#: ../../include/text.php:838
+#: ../../include/text.php:1008
 msgid "mellow"
 msgstr ""
 
-#: ../../include/text.php:839
+#: ../../include/text.php:1009
 msgid "tired"
 msgstr ""
 
-#: ../../include/text.php:840
+#: ../../include/text.php:1010
 msgid "perky"
 msgstr ""
 
-#: ../../include/text.php:841
+#: ../../include/text.php:1011
 msgid "angry"
 msgstr ""
 
-#: ../../include/text.php:842
+#: ../../include/text.php:1012
 msgid "stupified"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:1013
 msgid "puzzled"
 msgstr ""
 
-#: ../../include/text.php:844
+#: ../../include/text.php:1014
 msgid "interested"
 msgstr ""
 
-#: ../../include/text.php:845
+#: ../../include/text.php:1015
 msgid "bitter"
 msgstr ""
 
-#: ../../include/text.php:846
+#: ../../include/text.php:1016
 msgid "cheerful"
 msgstr ""
 
-#: ../../include/text.php:847
+#: ../../include/text.php:1017
 msgid "alive"
 msgstr ""
 
-#: ../../include/text.php:848
+#: ../../include/text.php:1018
 msgid "annoyed"
 msgstr ""
 
-#: ../../include/text.php:849
+#: ../../include/text.php:1019
 msgid "anxious"
 msgstr ""
 
-#: ../../include/text.php:850
+#: ../../include/text.php:1020
 msgid "cranky"
 msgstr ""
 
-#: ../../include/text.php:851
+#: ../../include/text.php:1021
 msgid "disturbed"
 msgstr ""
 
-#: ../../include/text.php:852
+#: ../../include/text.php:1022
 msgid "frustrated"
 msgstr ""
 
-#: ../../include/text.php:853
+#: ../../include/text.php:1023
 msgid "motivated"
 msgstr ""
 
-#: ../../include/text.php:854
+#: ../../include/text.php:1024
 msgid "relaxed"
 msgstr ""
 
-#: ../../include/text.php:855
+#: ../../include/text.php:1025
 msgid "surprised"
 msgstr ""
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1153
+#: ../../include/text.php:1352
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:1180 ../../include/text.php:1192
+#: ../../include/text.php:1379 ../../include/text.php:1391
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1333 ../../mod/events.php:335
+#: ../../include/text.php:1553 ../../mod/events.php:335
 msgid "link to source"
 msgstr ""
 
-#: ../../include/text.php:1365 ../../include/user.php:237
+#: ../../include/text.php:1596 ../../include/user.php:237
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1377
+#: ../../include/text.php:1608
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1583 ../../include/conversation.php:118
+#: ../../include/text.php:1860 ../../include/conversation.php:118
 #: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
 msgid "event"
 msgstr ""
 
-#: ../../include/text.php:1585 ../../include/diaspora.php:1874
+#: ../../include/text.php:1862 ../../include/diaspora.php:1874
 #: ../../include/conversation.php:126 ../../include/conversation.php:254
 #: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
 #: ../../view/theme/diabook/theme.php:464
 msgid "photo"
 msgstr ""
 
-#: ../../include/text.php:1587
+#: ../../include/text.php:1864
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1589 ../../mod/content.php:628
+#: ../../include/text.php:1866 ../../mod/content.php:628
 #: ../../object/Item.php:364 ../../object/Item.php:377
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:1590
+#: ../../include/text.php:1867
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1745
+#: ../../include/text.php:2022
 msgid "Item filed"
 msgstr ""
 
@@ -791,7 +791,7 @@ msgid "Finishes:"
 msgstr ""
 
 #: ../../include/bb2diaspora.php:415 ../../include/event.php:40
-#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1406
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1415
 msgid "Location:"
 msgstr ""
 
@@ -956,19 +956,19 @@ msgstr ""
 msgid "Reputable, has my trust"
 msgstr ""
 
-#: ../../include/contact_selectors.php:56
+#: ../../include/contact_selectors.php:56 ../../mod/admin.php:452
 msgid "Frequently"
 msgstr ""
 
-#: ../../include/contact_selectors.php:57
+#: ../../include/contact_selectors.php:57 ../../mod/admin.php:453
 msgid "Hourly"
 msgstr ""
 
-#: ../../include/contact_selectors.php:58
+#: ../../include/contact_selectors.php:58 ../../mod/admin.php:454
 msgid "Twice daily"
 msgstr ""
 
-#: ../../include/contact_selectors.php:59
+#: ../../include/contact_selectors.php:59 ../../mod/admin.php:455
 msgid "Daily"
 msgstr ""
 
@@ -993,8 +993,8 @@ msgid "RSS/Atom"
 msgstr ""
 
 #: ../../include/contact_selectors.php:79
-#: ../../include/contact_selectors.php:86 ../../mod/admin.php:754
-#: ../../mod/admin.php:765
+#: ../../include/contact_selectors.php:86 ../../mod/admin.php:766
+#: ../../mod/admin.php:777
 msgid "Email"
 msgstr ""
 
@@ -1041,7 +1041,7 @@ msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
 #: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
-#: ../../mod/match.php:58 ../../boot.php:1338
+#: ../../mod/match.php:58 ../../boot.php:1347
 msgid "Connect"
 msgstr ""
 
@@ -1118,7 +1118,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../include/contact_widgets.php:204 ../../mod/content.php:629
-#: ../../object/Item.php:365 ../../boot.php:652
+#: ../../object/Item.php:365 ../../boot.php:653
 msgid "show more"
 msgstr ""
 
@@ -1145,6 +1145,95 @@ msgstr ""
 msgid "Encrypted content"
 msgstr ""
 
+#: ../../include/items.php:1791 ../../include/datetime.php:472
+#, php-format
+msgid "%s's birthday"
+msgstr ""
+
+#: ../../include/items.php:1792 ../../include/datetime.php:473
+#, php-format
+msgid "Happy Birthday %s"
+msgstr ""
+
+#: ../../include/items.php:3466 ../../mod/dfrn_request.php:716
+msgid "[Name Withheld]"
+msgstr ""
+
+#: ../../include/items.php:3473
+msgid "A new person is sharing with you at "
+msgstr ""
+
+#: ../../include/items.php:3473
+msgid "You have a new follower at "
+msgstr ""
+
+#: ../../include/items.php:3957 ../../mod/admin.php:158
+#: ../../mod/admin.php:809 ../../mod/admin.php:1009 ../../mod/viewsrc.php:15
+#: ../../mod/notice.php:15 ../../mod/display.php:51 ../../mod/display.php:213
+msgid "Item not found."
+msgstr ""
+
+#: ../../include/items.php:3996
+msgid "Do you really want to delete this item?"
+msgstr ""
+
+#: ../../include/items.php:3998 ../../mod/profiles.php:606
+#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
+#: ../../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/dfrn_request.php:836
+#: ../../mod/suggest.php:29 ../../mod/message.php:209
+msgid "Yes"
+msgstr ""
+
+#: ../../include/items.php:4001 ../../include/conversation.php:1080
+#: ../../mod/contacts.php:249 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../mod/dfrn_request.php:848
+#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
+#: ../../mod/photos.php:202 ../../mod/photos.php:290
+msgid "Cancel"
+msgstr ""
+
+#: ../../include/items.php:4121 ../../mod/profiles.php:146
+#: ../../mod/profiles.php:567 ../../mod/notes.php:20 ../../mod/nogroup.php:25
+#: ../../mod/item.php:140 ../../mod/item.php:156 ../../mod/allfriends.php:9
+#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/register.php:40
+#: ../../mod/regmod.php:118 ../../mod/attach.php:33 ../../mod/contacts.php:147
+#: ../../mod/settings.php:91 ../../mod/settings.php:542
+#: ../../mod/settings.php:547 ../../mod/crepair.php:115
+#: ../../mod/delegate.php:6 ../../mod/poke.php:135
+#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
+#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
+#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
+#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
+#: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
+#: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/manage.php:96
+#: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
+#: ../../mod/network.php:6 ../../mod/notifications.php:66
+#: ../../mod/photos.php:133 ../../mod/photos.php:1044
+#: ../../mod/display.php:209 ../../mod/install.php:151
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
+#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
+#: ../../index.php:346
+msgid "Permission denied."
+msgstr ""
+
+#: ../../include/items.php:4191
+msgid "Archives"
+msgstr ""
+
+#: ../../include/network.php:875
+msgid "view full size"
+msgstr ""
+
 #: ../../include/datetime.php:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
 msgstr ""
@@ -1218,16 +1307,6 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/datetime.php:472 ../../include/items.php:1771
-#, php-format
-msgid "%s's birthday"
-msgstr ""
-
-#: ../../include/datetime.php:473 ../../include/items.php:1772
-#, php-format
-msgid "Happy Birthday %s"
-msgstr ""
-
 #: ../../include/plugin.php:439 ../../include/plugin.php:441
 msgid "Click here to upgrade."
 msgstr ""
@@ -1509,10 +1588,10 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:588 ../../mod/settings.php:623
-#: ../../mod/admin.php:758 ../../mod/group.php:171 ../../mod/photos.php:1637
-#: ../../mod/content.php:462 ../../mod/content.php:764
-#: ../../object/Item.php:127
+#: ../../include/conversation.php:588 ../../mod/admin.php:770
+#: ../../mod/settings.php:623 ../../mod/group.php:171
+#: ../../mod/photos.php:1637 ../../mod/content.php:462
+#: ../../mod/content.php:764 ../../object/Item.php:127
 msgid "Delete"
 msgstr ""
 
@@ -1739,16 +1818,6 @@ msgstr ""
 msgid "Preview"
 msgstr ""
 
-#: ../../include/conversation.php:1080 ../../include/items.php:3981
-#: ../../mod/contacts.php:249 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/dfrn_request.php:848
-#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
-#: ../../mod/photos.php:202 ../../mod/photos.php:290
-msgid "Cancel"
-msgstr ""
-
 #: ../../include/conversation.php:1086
 msgid "Post to Groups"
 msgstr ""
@@ -1964,7 +2033,7 @@ msgstr ""
 msgid "Clear notifications"
 msgstr ""
 
-#: ../../include/nav.php:73 ../../boot.php:1057
+#: ../../include/nav.php:73 ../../boot.php:1066
 msgid "Logout"
 msgstr ""
 
@@ -1972,7 +2041,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:76 ../../boot.php:1861
+#: ../../include/nav.php:76 ../../boot.php:1870
 msgid "Status"
 msgstr ""
 
@@ -1986,7 +2055,7 @@ msgid "Your profile page"
 msgstr ""
 
 #: ../../include/nav.php:78 ../../mod/fbrowser.php:25
-#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1875
+#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1884
 msgid "Photos"
 msgstr ""
 
@@ -1995,7 +2064,7 @@ msgid "Your photos"
 msgstr ""
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1885
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1894
 msgid "Events"
 msgstr ""
 
@@ -2011,7 +2080,7 @@ msgstr ""
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../include/nav.php:91 ../../boot.php:1058
+#: ../../include/nav.php:91 ../../boot.php:1067
 msgid "Login"
 msgstr ""
 
@@ -2028,7 +2097,7 @@ msgstr ""
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1033
+#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1042
 msgid "Register"
 msgstr ""
 
@@ -2146,8 +2215,8 @@ msgstr ""
 msgid "Delegate Page Management"
 msgstr ""
 
-#: ../../include/nav.php:167 ../../mod/settings.php:74 ../../mod/admin.php:849
-#: ../../mod/admin.php:1057 ../../mod/uexport.php:48
+#: ../../include/nav.php:167 ../../mod/admin.php:861 ../../mod/admin.php:1069
+#: ../../mod/settings.php:74 ../../mod/uexport.php:48
 #: ../../mod/newmember.php:22 ../../view/theme/diabook/theme.php:537
 #: ../../view/theme/diabook/theme.php:658
 msgid "Settings"
@@ -2157,7 +2226,7 @@ msgstr ""
 msgid "Account settings"
 msgstr ""
 
-#: ../../include/nav.php:169 ../../boot.php:1360
+#: ../../include/nav.php:169 ../../boot.php:1369
 msgid "Profiles"
 msgstr ""
 
@@ -2190,10 +2259,6 @@ msgstr ""
 msgid "Site map"
 msgstr ""
 
-#: ../../include/network.php:876
-msgid "view full size"
-msgstr ""
-
 #: ../../include/oembed.php:138
 msgid "Embedded content"
 msgstr ""
@@ -2202,71 +2267,6 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/items.php:3446 ../../mod/dfrn_request.php:716
-msgid "[Name Withheld]"
-msgstr ""
-
-#: ../../include/items.php:3453
-msgid "A new person is sharing with you at "
-msgstr ""
-
-#: ../../include/items.php:3453
-msgid "You have a new follower at "
-msgstr ""
-
-#: ../../include/items.php:3937 ../../mod/admin.php:158
-#: ../../mod/admin.php:797 ../../mod/admin.php:997 ../../mod/viewsrc.php:15
-#: ../../mod/notice.php:15 ../../mod/display.php:51 ../../mod/display.php:213
-msgid "Item not found."
-msgstr ""
-
-#: ../../include/items.php:3976
-msgid "Do you really want to delete this item?"
-msgstr ""
-
-#: ../../include/items.php:3978 ../../mod/profiles.php:606
-#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
-#: ../../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/dfrn_request.php:836
-#: ../../mod/suggest.php:29 ../../mod/message.php:209
-msgid "Yes"
-msgstr ""
-
-#: ../../include/items.php:4101 ../../mod/profiles.php:146
-#: ../../mod/profiles.php:567 ../../mod/notes.php:20 ../../mod/nogroup.php:25
-#: ../../mod/item.php:140 ../../mod/item.php:156 ../../mod/allfriends.php:9
-#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/register.php:40
-#: ../../mod/regmod.php:118 ../../mod/attach.php:33 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:542
-#: ../../mod/settings.php:547 ../../mod/crepair.php:115
-#: ../../mod/delegate.php:6 ../../mod/poke.php:135
-#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
-#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
-#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
-#: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
-#: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
-#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
-#: ../../mod/wallmessage.php:103 ../../mod/manage.php:96
-#: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
-#: ../../mod/network.php:6 ../../mod/notifications.php:66
-#: ../../mod/photos.php:133 ../../mod/photos.php:1044
-#: ../../mod/display.php:209 ../../mod/install.php:151
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
-#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
-#: ../../index.php:346
-msgid "Permission denied."
-msgstr ""
-
-#: ../../include/items.php:4171
-msgid "Archives"
-msgstr ""
-
 #: ../../include/security.php:22
 msgid "Welcome "
 msgstr ""
@@ -2409,11 +2409,11 @@ msgstr ""
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:626 ../../mod/contacts.php:386
-#: ../../mod/settings.php:560 ../../mod/settings.php:670
-#: ../../mod/settings.php:739 ../../mod/settings.php:811
-#: ../../mod/settings.php:1037 ../../mod/admin.php:480 ../../mod/admin.php:751
-#: ../../mod/admin.php:890 ../../mod/admin.php:1090 ../../mod/admin.php:1177
+#: ../../mod/profiles.php:626 ../../mod/admin.php:491 ../../mod/admin.php:763
+#: ../../mod/admin.php:902 ../../mod/admin.php:1102 ../../mod/admin.php:1189
+#: ../../mod/contacts.php:386 ../../mod/settings.php:560
+#: ../../mod/settings.php:670 ../../mod/settings.php:739
+#: ../../mod/settings.php:811 ../../mod/settings.php:1037
 #: ../../mod/crepair.php:166 ../../mod/poke.php:199 ../../mod/events.php:478
 #: ../../mod/fsuggest.php:107 ../../mod/group.php:87 ../../mod/invite.php:140
 #: ../../mod/localtime.php:45 ../../mod/manage.php:110
@@ -2589,23 +2589,23 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:722 ../../boot.php:1366 ../../boot.php:1392
+#: ../../mod/profiles.php:722 ../../boot.php:1375 ../../boot.php:1401
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:723 ../../boot.php:1367
+#: ../../mod/profiles.php:723 ../../boot.php:1376
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:734 ../../boot.php:1377
+#: ../../mod/profiles.php:734 ../../boot.php:1386
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:736 ../../boot.php:1380
+#: ../../mod/profiles.php:736 ../../boot.php:1389
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:737 ../../boot.php:1381
+#: ../../mod/profiles.php:737 ../../boot.php:1390
 msgid "Edit visibility"
 msgstr ""
 
@@ -2633,7 +2633,7 @@ msgstr ""
 msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1892
+#: ../../mod/notes.php:44 ../../boot.php:1901
 msgid "Personal Notes"
 msgstr ""
 
@@ -2696,6 +2696,803 @@ msgstr ""
 msgid "{0} mentioned you in a post"
 msgstr ""
 
+#: ../../mod/admin.php:55
+msgid "Theme settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:96 ../../mod/admin.php:490
+msgid "Site"
+msgstr ""
+
+#: ../../mod/admin.php:97 ../../mod/admin.php:762 ../../mod/admin.php:776
+msgid "Users"
+msgstr ""
+
+#: ../../mod/admin.php:98 ../../mod/admin.php:859 ../../mod/admin.php:901
+msgid "Plugins"
+msgstr ""
+
+#: ../../mod/admin.php:99 ../../mod/admin.php:1067 ../../mod/admin.php:1101
+msgid "Themes"
+msgstr ""
+
+#: ../../mod/admin.php:100
+msgid "DB updates"
+msgstr ""
+
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1188
+msgid "Logs"
+msgstr ""
+
+#: ../../mod/admin.php:121
+msgid "Plugin Features"
+msgstr ""
+
+#: ../../mod/admin.php:123
+msgid "User registrations waiting for confirmation"
+msgstr ""
+
+#: ../../mod/admin.php:182 ../../mod/admin.php:733
+msgid "Normal Account"
+msgstr ""
+
+#: ../../mod/admin.php:183 ../../mod/admin.php:734
+msgid "Soapbox Account"
+msgstr ""
+
+#: ../../mod/admin.php:184 ../../mod/admin.php:735
+msgid "Community/Celebrity Account"
+msgstr ""
+
+#: ../../mod/admin.php:185 ../../mod/admin.php:736
+msgid "Automatic Friend Account"
+msgstr ""
+
+#: ../../mod/admin.php:186
+msgid "Blog Account"
+msgstr ""
+
+#: ../../mod/admin.php:187
+msgid "Private Forum"
+msgstr ""
+
+#: ../../mod/admin.php:206
+msgid "Message queues"
+msgstr ""
+
+#: ../../mod/admin.php:211 ../../mod/admin.php:489 ../../mod/admin.php:761
+#: ../../mod/admin.php:858 ../../mod/admin.php:900 ../../mod/admin.php:1066
+#: ../../mod/admin.php:1100 ../../mod/admin.php:1187
+msgid "Administration"
+msgstr ""
+
+#: ../../mod/admin.php:212
+msgid "Summary"
+msgstr ""
+
+#: ../../mod/admin.php:214
+msgid "Registered users"
+msgstr ""
+
+#: ../../mod/admin.php:216
+msgid "Pending registrations"
+msgstr ""
+
+#: ../../mod/admin.php:217
+msgid "Version"
+msgstr ""
+
+#: ../../mod/admin.php:219
+msgid "Active plugins"
+msgstr ""
+
+#: ../../mod/admin.php:405
+msgid "Site settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:434 ../../mod/settings.php:769
+msgid "No special theme for mobile devices"
+msgstr ""
+
+#: ../../mod/admin.php:451 ../../mod/contacts.php:330
+msgid "Never"
+msgstr ""
+
+#: ../../mod/admin.php:460
+msgid "Multi user instance"
+msgstr ""
+
+#: ../../mod/admin.php:476
+msgid "Closed"
+msgstr ""
+
+#: ../../mod/admin.php:477
+msgid "Requires approval"
+msgstr ""
+
+#: ../../mod/admin.php:478
+msgid "Open"
+msgstr ""
+
+#: ../../mod/admin.php:482
+msgid "No SSL policy, links will track page SSL state"
+msgstr ""
+
+#: ../../mod/admin.php:483
+msgid "Force all links to use SSL"
+msgstr ""
+
+#: ../../mod/admin.php:484
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr ""
+
+#: ../../mod/admin.php:492 ../../mod/register.php:261
+msgid "Registration"
+msgstr ""
+
+#: ../../mod/admin.php:493
+msgid "File upload"
+msgstr ""
+
+#: ../../mod/admin.php:494
+msgid "Policies"
+msgstr ""
+
+#: ../../mod/admin.php:495
+msgid "Advanced"
+msgstr ""
+
+#: ../../mod/admin.php:496
+msgid "Performance"
+msgstr ""
+
+#: ../../mod/admin.php:500
+msgid "Site name"
+msgstr ""
+
+#: ../../mod/admin.php:501
+msgid "Banner/Logo"
+msgstr ""
+
+#: ../../mod/admin.php:502
+msgid "System language"
+msgstr ""
+
+#: ../../mod/admin.php:503
+msgid "System theme"
+msgstr ""
+
+#: ../../mod/admin.php:503
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr ""
+
+#: ../../mod/admin.php:504
+msgid "Mobile system theme"
+msgstr ""
+
+#: ../../mod/admin.php:504
+msgid "Theme for mobile devices"
+msgstr ""
+
+#: ../../mod/admin.php:505
+msgid "SSL link policy"
+msgstr ""
+
+#: ../../mod/admin.php:505
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr ""
+
+#: ../../mod/admin.php:506
+msgid "'Share' element"
+msgstr ""
+
+#: ../../mod/admin.php:506
+msgid "Activates the bbcode element 'share' for repeating items."
+msgstr ""
+
+#: ../../mod/admin.php:507
+msgid "Hide help entry from navigation menu"
+msgstr ""
+
+#: ../../mod/admin.php:507
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
+msgstr ""
+
+#: ../../mod/admin.php:508
+msgid "Single user instance"
+msgstr ""
+
+#: ../../mod/admin.php:508
+msgid "Make this instance multi-user or single-user for the named user"
+msgstr ""
+
+#: ../../mod/admin.php:509
+msgid "Maximum image size"
+msgstr ""
+
+#: ../../mod/admin.php:509
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr ""
+
+#: ../../mod/admin.php:510
+msgid "Maximum image length"
+msgstr ""
+
+#: ../../mod/admin.php:510
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
+msgstr ""
+
+#: ../../mod/admin.php:511
+msgid "JPEG image quality"
+msgstr ""
+
+#: ../../mod/admin.php:511
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr ""
+
+#: ../../mod/admin.php:513
+msgid "Register policy"
+msgstr ""
+
+#: ../../mod/admin.php:514
+msgid "Maximum Daily Registrations"
+msgstr ""
+
+#: ../../mod/admin.php:514
+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:515
+msgid "Register text"
+msgstr ""
+
+#: ../../mod/admin.php:515
+msgid "Will be displayed prominently on the registration page."
+msgstr ""
+
+#: ../../mod/admin.php:516
+msgid "Accounts abandoned after x days"
+msgstr ""
+
+#: ../../mod/admin.php:516
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr ""
+
+#: ../../mod/admin.php:517
+msgid "Allowed friend domains"
+msgstr ""
+
+#: ../../mod/admin.php:517
+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:518
+msgid "Allowed email domains"
+msgstr ""
+
+#: ../../mod/admin.php:518
+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:519
+msgid "Block public"
+msgstr ""
+
+#: ../../mod/admin.php:519
+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:520
+msgid "Force publish"
+msgstr ""
+
+#: ../../mod/admin.php:520
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr ""
+
+#: ../../mod/admin.php:521
+msgid "Global directory update URL"
+msgstr ""
+
+#: ../../mod/admin.php:521
+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:522
+msgid "Allow threaded items"
+msgstr ""
+
+#: ../../mod/admin.php:522
+msgid "Allow infinite level threading for items on this site."
+msgstr ""
+
+#: ../../mod/admin.php:523
+msgid "Private posts by default for new users"
+msgstr ""
+
+#: ../../mod/admin.php:523
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
+msgstr ""
+
+#: ../../mod/admin.php:524
+msgid "Don't include post content in email notifications"
+msgstr ""
+
+#: ../../mod/admin.php:524
+msgid ""
+"Don't include the content of a post/comment/private message/etc. in the "
+"email notifications that are sent out from this site, as a privacy measure."
+msgstr ""
+
+#: ../../mod/admin.php:525
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr ""
+
+#: ../../mod/admin.php:525
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr ""
+
+#: ../../mod/admin.php:526
+msgid "Don't embed private images in posts"
+msgstr ""
+
+#: ../../mod/admin.php:526
+msgid ""
+"Don't replace locally-hosted private photos in posts with an embedded copy "
+"of the image. This means that contacts who receive posts containing private "
+"photos will have to authenticate and load each image, which may take a while."
+msgstr ""
+
+#: ../../mod/admin.php:528
+msgid "Block multiple registrations"
+msgstr ""
+
+#: ../../mod/admin.php:528
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr ""
+
+#: ../../mod/admin.php:529
+msgid "OpenID support"
+msgstr ""
+
+#: ../../mod/admin.php:529
+msgid "OpenID support for registration and logins."
+msgstr ""
+
+#: ../../mod/admin.php:530
+msgid "Fullname check"
+msgstr ""
+
+#: ../../mod/admin.php:530
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr ""
+
+#: ../../mod/admin.php:531
+msgid "UTF-8 Regular expressions"
+msgstr ""
+
+#: ../../mod/admin.php:531
+msgid "Use PHP UTF8 regular expressions"
+msgstr ""
+
+#: ../../mod/admin.php:532
+msgid "Show Community Page"
+msgstr ""
+
+#: ../../mod/admin.php:532
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr ""
+
+#: ../../mod/admin.php:533
+msgid "Enable OStatus support"
+msgstr ""
+
+#: ../../mod/admin.php:533
+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:534
+msgid "OStatus conversation completion interval"
+msgstr ""
+
+#: ../../mod/admin.php:534
+msgid ""
+"How often shall the poller check for new entries in OStatus conversations? "
+"This can be a very ressource task."
+msgstr ""
+
+#: ../../mod/admin.php:535
+msgid "Enable Diaspora support"
+msgstr ""
+
+#: ../../mod/admin.php:535
+msgid "Provide built-in Diaspora network compatibility."
+msgstr ""
+
+#: ../../mod/admin.php:536
+msgid "Only allow Friendica contacts"
+msgstr ""
+
+#: ../../mod/admin.php:536
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr ""
+
+#: ../../mod/admin.php:537
+msgid "Verify SSL"
+msgstr ""
+
+#: ../../mod/admin.php:537
+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:538
+msgid "Proxy user"
+msgstr ""
+
+#: ../../mod/admin.php:539
+msgid "Proxy URL"
+msgstr ""
+
+#: ../../mod/admin.php:540
+msgid "Network timeout"
+msgstr ""
+
+#: ../../mod/admin.php:540
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr ""
+
+#: ../../mod/admin.php:541
+msgid "Delivery interval"
+msgstr ""
+
+#: ../../mod/admin.php:541
+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:542
+msgid "Poll interval"
+msgstr ""
+
+#: ../../mod/admin.php:542
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr ""
+
+#: ../../mod/admin.php:543
+msgid "Maximum Load Average"
+msgstr ""
+
+#: ../../mod/admin.php:543
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr ""
+
+#: ../../mod/admin.php:545
+msgid "Use MySQL full text engine"
+msgstr ""
+
+#: ../../mod/admin.php:545
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr ""
+
+#: ../../mod/admin.php:546
+msgid "Path to item cache"
+msgstr ""
+
+#: ../../mod/admin.php:547
+msgid "Cache duration in seconds"
+msgstr ""
+
+#: ../../mod/admin.php:547
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One "
+"day)."
+msgstr ""
+
+#: ../../mod/admin.php:548
+msgid "Path for lock file"
+msgstr ""
+
+#: ../../mod/admin.php:549
+msgid "Temp path"
+msgstr ""
+
+#: ../../mod/admin.php:550
+msgid "Base path to installation"
+msgstr ""
+
+#: ../../mod/admin.php:567
+msgid "Update has been marked successful"
+msgstr ""
+
+#: ../../mod/admin.php:577
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr ""
+
+#: ../../mod/admin.php:580
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr ""
+
+#: ../../mod/admin.php:584
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr ""
+
+#: ../../mod/admin.php:587
+#, php-format
+msgid "Update function %s could not be found."
+msgstr ""
+
+#: ../../mod/admin.php:602
+msgid "No failed updates."
+msgstr ""
+
+#: ../../mod/admin.php:606
+msgid "Failed Updates"
+msgstr ""
+
+#: ../../mod/admin.php:607
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr ""
+
+#: ../../mod/admin.php:608
+msgid "Mark success (if update was manually applied)"
+msgstr ""
+
+#: ../../mod/admin.php:609
+msgid "Attempt to execute this update step automatically"
+msgstr ""
+
+#: ../../mod/admin.php:634
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/admin.php:641
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/admin.php:680
+#, php-format
+msgid "User '%s' deleted"
+msgstr ""
+
+#: ../../mod/admin.php:688
+#, php-format
+msgid "User '%s' unblocked"
+msgstr ""
+
+#: ../../mod/admin.php:688
+#, php-format
+msgid "User '%s' blocked"
+msgstr ""
+
+#: ../../mod/admin.php:764
+msgid "select all"
+msgstr ""
+
+#: ../../mod/admin.php:765
+msgid "User registrations waiting for confirm"
+msgstr ""
+
+#: ../../mod/admin.php:766
+msgid "Request date"
+msgstr ""
+
+#: ../../mod/admin.php:766 ../../mod/admin.php:777 ../../mod/settings.php:562
+#: ../../mod/settings.php:588 ../../mod/crepair.php:148
+msgid "Name"
+msgstr ""
+
+#: ../../mod/admin.php:767
+msgid "No registrations."
+msgstr ""
+
+#: ../../mod/admin.php:768 ../../mod/notifications.php:161
+#: ../../mod/notifications.php:208
+msgid "Approve"
+msgstr ""
+
+#: ../../mod/admin.php:769
+msgid "Deny"
+msgstr ""
+
+#: ../../mod/admin.php:771 ../../mod/contacts.php:353
+#: ../../mod/contacts.php:412
+msgid "Block"
+msgstr ""
+
+#: ../../mod/admin.php:772 ../../mod/contacts.php:353
+#: ../../mod/contacts.php:412
+msgid "Unblock"
+msgstr ""
+
+#: ../../mod/admin.php:773
+msgid "Site admin"
+msgstr ""
+
+#: ../../mod/admin.php:774
+msgid "Account expired"
+msgstr ""
+
+#: ../../mod/admin.php:777
+msgid "Register date"
+msgstr ""
+
+#: ../../mod/admin.php:777
+msgid "Last login"
+msgstr ""
+
+#: ../../mod/admin.php:777
+msgid "Last item"
+msgstr ""
+
+#: ../../mod/admin.php:777
+msgid "Account"
+msgstr ""
+
+#: ../../mod/admin.php:779
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../mod/admin.php:780
+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 ""
+
+#: ../../mod/admin.php:821
+#, php-format
+msgid "Plugin %s disabled."
+msgstr ""
+
+#: ../../mod/admin.php:825
+#, php-format
+msgid "Plugin %s enabled."
+msgstr ""
+
+#: ../../mod/admin.php:835 ../../mod/admin.php:1038
+msgid "Disable"
+msgstr ""
+
+#: ../../mod/admin.php:837 ../../mod/admin.php:1040
+msgid "Enable"
+msgstr ""
+
+#: ../../mod/admin.php:860 ../../mod/admin.php:1068
+msgid "Toggle"
+msgstr ""
+
+#: ../../mod/admin.php:868 ../../mod/admin.php:1078
+msgid "Author: "
+msgstr ""
+
+#: ../../mod/admin.php:869 ../../mod/admin.php:1079
+msgid "Maintainer: "
+msgstr ""
+
+#: ../../mod/admin.php:998
+msgid "No themes found."
+msgstr ""
+
+#: ../../mod/admin.php:1060
+msgid "Screenshot"
+msgstr ""
+
+#: ../../mod/admin.php:1106
+msgid "[Experimental]"
+msgstr ""
+
+#: ../../mod/admin.php:1107
+msgid "[Unsupported]"
+msgstr ""
+
+#: ../../mod/admin.php:1134
+msgid "Log settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:1190
+msgid "Clear"
+msgstr ""
+
+#: ../../mod/admin.php:1196
+msgid "Enable Debugging"
+msgstr ""
+
+#: ../../mod/admin.php:1197
+msgid "Log file"
+msgstr ""
+
+#: ../../mod/admin.php:1197
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr ""
+
+#: ../../mod/admin.php:1198
+msgid "Log level"
+msgstr ""
+
+#: ../../mod/admin.php:1247 ../../mod/contacts.php:409
+msgid "Update now"
+msgstr ""
+
+#: ../../mod/admin.php:1248
+msgid "Close"
+msgstr ""
+
+#: ../../mod/admin.php:1254
+msgid "FTP Host"
+msgstr ""
+
+#: ../../mod/admin.php:1255
+msgid "FTP Path"
+msgstr ""
+
+#: ../../mod/admin.php:1256
+msgid "FTP User"
+msgstr ""
+
+#: ../../mod/admin.php:1257
+msgid "FTP Password"
+msgstr ""
+
 #: ../../mod/item.php:105
 msgid "Unable to locate original post."
 msgstr ""
@@ -2834,10 +3631,6 @@ msgstr ""
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:261 ../../mod/admin.php:481
-msgid "Registration"
-msgstr ""
-
 #: ../../mod/register.php:269
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
@@ -3027,10 +3820,6 @@ msgstr ""
 msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/contacts.php:330
-msgid "Never"
-msgstr ""
-
 #: ../../mod/contacts.php:334
 msgid "(Update was successful)"
 msgstr ""
@@ -3052,16 +3841,6 @@ msgstr ""
 msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:353 ../../mod/contacts.php:412
-#: ../../mod/admin.php:760
-msgid "Unblock"
-msgstr ""
-
-#: ../../mod/contacts.php:353 ../../mod/contacts.php:412
-#: ../../mod/admin.php:759
-msgid "Block"
-msgstr ""
-
 #: ../../mod/contacts.php:356
 msgid "Toggle Blocked status"
 msgstr ""
@@ -3155,10 +3934,6 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:409 ../../mod/admin.php:1235
-msgid "Update now"
-msgstr ""
-
 #: ../../mod/contacts.php:416
 msgid "Currently blocked"
 msgstr ""
@@ -3358,11 +4133,6 @@ msgstr ""
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:562 ../../mod/settings.php:588
-#: ../../mod/admin.php:754 ../../mod/admin.php:765 ../../mod/crepair.php:148
-msgid "Name"
-msgstr ""
-
 #: ../../mod/settings.php:563 ../../mod/settings.php:589
 msgid "Consumer Key"
 msgstr ""
@@ -3511,10 +4281,6 @@ msgstr ""
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:769 ../../mod/admin.php:432
-msgid "No special theme for mobile devices"
-msgstr ""
-
 #: ../../mod/settings.php:809
 msgid "Display Settings"
 msgstr ""
@@ -3825,762 +4591,6 @@ msgstr ""
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/admin.php:55
-msgid "Theme settings updated."
-msgstr ""
-
-#: ../../mod/admin.php:96 ../../mod/admin.php:479
-msgid "Site"
-msgstr ""
-
-#: ../../mod/admin.php:97 ../../mod/admin.php:750 ../../mod/admin.php:764
-msgid "Users"
-msgstr ""
-
-#: ../../mod/admin.php:98 ../../mod/admin.php:847 ../../mod/admin.php:889
-msgid "Plugins"
-msgstr ""
-
-#: ../../mod/admin.php:99 ../../mod/admin.php:1055 ../../mod/admin.php:1089
-msgid "Themes"
-msgstr ""
-
-#: ../../mod/admin.php:100
-msgid "DB updates"
-msgstr ""
-
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1176
-msgid "Logs"
-msgstr ""
-
-#: ../../mod/admin.php:121
-msgid "Plugin Features"
-msgstr ""
-
-#: ../../mod/admin.php:123
-msgid "User registrations waiting for confirmation"
-msgstr ""
-
-#: ../../mod/admin.php:182 ../../mod/admin.php:721
-msgid "Normal Account"
-msgstr ""
-
-#: ../../mod/admin.php:183 ../../mod/admin.php:722
-msgid "Soapbox Account"
-msgstr ""
-
-#: ../../mod/admin.php:184 ../../mod/admin.php:723
-msgid "Community/Celebrity Account"
-msgstr ""
-
-#: ../../mod/admin.php:185 ../../mod/admin.php:724
-msgid "Automatic Friend Account"
-msgstr ""
-
-#: ../../mod/admin.php:186
-msgid "Blog Account"
-msgstr ""
-
-#: ../../mod/admin.php:187
-msgid "Private Forum"
-msgstr ""
-
-#: ../../mod/admin.php:206
-msgid "Message queues"
-msgstr ""
-
-#: ../../mod/admin.php:211 ../../mod/admin.php:478 ../../mod/admin.php:749
-#: ../../mod/admin.php:846 ../../mod/admin.php:888 ../../mod/admin.php:1054
-#: ../../mod/admin.php:1088 ../../mod/admin.php:1175
-msgid "Administration"
-msgstr ""
-
-#: ../../mod/admin.php:212
-msgid "Summary"
-msgstr ""
-
-#: ../../mod/admin.php:214
-msgid "Registered users"
-msgstr ""
-
-#: ../../mod/admin.php:216
-msgid "Pending registrations"
-msgstr ""
-
-#: ../../mod/admin.php:217
-msgid "Version"
-msgstr ""
-
-#: ../../mod/admin.php:219
-msgid "Active plugins"
-msgstr ""
-
-#: ../../mod/admin.php:403
-msgid "Site settings updated."
-msgstr ""
-
-#: ../../mod/admin.php:449
-msgid "Multi user instance"
-msgstr ""
-
-#: ../../mod/admin.php:465
-msgid "Closed"
-msgstr ""
-
-#: ../../mod/admin.php:466
-msgid "Requires approval"
-msgstr ""
-
-#: ../../mod/admin.php:467
-msgid "Open"
-msgstr ""
-
-#: ../../mod/admin.php:471
-msgid "No SSL policy, links will track page SSL state"
-msgstr ""
-
-#: ../../mod/admin.php:472
-msgid "Force all links to use SSL"
-msgstr ""
-
-#: ../../mod/admin.php:473
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
-msgstr ""
-
-#: ../../mod/admin.php:482
-msgid "File upload"
-msgstr ""
-
-#: ../../mod/admin.php:483
-msgid "Policies"
-msgstr ""
-
-#: ../../mod/admin.php:484
-msgid "Advanced"
-msgstr ""
-
-#: ../../mod/admin.php:485
-msgid "Performance"
-msgstr ""
-
-#: ../../mod/admin.php:489
-msgid "Site name"
-msgstr ""
-
-#: ../../mod/admin.php:490
-msgid "Banner/Logo"
-msgstr ""
-
-#: ../../mod/admin.php:491
-msgid "System language"
-msgstr ""
-
-#: ../../mod/admin.php:492
-msgid "System theme"
-msgstr ""
-
-#: ../../mod/admin.php:492
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr ""
-
-#: ../../mod/admin.php:493
-msgid "Mobile system theme"
-msgstr ""
-
-#: ../../mod/admin.php:493
-msgid "Theme for mobile devices"
-msgstr ""
-
-#: ../../mod/admin.php:494
-msgid "SSL link policy"
-msgstr ""
-
-#: ../../mod/admin.php:494
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr ""
-
-#: ../../mod/admin.php:495
-msgid "'Share' element"
-msgstr ""
-
-#: ../../mod/admin.php:495
-msgid "Activates the bbcode element 'share' for repeating items."
-msgstr ""
-
-#: ../../mod/admin.php:496
-msgid "Hide help entry from navigation menu"
-msgstr ""
-
-#: ../../mod/admin.php:496
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
-msgstr ""
-
-#: ../../mod/admin.php:497
-msgid "Single user instance"
-msgstr ""
-
-#: ../../mod/admin.php:497
-msgid "Make this instance multi-user or single-user for the named user"
-msgstr ""
-
-#: ../../mod/admin.php:498
-msgid "Maximum image size"
-msgstr ""
-
-#: ../../mod/admin.php:498
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr ""
-
-#: ../../mod/admin.php:499
-msgid "Maximum image length"
-msgstr ""
-
-#: ../../mod/admin.php:499
-msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
-msgstr ""
-
-#: ../../mod/admin.php:500
-msgid "JPEG image quality"
-msgstr ""
-
-#: ../../mod/admin.php:500
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
-msgstr ""
-
-#: ../../mod/admin.php:502
-msgid "Register policy"
-msgstr ""
-
-#: ../../mod/admin.php:503
-msgid "Maximum Daily Registrations"
-msgstr ""
-
-#: ../../mod/admin.php:503
-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:504
-msgid "Register text"
-msgstr ""
-
-#: ../../mod/admin.php:504
-msgid "Will be displayed prominently on the registration page."
-msgstr ""
-
-#: ../../mod/admin.php:505
-msgid "Accounts abandoned after x days"
-msgstr ""
-
-#: ../../mod/admin.php:505
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr ""
-
-#: ../../mod/admin.php:506
-msgid "Allowed friend domains"
-msgstr ""
-
-#: ../../mod/admin.php:506
-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:507
-msgid "Allowed email domains"
-msgstr ""
-
-#: ../../mod/admin.php:507
-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:508
-msgid "Block public"
-msgstr ""
-
-#: ../../mod/admin.php:508
-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:509
-msgid "Force publish"
-msgstr ""
-
-#: ../../mod/admin.php:509
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr ""
-
-#: ../../mod/admin.php:510
-msgid "Global directory update URL"
-msgstr ""
-
-#: ../../mod/admin.php:510
-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:511
-msgid "Allow threaded items"
-msgstr ""
-
-#: ../../mod/admin.php:511
-msgid "Allow infinite level threading for items on this site."
-msgstr ""
-
-#: ../../mod/admin.php:512
-msgid "Private posts by default for new users"
-msgstr ""
-
-#: ../../mod/admin.php:512
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
-msgstr ""
-
-#: ../../mod/admin.php:513
-msgid "Don't include post content in email notifications"
-msgstr ""
-
-#: ../../mod/admin.php:513
-msgid ""
-"Don't include the content of a post/comment/private message/etc. in the "
-"email notifications that are sent out from this site, as a privacy measure."
-msgstr ""
-
-#: ../../mod/admin.php:514
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr ""
-
-#: ../../mod/admin.php:514
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr ""
-
-#: ../../mod/admin.php:515
-msgid "Don't embed private images in posts"
-msgstr ""
-
-#: ../../mod/admin.php:515
-msgid ""
-"Don't replace locally-hosted private photos in posts with an embedded copy "
-"of the image. This means that contacts who receive posts containing private "
-"photos will have to authenticate and load each image, which may take a while."
-msgstr ""
-
-#: ../../mod/admin.php:517
-msgid "Block multiple registrations"
-msgstr ""
-
-#: ../../mod/admin.php:517
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr ""
-
-#: ../../mod/admin.php:518
-msgid "OpenID support"
-msgstr ""
-
-#: ../../mod/admin.php:518
-msgid "OpenID support for registration and logins."
-msgstr ""
-
-#: ../../mod/admin.php:519
-msgid "Fullname check"
-msgstr ""
-
-#: ../../mod/admin.php:519
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr ""
-
-#: ../../mod/admin.php:520
-msgid "UTF-8 Regular expressions"
-msgstr ""
-
-#: ../../mod/admin.php:520
-msgid "Use PHP UTF8 regular expressions"
-msgstr ""
-
-#: ../../mod/admin.php:521
-msgid "Show Community Page"
-msgstr ""
-
-#: ../../mod/admin.php:521
-msgid ""
-"Display a Community page showing all recent public postings on this site."
-msgstr ""
-
-#: ../../mod/admin.php:522
-msgid "Enable OStatus support"
-msgstr ""
-
-#: ../../mod/admin.php:522
-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:523
-msgid "Enable Diaspora support"
-msgstr ""
-
-#: ../../mod/admin.php:523
-msgid "Provide built-in Diaspora network compatibility."
-msgstr ""
-
-#: ../../mod/admin.php:524
-msgid "Only allow Friendica contacts"
-msgstr ""
-
-#: ../../mod/admin.php:524
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
-msgstr ""
-
-#: ../../mod/admin.php:525
-msgid "Verify SSL"
-msgstr ""
-
-#: ../../mod/admin.php:525
-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:526
-msgid "Proxy user"
-msgstr ""
-
-#: ../../mod/admin.php:527
-msgid "Proxy URL"
-msgstr ""
-
-#: ../../mod/admin.php:528
-msgid "Network timeout"
-msgstr ""
-
-#: ../../mod/admin.php:528
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr ""
-
-#: ../../mod/admin.php:529
-msgid "Delivery interval"
-msgstr ""
-
-#: ../../mod/admin.php:529
-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:530
-msgid "Poll interval"
-msgstr ""
-
-#: ../../mod/admin.php:530
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr ""
-
-#: ../../mod/admin.php:531
-msgid "Maximum Load Average"
-msgstr ""
-
-#: ../../mod/admin.php:531
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr ""
-
-#: ../../mod/admin.php:533
-msgid "Use MySQL full text engine"
-msgstr ""
-
-#: ../../mod/admin.php:533
-msgid ""
-"Activates the full text engine. Speeds up search - but can only search for "
-"four and more characters."
-msgstr ""
-
-#: ../../mod/admin.php:534
-msgid "Path to item cache"
-msgstr ""
-
-#: ../../mod/admin.php:535
-msgid "Cache duration in seconds"
-msgstr ""
-
-#: ../../mod/admin.php:535
-msgid ""
-"How long should the cache files be hold? Default value is 86400 seconds (One "
-"day)."
-msgstr ""
-
-#: ../../mod/admin.php:536
-msgid "Path for lock file"
-msgstr ""
-
-#: ../../mod/admin.php:537
-msgid "Temp path"
-msgstr ""
-
-#: ../../mod/admin.php:538
-msgid "Base path to installation"
-msgstr ""
-
-#: ../../mod/admin.php:555
-msgid "Update has been marked successful"
-msgstr ""
-
-#: ../../mod/admin.php:565
-#, php-format
-msgid "Executing %s failed. Check system logs."
-msgstr ""
-
-#: ../../mod/admin.php:568
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr ""
-
-#: ../../mod/admin.php:572
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr ""
-
-#: ../../mod/admin.php:575
-#, php-format
-msgid "Update function %s could not be found."
-msgstr ""
-
-#: ../../mod/admin.php:590
-msgid "No failed updates."
-msgstr ""
-
-#: ../../mod/admin.php:594
-msgid "Failed Updates"
-msgstr ""
-
-#: ../../mod/admin.php:595
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr ""
-
-#: ../../mod/admin.php:596
-msgid "Mark success (if update was manually applied)"
-msgstr ""
-
-#: ../../mod/admin.php:597
-msgid "Attempt to execute this update step automatically"
-msgstr ""
-
-#: ../../mod/admin.php:622
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/admin.php:629
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/admin.php:668
-#, php-format
-msgid "User '%s' deleted"
-msgstr ""
-
-#: ../../mod/admin.php:676
-#, php-format
-msgid "User '%s' unblocked"
-msgstr ""
-
-#: ../../mod/admin.php:676
-#, php-format
-msgid "User '%s' blocked"
-msgstr ""
-
-#: ../../mod/admin.php:752
-msgid "select all"
-msgstr ""
-
-#: ../../mod/admin.php:753
-msgid "User registrations waiting for confirm"
-msgstr ""
-
-#: ../../mod/admin.php:754
-msgid "Request date"
-msgstr ""
-
-#: ../../mod/admin.php:755
-msgid "No registrations."
-msgstr ""
-
-#: ../../mod/admin.php:756 ../../mod/notifications.php:161
-#: ../../mod/notifications.php:208
-msgid "Approve"
-msgstr ""
-
-#: ../../mod/admin.php:757
-msgid "Deny"
-msgstr ""
-
-#: ../../mod/admin.php:761
-msgid "Site admin"
-msgstr ""
-
-#: ../../mod/admin.php:762
-msgid "Account expired"
-msgstr ""
-
-#: ../../mod/admin.php:765
-msgid "Register date"
-msgstr ""
-
-#: ../../mod/admin.php:765
-msgid "Last login"
-msgstr ""
-
-#: ../../mod/admin.php:765
-msgid "Last item"
-msgstr ""
-
-#: ../../mod/admin.php:765
-msgid "Account"
-msgstr ""
-
-#: ../../mod/admin.php:767
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: ../../mod/admin.php:768
-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 ""
-
-#: ../../mod/admin.php:809
-#, php-format
-msgid "Plugin %s disabled."
-msgstr ""
-
-#: ../../mod/admin.php:813
-#, php-format
-msgid "Plugin %s enabled."
-msgstr ""
-
-#: ../../mod/admin.php:823 ../../mod/admin.php:1026
-msgid "Disable"
-msgstr ""
-
-#: ../../mod/admin.php:825 ../../mod/admin.php:1028
-msgid "Enable"
-msgstr ""
-
-#: ../../mod/admin.php:848 ../../mod/admin.php:1056
-msgid "Toggle"
-msgstr ""
-
-#: ../../mod/admin.php:856 ../../mod/admin.php:1066
-msgid "Author: "
-msgstr ""
-
-#: ../../mod/admin.php:857 ../../mod/admin.php:1067
-msgid "Maintainer: "
-msgstr ""
-
-#: ../../mod/admin.php:986
-msgid "No themes found."
-msgstr ""
-
-#: ../../mod/admin.php:1048
-msgid "Screenshot"
-msgstr ""
-
-#: ../../mod/admin.php:1094
-msgid "[Experimental]"
-msgstr ""
-
-#: ../../mod/admin.php:1095
-msgid "[Unsupported]"
-msgstr ""
-
-#: ../../mod/admin.php:1122
-msgid "Log settings updated."
-msgstr ""
-
-#: ../../mod/admin.php:1178
-msgid "Clear"
-msgstr ""
-
-#: ../../mod/admin.php:1184
-msgid "Enable Debugging"
-msgstr ""
-
-#: ../../mod/admin.php:1185
-msgid "Log file"
-msgstr ""
-
-#: ../../mod/admin.php:1185
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr ""
-
-#: ../../mod/admin.php:1186
-msgid "Log level"
-msgstr ""
-
-#: ../../mod/admin.php:1236
-msgid "Close"
-msgstr ""
-
-#: ../../mod/admin.php:1242
-msgid "FTP Host"
-msgstr ""
-
-#: ../../mod/admin.php:1243
-msgid "FTP Path"
-msgstr ""
-
-#: ../../mod/admin.php:1244
-msgid "FTP User"
-msgstr ""
-
-#: ../../mod/admin.php:1245
-msgid "FTP Password"
-msgstr ""
-
 #: ../../mod/share.php:44
 msgid "link"
 msgstr ""
@@ -5510,7 +5520,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:84 ../../boot.php:1072
+#: ../../mod/lostpass.php:84 ../../boot.php:1081
 msgid "Password Reset"
 msgstr ""
 
@@ -5896,7 +5906,7 @@ msgstr ""
 msgid "Home Notifications"
 msgstr ""
 
-#: ../../mod/photos.php:51 ../../boot.php:1878
+#: ../../mod/photos.php:51 ../../boot.php:1887
 msgid "Photo Albums"
 msgstr ""
 
@@ -6096,7 +6106,7 @@ msgstr ""
 
 #: ../../mod/photos.php:1551 ../../mod/photos.php:1595
 #: ../../mod/photos.php:1678 ../../mod/content.php:732
-#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:651
+#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:652
 msgid "Comment"
 msgstr ""
 
@@ -6289,7 +6299,7 @@ msgid ""
 "features and resources."
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:1246
+#: ../../mod/profile.php:21 ../../boot.php:1255
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -6932,128 +6942,128 @@ msgstr ""
 msgid "Textareas font size"
 msgstr ""
 
-#: ../../boot.php:650
+#: ../../index.php:405
+msgid "toggle mobile"
+msgstr ""
+
+#: ../../boot.php:651
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:653
+#: ../../boot.php:654
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:920
+#: ../../boot.php:929
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:922
+#: ../../boot.php:931
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1032
+#: ../../boot.php:1041
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:1060
+#: ../../boot.php:1069
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:1061
+#: ../../boot.php:1070
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:1062
+#: ../../boot.php:1071
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1065
+#: ../../boot.php:1074
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:1071
+#: ../../boot.php:1080
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1074
+#: ../../boot.php:1083
 msgid "Website Terms of Service"
 msgstr ""
 
-#: ../../boot.php:1075
+#: ../../boot.php:1084
 msgid "terms of service"
 msgstr ""
 
-#: ../../boot.php:1077
+#: ../../boot.php:1086
 msgid "Website Privacy Policy"
 msgstr ""
 
-#: ../../boot.php:1078
+#: ../../boot.php:1087
 msgid "privacy policy"
 msgstr ""
 
-#: ../../boot.php:1207
+#: ../../boot.php:1216
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1286 ../../boot.php:1390
+#: ../../boot.php:1295 ../../boot.php:1399
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1352
+#: ../../boot.php:1361
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1360
+#: ../../boot.php:1369
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../boot.php:1489 ../../boot.php:1575
+#: ../../boot.php:1498 ../../boot.php:1584
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1490 ../../boot.php:1576
+#: ../../boot.php:1499 ../../boot.php:1585
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1535 ../../boot.php:1616
+#: ../../boot.php:1544 ../../boot.php:1625
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1547
+#: ../../boot.php:1556
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1548
+#: ../../boot.php:1557
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1609
+#: ../../boot.php:1618
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1627
+#: ../../boot.php:1636
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1628
+#: ../../boot.php:1637
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1864
+#: ../../boot.php:1873
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1871
+#: ../../boot.php:1880
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1888
+#: ../../boot.php:1897
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1895
+#: ../../boot.php:1904
 msgid "Only You Can See This"
 msgstr ""
-
-#: ../../index.php:405
-msgid "toggle mobile"
-msgstr ""

From 2316e0d73128fd8b070004bd575b847879373384 Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Thu, 4 Apr 2013 16:42:39 -0600
Subject: [PATCH 09/67] update admin options for frost, frost mobile, and decaf
 mobile

---
 view/theme/decaf-mobile/admin_site.tpl         | 4 ++++
 view/theme/decaf-mobile/smarty3/admin_site.tpl | 4 ++++
 view/theme/frost-mobile/admin_site.tpl         | 4 ++++
 view/theme/frost-mobile/smarty3/admin_site.tpl | 4 ++++
 view/theme/frost/admin_site.tpl                | 4 +++-
 view/theme/frost/smarty3/admin_site.tpl        | 4 +++-
 6 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/view/theme/decaf-mobile/admin_site.tpl b/view/theme/decaf-mobile/admin_site.tpl
index 349c8e5a99..61f52b18dc 100644
--- a/view/theme/decaf-mobile/admin_site.tpl
+++ b/view/theme/decaf-mobile/admin_site.tpl
@@ -11,6 +11,9 @@
 	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} 
+	{{ inc field_select.tpl with $field=$singleuser }}{{ endinc }} 
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 	
@@ -36,6 +39,7 @@
 	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$ostatus_poll_interval }}{{ endinc }} 
 	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
diff --git a/view/theme/decaf-mobile/smarty3/admin_site.tpl b/view/theme/decaf-mobile/smarty3/admin_site.tpl
index 5856d9792e..035024e689 100644
--- a/view/theme/decaf-mobile/smarty3/admin_site.tpl
+++ b/view/theme/decaf-mobile/smarty3/admin_site.tpl
@@ -16,6 +16,9 @@
 	{{include file="field_select.tpl" field=$theme}}
 	{{include file="field_select.tpl" field=$theme_mobile}}
 	{{include file="field_select.tpl" field=$ssl_policy}}
+	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$hide_help}} 
+	{{include file="field_select.tpl" field=$singleuser}} 
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 	
@@ -41,6 +44,7 @@
 	{{include file="field_checkbox.tpl" field=$force_publish}}
 	{{include file="field_checkbox.tpl" field=$no_community_page}}
 	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
 	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
 	{{include file="field_checkbox.tpl" field=$dfrn_only}}
 	{{include file="field_input.tpl" field=$global_directory}}
diff --git a/view/theme/frost-mobile/admin_site.tpl b/view/theme/frost-mobile/admin_site.tpl
index 349c8e5a99..61f52b18dc 100644
--- a/view/theme/frost-mobile/admin_site.tpl
+++ b/view/theme/frost-mobile/admin_site.tpl
@@ -11,6 +11,9 @@
 	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} 
+	{{ inc field_select.tpl with $field=$singleuser }}{{ endinc }} 
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 	
@@ -36,6 +39,7 @@
 	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$ostatus_poll_interval }}{{ endinc }} 
 	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
diff --git a/view/theme/frost-mobile/smarty3/admin_site.tpl b/view/theme/frost-mobile/smarty3/admin_site.tpl
index 5856d9792e..035024e689 100644
--- a/view/theme/frost-mobile/smarty3/admin_site.tpl
+++ b/view/theme/frost-mobile/smarty3/admin_site.tpl
@@ -16,6 +16,9 @@
 	{{include file="field_select.tpl" field=$theme}}
 	{{include file="field_select.tpl" field=$theme_mobile}}
 	{{include file="field_select.tpl" field=$ssl_policy}}
+	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$hide_help}} 
+	{{include file="field_select.tpl" field=$singleuser}} 
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 	
@@ -41,6 +44,7 @@
 	{{include file="field_checkbox.tpl" field=$force_publish}}
 	{{include file="field_checkbox.tpl" field=$no_community_page}}
 	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
 	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
 	{{include file="field_checkbox.tpl" field=$dfrn_only}}
 	{{include file="field_input.tpl" field=$global_directory}}
diff --git a/view/theme/frost/admin_site.tpl b/view/theme/frost/admin_site.tpl
index 38cbdb3ce7..07a76a827d 100644
--- a/view/theme/frost/admin_site.tpl
+++ b/view/theme/frost/admin_site.tpl
@@ -12,7 +12,8 @@
 	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
-
+	{{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} 
+	{{ inc field_select.tpl with $field=$singleuser }}{{ endinc }}
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 	
@@ -38,6 +39,7 @@
 	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$ostatus_poll_interval }}{{ endinc }} 
 	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
diff --git a/view/theme/frost/smarty3/admin_site.tpl b/view/theme/frost/smarty3/admin_site.tpl
index 247972712b..af0eebacc6 100644
--- a/view/theme/frost/smarty3/admin_site.tpl
+++ b/view/theme/frost/smarty3/admin_site.tpl
@@ -17,7 +17,8 @@
 	{{include file="field_select.tpl" field=$theme_mobile}}
 	{{include file="field_select.tpl" field=$ssl_policy}}
 	{{include file="field_checkbox.tpl" field=$new_share}}
-
+	{{include file="field_checkbox.tpl" field=$hide_help}} 
+	{{include file="field_select.tpl" field=$singleuser}}
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 	
@@ -43,6 +44,7 @@
 	{{include file="field_checkbox.tpl" field=$force_publish}}
 	{{include file="field_checkbox.tpl" field=$no_community_page}}
 	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
 	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
 	{{include file="field_checkbox.tpl" field=$dfrn_only}}
 	{{include file="field_input.tpl" field=$global_directory}}

From 17ca6290f5347222ac6170ba7dd34a94ee91a02a Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 6 Apr 2013 08:25:33 +0200
Subject: [PATCH 10/67] DE: update to the strings

---
 view/de/messages.po | 2064 ++++++++++++++++++++++---------------------
 view/de/strings.php |  392 ++++----
 2 files changed, 1234 insertions(+), 1222 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index 649f79e10f..71bd11b1c3 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -25,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2013-04-03 00:02-0700\n"
-"PO-Revision-Date: 2013-04-04 15:25+0000\n"
+"POT-Creation-Date: 2013-04-04 00:02-0700\n"
+"PO-Revision-Date: 2013-04-06 06:22+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"
@@ -38,7 +38,7 @@ msgstr ""
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
 #: ../../include/nav.php:77 ../../mod/profperm.php:103
 #: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88
-#: ../../boot.php:1868
+#: ../../boot.php:1877
 msgid "Profile"
 msgstr "Profil"
 
@@ -47,7 +47,7 @@ msgid "Full Name:"
 msgstr "Kompletter Name:"
 
 #: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
-#: ../../boot.php:1408
+#: ../../boot.php:1417
 msgid "Gender:"
 msgstr "Geschlecht:"
 
@@ -68,7 +68,7 @@ msgid "Age:"
 msgstr "Alter:"
 
 #: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
-#: ../../boot.php:1411
+#: ../../boot.php:1420
 msgid "Status:"
 msgstr "Status:"
 
@@ -82,7 +82,7 @@ msgid "Sexual Preference:"
 msgstr "Sexuelle Vorlieben:"
 
 #: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
-#: ../../boot.php:1413
+#: ../../boot.php:1422
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -418,306 +418,306 @@ msgstr "Kontakt bearbeiten"
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
-#: ../../include/text.php:276
+#: ../../include/text.php:313
 msgid "prev"
 msgstr "vorige"
 
-#: ../../include/text.php:278
+#: ../../include/text.php:315
 msgid "first"
 msgstr "erste"
 
-#: ../../include/text.php:307
+#: ../../include/text.php:344
 msgid "last"
 msgstr "letzte"
 
-#: ../../include/text.php:310
+#: ../../include/text.php:347
 msgid "next"
 msgstr "nächste"
 
-#: ../../include/text.php:328
+#: ../../include/text.php:371
 msgid "newer"
 msgstr "neuer"
 
-#: ../../include/text.php:332
+#: ../../include/text.php:375
 msgid "older"
 msgstr "älter"
 
-#: ../../include/text.php:697
+#: ../../include/text.php:837
 msgid "No contacts"
 msgstr "Keine Kontakte"
 
-#: ../../include/text.php:706
+#: ../../include/text.php:846
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d Kontakt"
 msgstr[1] "%d Kontakte"
 
-#: ../../include/text.php:718 ../../mod/viewcontacts.php:76
+#: ../../include/text.php:858 ../../mod/viewcontacts.php:76
 msgid "View Contacts"
 msgstr "Kontakte anzeigen"
 
-#: ../../include/text.php:778 ../../include/text.php:779
+#: ../../include/text.php:935 ../../include/text.php:936
 #: ../../include/nav.php:118 ../../mod/search.php:99
 msgid "Search"
 msgstr "Suche"
 
-#: ../../include/text.php:781 ../../mod/notes.php:63 ../../mod/filer.php:31
+#: ../../include/text.php:938 ../../mod/notes.php:63 ../../mod/filer.php:31
 msgid "Save"
 msgstr "Speichern"
 
-#: ../../include/text.php:819
+#: ../../include/text.php:987
 msgid "poke"
 msgstr "anstupsen"
 
-#: ../../include/text.php:819 ../../include/conversation.php:211
+#: ../../include/text.php:987 ../../include/conversation.php:211
 msgid "poked"
 msgstr "stupste"
 
-#: ../../include/text.php:820
+#: ../../include/text.php:988
 msgid "ping"
 msgstr "anpingen"
 
-#: ../../include/text.php:820
+#: ../../include/text.php:988
 msgid "pinged"
 msgstr "pingte"
 
-#: ../../include/text.php:821
+#: ../../include/text.php:989
 msgid "prod"
 msgstr "knuffen"
 
-#: ../../include/text.php:821
+#: ../../include/text.php:989
 msgid "prodded"
 msgstr "knuffte"
 
-#: ../../include/text.php:822
+#: ../../include/text.php:990
 msgid "slap"
 msgstr "ohrfeigen"
 
-#: ../../include/text.php:822
+#: ../../include/text.php:990
 msgid "slapped"
 msgstr "ohrfeigte"
 
-#: ../../include/text.php:823
+#: ../../include/text.php:991
 msgid "finger"
 msgstr "befummeln"
 
-#: ../../include/text.php:823
+#: ../../include/text.php:991
 msgid "fingered"
 msgstr "befummelte"
 
-#: ../../include/text.php:824
+#: ../../include/text.php:992
 msgid "rebuff"
 msgstr "eine Abfuhr erteilen"
 
-#: ../../include/text.php:824
+#: ../../include/text.php:992
 msgid "rebuffed"
 msgstr "abfuhrerteilte"
 
-#: ../../include/text.php:836
+#: ../../include/text.php:1006
 msgid "happy"
 msgstr "glücklich"
 
-#: ../../include/text.php:837
+#: ../../include/text.php:1007
 msgid "sad"
 msgstr "traurig"
 
-#: ../../include/text.php:838
+#: ../../include/text.php:1008
 msgid "mellow"
 msgstr "sanft"
 
-#: ../../include/text.php:839
+#: ../../include/text.php:1009
 msgid "tired"
 msgstr "müde"
 
-#: ../../include/text.php:840
+#: ../../include/text.php:1010
 msgid "perky"
 msgstr "frech"
 
-#: ../../include/text.php:841
+#: ../../include/text.php:1011
 msgid "angry"
 msgstr "sauer"
 
-#: ../../include/text.php:842
+#: ../../include/text.php:1012
 msgid "stupified"
 msgstr "verblüfft"
 
-#: ../../include/text.php:843
+#: ../../include/text.php:1013
 msgid "puzzled"
 msgstr "verwirrt"
 
-#: ../../include/text.php:844
+#: ../../include/text.php:1014
 msgid "interested"
 msgstr "interessiert"
 
-#: ../../include/text.php:845
+#: ../../include/text.php:1015
 msgid "bitter"
 msgstr "verbittert"
 
-#: ../../include/text.php:846
+#: ../../include/text.php:1016
 msgid "cheerful"
 msgstr "fröhlich"
 
-#: ../../include/text.php:847
+#: ../../include/text.php:1017
 msgid "alive"
 msgstr "lebendig"
 
-#: ../../include/text.php:848
+#: ../../include/text.php:1018
 msgid "annoyed"
 msgstr "verärgert"
 
-#: ../../include/text.php:849
+#: ../../include/text.php:1019
 msgid "anxious"
 msgstr "unruhig"
 
-#: ../../include/text.php:850
+#: ../../include/text.php:1020
 msgid "cranky"
 msgstr "schrullig"
 
-#: ../../include/text.php:851
+#: ../../include/text.php:1021
 msgid "disturbed"
 msgstr "verstört"
 
-#: ../../include/text.php:852
+#: ../../include/text.php:1022
 msgid "frustrated"
 msgstr "frustriert"
 
-#: ../../include/text.php:853
+#: ../../include/text.php:1023
 msgid "motivated"
 msgstr "motiviert"
 
-#: ../../include/text.php:854
+#: ../../include/text.php:1024
 msgid "relaxed"
 msgstr "entspannt"
 
-#: ../../include/text.php:855
+#: ../../include/text.php:1025
 msgid "surprised"
 msgstr "überrascht"
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Monday"
 msgstr "Montag"
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:1191
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "January"
 msgstr "Januar"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "February"
 msgstr "Februar"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "March"
 msgstr "März"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "April"
 msgstr "April"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "May"
 msgstr "Mai"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "June"
 msgstr "Juni"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "July"
 msgstr "Juli"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "August"
 msgstr "August"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "September"
 msgstr "September"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "October"
 msgstr "Oktober"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "November"
 msgstr "November"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1195
 msgid "December"
 msgstr "Dezember"
 
-#: ../../include/text.php:1153
+#: ../../include/text.php:1352
 msgid "bytes"
 msgstr "Byte"
 
-#: ../../include/text.php:1180 ../../include/text.php:1192
+#: ../../include/text.php:1379 ../../include/text.php:1391
 msgid "Click to open/close"
 msgstr "Zum öffnen/schließen klicken"
 
-#: ../../include/text.php:1333 ../../mod/events.php:335
+#: ../../include/text.php:1553 ../../mod/events.php:335
 msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
-#: ../../include/text.php:1365 ../../include/user.php:237
+#: ../../include/text.php:1596 ../../include/user.php:237
 msgid "default"
 msgstr "Standard"
 
-#: ../../include/text.php:1377
+#: ../../include/text.php:1608
 msgid "Select an alternate language"
 msgstr "Alternative Sprache auswählen"
 
-#: ../../include/text.php:1583 ../../include/conversation.php:118
+#: ../../include/text.php:1860 ../../include/conversation.php:118
 #: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
 msgid "event"
 msgstr "Veranstaltung"
 
-#: ../../include/text.php:1585 ../../include/diaspora.php:1874
+#: ../../include/text.php:1862 ../../include/diaspora.php:1874
 #: ../../include/conversation.php:126 ../../include/conversation.php:254
 #: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
 #: ../../view/theme/diabook/theme.php:464
 msgid "photo"
 msgstr "Foto"
 
-#: ../../include/text.php:1587
+#: ../../include/text.php:1864
 msgid "activity"
 msgstr "Aktivität"
 
-#: ../../include/text.php:1589 ../../mod/content.php:628
+#: ../../include/text.php:1866 ../../mod/content.php:628
 #: ../../object/Item.php:364 ../../object/Item.php:377
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] "Kommentar"
 
-#: ../../include/text.php:1590
+#: ../../include/text.php:1867
 msgid "post"
 msgstr "Beitrag"
 
-#: ../../include/text.php:1745
+#: ../../include/text.php:2022
 msgid "Item filed"
 msgstr "Beitrag abgelegt"
 
@@ -808,7 +808,7 @@ msgid "Finishes:"
 msgstr "Endet:"
 
 #: ../../include/bb2diaspora.php:415 ../../include/event.php:40
-#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1406
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1415
 msgid "Location:"
 msgstr "Ort:"
 
@@ -973,19 +973,19 @@ msgstr "OK, wahrscheinlich harmlos"
 msgid "Reputable, has my trust"
 msgstr "Seriös, hat mein Vertrauen"
 
-#: ../../include/contact_selectors.php:56
+#: ../../include/contact_selectors.php:56 ../../mod/admin.php:452
 msgid "Frequently"
 msgstr "immer wieder"
 
-#: ../../include/contact_selectors.php:57
+#: ../../include/contact_selectors.php:57 ../../mod/admin.php:453
 msgid "Hourly"
 msgstr "Stündlich"
 
-#: ../../include/contact_selectors.php:58
+#: ../../include/contact_selectors.php:58 ../../mod/admin.php:454
 msgid "Twice daily"
 msgstr "Zweimal täglich"
 
-#: ../../include/contact_selectors.php:59
+#: ../../include/contact_selectors.php:59 ../../mod/admin.php:455
 msgid "Daily"
 msgstr "Täglich"
 
@@ -1010,8 +1010,8 @@ msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:79
-#: ../../include/contact_selectors.php:86 ../../mod/admin.php:754
-#: ../../mod/admin.php:765
+#: ../../include/contact_selectors.php:86 ../../mod/admin.php:766
+#: ../../mod/admin.php:777
 msgid "Email"
 msgstr "E-Mail"
 
@@ -1058,7 +1058,7 @@ msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "Beispiel: bob@example.com, http://example.com/barbara"
 
 #: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
-#: ../../mod/match.php:58 ../../boot.php:1338
+#: ../../mod/match.php:58 ../../boot.php:1347
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1135,7 +1135,7 @@ msgstr[0] "%d gemeinsamer Kontakt"
 msgstr[1] "%d gemeinsame Kontakte"
 
 #: ../../include/contact_widgets.php:204 ../../mod/content.php:629
-#: ../../object/Item.php:365 ../../boot.php:652
+#: ../../object/Item.php:365 ../../boot.php:653
 msgid "show more"
 msgstr "mehr anzeigen"
 
@@ -1162,6 +1162,95 @@ msgstr "$1 hat geschrieben:"
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
+#: ../../include/items.php:1791 ../../include/datetime.php:472
+#, php-format
+msgid "%s's birthday"
+msgstr "%ss Geburtstag"
+
+#: ../../include/items.php:1792 ../../include/datetime.php:473
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Herzlichen Glückwunsch %s"
+
+#: ../../include/items.php:3466 ../../mod/dfrn_request.php:716
+msgid "[Name Withheld]"
+msgstr "[Name unterdrückt]"
+
+#: ../../include/items.php:3473
+msgid "A new person is sharing with you at "
+msgstr "Eine neue Person teilt mit dir auf "
+
+#: ../../include/items.php:3473
+msgid "You have a new follower at "
+msgstr "Du hast einen neuen Kontakt auf "
+
+#: ../../include/items.php:3957 ../../mod/admin.php:158
+#: ../../mod/admin.php:809 ../../mod/admin.php:1009 ../../mod/viewsrc.php:15
+#: ../../mod/notice.php:15 ../../mod/display.php:51 ../../mod/display.php:213
+msgid "Item not found."
+msgstr "Beitrag nicht gefunden."
+
+#: ../../include/items.php:3996
+msgid "Do you really want to delete this item?"
+msgstr "Möchtest du wirklich dieses Item löschen?"
+
+#: ../../include/items.php:3998 ../../mod/profiles.php:606
+#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
+#: ../../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/dfrn_request.php:836
+#: ../../mod/suggest.php:29 ../../mod/message.php:209
+msgid "Yes"
+msgstr "Ja"
+
+#: ../../include/items.php:4001 ../../include/conversation.php:1080
+#: ../../mod/contacts.php:249 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../mod/dfrn_request.php:848
+#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
+#: ../../mod/photos.php:202 ../../mod/photos.php:290
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../../include/items.php:4121 ../../mod/profiles.php:146
+#: ../../mod/profiles.php:567 ../../mod/notes.php:20 ../../mod/nogroup.php:25
+#: ../../mod/item.php:140 ../../mod/item.php:156 ../../mod/allfriends.php:9
+#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/register.php:40
+#: ../../mod/regmod.php:118 ../../mod/attach.php:33 ../../mod/contacts.php:147
+#: ../../mod/settings.php:91 ../../mod/settings.php:542
+#: ../../mod/settings.php:547 ../../mod/crepair.php:115
+#: ../../mod/delegate.php:6 ../../mod/poke.php:135
+#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
+#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
+#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
+#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
+#: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
+#: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/manage.php:96
+#: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
+#: ../../mod/network.php:6 ../../mod/notifications.php:66
+#: ../../mod/photos.php:133 ../../mod/photos.php:1044
+#: ../../mod/display.php:209 ../../mod/install.php:151
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
+#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
+#: ../../index.php:346
+msgid "Permission denied."
+msgstr "Zugriff verweigert."
+
+#: ../../include/items.php:4191
+msgid "Archives"
+msgstr "Archiv"
+
+#: ../../include/network.php:875
+msgid "view full size"
+msgstr "Volle Größe anzeigen"
+
 #: ../../include/datetime.php:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
@@ -1235,16 +1324,6 @@ msgstr "Sekunden"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s her"
 
-#: ../../include/datetime.php:472 ../../include/items.php:1771
-#, php-format
-msgid "%s's birthday"
-msgstr "%ss Geburtstag"
-
-#: ../../include/datetime.php:473 ../../include/items.php:1772
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "Herzlichen Glückwunsch %s"
-
 #: ../../include/plugin.php:439 ../../include/plugin.php:441
 msgid "Click here to upgrade."
 msgstr "Zum Upgraden hier klicken."
@@ -1526,10 +1605,10 @@ msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../../include/conversation.php:588 ../../mod/settings.php:623
-#: ../../mod/admin.php:758 ../../mod/group.php:171 ../../mod/photos.php:1637
-#: ../../mod/content.php:462 ../../mod/content.php:764
-#: ../../object/Item.php:127
+#: ../../include/conversation.php:588 ../../mod/admin.php:770
+#: ../../mod/settings.php:623 ../../mod/group.php:171
+#: ../../mod/photos.php:1637 ../../mod/content.php:462
+#: ../../mod/content.php:764 ../../object/Item.php:127
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1756,16 +1835,6 @@ msgstr "Z.B.: bob@example.com, mary@example.com"
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../include/conversation.php:1080 ../../include/items.php:3981
-#: ../../mod/contacts.php:249 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/dfrn_request.php:848
-#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
-#: ../../mod/photos.php:202 ../../mod/photos.php:290
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #: ../../include/conversation.php:1086
 msgid "Post to Groups"
 msgstr "Poste an Gruppe"
@@ -1982,7 +2051,7 @@ msgstr "Keine Neuigkeiten."
 msgid "Clear notifications"
 msgstr "Bereinige Benachrichtigungen"
 
-#: ../../include/nav.php:73 ../../boot.php:1057
+#: ../../include/nav.php:73 ../../boot.php:1066
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -1990,7 +2059,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:76 ../../boot.php:1861
+#: ../../include/nav.php:76 ../../boot.php:1870
 msgid "Status"
 msgstr "Status"
 
@@ -2004,7 +2073,7 @@ msgid "Your profile page"
 msgstr "Deine Profilseite"
 
 #: ../../include/nav.php:78 ../../mod/fbrowser.php:25
-#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1875
+#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1884
 msgid "Photos"
 msgstr "Bilder"
 
@@ -2013,7 +2082,7 @@ msgid "Your photos"
 msgstr "Deine Fotos"
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1885
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1894
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -2029,7 +2098,7 @@ msgstr "Persönliche Notizen"
 msgid "Your personal photos"
 msgstr "Deine privaten Fotos"
 
-#: ../../include/nav.php:91 ../../boot.php:1058
+#: ../../include/nav.php:91 ../../boot.php:1067
 msgid "Login"
 msgstr "Anmeldung"
 
@@ -2046,7 +2115,7 @@ msgstr "Pinnwand"
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1033
+#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1042
 msgid "Register"
 msgstr "Registrieren"
 
@@ -2164,8 +2233,8 @@ msgstr "Delegierungen"
 msgid "Delegate Page Management"
 msgstr "Delegiere das Management für die Seite"
 
-#: ../../include/nav.php:167 ../../mod/settings.php:74 ../../mod/admin.php:849
-#: ../../mod/admin.php:1057 ../../mod/uexport.php:48
+#: ../../include/nav.php:167 ../../mod/admin.php:861 ../../mod/admin.php:1069
+#: ../../mod/settings.php:74 ../../mod/uexport.php:48
 #: ../../mod/newmember.php:22 ../../view/theme/diabook/theme.php:537
 #: ../../view/theme/diabook/theme.php:658
 msgid "Settings"
@@ -2175,7 +2244,7 @@ msgstr "Einstellungen"
 msgid "Account settings"
 msgstr "Kontoeinstellungen"
 
-#: ../../include/nav.php:169 ../../boot.php:1360
+#: ../../include/nav.php:169 ../../boot.php:1369
 msgid "Profiles"
 msgstr "Profile"
 
@@ -2208,10 +2277,6 @@ msgstr "Navigation"
 msgid "Site map"
 msgstr "Sitemap"
 
-#: ../../include/network.php:876
-msgid "view full size"
-msgstr "Volle Größe anzeigen"
-
 #: ../../include/oembed.php:138
 msgid "Embedded content"
 msgstr "Eingebetteter Inhalt"
@@ -2220,71 +2285,6 @@ msgstr "Eingebetteter Inhalt"
 msgid "Embedding disabled"
 msgstr "Einbettungen deaktiviert"
 
-#: ../../include/items.php:3446 ../../mod/dfrn_request.php:716
-msgid "[Name Withheld]"
-msgstr "[Name unterdrückt]"
-
-#: ../../include/items.php:3453
-msgid "A new person is sharing with you at "
-msgstr "Eine neue Person teilt mit dir auf "
-
-#: ../../include/items.php:3453
-msgid "You have a new follower at "
-msgstr "Du hast einen neuen Kontakt auf "
-
-#: ../../include/items.php:3937 ../../mod/admin.php:158
-#: ../../mod/admin.php:797 ../../mod/admin.php:997 ../../mod/viewsrc.php:15
-#: ../../mod/notice.php:15 ../../mod/display.php:51 ../../mod/display.php:213
-msgid "Item not found."
-msgstr "Beitrag nicht gefunden."
-
-#: ../../include/items.php:3976
-msgid "Do you really want to delete this item?"
-msgstr "Möchtest du wirklich dieses Item löschen?"
-
-#: ../../include/items.php:3978 ../../mod/profiles.php:606
-#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
-#: ../../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/dfrn_request.php:836
-#: ../../mod/suggest.php:29 ../../mod/message.php:209
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../include/items.php:4101 ../../mod/profiles.php:146
-#: ../../mod/profiles.php:567 ../../mod/notes.php:20 ../../mod/nogroup.php:25
-#: ../../mod/item.php:140 ../../mod/item.php:156 ../../mod/allfriends.php:9
-#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/register.php:40
-#: ../../mod/regmod.php:118 ../../mod/attach.php:33 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:542
-#: ../../mod/settings.php:547 ../../mod/crepair.php:115
-#: ../../mod/delegate.php:6 ../../mod/poke.php:135
-#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
-#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
-#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
-#: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
-#: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
-#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
-#: ../../mod/wallmessage.php:103 ../../mod/manage.php:96
-#: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
-#: ../../mod/network.php:6 ../../mod/notifications.php:66
-#: ../../mod/photos.php:133 ../../mod/photos.php:1044
-#: ../../mod/display.php:209 ../../mod/install.php:151
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
-#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
-#: ../../index.php:346
-msgid "Permission denied."
-msgstr "Zugriff verweigert."
-
-#: ../../include/items.php:4171
-msgid "Archives"
-msgstr "Archiv"
-
 #: ../../include/security.php:22
 msgid "Welcome "
 msgstr "Willkommen "
@@ -2427,11 +2427,11 @@ msgstr "Nein"
 msgid "Edit Profile Details"
 msgstr "Profil bearbeiten"
 
-#: ../../mod/profiles.php:626 ../../mod/contacts.php:386
-#: ../../mod/settings.php:560 ../../mod/settings.php:670
-#: ../../mod/settings.php:739 ../../mod/settings.php:811
-#: ../../mod/settings.php:1037 ../../mod/admin.php:480 ../../mod/admin.php:751
-#: ../../mod/admin.php:890 ../../mod/admin.php:1090 ../../mod/admin.php:1177
+#: ../../mod/profiles.php:626 ../../mod/admin.php:491 ../../mod/admin.php:763
+#: ../../mod/admin.php:902 ../../mod/admin.php:1102 ../../mod/admin.php:1189
+#: ../../mod/contacts.php:386 ../../mod/settings.php:560
+#: ../../mod/settings.php:670 ../../mod/settings.php:739
+#: ../../mod/settings.php:811 ../../mod/settings.php:1037
 #: ../../mod/crepair.php:166 ../../mod/poke.php:199 ../../mod/events.php:478
 #: ../../mod/fsuggest.php:107 ../../mod/group.php:87 ../../mod/invite.php:140
 #: ../../mod/localtime.php:45 ../../mod/manage.php:110
@@ -2607,23 +2607,23 @@ msgstr "Alter: "
 msgid "Edit/Manage Profiles"
 msgstr "Verwalte/Editiere Profile"
 
-#: ../../mod/profiles.php:722 ../../boot.php:1366 ../../boot.php:1392
+#: ../../mod/profiles.php:722 ../../boot.php:1375 ../../boot.php:1401
 msgid "Change profile photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:723 ../../boot.php:1367
+#: ../../mod/profiles.php:723 ../../boot.php:1376
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: ../../mod/profiles.php:734 ../../boot.php:1377
+#: ../../mod/profiles.php:734 ../../boot.php:1386
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: ../../mod/profiles.php:736 ../../boot.php:1380
+#: ../../mod/profiles.php:736 ../../boot.php:1389
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:737 ../../boot.php:1381
+#: ../../mod/profiles.php:737 ../../boot.php:1390
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
@@ -2651,7 +2651,7 @@ msgstr "Sichtbar für"
 msgid "All Contacts (with secure profile access)"
 msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
 
-#: ../../mod/notes.php:44 ../../boot.php:1892
+#: ../../mod/notes.php:44 ../../boot.php:1901
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
@@ -2714,6 +2714,804 @@ 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/admin.php:55
+msgid "Theme settings updated."
+msgstr "Themeneinstellungen aktualisiert."
+
+#: ../../mod/admin.php:96 ../../mod/admin.php:490
+msgid "Site"
+msgstr "Seite"
+
+#: ../../mod/admin.php:97 ../../mod/admin.php:762 ../../mod/admin.php:776
+msgid "Users"
+msgstr "Nutzer"
+
+#: ../../mod/admin.php:98 ../../mod/admin.php:859 ../../mod/admin.php:901
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../../mod/admin.php:99 ../../mod/admin.php:1067 ../../mod/admin.php:1101
+msgid "Themes"
+msgstr "Themen"
+
+#: ../../mod/admin.php:100
+msgid "DB updates"
+msgstr "DB Updates"
+
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1188
+msgid "Logs"
+msgstr "Protokolle"
+
+#: ../../mod/admin.php:121
+msgid "Plugin Features"
+msgstr "Plugin Features"
+
+#: ../../mod/admin.php:123
+msgid "User registrations waiting for confirmation"
+msgstr "Nutzeranmeldungen die auf Bestätigung warten"
+
+#: ../../mod/admin.php:182 ../../mod/admin.php:733
+msgid "Normal Account"
+msgstr "Normales Konto"
+
+#: ../../mod/admin.php:183 ../../mod/admin.php:734
+msgid "Soapbox Account"
+msgstr "Marktschreier-Konto"
+
+#: ../../mod/admin.php:184 ../../mod/admin.php:735
+msgid "Community/Celebrity Account"
+msgstr "Forum/Promi-Konto"
+
+#: ../../mod/admin.php:185 ../../mod/admin.php:736
+msgid "Automatic Friend Account"
+msgstr "Automatisches Freundekonto"
+
+#: ../../mod/admin.php:186
+msgid "Blog Account"
+msgstr "Blog Account"
+
+#: ../../mod/admin.php:187
+msgid "Private Forum"
+msgstr "Privates Forum"
+
+#: ../../mod/admin.php:206
+msgid "Message queues"
+msgstr "Nachrichten-Warteschlangen"
+
+#: ../../mod/admin.php:211 ../../mod/admin.php:489 ../../mod/admin.php:761
+#: ../../mod/admin.php:858 ../../mod/admin.php:900 ../../mod/admin.php:1066
+#: ../../mod/admin.php:1100 ../../mod/admin.php:1187
+msgid "Administration"
+msgstr "Administration"
+
+#: ../../mod/admin.php:212
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: ../../mod/admin.php:214
+msgid "Registered users"
+msgstr "Registrierte Nutzer"
+
+#: ../../mod/admin.php:216
+msgid "Pending registrations"
+msgstr "Anstehende Anmeldungen"
+
+#: ../../mod/admin.php:217
+msgid "Version"
+msgstr "Version"
+
+#: ../../mod/admin.php:219
+msgid "Active plugins"
+msgstr "Aktive Plugins"
+
+#: ../../mod/admin.php:405
+msgid "Site settings updated."
+msgstr "Seiteneinstellungen aktualisiert."
+
+#: ../../mod/admin.php:434 ../../mod/settings.php:769
+msgid "No special theme for mobile devices"
+msgstr "Kein spezielles Theme für mobile Geräte verwenden."
+
+#: ../../mod/admin.php:451 ../../mod/contacts.php:330
+msgid "Never"
+msgstr "Niemals"
+
+#: ../../mod/admin.php:460
+msgid "Multi user instance"
+msgstr "Mehrbenutzer Instanz"
+
+#: ../../mod/admin.php:476
+msgid "Closed"
+msgstr "Geschlossen"
+
+#: ../../mod/admin.php:477
+msgid "Requires approval"
+msgstr "Bedarf der Zustimmung"
+
+#: ../../mod/admin.php:478
+msgid "Open"
+msgstr "Offen"
+
+#: ../../mod/admin.php:482
+msgid "No SSL policy, links will track page SSL state"
+msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
+
+#: ../../mod/admin.php:483
+msgid "Force all links to use SSL"
+msgstr "SSL für alle Links erzwingen"
+
+#: ../../mod/admin.php:484
+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:492 ../../mod/register.php:261
+msgid "Registration"
+msgstr "Registrierung"
+
+#: ../../mod/admin.php:493
+msgid "File upload"
+msgstr "Datei hochladen"
+
+#: ../../mod/admin.php:494
+msgid "Policies"
+msgstr "Regeln"
+
+#: ../../mod/admin.php:495
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: ../../mod/admin.php:496
+msgid "Performance"
+msgstr "Performance"
+
+#: ../../mod/admin.php:500
+msgid "Site name"
+msgstr "Seitenname"
+
+#: ../../mod/admin.php:501
+msgid "Banner/Logo"
+msgstr "Banner/Logo"
+
+#: ../../mod/admin.php:502
+msgid "System language"
+msgstr "Systemsprache"
+
+#: ../../mod/admin.php:503
+msgid "System theme"
+msgstr "Systemweites Thema"
+
+#: ../../mod/admin.php:503
+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:504
+msgid "Mobile system theme"
+msgstr "Systemweites mobiles Thema"
+
+#: ../../mod/admin.php:504
+msgid "Theme for mobile devices"
+msgstr "Thema für mobile Geräte"
+
+#: ../../mod/admin.php:505
+msgid "SSL link policy"
+msgstr "Regeln für SSL Links"
+
+#: ../../mod/admin.php:505
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
+
+#: ../../mod/admin.php:506
+msgid "'Share' element"
+msgstr "'Teilen' Element"
+
+#: ../../mod/admin.php:506
+msgid "Activates the bbcode element 'share' for repeating items."
+msgstr "Aktiviert das bbcode Element 'Teilen' um Einträge zu wiederholen."
+
+#: ../../mod/admin.php:507
+msgid "Hide help entry from navigation menu"
+msgstr "Verberge den Menüeintrag für die Hilfe im Navigationsmenü"
+
+#: ../../mod/admin.php:507
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
+msgstr "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden."
+
+#: ../../mod/admin.php:508
+msgid "Single user instance"
+msgstr "Ein-Nutzer Instanz"
+
+#: ../../mod/admin.php:508
+msgid "Make this instance multi-user or single-user for the named user"
+msgstr "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt."
+
+#: ../../mod/admin.php:509
+msgid "Maximum image size"
+msgstr "Maximale Größe von Bildern"
+
+#: ../../mod/admin.php:509
+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:510
+msgid "Maximum image length"
+msgstr "Maximale Länge von Bildern"
+
+#: ../../mod/admin.php:510
+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:511
+msgid "JPEG image quality"
+msgstr "Qualität des JPEG Bildes"
+
+#: ../../mod/admin.php:511
+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:513
+msgid "Register policy"
+msgstr "Registrierungsmethode"
+
+#: ../../mod/admin.php:514
+msgid "Maximum Daily Registrations"
+msgstr "Maximum täglicher Neuanmeldungen"
+
+#: ../../mod/admin.php:514
+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:515
+msgid "Register text"
+msgstr "Registrierungstext"
+
+#: ../../mod/admin.php:515
+msgid "Will be displayed prominently on the registration page."
+msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt."
+
+#: ../../mod/admin.php:516
+msgid "Accounts abandoned after x days"
+msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt"
+
+#: ../../mod/admin.php:516
+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:517
+msgid "Allowed friend domains"
+msgstr "Erlaubte Domains für Kontakte"
+
+#: ../../mod/admin.php:517
+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:518
+msgid "Allowed email domains"
+msgstr "Erlaubte Domains für E-Mails"
+
+#: ../../mod/admin.php:518
+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:519
+msgid "Block public"
+msgstr "Öffentlichen Zugriff blockieren"
+
+#: ../../mod/admin.php:519
+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:520
+msgid "Force publish"
+msgstr "Erzwinge Veröffentlichung"
+
+#: ../../mod/admin.php:520
+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:521
+msgid "Global directory update URL"
+msgstr "URL für Updates beim weltweiten Verzeichnis"
+
+#: ../../mod/admin.php:521
+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:522
+msgid "Allow threaded items"
+msgstr "Erlaube Threads in Diskussionen"
+
+#: ../../mod/admin.php:522
+msgid "Allow infinite level threading for items on this site."
+msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite."
+
+#: ../../mod/admin.php:523
+msgid "Private posts by default for new users"
+msgstr "Private Beiträge als Standard für neue Nutzer"
+
+#: ../../mod/admin.php:523
+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:524
+msgid "Don't include post content in email notifications"
+msgstr "Inhalte von Beiträgen nicht in Email Benachrichtigungen versenden"
+
+#: ../../mod/admin.php:524
+msgid ""
+"Don't include the content of a post/comment/private message/etc. in the "
+"email notifications that are sent out from this site, as a privacy measure."
+msgstr "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz, nicht in Email-Benachrichtigungen einbinden."
+
+#: ../../mod/admin.php:525
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr "Öffentlichen Zugriff auf Addons im Apps Menü verbieten."
+
+#: ../../mod/admin.php:525
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt."
+
+#: ../../mod/admin.php:526
+msgid "Don't embed private images in posts"
+msgstr "Private Bilder nicht in Beiträgen einbetten."
+
+#: ../../mod/admin.php:526
+msgid ""
+"Don't replace locally-hosted private photos in posts with an embedded copy "
+"of the image. This means that contacts who receive posts containing private "
+"photos will have to authenticate and load each image, which may take a "
+"while."
+msgstr "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert."
+
+#: ../../mod/admin.php:528
+msgid "Block multiple registrations"
+msgstr "Unterbinde Mehrfachregistrierung"
+
+#: ../../mod/admin.php:528
+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:529
+msgid "OpenID support"
+msgstr "OpenID Unterstützung"
+
+#: ../../mod/admin.php:529
+msgid "OpenID support for registration and logins."
+msgstr "OpenID-Unterstützung für Registrierung und Login."
+
+#: ../../mod/admin.php:530
+msgid "Fullname check"
+msgstr "Namen auf Vollständigkeit überprüfen"
+
+#: ../../mod/admin.php:530
+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:531
+msgid "UTF-8 Regular expressions"
+msgstr "UTF-8 Reguläre Ausdrücke"
+
+#: ../../mod/admin.php:531
+msgid "Use PHP UTF8 regular expressions"
+msgstr "PHP UTF8 Ausdrücke verwenden"
+
+#: ../../mod/admin.php:532
+msgid "Show Community Page"
+msgstr "Gemeinschaftsseite anzeigen"
+
+#: ../../mod/admin.php:532
+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:533
+msgid "Enable OStatus support"
+msgstr "OStatus Unterstützung aktivieren"
+
+#: ../../mod/admin.php:533
+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:534
+msgid "OStatus conversation completion interval"
+msgstr "Intervall zum Vervollständigen von OStatus Unterhaltungen"
+
+#: ../../mod/admin.php:534
+msgid ""
+"How often shall the poller check for new entries in OStatus conversations? "
+"This can be a very ressource task."
+msgstr "Wie oft soll der Poller checken ob es neue Nachrichten in OStatus Unterhaltungen gibt die geladen werden müssen. Je nach Anzahl der OStatus Kontakte könnte dies ein sehr Ressourcen lastiger Job sein."
+
+#: ../../mod/admin.php:535
+msgid "Enable Diaspora support"
+msgstr "Diaspora-Support aktivieren"
+
+#: ../../mod/admin.php:535
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
+
+#: ../../mod/admin.php:536
+msgid "Only allow Friendica contacts"
+msgstr "Nur Friendica-Kontakte erlauben"
+
+#: ../../mod/admin.php:536
+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:537
+msgid "Verify SSL"
+msgstr "SSL Überprüfen"
+
+#: ../../mod/admin.php:537
+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:538
+msgid "Proxy user"
+msgstr "Proxy Nutzer"
+
+#: ../../mod/admin.php:539
+msgid "Proxy URL"
+msgstr "Proxy URL"
+
+#: ../../mod/admin.php:540
+msgid "Network timeout"
+msgstr "Netzwerk Wartezeit"
+
+#: ../../mod/admin.php:540
+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:541
+msgid "Delivery interval"
+msgstr "Zustellungsintervall"
+
+#: ../../mod/admin.php:541
+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:542
+msgid "Poll interval"
+msgstr "Abfrageintervall"
+
+#: ../../mod/admin.php:542
+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:543
+msgid "Maximum Load Average"
+msgstr "Maximum Load Average"
+
+#: ../../mod/admin.php:543
+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:545
+msgid "Use MySQL full text engine"
+msgstr "Nutze MySQL full text engine"
+
+#: ../../mod/admin.php:545
+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:546
+msgid "Path to item cache"
+msgstr "Pfad zum Eintrag Cache"
+
+#: ../../mod/admin.php:547
+msgid "Cache duration in seconds"
+msgstr "Cache-Dauer in Sekunden"
+
+#: ../../mod/admin.php:547
+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:548
+msgid "Path for lock file"
+msgstr "Pfad für die Sperrdatei"
+
+#: ../../mod/admin.php:549
+msgid "Temp path"
+msgstr "Temp Pfad"
+
+#: ../../mod/admin.php:550
+msgid "Base path to installation"
+msgstr "Basis-Pfad zur Installation"
+
+#: ../../mod/admin.php:567
+msgid "Update has been marked successful"
+msgstr "Update wurde als erfolgreich markiert"
+
+#: ../../mod/admin.php:577
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr "Ausführung von %s schlug fehl. Systemprotokolle prüfen."
+
+#: ../../mod/admin.php:580
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "Update %s war erfolgreich."
+
+#: ../../mod/admin.php:584
+#, 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:587
+#, php-format
+msgid "Update function %s could not be found."
+msgstr "Updatefunktion %s konnte nicht gefunden werden."
+
+#: ../../mod/admin.php:602
+msgid "No failed updates."
+msgstr "Keine fehlgeschlagenen Updates."
+
+#: ../../mod/admin.php:606
+msgid "Failed Updates"
+msgstr "Fehlgeschlagene Updates"
+
+#: ../../mod/admin.php:607
+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:608
+msgid "Mark success (if update was manually applied)"
+msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)"
+
+#: ../../mod/admin.php:609
+msgid "Attempt to execute this update step automatically"
+msgstr "Versuchen, diesen Schritt automatisch auszuführen"
+
+#: ../../mod/admin.php:634
+#, 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:641
+#, 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:680
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Nutzer '%s' gelöscht"
+
+#: ../../mod/admin.php:688
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "Nutzer '%s' entsperrt"
+
+#: ../../mod/admin.php:688
+#, php-format
+msgid "User '%s' blocked"
+msgstr "Nutzer '%s' gesperrt"
+
+#: ../../mod/admin.php:764
+msgid "select all"
+msgstr "Alle auswählen"
+
+#: ../../mod/admin.php:765
+msgid "User registrations waiting for confirm"
+msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
+
+#: ../../mod/admin.php:766
+msgid "Request date"
+msgstr "Anfragedatum"
+
+#: ../../mod/admin.php:766 ../../mod/admin.php:777 ../../mod/settings.php:562
+#: ../../mod/settings.php:588 ../../mod/crepair.php:148
+msgid "Name"
+msgstr "Name"
+
+#: ../../mod/admin.php:767
+msgid "No registrations."
+msgstr "Keine Neuanmeldungen."
+
+#: ../../mod/admin.php:768 ../../mod/notifications.php:161
+#: ../../mod/notifications.php:208
+msgid "Approve"
+msgstr "Genehmigen"
+
+#: ../../mod/admin.php:769
+msgid "Deny"
+msgstr "Verwehren"
+
+#: ../../mod/admin.php:771 ../../mod/contacts.php:353
+#: ../../mod/contacts.php:412
+msgid "Block"
+msgstr "Sperren"
+
+#: ../../mod/admin.php:772 ../../mod/contacts.php:353
+#: ../../mod/contacts.php:412
+msgid "Unblock"
+msgstr "Entsperren"
+
+#: ../../mod/admin.php:773
+msgid "Site admin"
+msgstr "Seitenadministrator"
+
+#: ../../mod/admin.php:774
+msgid "Account expired"
+msgstr "Account ist abgelaufen"
+
+#: ../../mod/admin.php:777
+msgid "Register date"
+msgstr "Anmeldedatum"
+
+#: ../../mod/admin.php:777
+msgid "Last login"
+msgstr "Letzte Anmeldung"
+
+#: ../../mod/admin.php:777
+msgid "Last item"
+msgstr "Letzter Beitrag"
+
+#: ../../mod/admin.php:777
+msgid "Account"
+msgstr "Nutzerkonto"
+
+#: ../../mod/admin.php:779
+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:780
+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:821
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Plugin %s deaktiviert."
+
+#: ../../mod/admin.php:825
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Plugin %s aktiviert."
+
+#: ../../mod/admin.php:835 ../../mod/admin.php:1038
+msgid "Disable"
+msgstr "Ausschalten"
+
+#: ../../mod/admin.php:837 ../../mod/admin.php:1040
+msgid "Enable"
+msgstr "Einschalten"
+
+#: ../../mod/admin.php:860 ../../mod/admin.php:1068
+msgid "Toggle"
+msgstr "Umschalten"
+
+#: ../../mod/admin.php:868 ../../mod/admin.php:1078
+msgid "Author: "
+msgstr "Autor:"
+
+#: ../../mod/admin.php:869 ../../mod/admin.php:1079
+msgid "Maintainer: "
+msgstr "Betreuer:"
+
+#: ../../mod/admin.php:998
+msgid "No themes found."
+msgstr "Keine Themen gefunden."
+
+#: ../../mod/admin.php:1060
+msgid "Screenshot"
+msgstr "Bildschirmfoto"
+
+#: ../../mod/admin.php:1106
+msgid "[Experimental]"
+msgstr "[Experimentell]"
+
+#: ../../mod/admin.php:1107
+msgid "[Unsupported]"
+msgstr "[Nicht unterstützt]"
+
+#: ../../mod/admin.php:1134
+msgid "Log settings updated."
+msgstr "Protokolleinstellungen aktualisiert."
+
+#: ../../mod/admin.php:1190
+msgid "Clear"
+msgstr "löschen"
+
+#: ../../mod/admin.php:1196
+msgid "Enable Debugging"
+msgstr "Protokoll führen"
+
+#: ../../mod/admin.php:1197
+msgid "Log file"
+msgstr "Protokolldatei"
+
+#: ../../mod/admin.php:1197
+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:1198
+msgid "Log level"
+msgstr "Protokoll-Level"
+
+#: ../../mod/admin.php:1247 ../../mod/contacts.php:409
+msgid "Update now"
+msgstr "Jetzt aktualisieren"
+
+#: ../../mod/admin.php:1248
+msgid "Close"
+msgstr "Schließen"
+
+#: ../../mod/admin.php:1254
+msgid "FTP Host"
+msgstr "FTP Host"
+
+#: ../../mod/admin.php:1255
+msgid "FTP Path"
+msgstr "FTP Pfad"
+
+#: ../../mod/admin.php:1256
+msgid "FTP User"
+msgstr "FTP Nutzername"
+
+#: ../../mod/admin.php:1257
+msgid "FTP Password"
+msgstr "FTP Passwort"
+
 #: ../../mod/item.php:105
 msgid "Unable to locate original post."
 msgstr "Konnte den Originalbeitrag nicht finden."
@@ -2853,10 +3651,6 @@ msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung mögli
 msgid "Your invitation ID: "
 msgstr "ID deiner Einladung: "
 
-#: ../../mod/register.php:261 ../../mod/admin.php:481
-msgid "Registration"
-msgstr "Registrierung"
-
 #: ../../mod/register.php:269
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Vollständiger Name (z.B. Max Mustermann): "
@@ -3046,10 +3840,6 @@ msgstr "%s teilt mit Dir"
 msgid "Private communications are not available for this contact."
 msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar."
 
-#: ../../mod/contacts.php:330
-msgid "Never"
-msgstr "Niemals"
-
 #: ../../mod/contacts.php:334
 msgid "(Update was successful)"
 msgstr "(Aktualisierung war erfolgreich)"
@@ -3071,16 +3861,6 @@ msgstr "Netzwerktyp: %s"
 msgid "View all contacts"
 msgstr "Alle Kontakte anzeigen"
 
-#: ../../mod/contacts.php:353 ../../mod/contacts.php:412
-#: ../../mod/admin.php:760
-msgid "Unblock"
-msgstr "Entsperren"
-
-#: ../../mod/contacts.php:353 ../../mod/contacts.php:412
-#: ../../mod/admin.php:759
-msgid "Block"
-msgstr "Sperren"
-
 #: ../../mod/contacts.php:356
 msgid "Toggle Blocked status"
 msgstr "Geblockt-Status ein-/ausschalten"
@@ -3174,10 +3954,6 @@ msgstr "letzte Aktualisierung:"
 msgid "Update public posts"
 msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/contacts.php:409 ../../mod/admin.php:1235
-msgid "Update now"
-msgstr "Jetzt aktualisieren"
-
 #: ../../mod/contacts.php:416
 msgid "Currently blocked"
 msgstr "Derzeit geblockt"
@@ -3377,11 +4153,6 @@ msgstr "Einstellungen aktualisiert."
 msgid "Add application"
 msgstr "Programm hinzufügen"
 
-#: ../../mod/settings.php:562 ../../mod/settings.php:588
-#: ../../mod/admin.php:754 ../../mod/admin.php:765 ../../mod/crepair.php:148
-msgid "Name"
-msgstr "Name"
-
 #: ../../mod/settings.php:563 ../../mod/settings.php:589
 msgid "Consumer Key"
 msgstr "Consumer Key"
@@ -3530,10 +4301,6 @@ msgstr "In einen Ordner verschieben"
 msgid "Move to folder:"
 msgstr "In diesen Ordner verschieben:"
 
-#: ../../mod/settings.php:769 ../../mod/admin.php:432
-msgid "No special theme for mobile devices"
-msgstr "Kein spezielles Theme für mobile Geräte verwenden."
-
 #: ../../mod/settings.php:809
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
@@ -3845,763 +4612,6 @@ msgstr "Erweiterte Konto-/Seitentyp-Einstellungen"
 msgid "Change the behaviour of this account for special situations"
 msgstr "Verhalten dieses Kontos in bestimmten Situationen:"
 
-#: ../../mod/admin.php:55
-msgid "Theme settings updated."
-msgstr "Themeneinstellungen aktualisiert."
-
-#: ../../mod/admin.php:96 ../../mod/admin.php:479
-msgid "Site"
-msgstr "Seite"
-
-#: ../../mod/admin.php:97 ../../mod/admin.php:750 ../../mod/admin.php:764
-msgid "Users"
-msgstr "Nutzer"
-
-#: ../../mod/admin.php:98 ../../mod/admin.php:847 ../../mod/admin.php:889
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../../mod/admin.php:99 ../../mod/admin.php:1055 ../../mod/admin.php:1089
-msgid "Themes"
-msgstr "Themen"
-
-#: ../../mod/admin.php:100
-msgid "DB updates"
-msgstr "DB Updates"
-
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1176
-msgid "Logs"
-msgstr "Protokolle"
-
-#: ../../mod/admin.php:121
-msgid "Plugin Features"
-msgstr "Plugin Features"
-
-#: ../../mod/admin.php:123
-msgid "User registrations waiting for confirmation"
-msgstr "Nutzeranmeldungen die auf Bestätigung warten"
-
-#: ../../mod/admin.php:182 ../../mod/admin.php:721
-msgid "Normal Account"
-msgstr "Normales Konto"
-
-#: ../../mod/admin.php:183 ../../mod/admin.php:722
-msgid "Soapbox Account"
-msgstr "Marktschreier-Konto"
-
-#: ../../mod/admin.php:184 ../../mod/admin.php:723
-msgid "Community/Celebrity Account"
-msgstr "Forum/Promi-Konto"
-
-#: ../../mod/admin.php:185 ../../mod/admin.php:724
-msgid "Automatic Friend Account"
-msgstr "Automatisches Freundekonto"
-
-#: ../../mod/admin.php:186
-msgid "Blog Account"
-msgstr "Blog Account"
-
-#: ../../mod/admin.php:187
-msgid "Private Forum"
-msgstr "Privates Forum"
-
-#: ../../mod/admin.php:206
-msgid "Message queues"
-msgstr "Nachrichten-Warteschlangen"
-
-#: ../../mod/admin.php:211 ../../mod/admin.php:478 ../../mod/admin.php:749
-#: ../../mod/admin.php:846 ../../mod/admin.php:888 ../../mod/admin.php:1054
-#: ../../mod/admin.php:1088 ../../mod/admin.php:1175
-msgid "Administration"
-msgstr "Administration"
-
-#: ../../mod/admin.php:212
-msgid "Summary"
-msgstr "Zusammenfassung"
-
-#: ../../mod/admin.php:214
-msgid "Registered users"
-msgstr "Registrierte Nutzer"
-
-#: ../../mod/admin.php:216
-msgid "Pending registrations"
-msgstr "Anstehende Anmeldungen"
-
-#: ../../mod/admin.php:217
-msgid "Version"
-msgstr "Version"
-
-#: ../../mod/admin.php:219
-msgid "Active plugins"
-msgstr "Aktive Plugins"
-
-#: ../../mod/admin.php:403
-msgid "Site settings updated."
-msgstr "Seiteneinstellungen aktualisiert."
-
-#: ../../mod/admin.php:449
-msgid "Multi user instance"
-msgstr "Mehrbenutzer Instanz"
-
-#: ../../mod/admin.php:465
-msgid "Closed"
-msgstr "Geschlossen"
-
-#: ../../mod/admin.php:466
-msgid "Requires approval"
-msgstr "Bedarf der Zustimmung"
-
-#: ../../mod/admin.php:467
-msgid "Open"
-msgstr "Offen"
-
-#: ../../mod/admin.php:471
-msgid "No SSL policy, links will track page SSL state"
-msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
-
-#: ../../mod/admin.php:472
-msgid "Force all links to use SSL"
-msgstr "SSL für alle Links erzwingen"
-
-#: ../../mod/admin.php:473
-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:482
-msgid "File upload"
-msgstr "Datei hochladen"
-
-#: ../../mod/admin.php:483
-msgid "Policies"
-msgstr "Regeln"
-
-#: ../../mod/admin.php:484
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: ../../mod/admin.php:485
-msgid "Performance"
-msgstr "Performance"
-
-#: ../../mod/admin.php:489
-msgid "Site name"
-msgstr "Seitenname"
-
-#: ../../mod/admin.php:490
-msgid "Banner/Logo"
-msgstr "Banner/Logo"
-
-#: ../../mod/admin.php:491
-msgid "System language"
-msgstr "Systemsprache"
-
-#: ../../mod/admin.php:492
-msgid "System theme"
-msgstr "Systemweites Thema"
-
-#: ../../mod/admin.php:492
-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:493
-msgid "Mobile system theme"
-msgstr "Systemweites mobiles Thema"
-
-#: ../../mod/admin.php:493
-msgid "Theme for mobile devices"
-msgstr "Thema für mobile Geräte"
-
-#: ../../mod/admin.php:494
-msgid "SSL link policy"
-msgstr "Regeln für SSL Links"
-
-#: ../../mod/admin.php:494
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
-
-#: ../../mod/admin.php:495
-msgid "'Share' element"
-msgstr "'Teilen' Element"
-
-#: ../../mod/admin.php:495
-msgid "Activates the bbcode element 'share' for repeating items."
-msgstr "Aktiviert das bbcode Element 'Teilen' um Einträge zu wiederholen."
-
-#: ../../mod/admin.php:496
-msgid "Hide help entry from navigation menu"
-msgstr "Verberge den Menüeintrag für die Hilfe im Navigationsmenü"
-
-#: ../../mod/admin.php:496
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
-msgstr "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden."
-
-#: ../../mod/admin.php:497
-msgid "Single user instance"
-msgstr "Ein-Nutzer Instanz"
-
-#: ../../mod/admin.php:497
-msgid "Make this instance multi-user or single-user for the named user"
-msgstr "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt."
-
-#: ../../mod/admin.php:498
-msgid "Maximum image size"
-msgstr "Maximale Größe von Bildern"
-
-#: ../../mod/admin.php:498
-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:499
-msgid "Maximum image length"
-msgstr "Maximale Länge von Bildern"
-
-#: ../../mod/admin.php:499
-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:500
-msgid "JPEG image quality"
-msgstr "Qualität des JPEG Bildes"
-
-#: ../../mod/admin.php:500
-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:502
-msgid "Register policy"
-msgstr "Registrierungsmethode"
-
-#: ../../mod/admin.php:503
-msgid "Maximum Daily Registrations"
-msgstr "Maximum täglicher Neuanmeldungen"
-
-#: ../../mod/admin.php:503
-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:504
-msgid "Register text"
-msgstr "Registrierungstext"
-
-#: ../../mod/admin.php:504
-msgid "Will be displayed prominently on the registration page."
-msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt."
-
-#: ../../mod/admin.php:505
-msgid "Accounts abandoned after x days"
-msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt"
-
-#: ../../mod/admin.php:505
-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:506
-msgid "Allowed friend domains"
-msgstr "Erlaubte Domains für Kontakte"
-
-#: ../../mod/admin.php:506
-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:507
-msgid "Allowed email domains"
-msgstr "Erlaubte Domains für E-Mails"
-
-#: ../../mod/admin.php:507
-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:508
-msgid "Block public"
-msgstr "Öffentlichen Zugriff blockieren"
-
-#: ../../mod/admin.php:508
-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:509
-msgid "Force publish"
-msgstr "Erzwinge Veröffentlichung"
-
-#: ../../mod/admin.php:509
-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:510
-msgid "Global directory update URL"
-msgstr "URL für Updates beim weltweiten Verzeichnis"
-
-#: ../../mod/admin.php:510
-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:511
-msgid "Allow threaded items"
-msgstr "Erlaube Threads in Diskussionen"
-
-#: ../../mod/admin.php:511
-msgid "Allow infinite level threading for items on this site."
-msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite."
-
-#: ../../mod/admin.php:512
-msgid "Private posts by default for new users"
-msgstr "Private Beiträge als Standard für neue Nutzer"
-
-#: ../../mod/admin.php:512
-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:513
-msgid "Don't include post content in email notifications"
-msgstr "Inhalte von Beiträgen nicht in Email Benachrichtigungen versenden"
-
-#: ../../mod/admin.php:513
-msgid ""
-"Don't include the content of a post/comment/private message/etc. in the "
-"email notifications that are sent out from this site, as a privacy measure."
-msgstr "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz, nicht in Email-Benachrichtigungen einbinden."
-
-#: ../../mod/admin.php:514
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr "Öffentlichen Zugriff auf Addons im Apps Menü verbieten."
-
-#: ../../mod/admin.php:514
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt."
-
-#: ../../mod/admin.php:515
-msgid "Don't embed private images in posts"
-msgstr "Private Bilder nicht in Beiträgen einbetten."
-
-#: ../../mod/admin.php:515
-msgid ""
-"Don't replace locally-hosted private photos in posts with an embedded copy "
-"of the image. This means that contacts who receive posts containing private "
-"photos will have to authenticate and load each image, which may take a "
-"while."
-msgstr "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert."
-
-#: ../../mod/admin.php:517
-msgid "Block multiple registrations"
-msgstr "Unterbinde Mehrfachregistrierung"
-
-#: ../../mod/admin.php:517
-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:518
-msgid "OpenID support"
-msgstr "OpenID Unterstützung"
-
-#: ../../mod/admin.php:518
-msgid "OpenID support for registration and logins."
-msgstr "OpenID-Unterstützung für Registrierung und Login."
-
-#: ../../mod/admin.php:519
-msgid "Fullname check"
-msgstr "Namen auf Vollständigkeit überprüfen"
-
-#: ../../mod/admin.php:519
-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:520
-msgid "UTF-8 Regular expressions"
-msgstr "UTF-8 Reguläre Ausdrücke"
-
-#: ../../mod/admin.php:520
-msgid "Use PHP UTF8 regular expressions"
-msgstr "PHP UTF8 Ausdrücke verwenden"
-
-#: ../../mod/admin.php:521
-msgid "Show Community Page"
-msgstr "Gemeinschaftsseite anzeigen"
-
-#: ../../mod/admin.php:521
-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:522
-msgid "Enable OStatus support"
-msgstr "OStatus Unterstützung aktivieren"
-
-#: ../../mod/admin.php:522
-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:523
-msgid "Enable Diaspora support"
-msgstr "Diaspora-Support aktivieren"
-
-#: ../../mod/admin.php:523
-msgid "Provide built-in Diaspora network compatibility."
-msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
-
-#: ../../mod/admin.php:524
-msgid "Only allow Friendica contacts"
-msgstr "Nur Friendica-Kontakte erlauben"
-
-#: ../../mod/admin.php:524
-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:525
-msgid "Verify SSL"
-msgstr "SSL Überprüfen"
-
-#: ../../mod/admin.php:525
-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:526
-msgid "Proxy user"
-msgstr "Proxy Nutzer"
-
-#: ../../mod/admin.php:527
-msgid "Proxy URL"
-msgstr "Proxy URL"
-
-#: ../../mod/admin.php:528
-msgid "Network timeout"
-msgstr "Netzwerk Wartezeit"
-
-#: ../../mod/admin.php:528
-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:529
-msgid "Delivery interval"
-msgstr "Zustellungsintervall"
-
-#: ../../mod/admin.php:529
-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:530
-msgid "Poll interval"
-msgstr "Abfrageintervall"
-
-#: ../../mod/admin.php:530
-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:531
-msgid "Maximum Load Average"
-msgstr "Maximum Load Average"
-
-#: ../../mod/admin.php:531
-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:533
-msgid "Use MySQL full text engine"
-msgstr "Nutze MySQL full text engine"
-
-#: ../../mod/admin.php:533
-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:534
-msgid "Path to item cache"
-msgstr "Pfad zum Eintrag Cache"
-
-#: ../../mod/admin.php:535
-msgid "Cache duration in seconds"
-msgstr "Cache-Dauer in Sekunden"
-
-#: ../../mod/admin.php:535
-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:536
-msgid "Path for lock file"
-msgstr "Pfad für die Sperrdatei"
-
-#: ../../mod/admin.php:537
-msgid "Temp path"
-msgstr "Temp Pfad"
-
-#: ../../mod/admin.php:538
-msgid "Base path to installation"
-msgstr "Basis-Pfad zur Installation"
-
-#: ../../mod/admin.php:555
-msgid "Update has been marked successful"
-msgstr "Update wurde als erfolgreich markiert"
-
-#: ../../mod/admin.php:565
-#, php-format
-msgid "Executing %s failed. Check system logs."
-msgstr "Ausführung von %s schlug fehl. Systemprotokolle prüfen."
-
-#: ../../mod/admin.php:568
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "Update %s war erfolgreich."
-
-#: ../../mod/admin.php:572
-#, 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:575
-#, php-format
-msgid "Update function %s could not be found."
-msgstr "Updatefunktion %s konnte nicht gefunden werden."
-
-#: ../../mod/admin.php:590
-msgid "No failed updates."
-msgstr "Keine fehlgeschlagenen Updates."
-
-#: ../../mod/admin.php:594
-msgid "Failed Updates"
-msgstr "Fehlgeschlagene Updates"
-
-#: ../../mod/admin.php:595
-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:596
-msgid "Mark success (if update was manually applied)"
-msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)"
-
-#: ../../mod/admin.php:597
-msgid "Attempt to execute this update step automatically"
-msgstr "Versuchen, diesen Schritt automatisch auszuführen"
-
-#: ../../mod/admin.php:622
-#, 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:629
-#, 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:668
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Nutzer '%s' gelöscht"
-
-#: ../../mod/admin.php:676
-#, php-format
-msgid "User '%s' unblocked"
-msgstr "Nutzer '%s' entsperrt"
-
-#: ../../mod/admin.php:676
-#, php-format
-msgid "User '%s' blocked"
-msgstr "Nutzer '%s' gesperrt"
-
-#: ../../mod/admin.php:752
-msgid "select all"
-msgstr "Alle auswählen"
-
-#: ../../mod/admin.php:753
-msgid "User registrations waiting for confirm"
-msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
-
-#: ../../mod/admin.php:754
-msgid "Request date"
-msgstr "Anfragedatum"
-
-#: ../../mod/admin.php:755
-msgid "No registrations."
-msgstr "Keine Neuanmeldungen."
-
-#: ../../mod/admin.php:756 ../../mod/notifications.php:161
-#: ../../mod/notifications.php:208
-msgid "Approve"
-msgstr "Genehmigen"
-
-#: ../../mod/admin.php:757
-msgid "Deny"
-msgstr "Verwehren"
-
-#: ../../mod/admin.php:761
-msgid "Site admin"
-msgstr "Seitenadministrator"
-
-#: ../../mod/admin.php:762
-msgid "Account expired"
-msgstr "Account ist abgelaufen"
-
-#: ../../mod/admin.php:765
-msgid "Register date"
-msgstr "Anmeldedatum"
-
-#: ../../mod/admin.php:765
-msgid "Last login"
-msgstr "Letzte Anmeldung"
-
-#: ../../mod/admin.php:765
-msgid "Last item"
-msgstr "Letzter Beitrag"
-
-#: ../../mod/admin.php:765
-msgid "Account"
-msgstr "Nutzerkonto"
-
-#: ../../mod/admin.php:767
-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:768
-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:809
-#, php-format
-msgid "Plugin %s disabled."
-msgstr "Plugin %s deaktiviert."
-
-#: ../../mod/admin.php:813
-#, php-format
-msgid "Plugin %s enabled."
-msgstr "Plugin %s aktiviert."
-
-#: ../../mod/admin.php:823 ../../mod/admin.php:1026
-msgid "Disable"
-msgstr "Ausschalten"
-
-#: ../../mod/admin.php:825 ../../mod/admin.php:1028
-msgid "Enable"
-msgstr "Einschalten"
-
-#: ../../mod/admin.php:848 ../../mod/admin.php:1056
-msgid "Toggle"
-msgstr "Umschalten"
-
-#: ../../mod/admin.php:856 ../../mod/admin.php:1066
-msgid "Author: "
-msgstr "Autor:"
-
-#: ../../mod/admin.php:857 ../../mod/admin.php:1067
-msgid "Maintainer: "
-msgstr "Betreuer:"
-
-#: ../../mod/admin.php:986
-msgid "No themes found."
-msgstr "Keine Themen gefunden."
-
-#: ../../mod/admin.php:1048
-msgid "Screenshot"
-msgstr "Bildschirmfoto"
-
-#: ../../mod/admin.php:1094
-msgid "[Experimental]"
-msgstr "[Experimentell]"
-
-#: ../../mod/admin.php:1095
-msgid "[Unsupported]"
-msgstr "[Nicht unterstützt]"
-
-#: ../../mod/admin.php:1122
-msgid "Log settings updated."
-msgstr "Protokolleinstellungen aktualisiert."
-
-#: ../../mod/admin.php:1178
-msgid "Clear"
-msgstr "löschen"
-
-#: ../../mod/admin.php:1184
-msgid "Enable Debugging"
-msgstr "Protokoll führen"
-
-#: ../../mod/admin.php:1185
-msgid "Log file"
-msgstr "Protokolldatei"
-
-#: ../../mod/admin.php:1185
-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:1186
-msgid "Log level"
-msgstr "Protokoll-Level"
-
-#: ../../mod/admin.php:1236
-msgid "Close"
-msgstr "Schließen"
-
-#: ../../mod/admin.php:1242
-msgid "FTP Host"
-msgstr "FTP Host"
-
-#: ../../mod/admin.php:1243
-msgid "FTP Path"
-msgstr "FTP Pfad"
-
-#: ../../mod/admin.php:1244
-msgid "FTP User"
-msgstr "FTP Nutzername"
-
-#: ../../mod/admin.php:1245
-msgid "FTP Password"
-msgstr "FTP Passwort"
-
 #: ../../mod/share.php:44
 msgid "link"
 msgstr "Link"
@@ -5531,7 +5541,7 @@ msgid ""
 "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:84 ../../boot.php:1072
+#: ../../mod/lostpass.php:84 ../../boot.php:1081
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
@@ -5917,7 +5927,7 @@ msgstr "Keine weiteren Pinnwand-Benachrichtigungen"
 msgid "Home Notifications"
 msgstr "Pinnwand Benachrichtigungen"
 
-#: ../../mod/photos.php:51 ../../boot.php:1878
+#: ../../mod/photos.php:51 ../../boot.php:1887
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
@@ -6118,7 +6128,7 @@ msgstr "Das bist du"
 
 #: ../../mod/photos.php:1551 ../../mod/photos.php:1595
 #: ../../mod/photos.php:1678 ../../mod/content.php:732
-#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:651
+#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:652
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -6311,7 +6321,7 @@ msgid ""
 " features and resources."
 msgstr "Unsere <strong>Hilfe</strong> Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten."
 
-#: ../../mod/profile.php:21 ../../boot.php:1246
+#: ../../mod/profile.php:21 ../../boot.php:1255
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
@@ -6955,128 +6965,128 @@ msgstr "Schriftgröße in Beiträgen"
 msgid "Textareas font size"
 msgstr "Schriftgröße in Eingabefeldern"
 
-#: ../../boot.php:650
+#: ../../index.php:405
+msgid "toggle mobile"
+msgstr "auf/von Mobile Ansicht wechseln"
+
+#: ../../boot.php:651
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: ../../boot.php:653
+#: ../../boot.php:654
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: ../../boot.php:920
+#: ../../boot.php:929
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
 
-#: ../../boot.php:922
+#: ../../boot.php:931
 #, php-format
 msgid "Update Error at %s"
 msgstr "Updatefehler bei %s"
 
-#: ../../boot.php:1032
+#: ../../boot.php:1041
 msgid "Create a New Account"
 msgstr "Neues Konto erstellen"
 
-#: ../../boot.php:1060
+#: ../../boot.php:1069
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder E-Mail-Adresse: "
 
-#: ../../boot.php:1061
+#: ../../boot.php:1070
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:1062
+#: ../../boot.php:1071
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: ../../boot.php:1065
+#: ../../boot.php:1074
 msgid "Or login using OpenID: "
 msgstr "Oder melde dich mit deiner OpenID an: "
 
-#: ../../boot.php:1071
+#: ../../boot.php:1080
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:1074
+#: ../../boot.php:1083
 msgid "Website Terms of Service"
 msgstr "Website Nutzungsbedingungen"
 
-#: ../../boot.php:1075
+#: ../../boot.php:1084
 msgid "terms of service"
 msgstr "Nutzungsbedingungen"
 
-#: ../../boot.php:1077
+#: ../../boot.php:1086
 msgid "Website Privacy Policy"
 msgstr "Website Datenschutzerklärung"
 
-#: ../../boot.php:1078
+#: ../../boot.php:1087
 msgid "privacy policy"
 msgstr "Datenschutzerklärung"
 
-#: ../../boot.php:1207
+#: ../../boot.php:1216
 msgid "Requested account is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../boot.php:1286 ../../boot.php:1390
+#: ../../boot.php:1295 ../../boot.php:1399
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: ../../boot.php:1352
+#: ../../boot.php:1361
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../boot.php:1360
+#: ../../boot.php:1369
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
 
-#: ../../boot.php:1489 ../../boot.php:1575
+#: ../../boot.php:1498 ../../boot.php:1584
 msgid "g A l F d"
 msgstr "l, d. F G \\U\\h\\r"
 
-#: ../../boot.php:1490 ../../boot.php:1576
+#: ../../boot.php:1499 ../../boot.php:1585
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1535 ../../boot.php:1616
+#: ../../boot.php:1544 ../../boot.php:1625
 msgid "[today]"
 msgstr "[heute]"
 
-#: ../../boot.php:1547
+#: ../../boot.php:1556
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:1548
+#: ../../boot.php:1557
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:1609
+#: ../../boot.php:1618
 msgid "[No description]"
 msgstr "[keine Beschreibung]"
 
-#: ../../boot.php:1627
+#: ../../boot.php:1636
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: ../../boot.php:1628
+#: ../../boot.php:1637
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1864
+#: ../../boot.php:1873
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:1871
+#: ../../boot.php:1880
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1888
+#: ../../boot.php:1897
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1895
+#: ../../boot.php:1904
 msgid "Only You Can See This"
 msgstr "Nur du kannst das sehen"
-
-#: ../../index.php:405
-msgid "toggle mobile"
-msgstr "auf/von Mobile Ansicht wechseln"
diff --git a/view/de/strings.php b/view/de/strings.php
index e5e5e57dee..18742d20df 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -285,6 +285,18 @@ $a->strings["Image/photo"] = "Bild/Foto";
 $a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "<span><a href=\"%s\" target=\"external-link\">%s</a> schrieb den folgenden <a href=\"%s\" target=\"external-link\">Beitrag</a>";
 $a->strings["$1 wrote:"] = "$1 hat geschrieben:";
 $a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
+$a->strings["%s's birthday"] = "%ss Geburtstag";
+$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
+$a->strings["[Name Withheld]"] = "[Name unterdrückt]";
+$a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf ";
+$a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
+$a->strings["Item not found."] = "Beitrag nicht gefunden.";
+$a->strings["Do you really want to delete this item?"] = "Möchtest du wirklich dieses Item löschen?";
+$a->strings["Yes"] = "Ja";
+$a->strings["Cancel"] = "Abbrechen";
+$a->strings["Permission denied."] = "Zugriff verweigert.";
+$a->strings["Archives"] = "Archiv";
+$a->strings["view full size"] = "Volle Größe anzeigen";
 $a->strings["Miscellaneous"] = "Verschiedenes";
 $a->strings["year"] = "Jahr";
 $a->strings["month"] = "Monat";
@@ -303,8 +315,6 @@ $a->strings["minutes"] = "Minuten";
 $a->strings["second"] = "Sekunde";
 $a->strings["seconds"] = "Sekunden";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s her";
-$a->strings["%s's birthday"] = "%ss Geburtstag";
-$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
 $a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken.";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze deines Abonnements.";
 $a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in deinem Abonnement nicht verfügbar.";
@@ -420,7 +430,6 @@ $a->strings["CC: email addresses"] = "Cc: E-Mail-Addressen";
 $a->strings["Public post"] = "Öffentlicher Beitrag";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com";
 $a->strings["Preview"] = "Vorschau";
-$a->strings["Cancel"] = "Abbrechen";
 $a->strings["Post to Groups"] = "Poste an Gruppe";
 $a->strings["Post to Contacts"] = "Poste an Kontakte";
 $a->strings["Private post"] = "Privater Beitrag";
@@ -520,17 +529,8 @@ $a->strings["Admin"] = "Administration";
 $a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration";
 $a->strings["Navigation"] = "Navigation";
 $a->strings["Site map"] = "Sitemap";
-$a->strings["view full size"] = "Volle Größe anzeigen";
 $a->strings["Embedded content"] = "Eingebetteter Inhalt";
 $a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
-$a->strings["[Name Withheld]"] = "[Name unterdrückt]";
-$a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf ";
-$a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
-$a->strings["Item not found."] = "Beitrag nicht gefunden.";
-$a->strings["Do you really want to delete this item?"] = "Möchtest du wirklich dieses Item löschen?";
-$a->strings["Yes"] = "Ja";
-$a->strings["Permission denied."] = "Zugriff verweigert.";
-$a->strings["Archives"] = "Archiv";
 $a->strings["Welcome "] = "Willkommen ";
 $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
 $a->strings["Welcome back "] = "Willkommen zurück ";
@@ -628,6 +628,190 @@ $a->strings["{0} is now friends with %s"] = "{0} ist jetzt mit %s befreundet";
 $a->strings["{0} posted"] = "{0} hat etwas veröffentlicht";
 $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen";
 $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt";
+$a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert.";
+$a->strings["Site"] = "Seite";
+$a->strings["Users"] = "Nutzer";
+$a->strings["Plugins"] = "Plugins";
+$a->strings["Themes"] = "Themen";
+$a->strings["DB updates"] = "DB Updates";
+$a->strings["Logs"] = "Protokolle";
+$a->strings["Plugin Features"] = "Plugin Features";
+$a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten";
+$a->strings["Normal Account"] = "Normales Konto";
+$a->strings["Soapbox Account"] = "Marktschreier-Konto";
+$a->strings["Community/Celebrity Account"] = "Forum/Promi-Konto";
+$a->strings["Automatic Friend Account"] = "Automatisches Freundekonto";
+$a->strings["Blog Account"] = "Blog Account";
+$a->strings["Private Forum"] = "Privates Forum";
+$a->strings["Message queues"] = "Nachrichten-Warteschlangen";
+$a->strings["Administration"] = "Administration";
+$a->strings["Summary"] = "Zusammenfassung";
+$a->strings["Registered users"] = "Registrierte Nutzer";
+$a->strings["Pending registrations"] = "Anstehende Anmeldungen";
+$a->strings["Version"] = "Version";
+$a->strings["Active plugins"] = "Aktive Plugins";
+$a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert.";
+$a->strings["No special theme for mobile devices"] = "Kein spezielles Theme für mobile Geräte verwenden.";
+$a->strings["Never"] = "Niemals";
+$a->strings["Multi user instance"] = "Mehrbenutzer Instanz";
+$a->strings["Closed"] = "Geschlossen";
+$a->strings["Requires approval"] = "Bedarf der Zustimmung";
+$a->strings["Open"] = "Offen";
+$a->strings["No SSL policy, links will track page SSL state"] = "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten";
+$a->strings["Force all links to use SSL"] = "SSL für alle Links erzwingen";
+$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)";
+$a->strings["Registration"] = "Registrierung";
+$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";
+$a->strings["System theme"] = "Systemweites Thema";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>";
+$a->strings["Mobile system theme"] = "Systemweites mobiles Thema";
+$a->strings["Theme for mobile devices"] = "Thema für mobile Geräte";
+$a->strings["SSL link policy"] = "Regeln für SSL Links";
+$a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen";
+$a->strings["'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["Hide help entry from navigation menu"] = "Verberge den Menüeintrag für die Hilfe im Navigationsmenü";
+$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden.";
+$a->strings["Single user instance"] = "Ein-Nutzer Instanz";
+$a->strings["Make this instance multi-user or single-user for the named user"] = "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt.";
+$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";
+$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet.";
+$a->strings["JPEG image quality"] = "Qualität des JPEG Bildes";
+$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust.";
+$a->strings["Register policy"] = "Registrierungsmethode";
+$a->strings["Maximum Daily Registrations"] = "Maximum täglicher Neuanmeldungen";
+$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."] = "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.";
+$a->strings["Register text"] = "Registrierungstext";
+$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungsseite angezeigt.";
+$a->strings["Accounts abandoned after x days"] = "Nutzerkonten gelten nach x Tagen als unbenutzt";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit.";
+$a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
+$a->strings["Allowed email domains"] = "Erlaubte Domains für E-Mails";
+$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
+$a->strings["Block public"] = "Öffentlichen Zugriff blockieren";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist.";
+$a->strings["Force publish"] = "Erzwinge Veröffentlichung";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen.";
+$a->strings["Global directory update URL"] = "URL für Updates beim weltweiten Verzeichnis";
+$a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar.";
+$a->strings["Allow threaded items"] = "Erlaube Threads in Diskussionen";
+$a->strings["Allow infinite level threading for items on this site."] = "Erlaube ein unendliches Level für Threads auf dieser Seite.";
+$a->strings["Private posts by default for new users"] = "Private Beiträge als Standard für neue Nutzer";
+$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen.";
+$a->strings["Don't include post content in email notifications"] = "Inhalte von Beiträgen nicht in Email Benachrichtigungen versenden";
+$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz, nicht in Email-Benachrichtigungen einbinden.";
+$a->strings["Disallow public access to addons listed in the apps menu."] = "Öffentlichen Zugriff auf Addons im Apps Menü verbieten.";
+$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt.";
+$a->strings["Don't embed private images in posts"] = "Private Bilder nicht in Beiträgen einbetten.";
+$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert.";
+$a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
+$a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen.";
+$a->strings["OpenID support"] = "OpenID Unterstützung";
+$a->strings["OpenID support for registration and logins."] = "OpenID-Unterstützung für Registrierung und Login.";
+$a->strings["Fullname check"] = "Namen auf Vollständigkeit überprüfen";
+$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden.";
+$a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
+$a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden";
+$a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen";
+$a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server.";
+$a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren";
+$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "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.";
+$a->strings["OStatus conversation completion interval"] = "Intervall zum Vervollständigen von OStatus Unterhaltungen";
+$a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "Wie oft soll der Poller checken ob es neue Nachrichten in OStatus Unterhaltungen gibt die geladen werden müssen. Je nach Anzahl der OStatus Kontakte könnte dies ein sehr Ressourcen lastiger Job sein.";
+$a->strings["Enable Diaspora support"] = "Diaspora-Support aktivieren";
+$a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die eingebaute Diaspora-Verknüpfung.";
+$a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben";
+$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert.";
+$a->strings["Verify SSL"] = "SSL Überprüfen";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann.";
+$a->strings["Proxy user"] = "Proxy Nutzer";
+$a->strings["Proxy URL"] = "Proxy URL";
+$a->strings["Network timeout"] = "Netzwerk Wartezeit";
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen).";
+$a->strings["Delivery interval"] = "Zustellungsintervall";
+$a->strings["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."] = "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.";
+$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.";
+$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s hat keinen Status zurückgegeben. Unbekannter Status.";
+$a->strings["Update function %s could not be found."] = "Updatefunktion %s konnte nicht gefunden werden.";
+$a->strings["No failed updates."] = "Keine fehlgeschlagenen Updates.";
+$a->strings["Failed Updates"] = "Fehlgeschlagene Updates";
+$a->strings["This does not include updates prior to 1139, which did not return a status."] = "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben.";
+$a->strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (falls das Update manuell installiert wurde)";
+$a->strings["Attempt to execute this update step automatically"] = "Versuchen, diesen Schritt automatisch auszuführen";
+$a->strings["%s user blocked/unblocked"] = array(
+	0 => "%s Benutzer geblockt/freigegeben",
+	1 => "%s Benutzer geblockt/freigegeben",
+);
+$a->strings["%s user deleted"] = array(
+	0 => "%s Nutzer gelöscht",
+	1 => "%s Nutzer gelöscht",
+);
+$a->strings["User '%s' deleted"] = "Nutzer '%s' gelöscht";
+$a->strings["User '%s' unblocked"] = "Nutzer '%s' entsperrt";
+$a->strings["User '%s' blocked"] = "Nutzer '%s' gesperrt";
+$a->strings["select all"] = "Alle auswählen";
+$a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf deine Bestätigung warten";
+$a->strings["Request date"] = "Anfragedatum";
+$a->strings["Name"] = "Name";
+$a->strings["No registrations."] = "Keine Neuanmeldungen.";
+$a->strings["Approve"] = "Genehmigen";
+$a->strings["Deny"] = "Verwehren";
+$a->strings["Block"] = "Sperren";
+$a->strings["Unblock"] = "Entsperren";
+$a->strings["Site admin"] = "Seitenadministrator";
+$a->strings["Account expired"] = "Account ist abgelaufen";
+$a->strings["Register date"] = "Anmeldedatum";
+$a->strings["Last login"] = "Letzte Anmeldung";
+$a->strings["Last item"] = "Letzter Beitrag";
+$a->strings["Account"] = "Nutzerkonto";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "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?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "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?";
+$a->strings["Plugin %s disabled."] = "Plugin %s deaktiviert.";
+$a->strings["Plugin %s enabled."] = "Plugin %s aktiviert.";
+$a->strings["Disable"] = "Ausschalten";
+$a->strings["Enable"] = "Einschalten";
+$a->strings["Toggle"] = "Umschalten";
+$a->strings["Author: "] = "Autor:";
+$a->strings["Maintainer: "] = "Betreuer:";
+$a->strings["No themes found."] = "Keine Themen gefunden.";
+$a->strings["Screenshot"] = "Bildschirmfoto";
+$a->strings["[Experimental]"] = "[Experimentell]";
+$a->strings["[Unsupported]"] = "[Nicht unterstützt]";
+$a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert.";
+$a->strings["Clear"] = "löschen";
+$a->strings["Enable Debugging"] = "Protokoll führen";
+$a->strings["Log file"] = "Protokolldatei";
+$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis.";
+$a->strings["Log level"] = "Protokoll-Level";
+$a->strings["Update now"] = "Jetzt aktualisieren";
+$a->strings["Close"] = "Schließen";
+$a->strings["FTP Host"] = "FTP Host";
+$a->strings["FTP Path"] = "FTP Pfad";
+$a->strings["FTP User"] = "FTP Nutzername";
+$a->strings["FTP Password"] = "FTP Passwort";
 $a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden.";
 $a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen.";
 $a->strings["System error. Post not saved."] = "Systemfehler. Beitrag konnte nicht gespeichert werden.";
@@ -657,7 +841,6 @@ $a->strings["Your OpenID (optional): "] = "Deine OpenID (optional): ";
 $a->strings["Include your profile in member directory?"] = "Soll dein Profil im Nutzerverzeichnis angezeigt werden?";
 $a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
 $a->strings["Your invitation ID: "] = "ID deiner Einladung: ";
-$a->strings["Registration"] = "Registrierung";
 $a->strings["Your Full Name (e.g. Joe Smith): "] = "Vollständiger Name (z.B. Max Mustermann): ";
 $a->strings["Your Email Address: "] = "Deine E-Mail-Adresse: ";
 $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@\$sitename</strong>' sein.";
@@ -703,14 +886,11 @@ $a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige
 $a->strings["You are sharing with %s"] = "Du teilst mit %s";
 $a->strings["%s is sharing with you"] = "%s teilt mit Dir";
 $a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar.";
-$a->strings["Never"] = "Niemals";
 $a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)";
 $a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)";
 $a->strings["Suggest friends"] = "Kontakte vorschlagen";
 $a->strings["Network type: %s"] = "Netzwerktyp: %s";
 $a->strings["View all contacts"] = "Alle Kontakte anzeigen";
-$a->strings["Unblock"] = "Entsperren";
-$a->strings["Block"] = "Sperren";
 $a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
 $a->strings["Unignore"] = "Ignorieren aufheben";
 $a->strings["Ignore"] = "Ignorieren";
@@ -733,7 +913,6 @@ $a->strings["View conversations"] = "Unterhaltungen anzeigen";
 $a->strings["Delete contact"] = "Lösche den Kontakt";
 $a->strings["Last update:"] = "letzte Aktualisierung:";
 $a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
-$a->strings["Update now"] = "Jetzt aktualisieren";
 $a->strings["Currently blocked"] = "Derzeit geblockt";
 $a->strings["Currently ignored"] = "Derzeit ignoriert";
 $a->strings["Currently archived"] = "Momentan archiviert";
@@ -783,7 +962,6 @@ $a->strings["Private forum has no privacy permissions. Using default privacy gro
 $a->strings["Private forum has no privacy permissions and no default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte.";
 $a->strings["Settings updated."] = "Einstellungen aktualisiert.";
 $a->strings["Add application"] = "Programm hinzufügen";
-$a->strings["Name"] = "Name";
 $a->strings["Consumer Key"] = "Consumer Key";
 $a->strings["Consumer Secret"] = "Consumer Secret";
 $a->strings["Redirect"] = "Umleiten";
@@ -820,7 +998,6 @@ $a->strings["Action after import:"] = "Aktion nach Import:";
 $a->strings["Mark as seen"] = "Als gelesen markieren";
 $a->strings["Move to folder"] = "In einen Ordner verschieben";
 $a->strings["Move to folder:"] = "In diesen Ordner verschieben:";
-$a->strings["No special theme for mobile devices"] = "Kein spezielles Theme für mobile Geräte verwenden.";
 $a->strings["Display Settings"] = "Anzeige-Einstellungen";
 $a->strings["Display Theme:"] = "Theme:";
 $a->strings["Mobile Theme:"] = "Mobiles Theme";
@@ -898,181 +1075,6 @@ $a->strings["You are tagged in a post"] = "– du in einem Beitrag erwähnt wirs
 $a->strings["You are poked/prodded/etc. in a post"] = "– du von jemandem angestupst oder sonstwie behandelt wirst";
 $a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Konto-/Seitentyp-Einstellungen";
 $a->strings["Change the behaviour of this account for special situations"] = "Verhalten dieses Kontos in bestimmten Situationen:";
-$a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert.";
-$a->strings["Site"] = "Seite";
-$a->strings["Users"] = "Nutzer";
-$a->strings["Plugins"] = "Plugins";
-$a->strings["Themes"] = "Themen";
-$a->strings["DB updates"] = "DB Updates";
-$a->strings["Logs"] = "Protokolle";
-$a->strings["Plugin Features"] = "Plugin Features";
-$a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten";
-$a->strings["Normal Account"] = "Normales Konto";
-$a->strings["Soapbox Account"] = "Marktschreier-Konto";
-$a->strings["Community/Celebrity Account"] = "Forum/Promi-Konto";
-$a->strings["Automatic Friend Account"] = "Automatisches Freundekonto";
-$a->strings["Blog Account"] = "Blog Account";
-$a->strings["Private Forum"] = "Privates Forum";
-$a->strings["Message queues"] = "Nachrichten-Warteschlangen";
-$a->strings["Administration"] = "Administration";
-$a->strings["Summary"] = "Zusammenfassung";
-$a->strings["Registered users"] = "Registrierte Nutzer";
-$a->strings["Pending registrations"] = "Anstehende Anmeldungen";
-$a->strings["Version"] = "Version";
-$a->strings["Active plugins"] = "Aktive Plugins";
-$a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert.";
-$a->strings["Multi user instance"] = "Mehrbenutzer Instanz";
-$a->strings["Closed"] = "Geschlossen";
-$a->strings["Requires approval"] = "Bedarf der Zustimmung";
-$a->strings["Open"] = "Offen";
-$a->strings["No SSL policy, links will track page SSL state"] = "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten";
-$a->strings["Force all links to use SSL"] = "SSL für alle Links erzwingen";
-$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)";
-$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";
-$a->strings["System theme"] = "Systemweites Thema";
-$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>";
-$a->strings["Mobile system theme"] = "Systemweites mobiles Thema";
-$a->strings["Theme for mobile devices"] = "Thema für mobile Geräte";
-$a->strings["SSL link policy"] = "Regeln für SSL Links";
-$a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen";
-$a->strings["'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["Hide help entry from navigation menu"] = "Verberge den Menüeintrag für die Hilfe im Navigationsmenü";
-$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden.";
-$a->strings["Single user instance"] = "Ein-Nutzer Instanz";
-$a->strings["Make this instance multi-user or single-user for the named user"] = "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt.";
-$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";
-$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet.";
-$a->strings["JPEG image quality"] = "Qualität des JPEG Bildes";
-$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust.";
-$a->strings["Register policy"] = "Registrierungsmethode";
-$a->strings["Maximum Daily Registrations"] = "Maximum täglicher Neuanmeldungen";
-$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."] = "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.";
-$a->strings["Register text"] = "Registrierungstext";
-$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungsseite angezeigt.";
-$a->strings["Accounts abandoned after x days"] = "Nutzerkonten gelten nach x Tagen als unbenutzt";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit.";
-$a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
-$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
-$a->strings["Allowed email domains"] = "Erlaubte Domains für E-Mails";
-$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
-$a->strings["Block public"] = "Öffentlichen Zugriff blockieren";
-$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist.";
-$a->strings["Force publish"] = "Erzwinge Veröffentlichung";
-$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen.";
-$a->strings["Global directory update URL"] = "URL für Updates beim weltweiten Verzeichnis";
-$a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar.";
-$a->strings["Allow threaded items"] = "Erlaube Threads in Diskussionen";
-$a->strings["Allow infinite level threading for items on this site."] = "Erlaube ein unendliches Level für Threads auf dieser Seite.";
-$a->strings["Private posts by default for new users"] = "Private Beiträge als Standard für neue Nutzer";
-$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen.";
-$a->strings["Don't include post content in email notifications"] = "Inhalte von Beiträgen nicht in Email Benachrichtigungen versenden";
-$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz, nicht in Email-Benachrichtigungen einbinden.";
-$a->strings["Disallow public access to addons listed in the apps menu."] = "Öffentlichen Zugriff auf Addons im Apps Menü verbieten.";
-$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt.";
-$a->strings["Don't embed private images in posts"] = "Private Bilder nicht in Beiträgen einbetten.";
-$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert.";
-$a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
-$a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen.";
-$a->strings["OpenID support"] = "OpenID Unterstützung";
-$a->strings["OpenID support for registration and logins."] = "OpenID-Unterstützung für Registrierung und Login.";
-$a->strings["Fullname check"] = "Namen auf Vollständigkeit überprüfen";
-$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden.";
-$a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
-$a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden";
-$a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen";
-$a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server.";
-$a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren";
-$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "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.";
-$a->strings["Enable Diaspora support"] = "Diaspora-Support aktivieren";
-$a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die eingebaute Diaspora-Verknüpfung.";
-$a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben";
-$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert.";
-$a->strings["Verify SSL"] = "SSL Überprüfen";
-$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann.";
-$a->strings["Proxy user"] = "Proxy Nutzer";
-$a->strings["Proxy URL"] = "Proxy URL";
-$a->strings["Network timeout"] = "Netzwerk Wartezeit";
-$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen).";
-$a->strings["Delivery interval"] = "Zustellungsintervall";
-$a->strings["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."] = "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.";
-$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.";
-$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s hat keinen Status zurückgegeben. Unbekannter Status.";
-$a->strings["Update function %s could not be found."] = "Updatefunktion %s konnte nicht gefunden werden.";
-$a->strings["No failed updates."] = "Keine fehlgeschlagenen Updates.";
-$a->strings["Failed Updates"] = "Fehlgeschlagene Updates";
-$a->strings["This does not include updates prior to 1139, which did not return a status."] = "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben.";
-$a->strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (falls das Update manuell installiert wurde)";
-$a->strings["Attempt to execute this update step automatically"] = "Versuchen, diesen Schritt automatisch auszuführen";
-$a->strings["%s user blocked/unblocked"] = array(
-	0 => "%s Benutzer geblockt/freigegeben",
-	1 => "%s Benutzer geblockt/freigegeben",
-);
-$a->strings["%s user deleted"] = array(
-	0 => "%s Nutzer gelöscht",
-	1 => "%s Nutzer gelöscht",
-);
-$a->strings["User '%s' deleted"] = "Nutzer '%s' gelöscht";
-$a->strings["User '%s' unblocked"] = "Nutzer '%s' entsperrt";
-$a->strings["User '%s' blocked"] = "Nutzer '%s' gesperrt";
-$a->strings["select all"] = "Alle auswählen";
-$a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf deine Bestätigung warten";
-$a->strings["Request date"] = "Anfragedatum";
-$a->strings["No registrations."] = "Keine Neuanmeldungen.";
-$a->strings["Approve"] = "Genehmigen";
-$a->strings["Deny"] = "Verwehren";
-$a->strings["Site admin"] = "Seitenadministrator";
-$a->strings["Account expired"] = "Account ist abgelaufen";
-$a->strings["Register date"] = "Anmeldedatum";
-$a->strings["Last login"] = "Letzte Anmeldung";
-$a->strings["Last item"] = "Letzter Beitrag";
-$a->strings["Account"] = "Nutzerkonto";
-$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "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?";
-$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "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?";
-$a->strings["Plugin %s disabled."] = "Plugin %s deaktiviert.";
-$a->strings["Plugin %s enabled."] = "Plugin %s aktiviert.";
-$a->strings["Disable"] = "Ausschalten";
-$a->strings["Enable"] = "Einschalten";
-$a->strings["Toggle"] = "Umschalten";
-$a->strings["Author: "] = "Autor:";
-$a->strings["Maintainer: "] = "Betreuer:";
-$a->strings["No themes found."] = "Keine Themen gefunden.";
-$a->strings["Screenshot"] = "Bildschirmfoto";
-$a->strings["[Experimental]"] = "[Experimentell]";
-$a->strings["[Unsupported]"] = "[Nicht unterstützt]";
-$a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert.";
-$a->strings["Clear"] = "löschen";
-$a->strings["Enable Debugging"] = "Protokoll führen";
-$a->strings["Log file"] = "Protokolldatei";
-$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis.";
-$a->strings["Log level"] = "Protokoll-Level";
-$a->strings["Close"] = "Schließen";
-$a->strings["FTP Host"] = "FTP Host";
-$a->strings["FTP Path"] = "FTP Pfad";
-$a->strings["FTP User"] = "FTP Nutzername";
-$a->strings["FTP Password"] = "FTP Passwort";
 $a->strings["link"] = "Link";
 $a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt.";
 $a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren.";
@@ -1606,6 +1608,7 @@ $a->strings["Left"] = "Links";
 $a->strings["Center"] = "Mitte";
 $a->strings["Posts font size"] = "Schriftgröße in Beiträgen";
 $a->strings["Textareas font size"] = "Schriftgröße in Eingabefeldern";
+$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln";
 $a->strings["Delete this item?"] = "Diesen Beitrag löschen?";
 $a->strings["show fewer"] = "weniger anzeigen";
 $a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen.";
@@ -1636,4 +1639,3 @@ $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
 $a->strings["Profile Details"] = "Profildetails";
 $a->strings["Events and Calendar"] = "Ereignisse und Kalender";
 $a->strings["Only You Can See This"] = "Nur du kannst das sehen";
-$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln";

From 2cc73dbef3da678a65cd395b90b39b5c8670144b Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Sun, 7 Apr 2013 11:38:37 -0600
Subject: [PATCH 11/67] allow visiting other people's display/ links if I have
 a copy of the post

---
 mod/display.php | 81 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 56 insertions(+), 25 deletions(-)

diff --git a/mod/display.php b/mod/display.php
index bb2733e61b..24ce35791a 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -43,7 +43,7 @@ function display_content(&$a, $update = 0) {
 		$a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
 	}
 	else {
-		$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+		$item_id = (($a->argc > 2) ? $a->argv[2] : 0);
 	}
 
 	if(! $item_id) {
@@ -142,16 +142,46 @@ function display_content(&$a, $update = 0) {
 		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 		and `item`.`moderated` = 0
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-		AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
+		AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' )
+		AND uid = %d )
 		$sql_extra
 		ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ",
 		intval($a->profile['uid']),
 		dbesc($item_id),
-		dbesc($item_id)
+		dbesc($item_id),
+		intval($a->profile['uid'])
 	);
 
+	if(!$r && local_user()) {
+		// Check if this is another person's link to a post that we have
+		$r = q("SELECT `item`.uri FROM `item`
+			WHERE (`item`.`id` = '%s' OR `item`.`uri` = '%s' )
+			LIMIT 1",
+			dbesc($item_id),
+			dbesc($item_id)
+		);
+		if($r) {
+			$item_uri = $r[0]['uri'];
 
-	if(count($r)) {
+			$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+				`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
+				`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+				FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+				WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+				and `item`.`moderated` = 0
+				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+				AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE `uri` = '%s' AND uid = %d )
+				ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ",
+				intval(local_user()),
+				dbesc($item_uri),
+				intval(local_user())
+			);
+		}
+	}
+
+
+	if($r) {
 
 		if((local_user()) && (local_user() == $a->profile['uid'])) {
 			q("UPDATE `item` SET `unseen` = 0 
@@ -171,15 +201,17 @@ function display_content(&$a, $update = 0) {
 		require_once("include/html2plain.php");
 		$description = trim(html2plain(bbcode($r[0]["body"], false, false), 0, true));
 		$title = trim(html2plain(bbcode($r[0]["title"], false, false), 0, true));
+		$author_name = $r[0]["author-name"];
+
+		if ($title == "")
+			$title = $author_name;
 
 		$description = htmlspecialchars($description, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
 		$title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
-
-		if ($title == "")
-			$title = $r[0]["author-name"];
+		$author_name = htmlspecialchars($author_name, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
 
 		//<meta name="keywords" content="">
-		$a->page['htmlhead'] .= '<meta name="author" content="'.$r[0]["author-name"].'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="author" content="'.$author_name.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="title" content="'.$title.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="fulltitle" content="'.$title.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="description" content="'.$description.'" />'."\n";
@@ -192,27 +224,26 @@ function display_content(&$a, $update = 0) {
 		//<meta property="og:image" content="" />
 		$a->page['htmlhead'] .= '<meta property="og:url" content="'.$r[0]["plink"].'" />'."\n";
 		$a->page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
-		$a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$r[0]["author-name"].'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
 		// article:tag
 
+		return $o;
+	}
+
+	$r = q("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
+		dbesc($item_id),
+		dbesc($item_id)
+	);
+	if($r) {
+		if($r[0]['deleted']) {
+			notice( t('Item has been removed.') . EOL );
+		}
+		else {	
+			notice( t('Permission denied.') . EOL ); 
+		}
 	}
 	else {
-		$r = q("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
-			dbesc($item_id),
-			dbesc($item_id)
-		);
-		if(count($r)) {
-			if($r[0]['deleted']) {
-				notice( t('Item has been removed.') . EOL );
-			}
-			else {	
-				notice( t('Permission denied.') . EOL ); 
-			}
-		}
-		else {
-			notice( t('Item not found.') . EOL );
-		}
-
+		notice( t('Item not found.') . EOL );
 	}
 
 	return $o;

From 659d0cc1b8bbe39fdbce10a0b97d65897a73ad67 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Mon, 8 Apr 2013 09:03:31 -0400
Subject: [PATCH 12/67] uimport remove db scheme version check

---
 include/uimport.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/uimport.php b/include/uimport.php
index 12e85c61ad..4fd91f80a7 100644
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -101,11 +101,13 @@ function import_account(&$a, $file) {
 		return;
 	}
 
+	/*
+	// this is not required as we remove columns in json not in current db schema
 	if ($account['schema'] != DB_UPDATE_VERSION) {
 		notice(t("Error! I can't import this file: DB schema version is not compatible."));
 		return;
 	}
-
+	*/
 
 	// check for username
 	$r = q("SELECT uid FROM user WHERE nickname='%s'", $account['user']['nickname']);

From 5827db0ea327827657620b5b668b0741ca0e77bf Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 14 Apr 2013 17:22:42 +0200
Subject: [PATCH 13/67] check current password before changing the password

---
 mod/settings.php          | 13 +++++++++++--
 view/settings.tpl         |  2 ++
 view/smarty3/settings.tpl |  2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/mod/settings.php b/mod/settings.php
index 38bfedbb1c..56526b7e79 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -300,7 +300,8 @@ function settings_post(&$a) {
 	if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
 
 		$newpass = $_POST['npassword'];
-		$confirm = $_POST['confirm'];
+                $confirm = $_POST['confirm'];
+                $oldpass = hash('whirlpool', $_POST['opassword']);
 
 		$err = false;
 		if($newpass != $confirm ) {
@@ -311,7 +312,13 @@ function settings_post(&$a) {
 		if((! x($newpass)) || (! x($confirm))) {
 			notice( t('Empty passwords are not allowed. Password unchanged.') . EOL);
 			$err = true;
-		}
+                }
+
+                $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
+                if( $oldpass != $r[0]['password'] ) {
+                    notice( t('Wrong password.') . EOL);
+                    $err = true;
+                }
 
 		if(! $err) {
 			$password = hash('whirlpool',$newpass);
@@ -1045,6 +1052,8 @@ function settings_content(&$a) {
 		'$h_pass' 	=> t('Password Settings'),
 		'$password1'=> array('npassword', t('New Password:'), '', ''),
 		'$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
+		'$password3'=> array('opassword', t('Current Password:'), '', t('Your current password to confirm the changes')),
+		'$password4'=> array('password', t('Password:'), '', t('Your current password to confirm the changes')),
 		'$oid_enable' => (! get_config('system','no_openid')),
 		'$openid'	=> $openid_field,
 		
diff --git a/view/settings.tpl b/view/settings.tpl
index bebd0c12a8..569ebcf101 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -9,6 +9,7 @@ $nickname_block
 
 {{inc field_password.tpl with $field=$password1 }}{{endinc}}
 {{inc field_password.tpl with $field=$password2 }}{{endinc}}
+{{inc field_password.tpl with $field=$password3 }}{{endinc}}
 
 {{ if $oid_enable }}
 {{inc field_input.tpl with $field=$openid }}{{endinc}}
@@ -23,6 +24,7 @@ $nickname_block
 
 {{inc field_input.tpl with $field=$username }}{{endinc}}
 {{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_password.tpl with $field=$password4 }}{{endinc}}
 {{inc field_custom.tpl with $field=$timezone }}{{endinc}}
 {{inc field_input.tpl with $field=$defloc }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
diff --git a/view/smarty3/settings.tpl b/view/smarty3/settings.tpl
index b79b26b795..2ab4bd466c 100644
--- a/view/smarty3/settings.tpl
+++ b/view/smarty3/settings.tpl
@@ -14,6 +14,7 @@
 
 {{include file="field_password.tpl" field=$password1}}
 {{include file="field_password.tpl" field=$password2}}
+{{include file="field_password.tpl" field=$password3}}
 
 {{if $oid_enable}}
 {{include file="field_input.tpl" field=$openid}}
@@ -28,6 +29,7 @@
 
 {{include file="field_input.tpl" field=$username}}
 {{include file="field_input.tpl" field=$email}}
+{{include file="field_password.tpl" field=$password4}}
 {{include file="field_custom.tpl" field=$timezone}}
 {{include file="field_input.tpl" field=$defloc}}
 {{include file="field_checkbox.tpl" field=$allowloc}}

From 7be1040a6360d6322901ef609582b9520511f00b Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 14 Apr 2013 17:26:23 +0200
Subject: [PATCH 14/67] DE: update to the strings

---
 view/de/messages.po | 4 ++--
 view/de/strings.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index 71bd11b1c3..024cdcea17 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -26,7 +26,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
 "POT-Creation-Date: 2013-04-04 00:02-0700\n"
-"PO-Revision-Date: 2013-04-06 06:22+0000\n"
+"PO-Revision-Date: 2013-04-14 15:25+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"
@@ -4114,7 +4114,7 @@ msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
 
 #: ../../mod/settings.php:323
 msgid "Password changed."
-msgstr "Passwort ändern."
+msgstr "Passwort geändert."
 
 #: ../../mod/settings.php:325
 msgid "Password update failed. Please try again."
diff --git a/view/de/strings.php b/view/de/strings.php
index 18742d20df..862d0cf2f0 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -952,7 +952,7 @@ $a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet.";
 $a->strings["Features updated"] = "Features aktualisiert";
 $a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert.";
-$a->strings["Password changed."] = "Passwort ändern.";
+$a->strings["Password changed."] = "Passwort geändert.";
 $a->strings["Password update failed. Please try again."] = "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal.";
 $a->strings[" Please use a shorter name."] = " Bitte verwende einen kürzeren Namen.";
 $a->strings[" Name too short."] = " Name ist zu kurz.";

From 4dd406055c0f6ff86e96d0a38cee3032057f4d85 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 14 Apr 2013 17:58:16 +0200
Subject: [PATCH 15/67] check password when changing users email

---
 mod/settings.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/mod/settings.php b/mod/settings.php
index 56526b7e79..3d3688e29b 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -314,6 +314,8 @@ function settings_post(&$a) {
 			$err = true;
                 }
 
+                //  check if the old password was supplied correctly before 
+                //  changing it to the new value
                 $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
                 if( $oldpass != $r[0]['password'] ) {
                     notice( t('Wrong password.') . EOL);
@@ -401,8 +403,17 @@ function settings_post(&$a) {
 
 	if($email != $a->user['email']) {
 		$email_changed = true;
-        if(! valid_email($email))
-			$err .= t(' Not valid email.');
+                //  check for the correct password
+                $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
+                $password = hash('whirlpool', $_POST['password']);
+                if ($password != $r[0]['password']) {
+                    $err .= t('Wrong Password') . EOL;
+                    $email = $a->user['email'];
+                }
+                //  check the email is valid
+                if(! valid_email($email))
+                    $err .= t(' Not valid email.');
+                //  ensure new email is not the admin mail
 		if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
 			$err .= t(' Cannot change to that email.');
 			$email = $a->user['email'];

From b6d1a1f125e44fe6af1c8eff7635e6d509abe262 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 14 Apr 2013 18:19:01 +0200
Subject: [PATCH 16/67] tabwidth

---
 mod/settings.php | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/mod/settings.php b/mod/settings.php
index 3d3688e29b..ca688d1a9f 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -300,8 +300,8 @@ function settings_post(&$a) {
 	if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
 
 		$newpass = $_POST['npassword'];
-                $confirm = $_POST['confirm'];
-                $oldpass = hash('whirlpool', $_POST['opassword']);
+        $confirm = $_POST['confirm'];
+        $oldpass = hash('whirlpool', $_POST['opassword']);
 
 		$err = false;
 		if($newpass != $confirm ) {
@@ -312,15 +312,15 @@ function settings_post(&$a) {
 		if((! x($newpass)) || (! x($confirm))) {
 			notice( t('Empty passwords are not allowed. Password unchanged.') . EOL);
 			$err = true;
-                }
+        }
 
-                //  check if the old password was supplied correctly before 
-                //  changing it to the new value
-                $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
-                if( $oldpass != $r[0]['password'] ) {
-                    notice( t('Wrong password.') . EOL);
-                    $err = true;
-                }
+        //  check if the old password was supplied correctly before 
+        //  changing it to the new value
+        $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
+        if( $oldpass != $r[0]['password'] ) {
+            notice( t('Wrong password.') . EOL);
+            $err = true;
+        }
 
 		if(! $err) {
 			$password = hash('whirlpool',$newpass);
@@ -403,17 +403,17 @@ function settings_post(&$a) {
 
 	if($email != $a->user['email']) {
 		$email_changed = true;
-                //  check for the correct password
-                $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
-                $password = hash('whirlpool', $_POST['password']);
-                if ($password != $r[0]['password']) {
-                    $err .= t('Wrong Password') . EOL;
-                    $email = $a->user['email'];
-                }
-                //  check the email is valid
-                if(! valid_email($email))
-                    $err .= t(' Not valid email.');
-                //  ensure new email is not the admin mail
+        //  check for the correct password
+        $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
+        $password = hash('whirlpool', $_POST['password']);
+        if ($password != $r[0]['password']) {
+            $err .= t('Wrong Password') . EOL;
+            $email = $a->user['email'];
+        }
+        //  check the email is valid
+        if(! valid_email($email))
+            $err .= t(' Not valid email.');
+        //  ensure new email is not the admin mail
 		if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
 			$err .= t(' Cannot change to that email.');
 			$email = $a->user['email'];

From 960d1d99b28bae6d946ed2feaa44fc0b11b73d3f Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 17 Apr 2013 17:32:31 +0200
Subject: [PATCH 17/67] invalid arguments for a foreach loop found

---
 include/tags.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/tags.php b/include/tags.php
index c81a752d54..6e73f616cb 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -106,8 +106,10 @@ function create_tags_from_item($itemid) {
 function create_tags_from_itemuri($itemuri, $uid) {
 	$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-	foreach ($messages as $message)
-		create_tags_from_item($message["id"]);
+	if(count($messages)) {
+		foreach ($messages as $message)
+			create_tags_from_item($message["id"]);
+	}
 }
 
 function update_items() {

From 78e747016fb26b36439a72159c458102d5681d12 Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Thu, 18 Apr 2013 19:47:27 -0600
Subject: [PATCH 18/67] update mobile theme settings pages

---
 view/theme/decaf-mobile/settings.tpl         | 3 +++
 view/theme/decaf-mobile/smarty3/settings.tpl | 3 +++
 view/theme/frost-mobile/settings.tpl         | 3 +++
 view/theme/frost-mobile/smarty3/settings.tpl | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/view/theme/decaf-mobile/settings.tpl b/view/theme/decaf-mobile/settings.tpl
index 3ab464b257..036cc16916 100644
--- a/view/theme/decaf-mobile/settings.tpl
+++ b/view/theme/decaf-mobile/settings.tpl
@@ -9,6 +9,7 @@ $nickname_block
 
 {{inc field_password.tpl with $field=$password1 }}{{endinc}}
 {{inc field_password.tpl with $field=$password2 }}{{endinc}}
+{{inc field_password.tpl with $field=$password3 }}{{endinc}}
 
 {{ if $oid_enable }}
 {{inc field_input.tpl with $field=$openid }}{{endinc}}
@@ -23,6 +24,7 @@ $nickname_block
 
 {{inc field_input.tpl with $field=$username }}{{endinc}}
 {{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_password.tpl with $field=$password4 }}{{endinc}}
 {{inc field_custom.tpl with $field=$timezone }}{{endinc}}
 {{inc field_input.tpl with $field=$defloc }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
@@ -127,6 +129,7 @@ $group_select
 {{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
 </div>
 
 </div>
diff --git a/view/theme/decaf-mobile/smarty3/settings.tpl b/view/theme/decaf-mobile/smarty3/settings.tpl
index d702cd7d1b..587b96e28e 100644
--- a/view/theme/decaf-mobile/smarty3/settings.tpl
+++ b/view/theme/decaf-mobile/smarty3/settings.tpl
@@ -14,6 +14,7 @@
 
 {{include file="field_password.tpl" field=$password1}}
 {{include file="field_password.tpl" field=$password2}}
+{{include file="field_password.tpl" field=$password3}}
 
 {{if $oid_enable}}
 {{include file="field_input.tpl" field=$openid}}
@@ -28,6 +29,7 @@
 
 {{include file="field_input.tpl" field=$username}}
 {{include file="field_input.tpl" field=$email}}
+{{include file="field_password.tpl" field=$password4}}
 {{include file="field_custom.tpl" field=$timezone}}
 {{include file="field_input.tpl" field=$defloc}}
 {{include file="field_checkbox.tpl" field=$allowloc}}
@@ -132,6 +134,7 @@
 {{include file="field_intcheckbox.tpl" field=$notify5}}
 {{include file="field_intcheckbox.tpl" field=$notify6}}
 {{include file="field_intcheckbox.tpl" field=$notify7}}
+{{include file="field_intcheckbox.tpl" field=$notify8}}
 </div>
 
 </div>
diff --git a/view/theme/frost-mobile/settings.tpl b/view/theme/frost-mobile/settings.tpl
index 3e8b33d7f0..8e5aff019b 100644
--- a/view/theme/frost-mobile/settings.tpl
+++ b/view/theme/frost-mobile/settings.tpl
@@ -9,6 +9,7 @@ $nickname_block
 
 {{inc field_password.tpl with $field=$password1 }}{{endinc}}
 {{inc field_password.tpl with $field=$password2 }}{{endinc}}
+{{inc field_password.tpl with $field=$password3 }}{{endinc}}
 
 {{ if $oid_enable }}
 {{inc field_input.tpl with $field=$openid }}{{endinc}}
@@ -23,6 +24,7 @@ $nickname_block
 
 {{inc field_input.tpl with $field=$username }}{{endinc}}
 {{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_password.tpl with $field=$password4 }}{{endinc}}
 {{inc field_custom.tpl with $field=$timezone }}{{endinc}}
 {{inc field_input.tpl with $field=$defloc }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
@@ -123,6 +125,7 @@ $group_select
 {{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
 </div>
 
 </div>
diff --git a/view/theme/frost-mobile/smarty3/settings.tpl b/view/theme/frost-mobile/smarty3/settings.tpl
index 73732e453c..16a67039b2 100644
--- a/view/theme/frost-mobile/smarty3/settings.tpl
+++ b/view/theme/frost-mobile/smarty3/settings.tpl
@@ -14,6 +14,7 @@
 
 {{include file="field_password.tpl" field=$password1}}
 {{include file="field_password.tpl" field=$password2}}
+{{include file="field_password.tpl" field=$password3}}
 
 {{if $oid_enable}}
 {{include file="field_input.tpl" field=$openid}}
@@ -28,6 +29,7 @@
 
 {{include file="field_input.tpl" field=$username}}
 {{include file="field_input.tpl" field=$email}}
+{{include file="field_password.tpl" field=$password4}}
 {{include file="field_custom.tpl" field=$timezone}}
 {{include file="field_input.tpl" field=$defloc}}
 {{include file="field_checkbox.tpl" field=$allowloc}}
@@ -128,6 +130,7 @@
 {{include file="field_intcheckbox.tpl" field=$notify5}}
 {{include file="field_intcheckbox.tpl" field=$notify6}}
 {{include file="field_intcheckbox.tpl" field=$notify7}}
+{{include file="field_intcheckbox.tpl" field=$notify8}}
 </div>
 
 </div>

From a13e7b8a38f6eb61237c79090f144a60ea9fafe1 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 19 Apr 2013 04:51:43 -0700
Subject: [PATCH 19/67] rev update

---
 boot.php         |   2 +-
 util/messages.po | 502 +++++++++++++++++++++++------------------------
 2 files changed, 252 insertions(+), 252 deletions(-)

diff --git a/boot.php b/boot.php
index 22af8ef570..e23f05737c 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1660' );
+define ( 'FRIENDICA_VERSION',      '3.1.1675' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/util/messages.po b/util/messages.po
index a8ee559c95..1ef12493d9 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1660\n"
+"Project-Id-Version: 3.1.1675\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 00:02-0700\n"
+"POT-Creation-Date: 2013-04-19 00:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1050
+#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1052
 msgid "Full Name:"
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr ""
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:646
+#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:650
 msgid "Sexual Preference:"
 msgstr ""
 
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:648
+#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:652
 msgid "Hometown:"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:649
+#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:653
 msgid "Political Views:"
 msgstr ""
 
@@ -93,11 +93,11 @@ msgstr ""
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:653
+#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:657
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:654
+#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:658
 msgid "Dislikes:"
 msgstr ""
 
@@ -737,46 +737,6 @@ msgstr ""
 msgid "The error message was:"
 msgstr ""
 
-#: ../../include/uimport.php:61
-msgid "Error decoding account file"
-msgstr ""
-
-#: ../../include/uimport.php:67
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr ""
-
-#: ../../include/uimport.php:72
-msgid "Error! I can't import this file: DB schema version is not compatible."
-msgstr ""
-
-#: ../../include/uimport.php:81
-msgid "Error! Cannot check nickname"
-msgstr ""
-
-#: ../../include/uimport.php:85
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr ""
-
-#: ../../include/uimport.php:104
-msgid "User creation error"
-msgstr ""
-
-#: ../../include/uimport.php:122
-msgid "User profile creation error"
-msgstr ""
-
-#: ../../include/uimport.php:167
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/uimport.php:245
-msgid "Done. You can now login with your username and password"
-msgstr ""
-
 #: ../../include/bb2diaspora.php:393 ../../include/event.php:11
 #: ../../mod/localtime.php:12
 msgid "l F d, Y \\@ g:i A"
@@ -998,7 +958,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: ../../include/contact_selectors.php:80 ../../mod/settings.php:681
+#: ../../include/contact_selectors.php:80 ../../mod/settings.php:683
 #: ../../mod/dfrn_request.php:842
 msgid "Diaspora"
 msgstr ""
@@ -1177,22 +1137,22 @@ msgstr ""
 msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: ../../include/items.php:3998 ../../mod/profiles.php:606
+#: ../../include/items.php:3998 ../../mod/profiles.php:610
 #: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
-#: ../../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:936 ../../mod/settings.php:942
+#: ../../mod/settings.php:950 ../../mod/settings.php:954
+#: ../../mod/settings.php:959 ../../mod/settings.php:965
+#: ../../mod/settings.php:971 ../../mod/settings.php:977
 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1009 ../../mod/dfrn_request.php:836
+#: ../../mod/settings.php:1009 ../../mod/settings.php:1010
+#: ../../mod/settings.php:1011 ../../mod/dfrn_request.php:836
 #: ../../mod/suggest.php:29 ../../mod/message.php:209
 msgid "Yes"
 msgstr ""
 
 #: ../../include/items.php:4001 ../../include/conversation.php:1080
-#: ../../mod/contacts.php:249 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/dfrn_request.php:848
+#: ../../mod/contacts.php:249 ../../mod/settings.php:563
+#: ../../mod/settings.php:589 ../../mod/dfrn_request.php:848
 #: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
 #: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
 #: ../../mod/fbrowser.php:116 ../../mod/message.php:212
@@ -1201,12 +1161,12 @@ msgid "Cancel"
 msgstr ""
 
 #: ../../include/items.php:4121 ../../mod/profiles.php:146
-#: ../../mod/profiles.php:567 ../../mod/notes.php:20 ../../mod/nogroup.php:25
+#: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/nogroup.php:25
 #: ../../mod/item.php:140 ../../mod/item.php:156 ../../mod/allfriends.php:9
 #: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/register.php:40
 #: ../../mod/regmod.php:118 ../../mod/attach.php:33 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:542
-#: ../../mod/settings.php:547 ../../mod/crepair.php:115
+#: ../../mod/settings.php:91 ../../mod/settings.php:544
+#: ../../mod/settings.php:549 ../../mod/crepair.php:115
 #: ../../mod/delegate.php:6 ../../mod/poke.php:135
 #: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
 #: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
@@ -1589,7 +1549,7 @@ msgid "Select"
 msgstr ""
 
 #: ../../include/conversation.php:588 ../../mod/admin.php:770
-#: ../../mod/settings.php:623 ../../mod/group.php:171
+#: ../../mod/settings.php:625 ../../mod/group.php:171
 #: ../../mod/photos.php:1637 ../../mod/content.php:462
 #: ../../mod/content.php:764 ../../object/Item.php:127
 msgid "Delete"
@@ -2267,6 +2227,46 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
+#: ../../include/uimport.php:94
+msgid "Error decoding account file"
+msgstr ""
+
+#: ../../include/uimport.php:100
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr ""
+
+#: ../../include/uimport.php:105
+msgid "Error! I can't import this file: DB schema version is not compatible."
+msgstr ""
+
+#: ../../include/uimport.php:114
+msgid "Error! Cannot check nickname"
+msgstr ""
+
+#: ../../include/uimport.php:118
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr ""
+
+#: ../../include/uimport.php:137
+msgid "User creation error"
+msgstr ""
+
+#: ../../include/uimport.php:155
+msgid "User profile creation error"
+msgstr ""
+
+#: ../../include/uimport.php:200
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/uimport.php:270
+msgid "Done. You can now login with your username and password"
+msgstr ""
+
 #: ../../include/security.php:22
 msgid "Welcome "
 msgstr ""
@@ -2286,7 +2286,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:133
-#: ../../mod/profiles.php:160 ../../mod/profiles.php:579
+#: ../../mod/profiles.php:160 ../../mod/profiles.php:583
 #: ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr ""
@@ -2367,53 +2367,53 @@ msgstr ""
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:517
+#: ../../mod/profiles.php:521
 msgid " and "
 msgstr ""
 
-#: ../../mod/profiles.php:525
-msgid "public profile"
-msgstr ""
-
-#: ../../mod/profiles.php:528
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr ""
-
 #: ../../mod/profiles.php:529
-#, php-format
-msgid " - Visit %1$s's %2$s"
+msgid "public profile"
 msgstr ""
 
 #: ../../mod/profiles.php:532
 #, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr ""
+
+#: ../../mod/profiles.php:533
+#, php-format
+msgid " - Visit %1$s's %2$s"
+msgstr ""
+
+#: ../../mod/profiles.php:536
+#, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:605
+#: ../../mod/profiles.php:609
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:607 ../../mod/api.php:106 ../../mod/register.php:240
-#: ../../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/profiles.php:611 ../../mod/api.php:106 ../../mod/register.php:240
+#: ../../mod/settings.php:936 ../../mod/settings.php:942
+#: ../../mod/settings.php:950 ../../mod/settings.php:954
+#: ../../mod/settings.php:959 ../../mod/settings.php:965
+#: ../../mod/settings.php:971 ../../mod/settings.php:977
 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1009 ../../mod/dfrn_request.php:837
+#: ../../mod/settings.php:1009 ../../mod/settings.php:1010
+#: ../../mod/settings.php:1011 ../../mod/dfrn_request.php:837
 msgid "No"
 msgstr ""
 
-#: ../../mod/profiles.php:625
+#: ../../mod/profiles.php:629
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:626 ../../mod/admin.php:491 ../../mod/admin.php:763
+#: ../../mod/profiles.php:630 ../../mod/admin.php:491 ../../mod/admin.php:763
 #: ../../mod/admin.php:902 ../../mod/admin.php:1102 ../../mod/admin.php:1189
-#: ../../mod/contacts.php:386 ../../mod/settings.php:560
-#: ../../mod/settings.php:670 ../../mod/settings.php:739
-#: ../../mod/settings.php:811 ../../mod/settings.php:1037
+#: ../../mod/contacts.php:386 ../../mod/settings.php:562
+#: ../../mod/settings.php:672 ../../mod/settings.php:741
+#: ../../mod/settings.php:813 ../../mod/settings.php:1039
 #: ../../mod/crepair.php:166 ../../mod/poke.php:199 ../../mod/events.php:478
 #: ../../mod/fsuggest.php:107 ../../mod/group.php:87 ../../mod/invite.php:140
 #: ../../mod/localtime.php:45 ../../mod/manage.php:110
@@ -2430,182 +2430,182 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: ../../mod/profiles.php:627
+#: ../../mod/profiles.php:631
 msgid "Change Profile Photo"
 msgstr ""
 
-#: ../../mod/profiles.php:628
+#: ../../mod/profiles.php:632
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:629
+#: ../../mod/profiles.php:633
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:630
+#: ../../mod/profiles.php:634
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:631
+#: ../../mod/profiles.php:635
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:632
+#: ../../mod/profiles.php:636
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:633
+#: ../../mod/profiles.php:637
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:634
+#: ../../mod/profiles.php:638
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:635
+#: ../../mod/profiles.php:639
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:636
+#: ../../mod/profiles.php:640
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/profiles.php:637
+#: ../../mod/profiles.php:641
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:638
+#: ../../mod/profiles.php:642
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:639
+#: ../../mod/profiles.php:643
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:640
+#: ../../mod/profiles.php:644
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:641
+#: ../../mod/profiles.php:645
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:642
+#: ../../mod/profiles.php:646
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:643
+#: ../../mod/profiles.php:647
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:644
+#: ../../mod/profiles.php:648
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:645
+#: ../../mod/profiles.php:649
 msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/profiles.php:647
+#: ../../mod/profiles.php:651
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:650
+#: ../../mod/profiles.php:654
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:651
+#: ../../mod/profiles.php:655
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:652
+#: ../../mod/profiles.php:656
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:655
+#: ../../mod/profiles.php:659
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:656
+#: ../../mod/profiles.php:660
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:657
+#: ../../mod/profiles.php:661
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:658
+#: ../../mod/profiles.php:662
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:659
+#: ../../mod/profiles.php:663
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:660
+#: ../../mod/profiles.php:664
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:661
+#: ../../mod/profiles.php:665
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:662
+#: ../../mod/profiles.php:666
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:663
+#: ../../mod/profiles.php:667
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:664
+#: ../../mod/profiles.php:668
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:665
+#: ../../mod/profiles.php:669
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:666
+#: ../../mod/profiles.php:670
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:667
+#: ../../mod/profiles.php:671
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:672
+#: ../../mod/profiles.php:676
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:682 ../../mod/directory.php:111
+#: ../../mod/profiles.php:686 ../../mod/directory.php:111
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:721
+#: ../../mod/profiles.php:725
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:722 ../../boot.php:1375 ../../boot.php:1401
+#: ../../mod/profiles.php:726 ../../boot.php:1375 ../../boot.php:1401
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:723 ../../boot.php:1376
+#: ../../mod/profiles.php:727 ../../boot.php:1376
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:734 ../../boot.php:1386
+#: ../../mod/profiles.php:738 ../../boot.php:1386
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:736 ../../boot.php:1389
+#: ../../mod/profiles.php:740 ../../boot.php:1389
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:737 ../../boot.php:1390
+#: ../../mod/profiles.php:741 ../../boot.php:1390
 msgid "Edit visibility"
 msgstr ""
 
@@ -2790,7 +2790,7 @@ msgstr ""
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:434 ../../mod/settings.php:769
+#: ../../mod/admin.php:434 ../../mod/settings.php:771
 msgid "No special theme for mobile devices"
 msgstr ""
 
@@ -3333,8 +3333,8 @@ msgstr ""
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:766 ../../mod/admin.php:777 ../../mod/settings.php:562
-#: ../../mod/settings.php:588 ../../mod/crepair.php:148
+#: ../../mod/admin.php:766 ../../mod/admin.php:777 ../../mod/settings.php:564
+#: ../../mod/settings.php:590 ../../mod/crepair.php:148
 msgid "Name"
 msgstr ""
 
@@ -4068,7 +4068,7 @@ msgstr ""
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:121 ../../mod/settings.php:586
+#: ../../mod/settings.php:121 ../../mod/settings.php:588
 msgid "Update"
 msgstr ""
 
@@ -4128,466 +4128,466 @@ msgstr ""
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:559 ../../mod/settings.php:585
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:561 ../../mod/settings.php:587
+#: ../../mod/settings.php:623
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../mod/settings.php:565 ../../mod/settings.php:591
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../mod/settings.php:566 ../../mod/settings.php:592
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:565 ../../mod/settings.php:591
+#: ../../mod/settings.php:567 ../../mod/settings.php:593
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:566 ../../mod/settings.php:592
+#: ../../mod/settings.php:568 ../../mod/settings.php:594
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:577
+#: ../../mod/settings.php:579
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:622
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:622 ../../mod/editpost.php:109
+#: ../../mod/settings.php:624 ../../mod/editpost.php:109
 #: ../../mod/content.php:751 ../../object/Item.php:117
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:626
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:627
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:628
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:638
+#: ../../mod/settings.php:640
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:646
+#: ../../mod/settings.php:648
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:660
+#: ../../mod/settings.php:662
 msgid "Off"
 msgstr ""
 
-#: ../../mod/settings.php:660
+#: ../../mod/settings.php:662
 msgid "On"
 msgstr ""
 
-#: ../../mod/settings.php:668
+#: ../../mod/settings.php:670
 msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:683 ../../mod/settings.php:684
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:683 ../../mod/settings.php:684
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:683 ../../mod/settings.php:684
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:684
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:716
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:723
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:726
+#: ../../mod/settings.php:728
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:729
 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:728
+#: ../../mod/settings.php:730
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:732
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:731
+#: ../../mod/settings.php:733
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:732
+#: ../../mod/settings.php:734
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:732 ../../mod/settings.php:737
+#: ../../mod/settings.php:734 ../../mod/settings.php:739
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:733
+#: ../../mod/settings.php:735
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:736
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:737
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:738
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:739
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:739
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:739
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:738
+#: ../../mod/settings.php:740
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:811
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:815 ../../mod/settings.php:826
+#: ../../mod/settings.php:817 ../../mod/settings.php:828
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:818
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:819
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:819
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:820
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:820
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:819
+#: ../../mod/settings.php:821
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:897
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:896
+#: ../../mod/settings.php:898
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:901
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:900
+#: ../../mod/settings.php:902
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:903
+#: ../../mod/settings.php:905
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:904
+#: ../../mod/settings.php:906
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:907
+#: ../../mod/settings.php:909
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:908
+#: ../../mod/settings.php:910
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:911
+#: ../../mod/settings.php:913
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:912
+#: ../../mod/settings.php:914
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:926
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:926
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:934
+#: ../../mod/settings.php:936
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:940
+#: ../../mod/settings.php:942
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:948
+#: ../../mod/settings.php:950
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:952
+#: ../../mod/settings.php:954
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:959
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:963
+#: ../../mod/settings.php:965
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:969
+#: ../../mod/settings.php:971
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:975
+#: ../../mod/settings.php:977
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:985
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:988 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:993
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1004
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1004
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:1003
+#: ../../mod/settings.php:1005
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1006
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1007
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1008
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1009
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1010
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:1009
+#: ../../mod/settings.php:1011
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1037
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1043
+#: ../../mod/settings.php:1045
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1046
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:1045
+#: ../../mod/settings.php:1047
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:1045
+#: ../../mod/settings.php:1047
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1051
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1053
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:1052
+#: ../../mod/settings.php:1054
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:1053
+#: ../../mod/settings.php:1055
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1054
+#: ../../mod/settings.php:1056
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1057
+#: ../../mod/settings.php:1059
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1059
+#: ../../mod/settings.php:1061
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:1059 ../../mod/settings.php:1089
+#: ../../mod/settings.php:1061 ../../mod/settings.php:1091
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:1060
+#: ../../mod/settings.php:1062
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1063
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1070 ../../mod/photos.php:1140
+#: ../../mod/settings.php:1072 ../../mod/photos.php:1140
 #: ../../mod/photos.php:1506
 msgid "Show to Groups"
 msgstr ""
 
-#: ../../mod/settings.php:1071 ../../mod/photos.php:1141
+#: ../../mod/settings.php:1073 ../../mod/photos.php:1141
 #: ../../mod/photos.php:1507
 msgid "Show to Contacts"
 msgstr ""
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1074
 msgid "Default Private Post"
 msgstr ""
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1075
 msgid "Default Public Post"
 msgstr ""
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1079
 msgid "Default Permissions for New Posts"
 msgstr ""
 
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1091
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1094
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1095
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1096
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1095
+#: ../../mod/settings.php:1097
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1098
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1099
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1100
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1101
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1102
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1101
+#: ../../mod/settings.php:1103
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1104
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1105
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1104
+#: ../../mod/settings.php:1106
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1105
+#: ../../mod/settings.php:1107
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1110
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1109
+#: ../../mod/settings.php:1111
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 

From dd02b7bd00824f5282023480b3485fe6db5942c7 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Fri, 19 Apr 2013 09:55:07 -0400
Subject: [PATCH 20/67] drop items to group pages if no mentions in it. should
 fix bug 557

---
 include/items.php | 52 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/include/items.php b/include/items.php
index 210e66bf7a..194e19b5c0 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1180,19 +1180,23 @@ function item_store($arr,$force_parent = false) {
 		);
 	}
 
-	tag_deliver($arr['uid'],$current_post);
+	$deleted = tag_deliver($arr['uid'],$current_post);
 
-	// Store the fresh generated item into the cache
-	$cachefile = get_cachefile($arr["guid"]."-".hash("md5", $arr['body']));
+	// current post can be deleted if is for a communuty page and no mention are
+	// in it.
+	if (!$deleted) {
+		
+		// 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']);
-		$a = get_app();
-		$stamp1 = microtime(true);
-		file_put_contents($cachefile, $s);
-		$a->save_timestamp($stamp1, "file");
-		logger('item_store: put item '.$current_post.' into cachefile '.$cachefile);
-	}
+		if (($cachefile != '') AND !file_exists($cachefile)) {
+			$s = prepare_text($arr['body']);
+			$a = get_app();
+			$stamp1 = microtime(true);
+			file_put_contents($cachefile, $s);
+			$a->save_timestamp($stamp1, "file");
+			logger('item_store: put item '.$current_post.' into cachefile '.$cachefile);
+		}
 
         $r = q('SELECT * FROM `item` WHERE id = %d', intval($current_post));
         if (count($r) == 1) {
@@ -1201,7 +1205,7 @@ function item_store($arr,$force_parent = false) {
         else {
             logger('item_store: new item not found in DB, id ' . $current_post);
         }
-
+	}
 	return $current_post;
 }
 
@@ -1217,10 +1221,15 @@ function get_item_contact($item,$contacts) {
 	return false;
 }
 
-
+/**
+ * look for mention tags and setup a second delivery chain for forum/community posts if appropriate
+ * @param int $uid
+ * @param int $item_id
+ * @return bool true if item was deleted, else false
+ */
 function tag_deliver($uid,$item_id) {
 
-	// look for mention tags and setup a second delivery chain for forum/community posts if appropriate
+	// 
 
 	$a = get_app();
 
@@ -1262,8 +1271,21 @@ function tag_deliver($uid,$item_id) {
 		}
 	}
 
-	if(! $mention)
+	if(! $mention){
+		if ( ($community_page || $prvgroup) &&
+			  (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])){
+			// mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment)
+			// delete it!
+			logger("tag_deliver: no-mention top-level post to communuty or private group. delete.");
+			q("DELETE FROM item WHERE id = %d and uid = %d limit 1",
+				intval($item_id),
+				intval($uid)
+			);
+			return true;
+		}
 		return;
+	}
+		
 
 	// send a notification
 

From bc68892cf9a134a1ba7b1e0f381e52d64f3c27b4 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 21 Apr 2013 16:07:02 -0700
Subject: [PATCH 21/67] rev update

---
 boot.php         |   2 +-
 util/messages.po | 401 ++++++++++++++++++++++++-----------------------
 2 files changed, 209 insertions(+), 194 deletions(-)

diff --git a/boot.php b/boot.php
index e23f05737c..0475f6ab39 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1675' );
+define ( 'FRIENDICA_VERSION',      '3.1.1677' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/util/messages.po b/util/messages.po
index 1ef12493d9..0de2f4470d 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1675\n"
+"Project-Id-Version: 3.1.1677\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-19 00:02-0700\n"
+"POT-Creation-Date: 2013-04-21 00:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1052
+#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1072
 msgid "Full Name:"
 msgstr ""
 
@@ -958,7 +958,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: ../../include/contact_selectors.php:80 ../../mod/settings.php:683
+#: ../../include/contact_selectors.php:80 ../../mod/settings.php:701
 #: ../../mod/dfrn_request.php:842
 msgid "Diaspora"
 msgstr ""
@@ -1127,9 +1127,9 @@ msgstr ""
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:3957 ../../mod/admin.php:158
-#: ../../mod/admin.php:809 ../../mod/admin.php:1009 ../../mod/viewsrc.php:15
-#: ../../mod/notice.php:15 ../../mod/display.php:51 ../../mod/display.php:213
+#: ../../include/items.php:3957 ../../mod/display.php:51
+#: ../../mod/display.php:246 ../../mod/admin.php:158 ../../mod/admin.php:809
+#: ../../mod/admin.php:1009 ../../mod/viewsrc.php:15 ../../mod/notice.php:15
 msgid "Item not found."
 msgstr ""
 
@@ -1139,20 +1139,20 @@ msgstr ""
 
 #: ../../include/items.php:3998 ../../mod/profiles.php:610
 #: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
-#: ../../mod/settings.php:936 ../../mod/settings.php:942
-#: ../../mod/settings.php:950 ../../mod/settings.php:954
-#: ../../mod/settings.php:959 ../../mod/settings.php:965
-#: ../../mod/settings.php:971 ../../mod/settings.php:977
-#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1009 ../../mod/settings.php:1010
-#: ../../mod/settings.php:1011 ../../mod/dfrn_request.php:836
+#: ../../mod/settings.php:954 ../../mod/settings.php:960
+#: ../../mod/settings.php:968 ../../mod/settings.php:972
+#: ../../mod/settings.php:977 ../../mod/settings.php:983
+#: ../../mod/settings.php:989 ../../mod/settings.php:995
+#: ../../mod/settings.php:1025 ../../mod/settings.php:1026
+#: ../../mod/settings.php:1027 ../../mod/settings.php:1028
+#: ../../mod/settings.php:1029 ../../mod/dfrn_request.php:836
 #: ../../mod/suggest.php:29 ../../mod/message.php:209
 msgid "Yes"
 msgstr ""
 
 #: ../../include/items.php:4001 ../../include/conversation.php:1080
-#: ../../mod/contacts.php:249 ../../mod/settings.php:563
-#: ../../mod/settings.php:589 ../../mod/dfrn_request.php:848
+#: ../../mod/contacts.php:249 ../../mod/settings.php:581
+#: ../../mod/settings.php:607 ../../mod/dfrn_request.php:848
 #: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
 #: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
 #: ../../mod/fbrowser.php:116 ../../mod/message.php:212
@@ -1161,13 +1161,13 @@ msgid "Cancel"
 msgstr ""
 
 #: ../../include/items.php:4121 ../../mod/profiles.php:146
-#: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/nogroup.php:25
-#: ../../mod/item.php:140 ../../mod/item.php:156 ../../mod/allfriends.php:9
-#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/register.php:40
-#: ../../mod/regmod.php:118 ../../mod/attach.php:33 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:544
-#: ../../mod/settings.php:549 ../../mod/crepair.php:115
-#: ../../mod/delegate.php:6 ../../mod/poke.php:135
+#: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/display.php:242
+#: ../../mod/nogroup.php:25 ../../mod/item.php:140 ../../mod/item.php:156
+#: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
+#: ../../mod/contacts.php:147 ../../mod/settings.php:91
+#: ../../mod/settings.php:562 ../../mod/settings.php:567
+#: ../../mod/crepair.php:115 ../../mod/delegate.php:6 ../../mod/poke.php:135
 #: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
 #: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
 #: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
@@ -1179,10 +1179,9 @@ msgstr ""
 #: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
 #: ../../mod/network.php:6 ../../mod/notifications.php:66
 #: ../../mod/photos.php:133 ../../mod/photos.php:1044
-#: ../../mod/display.php:209 ../../mod/install.php:151
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
-#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
-#: ../../index.php:346
+#: ../../mod/install.php:151 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:169 ../../mod/profile_photo.php:180
+#: ../../mod/profile_photo.php:193 ../../index.php:346
 msgid "Permission denied."
 msgstr ""
 
@@ -1549,7 +1548,7 @@ msgid "Select"
 msgstr ""
 
 #: ../../include/conversation.php:588 ../../mod/admin.php:770
-#: ../../mod/settings.php:625 ../../mod/group.php:171
+#: ../../mod/settings.php:643 ../../mod/group.php:171
 #: ../../mod/photos.php:1637 ../../mod/content.php:462
 #: ../../mod/content.php:764 ../../object/Item.php:127
 msgid "Delete"
@@ -2235,35 +2234,31 @@ msgstr ""
 msgid "Error! No version data in file! This is not a Friendica account file?"
 msgstr ""
 
-#: ../../include/uimport.php:105
-msgid "Error! I can't import this file: DB schema version is not compatible."
-msgstr ""
-
-#: ../../include/uimport.php:114
+#: ../../include/uimport.php:116
 msgid "Error! Cannot check nickname"
 msgstr ""
 
-#: ../../include/uimport.php:118
+#: ../../include/uimport.php:120
 #, php-format
 msgid "User '%s' already exists on this server!"
 msgstr ""
 
-#: ../../include/uimport.php:137
+#: ../../include/uimport.php:139
 msgid "User creation error"
 msgstr ""
 
-#: ../../include/uimport.php:155
+#: ../../include/uimport.php:157
 msgid "User profile creation error"
 msgstr ""
 
-#: ../../include/uimport.php:200
+#: ../../include/uimport.php:202
 #, php-format
 msgid "%d contact not imported"
 msgid_plural "%d contacts not imported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/uimport.php:270
+#: ../../include/uimport.php:272
 msgid "Done. You can now login with your username and password"
 msgstr ""
 
@@ -2395,13 +2390,13 @@ msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
 #: ../../mod/profiles.php:611 ../../mod/api.php:106 ../../mod/register.php:240
-#: ../../mod/settings.php:936 ../../mod/settings.php:942
-#: ../../mod/settings.php:950 ../../mod/settings.php:954
-#: ../../mod/settings.php:959 ../../mod/settings.php:965
-#: ../../mod/settings.php:971 ../../mod/settings.php:977
-#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1009 ../../mod/settings.php:1010
-#: ../../mod/settings.php:1011 ../../mod/dfrn_request.php:837
+#: ../../mod/settings.php:954 ../../mod/settings.php:960
+#: ../../mod/settings.php:968 ../../mod/settings.php:972
+#: ../../mod/settings.php:977 ../../mod/settings.php:983
+#: ../../mod/settings.php:989 ../../mod/settings.php:995
+#: ../../mod/settings.php:1025 ../../mod/settings.php:1026
+#: ../../mod/settings.php:1027 ../../mod/settings.php:1028
+#: ../../mod/settings.php:1029 ../../mod/dfrn_request.php:837
 msgid "No"
 msgstr ""
 
@@ -2411,9 +2406,9 @@ msgstr ""
 
 #: ../../mod/profiles.php:630 ../../mod/admin.php:491 ../../mod/admin.php:763
 #: ../../mod/admin.php:902 ../../mod/admin.php:1102 ../../mod/admin.php:1189
-#: ../../mod/contacts.php:386 ../../mod/settings.php:562
-#: ../../mod/settings.php:672 ../../mod/settings.php:741
-#: ../../mod/settings.php:813 ../../mod/settings.php:1039
+#: ../../mod/contacts.php:386 ../../mod/settings.php:580
+#: ../../mod/settings.php:690 ../../mod/settings.php:759
+#: ../../mod/settings.php:831 ../../mod/settings.php:1057
 #: ../../mod/crepair.php:166 ../../mod/poke.php:199 ../../mod/events.php:478
 #: ../../mod/fsuggest.php:107 ../../mod/group.php:87 ../../mod/invite.php:140
 #: ../../mod/localtime.php:45 ../../mod/manage.php:110
@@ -2637,6 +2632,21 @@ msgstr ""
 msgid "Personal Notes"
 msgstr ""
 
+#: ../../mod/display.php:19 ../../mod/search.php:89
+#: ../../mod/dfrn_request.php:761 ../../mod/directory.php:31
+#: ../../mod/viewcontacts.php:17 ../../mod/photos.php:914
+#: ../../mod/community.php:18
+msgid "Public access denied."
+msgstr ""
+
+#: ../../mod/display.php:99 ../../mod/profile.php:155
+msgid "Access to this profile has been restricted."
+msgstr ""
+
+#: ../../mod/display.php:239
+msgid "Item has been removed."
+msgstr ""
+
 #: ../../mod/nogroup.php:40 ../../mod/contacts.php:395
 #: ../../mod/contacts.php:585 ../../mod/viewcontacts.php:62
 #, php-format
@@ -2790,7 +2800,7 @@ msgstr ""
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:434 ../../mod/settings.php:771
+#: ../../mod/admin.php:434 ../../mod/settings.php:789
 msgid "No special theme for mobile devices"
 msgstr ""
 
@@ -3333,8 +3343,8 @@ msgstr ""
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:766 ../../mod/admin.php:777 ../../mod/settings.php:564
-#: ../../mod/settings.php:590 ../../mod/crepair.php:148
+#: ../../mod/admin.php:766 ../../mod/admin.php:777 ../../mod/settings.php:582
+#: ../../mod/settings.php:608 ../../mod/crepair.php:148
 msgid "Name"
 msgstr ""
 
@@ -3540,13 +3550,6 @@ msgstr ""
 msgid "Remove term"
 msgstr ""
 
-#: ../../mod/search.php:89 ../../mod/dfrn_request.php:761
-#: ../../mod/directory.php:31 ../../mod/viewcontacts.php:17
-#: ../../mod/photos.php:914 ../../mod/display.php:19
-#: ../../mod/community.php:18
-msgid "Public access denied."
-msgstr ""
-
 #: ../../mod/search.php:180 ../../mod/search.php:206
 #: ../../mod/community.php:61 ../../mod/community.php:89
 msgid "No results."
@@ -4068,7 +4071,7 @@ msgstr ""
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:121 ../../mod/settings.php:588
+#: ../../mod/settings.php:121 ../../mod/settings.php:606
 msgid "Update"
 msgstr ""
 
@@ -4084,510 +4087,530 @@ msgstr ""
 msgid "Features updated"
 msgstr ""
 
-#: ../../mod/settings.php:307
+#: ../../mod/settings.php:308
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:312
+#: ../../mod/settings.php:313
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:323
+#: ../../mod/settings.php:321
+msgid "Wrong password."
+msgstr ""
+
+#: ../../mod/settings.php:332
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:325
+#: ../../mod/settings.php:334
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:390
+#: ../../mod/settings.php:399
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:392
+#: ../../mod/settings.php:401
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:398
+#: ../../mod/settings.php:410
+msgid "Wrong Password"
+msgstr ""
+
+#: ../../mod/settings.php:415
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:400
+#: ../../mod/settings.php:418
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:454
+#: ../../mod/settings.php:472
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:458
+#: ../../mod/settings.php:476
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:488
+#: ../../mod/settings.php:506
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:561 ../../mod/settings.php:587
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:579 ../../mod/settings.php:605
+#: ../../mod/settings.php:641
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:565 ../../mod/settings.php:591
+#: ../../mod/settings.php:583 ../../mod/settings.php:609
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:566 ../../mod/settings.php:592
+#: ../../mod/settings.php:584 ../../mod/settings.php:610
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:567 ../../mod/settings.php:593
+#: ../../mod/settings.php:585 ../../mod/settings.php:611
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:568 ../../mod/settings.php:594
+#: ../../mod/settings.php:586 ../../mod/settings.php:612
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:579
+#: ../../mod/settings.php:597
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:622
+#: ../../mod/settings.php:640
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:624 ../../mod/editpost.php:109
+#: ../../mod/settings.php:642 ../../mod/editpost.php:109
 #: ../../mod/content.php:751 ../../object/Item.php:117
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:644
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:627
+#: ../../mod/settings.php:645
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:628
+#: ../../mod/settings.php:646
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:640
+#: ../../mod/settings.php:658
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:648
+#: ../../mod/settings.php:666
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:662
+#: ../../mod/settings.php:680
 msgid "Off"
 msgstr ""
 
-#: ../../mod/settings.php:662
+#: ../../mod/settings.php:680
 msgid "On"
 msgstr ""
 
-#: ../../mod/settings.php:670
+#: ../../mod/settings.php:688
 msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/settings.php:683 ../../mod/settings.php:684
+#: ../../mod/settings.php:701 ../../mod/settings.php:702
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:683 ../../mod/settings.php:684
+#: ../../mod/settings.php:701 ../../mod/settings.php:702
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:683 ../../mod/settings.php:684
+#: ../../mod/settings.php:701 ../../mod/settings.php:702
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:684
+#: ../../mod/settings.php:702
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:716
+#: ../../mod/settings.php:734
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:723
+#: ../../mod/settings.php:741
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:728
+#: ../../mod/settings.php:746
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:729
+#: ../../mod/settings.php:747
 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:730
+#: ../../mod/settings.php:748
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:732
+#: ../../mod/settings.php:750
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:733
+#: ../../mod/settings.php:751
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:752
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:734 ../../mod/settings.php:739
+#: ../../mod/settings.php:752 ../../mod/settings.php:757
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:753
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:754
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:755
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:738
+#: ../../mod/settings.php:756
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:739
+#: ../../mod/settings.php:757
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:739
+#: ../../mod/settings.php:757
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:739
+#: ../../mod/settings.php:757
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:740
+#: ../../mod/settings.php:758
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:811
+#: ../../mod/settings.php:829
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:817 ../../mod/settings.php:828
+#: ../../mod/settings.php:835 ../../mod/settings.php:846
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:836
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:819
+#: ../../mod/settings.php:837
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:819
+#: ../../mod/settings.php:837
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:820
+#: ../../mod/settings.php:838
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: ../../mod/settings.php:820
+#: ../../mod/settings.php:838
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:821
+#: ../../mod/settings.php:839
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:897
+#: ../../mod/settings.php:915
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:916
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:901
+#: ../../mod/settings.php:919
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:902
+#: ../../mod/settings.php:920
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:905
+#: ../../mod/settings.php:923
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:924
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:909
+#: ../../mod/settings.php:927
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:928
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:913
+#: ../../mod/settings.php:931
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:914
+#: ../../mod/settings.php:932
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:926
+#: ../../mod/settings.php:944
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:926
+#: ../../mod/settings.php:944
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:936
+#: ../../mod/settings.php:954
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:942
+#: ../../mod/settings.php:960
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:950
+#: ../../mod/settings.php:968
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:954
+#: ../../mod/settings.php:972
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:959
+#: ../../mod/settings.php:977
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:965
+#: ../../mod/settings.php:983
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:971
+#: ../../mod/settings.php:989
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:977
+#: ../../mod/settings.php:995
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:985
+#: ../../mod/settings.php:1003
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:988 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:1006 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:993
+#: ../../mod/settings.php:1011
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1022
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1022
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1023
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1024
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1025
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1026
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:1009
+#: ../../mod/settings.php:1027
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1010
+#: ../../mod/settings.php:1028
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:1011
+#: ../../mod/settings.php:1029
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1055
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1045
+#: ../../mod/settings.php:1063
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1046
+#: ../../mod/settings.php:1064
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:1047
+#: ../../mod/settings.php:1065
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:1047
+#: ../../mod/settings.php:1065
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1066
+msgid "Current Password:"
+msgstr ""
+
+#: ../../mod/settings.php:1066 ../../mod/settings.php:1067
+msgid "Your current password to confirm the changes"
+msgstr ""
+
+#: ../../mod/settings.php:1067
+msgid "Password:"
+msgstr ""
+
+#: ../../mod/settings.php:1071
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1053
+#: ../../mod/settings.php:1073
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:1054
+#: ../../mod/settings.php:1074
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:1055
+#: ../../mod/settings.php:1075
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1056
+#: ../../mod/settings.php:1076
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1059
+#: ../../mod/settings.php:1079
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1081
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:1061 ../../mod/settings.php:1091
+#: ../../mod/settings.php:1081 ../../mod/settings.php:1111
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1082
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1083
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1072 ../../mod/photos.php:1140
+#: ../../mod/settings.php:1092 ../../mod/photos.php:1140
 #: ../../mod/photos.php:1506
 msgid "Show to Groups"
 msgstr ""
 
-#: ../../mod/settings.php:1073 ../../mod/photos.php:1141
+#: ../../mod/settings.php:1093 ../../mod/photos.php:1141
 #: ../../mod/photos.php:1507
 msgid "Show to Contacts"
 msgstr ""
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1094
 msgid "Default Private Post"
 msgstr ""
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1095
 msgid "Default Public Post"
 msgstr ""
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1099
 msgid "Default Permissions for New Posts"
 msgstr ""
 
-#: ../../mod/settings.php:1091
+#: ../../mod/settings.php:1111
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1114
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1095
+#: ../../mod/settings.php:1115
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1116
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1117
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1118
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1119
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1120
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:1101
+#: ../../mod/settings.php:1121
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1122
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1123
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1104
+#: ../../mod/settings.php:1124
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1105
+#: ../../mod/settings.php:1125
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1106
+#: ../../mod/settings.php:1126
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1107
+#: ../../mod/settings.php:1127
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1110
+#: ../../mod/settings.php:1130
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1111
+#: ../../mod/settings.php:1131
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
@@ -6303,18 +6326,10 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:155 ../../mod/display.php:99
-msgid "Access to this profile has been restricted."
-msgstr ""
-
 #: ../../mod/profile.php:180
 msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/display.php:206
-msgid "Item has been removed."
-msgstr ""
-
 #: ../../mod/install.php:117
 msgid "Friendica Social Communications Server - Setup"
 msgstr ""

From ddf1caf0fd9ea4fc97147ba7b45587bcf7a6fab4 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 27 Mar 2013 10:37:59 -0400
Subject: [PATCH 22/67] template engine rework - use smarty3 as default engine
 - new pluggable template engine system

---
 boot.php                       | 74 ++++++++++++++++++++++++++++++++--
 include/friendica_smarty.php   | 32 +++++++++++++--
 include/template_processor.php | 21 +++++++---
 include/text.php               | 32 +++++----------
 object/TemplateEngine.php      | 11 +++++
 5 files changed, 136 insertions(+), 34 deletions(-)
 create mode 100644 object/TemplateEngine.php

diff --git a/boot.php b/boot.php
index 0475f6ab39..477b8331c0 100644
--- a/boot.php
+++ b/boot.php
@@ -385,6 +385,11 @@ if(! class_exists('App')) {
 			'stylesheet' => '',
 			'template_engine' => 'internal',
 		);
+		
+		// array of registered template engines ('name'=>'class name')
+		public $template_engines = array();
+		// array of instanced template engines ('name'=>'instance')
+		public $template_engine_instance = array();
 
 		private $ldelim = array(
 			'internal' => '',
@@ -539,6 +544,17 @@ if(! class_exists('App')) {
 			$mobile_detect = new Mobile_Detect();
 			$this->is_mobile = $mobile_detect->isMobile();
 			$this->is_tablet = $mobile_detect->isTablet();
+			
+			/**
+			 * register template engines
+			 */
+			$dc = get_declared_classes();
+			foreach ($dc as $k) {
+				if (in_array("ITemplateEngine", class_implements($k))){
+					$this->register_template_engine($k);
+				}
+			}
+			
 		}
 
 		function get_basepath() {
@@ -712,13 +728,63 @@ if(! class_exists('App')) {
 			return $this->cached_profile_image[$avatar_image];
 		}
 
+
+		/**
+		 * register template engine class
+		 * if $name is "", is used class static property $class::$name
+		 * @param string $class
+		 * @param string $name
+		 */
+		function register_template_engine($class, $name = '') {
+			if ($name===""){
+				$v = get_class_vars( $class );
+				if(x($v,"name")) $name = $v['name'];
+			}
+	 		if ($name===""){
+ 				echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
+				killme(); 
+ 			}
+			$this->template_engines[$name] = $class;
+		}
+
+		/**
+		 * return template engine instance. If $name is not defined,
+		 * return engine defined by theme, or default
+		 * 
+		 * @param strin $name Template engine name
+		 * @return object Template Engine instance
+		 */
+		function template_engine($name = ''){
+			
+			if ($name!=="") {
+				$template_engine = $name;
+			} else {
+				$template_engine = 'smarty3';
+				if (x($this->theme, 'template_engine')) {
+					$template_engine = $this->theme['template_engine'];
+				}
+			}
+			if (isset($this->template_engines[$template_engine])){
+				if(isset($this->template_engine_instance[$template_engine])){
+					return $this->template_engine_instance[$template_engine];
+				} else {
+					$class = $this->template_engines[$template_engine];
+					$obj = new $class;
+					$this->template_engine_instance[$template_engine] = $obj;
+					return $obj;
+				}
+			}
+			
+			echo "template engine <tt>$template_engine</tt> is not registered!\n"; killme();
+		}
+
 		function get_template_engine() {
 			return $this->theme['template_engine'];
 		}
 
-		function set_template_engine($engine = 'internal') {
+		function set_template_engine($engine = 'smarty3') {
 
-			$this->theme['template_engine'] = 'internal';
+			$this->theme['template_engine'] = 'smarty3';
 
 			switch($engine) {
 				case 'smarty3':
@@ -730,11 +796,11 @@ if(! class_exists('App')) {
 			}
 		}
 
-		function get_template_ldelim($engine = 'internal') {
+		function get_template_ldelim($engine = 'smarty3') {
 			return $this->ldelim[$engine];
 		}
 
-		function get_template_rdelim($engine = 'internal') {
+		function get_template_rdelim($engine = 'smarty3') {
 			return $this->rdelim[$engine];
 		}
 
diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php
index b3f0d18a01..f9d91a827d 100644
--- a/include/friendica_smarty.php
+++ b/include/friendica_smarty.php
@@ -1,9 +1,9 @@
 <?php
 
+require_once "object/TemplateEngine.php";
 require_once("library/Smarty/libs/Smarty.class.php");
 
 class FriendicaSmarty extends Smarty {
-
 	public $filename;
 
 	function __construct() {
@@ -37,7 +37,33 @@ class FriendicaSmarty extends Smarty {
 		}
 		return $this->fetch('file:' . $this->filename);
 	}
+	
+
 }
 
-
-
+class FriendicaSmartyEngine implements ITemplateEngine {
+	static $name ="smarty3";
+	// ITemplateEngine interface
+	public function replace_macros($s, $r) {
+		$template = '';
+		if(gettype($s) === 'string') {
+			$template = $s;
+			$s = new FriendicaSmarty();
+		}
+		foreach($r as $key=>$value) {
+			if($key[0] === '$') {
+				$key = substr($key, 1);
+			}
+			$s->assign($key, $value);
+		}
+		return $s->parsed($template);		
+	}
+	
+	public function get_template_file($file, $root=''){
+		$a = get_app();
+		$template_file = get_template_file($a, 'smarty3/' . $file, $root);
+		$template = new FriendicaSmarty();
+		$template->filename = $template_file;
+		return $template;
+	}
+}
diff --git a/include/template_processor.php b/include/template_processor.php
index ebc03b8d84..49d37488f9 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -1,9 +1,11 @@
 <?php
+require_once 'object/TemplateEngine.php';
 
 define("KEY_NOT_EXISTS", '^R_key_not_Exists^');
 
-class Template {
-
+class Template implements ITemplateEngine {
+	static $name ="internal";
+	
 	var $r;
 	var $search;
 	var $replace;
@@ -256,7 +258,8 @@ class Template {
 		return $s;
 	}
 
-	public function replace($s, $r) {
+	// TemplateEngine interface
+	public function replace_macros($s, $r) {
 		$this->r = $r;
 
 		// remove comments block
@@ -276,12 +279,18 @@ class Template {
 			$count++;
 			$s = $this->var_replace($s);
 		}
-		return $s;
+		return template_unescape($s);
 	}
-
+	
+	public function get_template_file($file, $root='') {
+		$a = get_app();
+		$template_file = get_template_file($a, $file, $root);
+		$content = file_get_contents($template_file);
+		return $content;		
+	}
+	
 }
 
-$t = new Template;
 
 function template_escape($s) {
 
diff --git a/include/text.php b/include/text.php
index 3d244c61ff..628b4fc2da 100644
--- a/include/text.php
+++ b/include/text.php
@@ -15,39 +15,20 @@ if(! function_exists('replace_macros')) {
 /**
  * This is our template processor
  * 
- * @global Template $t
  * @param string|FriendicaSmarty $s the string requiring macro substitution, 
  *									or an instance of FriendicaSmarty
  * @param array $r key value pairs (search => replace)
  * @return string substituted string
  */
 function replace_macros($s,$r) {
-	global $t;
 	
 	$stamp1 = microtime(true);
 
 	$a = get_app();
 
-	if($a->theme['template_engine'] === 'smarty3') {
-		$template = '';
-		if(gettype($s) === 'string') {
-			$template = $s;
-			$s = new FriendicaSmarty();
-		}
-		foreach($r as $key=>$value) {
-			if($key[0] === '$') {
-				$key = substr($key, 1);
-			}
-			$s->assign($key, $value);
-		}
-		$output = $s->parsed($template);
-	}
-	else {
-		$r =  $t->replace($s,$r);
+	$t = $a->template_engine();
+	$output = $t->replace_macros($s,$r);
 
-		$output = template_unescape($r);
-	}
-	$a = get_app();
 	$a->save_timestamp($stamp1, "rendering");
 
 	return $output;
@@ -582,6 +563,14 @@ function get_markup_template($s, $root = '') {
 	$stamp1 = microtime(true);
 
 	$a = get_app();
+	$t = $a->template_engine();
+	
+	$template = $t->get_template_file($s, $root);
+	
+	$a->save_timestamp($stamp1, "file");
+	
+	return $template;
+	/*
 
 	if($a->theme['template_engine'] === 'smarty3') {
 		$template_file = get_template_file($a, 'smarty3/' . $s, $root);
@@ -602,6 +591,7 @@ function get_markup_template($s, $root = '') {
 		return $content;
 
 	}
+	 */
 }}
 
 if(! function_exists("get_template_file")) {
diff --git a/object/TemplateEngine.php b/object/TemplateEngine.php
new file mode 100644
index 0000000000..cbd74aaec9
--- /dev/null
+++ b/object/TemplateEngine.php
@@ -0,0 +1,11 @@
+<?php
+require_once 'boot.php';
+
+
+/**
+ * Interface for template engines
+ */
+interface ITemplateEngine {
+	public function replace_macros($s,$v);
+	public function get_template_file($file, $root='');
+}

From 6fddd1cbbff6de6dd88487698469a7f1b7f6854e Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 27 Mar 2013 10:41:23 -0400
Subject: [PATCH 23/67] template: remove old 'internal' template files, move
 smarty3 templates into 'templates' subdir

---
 include/friendica_smarty.php                  |  10 +-
 view/404.tpl                                  |   1 -
 view/acl_selector.tpl                         |  26 --
 view/admin_aside.tpl                          |  42 --
 view/admin_logs.tpl                           |  19 -
 view/admin_plugins.tpl                        |  15 -
 view/admin_plugins_details.tpl                |  36 --
 view/admin_remoteupdate.tpl                   |  98 -----
 view/admin_site.tpl                           | 116 ------
 view/admin_summary.tpl                        |  40 --
 view/admin_users.tpl                          |  98 -----
 view/album_edit.tpl                           |  15 -
 view/api_config_xml.tpl                       |  66 ---
 view/api_friends_xml.tpl                      |   7 -
 view/api_ratelimit_xml.tpl                    |   6 -
 view/api_status_xml.tpl                       |  46 ---
 view/api_test_xml.tpl                         |   1 -
 view/api_timeline_atom.tpl                    |  90 -----
 view/api_timeline_rss.tpl                     |  26 --
 view/api_timeline_xml.tpl                     |  20 -
 view/api_user_xml.tpl                         |  46 ---
 view/apps.tpl                                 |   7 -
 view/atom_feed.tpl                            |  29 --
 view/atom_feed_dfrn.tpl                       |  29 --
 view/atom_mail.tpl                            |  17 -
 view/atom_relocate.tpl                        |  17 -
 view/atom_suggest.tpl                         |  11 -
 view/auto_request.tpl                         |  37 --
 view/birthdays_reminder.tpl                   |  10 -
 view/categories_widget.tpl                    |  12 -
 view/comment_item.tpl                         |  39 --
 view/common_friends.tpl                       |  12 -
 view/common_tabs.tpl                          |   5 -
 view/confirm.tpl                              |  14 -
 view/contact_block.tpl                        |  12 -
 view/contact_edit.tpl                         |  88 ----
 view/contact_end.tpl                          |   0
 view/contact_head.tpl                         |  30 --
 view/contact_template.tpl                     |  31 --
 view/contacts-end.tpl                         |   0
 view/contacts-head.tpl                        |  17 -
 view/contacts-template.tpl                    |  26 --
 view/contacts-widget-sidebar.tpl              |   6 -
 view/content.tpl                              |   2 -
 view/conversation.tpl                         |  29 --
 view/crepair.tpl                              |  46 ---
 view/cropbody.tpl                             |  58 ---
 view/cropend.tpl                              |   0
 view/crophead.tpl                             |   4 -
 view/delegate.tpl                             |  57 ---
 view/dfrn_req_confirm.tpl                     |  21 -
 view/dfrn_request.tpl                         |  65 ---
 view/diasp_dec_hdr.tpl                        |   8 -
 view/diaspora_comment.tpl                     |  11 -
 view/diaspora_comment_relay.tpl               |  12 -
 view/diaspora_conversation.tpl                |  29 --
 view/diaspora_like.tpl                        |  12 -
 view/diaspora_like_relay.tpl                  |  13 -
 view/diaspora_message.tpl                     |  13 -
 view/diaspora_photo.tpl                       |  13 -
 view/diaspora_post.tpl                        |  11 -
 view/diaspora_profile.tpl                     |  16 -
 view/diaspora_relay_retraction.tpl            |  10 -
 view/diaspora_relayable_retraction.tpl        |  11 -
 view/diaspora_retract.tpl                     |   9 -
 view/diaspora_share.tpl                       |   8 -
 view/diaspora_signed_retract.tpl              |  10 -
 view/diaspora_vcard.tpl                       |  57 ---
 view/directory_header.tpl                     |  16 -
 view/directory_item.tpl                       |  11 -
 view/display-head.tpl                         |   8 -
 view/email_notify_html.tpl                    |  30 --
 view/email_notify_text.tpl                    |  16 -
 view/end.tpl                                  |   0
 view/event.tpl                                |  10 -
 view/event_end.tpl                            |   0
 view/event_form.tpl                           |  49 ---
 view/event_head.tpl                           | 139 -------
 view/events-js.tpl                            |   6 -
 view/events.tpl                               |  24 --
 view/events_reminder.tpl                      |  10 -
 view/failed_updates.tpl                       |  17 -
 view/fake_feed.tpl                            |  13 -
 view/field.tpl                                |   4 -
 view/field_checkbox.tpl                       |   6 -
 view/field_combobox.tpl                       |  18 -
 view/field_custom.tpl                         |   6 -
 view/field_input.tpl                          |   6 -
 view/field_intcheckbox.tpl                    |   6 -
 view/field_openid.tpl                         |   6 -
 view/field_password.tpl                       |   6 -
 view/field_radio.tpl                          |   6 -
 view/field_richtext.tpl                       |   6 -
 view/field_select.tpl                         |   8 -
 view/field_select_raw.tpl                     |   8 -
 view/field_textarea.tpl                       |   6 -
 view/field_themeselect.tpl                    |   9 -
 view/field_yesno.tpl                          |  13 -
 view/fileas_widget.tpl                        |  12 -
 view/filebrowser.tpl                          |  84 ----
 view/filer_dialog.tpl                         |   4 -
 view/follow.tpl                               |   8 -
 view/follow_slap.tpl                          |  25 --
 view/generic_links_widget.tpl                 |  11 -
 view/group_drop.tpl                           |   9 -
 view/group_edit.tpl                           |  23 --
 view/group_selection.tpl                      |   8 -
 view/group_side.tpl                           |  33 --
 view/groupeditor.tpl                          |  16 -
 view/head.tpl                                 | 112 ------
 view/hide_comments.tpl                        |   4 -
 view/install.tpl                              |  10 -
 view/install_checks.tpl                       |  24 --
 view/install_db.tpl                           |  30 --
 view/install_settings.tpl                     |  25 --
 view/intros.tpl                               |  28 --
 view/invite.tpl                               |  30 --
 view/jot-end.tpl                              |   0
 view/jot-header.tpl                           | 322 ---------------
 view/jot.tpl                                  |  88 ----
 view/jot_geotag.tpl                           |   8 -
 view/lang_selector.tpl                        |  10 -
 view/like_noshare.tpl                         |   7 -
 view/login.tpl                                |  35 --
 view/login_head.tpl                           |   0
 view/logout.tpl                               |   6 -
 view/lostpass.tpl                             |  18 -
 view/magicsig.tpl                             |   9 -
 view/mail_conv.tpl                            |  14 -
 view/mail_display.tpl                         |  10 -
 view/mail_head.tpl                            |   3 -
 view/mail_list.tpl                            |  16 -
 view/maintenance.tpl                          |   1 -
 view/manage.tpl                               |  17 -
 view/match.tpl                                |  16 -
 view/message-end.tpl                          |   0
 view/message-head.tpl                         |  17 -
 view/message_side.tpl                         |  10 -
 view/moderated_comment.tpl                    |  34 --
 view/mood_content.tpl                         |  20 -
 view/msg-end.tpl                              |   0
 view/msg-header.tpl                           |  97 -----
 view/nav.tpl                                  |  68 ----
 view/navigation.tpl                           | 103 -----
 view/netfriend.tpl                            |  14 -
 view/nets.tpl                                 |  10 -
 view/nogroup-template.tpl                     |  12 -
 view/notifications.tpl                        |   8 -
 view/notifications_comments_item.tpl          |   3 -
 view/notifications_dislikes_item.tpl          |   3 -
 view/notifications_friends_item.tpl           |   3 -
 view/notifications_likes_item.tpl             |   3 -
 view/notifications_network_item.tpl           |   3 -
 view/notifications_posts_item.tpl             |   3 -
 view/notify.tpl                               |   3 -
 view/oauth_authorize.tpl                      |  10 -
 view/oauth_authorize_done.tpl                 |   4 -
 view/oembed_video.tpl                         |   4 -
 view/oexchange_xrd.tpl                        |  33 --
 view/opensearch.tpl                           |  13 -
 view/pagetypes.tpl                            |   5 -
 view/peoplefind.tpl                           |  14 -
 view/photo_album.tpl                          |   7 -
 view/photo_drop.tpl                           |   4 -
 view/photo_edit.tpl                           |  50 ---
 view/photo_edit_head.tpl                      |  11 -
 view/photo_item.tpl                           |  22 -
 view/photo_top.tpl                            |   8 -
 view/photo_view.tpl                           |  37 --
 view/photos_default_uploader_box.tpl          |   1 -
 view/photos_default_uploader_submit.tpl       |   3 -
 view/photos_head.tpl                          |  26 --
 view/photos_recent.tpl                        |  11 -
 view/photos_upload.tpl                        |  49 ---
 view/poco_entry_xml.tpl                       |   7 -
 view/poco_xml.tpl                             |  18 -
 view/poke_content.tpl                         |  32 --
 view/posted_date_widget.tpl                   |   9 -
 view/profed_end.tpl                           |   0
 view/profed_head.tpl                          |  38 --
 view/profile-hide-friends.tpl                 |  16 -
 view/profile-hide-wall.tpl                    |  16 -
 view/profile-in-directory.tpl                 |  16 -
 view/profile-in-netdir.tpl                    |  16 -
 view/profile_advanced.tpl                     | 170 --------
 view/profile_edit.tpl                         | 323 ---------------
 view/profile_edlink.tpl                       |   2 -
 view/profile_entry.tpl                        |  11 -
 view/profile_listing_header.tpl               |   8 -
 view/profile_photo.tpl                        |  26 --
 view/profile_publish.tpl                      |  16 -
 view/profile_vcard.tpl                        |  50 ---
 view/prv_message.tpl                          |  33 --
 view/pwdreset.tpl                             |  17 -
 view/register.tpl                             |  65 ---
 view/remote_friends_common.tpl                |  21 -
 view/removeme.tpl                             |  20 -
 view/saved_searches_aside.tpl                 |  14 -
 view/search_item.tpl                          |  64 ---
 view/settings-end.tpl                         |   0
 view/settings-head.tpl                        |  25 --
 view/settings.tpl                             | 147 -------
 view/settings_addons.tpl                      |  10 -
 view/settings_connectors.tpl                  |  35 --
 view/settings_display.tpl                     |  22 -
 view/settings_display_end.tpl                 |   0
 view/settings_features.tpl                    |  20 -
 view/settings_nick_set.tpl                    |   5 -
 view/settings_nick_subdir.tpl                 |   6 -
 view/settings_oauth.tpl                       |  31 --
 view/settings_oauth_edit.tpl                  |  17 -
 view/smarty3/404.tpl                          |   6 -
 view/smarty3/acl_selector.tpl                 |  31 --
 view/smarty3/admin_aside.tpl                  |  47 ---
 view/smarty3/admin_logs.tpl                   |  24 --
 view/smarty3/admin_plugins.tpl                |  20 -
 view/smarty3/admin_plugins_details.tpl        |  41 --
 view/smarty3/admin_remoteupdate.tpl           | 103 -----
 view/smarty3/admin_site.tpl                   | 121 ------
 view/smarty3/admin_summary.tpl                |  45 ---
 view/smarty3/admin_users.tpl                  | 103 -----
 view/smarty3/album_edit.tpl                   |  20 -
 view/smarty3/api_config_xml.tpl               |  71 ----
 view/smarty3/api_friends_xml.tpl              |  12 -
 view/smarty3/api_ratelimit_xml.tpl            |  11 -
 view/smarty3/api_status_xml.tpl               |  51 ---
 view/smarty3/api_test_xml.tpl                 |   6 -
 view/smarty3/api_timeline_atom.tpl            |  95 -----
 view/smarty3/api_timeline_rss.tpl             |  31 --
 view/smarty3/api_timeline_xml.tpl             |  25 --
 view/smarty3/api_user_xml.tpl                 |  51 ---
 view/smarty3/apps.tpl                         |  12 -
 view/smarty3/atom_feed.tpl                    |  34 --
 view/smarty3/atom_feed_dfrn.tpl               |  34 --
 view/smarty3/atom_mail.tpl                    |  22 -
 view/smarty3/atom_relocate.tpl                |  22 -
 view/smarty3/atom_suggest.tpl                 |  16 -
 view/smarty3/auto_request.tpl                 |  42 --
 view/smarty3/birthdays_reminder.tpl           |  15 -
 view/smarty3/categories_widget.tpl            |  17 -
 view/smarty3/comment_item.tpl                 |  44 --
 view/smarty3/common_friends.tpl               |  17 -
 view/smarty3/common_tabs.tpl                  |  10 -
 view/smarty3/confirm.tpl                      |  19 -
 view/smarty3/contact_block.tpl                |  17 -
 view/smarty3/contact_edit.tpl                 |  93 -----
 view/smarty3/contact_end.tpl                  |   5 -
 view/smarty3/contact_head.tpl                 |  35 --
 view/smarty3/contact_template.tpl             |  36 --
 view/smarty3/contacts-end.tpl                 |   5 -
 view/smarty3/contacts-head.tpl                |  22 -
 view/smarty3/contacts-template.tpl            |  31 --
 view/smarty3/contacts-widget-sidebar.tpl      |  11 -
 view/smarty3/content.tpl                      |   7 -
 view/smarty3/conversation.tpl                 |  34 --
 view/smarty3/crepair.tpl                      |  51 ---
 view/smarty3/cropbody.tpl                     |  63 ---
 view/smarty3/cropend.tpl                      |   5 -
 view/smarty3/crophead.tpl                     |   9 -
 view/smarty3/delegate.tpl                     |  62 ---
 view/smarty3/dfrn_req_confirm.tpl             |  26 --
 view/smarty3/dfrn_request.tpl                 |  70 ----
 view/smarty3/diasp_dec_hdr.tpl                |  13 -
 view/smarty3/diaspora_comment.tpl             |  16 -
 view/smarty3/diaspora_comment_relay.tpl       |  17 -
 view/smarty3/diaspora_conversation.tpl        |  34 --
 view/smarty3/diaspora_like.tpl                |  17 -
 view/smarty3/diaspora_like_relay.tpl          |  18 -
 view/smarty3/diaspora_message.tpl             |  18 -
 view/smarty3/diaspora_photo.tpl               |  18 -
 view/smarty3/diaspora_post.tpl                |  16 -
 view/smarty3/diaspora_profile.tpl             |  21 -
 view/smarty3/diaspora_relay_retraction.tpl    |  15 -
 .../smarty3/diaspora_relayable_retraction.tpl |  16 -
 view/smarty3/diaspora_retract.tpl             |  14 -
 view/smarty3/diaspora_share.tpl               |  13 -
 view/smarty3/diaspora_signed_retract.tpl      |  15 -
 view/smarty3/diaspora_vcard.tpl               |  62 ---
 view/smarty3/directory_header.tpl             |  21 -
 view/smarty3/directory_item.tpl               |  16 -
 view/smarty3/display-head.tpl                 |  13 -
 view/smarty3/email_notify_html.tpl            |  35 --
 view/smarty3/email_notify_text.tpl            |  21 -
 view/smarty3/end.tpl                          |   5 -
 view/smarty3/event.tpl                        |  15 -
 view/smarty3/event_end.tpl                    |   5 -
 view/smarty3/event_form.tpl                   |  54 ---
 view/smarty3/event_head.tpl                   | 144 -------
 view/smarty3/events-js.tpl                    |  11 -
 view/smarty3/events.tpl                       |  29 --
 view/smarty3/events_reminder.tpl              |  15 -
 view/smarty3/failed_updates.tpl               |  22 -
 view/smarty3/fake_feed.tpl                    |  18 -
 view/smarty3/field.tpl                        |   9 -
 view/smarty3/field_checkbox.tpl               |  11 -
 view/smarty3/field_combobox.tpl               |  23 --
 view/smarty3/field_custom.tpl                 |  11 -
 view/smarty3/field_input.tpl                  |  11 -
 view/smarty3/field_intcheckbox.tpl            |  11 -
 view/smarty3/field_openid.tpl                 |  11 -
 view/smarty3/field_password.tpl               |  11 -
 view/smarty3/field_radio.tpl                  |  11 -
 view/smarty3/field_richtext.tpl               |  11 -
 view/smarty3/field_select.tpl                 |  13 -
 view/smarty3/field_select_raw.tpl             |  13 -
 view/smarty3/field_textarea.tpl               |  11 -
 view/smarty3/field_themeselect.tpl            |  14 -
 view/smarty3/field_yesno.tpl                  |  18 -
 view/smarty3/fileas_widget.tpl                |  17 -
 view/smarty3/filebrowser.tpl                  |  89 ----
 view/smarty3/filer_dialog.tpl                 |   9 -
 view/smarty3/follow.tpl                       |  13 -
 view/smarty3/follow_slap.tpl                  |  30 --
 view/smarty3/generic_links_widget.tpl         |  16 -
 view/smarty3/group_drop.tpl                   |  14 -
 view/smarty3/group_edit.tpl                   |  28 --
 view/smarty3/group_selection.tpl              |  13 -
 view/smarty3/group_side.tpl                   |  38 --
 view/smarty3/groupeditor.tpl                  |  21 -
 view/smarty3/head.tpl                         | 117 ------
 view/smarty3/hide_comments.tpl                |   9 -
 view/smarty3/install.tpl                      |  15 -
 view/smarty3/install_checks.tpl               |  29 --
 view/smarty3/install_db.tpl                   |  35 --
 view/smarty3/install_settings.tpl             |  30 --
 view/smarty3/intros.tpl                       |  33 --
 view/smarty3/invite.tpl                       |  35 --
 view/smarty3/jot-end.tpl                      |   5 -
 view/smarty3/jot-header.tpl                   | 327 ---------------
 view/smarty3/jot.tpl                          |  93 -----
 view/smarty3/jot_geotag.tpl                   |  13 -
 view/smarty3/lang_selector.tpl                |  15 -
 view/smarty3/like_noshare.tpl                 |  12 -
 view/smarty3/login.tpl                        |  40 --
 view/smarty3/login_head.tpl                   |   5 -
 view/smarty3/logout.tpl                       |  11 -
 view/smarty3/lostpass.tpl                     |  23 --
 view/smarty3/magicsig.tpl                     |  14 -
 view/smarty3/mail_conv.tpl                    |  19 -
 view/smarty3/mail_display.tpl                 |  15 -
 view/smarty3/mail_head.tpl                    |   8 -
 view/smarty3/mail_list.tpl                    |  21 -
 view/smarty3/maintenance.tpl                  |   6 -
 view/smarty3/manage.tpl                       |  22 -
 view/smarty3/match.tpl                        |  21 -
 view/smarty3/message-end.tpl                  |   5 -
 view/smarty3/message-head.tpl                 |  22 -
 view/smarty3/message_side.tpl                 |  15 -
 view/smarty3/moderated_comment.tpl            |  39 --
 view/smarty3/mood_content.tpl                 |  25 --
 view/smarty3/msg-end.tpl                      |   5 -
 view/smarty3/msg-header.tpl                   | 102 -----
 view/smarty3/nav.tpl                          |  73 ----
 view/smarty3/navigation.tpl                   | 108 -----
 view/smarty3/netfriend.tpl                    |  19 -
 view/smarty3/nets.tpl                         |  15 -
 view/smarty3/nogroup-template.tpl             |  17 -
 view/smarty3/notifications.tpl                |  13 -
 view/smarty3/notifications_comments_item.tpl  |   8 -
 view/smarty3/notifications_dislikes_item.tpl  |   8 -
 view/smarty3/notifications_friends_item.tpl   |   8 -
 view/smarty3/notifications_likes_item.tpl     |   8 -
 view/smarty3/notifications_network_item.tpl   |   8 -
 view/smarty3/notifications_posts_item.tpl     |   8 -
 view/smarty3/notify.tpl                       |   8 -
 view/smarty3/oauth_authorize.tpl              |  15 -
 view/smarty3/oauth_authorize_done.tpl         |   9 -
 view/smarty3/oembed_video.tpl                 |   9 -
 view/smarty3/oexchange_xrd.tpl                |  38 --
 view/smarty3/opensearch.tpl                   |  18 -
 view/smarty3/pagetypes.tpl                    |  10 -
 view/smarty3/peoplefind.tpl                   |  19 -
 view/smarty3/photo_album.tpl                  |  12 -
 view/smarty3/photo_drop.tpl                   |   9 -
 view/smarty3/photo_edit.tpl                   |  55 ---
 view/smarty3/photo_edit_head.tpl              |  16 -
 view/smarty3/photo_item.tpl                   |  27 --
 view/smarty3/photo_top.tpl                    |  13 -
 view/smarty3/photo_view.tpl                   |  42 --
 view/smarty3/photos_default_uploader_box.tpl  |   6 -
 .../photos_default_uploader_submit.tpl        |   8 -
 view/smarty3/photos_head.tpl                  |  31 --
 view/smarty3/photos_recent.tpl                |  16 -
 view/smarty3/photos_upload.tpl                |  54 ---
 view/smarty3/poco_entry_xml.tpl               |  12 -
 view/smarty3/poco_xml.tpl                     |  23 --
 view/smarty3/poke_content.tpl                 |  37 --
 view/smarty3/posted_date_widget.tpl           |  14 -
 view/smarty3/profed_end.tpl                   |   5 -
 view/smarty3/profed_head.tpl                  |  43 --
 view/smarty3/profile-hide-friends.tpl         |  21 -
 view/smarty3/profile-hide-wall.tpl            |  21 -
 view/smarty3/profile-in-directory.tpl         |  21 -
 view/smarty3/profile-in-netdir.tpl            |  21 -
 view/smarty3/profile_advanced.tpl             | 175 --------
 view/smarty3/profile_edit.tpl                 | 328 ---------------
 view/smarty3/profile_edlink.tpl               |   7 -
 view/smarty3/profile_entry.tpl                |  16 -
 view/smarty3/profile_listing_header.tpl       |  13 -
 view/smarty3/profile_photo.tpl                |  31 --
 view/smarty3/profile_publish.tpl              |  21 -
 view/smarty3/profile_vcard.tpl                |  55 ---
 view/smarty3/prv_message.tpl                  |  38 --
 view/smarty3/pwdreset.tpl                     |  22 -
 view/smarty3/register.tpl                     |  70 ----
 view/smarty3/remote_friends_common.tpl        |  26 --
 view/smarty3/removeme.tpl                     |  25 --
 view/smarty3/saved_searches_aside.tpl         |  19 -
 view/smarty3/search_item.tpl                  |  69 ----
 view/smarty3/settings-end.tpl                 |   5 -
 view/smarty3/settings-head.tpl                |  30 --
 view/smarty3/settings.tpl                     | 152 -------
 view/smarty3/settings_addons.tpl              |  15 -
 view/smarty3/settings_connectors.tpl          |  40 --
 view/smarty3/settings_display.tpl             |  27 --
 view/smarty3/settings_display_end.tpl         |   5 -
 view/smarty3/settings_features.tpl            |  25 --
 view/smarty3/settings_nick_set.tpl            |  10 -
 view/smarty3/settings_nick_subdir.tpl         |  11 -
 view/smarty3/settings_oauth.tpl               |  36 --
 view/smarty3/settings_oauth_edit.tpl          |  22 -
 view/smarty3/suggest_friends.tpl              |  21 -
 view/smarty3/suggestions.tpl                  |  26 --
 view/smarty3/tag_slap.tpl                     |  35 --
 view/smarty3/threaded_conversation.tpl        |  21 -
 view/smarty3/toggle_mobile_footer.tpl         |   7 -
 view/smarty3/uexport.tpl                      |  14 -
 view/smarty3/uimport.tpl                      |  18 -
 view/smarty3/vcard-widget.tpl                 |  10 -
 view/smarty3/viewcontact_template.tpl         |  14 -
 view/smarty3/voting_fakelink.tpl              |   6 -
 view/smarty3/wall_thread.tpl                  | 125 ------
 view/smarty3/wallmessage.tpl                  |  37 --
 view/smarty3/wallmsg-end.tpl                  |   5 -
 view/smarty3/wallmsg-header.tpl               |  87 ----
 view/smarty3/xrd_diaspora.tpl                 |   8 -
 view/smarty3/xrd_host.tpl                     |  23 --
 view/smarty3/xrd_person.tpl                   |  43 --
 view/suggest_friends.tpl                      |  16 -
 view/suggestions.tpl                          |  21 -
 view/tag_slap.tpl                             |  30 --
 view/theme/cleanzero/nav.tpl                  |  85 ----
 view/theme/cleanzero/smarty3/nav.tpl          |  90 -----
 .../cleanzero/smarty3/theme_settings.tpl      |  15 -
 view/theme/cleanzero/theme_settings.tpl       |  10 -
 view/theme/comix-plain/comment_item.tpl       |  33 --
 view/theme/comix-plain/search_item.tpl        |  54 ---
 .../comix-plain/smarty3/comment_item.tpl      |  38 --
 .../theme/comix-plain/smarty3/search_item.tpl |  59 ---
 view/theme/comix/comment_item.tpl             |  33 --
 view/theme/comix/search_item.tpl              |  54 ---
 view/theme/comix/smarty3/comment_item.tpl     |  38 --
 view/theme/comix/smarty3/search_item.tpl      |  59 ---
 view/theme/decaf-mobile/acl_html_selector.tpl |  29 --
 view/theme/decaf-mobile/acl_selector.tpl      |  23 --
 view/theme/decaf-mobile/admin_aside.tpl       |  31 --
 view/theme/decaf-mobile/admin_site.tpl        |  67 ----
 view/theme/decaf-mobile/admin_users.tpl       |  98 -----
 view/theme/decaf-mobile/album_edit.tpl        |  15 -
 view/theme/decaf-mobile/categories_widget.tpl |  12 -
 view/theme/decaf-mobile/comment_item.tpl      |  79 ----
 view/theme/decaf-mobile/common_tabs.tpl       |   6 -
 view/theme/decaf-mobile/contact_block.tpl     |  12 -
 view/theme/decaf-mobile/contact_edit.tpl      |  93 -----
 view/theme/decaf-mobile/contact_head.tpl      |   0
 view/theme/decaf-mobile/contact_template.tpl  |  38 --
 view/theme/decaf-mobile/contacts-end.tpl      |   4 -
 view/theme/decaf-mobile/contacts-head.tpl     |   5 -
 view/theme/decaf-mobile/contacts-template.tpl |  28 --
 .../decaf-mobile/contacts-widget-sidebar.tpl  |   2 -
 view/theme/decaf-mobile/conversation.tpl      |  29 --
 view/theme/decaf-mobile/cropbody.tpl          |  27 --
 view/theme/decaf-mobile/cropend.tpl           |   4 -
 view/theme/decaf-mobile/crophead.tpl          |   1 -
 view/theme/decaf-mobile/display-head.tpl      |   4 -
 view/theme/decaf-mobile/end.tpl               |  25 --
 view/theme/decaf-mobile/event_end.tpl         |   4 -
 view/theme/decaf-mobile/event_head.tpl        |   6 -
 view/theme/decaf-mobile/field_checkbox.tpl    |   6 -
 view/theme/decaf-mobile/field_input.tpl       |   6 -
 view/theme/decaf-mobile/field_openid.tpl      |   6 -
 view/theme/decaf-mobile/field_password.tpl    |   6 -
 view/theme/decaf-mobile/field_themeselect.tpl |   9 -
 view/theme/decaf-mobile/field_yesno.tpl       |  14 -
 .../decaf-mobile/generic_links_widget.tpl     |  12 -
 view/theme/decaf-mobile/group_drop.tpl        |   9 -
 view/theme/decaf-mobile/group_side.tpl        |  33 --
 view/theme/decaf-mobile/head.tpl              |  30 --
 view/theme/decaf-mobile/jot-end.tpl           |   5 -
 view/theme/decaf-mobile/jot-header.tpl        |  17 -
 view/theme/decaf-mobile/jot.tpl               |  99 -----
 view/theme/decaf-mobile/jot_geotag.tpl        |  11 -
 view/theme/decaf-mobile/lang_selector.tpl     |  10 -
 view/theme/decaf-mobile/like_noshare.tpl      |   7 -
 view/theme/decaf-mobile/login.tpl             |  45 ---
 view/theme/decaf-mobile/login_head.tpl        |   2 -
 view/theme/decaf-mobile/lostpass.tpl          |  21 -
 view/theme/decaf-mobile/mail_conv.tpl         |  18 -
 view/theme/decaf-mobile/mail_list.tpl         |  16 -
 view/theme/decaf-mobile/manage.tpl            |  18 -
 view/theme/decaf-mobile/message-end.tpl       |   4 -
 view/theme/decaf-mobile/message-head.tpl      |   0
 view/theme/decaf-mobile/msg-end.tpl           |   2 -
 view/theme/decaf-mobile/msg-header.tpl        |  10 -
 view/theme/decaf-mobile/nav.tpl               | 155 -------
 view/theme/decaf-mobile/photo_drop.tpl        |   4 -
 view/theme/decaf-mobile/photo_edit.tpl        |  60 ---
 view/theme/decaf-mobile/photo_edit_head.tpl   |   7 -
 view/theme/decaf-mobile/photo_view.tpl        |  42 --
 view/theme/decaf-mobile/photos_head.tpl       |   5 -
 view/theme/decaf-mobile/photos_upload.tpl     |  51 ---
 view/theme/decaf-mobile/profed_end.tpl        |   8 -
 view/theme/decaf-mobile/profed_head.tpl       |   5 -
 view/theme/decaf-mobile/profile_edit.tpl      | 324 ---------------
 view/theme/decaf-mobile/profile_photo.tpl     |  19 -
 view/theme/decaf-mobile/profile_vcard.tpl     |  51 ---
 view/theme/decaf-mobile/prv_message.tpl       |  43 --
 view/theme/decaf-mobile/register.tpl          |  80 ----
 view/theme/decaf-mobile/search_item.tpl       |  64 ---
 view/theme/decaf-mobile/settings-head.tpl     |   5 -
 view/theme/decaf-mobile/settings.tpl          | 151 -------
 .../decaf-mobile/settings_display_end.tpl     |   2 -
 .../smarty3/acl_html_selector.tpl             |  34 --
 .../decaf-mobile/smarty3/acl_selector.tpl     |  28 --
 .../decaf-mobile/smarty3/admin_aside.tpl      |  36 --
 .../theme/decaf-mobile/smarty3/admin_site.tpl |  72 ----
 .../decaf-mobile/smarty3/admin_users.tpl      | 103 -----
 .../theme/decaf-mobile/smarty3/album_edit.tpl |  20 -
 .../smarty3/categories_widget.tpl             |  17 -
 .../decaf-mobile/smarty3/comment_item.tpl     |  84 ----
 .../decaf-mobile/smarty3/common_tabs.tpl      |  11 -
 .../decaf-mobile/smarty3/contact_block.tpl    |  17 -
 .../decaf-mobile/smarty3/contact_edit.tpl     |  98 -----
 .../decaf-mobile/smarty3/contact_head.tpl     |   5 -
 .../decaf-mobile/smarty3/contact_template.tpl |  43 --
 .../decaf-mobile/smarty3/contacts-end.tpl     |   9 -
 .../decaf-mobile/smarty3/contacts-head.tpl    |  10 -
 .../smarty3/contacts-template.tpl             |  33 --
 .../smarty3/contacts-widget-sidebar.tpl       |   7 -
 .../decaf-mobile/smarty3/conversation.tpl     |  34 --
 view/theme/decaf-mobile/smarty3/cropbody.tpl  |  32 --
 view/theme/decaf-mobile/smarty3/cropend.tpl   |   9 -
 view/theme/decaf-mobile/smarty3/crophead.tpl  |   6 -
 .../decaf-mobile/smarty3/display-head.tpl     |   9 -
 view/theme/decaf-mobile/smarty3/end.tpl       |  30 --
 view/theme/decaf-mobile/smarty3/event_end.tpl |   9 -
 .../theme/decaf-mobile/smarty3/event_head.tpl |  11 -
 .../decaf-mobile/smarty3/field_checkbox.tpl   |  11 -
 .../decaf-mobile/smarty3/field_input.tpl      |  11 -
 .../decaf-mobile/smarty3/field_openid.tpl     |  11 -
 .../decaf-mobile/smarty3/field_password.tpl   |  11 -
 .../smarty3/field_themeselect.tpl             |  14 -
 .../decaf-mobile/smarty3/field_yesno.tpl      |  19 -
 .../smarty3/generic_links_widget.tpl          |  17 -
 .../theme/decaf-mobile/smarty3/group_drop.tpl |  14 -
 .../theme/decaf-mobile/smarty3/group_side.tpl |  38 --
 view/theme/decaf-mobile/smarty3/head.tpl      |  35 --
 view/theme/decaf-mobile/smarty3/jot-end.tpl   |  10 -
 .../theme/decaf-mobile/smarty3/jot-header.tpl |  22 -
 view/theme/decaf-mobile/smarty3/jot.tpl       | 104 -----
 .../theme/decaf-mobile/smarty3/jot_geotag.tpl |  16 -
 .../decaf-mobile/smarty3/lang_selector.tpl    |  15 -
 .../decaf-mobile/smarty3/like_noshare.tpl     |  12 -
 view/theme/decaf-mobile/smarty3/login.tpl     |  50 ---
 .../theme/decaf-mobile/smarty3/login_head.tpl |   7 -
 view/theme/decaf-mobile/smarty3/lostpass.tpl  |  26 --
 view/theme/decaf-mobile/smarty3/mail_conv.tpl |  23 --
 view/theme/decaf-mobile/smarty3/mail_list.tpl |  21 -
 view/theme/decaf-mobile/smarty3/manage.tpl    |  23 --
 .../decaf-mobile/smarty3/message-end.tpl      |   9 -
 .../decaf-mobile/smarty3/message-head.tpl     |   5 -
 .../smarty3/moderated_comment.tpl             |  66 ---
 view/theme/decaf-mobile/smarty3/msg-end.tpl   |   7 -
 .../theme/decaf-mobile/smarty3/msg-header.tpl |  15 -
 view/theme/decaf-mobile/smarty3/nav.tpl       | 160 --------
 .../theme/decaf-mobile/smarty3/photo_drop.tpl |   9 -
 .../theme/decaf-mobile/smarty3/photo_edit.tpl |  65 ---
 .../decaf-mobile/smarty3/photo_edit_head.tpl  |  12 -
 .../theme/decaf-mobile/smarty3/photo_view.tpl |  47 ---
 .../decaf-mobile/smarty3/photos_head.tpl      |  10 -
 .../decaf-mobile/smarty3/photos_upload.tpl    |  56 ---
 .../theme/decaf-mobile/smarty3/profed_end.tpl |  13 -
 .../decaf-mobile/smarty3/profed_head.tpl      |  10 -
 .../decaf-mobile/smarty3/profile_edit.tpl     | 329 ---------------
 .../decaf-mobile/smarty3/profile_photo.tpl    |  24 --
 .../decaf-mobile/smarty3/profile_vcard.tpl    |  56 ---
 .../decaf-mobile/smarty3/prv_message.tpl      |  48 ---
 view/theme/decaf-mobile/smarty3/register.tpl  |  85 ----
 .../decaf-mobile/smarty3/search_item.tpl      |  69 ----
 .../decaf-mobile/smarty3/settings-head.tpl    |  10 -
 view/theme/decaf-mobile/smarty3/settings.tpl  | 156 -------
 .../smarty3/settings_display_end.tpl          |   7 -
 .../decaf-mobile/smarty3/suggest_friends.tpl  |  21 -
 .../smarty3/threaded_conversation.tpl         |  17 -
 .../decaf-mobile/smarty3/voting_fakelink.tpl  |   6 -
 .../decaf-mobile/smarty3/wall_thread.tpl      | 124 ------
 .../smarty3/wall_thread_toponly.tpl           | 106 -----
 .../decaf-mobile/smarty3/wallmessage.tpl      |  37 --
 .../decaf-mobile/smarty3/wallmsg-end.tpl      |   7 -
 .../decaf-mobile/smarty3/wallmsg-header.tpl   |  12 -
 view/theme/decaf-mobile/suggest_friends.tpl   |  16 -
 .../decaf-mobile/threaded_conversation.tpl    |  12 -
 view/theme/decaf-mobile/voting_fakelink.tpl   |   1 -
 view/theme/decaf-mobile/wall_thread.tpl       | 119 ------
 .../decaf-mobile/wall_thread_toponly.tpl      | 101 -----
 view/theme/decaf-mobile/wallmessage.tpl       |  32 --
 view/theme/decaf-mobile/wallmsg-end.tpl       |   2 -
 view/theme/decaf-mobile/wallmsg-header.tpl    |   7 -
 view/theme/diabook/admin_users.tpl            |  88 ----
 view/theme/diabook/bottom.tpl                 | 155 -------
 view/theme/diabook/ch_directory_item.tpl      |  10 -
 view/theme/diabook/comment_item.tpl           |  43 --
 view/theme/diabook/communityhome.tpl          | 172 --------
 view/theme/diabook/contact_template.tpl       |  31 --
 view/theme/diabook/directory_item.tpl         |  42 --
 view/theme/diabook/footer.tpl                 |   3 -
 view/theme/diabook/generic_links_widget.tpl   |  11 -
 view/theme/diabook/group_side.tpl             |  34 --
 view/theme/diabook/jot.tpl                    |  87 ----
 view/theme/diabook/login.tpl                  |  33 --
 view/theme/diabook/mail_conv.tpl              |  60 ---
 view/theme/diabook/mail_display.tpl           |  12 -
 view/theme/diabook/mail_list.tpl              |   8 -
 view/theme/diabook/message_side.tpl           |  10 -
 view/theme/diabook/nav.tpl                    | 188 ---------
 view/theme/diabook/nets.tpl                   |  17 -
 view/theme/diabook/oembed_video.tpl           |   4 -
 view/theme/diabook/photo_item.tpl             |  65 ---
 view/theme/diabook/photo_view.tpl             |  33 --
 view/theme/diabook/profile_side.tpl           |  21 -
 view/theme/diabook/profile_vcard.tpl          |  64 ---
 view/theme/diabook/prv_message.tpl            |  40 --
 view/theme/diabook/right_aside.tpl            |  20 -
 view/theme/diabook/search_item.tpl            | 111 -----
 view/theme/diabook/smarty3/admin_users.tpl    |  93 -----
 view/theme/diabook/smarty3/bottom.tpl         | 160 --------
 .../diabook/smarty3/ch_directory_item.tpl     |  15 -
 view/theme/diabook/smarty3/comment_item.tpl   |  48 ---
 view/theme/diabook/smarty3/communityhome.tpl  | 177 --------
 .../diabook/smarty3/contact_template.tpl      |  36 --
 view/theme/diabook/smarty3/directory_item.tpl |  47 ---
 view/theme/diabook/smarty3/footer.tpl         |   8 -
 .../diabook/smarty3/generic_links_widget.tpl  |  16 -
 view/theme/diabook/smarty3/group_side.tpl     |  39 --
 view/theme/diabook/smarty3/jot.tpl            |  92 -----
 view/theme/diabook/smarty3/login.tpl          |  38 --
 view/theme/diabook/smarty3/mail_conv.tpl      |  65 ---
 view/theme/diabook/smarty3/mail_display.tpl   |  17 -
 view/theme/diabook/smarty3/mail_list.tpl      |  13 -
 view/theme/diabook/smarty3/message_side.tpl   |  15 -
 view/theme/diabook/smarty3/nav.tpl            | 193 ---------
 view/theme/diabook/smarty3/nets.tpl           |  22 -
 view/theme/diabook/smarty3/oembed_video.tpl   |   9 -
 view/theme/diabook/smarty3/photo_item.tpl     |  70 ----
 view/theme/diabook/smarty3/photo_view.tpl     |  38 --
 view/theme/diabook/smarty3/profile_side.tpl   |  26 --
 view/theme/diabook/smarty3/profile_vcard.tpl  |  69 ----
 view/theme/diabook/smarty3/prv_message.tpl    |  45 ---
 view/theme/diabook/smarty3/right_aside.tpl    |  25 --
 view/theme/diabook/smarty3/search_item.tpl    | 116 ------
 view/theme/diabook/smarty3/theme_settings.tpl |  46 ---
 view/theme/diabook/smarty3/wall_thread.tpl    | 146 -------
 view/theme/diabook/theme_settings.tpl         |  41 --
 view/theme/diabook/wall_thread.tpl            | 141 -------
 view/theme/dispy/bottom.tpl                   |  71 ----
 view/theme/dispy/comment_item.tpl             |  70 ----
 view/theme/dispy/communityhome.tpl            |  35 --
 view/theme/dispy/contact_template.tpl         |  36 --
 view/theme/dispy/conversation.tpl             |  29 --
 view/theme/dispy/group_side.tpl               |  29 --
 view/theme/dispy/header.tpl                   |   0
 view/theme/dispy/jot-header.tpl               | 345 ----------------
 view/theme/dispy/jot.tpl                      |  79 ----
 view/theme/dispy/lang_selector.tpl            |  10 -
 view/theme/dispy/mail_head.tpl                |   5 -
 view/theme/dispy/nav.tpl                      | 145 -------
 view/theme/dispy/photo_edit.tpl               |  53 ---
 view/theme/dispy/photo_view.tpl               |  36 --
 view/theme/dispy/profile_vcard.tpl            |  82 ----
 view/theme/dispy/saved_searches_aside.tpl     |  14 -
 view/theme/dispy/search_item.tpl              |  64 ---
 view/theme/dispy/smarty3/bottom.tpl           |  76 ----
 view/theme/dispy/smarty3/comment_item.tpl     |  75 ----
 view/theme/dispy/smarty3/communityhome.tpl    |  40 --
 view/theme/dispy/smarty3/contact_template.tpl |  41 --
 view/theme/dispy/smarty3/conversation.tpl     |  34 --
 view/theme/dispy/smarty3/group_side.tpl       |  34 --
 view/theme/dispy/smarty3/header.tpl           |   5 -
 view/theme/dispy/smarty3/jot-header.tpl       | 350 ----------------
 view/theme/dispy/smarty3/jot.tpl              |  84 ----
 view/theme/dispy/smarty3/lang_selector.tpl    |  15 -
 view/theme/dispy/smarty3/mail_head.tpl        |  10 -
 view/theme/dispy/smarty3/nav.tpl              | 150 -------
 view/theme/dispy/smarty3/photo_edit.tpl       |  58 ---
 view/theme/dispy/smarty3/photo_view.tpl       |  41 --
 view/theme/dispy/smarty3/profile_vcard.tpl    |  87 ----
 .../dispy/smarty3/saved_searches_aside.tpl    |  19 -
 view/theme/dispy/smarty3/search_item.tpl      |  69 ----
 view/theme/dispy/smarty3/theme_settings.tpl   |  15 -
 .../dispy/smarty3/threaded_conversation.tpl   |  20 -
 view/theme/dispy/smarty3/wall_thread.tpl      | 144 -------
 view/theme/dispy/theme_settings.tpl           |  10 -
 view/theme/dispy/threaded_conversation.tpl    |  15 -
 view/theme/dispy/wall_thread.tpl              | 139 -------
 view/theme/duepuntozero/comment_item.tpl      |  66 ---
 view/theme/duepuntozero/lang_selector.tpl     |  10 -
 view/theme/duepuntozero/moderated_comment.tpl |  61 ---
 view/theme/duepuntozero/nav.tpl               |  70 ----
 view/theme/duepuntozero/profile_vcard.tpl     |  51 ---
 view/theme/duepuntozero/prv_message.tpl       |  39 --
 .../duepuntozero/smarty3/comment_item.tpl     |  71 ----
 .../duepuntozero/smarty3/lang_selector.tpl    |  15 -
 .../smarty3/moderated_comment.tpl             |  66 ---
 view/theme/duepuntozero/smarty3/nav.tpl       |  75 ----
 .../duepuntozero/smarty3/profile_vcard.tpl    |  56 ---
 .../duepuntozero/smarty3/prv_message.tpl      |  44 --
 view/theme/facepark/comment_item.tpl          |  33 --
 view/theme/facepark/group_side.tpl            |  28 --
 view/theme/facepark/jot.tpl                   |  85 ----
 view/theme/facepark/nav.tpl                   |  68 ----
 view/theme/facepark/profile_vcard.tpl         |  47 ---
 view/theme/facepark/search_item.tpl           |  54 ---
 view/theme/facepark/smarty3/comment_item.tpl  |  38 --
 view/theme/facepark/smarty3/group_side.tpl    |  33 --
 view/theme/facepark/smarty3/jot.tpl           |  90 -----
 view/theme/facepark/smarty3/nav.tpl           |  73 ----
 view/theme/facepark/smarty3/profile_vcard.tpl |  52 ---
 view/theme/facepark/smarty3/search_item.tpl   |  59 ---
 view/theme/frost-mobile/acl_selector.tpl      |  23 --
 view/theme/frost-mobile/admin_aside.tpl       |  31 --
 view/theme/frost-mobile/admin_site.tpl        |  67 ----
 view/theme/frost-mobile/admin_users.tpl       |  98 -----
 view/theme/frost-mobile/categories_widget.tpl |  12 -
 view/theme/frost-mobile/comment_item.tpl      |  78 ----
 view/theme/frost-mobile/common_tabs.tpl       |   6 -
 view/theme/frost-mobile/contact_block.tpl     |  12 -
 view/theme/frost-mobile/contact_edit.tpl      |  93 -----
 view/theme/frost-mobile/contact_head.tpl      |   0
 view/theme/frost-mobile/contact_template.tpl  |  36 --
 view/theme/frost-mobile/contacts-end.tpl      |   4 -
 view/theme/frost-mobile/contacts-head.tpl     |   5 -
 view/theme/frost-mobile/contacts-template.tpl |  28 --
 .../frost-mobile/contacts-widget-sidebar.tpl  |   2 -
 view/theme/frost-mobile/conversation.tpl      |  29 --
 view/theme/frost-mobile/cropbody.tpl          |  27 --
 view/theme/frost-mobile/cropend.tpl           |   4 -
 view/theme/frost-mobile/crophead.tpl          |   1 -
 view/theme/frost-mobile/display-head.tpl      |   4 -
 view/theme/frost-mobile/end.tpl               |  22 -
 view/theme/frost-mobile/event.tpl             |  10 -
 view/theme/frost-mobile/event_end.tpl         |   4 -
 view/theme/frost-mobile/event_head.tpl        |   6 -
 view/theme/frost-mobile/field_checkbox.tpl    |   6 -
 view/theme/frost-mobile/field_input.tpl       |   6 -
 view/theme/frost-mobile/field_openid.tpl      |   6 -
 view/theme/frost-mobile/field_password.tpl    |   6 -
 view/theme/frost-mobile/field_themeselect.tpl |   9 -
 .../frost-mobile/generic_links_widget.tpl     |  12 -
 view/theme/frost-mobile/group_drop.tpl        |   9 -
 view/theme/frost-mobile/head.tpl              |  31 --
 view/theme/frost-mobile/jot-end.tpl           |   5 -
 view/theme/frost-mobile/jot-header.tpl        |  18 -
 view/theme/frost-mobile/jot.tpl               |  91 -----
 view/theme/frost-mobile/jot_geotag.tpl        |  11 -
 view/theme/frost-mobile/lang_selector.tpl     |  10 -
 view/theme/frost-mobile/like_noshare.tpl      |   7 -
 view/theme/frost-mobile/login.tpl             |  45 ---
 view/theme/frost-mobile/login_head.tpl        |   2 -
 view/theme/frost-mobile/lostpass.tpl          |  21 -
 view/theme/frost-mobile/mail_conv.tpl         |  18 -
 view/theme/frost-mobile/mail_list.tpl         |  16 -
 view/theme/frost-mobile/message-end.tpl       |   4 -
 view/theme/frost-mobile/message-head.tpl      |   0
 view/theme/frost-mobile/moderated_comment.tpl |  61 ---
 view/theme/frost-mobile/msg-end.tpl           |   2 -
 view/theme/frost-mobile/msg-header.tpl        |  10 -
 view/theme/frost-mobile/nav.tpl               | 146 -------
 view/theme/frost-mobile/photo_drop.tpl        |   4 -
 view/theme/frost-mobile/photo_edit.tpl        |  58 ---
 view/theme/frost-mobile/photo_edit_head.tpl   |   7 -
 view/theme/frost-mobile/photo_view.tpl        |  42 --
 view/theme/frost-mobile/photos_head.tpl       |   5 -
 view/theme/frost-mobile/photos_upload.tpl     |  50 ---
 view/theme/frost-mobile/profed_end.tpl        |   8 -
 view/theme/frost-mobile/profed_head.tpl       |   5 -
 view/theme/frost-mobile/profile_edit.tpl      | 322 ---------------
 view/theme/frost-mobile/profile_photo.tpl     |  19 -
 view/theme/frost-mobile/profile_vcard.tpl     |  51 ---
 view/theme/frost-mobile/prv_message.tpl       |  39 --
 view/theme/frost-mobile/register.tpl          |  80 ----
 view/theme/frost-mobile/search_item.tpl       |  64 ---
 view/theme/frost-mobile/settings-head.tpl     |   5 -
 view/theme/frost-mobile/settings.tpl          | 147 -------
 .../frost-mobile/settings_display_end.tpl     |   2 -
 .../frost-mobile/smarty3/acl_selector.tpl     |  28 --
 .../frost-mobile/smarty3/admin_aside.tpl      |  36 --
 .../theme/frost-mobile/smarty3/admin_site.tpl |  72 ----
 .../frost-mobile/smarty3/admin_users.tpl      | 103 -----
 .../smarty3/categories_widget.tpl             |  17 -
 .../frost-mobile/smarty3/comment_item.tpl     |  83 ----
 .../frost-mobile/smarty3/common_tabs.tpl      |  11 -
 .../frost-mobile/smarty3/contact_block.tpl    |  17 -
 .../frost-mobile/smarty3/contact_edit.tpl     |  98 -----
 .../frost-mobile/smarty3/contact_head.tpl     |   5 -
 .../frost-mobile/smarty3/contact_template.tpl |  41 --
 .../frost-mobile/smarty3/contacts-end.tpl     |   9 -
 .../frost-mobile/smarty3/contacts-head.tpl    |  10 -
 .../smarty3/contacts-template.tpl             |  33 --
 .../smarty3/contacts-widget-sidebar.tpl       |   7 -
 .../frost-mobile/smarty3/conversation.tpl     |  34 --
 view/theme/frost-mobile/smarty3/cropbody.tpl  |  32 --
 view/theme/frost-mobile/smarty3/cropend.tpl   |   9 -
 view/theme/frost-mobile/smarty3/crophead.tpl  |   6 -
 .../frost-mobile/smarty3/display-head.tpl     |   9 -
 view/theme/frost-mobile/smarty3/end.tpl       |  27 --
 view/theme/frost-mobile/smarty3/event.tpl     |  15 -
 view/theme/frost-mobile/smarty3/event_end.tpl |   9 -
 .../theme/frost-mobile/smarty3/event_head.tpl |  11 -
 .../frost-mobile/smarty3/field_checkbox.tpl   |  11 -
 .../frost-mobile/smarty3/field_input.tpl      |  11 -
 .../frost-mobile/smarty3/field_openid.tpl     |  11 -
 .../frost-mobile/smarty3/field_password.tpl   |  11 -
 .../smarty3/field_themeselect.tpl             |  14 -
 .../smarty3/generic_links_widget.tpl          |  17 -
 .../theme/frost-mobile/smarty3/group_drop.tpl |  14 -
 view/theme/frost-mobile/smarty3/head.tpl      |  36 --
 view/theme/frost-mobile/smarty3/jot-end.tpl   |  10 -
 .../theme/frost-mobile/smarty3/jot-header.tpl |  23 --
 view/theme/frost-mobile/smarty3/jot.tpl       |  96 -----
 .../theme/frost-mobile/smarty3/jot_geotag.tpl |  16 -
 .../frost-mobile/smarty3/lang_selector.tpl    |  15 -
 .../frost-mobile/smarty3/like_noshare.tpl     |  12 -
 view/theme/frost-mobile/smarty3/login.tpl     |  50 ---
 .../theme/frost-mobile/smarty3/login_head.tpl |   7 -
 view/theme/frost-mobile/smarty3/lostpass.tpl  |  26 --
 view/theme/frost-mobile/smarty3/mail_conv.tpl |  23 --
 view/theme/frost-mobile/smarty3/mail_list.tpl |  21 -
 .../frost-mobile/smarty3/message-end.tpl      |   9 -
 .../frost-mobile/smarty3/message-head.tpl     |   5 -
 .../smarty3/moderated_comment.tpl             |  66 ---
 view/theme/frost-mobile/smarty3/msg-end.tpl   |   7 -
 .../theme/frost-mobile/smarty3/msg-header.tpl |  15 -
 view/theme/frost-mobile/smarty3/nav.tpl       | 151 -------
 .../theme/frost-mobile/smarty3/photo_drop.tpl |   9 -
 .../theme/frost-mobile/smarty3/photo_edit.tpl |  63 ---
 .../frost-mobile/smarty3/photo_edit_head.tpl  |  12 -
 .../theme/frost-mobile/smarty3/photo_view.tpl |  47 ---
 .../frost-mobile/smarty3/photos_head.tpl      |  10 -
 .../frost-mobile/smarty3/photos_upload.tpl    |  55 ---
 .../theme/frost-mobile/smarty3/profed_end.tpl |  13 -
 .../frost-mobile/smarty3/profed_head.tpl      |  10 -
 .../frost-mobile/smarty3/profile_edit.tpl     | 327 ---------------
 .../frost-mobile/smarty3/profile_photo.tpl    |  24 --
 .../frost-mobile/smarty3/profile_vcard.tpl    |  56 ---
 .../frost-mobile/smarty3/prv_message.tpl      |  44 --
 view/theme/frost-mobile/smarty3/register.tpl  |  85 ----
 .../frost-mobile/smarty3/search_item.tpl      |  69 ----
 .../frost-mobile/smarty3/settings-head.tpl    |  10 -
 view/theme/frost-mobile/smarty3/settings.tpl  | 152 -------
 .../smarty3/settings_display_end.tpl          |   7 -
 .../frost-mobile/smarty3/suggest_friends.tpl  |  21 -
 .../smarty3/threaded_conversation.tpl         |  20 -
 .../frost-mobile/smarty3/voting_fakelink.tpl  |   6 -
 .../frost-mobile/smarty3/wall_thread.tpl      | 131 ------
 .../frost-mobile/smarty3/wallmsg-end.tpl      |   7 -
 .../frost-mobile/smarty3/wallmsg-header.tpl   |  12 -
 view/theme/frost-mobile/suggest_friends.tpl   |  16 -
 .../frost-mobile/threaded_conversation.tpl    |  15 -
 view/theme/frost-mobile/voting_fakelink.tpl   |   1 -
 view/theme/frost-mobile/wall_thread.tpl       | 126 ------
 view/theme/frost-mobile/wallmsg-end.tpl       |   2 -
 view/theme/frost-mobile/wallmsg-header.tpl    |   7 -
 view/theme/frost/acl_selector.tpl             |  23 --
 view/theme/frost/admin_aside.tpl              |  31 --
 view/theme/frost/admin_site.tpl               |  76 ----
 view/theme/frost/admin_users.tpl              |  98 -----
 view/theme/frost/comment_item.tpl             |  77 ----
 view/theme/frost/contact_edit.tpl             |  88 ----
 view/theme/frost/contact_end.tpl              |   2 -
 view/theme/frost/contact_head.tpl             |   4 -
 view/theme/frost/contact_template.tpl         |  33 --
 view/theme/frost/contacts-end.tpl             |   4 -
 view/theme/frost/contacts-head.tpl            |   5 -
 view/theme/frost/contacts-template.tpl        |  28 --
 view/theme/frost/cropbody.tpl                 |  27 --
 view/theme/frost/cropend.tpl                  |   4 -
 view/theme/frost/crophead.tpl                 |   1 -
 view/theme/frost/display-head.tpl             |   4 -
 view/theme/frost/end.tpl                      |  25 --
 view/theme/frost/event.tpl                    |  10 -
 view/theme/frost/event_end.tpl                |   5 -
 view/theme/frost/event_form.tpl               |  50 ---
 view/theme/frost/event_head.tpl               |   7 -
 view/theme/frost/field_combobox.tpl           |  18 -
 view/theme/frost/field_input.tpl              |   6 -
 view/theme/frost/field_openid.tpl             |   6 -
 view/theme/frost/field_password.tpl           |   6 -
 view/theme/frost/field_themeselect.tpl        |   9 -
 view/theme/frost/filebrowser.tpl              |  84 ----
 view/theme/frost/group_drop.tpl               |   9 -
 view/theme/frost/head.tpl                     |  23 --
 view/theme/frost/jot-end.tpl                  |   3 -
 view/theme/frost/jot-header.tpl               |  17 -
 view/theme/frost/jot.tpl                      |  91 -----
 view/theme/frost/jot_geotag.tpl               |  11 -
 view/theme/frost/lang_selector.tpl            |  10 -
 view/theme/frost/like_noshare.tpl             |   7 -
 view/theme/frost/login.tpl                    |  45 ---
 view/theme/frost/login_head.tpl               |   2 -
 view/theme/frost/lostpass.tpl                 |  21 -
 view/theme/frost/mail_conv.tpl                |  14 -
 view/theme/frost/mail_list.tpl                |  16 -
 view/theme/frost/message-end.tpl              |   4 -
 view/theme/frost/message-head.tpl             |   0
 view/theme/frost/moderated_comment.tpl        |  61 ---
 view/theme/frost/msg-end.tpl                  |   3 -
 view/theme/frost/msg-header.tpl               |  10 -
 view/theme/frost/nav.tpl                      | 150 -------
 view/theme/frost/photo_drop.tpl               |   4 -
 view/theme/frost/photo_edit.tpl               |  58 ---
 view/theme/frost/photo_edit_head.tpl          |   7 -
 view/theme/frost/photo_view.tpl               |  42 --
 view/theme/frost/photos_head.tpl              |   5 -
 view/theme/frost/photos_upload.tpl            |  52 ---
 view/theme/frost/posted_date_widget.tpl       |   9 -
 view/theme/frost/profed_end.tpl               |   8 -
 view/theme/frost/profed_head.tpl              |   5 -
 view/theme/frost/profile_edit.tpl             | 322 ---------------
 view/theme/frost/profile_vcard.tpl            |  51 ---
 view/theme/frost/prv_message.tpl              |  39 --
 view/theme/frost/register.tpl                 |  80 ----
 view/theme/frost/search_item.tpl              |  64 ---
 view/theme/frost/settings-head.tpl            |   5 -
 view/theme/frost/settings_display_end.tpl     |   2 -
 view/theme/frost/smarty3/acl_selector.tpl     |  28 --
 view/theme/frost/smarty3/admin_aside.tpl      |  36 --
 view/theme/frost/smarty3/admin_site.tpl       |  81 ----
 view/theme/frost/smarty3/admin_users.tpl      | 103 -----
 view/theme/frost/smarty3/comment_item.tpl     |  82 ----
 view/theme/frost/smarty3/contact_edit.tpl     |  93 -----
 view/theme/frost/smarty3/contact_end.tpl      |   7 -
 view/theme/frost/smarty3/contact_head.tpl     |   9 -
 view/theme/frost/smarty3/contact_template.tpl |  38 --
 view/theme/frost/smarty3/contacts-end.tpl     |   9 -
 view/theme/frost/smarty3/contacts-head.tpl    |  10 -
 .../theme/frost/smarty3/contacts-template.tpl |  33 --
 view/theme/frost/smarty3/cropbody.tpl         |  32 --
 view/theme/frost/smarty3/cropend.tpl          |   9 -
 view/theme/frost/smarty3/crophead.tpl         |   6 -
 view/theme/frost/smarty3/display-head.tpl     |   9 -
 view/theme/frost/smarty3/end.tpl              |  30 --
 view/theme/frost/smarty3/event.tpl            |  15 -
 view/theme/frost/smarty3/event_end.tpl        |  10 -
 view/theme/frost/smarty3/event_form.tpl       |  55 ---
 view/theme/frost/smarty3/event_head.tpl       |  12 -
 view/theme/frost/smarty3/field_combobox.tpl   |  23 --
 view/theme/frost/smarty3/field_input.tpl      |  11 -
 view/theme/frost/smarty3/field_openid.tpl     |  11 -
 view/theme/frost/smarty3/field_password.tpl   |  11 -
 .../theme/frost/smarty3/field_themeselect.tpl |  14 -
 view/theme/frost/smarty3/filebrowser.tpl      |  89 ----
 view/theme/frost/smarty3/group_drop.tpl       |  14 -
 view/theme/frost/smarty3/head.tpl             |  28 --
 view/theme/frost/smarty3/jot-end.tpl          |   8 -
 view/theme/frost/smarty3/jot-header.tpl       |  22 -
 view/theme/frost/smarty3/jot.tpl              |  96 -----
 view/theme/frost/smarty3/jot_geotag.tpl       |  16 -
 view/theme/frost/smarty3/lang_selector.tpl    |  15 -
 view/theme/frost/smarty3/like_noshare.tpl     |  12 -
 view/theme/frost/smarty3/login.tpl            |  50 ---
 view/theme/frost/smarty3/login_head.tpl       |   7 -
 view/theme/frost/smarty3/lostpass.tpl         |  26 --
 view/theme/frost/smarty3/mail_conv.tpl        |  19 -
 view/theme/frost/smarty3/mail_list.tpl        |  21 -
 view/theme/frost/smarty3/message-end.tpl      |   9 -
 view/theme/frost/smarty3/message-head.tpl     |   5 -
 .../theme/frost/smarty3/moderated_comment.tpl |  66 ---
 view/theme/frost/smarty3/msg-end.tpl          |   8 -
 view/theme/frost/smarty3/msg-header.tpl       |  15 -
 view/theme/frost/smarty3/nav.tpl              | 155 -------
 view/theme/frost/smarty3/photo_drop.tpl       |   9 -
 view/theme/frost/smarty3/photo_edit.tpl       |  63 ---
 view/theme/frost/smarty3/photo_edit_head.tpl  |  12 -
 view/theme/frost/smarty3/photo_view.tpl       |  47 ---
 view/theme/frost/smarty3/photos_head.tpl      |  10 -
 view/theme/frost/smarty3/photos_upload.tpl    |  57 ---
 .../frost/smarty3/posted_date_widget.tpl      |  14 -
 view/theme/frost/smarty3/profed_end.tpl       |  13 -
 view/theme/frost/smarty3/profed_head.tpl      |  10 -
 view/theme/frost/smarty3/profile_edit.tpl     | 327 ---------------
 view/theme/frost/smarty3/profile_vcard.tpl    |  56 ---
 view/theme/frost/smarty3/prv_message.tpl      |  44 --
 view/theme/frost/smarty3/register.tpl         |  85 ----
 view/theme/frost/smarty3/search_item.tpl      |  69 ----
 view/theme/frost/smarty3/settings-head.tpl    |  10 -
 .../frost/smarty3/settings_display_end.tpl    |   7 -
 view/theme/frost/smarty3/suggest_friends.tpl  |  21 -
 .../frost/smarty3/threaded_conversation.tpl   |  33 --
 view/theme/frost/smarty3/voting_fakelink.tpl  |   6 -
 view/theme/frost/smarty3/wall_thread.tpl      | 130 ------
 view/theme/frost/smarty3/wallmsg-end.tpl      |   9 -
 view/theme/frost/smarty3/wallmsg-header.tpl   |  12 -
 view/theme/frost/suggest_friends.tpl          |  16 -
 view/theme/frost/threaded_conversation.tpl    |  28 --
 view/theme/frost/voting_fakelink.tpl          |   1 -
 view/theme/frost/wall_thread.tpl              | 125 ------
 view/theme/frost/wallmsg-end.tpl              |   4 -
 view/theme/frost/wallmsg-header.tpl           |   7 -
 view/theme/quattro/birthdays_reminder.tpl     |   1 -
 view/theme/quattro/comment_item.tpl           |  63 ---
 view/theme/quattro/contact_template.tpl       |  32 --
 view/theme/quattro/conversation.tpl           |  49 ---
 view/theme/quattro/events_reminder.tpl        |  39 --
 view/theme/quattro/fileas_widget.tpl          |  12 -
 view/theme/quattro/generic_links_widget.tpl   |  11 -
 view/theme/quattro/group_side.tpl             |  29 --
 view/theme/quattro/jot.tpl                    |  56 ---
 view/theme/quattro/mail_conv.tpl              |  63 ---
 view/theme/quattro/mail_display.tpl           |  12 -
 view/theme/quattro/mail_list.tpl              |   8 -
 view/theme/quattro/message_side.tpl           |  10 -
 view/theme/quattro/nav.tpl                    |  95 -----
 view/theme/quattro/nets.tpl                   |  12 -
 view/theme/quattro/photo_view.tpl             |  37 --
 view/theme/quattro/profile_vcard.tpl          |  68 ----
 view/theme/quattro/prv_message.tpl            |  38 --
 view/theme/quattro/saved_searches_aside.tpl   |  15 -
 view/theme/quattro/search_item.tpl            |  93 -----
 .../quattro/smarty3/birthdays_reminder.tpl    |   6 -
 view/theme/quattro/smarty3/comment_item.tpl   |  68 ----
 .../quattro/smarty3/contact_template.tpl      |  37 --
 view/theme/quattro/smarty3/conversation.tpl   |  54 ---
 .../theme/quattro/smarty3/events_reminder.tpl |  44 --
 view/theme/quattro/smarty3/fileas_widget.tpl  |  17 -
 .../quattro/smarty3/generic_links_widget.tpl  |  16 -
 view/theme/quattro/smarty3/group_side.tpl     |  34 --
 view/theme/quattro/smarty3/jot.tpl            |  61 ---
 view/theme/quattro/smarty3/mail_conv.tpl      |  68 ----
 view/theme/quattro/smarty3/mail_display.tpl   |  17 -
 view/theme/quattro/smarty3/mail_list.tpl      |  13 -
 view/theme/quattro/smarty3/message_side.tpl   |  15 -
 view/theme/quattro/smarty3/nav.tpl            | 100 -----
 view/theme/quattro/smarty3/nets.tpl           |  17 -
 view/theme/quattro/smarty3/photo_view.tpl     |  42 --
 view/theme/quattro/smarty3/profile_vcard.tpl  |  73 ----
 view/theme/quattro/smarty3/prv_message.tpl    |  43 --
 .../quattro/smarty3/saved_searches_aside.tpl  |  20 -
 view/theme/quattro/smarty3/search_item.tpl    |  98 -----
 view/theme/quattro/smarty3/theme_settings.tpl |  37 --
 .../quattro/smarty3/threaded_conversation.tpl |  45 ---
 view/theme/quattro/smarty3/wall_item_tag.tpl  |  72 ----
 view/theme/quattro/smarty3/wall_thread.tpl    | 177 --------
 view/theme/quattro/theme_settings.tpl         |  32 --
 view/theme/quattro/threaded_conversation.tpl  |  40 --
 view/theme/quattro/wall_item_tag.tpl          |  67 ----
 view/theme/quattro/wall_thread.tpl            | 172 --------
 view/theme/slackr/birthdays_reminder.tpl      |   8 -
 view/theme/slackr/events_reminder.tpl         |  39 --
 .../slackr/smarty3/birthdays_reminder.tpl     |  13 -
 view/theme/slackr/smarty3/events_reminder.tpl |  44 --
 view/theme/smoothly/bottom.tpl                |  52 ---
 view/theme/smoothly/follow.tpl                |   8 -
 view/theme/smoothly/jot-header.tpl            | 374 -----------------
 view/theme/smoothly/jot.tpl                   |  84 ----
 view/theme/smoothly/lang_selector.tpl         |  10 -
 view/theme/smoothly/nav.tpl                   |  81 ----
 view/theme/smoothly/search_item.tpl           |  53 ---
 view/theme/smoothly/smarty3/bottom.tpl        |  57 ---
 view/theme/smoothly/smarty3/follow.tpl        |  13 -
 view/theme/smoothly/smarty3/jot-header.tpl    | 379 ------------------
 view/theme/smoothly/smarty3/jot.tpl           |  89 ----
 view/theme/smoothly/smarty3/lang_selector.tpl |  15 -
 view/theme/smoothly/smarty3/nav.tpl           |  86 ----
 view/theme/smoothly/smarty3/search_item.tpl   |  58 ---
 view/theme/smoothly/smarty3/wall_thread.tpl   | 165 --------
 view/theme/smoothly/wall_thread.tpl           | 160 --------
 view/theme/testbubble/comment_item.tpl        |  33 --
 view/theme/testbubble/group_drop.tpl          |   8 -
 view/theme/testbubble/group_edit.tpl          |  16 -
 view/theme/testbubble/group_side.tpl          |  28 --
 view/theme/testbubble/jot-header.tpl          | 366 -----------------
 view/theme/testbubble/jot.tpl                 |  75 ----
 view/theme/testbubble/match.tpl               |  13 -
 view/theme/testbubble/nav.tpl                 |  66 ---
 view/theme/testbubble/photo_album.tpl         |   8 -
 view/theme/testbubble/photo_top.tpl           |   8 -
 view/theme/testbubble/photo_view.tpl          |  40 --
 view/theme/testbubble/profile_entry.tpl       |  11 -
 view/theme/testbubble/profile_vcard.tpl       |  45 ---
 .../theme/testbubble/saved_searches_aside.tpl |  14 -
 view/theme/testbubble/search_item.tpl         |  53 ---
 .../theme/testbubble/smarty3/comment_item.tpl |  38 --
 view/theme/testbubble/smarty3/group_drop.tpl  |  13 -
 view/theme/testbubble/smarty3/group_edit.tpl  |  21 -
 view/theme/testbubble/smarty3/group_side.tpl  |  33 --
 view/theme/testbubble/smarty3/jot-header.tpl  | 371 -----------------
 view/theme/testbubble/smarty3/jot.tpl         |  80 ----
 view/theme/testbubble/smarty3/match.tpl       |  18 -
 view/theme/testbubble/smarty3/nav.tpl         |  71 ----
 view/theme/testbubble/smarty3/photo_album.tpl |  13 -
 view/theme/testbubble/smarty3/photo_top.tpl   |  13 -
 view/theme/testbubble/smarty3/photo_view.tpl  |  45 ---
 .../testbubble/smarty3/profile_entry.tpl      |  16 -
 .../testbubble/smarty3/profile_vcard.tpl      |  50 ---
 .../smarty3/saved_searches_aside.tpl          |  19 -
 view/theme/testbubble/smarty3/search_item.tpl |  58 ---
 view/theme/testbubble/smarty3/wall_thread.tpl | 112 ------
 view/theme/testbubble/wall_thread.tpl         | 107 -----
 view/theme/vier/comment_item.tpl              |  51 ---
 view/theme/vier/mail_list.tpl                 |   8 -
 view/theme/vier/nav.tpl                       | 145 -------
 view/theme/vier/profile_edlink.tpl            |   1 -
 view/theme/vier/profile_vcard.tpl             |  65 ---
 view/theme/vier/search_item.tpl               |  92 -----
 view/theme/vier/smarty3/comment_item.tpl      |  56 ---
 view/theme/vier/smarty3/mail_list.tpl         |  13 -
 view/theme/vier/smarty3/nav.tpl               | 150 -------
 view/theme/vier/smarty3/profile_edlink.tpl    |   6 -
 view/theme/vier/smarty3/profile_vcard.tpl     |  70 ----
 view/theme/vier/smarty3/search_item.tpl       |  97 -----
 .../vier/smarty3/threaded_conversation.tpl    |  45 ---
 view/theme/vier/smarty3/wall_thread.tpl       | 177 --------
 view/theme/vier/threaded_conversation.tpl     |  40 --
 view/theme/vier/wall_thread.tpl               | 172 --------
 view/threaded_conversation.tpl                |  16 -
 view/toggle_mobile_footer.tpl                 |   2 -
 view/uexport.tpl                              |   9 -
 view/uimport.tpl                              |  13 -
 view/vcard-widget.tpl                         |   5 -
 view/viewcontact_template.tpl                 |   9 -
 view/voting_fakelink.tpl                      |   1 -
 view/wall_thread.tpl                          | 120 ------
 view/wallmessage.tpl                          |  32 --
 view/wallmsg-end.tpl                          |   0
 view/wallmsg-header.tpl                       |  82 ----
 view/xrd_diaspora.tpl                         |   3 -
 view/xrd_host.tpl                             |  18 -
 view/xrd_person.tpl                           |  38 --
 1138 files changed, 6 insertions(+), 42288 deletions(-)
 delete mode 100644 view/404.tpl
 delete mode 100644 view/acl_selector.tpl
 delete mode 100644 view/admin_aside.tpl
 delete mode 100644 view/admin_logs.tpl
 delete mode 100644 view/admin_plugins.tpl
 delete mode 100644 view/admin_plugins_details.tpl
 delete mode 100644 view/admin_remoteupdate.tpl
 delete mode 100644 view/admin_site.tpl
 delete mode 100644 view/admin_summary.tpl
 delete mode 100644 view/admin_users.tpl
 delete mode 100644 view/album_edit.tpl
 delete mode 100644 view/api_config_xml.tpl
 delete mode 100644 view/api_friends_xml.tpl
 delete mode 100644 view/api_ratelimit_xml.tpl
 delete mode 100644 view/api_status_xml.tpl
 delete mode 100644 view/api_test_xml.tpl
 delete mode 100644 view/api_timeline_atom.tpl
 delete mode 100644 view/api_timeline_rss.tpl
 delete mode 100644 view/api_timeline_xml.tpl
 delete mode 100644 view/api_user_xml.tpl
 delete mode 100644 view/apps.tpl
 delete mode 100644 view/atom_feed.tpl
 delete mode 100644 view/atom_feed_dfrn.tpl
 delete mode 100644 view/atom_mail.tpl
 delete mode 100644 view/atom_relocate.tpl
 delete mode 100644 view/atom_suggest.tpl
 delete mode 100644 view/auto_request.tpl
 delete mode 100644 view/birthdays_reminder.tpl
 delete mode 100644 view/categories_widget.tpl
 delete mode 100644 view/comment_item.tpl
 delete mode 100644 view/common_friends.tpl
 delete mode 100644 view/common_tabs.tpl
 delete mode 100644 view/confirm.tpl
 delete mode 100644 view/contact_block.tpl
 delete mode 100644 view/contact_edit.tpl
 delete mode 100644 view/contact_end.tpl
 delete mode 100644 view/contact_head.tpl
 delete mode 100644 view/contact_template.tpl
 delete mode 100644 view/contacts-end.tpl
 delete mode 100644 view/contacts-head.tpl
 delete mode 100644 view/contacts-template.tpl
 delete mode 100644 view/contacts-widget-sidebar.tpl
 delete mode 100644 view/content.tpl
 delete mode 100644 view/conversation.tpl
 delete mode 100644 view/crepair.tpl
 delete mode 100644 view/cropbody.tpl
 delete mode 100644 view/cropend.tpl
 delete mode 100644 view/crophead.tpl
 delete mode 100644 view/delegate.tpl
 delete mode 100644 view/dfrn_req_confirm.tpl
 delete mode 100644 view/dfrn_request.tpl
 delete mode 100644 view/diasp_dec_hdr.tpl
 delete mode 100644 view/diaspora_comment.tpl
 delete mode 100644 view/diaspora_comment_relay.tpl
 delete mode 100644 view/diaspora_conversation.tpl
 delete mode 100644 view/diaspora_like.tpl
 delete mode 100755 view/diaspora_like_relay.tpl
 delete mode 100644 view/diaspora_message.tpl
 delete mode 100644 view/diaspora_photo.tpl
 delete mode 100644 view/diaspora_post.tpl
 delete mode 100644 view/diaspora_profile.tpl
 delete mode 100644 view/diaspora_relay_retraction.tpl
 delete mode 100755 view/diaspora_relayable_retraction.tpl
 delete mode 100644 view/diaspora_retract.tpl
 delete mode 100644 view/diaspora_share.tpl
 delete mode 100644 view/diaspora_signed_retract.tpl
 delete mode 100644 view/diaspora_vcard.tpl
 delete mode 100644 view/directory_header.tpl
 delete mode 100644 view/directory_item.tpl
 delete mode 100644 view/display-head.tpl
 delete mode 100644 view/email_notify_html.tpl
 delete mode 100644 view/email_notify_text.tpl
 delete mode 100644 view/end.tpl
 delete mode 100644 view/event.tpl
 delete mode 100644 view/event_end.tpl
 delete mode 100644 view/event_form.tpl
 delete mode 100644 view/event_head.tpl
 delete mode 100644 view/events-js.tpl
 delete mode 100644 view/events.tpl
 delete mode 100644 view/events_reminder.tpl
 delete mode 100644 view/failed_updates.tpl
 delete mode 100644 view/fake_feed.tpl
 delete mode 100644 view/field.tpl
 delete mode 100644 view/field_checkbox.tpl
 delete mode 100644 view/field_combobox.tpl
 delete mode 100644 view/field_custom.tpl
 delete mode 100644 view/field_input.tpl
 delete mode 100644 view/field_intcheckbox.tpl
 delete mode 100644 view/field_openid.tpl
 delete mode 100644 view/field_password.tpl
 delete mode 100644 view/field_radio.tpl
 delete mode 100644 view/field_richtext.tpl
 delete mode 100644 view/field_select.tpl
 delete mode 100644 view/field_select_raw.tpl
 delete mode 100644 view/field_textarea.tpl
 delete mode 100644 view/field_themeselect.tpl
 delete mode 100644 view/field_yesno.tpl
 delete mode 100644 view/fileas_widget.tpl
 delete mode 100644 view/filebrowser.tpl
 delete mode 100644 view/filer_dialog.tpl
 delete mode 100644 view/follow.tpl
 delete mode 100644 view/follow_slap.tpl
 delete mode 100644 view/generic_links_widget.tpl
 delete mode 100644 view/group_drop.tpl
 delete mode 100644 view/group_edit.tpl
 delete mode 100644 view/group_selection.tpl
 delete mode 100644 view/group_side.tpl
 delete mode 100644 view/groupeditor.tpl
 delete mode 100644 view/head.tpl
 delete mode 100644 view/hide_comments.tpl
 delete mode 100644 view/install.tpl
 delete mode 100644 view/install_checks.tpl
 delete mode 100644 view/install_db.tpl
 delete mode 100644 view/install_settings.tpl
 delete mode 100644 view/intros.tpl
 delete mode 100644 view/invite.tpl
 delete mode 100644 view/jot-end.tpl
 delete mode 100644 view/jot-header.tpl
 delete mode 100644 view/jot.tpl
 delete mode 100644 view/jot_geotag.tpl
 delete mode 100644 view/lang_selector.tpl
 delete mode 100644 view/like_noshare.tpl
 delete mode 100644 view/login.tpl
 delete mode 100644 view/login_head.tpl
 delete mode 100644 view/logout.tpl
 delete mode 100644 view/lostpass.tpl
 delete mode 100644 view/magicsig.tpl
 delete mode 100644 view/mail_conv.tpl
 delete mode 100644 view/mail_display.tpl
 delete mode 100644 view/mail_head.tpl
 delete mode 100644 view/mail_list.tpl
 delete mode 100644 view/maintenance.tpl
 delete mode 100644 view/manage.tpl
 delete mode 100644 view/match.tpl
 delete mode 100644 view/message-end.tpl
 delete mode 100644 view/message-head.tpl
 delete mode 100644 view/message_side.tpl
 delete mode 100644 view/moderated_comment.tpl
 delete mode 100644 view/mood_content.tpl
 delete mode 100644 view/msg-end.tpl
 delete mode 100644 view/msg-header.tpl
 delete mode 100644 view/nav.tpl
 delete mode 100644 view/navigation.tpl
 delete mode 100644 view/netfriend.tpl
 delete mode 100644 view/nets.tpl
 delete mode 100644 view/nogroup-template.tpl
 delete mode 100644 view/notifications.tpl
 delete mode 100644 view/notifications_comments_item.tpl
 delete mode 100644 view/notifications_dislikes_item.tpl
 delete mode 100644 view/notifications_friends_item.tpl
 delete mode 100644 view/notifications_likes_item.tpl
 delete mode 100644 view/notifications_network_item.tpl
 delete mode 100644 view/notifications_posts_item.tpl
 delete mode 100644 view/notify.tpl
 delete mode 100644 view/oauth_authorize.tpl
 delete mode 100644 view/oauth_authorize_done.tpl
 delete mode 100755 view/oembed_video.tpl
 delete mode 100644 view/oexchange_xrd.tpl
 delete mode 100644 view/opensearch.tpl
 delete mode 100644 view/pagetypes.tpl
 delete mode 100644 view/peoplefind.tpl
 delete mode 100644 view/photo_album.tpl
 delete mode 100644 view/photo_drop.tpl
 delete mode 100644 view/photo_edit.tpl
 delete mode 100644 view/photo_edit_head.tpl
 delete mode 100644 view/photo_item.tpl
 delete mode 100644 view/photo_top.tpl
 delete mode 100644 view/photo_view.tpl
 delete mode 100644 view/photos_default_uploader_box.tpl
 delete mode 100644 view/photos_default_uploader_submit.tpl
 delete mode 100644 view/photos_head.tpl
 delete mode 100644 view/photos_recent.tpl
 delete mode 100644 view/photos_upload.tpl
 delete mode 100644 view/poco_entry_xml.tpl
 delete mode 100644 view/poco_xml.tpl
 delete mode 100644 view/poke_content.tpl
 delete mode 100644 view/posted_date_widget.tpl
 delete mode 100644 view/profed_end.tpl
 delete mode 100644 view/profed_head.tpl
 delete mode 100644 view/profile-hide-friends.tpl
 delete mode 100644 view/profile-hide-wall.tpl
 delete mode 100644 view/profile-in-directory.tpl
 delete mode 100644 view/profile-in-netdir.tpl
 delete mode 100644 view/profile_advanced.tpl
 delete mode 100644 view/profile_edit.tpl
 delete mode 100644 view/profile_edlink.tpl
 delete mode 100644 view/profile_entry.tpl
 delete mode 100644 view/profile_listing_header.tpl
 delete mode 100644 view/profile_photo.tpl
 delete mode 100644 view/profile_publish.tpl
 delete mode 100644 view/profile_vcard.tpl
 delete mode 100644 view/prv_message.tpl
 delete mode 100644 view/pwdreset.tpl
 delete mode 100644 view/register.tpl
 delete mode 100644 view/remote_friends_common.tpl
 delete mode 100644 view/removeme.tpl
 delete mode 100644 view/saved_searches_aside.tpl
 delete mode 100644 view/search_item.tpl
 delete mode 100644 view/settings-end.tpl
 delete mode 100644 view/settings-head.tpl
 delete mode 100644 view/settings.tpl
 delete mode 100644 view/settings_addons.tpl
 delete mode 100644 view/settings_connectors.tpl
 delete mode 100644 view/settings_display.tpl
 delete mode 100644 view/settings_display_end.tpl
 delete mode 100644 view/settings_features.tpl
 delete mode 100644 view/settings_nick_set.tpl
 delete mode 100644 view/settings_nick_subdir.tpl
 delete mode 100644 view/settings_oauth.tpl
 delete mode 100644 view/settings_oauth_edit.tpl
 delete mode 100644 view/smarty3/404.tpl
 delete mode 100644 view/smarty3/acl_selector.tpl
 delete mode 100644 view/smarty3/admin_aside.tpl
 delete mode 100644 view/smarty3/admin_logs.tpl
 delete mode 100644 view/smarty3/admin_plugins.tpl
 delete mode 100644 view/smarty3/admin_plugins_details.tpl
 delete mode 100644 view/smarty3/admin_remoteupdate.tpl
 delete mode 100644 view/smarty3/admin_site.tpl
 delete mode 100644 view/smarty3/admin_summary.tpl
 delete mode 100644 view/smarty3/admin_users.tpl
 delete mode 100644 view/smarty3/album_edit.tpl
 delete mode 100644 view/smarty3/api_config_xml.tpl
 delete mode 100644 view/smarty3/api_friends_xml.tpl
 delete mode 100644 view/smarty3/api_ratelimit_xml.tpl
 delete mode 100644 view/smarty3/api_status_xml.tpl
 delete mode 100644 view/smarty3/api_test_xml.tpl
 delete mode 100644 view/smarty3/api_timeline_atom.tpl
 delete mode 100644 view/smarty3/api_timeline_rss.tpl
 delete mode 100644 view/smarty3/api_timeline_xml.tpl
 delete mode 100644 view/smarty3/api_user_xml.tpl
 delete mode 100644 view/smarty3/apps.tpl
 delete mode 100644 view/smarty3/atom_feed.tpl
 delete mode 100644 view/smarty3/atom_feed_dfrn.tpl
 delete mode 100644 view/smarty3/atom_mail.tpl
 delete mode 100644 view/smarty3/atom_relocate.tpl
 delete mode 100644 view/smarty3/atom_suggest.tpl
 delete mode 100644 view/smarty3/auto_request.tpl
 delete mode 100644 view/smarty3/birthdays_reminder.tpl
 delete mode 100644 view/smarty3/categories_widget.tpl
 delete mode 100644 view/smarty3/comment_item.tpl
 delete mode 100644 view/smarty3/common_friends.tpl
 delete mode 100644 view/smarty3/common_tabs.tpl
 delete mode 100644 view/smarty3/confirm.tpl
 delete mode 100644 view/smarty3/contact_block.tpl
 delete mode 100644 view/smarty3/contact_edit.tpl
 delete mode 100644 view/smarty3/contact_end.tpl
 delete mode 100644 view/smarty3/contact_head.tpl
 delete mode 100644 view/smarty3/contact_template.tpl
 delete mode 100644 view/smarty3/contacts-end.tpl
 delete mode 100644 view/smarty3/contacts-head.tpl
 delete mode 100644 view/smarty3/contacts-template.tpl
 delete mode 100644 view/smarty3/contacts-widget-sidebar.tpl
 delete mode 100644 view/smarty3/content.tpl
 delete mode 100644 view/smarty3/conversation.tpl
 delete mode 100644 view/smarty3/crepair.tpl
 delete mode 100644 view/smarty3/cropbody.tpl
 delete mode 100644 view/smarty3/cropend.tpl
 delete mode 100644 view/smarty3/crophead.tpl
 delete mode 100644 view/smarty3/delegate.tpl
 delete mode 100644 view/smarty3/dfrn_req_confirm.tpl
 delete mode 100644 view/smarty3/dfrn_request.tpl
 delete mode 100644 view/smarty3/diasp_dec_hdr.tpl
 delete mode 100644 view/smarty3/diaspora_comment.tpl
 delete mode 100644 view/smarty3/diaspora_comment_relay.tpl
 delete mode 100644 view/smarty3/diaspora_conversation.tpl
 delete mode 100644 view/smarty3/diaspora_like.tpl
 delete mode 100644 view/smarty3/diaspora_like_relay.tpl
 delete mode 100644 view/smarty3/diaspora_message.tpl
 delete mode 100644 view/smarty3/diaspora_photo.tpl
 delete mode 100644 view/smarty3/diaspora_post.tpl
 delete mode 100644 view/smarty3/diaspora_profile.tpl
 delete mode 100644 view/smarty3/diaspora_relay_retraction.tpl
 delete mode 100644 view/smarty3/diaspora_relayable_retraction.tpl
 delete mode 100644 view/smarty3/diaspora_retract.tpl
 delete mode 100644 view/smarty3/diaspora_share.tpl
 delete mode 100644 view/smarty3/diaspora_signed_retract.tpl
 delete mode 100644 view/smarty3/diaspora_vcard.tpl
 delete mode 100644 view/smarty3/directory_header.tpl
 delete mode 100644 view/smarty3/directory_item.tpl
 delete mode 100644 view/smarty3/display-head.tpl
 delete mode 100644 view/smarty3/email_notify_html.tpl
 delete mode 100644 view/smarty3/email_notify_text.tpl
 delete mode 100644 view/smarty3/end.tpl
 delete mode 100644 view/smarty3/event.tpl
 delete mode 100644 view/smarty3/event_end.tpl
 delete mode 100644 view/smarty3/event_form.tpl
 delete mode 100644 view/smarty3/event_head.tpl
 delete mode 100644 view/smarty3/events-js.tpl
 delete mode 100644 view/smarty3/events.tpl
 delete mode 100644 view/smarty3/events_reminder.tpl
 delete mode 100644 view/smarty3/failed_updates.tpl
 delete mode 100644 view/smarty3/fake_feed.tpl
 delete mode 100644 view/smarty3/field.tpl
 delete mode 100644 view/smarty3/field_checkbox.tpl
 delete mode 100644 view/smarty3/field_combobox.tpl
 delete mode 100644 view/smarty3/field_custom.tpl
 delete mode 100644 view/smarty3/field_input.tpl
 delete mode 100644 view/smarty3/field_intcheckbox.tpl
 delete mode 100644 view/smarty3/field_openid.tpl
 delete mode 100644 view/smarty3/field_password.tpl
 delete mode 100644 view/smarty3/field_radio.tpl
 delete mode 100644 view/smarty3/field_richtext.tpl
 delete mode 100644 view/smarty3/field_select.tpl
 delete mode 100644 view/smarty3/field_select_raw.tpl
 delete mode 100644 view/smarty3/field_textarea.tpl
 delete mode 100644 view/smarty3/field_themeselect.tpl
 delete mode 100644 view/smarty3/field_yesno.tpl
 delete mode 100644 view/smarty3/fileas_widget.tpl
 delete mode 100644 view/smarty3/filebrowser.tpl
 delete mode 100644 view/smarty3/filer_dialog.tpl
 delete mode 100644 view/smarty3/follow.tpl
 delete mode 100644 view/smarty3/follow_slap.tpl
 delete mode 100644 view/smarty3/generic_links_widget.tpl
 delete mode 100644 view/smarty3/group_drop.tpl
 delete mode 100644 view/smarty3/group_edit.tpl
 delete mode 100644 view/smarty3/group_selection.tpl
 delete mode 100644 view/smarty3/group_side.tpl
 delete mode 100644 view/smarty3/groupeditor.tpl
 delete mode 100644 view/smarty3/head.tpl
 delete mode 100644 view/smarty3/hide_comments.tpl
 delete mode 100644 view/smarty3/install.tpl
 delete mode 100644 view/smarty3/install_checks.tpl
 delete mode 100644 view/smarty3/install_db.tpl
 delete mode 100644 view/smarty3/install_settings.tpl
 delete mode 100644 view/smarty3/intros.tpl
 delete mode 100644 view/smarty3/invite.tpl
 delete mode 100644 view/smarty3/jot-end.tpl
 delete mode 100644 view/smarty3/jot-header.tpl
 delete mode 100644 view/smarty3/jot.tpl
 delete mode 100644 view/smarty3/jot_geotag.tpl
 delete mode 100644 view/smarty3/lang_selector.tpl
 delete mode 100644 view/smarty3/like_noshare.tpl
 delete mode 100644 view/smarty3/login.tpl
 delete mode 100644 view/smarty3/login_head.tpl
 delete mode 100644 view/smarty3/logout.tpl
 delete mode 100644 view/smarty3/lostpass.tpl
 delete mode 100644 view/smarty3/magicsig.tpl
 delete mode 100644 view/smarty3/mail_conv.tpl
 delete mode 100644 view/smarty3/mail_display.tpl
 delete mode 100644 view/smarty3/mail_head.tpl
 delete mode 100644 view/smarty3/mail_list.tpl
 delete mode 100644 view/smarty3/maintenance.tpl
 delete mode 100644 view/smarty3/manage.tpl
 delete mode 100644 view/smarty3/match.tpl
 delete mode 100644 view/smarty3/message-end.tpl
 delete mode 100644 view/smarty3/message-head.tpl
 delete mode 100644 view/smarty3/message_side.tpl
 delete mode 100644 view/smarty3/moderated_comment.tpl
 delete mode 100644 view/smarty3/mood_content.tpl
 delete mode 100644 view/smarty3/msg-end.tpl
 delete mode 100644 view/smarty3/msg-header.tpl
 delete mode 100644 view/smarty3/nav.tpl
 delete mode 100644 view/smarty3/navigation.tpl
 delete mode 100644 view/smarty3/netfriend.tpl
 delete mode 100644 view/smarty3/nets.tpl
 delete mode 100644 view/smarty3/nogroup-template.tpl
 delete mode 100644 view/smarty3/notifications.tpl
 delete mode 100644 view/smarty3/notifications_comments_item.tpl
 delete mode 100644 view/smarty3/notifications_dislikes_item.tpl
 delete mode 100644 view/smarty3/notifications_friends_item.tpl
 delete mode 100644 view/smarty3/notifications_likes_item.tpl
 delete mode 100644 view/smarty3/notifications_network_item.tpl
 delete mode 100644 view/smarty3/notifications_posts_item.tpl
 delete mode 100644 view/smarty3/notify.tpl
 delete mode 100644 view/smarty3/oauth_authorize.tpl
 delete mode 100644 view/smarty3/oauth_authorize_done.tpl
 delete mode 100644 view/smarty3/oembed_video.tpl
 delete mode 100644 view/smarty3/oexchange_xrd.tpl
 delete mode 100644 view/smarty3/opensearch.tpl
 delete mode 100644 view/smarty3/pagetypes.tpl
 delete mode 100644 view/smarty3/peoplefind.tpl
 delete mode 100644 view/smarty3/photo_album.tpl
 delete mode 100644 view/smarty3/photo_drop.tpl
 delete mode 100644 view/smarty3/photo_edit.tpl
 delete mode 100644 view/smarty3/photo_edit_head.tpl
 delete mode 100644 view/smarty3/photo_item.tpl
 delete mode 100644 view/smarty3/photo_top.tpl
 delete mode 100644 view/smarty3/photo_view.tpl
 delete mode 100644 view/smarty3/photos_default_uploader_box.tpl
 delete mode 100644 view/smarty3/photos_default_uploader_submit.tpl
 delete mode 100644 view/smarty3/photos_head.tpl
 delete mode 100644 view/smarty3/photos_recent.tpl
 delete mode 100644 view/smarty3/photos_upload.tpl
 delete mode 100644 view/smarty3/poco_entry_xml.tpl
 delete mode 100644 view/smarty3/poco_xml.tpl
 delete mode 100644 view/smarty3/poke_content.tpl
 delete mode 100644 view/smarty3/posted_date_widget.tpl
 delete mode 100644 view/smarty3/profed_end.tpl
 delete mode 100644 view/smarty3/profed_head.tpl
 delete mode 100644 view/smarty3/profile-hide-friends.tpl
 delete mode 100644 view/smarty3/profile-hide-wall.tpl
 delete mode 100644 view/smarty3/profile-in-directory.tpl
 delete mode 100644 view/smarty3/profile-in-netdir.tpl
 delete mode 100644 view/smarty3/profile_advanced.tpl
 delete mode 100644 view/smarty3/profile_edit.tpl
 delete mode 100644 view/smarty3/profile_edlink.tpl
 delete mode 100644 view/smarty3/profile_entry.tpl
 delete mode 100644 view/smarty3/profile_listing_header.tpl
 delete mode 100644 view/smarty3/profile_photo.tpl
 delete mode 100644 view/smarty3/profile_publish.tpl
 delete mode 100644 view/smarty3/profile_vcard.tpl
 delete mode 100644 view/smarty3/prv_message.tpl
 delete mode 100644 view/smarty3/pwdreset.tpl
 delete mode 100644 view/smarty3/register.tpl
 delete mode 100644 view/smarty3/remote_friends_common.tpl
 delete mode 100644 view/smarty3/removeme.tpl
 delete mode 100644 view/smarty3/saved_searches_aside.tpl
 delete mode 100644 view/smarty3/search_item.tpl
 delete mode 100644 view/smarty3/settings-end.tpl
 delete mode 100644 view/smarty3/settings-head.tpl
 delete mode 100644 view/smarty3/settings.tpl
 delete mode 100644 view/smarty3/settings_addons.tpl
 delete mode 100644 view/smarty3/settings_connectors.tpl
 delete mode 100644 view/smarty3/settings_display.tpl
 delete mode 100644 view/smarty3/settings_display_end.tpl
 delete mode 100644 view/smarty3/settings_features.tpl
 delete mode 100644 view/smarty3/settings_nick_set.tpl
 delete mode 100644 view/smarty3/settings_nick_subdir.tpl
 delete mode 100644 view/smarty3/settings_oauth.tpl
 delete mode 100644 view/smarty3/settings_oauth_edit.tpl
 delete mode 100644 view/smarty3/suggest_friends.tpl
 delete mode 100644 view/smarty3/suggestions.tpl
 delete mode 100644 view/smarty3/tag_slap.tpl
 delete mode 100644 view/smarty3/threaded_conversation.tpl
 delete mode 100644 view/smarty3/toggle_mobile_footer.tpl
 delete mode 100644 view/smarty3/uexport.tpl
 delete mode 100644 view/smarty3/uimport.tpl
 delete mode 100644 view/smarty3/vcard-widget.tpl
 delete mode 100644 view/smarty3/viewcontact_template.tpl
 delete mode 100644 view/smarty3/voting_fakelink.tpl
 delete mode 100644 view/smarty3/wall_thread.tpl
 delete mode 100644 view/smarty3/wallmessage.tpl
 delete mode 100644 view/smarty3/wallmsg-end.tpl
 delete mode 100644 view/smarty3/wallmsg-header.tpl
 delete mode 100644 view/smarty3/xrd_diaspora.tpl
 delete mode 100644 view/smarty3/xrd_host.tpl
 delete mode 100644 view/smarty3/xrd_person.tpl
 delete mode 100644 view/suggest_friends.tpl
 delete mode 100644 view/suggestions.tpl
 delete mode 100644 view/tag_slap.tpl
 delete mode 100644 view/theme/cleanzero/nav.tpl
 delete mode 100644 view/theme/cleanzero/smarty3/nav.tpl
 delete mode 100644 view/theme/cleanzero/smarty3/theme_settings.tpl
 delete mode 100644 view/theme/cleanzero/theme_settings.tpl
 delete mode 100644 view/theme/comix-plain/comment_item.tpl
 delete mode 100644 view/theme/comix-plain/search_item.tpl
 delete mode 100644 view/theme/comix-plain/smarty3/comment_item.tpl
 delete mode 100644 view/theme/comix-plain/smarty3/search_item.tpl
 delete mode 100644 view/theme/comix/comment_item.tpl
 delete mode 100644 view/theme/comix/search_item.tpl
 delete mode 100644 view/theme/comix/smarty3/comment_item.tpl
 delete mode 100644 view/theme/comix/smarty3/search_item.tpl
 delete mode 100644 view/theme/decaf-mobile/acl_html_selector.tpl
 delete mode 100644 view/theme/decaf-mobile/acl_selector.tpl
 delete mode 100644 view/theme/decaf-mobile/admin_aside.tpl
 delete mode 100644 view/theme/decaf-mobile/admin_site.tpl
 delete mode 100644 view/theme/decaf-mobile/admin_users.tpl
 delete mode 100644 view/theme/decaf-mobile/album_edit.tpl
 delete mode 100644 view/theme/decaf-mobile/categories_widget.tpl
 delete mode 100755 view/theme/decaf-mobile/comment_item.tpl
 delete mode 100644 view/theme/decaf-mobile/common_tabs.tpl
 delete mode 100644 view/theme/decaf-mobile/contact_block.tpl
 delete mode 100644 view/theme/decaf-mobile/contact_edit.tpl
 delete mode 100644 view/theme/decaf-mobile/contact_head.tpl
 delete mode 100644 view/theme/decaf-mobile/contact_template.tpl
 delete mode 100644 view/theme/decaf-mobile/contacts-end.tpl
 delete mode 100644 view/theme/decaf-mobile/contacts-head.tpl
 delete mode 100644 view/theme/decaf-mobile/contacts-template.tpl
 delete mode 100644 view/theme/decaf-mobile/contacts-widget-sidebar.tpl
 delete mode 100644 view/theme/decaf-mobile/conversation.tpl
 delete mode 100644 view/theme/decaf-mobile/cropbody.tpl
 delete mode 100644 view/theme/decaf-mobile/cropend.tpl
 delete mode 100644 view/theme/decaf-mobile/crophead.tpl
 delete mode 100644 view/theme/decaf-mobile/display-head.tpl
 delete mode 100644 view/theme/decaf-mobile/end.tpl
 delete mode 100644 view/theme/decaf-mobile/event_end.tpl
 delete mode 100644 view/theme/decaf-mobile/event_head.tpl
 delete mode 100644 view/theme/decaf-mobile/field_checkbox.tpl
 delete mode 100644 view/theme/decaf-mobile/field_input.tpl
 delete mode 100644 view/theme/decaf-mobile/field_openid.tpl
 delete mode 100644 view/theme/decaf-mobile/field_password.tpl
 delete mode 100644 view/theme/decaf-mobile/field_themeselect.tpl
 delete mode 100644 view/theme/decaf-mobile/field_yesno.tpl
 delete mode 100644 view/theme/decaf-mobile/generic_links_widget.tpl
 delete mode 100644 view/theme/decaf-mobile/group_drop.tpl
 delete mode 100644 view/theme/decaf-mobile/group_side.tpl
 delete mode 100644 view/theme/decaf-mobile/head.tpl
 delete mode 100644 view/theme/decaf-mobile/jot-end.tpl
 delete mode 100644 view/theme/decaf-mobile/jot-header.tpl
 delete mode 100644 view/theme/decaf-mobile/jot.tpl
 delete mode 100644 view/theme/decaf-mobile/jot_geotag.tpl
 delete mode 100644 view/theme/decaf-mobile/lang_selector.tpl
 delete mode 100644 view/theme/decaf-mobile/like_noshare.tpl
 delete mode 100644 view/theme/decaf-mobile/login.tpl
 delete mode 100644 view/theme/decaf-mobile/login_head.tpl
 delete mode 100644 view/theme/decaf-mobile/lostpass.tpl
 delete mode 100644 view/theme/decaf-mobile/mail_conv.tpl
 delete mode 100644 view/theme/decaf-mobile/mail_list.tpl
 delete mode 100644 view/theme/decaf-mobile/manage.tpl
 delete mode 100644 view/theme/decaf-mobile/message-end.tpl
 delete mode 100644 view/theme/decaf-mobile/message-head.tpl
 delete mode 100644 view/theme/decaf-mobile/msg-end.tpl
 delete mode 100644 view/theme/decaf-mobile/msg-header.tpl
 delete mode 100644 view/theme/decaf-mobile/nav.tpl
 delete mode 100644 view/theme/decaf-mobile/photo_drop.tpl
 delete mode 100644 view/theme/decaf-mobile/photo_edit.tpl
 delete mode 100644 view/theme/decaf-mobile/photo_edit_head.tpl
 delete mode 100644 view/theme/decaf-mobile/photo_view.tpl
 delete mode 100644 view/theme/decaf-mobile/photos_head.tpl
 delete mode 100644 view/theme/decaf-mobile/photos_upload.tpl
 delete mode 100644 view/theme/decaf-mobile/profed_end.tpl
 delete mode 100644 view/theme/decaf-mobile/profed_head.tpl
 delete mode 100644 view/theme/decaf-mobile/profile_edit.tpl
 delete mode 100644 view/theme/decaf-mobile/profile_photo.tpl
 delete mode 100644 view/theme/decaf-mobile/profile_vcard.tpl
 delete mode 100644 view/theme/decaf-mobile/prv_message.tpl
 delete mode 100644 view/theme/decaf-mobile/register.tpl
 delete mode 100644 view/theme/decaf-mobile/search_item.tpl
 delete mode 100644 view/theme/decaf-mobile/settings-head.tpl
 delete mode 100644 view/theme/decaf-mobile/settings.tpl
 delete mode 100644 view/theme/decaf-mobile/settings_display_end.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/acl_html_selector.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/acl_selector.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/admin_aside.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/admin_site.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/admin_users.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/album_edit.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/categories_widget.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/comment_item.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/common_tabs.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/contact_block.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/contact_edit.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/contact_head.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/contact_template.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/contacts-end.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/contacts-head.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/contacts-template.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/conversation.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/cropbody.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/cropend.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/crophead.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/display-head.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/end.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/event_end.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/event_head.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/field_checkbox.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/field_input.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/field_openid.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/field_password.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/field_themeselect.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/field_yesno.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/generic_links_widget.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/group_drop.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/group_side.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/head.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/jot-end.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/jot-header.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/jot.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/jot_geotag.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/lang_selector.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/like_noshare.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/login.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/login_head.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/lostpass.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/mail_conv.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/mail_list.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/manage.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/message-end.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/message-head.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/moderated_comment.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/msg-end.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/msg-header.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/nav.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/photo_drop.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/photo_edit.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/photo_edit_head.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/photo_view.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/photos_head.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/photos_upload.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/profed_end.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/profed_head.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/profile_edit.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/profile_photo.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/profile_vcard.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/prv_message.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/register.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/search_item.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/settings-head.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/settings.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/settings_display_end.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/suggest_friends.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/threaded_conversation.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/voting_fakelink.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/wall_thread.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/wallmessage.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/wallmsg-end.tpl
 delete mode 100644 view/theme/decaf-mobile/smarty3/wallmsg-header.tpl
 delete mode 100644 view/theme/decaf-mobile/suggest_friends.tpl
 delete mode 100644 view/theme/decaf-mobile/threaded_conversation.tpl
 delete mode 100644 view/theme/decaf-mobile/voting_fakelink.tpl
 delete mode 100644 view/theme/decaf-mobile/wall_thread.tpl
 delete mode 100644 view/theme/decaf-mobile/wall_thread_toponly.tpl
 delete mode 100644 view/theme/decaf-mobile/wallmessage.tpl
 delete mode 100644 view/theme/decaf-mobile/wallmsg-end.tpl
 delete mode 100644 view/theme/decaf-mobile/wallmsg-header.tpl
 delete mode 100644 view/theme/diabook/admin_users.tpl
 delete mode 100644 view/theme/diabook/bottom.tpl
 delete mode 100644 view/theme/diabook/ch_directory_item.tpl
 delete mode 100644 view/theme/diabook/comment_item.tpl
 delete mode 100644 view/theme/diabook/communityhome.tpl
 delete mode 100644 view/theme/diabook/contact_template.tpl
 delete mode 100644 view/theme/diabook/directory_item.tpl
 delete mode 100644 view/theme/diabook/footer.tpl
 delete mode 100644 view/theme/diabook/generic_links_widget.tpl
 delete mode 100644 view/theme/diabook/group_side.tpl
 delete mode 100644 view/theme/diabook/jot.tpl
 delete mode 100644 view/theme/diabook/login.tpl
 delete mode 100644 view/theme/diabook/mail_conv.tpl
 delete mode 100644 view/theme/diabook/mail_display.tpl
 delete mode 100644 view/theme/diabook/mail_list.tpl
 delete mode 100644 view/theme/diabook/message_side.tpl
 delete mode 100644 view/theme/diabook/nav.tpl
 delete mode 100644 view/theme/diabook/nets.tpl
 delete mode 100644 view/theme/diabook/oembed_video.tpl
 delete mode 100644 view/theme/diabook/photo_item.tpl
 delete mode 100644 view/theme/diabook/photo_view.tpl
 delete mode 100644 view/theme/diabook/profile_side.tpl
 delete mode 100644 view/theme/diabook/profile_vcard.tpl
 delete mode 100644 view/theme/diabook/prv_message.tpl
 delete mode 100644 view/theme/diabook/right_aside.tpl
 delete mode 100644 view/theme/diabook/search_item.tpl
 delete mode 100644 view/theme/diabook/smarty3/admin_users.tpl
 delete mode 100644 view/theme/diabook/smarty3/bottom.tpl
 delete mode 100644 view/theme/diabook/smarty3/ch_directory_item.tpl
 delete mode 100644 view/theme/diabook/smarty3/comment_item.tpl
 delete mode 100644 view/theme/diabook/smarty3/communityhome.tpl
 delete mode 100644 view/theme/diabook/smarty3/contact_template.tpl
 delete mode 100644 view/theme/diabook/smarty3/directory_item.tpl
 delete mode 100644 view/theme/diabook/smarty3/footer.tpl
 delete mode 100644 view/theme/diabook/smarty3/generic_links_widget.tpl
 delete mode 100644 view/theme/diabook/smarty3/group_side.tpl
 delete mode 100644 view/theme/diabook/smarty3/jot.tpl
 delete mode 100644 view/theme/diabook/smarty3/login.tpl
 delete mode 100644 view/theme/diabook/smarty3/mail_conv.tpl
 delete mode 100644 view/theme/diabook/smarty3/mail_display.tpl
 delete mode 100644 view/theme/diabook/smarty3/mail_list.tpl
 delete mode 100644 view/theme/diabook/smarty3/message_side.tpl
 delete mode 100644 view/theme/diabook/smarty3/nav.tpl
 delete mode 100644 view/theme/diabook/smarty3/nets.tpl
 delete mode 100644 view/theme/diabook/smarty3/oembed_video.tpl
 delete mode 100644 view/theme/diabook/smarty3/photo_item.tpl
 delete mode 100644 view/theme/diabook/smarty3/photo_view.tpl
 delete mode 100644 view/theme/diabook/smarty3/profile_side.tpl
 delete mode 100644 view/theme/diabook/smarty3/profile_vcard.tpl
 delete mode 100644 view/theme/diabook/smarty3/prv_message.tpl
 delete mode 100644 view/theme/diabook/smarty3/right_aside.tpl
 delete mode 100644 view/theme/diabook/smarty3/search_item.tpl
 delete mode 100644 view/theme/diabook/smarty3/theme_settings.tpl
 delete mode 100644 view/theme/diabook/smarty3/wall_thread.tpl
 delete mode 100644 view/theme/diabook/theme_settings.tpl
 delete mode 100644 view/theme/diabook/wall_thread.tpl
 delete mode 100644 view/theme/dispy/bottom.tpl
 delete mode 100644 view/theme/dispy/comment_item.tpl
 delete mode 100644 view/theme/dispy/communityhome.tpl
 delete mode 100644 view/theme/dispy/contact_template.tpl
 delete mode 100644 view/theme/dispy/conversation.tpl
 delete mode 100644 view/theme/dispy/group_side.tpl
 delete mode 100644 view/theme/dispy/header.tpl
 delete mode 100644 view/theme/dispy/jot-header.tpl
 delete mode 100644 view/theme/dispy/jot.tpl
 delete mode 100644 view/theme/dispy/lang_selector.tpl
 delete mode 100644 view/theme/dispy/mail_head.tpl
 delete mode 100644 view/theme/dispy/nav.tpl
 delete mode 100644 view/theme/dispy/photo_edit.tpl
 delete mode 100644 view/theme/dispy/photo_view.tpl
 delete mode 100644 view/theme/dispy/profile_vcard.tpl
 delete mode 100644 view/theme/dispy/saved_searches_aside.tpl
 delete mode 100644 view/theme/dispy/search_item.tpl
 delete mode 100644 view/theme/dispy/smarty3/bottom.tpl
 delete mode 100644 view/theme/dispy/smarty3/comment_item.tpl
 delete mode 100644 view/theme/dispy/smarty3/communityhome.tpl
 delete mode 100644 view/theme/dispy/smarty3/contact_template.tpl
 delete mode 100644 view/theme/dispy/smarty3/conversation.tpl
 delete mode 100644 view/theme/dispy/smarty3/group_side.tpl
 delete mode 100644 view/theme/dispy/smarty3/header.tpl
 delete mode 100644 view/theme/dispy/smarty3/jot-header.tpl
 delete mode 100644 view/theme/dispy/smarty3/jot.tpl
 delete mode 100644 view/theme/dispy/smarty3/lang_selector.tpl
 delete mode 100644 view/theme/dispy/smarty3/mail_head.tpl
 delete mode 100644 view/theme/dispy/smarty3/nav.tpl
 delete mode 100644 view/theme/dispy/smarty3/photo_edit.tpl
 delete mode 100644 view/theme/dispy/smarty3/photo_view.tpl
 delete mode 100644 view/theme/dispy/smarty3/profile_vcard.tpl
 delete mode 100644 view/theme/dispy/smarty3/saved_searches_aside.tpl
 delete mode 100644 view/theme/dispy/smarty3/search_item.tpl
 delete mode 100644 view/theme/dispy/smarty3/theme_settings.tpl
 delete mode 100644 view/theme/dispy/smarty3/threaded_conversation.tpl
 delete mode 100644 view/theme/dispy/smarty3/wall_thread.tpl
 delete mode 100644 view/theme/dispy/theme_settings.tpl
 delete mode 100644 view/theme/dispy/threaded_conversation.tpl
 delete mode 100644 view/theme/dispy/wall_thread.tpl
 delete mode 100755 view/theme/duepuntozero/comment_item.tpl
 delete mode 100644 view/theme/duepuntozero/lang_selector.tpl
 delete mode 100755 view/theme/duepuntozero/moderated_comment.tpl
 delete mode 100644 view/theme/duepuntozero/nav.tpl
 delete mode 100644 view/theme/duepuntozero/profile_vcard.tpl
 delete mode 100644 view/theme/duepuntozero/prv_message.tpl
 delete mode 100644 view/theme/duepuntozero/smarty3/comment_item.tpl
 delete mode 100644 view/theme/duepuntozero/smarty3/lang_selector.tpl
 delete mode 100644 view/theme/duepuntozero/smarty3/moderated_comment.tpl
 delete mode 100644 view/theme/duepuntozero/smarty3/nav.tpl
 delete mode 100644 view/theme/duepuntozero/smarty3/profile_vcard.tpl
 delete mode 100644 view/theme/duepuntozero/smarty3/prv_message.tpl
 delete mode 100644 view/theme/facepark/comment_item.tpl
 delete mode 100644 view/theme/facepark/group_side.tpl
 delete mode 100644 view/theme/facepark/jot.tpl
 delete mode 100644 view/theme/facepark/nav.tpl
 delete mode 100644 view/theme/facepark/profile_vcard.tpl
 delete mode 100644 view/theme/facepark/search_item.tpl
 delete mode 100644 view/theme/facepark/smarty3/comment_item.tpl
 delete mode 100644 view/theme/facepark/smarty3/group_side.tpl
 delete mode 100644 view/theme/facepark/smarty3/jot.tpl
 delete mode 100644 view/theme/facepark/smarty3/nav.tpl
 delete mode 100644 view/theme/facepark/smarty3/profile_vcard.tpl
 delete mode 100644 view/theme/facepark/smarty3/search_item.tpl
 delete mode 100644 view/theme/frost-mobile/acl_selector.tpl
 delete mode 100644 view/theme/frost-mobile/admin_aside.tpl
 delete mode 100644 view/theme/frost-mobile/admin_site.tpl
 delete mode 100644 view/theme/frost-mobile/admin_users.tpl
 delete mode 100644 view/theme/frost-mobile/categories_widget.tpl
 delete mode 100755 view/theme/frost-mobile/comment_item.tpl
 delete mode 100644 view/theme/frost-mobile/common_tabs.tpl
 delete mode 100644 view/theme/frost-mobile/contact_block.tpl
 delete mode 100644 view/theme/frost-mobile/contact_edit.tpl
 delete mode 100644 view/theme/frost-mobile/contact_head.tpl
 delete mode 100644 view/theme/frost-mobile/contact_template.tpl
 delete mode 100644 view/theme/frost-mobile/contacts-end.tpl
 delete mode 100644 view/theme/frost-mobile/contacts-head.tpl
 delete mode 100644 view/theme/frost-mobile/contacts-template.tpl
 delete mode 100644 view/theme/frost-mobile/contacts-widget-sidebar.tpl
 delete mode 100644 view/theme/frost-mobile/conversation.tpl
 delete mode 100644 view/theme/frost-mobile/cropbody.tpl
 delete mode 100644 view/theme/frost-mobile/cropend.tpl
 delete mode 100644 view/theme/frost-mobile/crophead.tpl
 delete mode 100644 view/theme/frost-mobile/display-head.tpl
 delete mode 100644 view/theme/frost-mobile/end.tpl
 delete mode 100644 view/theme/frost-mobile/event.tpl
 delete mode 100644 view/theme/frost-mobile/event_end.tpl
 delete mode 100644 view/theme/frost-mobile/event_head.tpl
 delete mode 100644 view/theme/frost-mobile/field_checkbox.tpl
 delete mode 100644 view/theme/frost-mobile/field_input.tpl
 delete mode 100644 view/theme/frost-mobile/field_openid.tpl
 delete mode 100644 view/theme/frost-mobile/field_password.tpl
 delete mode 100644 view/theme/frost-mobile/field_themeselect.tpl
 delete mode 100644 view/theme/frost-mobile/generic_links_widget.tpl
 delete mode 100644 view/theme/frost-mobile/group_drop.tpl
 delete mode 100644 view/theme/frost-mobile/head.tpl
 delete mode 100644 view/theme/frost-mobile/jot-end.tpl
 delete mode 100644 view/theme/frost-mobile/jot-header.tpl
 delete mode 100644 view/theme/frost-mobile/jot.tpl
 delete mode 100644 view/theme/frost-mobile/jot_geotag.tpl
 delete mode 100644 view/theme/frost-mobile/lang_selector.tpl
 delete mode 100644 view/theme/frost-mobile/like_noshare.tpl
 delete mode 100644 view/theme/frost-mobile/login.tpl
 delete mode 100644 view/theme/frost-mobile/login_head.tpl
 delete mode 100644 view/theme/frost-mobile/lostpass.tpl
 delete mode 100644 view/theme/frost-mobile/mail_conv.tpl
 delete mode 100644 view/theme/frost-mobile/mail_list.tpl
 delete mode 100644 view/theme/frost-mobile/message-end.tpl
 delete mode 100644 view/theme/frost-mobile/message-head.tpl
 delete mode 100755 view/theme/frost-mobile/moderated_comment.tpl
 delete mode 100644 view/theme/frost-mobile/msg-end.tpl
 delete mode 100644 view/theme/frost-mobile/msg-header.tpl
 delete mode 100644 view/theme/frost-mobile/nav.tpl
 delete mode 100644 view/theme/frost-mobile/photo_drop.tpl
 delete mode 100644 view/theme/frost-mobile/photo_edit.tpl
 delete mode 100644 view/theme/frost-mobile/photo_edit_head.tpl
 delete mode 100644 view/theme/frost-mobile/photo_view.tpl
 delete mode 100644 view/theme/frost-mobile/photos_head.tpl
 delete mode 100644 view/theme/frost-mobile/photos_upload.tpl
 delete mode 100644 view/theme/frost-mobile/profed_end.tpl
 delete mode 100644 view/theme/frost-mobile/profed_head.tpl
 delete mode 100644 view/theme/frost-mobile/profile_edit.tpl
 delete mode 100644 view/theme/frost-mobile/profile_photo.tpl
 delete mode 100644 view/theme/frost-mobile/profile_vcard.tpl
 delete mode 100644 view/theme/frost-mobile/prv_message.tpl
 delete mode 100644 view/theme/frost-mobile/register.tpl
 delete mode 100644 view/theme/frost-mobile/search_item.tpl
 delete mode 100644 view/theme/frost-mobile/settings-head.tpl
 delete mode 100644 view/theme/frost-mobile/settings.tpl
 delete mode 100644 view/theme/frost-mobile/settings_display_end.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/acl_selector.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/admin_aside.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/admin_site.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/admin_users.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/categories_widget.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/comment_item.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/common_tabs.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/contact_block.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/contact_edit.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/contact_head.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/contact_template.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/contacts-end.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/contacts-head.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/contacts-template.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/conversation.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/cropbody.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/cropend.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/crophead.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/display-head.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/end.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/event.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/event_end.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/event_head.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/field_checkbox.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/field_input.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/field_openid.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/field_password.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/field_themeselect.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/generic_links_widget.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/group_drop.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/head.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/jot-end.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/jot-header.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/jot.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/jot_geotag.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/lang_selector.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/like_noshare.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/login.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/login_head.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/lostpass.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/mail_conv.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/mail_list.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/message-end.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/message-head.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/moderated_comment.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/msg-end.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/msg-header.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/nav.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/photo_drop.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/photo_edit.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/photo_edit_head.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/photo_view.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/photos_head.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/photos_upload.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/profed_end.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/profed_head.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/profile_edit.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/profile_photo.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/profile_vcard.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/prv_message.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/register.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/search_item.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/settings-head.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/settings.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/settings_display_end.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/suggest_friends.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/threaded_conversation.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/voting_fakelink.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/wall_thread.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/wallmsg-end.tpl
 delete mode 100644 view/theme/frost-mobile/smarty3/wallmsg-header.tpl
 delete mode 100644 view/theme/frost-mobile/suggest_friends.tpl
 delete mode 100644 view/theme/frost-mobile/threaded_conversation.tpl
 delete mode 100644 view/theme/frost-mobile/voting_fakelink.tpl
 delete mode 100644 view/theme/frost-mobile/wall_thread.tpl
 delete mode 100644 view/theme/frost-mobile/wallmsg-end.tpl
 delete mode 100644 view/theme/frost-mobile/wallmsg-header.tpl
 delete mode 100644 view/theme/frost/acl_selector.tpl
 delete mode 100644 view/theme/frost/admin_aside.tpl
 delete mode 100644 view/theme/frost/admin_site.tpl
 delete mode 100644 view/theme/frost/admin_users.tpl
 delete mode 100755 view/theme/frost/comment_item.tpl
 delete mode 100644 view/theme/frost/contact_edit.tpl
 delete mode 100644 view/theme/frost/contact_end.tpl
 delete mode 100644 view/theme/frost/contact_head.tpl
 delete mode 100644 view/theme/frost/contact_template.tpl
 delete mode 100644 view/theme/frost/contacts-end.tpl
 delete mode 100644 view/theme/frost/contacts-head.tpl
 delete mode 100644 view/theme/frost/contacts-template.tpl
 delete mode 100644 view/theme/frost/cropbody.tpl
 delete mode 100644 view/theme/frost/cropend.tpl
 delete mode 100644 view/theme/frost/crophead.tpl
 delete mode 100644 view/theme/frost/display-head.tpl
 delete mode 100644 view/theme/frost/end.tpl
 delete mode 100644 view/theme/frost/event.tpl
 delete mode 100644 view/theme/frost/event_end.tpl
 delete mode 100644 view/theme/frost/event_form.tpl
 delete mode 100644 view/theme/frost/event_head.tpl
 delete mode 100644 view/theme/frost/field_combobox.tpl
 delete mode 100644 view/theme/frost/field_input.tpl
 delete mode 100644 view/theme/frost/field_openid.tpl
 delete mode 100644 view/theme/frost/field_password.tpl
 delete mode 100644 view/theme/frost/field_themeselect.tpl
 delete mode 100644 view/theme/frost/filebrowser.tpl
 delete mode 100644 view/theme/frost/group_drop.tpl
 delete mode 100644 view/theme/frost/head.tpl
 delete mode 100644 view/theme/frost/jot-end.tpl
 delete mode 100644 view/theme/frost/jot-header.tpl
 delete mode 100644 view/theme/frost/jot.tpl
 delete mode 100644 view/theme/frost/jot_geotag.tpl
 delete mode 100644 view/theme/frost/lang_selector.tpl
 delete mode 100644 view/theme/frost/like_noshare.tpl
 delete mode 100644 view/theme/frost/login.tpl
 delete mode 100644 view/theme/frost/login_head.tpl
 delete mode 100644 view/theme/frost/lostpass.tpl
 delete mode 100644 view/theme/frost/mail_conv.tpl
 delete mode 100644 view/theme/frost/mail_list.tpl
 delete mode 100644 view/theme/frost/message-end.tpl
 delete mode 100644 view/theme/frost/message-head.tpl
 delete mode 100755 view/theme/frost/moderated_comment.tpl
 delete mode 100644 view/theme/frost/msg-end.tpl
 delete mode 100644 view/theme/frost/msg-header.tpl
 delete mode 100644 view/theme/frost/nav.tpl
 delete mode 100644 view/theme/frost/photo_drop.tpl
 delete mode 100644 view/theme/frost/photo_edit.tpl
 delete mode 100644 view/theme/frost/photo_edit_head.tpl
 delete mode 100644 view/theme/frost/photo_view.tpl
 delete mode 100644 view/theme/frost/photos_head.tpl
 delete mode 100644 view/theme/frost/photos_upload.tpl
 delete mode 100644 view/theme/frost/posted_date_widget.tpl
 delete mode 100644 view/theme/frost/profed_end.tpl
 delete mode 100644 view/theme/frost/profed_head.tpl
 delete mode 100644 view/theme/frost/profile_edit.tpl
 delete mode 100644 view/theme/frost/profile_vcard.tpl
 delete mode 100644 view/theme/frost/prv_message.tpl
 delete mode 100644 view/theme/frost/register.tpl
 delete mode 100644 view/theme/frost/search_item.tpl
 delete mode 100644 view/theme/frost/settings-head.tpl
 delete mode 100644 view/theme/frost/settings_display_end.tpl
 delete mode 100644 view/theme/frost/smarty3/acl_selector.tpl
 delete mode 100644 view/theme/frost/smarty3/admin_aside.tpl
 delete mode 100644 view/theme/frost/smarty3/admin_site.tpl
 delete mode 100644 view/theme/frost/smarty3/admin_users.tpl
 delete mode 100644 view/theme/frost/smarty3/comment_item.tpl
 delete mode 100644 view/theme/frost/smarty3/contact_edit.tpl
 delete mode 100644 view/theme/frost/smarty3/contact_end.tpl
 delete mode 100644 view/theme/frost/smarty3/contact_head.tpl
 delete mode 100644 view/theme/frost/smarty3/contact_template.tpl
 delete mode 100644 view/theme/frost/smarty3/contacts-end.tpl
 delete mode 100644 view/theme/frost/smarty3/contacts-head.tpl
 delete mode 100644 view/theme/frost/smarty3/contacts-template.tpl
 delete mode 100644 view/theme/frost/smarty3/cropbody.tpl
 delete mode 100644 view/theme/frost/smarty3/cropend.tpl
 delete mode 100644 view/theme/frost/smarty3/crophead.tpl
 delete mode 100644 view/theme/frost/smarty3/display-head.tpl
 delete mode 100644 view/theme/frost/smarty3/end.tpl
 delete mode 100644 view/theme/frost/smarty3/event.tpl
 delete mode 100644 view/theme/frost/smarty3/event_end.tpl
 delete mode 100644 view/theme/frost/smarty3/event_form.tpl
 delete mode 100644 view/theme/frost/smarty3/event_head.tpl
 delete mode 100644 view/theme/frost/smarty3/field_combobox.tpl
 delete mode 100644 view/theme/frost/smarty3/field_input.tpl
 delete mode 100644 view/theme/frost/smarty3/field_openid.tpl
 delete mode 100644 view/theme/frost/smarty3/field_password.tpl
 delete mode 100644 view/theme/frost/smarty3/field_themeselect.tpl
 delete mode 100644 view/theme/frost/smarty3/filebrowser.tpl
 delete mode 100644 view/theme/frost/smarty3/group_drop.tpl
 delete mode 100644 view/theme/frost/smarty3/head.tpl
 delete mode 100644 view/theme/frost/smarty3/jot-end.tpl
 delete mode 100644 view/theme/frost/smarty3/jot-header.tpl
 delete mode 100644 view/theme/frost/smarty3/jot.tpl
 delete mode 100644 view/theme/frost/smarty3/jot_geotag.tpl
 delete mode 100644 view/theme/frost/smarty3/lang_selector.tpl
 delete mode 100644 view/theme/frost/smarty3/like_noshare.tpl
 delete mode 100644 view/theme/frost/smarty3/login.tpl
 delete mode 100644 view/theme/frost/smarty3/login_head.tpl
 delete mode 100644 view/theme/frost/smarty3/lostpass.tpl
 delete mode 100644 view/theme/frost/smarty3/mail_conv.tpl
 delete mode 100644 view/theme/frost/smarty3/mail_list.tpl
 delete mode 100644 view/theme/frost/smarty3/message-end.tpl
 delete mode 100644 view/theme/frost/smarty3/message-head.tpl
 delete mode 100644 view/theme/frost/smarty3/moderated_comment.tpl
 delete mode 100644 view/theme/frost/smarty3/msg-end.tpl
 delete mode 100644 view/theme/frost/smarty3/msg-header.tpl
 delete mode 100644 view/theme/frost/smarty3/nav.tpl
 delete mode 100644 view/theme/frost/smarty3/photo_drop.tpl
 delete mode 100644 view/theme/frost/smarty3/photo_edit.tpl
 delete mode 100644 view/theme/frost/smarty3/photo_edit_head.tpl
 delete mode 100644 view/theme/frost/smarty3/photo_view.tpl
 delete mode 100644 view/theme/frost/smarty3/photos_head.tpl
 delete mode 100644 view/theme/frost/smarty3/photos_upload.tpl
 delete mode 100644 view/theme/frost/smarty3/posted_date_widget.tpl
 delete mode 100644 view/theme/frost/smarty3/profed_end.tpl
 delete mode 100644 view/theme/frost/smarty3/profed_head.tpl
 delete mode 100644 view/theme/frost/smarty3/profile_edit.tpl
 delete mode 100644 view/theme/frost/smarty3/profile_vcard.tpl
 delete mode 100644 view/theme/frost/smarty3/prv_message.tpl
 delete mode 100644 view/theme/frost/smarty3/register.tpl
 delete mode 100644 view/theme/frost/smarty3/search_item.tpl
 delete mode 100644 view/theme/frost/smarty3/settings-head.tpl
 delete mode 100644 view/theme/frost/smarty3/settings_display_end.tpl
 delete mode 100644 view/theme/frost/smarty3/suggest_friends.tpl
 delete mode 100644 view/theme/frost/smarty3/threaded_conversation.tpl
 delete mode 100644 view/theme/frost/smarty3/voting_fakelink.tpl
 delete mode 100644 view/theme/frost/smarty3/wall_thread.tpl
 delete mode 100644 view/theme/frost/smarty3/wallmsg-end.tpl
 delete mode 100644 view/theme/frost/smarty3/wallmsg-header.tpl
 delete mode 100644 view/theme/frost/suggest_friends.tpl
 delete mode 100644 view/theme/frost/threaded_conversation.tpl
 delete mode 100644 view/theme/frost/voting_fakelink.tpl
 delete mode 100644 view/theme/frost/wall_thread.tpl
 delete mode 100644 view/theme/frost/wallmsg-end.tpl
 delete mode 100644 view/theme/frost/wallmsg-header.tpl
 delete mode 100644 view/theme/quattro/birthdays_reminder.tpl
 delete mode 100644 view/theme/quattro/comment_item.tpl
 delete mode 100644 view/theme/quattro/contact_template.tpl
 delete mode 100644 view/theme/quattro/conversation.tpl
 delete mode 100644 view/theme/quattro/events_reminder.tpl
 delete mode 100644 view/theme/quattro/fileas_widget.tpl
 delete mode 100644 view/theme/quattro/generic_links_widget.tpl
 delete mode 100644 view/theme/quattro/group_side.tpl
 delete mode 100644 view/theme/quattro/jot.tpl
 delete mode 100644 view/theme/quattro/mail_conv.tpl
 delete mode 100644 view/theme/quattro/mail_display.tpl
 delete mode 100644 view/theme/quattro/mail_list.tpl
 delete mode 100644 view/theme/quattro/message_side.tpl
 delete mode 100644 view/theme/quattro/nav.tpl
 delete mode 100644 view/theme/quattro/nets.tpl
 delete mode 100644 view/theme/quattro/photo_view.tpl
 delete mode 100644 view/theme/quattro/profile_vcard.tpl
 delete mode 100644 view/theme/quattro/prv_message.tpl
 delete mode 100644 view/theme/quattro/saved_searches_aside.tpl
 delete mode 100644 view/theme/quattro/search_item.tpl
 delete mode 100644 view/theme/quattro/smarty3/birthdays_reminder.tpl
 delete mode 100644 view/theme/quattro/smarty3/comment_item.tpl
 delete mode 100644 view/theme/quattro/smarty3/contact_template.tpl
 delete mode 100644 view/theme/quattro/smarty3/conversation.tpl
 delete mode 100644 view/theme/quattro/smarty3/events_reminder.tpl
 delete mode 100644 view/theme/quattro/smarty3/fileas_widget.tpl
 delete mode 100644 view/theme/quattro/smarty3/generic_links_widget.tpl
 delete mode 100644 view/theme/quattro/smarty3/group_side.tpl
 delete mode 100644 view/theme/quattro/smarty3/jot.tpl
 delete mode 100644 view/theme/quattro/smarty3/mail_conv.tpl
 delete mode 100644 view/theme/quattro/smarty3/mail_display.tpl
 delete mode 100644 view/theme/quattro/smarty3/mail_list.tpl
 delete mode 100644 view/theme/quattro/smarty3/message_side.tpl
 delete mode 100644 view/theme/quattro/smarty3/nav.tpl
 delete mode 100644 view/theme/quattro/smarty3/nets.tpl
 delete mode 100644 view/theme/quattro/smarty3/photo_view.tpl
 delete mode 100644 view/theme/quattro/smarty3/profile_vcard.tpl
 delete mode 100644 view/theme/quattro/smarty3/prv_message.tpl
 delete mode 100644 view/theme/quattro/smarty3/saved_searches_aside.tpl
 delete mode 100644 view/theme/quattro/smarty3/search_item.tpl
 delete mode 100644 view/theme/quattro/smarty3/theme_settings.tpl
 delete mode 100644 view/theme/quattro/smarty3/threaded_conversation.tpl
 delete mode 100644 view/theme/quattro/smarty3/wall_item_tag.tpl
 delete mode 100644 view/theme/quattro/smarty3/wall_thread.tpl
 delete mode 100644 view/theme/quattro/theme_settings.tpl
 delete mode 100644 view/theme/quattro/threaded_conversation.tpl
 delete mode 100644 view/theme/quattro/wall_item_tag.tpl
 delete mode 100644 view/theme/quattro/wall_thread.tpl
 delete mode 100644 view/theme/slackr/birthdays_reminder.tpl
 delete mode 100644 view/theme/slackr/events_reminder.tpl
 delete mode 100644 view/theme/slackr/smarty3/birthdays_reminder.tpl
 delete mode 100644 view/theme/slackr/smarty3/events_reminder.tpl
 delete mode 100644 view/theme/smoothly/bottom.tpl
 delete mode 100644 view/theme/smoothly/follow.tpl
 delete mode 100644 view/theme/smoothly/jot-header.tpl
 delete mode 100644 view/theme/smoothly/jot.tpl
 delete mode 100644 view/theme/smoothly/lang_selector.tpl
 delete mode 100644 view/theme/smoothly/nav.tpl
 delete mode 100644 view/theme/smoothly/search_item.tpl
 delete mode 100644 view/theme/smoothly/smarty3/bottom.tpl
 delete mode 100644 view/theme/smoothly/smarty3/follow.tpl
 delete mode 100644 view/theme/smoothly/smarty3/jot-header.tpl
 delete mode 100644 view/theme/smoothly/smarty3/jot.tpl
 delete mode 100644 view/theme/smoothly/smarty3/lang_selector.tpl
 delete mode 100644 view/theme/smoothly/smarty3/nav.tpl
 delete mode 100644 view/theme/smoothly/smarty3/search_item.tpl
 delete mode 100644 view/theme/smoothly/smarty3/wall_thread.tpl
 delete mode 100644 view/theme/smoothly/wall_thread.tpl
 delete mode 100644 view/theme/testbubble/comment_item.tpl
 delete mode 100644 view/theme/testbubble/group_drop.tpl
 delete mode 100644 view/theme/testbubble/group_edit.tpl
 delete mode 100644 view/theme/testbubble/group_side.tpl
 delete mode 100644 view/theme/testbubble/jot-header.tpl
 delete mode 100644 view/theme/testbubble/jot.tpl
 delete mode 100644 view/theme/testbubble/match.tpl
 delete mode 100644 view/theme/testbubble/nav.tpl
 delete mode 100644 view/theme/testbubble/photo_album.tpl
 delete mode 100644 view/theme/testbubble/photo_top.tpl
 delete mode 100644 view/theme/testbubble/photo_view.tpl
 delete mode 100644 view/theme/testbubble/profile_entry.tpl
 delete mode 100644 view/theme/testbubble/profile_vcard.tpl
 delete mode 100644 view/theme/testbubble/saved_searches_aside.tpl
 delete mode 100644 view/theme/testbubble/search_item.tpl
 delete mode 100644 view/theme/testbubble/smarty3/comment_item.tpl
 delete mode 100644 view/theme/testbubble/smarty3/group_drop.tpl
 delete mode 100644 view/theme/testbubble/smarty3/group_edit.tpl
 delete mode 100644 view/theme/testbubble/smarty3/group_side.tpl
 delete mode 100644 view/theme/testbubble/smarty3/jot-header.tpl
 delete mode 100644 view/theme/testbubble/smarty3/jot.tpl
 delete mode 100644 view/theme/testbubble/smarty3/match.tpl
 delete mode 100644 view/theme/testbubble/smarty3/nav.tpl
 delete mode 100644 view/theme/testbubble/smarty3/photo_album.tpl
 delete mode 100644 view/theme/testbubble/smarty3/photo_top.tpl
 delete mode 100644 view/theme/testbubble/smarty3/photo_view.tpl
 delete mode 100644 view/theme/testbubble/smarty3/profile_entry.tpl
 delete mode 100644 view/theme/testbubble/smarty3/profile_vcard.tpl
 delete mode 100644 view/theme/testbubble/smarty3/saved_searches_aside.tpl
 delete mode 100644 view/theme/testbubble/smarty3/search_item.tpl
 delete mode 100644 view/theme/testbubble/smarty3/wall_thread.tpl
 delete mode 100644 view/theme/testbubble/wall_thread.tpl
 delete mode 100644 view/theme/vier/comment_item.tpl
 delete mode 100644 view/theme/vier/mail_list.tpl
 delete mode 100644 view/theme/vier/nav.tpl
 delete mode 100644 view/theme/vier/profile_edlink.tpl
 delete mode 100644 view/theme/vier/profile_vcard.tpl
 delete mode 100644 view/theme/vier/search_item.tpl
 delete mode 100644 view/theme/vier/smarty3/comment_item.tpl
 delete mode 100644 view/theme/vier/smarty3/mail_list.tpl
 delete mode 100644 view/theme/vier/smarty3/nav.tpl
 delete mode 100644 view/theme/vier/smarty3/profile_edlink.tpl
 delete mode 100644 view/theme/vier/smarty3/profile_vcard.tpl
 delete mode 100644 view/theme/vier/smarty3/search_item.tpl
 delete mode 100644 view/theme/vier/smarty3/threaded_conversation.tpl
 delete mode 100644 view/theme/vier/smarty3/wall_thread.tpl
 delete mode 100644 view/theme/vier/threaded_conversation.tpl
 delete mode 100644 view/theme/vier/wall_thread.tpl
 delete mode 100644 view/threaded_conversation.tpl
 delete mode 100644 view/toggle_mobile_footer.tpl
 delete mode 100644 view/uexport.tpl
 delete mode 100644 view/uimport.tpl
 delete mode 100644 view/vcard-widget.tpl
 delete mode 100644 view/viewcontact_template.tpl
 delete mode 100644 view/voting_fakelink.tpl
 delete mode 100644 view/wall_thread.tpl
 delete mode 100644 view/wallmessage.tpl
 delete mode 100644 view/wallmsg-end.tpl
 delete mode 100644 view/wallmsg-header.tpl
 delete mode 100644 view/xrd_diaspora.tpl
 delete mode 100644 view/xrd_host.tpl
 delete mode 100644 view/xrd_person.tpl

diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php
index f9d91a827d..1326b0aca6 100644
--- a/include/friendica_smarty.php
+++ b/include/friendica_smarty.php
@@ -3,6 +3,8 @@
 require_once "object/TemplateEngine.php";
 require_once("library/Smarty/libs/Smarty.class.php");
 
+define('SMARTY3_TEMPLATE_FOLDER','templates');
+
 class FriendicaSmarty extends Smarty {
 	public $filename;
 
@@ -14,10 +16,10 @@ class FriendicaSmarty extends Smarty {
 
 		// setTemplateDir can be set to an array, which Smarty will parse in order.
 		// The order is thus very important here
-		$template_dirs = array('theme' => "view/theme/$theme/smarty3/");
+		$template_dirs = array('theme' => "view/theme/$theme/".SMARTY3_TEMPLATE_FOLDER."/");
 		if( x($a->theme_info,"extends") )
-			$template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/smarty3/");
-		$template_dirs = $template_dirs + array('base' => 'view/smarty3/');
+			$template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/".SMARTY3_TEMPLATE_FOLDER."/");
+		$template_dirs = $template_dirs + array('base' => "view/".SMARTY3_TEMPLATE_FOLDER."/");
 		$this->setTemplateDir($template_dirs);
 
 		$this->setCompileDir('view/smarty3/compiled/');
@@ -61,7 +63,7 @@ class FriendicaSmartyEngine implements ITemplateEngine {
 	
 	public function get_template_file($file, $root=''){
 		$a = get_app();
-		$template_file = get_template_file($a, 'smarty3/' . $file, $root);
+		$template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER.'/'.$file, $root);
 		$template = new FriendicaSmarty();
 		$template->filename = $template_file;
 		return $template;
diff --git a/view/404.tpl b/view/404.tpl
deleted file mode 100644
index bf4d4e949c..0000000000
--- a/view/404.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<h1>$message</h1>
diff --git a/view/acl_selector.tpl b/view/acl_selector.tpl
deleted file mode 100644
index 837225a5b1..0000000000
--- a/view/acl_selector.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<div id="acl-wrapper">
-	<input id="acl-search">
-	<a href="#" id="acl-showall">$showall</a>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</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>
-
-<script>
-$(document).ready(function() {
-	if(typeof acl=="undefined"){
-		acl = new ACL(
-			baseurl+"/acl",
-			[ $allowcid,$allowgid,$denycid,$denygid ]
-		);
-	}
-});
-</script>
diff --git a/view/admin_aside.tpl b/view/admin_aside.tpl
deleted file mode 100644
index 2f43562bd1..0000000000
--- a/view/admin_aside.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<script>
-	// update pending count //
-	$(function(){
-
-		$("nav").bind('nav-update',  function(e,data){
-			var elm = $('#pending-update');
-			var register = $(data).find('register').text();
-			if (register=="0") { register=""; elm.hide();} else { elm.show(); }
-			elm.html(register);
-		});
-	});
-</script>
-<h4><a href="$admurl">$admtxt</a></h4>
-<ul class='admin linklist'>
-	<li class='admin link button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
-	<li class='admin link button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
-	<li class='admin link button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
-	<li class='admin link button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
-	<li class='admin link button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
-</ul>
-
-{{ if $admin.update }}
-<ul class='admin linklist'>
-	<li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
-	<li class='admin link button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
-</ul>
-{{ endif }}
-
-
-{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
-<ul class='admin linklist'>
-	{{ for $admin.plugins_admin as $l }}
-	<li class='admin link button $l.2'><a href='$l.0'>$l.1</a></li>
-	{{ endfor }}
-</ul>
-	
-	
-<h4>$logtxt</h4>
-<ul class='admin linklist'>
-	<li class='admin link button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
-</ul>
-
diff --git a/view/admin_logs.tpl b/view/admin_logs.tpl
deleted file mode 100644
index b777cf4201..0000000000
--- a/view/admin_logs.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/logs" method="post">
-    <input type='hidden' name='form_security_token' value='$form_security_token'>
-
-	{{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$logfile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$loglevel }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_logs" value="$submit" /></div>
-	
-	</form>
-	
-	<h3>$logname</h3>
-	<div style="width:100%; height:400px; overflow: auto; "><pre>$data</pre></div>
-<!--	<iframe src='$baseurl/$logname' style="width:100%; height:400px"></iframe> -->
-	<!-- <div class="submit"><input type="submit" name="page_logs_clear_log" value="$clear" /></div> -->
-</div>
diff --git a/view/admin_plugins.tpl b/view/admin_plugins.tpl
deleted file mode 100644
index 74b56bb4e9..0000000000
--- a/view/admin_plugins.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-		<ul id='pluginslist'>
-		{{ for $plugins as $p }}
-			<li class='plugin $p.1'>
-				<a class='toggleplugin' href='$baseurl/admin/$function/$p.0?a=t&amp;t=$form_security_token' title="{{if $p.1==on }}Disable{{ else }}Enable{{ endif }}" ><span class='icon $p.1'></span></a>
-				<a href='$baseurl/admin/$function/$p.0'><span class='name'>$p.2.name</span></a> - <span class="version">$p.2.version</span>
-				{{ if $p.2.experimental }} $experimental {{ endif }}{{ if $p.2.unsupported }} $unsupported {{ endif }}
-
-					<div class='desc'>$p.2.description</div>
-			</li>
-		{{ endfor }}
-		</ul>
-</div>
diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl
deleted file mode 100644
index 931c7b83cf..0000000000
--- a/view/admin_plugins_details.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/$function/$plugin/?a=t&amp;t=$form_security_token">$action</a></p>
-	<p>$info.description</p>
-	
-	<p class="author">$str_author
-	{{ for $info.author as $a }}
-		{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
-	{{ endfor }}
-	</p>
-
-	<p class="maintainer">$str_maintainer
-	{{ for $info.maintainer as $a }}
-		{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
-	{{ endfor }}
-	</p>
-	
-	{{ if $screenshot }}
-	<a href="$screenshot.0" class='screenshot'><img src="$screenshot.0" alt="$screenshot.1" /></a>
-	{{ endif }}
-
-	{{ if $admin_form }}
-	<h3>$settings</h3>
-	<form method="post" action="$baseurl/admin/$function/$plugin/">
-		$admin_form
-	</form>
-	{{ endif }}
-
-	{{ if $readme }}
-	<h3>Readme</h3>
-	<div id="plugin_readme">
-		$readme
-	</div>
-	{{ endif }}
-</div>
diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl
deleted file mode 100644
index 874c6e6267..0000000000
--- a/view/admin_remoteupdate.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-<script src="js/jquery.htmlstream.js"></script>
-<script>
-	/* ajax updater */
-	function updateEnd(data){
-		//$("#updatepopup .panel_text").html(data);
-		$("#remoteupdate_form").find("input").removeAttr('disabled');
-		$(".panel_action_close").fadeIn()	
-	}
-	function updateOn(data){
-		
-		var patt=/§([^§]*)§/g; 
-		var matches = data.match(patt);
-		$(matches).each(function(id,data){
-			data = data.replace(/§/g,"");
-			d = data.split("@");
-			console.log(d);
-			elm = $("#updatepopup .panel_text #"+d[0]);
-			html = "<div id='"+d[0]+"' class='progress'>"+d[1]+"<span>"+d[2]+"</span></div>";
-			if (elm.length==0){
-				$("#updatepopup .panel_text").append(html);
-			} else {
-				$(elm).replaceWith(html);
-			}
-		});
-		
-		
-	}
-	
-	$(function(){
-		$("#remoteupdate_form").submit(function(){
-			var data={};
-			$(this).find("input").each(function(i, e){
-				name = $(e).attr('name');
-				value = $(e).val();
-				e.disabled = true;
-				data[name]=value;
-			});
-
-			$("#updatepopup .panel_text").html("");
-			$("#updatepopup").show();
-			$("#updatepopup .panel").hide().slideDown(500);
-			$(".panel_action_close").hide().click(function(){
-				$("#updatepopup .panel").slideUp(500, function(){
-					$("#updatepopup").hide();
-				});				
-			});
-
-			$.post(
-				$(this).attr('action'), 
-				data, 
-				updateEnd,
-				'text',
-				updateOn
-			);
-
-			
-			return false;
-		})
-	});
-</script>
-<div id="updatepopup" class="popup">
-	<div class="background"></div>
-	<div class="panel">
-		<div class="panel_in">
-			<h1>Friendica Update</h1>
-			<div class="panel_text"></div>
-			<div class="panel_actions">
-				<input type="button" value="$close" class="panel_action_close">
-			</div>
-		</div>
-	</div>
-</div>
-<div id="adminpage">
-	<dl> <dt>Your version:</dt><dd>$localversion</dd> </dl>
-{{ if $needupdate }}
-	<dl> <dt>New version:</dt><dd>$remoteversion</dd> </dl>
-
-	<form id="remoteupdate_form" method="POST" action="$baseurl/admin/update">
-	<input type="hidden" name="$remotefile.0" value="$remotefile.2">
-
-	{{ if $canwrite }}
-		<div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div>
-	{{ else }}
-		<h3>Your friendica installation is not writable by web server.</h3>
-		{{ if $canftp }}
-			<p>You can try to update via FTP</p>
-			{{ inc field_input.tpl with $field=$ftphost }}{{ endinc }}
-			{{ inc field_input.tpl with $field=$ftppath }}{{ endinc }}
-			{{ inc field_input.tpl with $field=$ftpuser }}{{ endinc }}
-			{{ inc field_password.tpl with $field=$ftppwd }}{{ endinc }}
-			<div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div>
-		{{ endif }}
-	{{ endif }}
-	</form>
-{{ else }}
-<h4>No updates</h4>
-{{ endif }}
-</div>
diff --git a/view/admin_site.tpl b/view/admin_site.tpl
deleted file mode 100644
index 0f0fdd4268..0000000000
--- a/view/admin_site.tpl
+++ /dev/null
@@ -1,116 +0,0 @@
-<script>
-	$(function(){
-		
-		$("#cnftheme").click(function(){
-			$.colorbox({
-				width: 800,
-				height: '90%',
-				/*onOpen: function(){
-					var theme = $("#id_theme :selected").val();
-					$("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme);
-				},*/
-				href: "$baseurl/admin/themes/" + $("#id_theme :selected").val(),
-				onComplete: function(){
-					$("div#fancybox-content form").submit(function(e){
-						var url = $(this).attr('action');
-						// can't get .serialize() to work...
-						var data={};
-						$(this).find("input").each(function(){
-							data[$(this).attr('name')] = $(this).val();
-						});
-						$(this).find("select").each(function(){
-							data[$(this).attr('name')] = $(this).children(":selected").val();
-						});
-						console.log(":)", url, data);
-					
-						$.post(url, data, function(data) {
-							if(timer) clearTimeout(timer);
-							NavUpdate();
-							$.colorbox.close();
-						})
-					
-						return false;
-					});
-				
-				}
-			});
-			return false;
-		});
-	});
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='$form_security_token'>
-
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$singleuser }}{{ endinc }}
-
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$registration</h3>
-	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-
-	<h3>$upload</h3>
-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
-	
-	<h3>$corporate</h3>
-	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ostatus_poll_interval }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }}	
-	{{ inc field_checkbox.tpl with $field=$disable_embedded }}{{ endinc }}
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$advanced</h3>
-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$lockpath }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$temppath }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$basepath }}{{ endinc }}
-
-	<h3>$performance</h3>
-	{{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
-
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	</form>
-</div>
diff --git a/view/admin_summary.tpl b/view/admin_summary.tpl
deleted file mode 100644
index 4efe1960c5..0000000000
--- a/view/admin_summary.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-
-	<dl>
-		<dt>$queues.label</dt>
-		<dd>$queues.deliverq - $queues.queue</dd>
-	</dl>
-	<dl>
-		<dt>$pending.0</dt>
-		<dd>$pending.1</dt>
-	</dl>
-
-	<dl>
-		<dt>$users.0</dt>
-		<dd>$users.1</dd>
-	</dl>
-	{{ for $accounts as $p }}
-		<dl>
-			<dt>$p.0</dt>
-			<dd>{{ if $p.1 }}$p.1{{ else }}0{{ endif }}</dd>
-		</dl>
-	{{ endfor }}
-
-
-	<dl>
-		<dt>$plugins.0</dt>
-		
-		{{ for $plugins.1 as $p }}
-			<dd>$p</dd>
-		{{ endfor }}
-		
-	</dl>
-
-	<dl>
-		<dt>$version.0</dt>
-		<dd>$version.1 - $build</dt>
-	</dl>
-
-
-</div>
diff --git a/view/admin_users.tpl b/view/admin_users.tpl
deleted file mode 100644
index d9a96d7df7..0000000000
--- a/view/admin_users.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
-						<td class="checkbox"> 
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-                                    {{ endif }}
-						<td class="tools">
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                        <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
-                                    {{ endif }}
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/album_edit.tpl b/view/album_edit.tpl
deleted file mode 100644
index 56a7b73fcd..0000000000
--- a/view/album_edit.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="photo-album-edit-wrapper">
-<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/$nickname/album/$hexalbum" method="post" >
-
-
-<label id="photo-album-edit-name-label" for="photo-album-edit-name" >$nametext</label>
-<input type="text" size="64" name="albumname" value="$album" >
-
-<div id="photo-album-edit-name-end"></div>
-
-<input id="photo-album-edit-submit" type="submit" name="submit" value="$submit" />
-<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="$dropsubmit" onclick="return confirmDelete();" />
-
-</form>
-</div>
-<div id="photo-album-edit-end" ></div>
diff --git a/view/api_config_xml.tpl b/view/api_config_xml.tpl
deleted file mode 100644
index 3281e59dd3..0000000000
--- a/view/api_config_xml.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<config>
- <site>
-  <name>$config.site.name</name>
-  <server>$config.site.server</server>
-  <theme>default</theme>
-  <path></path>
-  <logo>$config.site.logo</logo>
-
-  <fancy>true</fancy>
-  <language>en</language>
-  <email>$config.site.email</email>
-  <broughtby></broughtby>
-  <broughtbyurl></broughtbyurl>
-  <timezone>UTC</timezone>
-  <closed>$config.site.closed</closed>
-
-  <inviteonly>false</inviteonly>
-  <private>$config.site.private</private>
-  <textlimit>$config.site.textlimit</textlimit>
-  <ssl>$config.site.ssl</ssl>
-  <sslserver>$config.site.sslserver</sslserver>
-  <shorturllength>30</shorturllength>
-
-</site>
- <license>
-  <type>cc</type>
-  <owner></owner>
-  <url>http://creativecommons.org/licenses/by/3.0/</url>
-  <title>Creative Commons Attribution 3.0</title>
-  <image>http://i.creativecommons.org/l/by/3.0/80x15.png</image>
-
-</license>
- <nickname>
-  <featured></featured>
-</nickname>
- <profile>
-  <biolimit></biolimit>
-</profile>
- <group>
-  <desclimit></desclimit>
-</group>
- <notice>
-
-  <contentlimit></contentlimit>
-</notice>
- <throttle>
-  <enabled>false</enabled>
-  <count>20</count>
-  <timespan>600</timespan>
-</throttle>
- <xmpp>
-
-  <enabled>false</enabled>
-  <server>INVALID SERVER</server>
-  <port>5222</port>
-  <user>update</user>
-</xmpp>
- <integration>
-  <source>StatusNet</source>
-
-</integration>
- <attachments>
-  <uploads>false</uploads>
-  <file_quota>0</file_quota>
-</attachments>
-</config>
diff --git a/view/api_friends_xml.tpl b/view/api_friends_xml.tpl
deleted file mode 100644
index 9bdf53222d..0000000000
--- a/view/api_friends_xml.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- TEMPLATE APPEARS UNUSED -->
-
-<users type="array">
-	{{for $users as $u }}
-	{{inc api_user_xml.tpl with $user=$u }}{{endinc}}
-	{{endfor}}
-</users>
diff --git a/view/api_ratelimit_xml.tpl b/view/api_ratelimit_xml.tpl
deleted file mode 100644
index 36ec1993df..0000000000
--- a/view/api_ratelimit_xml.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<hash>
- <remaining-hits type="integer">$hash.remaining_hits</remaining-hits>
- <hourly-limit type="integer">$hash.hourly_limit</hourly-limit>
- <reset-time type="datetime">$hash.reset_time</reset-time>
- <reset_time_in_seconds type="integer">$hash.resettime_in_seconds</reset_time_in_seconds>
-</hash>
diff --git a/view/api_status_xml.tpl b/view/api_status_xml.tpl
deleted file mode 100644
index f6cd9c2c02..0000000000
--- a/view/api_status_xml.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<status>{{ if $status }}
-    <created_at>$status.created_at</created_at>
-    <id>$status.id</id>
-    <text>$status.text</text>
-    <source>$status.source</source>
-    <truncated>$status.truncated</truncated>
-    <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
-    <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
-    <favorited>$status.favorited</favorited>
-    <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
-    <geo>$status.geo</geo>
-    <coordinates>$status.coordinates</coordinates>
-    <place>$status.place</place>
-    <contributors>$status.contributors</contributors>
-	<user>
-	  <id>$status.user.id</id>
-	  <name>$status.user.name</name>
-	  <screen_name>$status.user.screen_name</screen_name>
-	  <location>$status.user.location</location>
-	  <description>$status.user.description</description>
-	  <profile_image_url>$status.user.profile_image_url</profile_image_url>
-	  <url>$status.user.url</url>
-	  <protected>$status.user.protected</protected>
-	  <followers_count>$status.user.followers</followers_count>
-	  <profile_background_color>$status.user.profile_background_color</profile_background_color>
-  	  <profile_text_color>$status.user.profile_text_color</profile_text_color>
-  	  <profile_link_color>$status.user.profile_link_color</profile_link_color>
-  	  <profile_sidebar_fill_color>$status.user.profile_sidebar_fill_color</profile_sidebar_fill_color>
-  	  <profile_sidebar_border_color>$status.user.profile_sidebar_border_color</profile_sidebar_border_color>
-  	  <friends_count>$status.user.friends_count</friends_count>
-  	  <created_at>$status.user.created_at</created_at>
-  	  <favourites_count>$status.user.favourites_count</favourites_count>
-  	  <utc_offset>$status.user.utc_offset</utc_offset>
-  	  <time_zone>$status.user.time_zone</time_zone>
-  	  <profile_background_image_url>$status.user.profile_background_image_url</profile_background_image_url>
-  	  <profile_background_tile>$status.user.profile_background_tile</profile_background_tile>
-  	  <profile_use_background_image>$status.user.profile_use_background_image</profile_use_background_image>
-  	  <notifications></notifications>
-  	  <geo_enabled>$status.user.geo_enabled</geo_enabled>
-  	  <verified>$status.user.verified</verified>
-  	  <following></following>
-  	  <statuses_count>$status.user.statuses_count</statuses_count>
-  	  <lang>$status.user.lang</lang>
-  	  <contributors_enabled>$status.user.contributors_enabled</contributors_enabled>
-	  </user>
-{{ endif }}</status>
diff --git a/view/api_test_xml.tpl b/view/api_test_xml.tpl
deleted file mode 100644
index 7509a2dc1b..0000000000
--- a/view/api_test_xml.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<ok>$ok</ok>
diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
deleted file mode 100644
index 3db91573ef..0000000000
--- a/view/api_timeline_atom.tpl
+++ /dev/null
@@ -1,90 +0,0 @@
-<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>
- <title>Friendica</title>
- <subtitle>Friendica API feed</subtitle>
- <logo>$rss.logo</logo>
- <updated>$rss.atom_updated</updated>
- <link type="text/html" rel="alternate" href="$rss.alternate"/>
- <link type="application/atom+xml" rel="self" href="$rss.self"/>
- 
- 
- <author>
-	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-	<uri>$user.url</uri>
-	<name>$user.name</name>
-	<link rel="alternate" type="text/html" href="$user.url"/>
-	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="$user.profile_image_url"/>
-	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="$user.profile_image_url"/>
-	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$user.profile_image_url"/>
-	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="$user.profile_image_url"/>
-	<georss:point></georss:point>
-	<poco:preferredUsername>$user.screen_name</poco:preferredUsername>
-	<poco:displayName>$user.name</poco:displayName>
-	<poco:urls>
-		<poco:type>homepage</poco:type>
-		<poco:value>$user.url</poco:value>
-		<poco:primary>true</poco:primary>
-	</poco:urls>
-	<statusnet:profile_info local_id="$user.id"></statusnet:profile_info>
- </author>
-
- <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
- <activity:subject>
-	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-	<id>$user.contact_url</id>
-	<title>$user.name</title>
-	<link rel="alternate" type="text/html" href="$user.url"/>
-	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="$user.profile_image_url"/>
-	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="$user.profile_image_url"/>
-	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$user.profile_image_url"/>
-	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="$user.profile_image_url"/>
-	<poco:preferredUsername>$user.screen_name</poco:preferredUsername>
-	<poco:displayName>$user.name</poco:displayName>
-	<poco:urls>
-		<poco:type>homepage</poco:type>
-		<poco:value>$user.url</poco:value>
-		<poco:primary>true</poco:primary>
-	</poco:urls>
-	<statusnet:profile_info local_id="$user.id"></statusnet:profile_info>
- </activity:subject>
- 
- 
-  	{{ for $statuses as $status }}
-	<entry>
-		<activity:object-type>$status.objecttype</activity:object-type>
-		<id>$status.message_id</id>
-		<title>$status.text</title>
-		<content type="html">$status.statusnet_html</content>
-		<link rel="alternate" type="text/html" href="$status.url"/>
-		<activity:verb>$status.verb</activity:verb>
-		<published>$status.published</published>
-		<updated>$status.updated</updated>
-
-		<link rel="self" type="application/atom+xml" href="$status.self"/>
-		<link rel="edit" type="application/atom+xml" href="$status.edit"/>
-		<statusnet:notice_info local_id="$status.id" source="$status.source" >
-		</statusnet:notice_info>
-
-		<author>
-			<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-			<uri>$status.user.url</uri>
-			<name>$status.user.name</name>
-			<link rel="alternate" type="text/html" href="$status.user.url"/>
-			<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$status.user.profile_image_url"/>
-
-			<georss:point/>
-			<poco:preferredUsername>$status.user.screen_name</poco:preferredUsername>
-			<poco:displayName>$status.user.name</poco:displayName>
-			<poco:address/>
-			<poco:urls>
-				<poco:type>homepage</poco:type>
-				<poco:value>$status.user.url</poco:value>
-				<poco:primary>true</poco:primary>
-			</poco:urls>
-		</author>
-		<link rel="ostatus:conversation" type="text/html" href="$status.url"/> 
-
-	</entry>    
-    {{ endfor }}
-</feed>
diff --git a/view/api_timeline_rss.tpl b/view/api_timeline_rss.tpl
deleted file mode 100644
index 99279ec372..0000000000
--- a/view/api_timeline_rss.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<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>
-    <link>$rss.alternate</link>
-    <atom:link type="application/rss+xml" rel="self" href="$rss.self"/>
-    <description>Friendica timeline</description>
-    <language>$rss.language</language>
-    <ttl>40</ttl>
-	<image>
-		<link>$user.link</link>
-		<title>$user.name's items</title>
-		<url>$user.profile_image_url</url>
-	</image>
-	
-{{ for $statuses as $status }}
-  <item>
-    <title>$status.user.name: $status.text</title>
-    <description>$status.text</description>
-    <pubDate>$status.created_at</pubDate>
-    <guid>$status.url</guid>
-    <link>$status.url</link>
-    <twitter:source>$status.source</twitter:source>
-  </item>
-{{ endfor }}
-  </channel>
-</rss>
diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl
deleted file mode 100644
index 4a32b411b5..0000000000
--- a/view/api_timeline_xml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
-{{ for $statuses as $status }} <status>
-  <text>$status.text</text>
-  <truncated>$status.truncated</truncated>
-  <created_at>$status.created_at</created_at>
-  <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
-  <source>$status.source</source>
-  <id>$status.id</id>
-  <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
-  <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
-  <geo>$status.geo</geo>
-  <favorited>$status.favorited</favorited>
-{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}  <statusnet:html>$status.statusnet_html</statusnet:html>
-  <statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id>
-  <url>$status.url</url>
-  <coordinates>$status.coordinates</coordinates>
-  <place>$status.place</place>
-  <contributors>$status.contributors</contributors>
- </status>
-{{ endfor }}</statuses>
diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl
deleted file mode 100644
index d286652c03..0000000000
--- a/view/api_user_xml.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-  <user>
-   <id>$user.id</id>
-   <name>$user.name</name>
-   <screen_name>$user.screen_name</screen_name>
-   <location>$user.location</location>
-   <description>$user.description</description>
-   <profile_image_url>$user.profile_image_url</profile_image_url>
-   <url>$user.url</url>
-   <protected>$user.protected</protected>
-   <followers_count>$user.followers_count</followers_count>
-   <friends_count>$user.friends_count</friends_count>
-   <created_at>$user.created_at</created_at>
-   <favourites_count>$user.favourites_count</favourites_count>
-   <utc_offset>$user.utc_offset</utc_offset>
-   <time_zone>$user.time_zone</time_zone>
-   <statuses_count>$user.statuses_count</statuses_count>
-   <following>$user.following</following>
-   <profile_background_color>$user.profile_background_color</profile_background_color>
-   <profile_text_color>$user.profile_text_color</profile_text_color>
-   <profile_link_color>$user.profile_link_color</profile_link_color>
-   <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
-   <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
-   <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
-   <profile_background_tile>$user.profile_background_tile</profile_background_tile>
-   <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
-   <notifications>$user.notifications</notifications>
-   <geo_enabled>$user.geo_enabled</geo_enabled>
-   <verified>$user.verified</verified>
-   <lang>$user.lang</lang>
-   <contributors_enabled>$user.contributors_enabled</contributors_enabled>
-   <status>{{ if $user.status }}
-    <created_at>$user.status.created_at</created_at>
-    <id>$user.status.id</id>
-    <text>$user.status.text</text>
-    <source>$user.status.source</source>
-    <truncated>$user.status.truncated</truncated>
-    <in_reply_to_status_id>$user.status.in_reply_to_status_id</in_reply_to_status_id>
-    <in_reply_to_user_id>$user.status.in_reply_to_user_id</in_reply_to_user_id>
-    <favorited>$user.status.favorited</favorited>
-    <in_reply_to_screen_name>$user.status.in_reply_to_screen_name</in_reply_to_screen_name>
-    <geo>$user.status.geo</geo>
-    <coordinates>$user.status.coordinates</coordinates>
-    <place>$user.status.place</place>
-    <contributors>$user.status.contributors</contributors>
-  {{ endif }}</status>
-  </user>
diff --git a/view/apps.tpl b/view/apps.tpl
deleted file mode 100644
index 4c7f8c94cc..0000000000
--- a/view/apps.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h3>$title</h3>
-
-<ul>
-	{{ for $apps as $ap }}
-	<li>$ap</li>
-	{{ endfor }}
-</ul>
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
deleted file mode 100644
index 2feb547ee2..0000000000
--- a/view/atom_feed.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<feed xmlns="http://www.w3.org/2005/Atom"
-      xmlns:thr="http://purl.org/syndication/thread/1.0"
-      xmlns:at="http://purl.org/atompub/tombstones/1.0"
-      xmlns:media="http://purl.org/syndication/atommedia"
-      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
-      xmlns:as="http://activitystrea.ms/spec/1.0/"
-      xmlns:georss="http://www.georss.org/georss" 
-      xmlns:poco="http://portablecontacts.net/spec/1.0" 
-      xmlns:ostatus="http://ostatus.org/schema/1.0" 
-	  xmlns:statusnet="http://status.net/schema/api/1/" > 
-
-  <id>$feed_id</id>
-  <title>$feed_title</title>
-  <generator uri="http://friendica.com" version="$version">Friendica</generator>
-  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
-  $hub
-  $salmon
-  $community
-
-  <updated>$feed_updated</updated>
-
-  <dfrn:owner>
-    <name dfrn:updated="$namdate" >$name</name>
-    <uri dfrn:updated="$uridate" >$profile_page</uri>
-    <link rel="photo"  type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
-    <link rel="avatar" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
-    $birthday
-  </dfrn:owner>
diff --git a/view/atom_feed_dfrn.tpl b/view/atom_feed_dfrn.tpl
deleted file mode 100644
index 0bae62b526..0000000000
--- a/view/atom_feed_dfrn.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<feed xmlns="http://www.w3.org/2005/Atom"
-      xmlns:thr="http://purl.org/syndication/thread/1.0"
-      xmlns:at="http://purl.org/atompub/tombstones/1.0"
-      xmlns:media="http://purl.org/syndication/atommedia"
-      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
-      xmlns:as="http://activitystrea.ms/spec/1.0/"
-      xmlns:georss="http://www.georss.org/georss" 
-      xmlns:poco="http://portablecontacts.net/spec/1.0" 
-      xmlns:ostatus="http://ostatus.org/schema/1.0" 
-	  xmlns:statusnet="http://status.net/schema/api/1/" > 
-
-  <id>$feed_id</id>
-  <title>$feed_title</title>
-  <generator uri="http://friendica.com" version="$version">Friendica</generator>
-  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
-  $hub
-  $salmon
-  $community
-
-  <updated>$feed_updated</updated>
-
-  <author>
-    <name dfrn:updated="$namdate" >$name</name>
-    <uri dfrn:updated="$uridate" >$profile_page</uri>
-    <link rel="photo"  type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
-    <link rel="avatar" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
-    $birthday
-  </author>
diff --git a/view/atom_mail.tpl b/view/atom_mail.tpl
deleted file mode 100644
index bf7c3efc86..0000000000
--- a/view/atom_mail.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<dfrn:mail>
-
-	<dfrn:sender>
-		<dfrn:name>$name</dfrn:name>
-		<dfrn:uri>$profile_page</dfrn:uri>
-		<dfrn:avatar>$thumb</dfrn:avatar>
-	</dfrn:sender>
-
-	<dfrn:id>$item_id</dfrn:id>
-	<dfrn:in-reply-to>$parent_id</dfrn:in-reply-to>
-	<dfrn:sentdate>$created</dfrn:sentdate>
-	<dfrn:subject>$subject</dfrn:subject>
-	<dfrn:content>$content</dfrn:content>
-
-</dfrn:mail>
-
diff --git a/view/atom_relocate.tpl b/view/atom_relocate.tpl
deleted file mode 100644
index f7db934d7a..0000000000
--- a/view/atom_relocate.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<dfrn:relocate>
-
-	<dfrn:url>$url</dfrn:url>
-	<dfrn:name>$name</dfrn:name>
-	<dfrn:photo>$photo</dfrn:photo>
-	<dfrn:thumb>$thumb</dfrn:thumb>
-	<dfrn:micro>$micro</dfrn:micro>
-	<dfrn:request>$request</dfrn:request>
-	<dfrn:confirm>$confirm</dfrn:confirm>
-	<dfrn:notify>$notify</dfrn:notify>
-	<dfrn:poll>$poll</dfrn:poll>
-	<dfrn:sitepubkey>$sitepubkey</dfrn:sitepubkey>
-
-
-</dfrn:relocate>
-
diff --git a/view/atom_suggest.tpl b/view/atom_suggest.tpl
deleted file mode 100644
index 66c61f9b6e..0000000000
--- a/view/atom_suggest.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<dfrn:suggest>
-
-	<dfrn:url>$url</dfrn:url>
-	<dfrn:name>$name</dfrn:name>
-	<dfrn:photo>$photo</dfrn:photo>
-	<dfrn:request>$request</dfrn:request>
-	<dfrn:note>$note</dfrn:note>
-
-</dfrn:suggest>
-
diff --git a/view/auto_request.tpl b/view/auto_request.tpl
deleted file mode 100644
index 961de9bb39..0000000000
--- a/view/auto_request.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-
-<h1>$header</h1>
-
-<p id="dfrn-request-intro">
-$page_desc<br />
-<ul id="dfrn-request-networks">
-<li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
-<li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
-<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
-{{ if $emailnet }}<li>$emailnet</li>{{ endif }}
-</ul>
-</p>
-<p>
-$invite_desc
-</p>
-<p>
-$desc
-</p>
-
-<form action="dfrn_request/$nickname" method="post" />
-
-<div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >$your_address</label>
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" />
-	<div id="dfrn-request-url-end"></div>
-</div>
-
-
-<div id="dfrn-request-info-wrapper" >
-
-</div>
-
-	<div id="dfrn-request-submit-wrapper">
-		<input type="submit" name="submit" id="dfrn-request-submit-button" value="$submit" />
-		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="$cancel" />
-	</div>
-</form>
diff --git a/view/birthdays_reminder.tpl b/view/birthdays_reminder.tpl
deleted file mode 100644
index 971680a8cc..0000000000
--- a/view/birthdays_reminder.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ 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>
-<div id="birthday-title-end"></div>
-{{ for $events as $event }}
-<div class="birthday-list" id="birthday-$event.id"> <a href="$event.link">$event.title</a> $event.date </div>
-{{ endfor }}
-</div>
-{{ endif }}
-
diff --git a/view/categories_widget.tpl b/view/categories_widget.tpl
deleted file mode 100644
index 5dbd871a89..0000000000
--- a/view/categories_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="categories-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="categories-ul">
-		<li class="tool"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
-		{{ for $terms as $term }}
-			<li class="tool"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
deleted file mode 100644
index 1764f99d89..0000000000
--- a/view/comment_item.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-		{{ if $threaded }}
-		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;">
-		{{ else }}
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-		{{ endif }}
-			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/common_friends.tpl b/view/common_friends.tpl
deleted file mode 100644
index 1f610d8c4f..0000000000
--- a/view/common_friends.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="$url" title="$name[$tags]">$name</a>
-	</div>
-	<div class="profile-match-end"></div>
-</div>
\ No newline at end of file
diff --git a/view/common_tabs.tpl b/view/common_tabs.tpl
deleted file mode 100644
index f8ceff46a3..0000000000
--- a/view/common_tabs.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<ul class="tabs">
-	{{ for $tabs as $tab }}
-		<li id="$tab.id"><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
-	{{ endfor }}
-</ul>
diff --git a/view/confirm.tpl b/view/confirm.tpl
deleted file mode 100644
index 5e7e641c45..0000000000
--- a/view/confirm.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<center>
-<form action="$confirm_url" id="confirm-form" method="$method">
-
-	<span id="confirm-message">$message</span>
-	{{ for $extra_inputs as $input }}
-	<input type="hidden" name="$input.name" value="$input.value" />
-	{{ endfor }}
-
-	<input class="confirm-button" id="confirm-submit-button" type="submit" name="$confirm_name" value="$confirm" />
-	<input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="$cancel" />
-
-</form>
-</center>
-
diff --git a/view/contact_block.tpl b/view/contact_block.tpl
deleted file mode 100644
index a796487122..0000000000
--- a/view/contact_block.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="contact-block">
-<h4 class="contact-block-h4">$contacts</h4>
-{{ if $micropro }}
-		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
-		<div class='contact-block-content'>
-		{{ for $micropro as $m }}
-			$m
-		{{ endfor }}
-		</div>
-{{ endif }}
-</div>
-<div class="clear"></div>
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
deleted file mode 100644
index bec78bd7d9..0000000000
--- a/view/contact_edit.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-wrapper" >
-
-	$tab_str
-
-	<div id="contact-edit-drop-link" >
-		<a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
-	</div>
-
-	<div id="contact-edit-drop-link-end"></div>
-
-
-	<div id="contact-edit-nav-wrapper" >
-		<div id="contact-edit-links">
-			<ul>
-				<li><div id="contact-edit-rel">$relation_text</div></li>
-				<li><div id="contact-edit-nettype">$nettype</div></li>
-				{{ if $lost_contact }}
-					<li><div id="lost-contact-message">$lost_contact</div></li>
-				{{ endif }}
-				{{ if $insecure }}
-					<li><div id="insecure-message">$insecure</div></li>
-				{{ endif }}
-				{{ if $blocked }}
-					<li><div id="block-message">$blocked</div></li>
-				{{ endif }}
-				{{ if $ignored }}
-					<li><div id="ignore-message">$ignored</div></li>
-				{{ endif }}
-				{{ if $archived }}
-					<li><div id="archive-message">$archived</div></li>
-				{{ endif }}
-
-				<li>&nbsp;</li>
-
-				{{ if $common_text }}
-					<li><div id="contact-edit-common"><a href="$common_link">$common_text</a></div></li>
-				{{ endif }}
-				{{ if $all_friends }}
-					<li><div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div></li>
-				{{ endif }}
-
-
-				<li><a href="network/0?nets=all&cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
-				{{ if $lblsuggest }}
-					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
-				{{ endif }}
-
-			</ul>
-		</div>
-	</div>
-	<div id="contact-edit-nav-end"></div>
-
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-	{{ if $poll_enabled }}
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></div>
-			<span id="contact-edit-poll-text">$updpub</span> $poll_interval <span id="contact-edit-update-now" class="button"><a href="contacts/$contact_id/update" >$udnow</a></span>
-		</div>
-	{{ endif }}
-	<div id="contact-edit-end" ></div>
-
-	{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-
-<div id="contact-edit-info-wrapper">
-<h4>$lbl_info1</h4>
-	<textarea id="contact-edit-info" rows="8" cols="60" name="info">$info</textarea>
-	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-</div>
-<div id="contact-edit-info-end"></div>
-
-
-<div id="contact-edit-profile-select-text">
-<h4>$lbl_vis1</h4>
-<p>$lbl_vis2</p> 
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-
-</form>
-</div>
diff --git a/view/contact_end.tpl b/view/contact_end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/contact_head.tpl b/view/contact_head.tpl
deleted file mode 100644
index 0a7f0ef0f9..0000000000
--- a/view/contact_head.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-          <script language="javascript" type="text/javascript">
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "$editselect",
-	elements: "contact-edit-info",
-	plugins : "bbcode",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_styles : "blockquote,code",
-	gecko_spellcheck : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	//force_p_newlines : false,
-	//force_br_newlines : true,
-	forced_root_block : 'div',
-	content_css: "$baseurl/view/custom_tinymce.css"
-
-
-});
-
-
-</script>
-
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
deleted file mode 100644
index f7ed107509..0000000000
--- a/view/contact_template.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-						{{ for $contact.photo_menu as $c }}
-						{{ if $c.2 }}
-						<li><a target="redir" href="$c.1">$c.0</a></li>
-						{{ else }}
-						<li><a href="$c.1">$c.0</a></li>
-						{{ endif }}
-						{{ endfor }}
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/contacts-end.tpl b/view/contacts-end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/contacts-head.tpl b/view/contacts-head.tpl
deleted file mode 100644
index 011f55b981..0000000000
--- a/view/contacts-head.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<script src="$baseurl/library/jquery_ac/friendica.complete.js" ></script>
-
-<script>
-$(document).ready(function() { 
-	var a; 
-	a = $("#contacts-search").autocomplete({ 
-		serviceUrl: '$base/acl',
-		minChars: 2,
-		width: 350,
-	});
-	a.setOptions({ params: { type: 'a' }});
-
-}); 
-
-</script>
-
diff --git a/view/contacts-template.tpl b/view/contacts-template.tpl
deleted file mode 100644
index ecb342bf44..0000000000
--- a/view/contacts-template.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<h1>$header{{ if $total }} ($total){{ endif }}</h1>
-
-{{ if $finding }}<h4>$finding</h4>{{ endif }}
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="$cmd" method="get" >
-<span class="contacts-search-desc">$desc</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-$tabs
-
-
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
-<div id="contact-edit-end"></div>
-
-$paginate
-
-
-
-
diff --git a/view/contacts-widget-sidebar.tpl b/view/contacts-widget-sidebar.tpl
deleted file mode 100644
index c9450ce648..0000000000
--- a/view/contacts-widget-sidebar.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-$vcard_widget
-$follow_widget
-$groups_widget
-$findpeople_widget
-$networks_widget
-
diff --git a/view/content.tpl b/view/content.tpl
deleted file mode 100644
index 466045d396..0000000000
--- a/view/content.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<div id="content-begin"></div>
-<div id="content-end"></div>
diff --git a/view/conversation.tpl b/view/conversation.tpl
deleted file mode 100644
index 0e14646219..0000000000
--- a/view/conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	{{ for $thread.items as $item }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-		
-		{{ inc $item.template }}{{ endinc }}
-		
-		
-	{{ endfor }}
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/crepair.tpl b/view/crepair.tpl
deleted file mode 100644
index a3e532b615..0000000000
--- a/view/crepair.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-
-<form id="crepair-form" action="crepair/$contact_id" method="post" >
-
-<h4>$contact_name</h4>
-
-<label id="crepair-name-label" class="crepair-label" for="crepair-name">$label_name</label>
-<input type="text" id="crepair-name" class="crepair-input" name="name" value="$contact_name" />
-<div class="clear"></div>
-
-<label id="crepair-nick-label" class="crepair-label" for="crepair-nick">$label_nick</label>
-<input type="text" id="crepair-nick" class="crepair-input" name="nick" value="$contact_nick" />
-<div class="clear"></div>
-
-<label id="crepair-attag-label" class="crepair-label" for="crepair-attag">$label_attag</label>
-<input type="text" id="crepair-attag" class="crepair-input" name="attag" value="$contact_attag" />
-<div class="clear"></div>
-
-<label id="crepair-url-label" class="crepair-label" for="crepair-url">$label_url</label>
-<input type="text" id="crepair-url" class="crepair-input" name="url" value="$contact_url" />
-<div class="clear"></div>
-
-<label id="crepair-request-label" class="crepair-label" for="crepair-request">$label_request</label>
-<input type="text" id="crepair-request" class="crepair-input" name="request" value="$request" />
-<div class="clear"></div>
- 
-<label id="crepair-confirm-label" class="crepair-label" for="crepair-confirm">$label_confirm</label>
-<input type="text" id="crepair-confirm" class="crepair-input" name="confirm" value="$confirm" />
-<div class="clear"></div>
-
-<label id="crepair-notify-label" class="crepair-label" for="crepair-notify">$label_notify</label>
-<input type="text" id="crepair-notify" class="crepair-input" name="notify" value="$notify" />
-<div class="clear"></div>
-
-<label id="crepair-poll-label" class="crepair-label" for="crepair-poll">$label_poll</label>
-<input type="text" id="crepair-poll" class="crepair-input" name="poll" value="$poll" />
-<div class="clear"></div>
-
-<label id="crepair-photo-label" class="crepair-label" for="crepair-photo">$label_photo</label>
-<input type="text" id="crepair-photo" class="crepair-input" name="photo" value="" />
-<div class="clear"></div>
-
-<input type="submit" name="submit" value="$lbl_submit" />
-
-</form>
-
-
diff --git a/view/cropbody.tpl b/view/cropbody.tpl
deleted file mode 100644
index 4c0ca3d634..0000000000
--- a/view/cropbody.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<h1>$title</h1>
-<p id="cropimage-desc">
-$desc
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<input type='hidden' name='profile' value='$profile'>
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="$done" />
-</div>
-
-</form>
diff --git a/view/cropend.tpl b/view/cropend.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/crophead.tpl b/view/crophead.tpl
deleted file mode 100644
index 48f3754265..0000000000
--- a/view/crophead.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-      <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>
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/delegate.tpl b/view/delegate.tpl
deleted file mode 100644
index 9a7d2e18d2..0000000000
--- a/view/delegate.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h3>$header</h3>
-
-<div id="delegate-desc" class="delegate-desc">$desc</div>
-
-{{ if $managers }}
-<h3>$head_managers</h3>
-
-{{ for $managers as $x }}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="#" >
-<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" />
-</a>
-</div>
-
-{{ endfor }}
-<div class="clear"></div>
-<hr />
-{{ endif }}
-
-
-<h3>$head_delegates</h3>
-
-{{ if $delegates }}
-{{ for $delegates as $x }}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="$base/delegate/remove/$x.uid" >
-<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" />
-</a>
-</div>
-
-{{ endfor }}
-<div class="clear"></div>
-{{ else }}
-$none
-{{ endif }}
-<hr />
-
-
-<h3>$head_potentials</h3>
-{{ if $potentials }}
-{{ for $potentials as $x }}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="$base/delegate/add/$x.uid" >
-<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" />
-</a>
-</div>
-
-{{ endfor }}
-<div class="clear"></div>
-{{ else }}
-$none
-{{ endif }}
-<hr />
-
diff --git a/view/dfrn_req_confirm.tpl b/view/dfrn_req_confirm.tpl
deleted file mode 100644
index 6c916323ce..0000000000
--- a/view/dfrn_req_confirm.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<p id="dfrn-request-homecoming" >
-$welcome
-<br />
-$please
-
-</p>
-<form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> 
-<input type="hidden" name="dfrn_url" value="$dfrn_url" />
-<input type="hidden" name="confirm_key" value="$confirm_key" />
-<input type="hidden" name="localconfirm" value="1" />
-$aes_allow
-
-<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">$hidethem</label>
-<input type="checkbox" name="hidden-contact" value="1" {{ if $hidechecked }}checked="checked" {{ endif }} />
-
-
-<div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="$submit" />
-</div>
-</form>
\ No newline at end of file
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
deleted file mode 100644
index bd3bcbc42b..0000000000
--- a/view/dfrn_request.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-
-<h1>$header</h1>
-
-<p id="dfrn-request-intro">
-$page_desc<br />
-<ul id="dfrn-request-networks">
-<li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
-<li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
-<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
-{{ if $emailnet }}<li>$emailnet</li>{{ endif }}
-</ul>
-$invite_desc
-</p>
-<p>
-$desc
-</p>
-
-<form action="dfrn_request/$nickname" method="post" />
-
-<div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >$your_address</label>
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" />
-	<div id="dfrn-request-url-end"></div>
-</div>
-
-<p id="dfrn-request-options">
-$pls_answer
-</p>
-
-<div id="dfrn-request-info-wrapper" >
-
-
-<p id="doiknowyou">
-$does_know
-</p>
-
-		<div id="dfrn-request-know-yes-wrapper">
-		<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">$yes</label>
-		<input type="radio" name="knowyou" id="knowyouyes" value="1" />
-
-		<div id="dfrn-request-knowyou-break" ></div>	
-		</div>
-		<div id="dfrn-request-know-no-wrapper">
-		<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">$no</label>
-		<input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
-
-		<div id="dfrn-request-knowyou-end"></div>
-		</div>
-
-
-<p id="dfrn-request-message-desc">
-$add_note
-</p>
-	<div id="dfrn-request-message-wrapper">
-	<textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
-	</div>
-
-
-</div>
-
-	<div id="dfrn-request-submit-wrapper">
-		<input type="submit" name="submit" id="dfrn-request-submit-button" value="$submit" />
-		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="$cancel" />
-	</div>
-</form>
diff --git a/view/diasp_dec_hdr.tpl b/view/diasp_dec_hdr.tpl
deleted file mode 100644
index e87c618888..0000000000
--- a/view/diasp_dec_hdr.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<decrypted_hdeader>
-  <iv>$inner_iv</iv>
-  <aes_key>$inner_key</aes_key>
-  <author>
-    <name>$author_name</name>
-    <uri>$author_uri</uri>
-  </author>
-</decrypted_header>
diff --git a/view/diaspora_comment.tpl b/view/diaspora_comment.tpl
deleted file mode 100644
index 6ef4ab664d..0000000000
--- a/view/diaspora_comment.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<XML>
-  <post>
-    <comment>
-      <guid>$guid</guid>
-      <parent_guid>$parent_guid</parent_guid>
-      <author_signature>$authorsig</author_signature>
-      <text>$body</text>
-      <diaspora_handle>$handle</diaspora_handle>
-    </comment>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/diaspora_comment_relay.tpl b/view/diaspora_comment_relay.tpl
deleted file mode 100644
index e82de1171e..0000000000
--- a/view/diaspora_comment_relay.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<XML>
-  <post>
-    <comment>
-      <guid>$guid</guid>
-      <parent_guid>$parent_guid</parent_guid>
-      <parent_author_signature>$parentsig</parent_author_signature>
-      <author_signature>$authorsig</author_signature>
-      <text>$body</text>
-      <diaspora_handle>$handle</diaspora_handle>
-    </comment>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/diaspora_conversation.tpl b/view/diaspora_conversation.tpl
deleted file mode 100644
index 12807ba599..0000000000
--- a/view/diaspora_conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<XML>
-  <post>
-    <conversation>
-      <guid>$conv.guid</guid>
-      <subject>$conv.subject</subject>
-      <created_at>$conv.created_at</created_at>
-
-      {{ for $conv.messages as $msg }}
-
-      <message>
-        <guid>$msg.guid</guid>
-        <parent_guid>$msg.parent_guid</parent_guid>
-        {{ if $msg.parent_author_signature }}
-        <parent_author_signature>$msg.parent_author_signature</parent_author_signature>
-        {{ endif }}
-        <author_signature>$msg.author_signature</author_signature>
-        <text>$msg.text</text>
-        <created_at>$msg.created_at</created_at>
-        <diaspora_handle>$msg.diaspora_handle</diaspora_handle>
-        <conversation_guid>$msg.conversation_guid</conversation_guid>
-      </message>
-
-      {{ endfor }}
-
-      <diaspora_handle>$conv.diaspora_handle</diaspora_handle>
-      <participant_handles>$conv.participant_handles</participant_handles>
-    </conversation>
-  </post>
-</XML>
diff --git a/view/diaspora_like.tpl b/view/diaspora_like.tpl
deleted file mode 100644
index a777aeebed..0000000000
--- a/view/diaspora_like.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<XML>
-  <post>
-    <like>
-      <target_type>$target_type</target_type>
-      <guid>$guid</guid>
-      <parent_guid>$parent_guid</parent_guid>
-      <author_signature>$authorsig</author_signature>
-      <positive>$positive</positive>
-      <diaspora_handle>$handle</diaspora_handle>
-    </like>
-  </post>
-</XML>
diff --git a/view/diaspora_like_relay.tpl b/view/diaspora_like_relay.tpl
deleted file mode 100755
index 8b67f4de33..0000000000
--- a/view/diaspora_like_relay.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-    <like>
-      <guid>$guid</guid>
-      <target_type>$target_type</target_type>
-      <parent_guid>$parent_guid</parent_guid>
-      <parent_author_signature>$parentsig</parent_author_signature>
-      <author_signature>$authorsig</author_signature>
-      <positive>$positive</positive>
-      <diaspora_handle>$handle</diaspora_handle>
-    </like>
-  </post>
-</XML>
diff --git a/view/diaspora_message.tpl b/view/diaspora_message.tpl
deleted file mode 100644
index 667b8d53fa..0000000000
--- a/view/diaspora_message.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-      <message>
-        <guid>$msg.guid</guid>
-        <parent_guid>$msg.parent_guid</parent_guid>
-        <author_signature>$msg.author_signature</author_signature>
-        <text>$msg.text</text>
-        <created_at>$msg.created_at</created_at>
-        <diaspora_handle>$msg.diaspora_handle</diaspora_handle>
-        <conversation_guid>$msg.conversation_guid</conversation_guid>
-      </message>
-  </post>
-</XML>
diff --git a/view/diaspora_photo.tpl b/view/diaspora_photo.tpl
deleted file mode 100644
index 75ca7f15c7..0000000000
--- a/view/diaspora_photo.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-    <photo>
-      <remote_photo_path>$path</remote_photo_path>
-      <remote_photo_name>$filename</remote_photo_name>
-      <status_message_guid>$msg_guid</status_message_guid>
-      <guid>$guid</guid>
-      <diaspora_handle>$handle</diaspora_handle>
-      <public>$public</public>
-      <created_at>$created_at</created_at>
-    </photo>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/diaspora_post.tpl b/view/diaspora_post.tpl
deleted file mode 100644
index 1ba3ebb1fc..0000000000
--- a/view/diaspora_post.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<XML>
-  <post>
-    <status_message>
-      <raw_message>$body</raw_message>
-      <guid>$guid</guid>
-      <diaspora_handle>$handle</diaspora_handle>
-      <public>$public</public>
-      <created_at>$created</created_at>
-    </status_message>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/diaspora_profile.tpl b/view/diaspora_profile.tpl
deleted file mode 100644
index e5c3d3cad2..0000000000
--- a/view/diaspora_profile.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<XML>
- <post><profile>
-  <diaspora_handle>$handle</diaspora_handle>
-  <first_name>$first</first_name>
-  <last_name>$last</last_name>
-  <image_url>$large</image_url>
-  <image_url_small>$small</image_url_small>
-  <image_url_medium>$medium</image_url_medium>
-  <birthday>$dob</birthday>
-  <gender>$gender</gender>
-  <bio>$about</bio>
-  <location>$location</location>
-  <searchable>$searchable</searchable>
-  <tag_string>$tags</tag_string>
-</profile></post>
-      </XML>
diff --git a/view/diaspora_relay_retraction.tpl b/view/diaspora_relay_retraction.tpl
deleted file mode 100644
index e76c7c6c5e..0000000000
--- a/view/diaspora_relay_retraction.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<XML>
-  <post>
-    <relayable_retraction>
-      <target_type>$type</target_type>
-      <target_guid>$guid</target_guid>
-      <target_author_signature>$signature</target_author_signature>
-      <sender_handle>$handle</sender_handle>
-    </relayable_retraction>
-  </post>
-</XML>
diff --git a/view/diaspora_relayable_retraction.tpl b/view/diaspora_relayable_retraction.tpl
deleted file mode 100755
index 73cff8343a..0000000000
--- a/view/diaspora_relayable_retraction.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<XML>
-  <post>
-    <relayable_retraction>
-      <target_type>$target_type</target_type>
-      <target_guid>$guid</target_guid>
-      <parent_author_signature>$parentsig</parent_author_signature>
-      <target_author_signature>$authorsig</target_author_signature>
-      <sender_handle>$handle</sender_handle>
-    </relayable_retraction>
-  </post>
-</XML>
diff --git a/view/diaspora_retract.tpl b/view/diaspora_retract.tpl
deleted file mode 100644
index 6d5b6e22be..0000000000
--- a/view/diaspora_retract.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<XML>
-  <post>
-    <retraction>
-      <post_guid>$guid</post_guid>
-      <type>$type</type>
-      <diaspora_handle>$handle</diaspora_handle>
-    </retraction>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/diaspora_share.tpl b/view/diaspora_share.tpl
deleted file mode 100644
index c16341b1e1..0000000000
--- a/view/diaspora_share.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<XML>
-  <post>
-    <request>
-      <sender_handle>$sender</sender_handle>
-      <recipient_handle>$recipient</recipient_handle>
-    </request>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/diaspora_signed_retract.tpl b/view/diaspora_signed_retract.tpl
deleted file mode 100644
index 22120e2870..0000000000
--- a/view/diaspora_signed_retract.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<XML>
-  <post>
-    <signed_retraction>
-      <target_guid>$guid</target_guid>
-      <target_type>$type</target_type>
-      <sender_handle>$handle</sender_handle>
-      <target_author_signature>$signature</target_author_signature>
-    </signed_retraction>
-  </post>
-</XML>
diff --git a/view/diaspora_vcard.tpl b/view/diaspora_vcard.tpl
deleted file mode 100644
index de3981a94b..0000000000
--- a/view/diaspora_vcard.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<div style="display:none;">
-	<dl class='entity_nickname'>
-		<dt>Nickname</dt>
-		<dd>		
-			<a class="nickname url uid" href="$diaspora.podloc/" rel="me">$diaspora.nickname</a>
-		</dd>
-	</dl>
-	<dl class='entity_fn'>
-		<dt>Full name</dt>
-		<dd>
-			<span class='fn'>$diaspora.fullname</span>
-		</dd>
-	</dl>
-
-	<dl class='entity_given_name'>
-		<dt>First name</dt>
-		<dd>
-		<span class='given_name'>$diaspora.firstname</span>
-		</dd>
-	</dl>
-	<dl class='entity_family_name'>
-		<dt>Family name</dt>
-		<dd>
-		<span class='family_name'>$diaspora.lastname</span>
-		</dd>
-	</dl>
-	<dl class="entity_url">
-		<dt>URL</dt>
-		<dd>
-			<a class="url" href="$diaspora.podloc/" id="pod_location" rel="me">$diaspora.podloc/</a>
-		</dd>
-	</dl>
-	<dl class="entity_photo">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo avatar" height="300" width="300" src="$diaspora.photo300">
-		</dd>
-	</dl>
-	<dl class="entity_photo_medium">
-		<dt>Photo</dt>
-		<dd> 
-			<img class="photo avatar" height="100" width="100" src="$diaspora.photo100">
-		</dd>
-	</dl>
-	<dl class="entity_photo_small">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo avatar" height="50" width="50" src="$diaspora.photo50">
-		</dd>
-	</dl>
-	<dl class="entity_searchable">
-		<dt>Searchable</dt>
-		<dd>
-			<span class="searchable">$diaspora.searchable</span>
-		</dd>
-	</dl>
-</div>
diff --git a/view/directory_header.tpl b/view/directory_header.tpl
deleted file mode 100644
index 1f03540f2c..0000000000
--- a/view/directory_header.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h1>$sitedir</h1>
-
-$globaldir
-$admin
-
-$finding
-
-<div id="directory-search-wrapper">
-<form id="directory-search-form" action="directory" method="get" >
-<span class="dirsearch-desc">$desc</span>
-<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="directory-search-submit" value="$submit" class="button" />
-</form>
-</div>
-<div id="directory-search-end"></div>
-
diff --git a/view/directory_item.tpl b/view/directory_item.tpl
deleted file mode 100644
index d496cb2add..0000000000
--- a/view/directory_item.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="directory-item lframe" id="directory-item-$id" >
-	<div class="contact-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="contact-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>
-		</div>
-	</div>
-
-	<div class="contact-name" id="directory-name-$id">$name</div>
-	<div class="contact-details">$details</div>
-</div>
diff --git a/view/display-head.tpl b/view/display-head.tpl
deleted file mode 100644
index 3d4e7e96ad..0000000000
--- a/view/display-head.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<script>
-$(document).ready(function() {
-	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-});
-</script>
-
diff --git a/view/email_notify_html.tpl b/view/email_notify_html.tpl
deleted file mode 100644
index 4a8e5a9114..0000000000
--- a/view/email_notify_html.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>$banner</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">$product</div><div style="clear: both;"></div></td></tr>
-
-
-	<tr><td style="padding-top:22px;" colspan="2">$preamble</td></tr>
-
-
-	{{ if $content_allowed }}
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$source_link"><img style="border:0px;width:48px;height:48px;" src="$source_photo"></a></td>
-		<td style="padding-top:22px;"><a href="$source_link">$source_name</a></td></tr>
-	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
-	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
-	{{ endif }}
-	<tr><td style="padding-top:11px;" colspan="2">$hsitelink</td></tr>
-	<tr><td style="padding-bottom:11px;" colspan="2">$hitemlink</td></tr>
-	<tr><td></td><td>$thanks</td></tr>
-	<tr><td></td><td>$site_admin</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
-
diff --git a/view/email_notify_text.tpl b/view/email_notify_text.tpl
deleted file mode 100644
index af7931e4b0..0000000000
--- a/view/email_notify_text.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$preamble
-
-{{ if $content_allowed }}
-$title
-
-$textversion
-
-{{ endif }}
-$tsitelink
-$titemlink
-
-$thanks
-$site_admin
-
-
diff --git a/view/end.tpl b/view/end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/event.tpl b/view/event.tpl
deleted file mode 100644
index 1f71289b3a..0000000000
--- a/view/event.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ for $events as $event }}
-	<div class="event">
-	
-	{{ if $event.item.author_name }}<a href="$event.item.author_link" ><img src="$event.item.author_avatar" height="32" width="32" />$event.item.author_name</a>{{ endif }}
-	$event.html
-	{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{ endif }}
-	{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }}
-	</div>
-	<div class="clear"></div>
-{{ endfor }}
diff --git a/view/event_end.tpl b/view/event_end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/event_form.tpl b/view/event_form.tpl
deleted file mode 100644
index 536c52b0fa..0000000000
--- a/view/event_form.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-<h3>$title</h3>
-
-<p>
-$desc
-</p>
-
-<form action="$post" method="post" >
-
-<input type="hidden" name="event_id" value="$eid" />
-<input type="hidden" name="cid" value="$cid" />
-<input type="hidden" name="uri" value="$uri" />
-
-<div id="event-start-text">$s_text</div>
-$s_dsel $s_tsel
-
-<div id="event-finish-text">$f_text</div>
-$f_dsel $f_tsel
-
-<div id="event-datetime-break"></div>
-
-<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" $n_checked /> <div id="event-nofinish-text">$n_text</div>
-
-<div id="event-nofinish-break"></div>
-
-<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" $a_checked /> <div id="event-adjust-text">$a_text</div>
-
-<div id="event-adjust-break"></div>
-
-<div id="event-summary-text">$t_text</div>
-<input type="text" id="event-summary" name="summary" value="$t_orig" />
-
-
-<div id="event-desc-text">$d_text</div>
-<textarea id="event-desc-textarea" name="desc">$d_orig</textarea>
-
-
-<div id="event-location-text">$l_text</div>
-<textarea id="event-location-textarea" name="location">$l_orig</textarea>
-
-<input type="checkbox" name="share" value="1" id="event-share-checkbox" $sh_checked /> <div id="event-share-text">$sh_text</div>
-<div id="event-share-break"></div>
-
-$acl
-
-<div class="clear"></div>
-<input id="event-submit" type="submit" name="submit" value="$submit" />
-</form>
-
-
diff --git a/view/event_head.tpl b/view/event_head.tpl
deleted file mode 100644
index 559de24e31..0000000000
--- a/view/event_head.tpl
+++ /dev/null
@@ -1,139 +0,0 @@
-<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>
-
-<script>
-	function showEvent(eventid) {
-		$.get(
-			'$baseurl/events/?id='+eventid,
-			function(data){
-				$.colorbox({html:data});
-			}
-		);			
-	}
-	
-	$(document).ready(function() {
-		$('#events-calendar').fullCalendar({
-			events: '$baseurl/events/json/',
-			header: {
-				left: 'prev,next today',
-				center: 'title',
-				right: 'month,agendaWeek,agendaDay'
-			},			
-			timeFormat: 'H(:mm)',
-			eventClick: function(calEvent, jsEvent, view) {
-				showEvent(calEvent.id);
-			},
-			
-			eventRender: function(event, element, view) {
-				//console.log(view.name);
-				if (event.item['author-name']==null) return;
-				switch(view.name){
-					case "month":
-					element.find(".fc-event-title").html(
-						"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
-							event.item['author-avatar'],
-							event.item['author-name'],
-							event.title
-					));
-					break;
-					case "agendaWeek":
-					element.find(".fc-event-title").html(
-						"<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(
-							event.item['author-avatar'],
-							event.item['author-name'],
-							event.item.desc,
-							event.item.location
-					));
-					break;
-					case "agendaDay":
-					element.find(".fc-event-title").html(
-						"<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(
-							event.item['author-avatar'],
-							event.item['author-name'],
-							event.item.desc,
-							event.item.location
-					));
-					break;
-				}
-			}
-			
-		})
-		
-		// center on date
-		var args=location.href.replace(baseurl,"").split("/");
-		if (args.length>=4) {
-			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
-		} 
-		
-		// show event popup
-		var hash = location.hash.split("-")
-		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
-		
-	});
-</script>
-
-
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "textareas",
-		plugins : "bbcode,paste",
-		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",
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		//force_p_newlines : false,
-		//force_br_newlines : true,
-		forced_root_block : 'div',
-		content_css: "$baseurl/view/custom_tinymce.css",
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-			});
-		}
-
-	});
-
-
-	$(document).ready(function() { 
-
-		$('#event-share-checkbox').change(function() {
-
-			if ($('#event-share-checkbox').is(':checked')) { 
-				$('#acl-wrapper').show();
-			}
-			else {
-				$('#acl-wrapper').hide();
-			}
-		}).trigger('change');
-
-
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-public').hide();
-			});
-			if(selstr == null) {
-				$('#jot-public').show();
-			}
-
-		}).trigger('change');
-
-	});
-
-</script>
-
diff --git a/view/events-js.tpl b/view/events-js.tpl
deleted file mode 100644
index b0e182c56d..0000000000
--- a/view/events-js.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-$tabs
-<h2>$title</h2>
-
-<div id="new-event-link"><a href="$new_event.0" >$new_event.1</a></div>
-
-<div id="events-calendar"></div>
diff --git a/view/events.tpl b/view/events.tpl
deleted file mode 100644
index be7dc2fb2d..0000000000
--- a/view/events.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-$tabs
-<h2>$title</h2>
-
-<div id="new-event-link"><a href="$new_event.0" >$new_event.1</a></div>
-
-<div id="event-calendar-wrapper">
-	<a href="$previus.0" class="prevcal $previus.2"><div id="event-calendar-prev" class="icon s22 prev" title="$previus.1"></div></a>
-	$calendar
-	<a href="$next.0" class="nextcal $next.2"><div id="event-calendar-prev" class="icon s22 next" title="$next.1"></div></a>
-</div>
-<div class="event-calendar-end"></div>
-
-
-{{ for $events as $event }}
-	<div class="event">
-	{{ if $event.is_first }}<hr /><a name="link-$event.j" ><div class="event-list-date">$event.d</div></a>{{ endif }}
-	{{ if $event.item.author_name }}<a href="$event.item.author_link" ><img src="$event.item.author_avatar" height="32" width="32" />$event.item.author_name</a>{{ endif }}
-	$event.html
-	{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{ endif }}
-	{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }}
-	</div>
-	<div class="clear"></div>
-
-{{ endfor }}
diff --git a/view/events_reminder.tpl b/view/events_reminder.tpl
deleted file mode 100644
index 9746898c77..0000000000
--- a/view/events_reminder.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ 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>
-<div id="event-title-end"></div>
-{{ for $events as $event }}
-<div class="event-list" id="event-$event.id"> <a href="events/$event.link">$event.title</a> $event.date </div>
-{{ endfor }}
-</div>
-{{ endif }}
-
diff --git a/view/failed_updates.tpl b/view/failed_updates.tpl
deleted file mode 100644
index c6e4cb08e1..0000000000
--- a/view/failed_updates.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<h2>$banner</h2>
-
-<div id="failed_updates_desc">$desc</div>
-
-{{ if $failed }}
-{{ for $failed as $f }}
-
-<h4>$f</h4>
-<ul>
-<li><a href="$base/admin/dbsync/mark/$f">$mark</a></li>
-<li><a href="$base/admin/dbsync/$f">$apply</a></li>
-</ul>
-
-<hr />
-{{ endfor }}
-{{ endif }}
-
diff --git a/view/fake_feed.tpl b/view/fake_feed.tpl
deleted file mode 100644
index c37071cf4a..0000000000
--- a/view/fake_feed.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<feed xmlns="http://www.w3.org/2005/Atom" >
-
-  <id>fake feed</id>
-  <title>fake title</title>
-
-  <updated>1970-01-01T00:00:00Z</updated>
-
-  <author>
-    <name>Fake Name</name>
-    <uri>http://example.com</uri>
-  </author>
-
diff --git a/view/field.tpl b/view/field.tpl
deleted file mode 100644
index 35f5afd39c..0000000000
--- a/view/field.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
- {{ if $field.0==select }}
- {{ inc field_select.tpl }}{{ endinc }}
- {{ endif }}
diff --git a/view/field_checkbox.tpl b/view/field_checkbox.tpl
deleted file mode 100644
index 5e170370ab..0000000000
--- a/view/field_checkbox.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field checkbox' id='div_id_$field.0'>
-		<label for='id_$field.0'>$field.1</label>
-		<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_combobox.tpl b/view/field_combobox.tpl
deleted file mode 100644
index a4dc8e5714..0000000000
--- a/view/field_combobox.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-	
-	<div class='field combobox'>
-		<label for='id_$field.0' id='id_$field.0_label'>$field.1</label>
-		{# html5 don't work on Chrome, Safari and IE9
-		<input id="id_$field.0" type="text" list="data_$field.0" >
-		<datalist id="data_$field.0" >
-		   {{ for $field.4 as $opt=>$val }}<option value="$val">{{ endfor }}
-		</datalist> #}
-		
-		<input id="id_$field.0" type="text" value="$field.2">
-		<select id="select_$field.0" onChange="$('#id_$field.0').val($(this).val())">
-			<option value="">$field.5</option>
-			{{ for $field.4 as $opt=>$val }}<option value="$val">$val</option>{{ endfor }}
-		</select>
-		
-		<span class='field_help'>$field.3</span>
-	</div>
-
diff --git a/view/field_custom.tpl b/view/field_custom.tpl
deleted file mode 100644
index be15d3f607..0000000000
--- a/view/field_custom.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field custom'>
-		<label for='$field.0'>$field.1</label>
-		$field.2
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_input.tpl b/view/field_input.tpl
deleted file mode 100644
index 748d93f3ee..0000000000
--- a/view/field_input.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input'>
-		<label for='id_$field.0'>$field.1</label>
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_intcheckbox.tpl b/view/field_intcheckbox.tpl
deleted file mode 100644
index 47a513a55e..0000000000
--- a/view/field_intcheckbox.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field checkbox'>
-		<label for='id_$field.0'>$field.1</label>
-		<input type="checkbox" name='$field.0' id='id_$field.0' value="$field.3" {{ if $field.2 }}checked="true"{{ endif }}>
-		<span class='field_help'>$field.4</span>
-	</div>
diff --git a/view/field_openid.tpl b/view/field_openid.tpl
deleted file mode 100644
index acd93ff62d..0000000000
--- a/view/field_openid.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input openid'>
-		<label for='id_$field.0'>$field.1</label>
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_password.tpl b/view/field_password.tpl
deleted file mode 100644
index e604b7f5da..0000000000
--- a/view/field_password.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field password'>
-		<label for='id_$field.0'>$field.1</label>
-		<input type='password' name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_radio.tpl b/view/field_radio.tpl
deleted file mode 100644
index a915e8eb3c..0000000000
--- a/view/field_radio.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field radio'>
-		<label for='id_$field.0_$field.2'>$field.1</label>
-		<input type="radio" name='$field.0' id='id_$field.0_$field.2' value="$field.2" {{ if $field.4 }}checked="true"{{ endif }}>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_richtext.tpl b/view/field_richtext.tpl
deleted file mode 100644
index c124ee000e..0000000000
--- a/view/field_richtext.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field richtext'>
-		<label for='id_$field.0'>$field.1</label>
-		<textarea name='$field.0' id='id_$field.0' class="fieldRichtext">$field.2</textarea>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_select.tpl b/view/field_select.tpl
deleted file mode 100644
index d79eb48e0d..0000000000
--- a/view/field_select.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-	
-	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0'>
-			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
-		</select>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_select_raw.tpl b/view/field_select_raw.tpl
deleted file mode 100644
index 765b285d99..0000000000
--- a/view/field_select_raw.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-	
-	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0'>
-			$field.4
-		</select>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_textarea.tpl b/view/field_textarea.tpl
deleted file mode 100644
index 2425cdd3b7..0000000000
--- a/view/field_textarea.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field textarea'>
-		<label for='id_$field.0'>$field.1</label>
-		<textarea name='$field.0' id='id_$field.0'>$field.2</textarea>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_themeselect.tpl b/view/field_themeselect.tpl
deleted file mode 100644
index 654c18d450..0000000000
--- a/view/field_themeselect.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-	<script>$(function(){ previewTheme($("#id_$field.0")[0]); });</script>
-	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0' {{ if $field.5 }}onchange="previewTheme(this);"{{ endif }} >
-			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
-		</select>
-		<span class='field_help'>$field.3</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/field_yesno.tpl b/view/field_yesno.tpl
deleted file mode 100644
index 5d4a775c29..0000000000
--- a/view/field_yesno.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-	<div class='field yesno'>
-		<label for='id_$field.0'>$field.1</label>
-		<div class='onoff' id="id_$field.0_onoff">
-			<input  type="hidden" name='$field.0' id='id_$field.0' value="$field.2">
-			<a href="#" class='off'>
-				{{ if $field.4 }}$field.4.0{{ else }}OFF{{ endif }}
-			</a>
-			<a href="#" class='on'>
-				{{ if $field.4 }}$field.4.1{{ else }}ON{{ endif }}
-			</a>
-		</div>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/fileas_widget.tpl b/view/fileas_widget.tpl
deleted file mode 100644
index 54fba7435f..0000000000
--- a/view/fileas_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="fileas-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="fileas-ul">
-		<li class="tool"><a href="$base" class="fileas-link fileas-all{{ if $sel_all }} fileas-selected{{ endif }}">$all</a></li>
-		{{ for $terms as $term }}
-			<li class="tool"><a href="$base?f=&file=$term.name" class="fileas-link{{ if $term.selected }} fileas-selected{{ endif }}">$term.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/filebrowser.tpl b/view/filebrowser.tpl
deleted file mode 100644
index 7db31d716f..0000000000
--- a/view/filebrowser.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-	<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
-	<style>
-		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
-		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
-		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
-		.filebrowser ul{ list-style-type: none; padding:0px; }
-		.filebrowser.folders a { display: block; padding: 0.3em }
-		.filebrowser.folders a:hover { background-color: #f0f0ee; }
-		.filebrowser.files.image { overflow: auto; height: auto; }
-		.filebrowser.files.image img { height:50px;}
-		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
-		.filebrowser.files.image span { display: none;}
-		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
-		.filebrowser.files a { display: block;  padding: 0.3em}
-		.filebrowser.files a:hover { background-color: #f0f0ee; }
-		.filebrowser a { text-decoration: none; }
-	</style>
-	<script>
-		var FileBrowserDialogue = {
-			init : function () {
-				// Here goes your code for setting your custom things onLoad.
-			},
-			mySubmit : function (URL) {
-				//var URL = document.my_form.my_field.value;
-				var win = tinyMCEPopup.getWindowArg("window");
-
-				// insert information now
-				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
-
-				// are we an image browser
-				if (typeof(win.ImageDialog) != "undefined") {
-					// we are, so update image dimensions...
-					if (win.ImageDialog.getImageData)
-						win.ImageDialog.getImageData();
-
-					// ... and preview if necessary
-					if (win.ImageDialog.showPreviewImage)
-						win.ImageDialog.showPreviewImage(URL);
-				}
-
-				// close popup window
-				tinyMCEPopup.close();
-			}
-		}
-
-		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
-	</script>
-	</head>
-	<body>
-	
-	<div class="tabs">
-		<ul >
-			<li class="current"><span>FileBrowser</span></li>
-		</ul>
-	</div>
-	<div class="panel_wrapper">
-
-		<div id="general_panel" class="panel current">
-			<div class="filebrowser path">
-				{{ for $path as $p }}<a href="$p.0">$p.1</a>{{ endfor }}
-			</div>
-			<div class="filebrowser folders">
-				<ul>
-					{{ for $folders as $f }}<li><a href="$f.0/">$f.1</a></li>{{ endfor }}
-				</ul>
-			</div>
-			<div class="filebrowser files $type">
-				<ul>
-				{{ for $files as $f }}
-					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('$f.0'); return false;"><img src="$f.2"><span>$f.1</span></a></li>
-				{{ endfor }}
-				</ul>
-			</div>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<input type="button" id="cancel" name="cancel" value="$cancel" onclick="tinyMCEPopup.close();" />
-	</div>	
-	</body>
-	
-</html>
diff --git a/view/filer_dialog.tpl b/view/filer_dialog.tpl
deleted file mode 100644
index ae837d6b74..0000000000
--- a/view/filer_dialog.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{ inc field_combobox.tpl }}{{ endinc }}
-<div class="settings-submit-wrapper" >
-	<input id="filer_save" type="button" class="settings-submit" value="$submit" />
-</div>
diff --git a/view/follow.tpl b/view/follow.tpl
deleted file mode 100644
index d6f3261307..0000000000
--- a/view/follow.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="follow-sidebar" class="widget">
-	<h3>$connect</h3>
-	<div id="connect-desc">$desc</div>
-	<form action="follow" method="post" >
-		<input id="side-follow-url" type="text" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" />
-	</form>
-</div>
-
diff --git a/view/follow_slap.tpl b/view/follow_slap.tpl
deleted file mode 100644
index 0d0889f7db..0000000000
--- a/view/follow_slap.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-	<entry>
-		<author>
-			<name>$name</name>
-			<uri>$profile_page</uri>
-			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
-			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
-		</author>
-
-		<id>$item_id</id>
-		<title>$title</title>
-		<published>$published</published>
-		<content type="$type" >$content</content>
-
-		<as:actor>
-		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
-		<id>$profile_page</id>
-		<title></title>
- 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="$photo"/>
-		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb"/>
-		<poco:preferredUsername>$nick</poco:preferredUsername>
-		<poco:displayName>$name</poco:displayName>
-		</as:actor>
- 		<as:verb>$verb</as:verb>
-		$ostat_follow
-	</entry>
diff --git a/view/generic_links_widget.tpl b/view/generic_links_widget.tpl
deleted file mode 100644
index f3404f783f..0000000000
--- a/view/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="widget{{ if $class }} $class{{ endif }}">
-	{{if $title}}<h3>$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul>
-		{{ for $items as $item }}
-			<li class="tool"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/group_drop.tpl b/view/group_drop.tpl
deleted file mode 100644
index 2cbebbb8e5..0000000000
--- a/view/group_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id?t=$form_security_token" 
-		onclick="return confirmDelete();" 
-		id="group-delete-icon-$id" 
-		class="icon drophide group-delete-icon" 
-		onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);" ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
deleted file mode 100644
index 2fa2b1a552..0000000000
--- a/view/group_edit.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<h2>$title</h2>
-
-
-<div id="group-edit-wrapper" >
-	<form action="group/$gid" id="group-edit-form" method="post" >
-		<input type='hidden' name='form_security_token' value='$form_security_token'>
-		
-		{{ inc field_input.tpl with $field=$gname }}{{ endinc }}
-		{{ if $drop }}$drop{{ endif }}
-		<div id="group-edit-submit-wrapper" >
-			<input type="submit" name="submit" value="$submit" >
-		</div>
-		<div id="group-edit-select-end" ></div>
-	</form>
-</div>
-
-
-{{ if $groupeditor }}
-	<div id="group-update-wrapper">
-		{{ inc groupeditor.tpl }}{{ endinc }}
-	</div>
-{{ endif }}
-{{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }}
diff --git a/view/group_selection.tpl b/view/group_selection.tpl
deleted file mode 100644
index 3809cb9946..0000000000
--- a/view/group_selection.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="field custom">
-<label for="group-selection" id="group-selection-lbl">$label</label>
-<select name="group-selection" id="group-selection" >
-{{ for $groups as $group }}
-<option value="$group.id" {{ if $group.selected }}selected="selected"{{ endif }} >$group.name</option>
-{{ endfor }}
-</select>
-</div>
diff --git a/view/group_side.tpl b/view/group_side.tpl
deleted file mode 100644
index ebb194d9c0..0000000000
--- a/view/group_side.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}			
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
-				{{ endif }}
-				<a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-  {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>
-
-
diff --git a/view/groupeditor.tpl b/view/groupeditor.tpl
deleted file mode 100644
index 755985eb35..0000000000
--- a/view/groupeditor.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div id="group">
-<h3>$groupeditor.label_members</h3>
-<div id="group-members" class="contact_list">
-{{ for $groupeditor.members as $c}} $c {{ endfor }}
-</div>
-<div id="group-members-end"></div>
-<hr id="group-separator" />
-</div>
-
-<div id="contacts">
-<h3>$groupeditor.label_contacts</h3>
-<div id="group-all-contacts" class="contact_list">
-{{ for $groupeditor.contacts as $m}} $m {{ endfor }}
-</div>
-<div id="group-all-contacts-end"></div>
-</div>
diff --git a/view/head.tpl b/view/head.tpl
deleted file mode 100644
index 7b1ed7de93..0000000000
--- a/view/head.tpl
+++ /dev/null
@@ -1,112 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl/" />
-<meta name="generator" content="$generator" />
-{#<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox.css" type="text/css" media="screen" />-->#}
-<link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
-
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-
-<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
-
-<link rel="apple-touch-icon" href="$baseurl/images/friendica-128.png"/>
-<meta name="apple-mobile-web-app-capable" content="yes" /> 
-
-
-<link rel="search"
-         href="$baseurl/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
-<!--[if IE]>
-<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
-{#<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox.pack.js"></script>-->#}
-<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>
-<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
-<script type="text/javascript" src="$baseurl/js/acl.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
-<script type="text/javascript" src="$baseurl/js/main.js" ></script>
-<script>
-
-	var updateInterval = $update_interval;
-	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
-
-	function confirmDelete() { return confirm("$delitem"); }
-	function commentOpen(obj,id) {
-		if(obj.value == '$comment') {
-			obj.value = '';
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			$("#mod-cmnt-wrap-" + id).show();
-			openMenu("comment-edit-submit-wrapper-" + id);
-			return true;
-		}
-		return false;
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = '$comment';
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
-			$("#mod-cmnt-wrap-" + id).hide();
-			closeMenu("comment-edit-submit-wrapper-" + id);
-			return true;
-		}
-		return false;
-	}
-
-
-	function commentInsert(obj,id) {
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == '$comment') {
-			tmpStr = '';
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-		var ins = $(obj).html();
-		ins = ins.replace('&lt;','<');
-		ins = ins.replace('&gt;','>');
-		ins = ins.replace('&amp;','&');
-		ins = ins.replace('&quot;','"');
-		$("#comment-edit-text-" + id).val(tmpStr + ins);
-	}
-
-	function qCommentInsert(obj,id) {
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == '$comment') {
-			tmpStr = '';
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-		var ins = $(obj).val();
-		ins = ins.replace('&lt;','<');
-		ins = ins.replace('&gt;','>');
-		ins = ins.replace('&amp;','&');
-		ins = ins.replace('&quot;','"');
-		$("#comment-edit-text-" + id).val(tmpStr + ins);
-		$(obj).val('');
-	}
-
-	window.showMore = "$showmore";
-	window.showFewer = "$showfewer";
-
-	function showHideCommentBox(id) {
-		if( $('#comment-edit-form-' + id).is(':visible')) {
-			$('#comment-edit-form-' + id).hide();
-		}
-		else {
-			$('#comment-edit-form-' + id).show();
-		}
-	}
-
-
-</script>
-
-
diff --git a/view/hide_comments.tpl b/view/hide_comments.tpl
deleted file mode 100644
index 55ee9dd7b1..0000000000
--- a/view/hide_comments.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<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>
-<div id="collapsed-comments-$id" class="collapsed-comments" style="display: $display;">
diff --git a/view/install.tpl b/view/install.tpl
deleted file mode 100644
index b3a5f46fff..0000000000
--- a/view/install.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<h1>$title</h1>
-<h2>$pass</h2>
-
-
-{{ if $status }}
-<h3 class="error-message">$status</h3>
-{{ endif }}
-
-$text
diff --git a/view/install_checks.tpl b/view/install_checks.tpl
deleted file mode 100644
index a3aa2b2660..0000000000
--- a/view/install_checks.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>$title</h1>
-<h2>$pass</h2>
-<form  action="$baseurl/index.php?q=install" method="post">
-<table>
-{{ for $checks as $check }}
-	<tr><td>$check.title </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if $check.required}}off{{else}}yellow{{endif}}{{endif}}"></td><td>{{if $check.required}}(required){{endif}}</td></tr>
-	{{if $check.help }}
-	<tr><td colspan="3"><blockquote>$check.help</blockquote></td></tr>
-	{{endif}}
-{{ endfor }}
-</table>
-
-{{ if $phpath }}
-	<input type="hidden" name="phpath" value="$phpath">
-{{ endif }}
-
-{{ if $passed }}
-	<input type="hidden" name="pass" value="2">
-	<input type="submit" value="$next">
-{{ else }}
-	<input type="hidden" name="pass" value="1">
-	<input type="submit" value="$reload">
-{{ endif }}
-</form>
diff --git a/view/install_db.tpl b/view/install_db.tpl
deleted file mode 100644
index 1302b5a708..0000000000
--- a/view/install_db.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-<h1>$title</h1>
-<h2>$pass</h2>
-
-
-<p>
-$info_01<br>
-$info_02<br>
-$info_03
-</p>
-
-{{ if $status }}
-<h3 class="error-message">$status</h3>
-{{ endif }}
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-<input type="hidden" name="pass" value="3" />
-
-{{ inc field_input.tpl with $field=$dbhost }}{{endinc}}
-{{ inc field_input.tpl with $field=$dbuser }}{{endinc}}
-{{ inc field_password.tpl with $field=$dbpass }}{{endinc}}
-{{ inc field_input.tpl with $field=$dbdata }}{{endinc}}
-
-
-<input id="install-submit" type="submit" name="submit" value="$submit" /> 
-
-</form>
-
diff --git a/view/install_settings.tpl b/view/install_settings.tpl
deleted file mode 100644
index 05b87f904e..0000000000
--- a/view/install_settings.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<h1>$title</h1>
-<h2>$pass</h2>
-
-
-{{ if $status }}
-<h3 class="error-message">$status</h3>
-{{ endif }}
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-<input type="hidden" name="dbhost" value="$dbhost" />
-<input type="hidden" name="dbuser" value="$dbuser" />
-<input type="hidden" name="dbpass" value="$dbpass" />
-<input type="hidden" name="dbdata" value="$dbdata" />
-<input type="hidden" name="pass" value="4" />
-
-{{ inc field_input.tpl with $field=$adminmail }}{{endinc}}
-$timezone
-
-<input id="install-submit" type="submit" name="submit" value="$submit" /> 
-
-</form>
-
diff --git a/view/intros.tpl b/view/intros.tpl
deleted file mode 100644
index e7fd53ca4f..0000000000
--- a/view/intros.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-
-<div class="intro-wrapper" id="intro-$contact_id" >
-
-<p class="intro-desc">$str_notifytype $notify_type</p>
-<div class="intro-fullname" id="intro-fullname-$contact_id" >$fullname</div>
-<a class="intro-url-link" id="intro-url-link-$contact_id" href="$url" ><img id="photo-$contact_id" class="intro-photo" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
-<div class="intro-knowyou">$knowyou</div>
-<div class="intro-note" id="intro-note-$contact_id">$note</div>
-<div class="intro-wrapper-end" id="intro-wrapper-end-$contact_id"></div>
-<form class="intro-form" action="notifications/$intro_id" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" />
-<input class="intro-submit-discard" type="submit" name="submit" value="$discard" />
-</form>
-<div class="intro-form-end"></div>
-
-<form class="intro-approve-form" action="dfrn_confirm" method="post">
-{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$activity }}{{endinc}}
-<input type="hidden" name="dfrn_id" value="$dfrn_id" >
-<input type="hidden" name="intro_id" value="$intro_id" >
-<input type="hidden" name="contact_id" value="$contact_id" >
-
-$dfrn_text
-
-<input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
-</form>
-</div>
-<div class="intro-end"></div>
diff --git a/view/invite.tpl b/view/invite.tpl
deleted file mode 100644
index e00d27d4ae..0000000000
--- a/view/invite.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<form action="invite" method="post" id="invite-form" >
-
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="invite-wrapper">
-
-<h3>$invite</h3>
-
-<div id="invite-recipient-text">
-$addr_text
-</div>
-
-<div id="invite-recipient-textarea">
-<textarea id="invite-recipients" name="recipients" rows="8" cols="32" ></textarea>
-</div>
-
-<div id="invite-message-text">
-$msg_text
-</div>
-
-<div id="invite-message-textarea">
-<textarea id="invite-message" name="message" rows="10" cols="72" >$default_message</textarea>
-</div>
-
-<div id="invite-submit-wrapper">
-<input type="submit" name="submit" value="$submit" />
-</div>
-
-</div>
-</form>
diff --git a/view/jot-end.tpl b/view/jot-end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
deleted file mode 100644
index a442c4c648..0000000000
--- a/view/jot-header.tpl
+++ /dev/null
@@ -1,322 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-
-var editor=false;
-var textlen = 0;
-var plaintext = '$editselect';
-
-function initEditor(cb){
-	if (editor==false){
-		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").hide();
-			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-			editor = true;
-			$("a#jot-perms-icon").colorbox({
-				'inline' : true,
-				'transition' : 'elastic'
-			});
-			$(".jothidden").show();
-			if (typeof cb!="undefined") cb();
-			return;
-		}	
-		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: $editselect,
-			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,autoresize, 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",
-			gecko_spellcheck : true,
-			paste_text_sticky : true,
-			entity_encoding : "raw",
-			add_unload_trigger : false,
-			remove_linebreaks : false,
-			//force_p_newlines : false,
-			//force_br_newlines : true,
-			forced_root_block : 'div',
-			convert_urls: false,
-			content_css: "$baseurl/view/custom_tinymce.css",
-			theme_advanced_path : false,
-			file_browser_callback : "fcFileBrowser",
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-
-					textlen = txt.length;
-					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$('#profile-jot-desc').html(ispublic);
-					}
-					else {
-						$('#profile-jot-desc').html('&nbsp;');
-					}	 
-
-				 //Character count
-
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
-					$('#character-counter').text(textlen);
-				});
-
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
-
-			}
-		});
-		editor = true;
-		// setup acl popup
-		$("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-		}); 
-	} else {
-		if (typeof cb!="undefined") cb();
-	}
-}
-
-function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
-	initEditor();
-}
-
-</script>
-<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
-<script>
-	var ispublic = '$ispublic';
-
-	$(document).ready(function() {
-		
-		/* enable tinymce on focus and click */
-		$("#profile-jot-text").focus(enableOnUser);
-		$("#profile-jot-text").click(enableOnUser);
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-
-	});
-
-	function deleteCheckedItems() {
-		if(confirm('$delitems')) {
-			var checkedstr = '';
-
-			$("#item-delete-selected").hide();
-			$('#item-delete-selected-rotator').show();
-
-			$('.item-select').each( function() {
-				if($(this).is(':checked')) {
-					if(checkedstr.length != 0) {
-						checkedstr = checkedstr + ',' + $(this).val();
-					}
-					else {
-						checkedstr = $(this).val();
-					}
-				}	
-			});
-			$.post('item', { dropitems: checkedstr }, function(data) {
-				window.location.reload();
-			});
-		}
-	}
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("$vidurl");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("$audurl");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("$whereareu", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		if ($('#jot-popup').length != 0) $('#jot-popup').show();
-
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-			if (!editor) $("#profile-jot-text").val("");
-			initEditor(function(){
-				addeditortext(data);
-				$('#like-rotator-' + id).hide();
-				$(window).scrollTop(0);
-			});
-
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("$term");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.colorbox({html:data});
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply, NavUpdate);
-//					if(timer) clearTimeout(timer);
-//					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.colorbox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-	function addeditortext(data) {
-		if(plaintext == 'none') {
-			var currentText = $("#profile-jot-text").val();
-			$("#profile-jot-text").val(currentText + data);
-		}
-		else
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-	}	
-
-	$geotag
-
-</script>
-
diff --git a/view/jot.tpl b/view/jot.tpl
deleted file mode 100644
index 61d7273070..0000000000
--- a/view/jot.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
-		{{ endif }}
-		<div id="jot-text-wrap">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/jot_geotag.tpl b/view/jot_geotag.tpl
deleted file mode 100644
index b0f71e73bf..0000000000
--- a/view/jot_geotag.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
-			$('#profile-nolocation-wrapper').show();
-		});
-	}
-
diff --git a/view/lang_selector.tpl b/view/lang_selector.tpl
deleted file mode 100644
index b3a527b40f..0000000000
--- a/view/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl
deleted file mode 100644
index 777b2e3594..0000000000
--- a/view/like_noshare.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<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>
-	{{ if $nolike }}
-	<a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
-	{{ endif }}
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
diff --git a/view/login.tpl b/view/login.tpl
deleted file mode 100644
index 297b36c9ac..0000000000
--- a/view/login.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-
-	{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
-
-	<div id="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/login_head.tpl b/view/login_head.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/logout.tpl b/view/logout.tpl
deleted file mode 100644
index efc971df84..0000000000
--- a/view/logout.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<form action="$dest_url" method="post" >
-<div class="logout-wrapper">
-<input type="hidden" name="auth-params" value="logout" />
-<input type="submit" name="submit" id="logout-button" value="$logout" />
-</div>
-</form>
diff --git a/view/lostpass.tpl b/view/lostpass.tpl
deleted file mode 100644
index cd3644157a..0000000000
--- a/view/lostpass.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<h3>$title</h3>
-
-<p id="lostpass-desc">
-$desc
-</p>
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">$name</label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-
diff --git a/view/magicsig.tpl b/view/magicsig.tpl
deleted file mode 100644
index 75f9bc475b..0000000000
--- a/view/magicsig.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<me:env xmlns:me="http://salmon-protocol.org/ns/magic-env">
-<me:data type="application/atom+xml">
-$data
-</me:data>
-<me:encoding>$encoding</me:encoding>
-<me:alg>$algorithm</me:alg>
-<me:sig key_id="$keyhash">$signature</me:sig>
-</me:env>
diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl
deleted file mode 100644
index 75a4506f6a..0000000000
--- a/view/mail_conv.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<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>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
diff --git a/view/mail_display.tpl b/view/mail_display.tpl
deleted file mode 100644
index b328d32a27..0000000000
--- a/view/mail_display.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-{{ for $mails as $mail }}
-	{{ inc mail_conv.tpl }}{{endinc}}
-{{ endfor }}
-
-{{ if $canreply }}
-{{ inc prv_message.tpl }}{{ endinc }}
-{{ else }}
-$unknown_text
-{{endif }}
diff --git a/view/mail_head.tpl b/view/mail_head.tpl
deleted file mode 100644
index afb65f5373..0000000000
--- a/view/mail_head.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>$messages</h3>
-
-$tab_content
diff --git a/view/mail_list.tpl b/view/mail_list.tpl
deleted file mode 100644
index 22e35dec81..0000000000
--- a/view/mail_list.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<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>
-	</div>
-	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >$from_name</div>
-		<div class="mail-list-date">$date</div>
-		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
-		<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="icon drophide mail-list-delete	delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
-	</div>
-</div>
-</div>
-<div class="mail-list-delete-end"></div>
-
-<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/maintenance.tpl b/view/maintenance.tpl
deleted file mode 100644
index bbe15d46a8..0000000000
--- a/view/maintenance.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<div id="maintenance-message">$sysdown</div>
diff --git a/view/manage.tpl b/view/manage.tpl
deleted file mode 100644
index 24497b42c6..0000000000
--- a/view/manage.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<h3>$title</h3>
-<div id="identity-manage-desc">$desc</div>
-<div id="identity-manage-choose">$choose</div>
-<div id="identity-selector-wrapper">
-	<form action="manage" method="post" >
-	<select name="identity" size="4" onchange="this.form.submit();" >
-
-	{{ for $identities as $id }}
-		<option $id.selected value="$id.uid">$id.username ($id.nickname)</option>
-	{{ endfor }}
-
-	</select>
-	<div id="identity-select-break"></div>
-
-	{#<!--<input id="identity-submit" type="submit" name="submit" value="$submit" />-->#}
-</div></form>
-
diff --git a/view/match.tpl b/view/match.tpl
deleted file mode 100644
index b052845ae7..0000000000
--- a/view/match.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" title="$name[$tags]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="$url" title="$name[$tags]">$name</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{ if $connlnk }}
-	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
-	{{ endif }}
-
-</div>
diff --git a/view/message-end.tpl b/view/message-end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/message-head.tpl b/view/message-head.tpl
deleted file mode 100644
index 91c322fda4..0000000000
--- a/view/message-head.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<script src="$baseurl/library/jquery_ac/friendica.complete.js" ></script>
-
-<script>$(document).ready(function() { 
-	var a; 
-	a = $("#recip").autocomplete({ 
-		serviceUrl: '$base/acl',
-		minChars: 2,
-		width: 350,
-		onSelect: function(value,data) {
-			$("#recip-complete").val(data);
-		}			
-	});
-
-}); 
-
-</script>
-
diff --git a/view/message_side.tpl b/view/message_side.tpl
deleted file mode 100644
index fce771bd5d..0000000000
--- a/view/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new"><a href="$new.url" class="{{ if $new.sel }}newmessage-selected{{ endif }}">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool"><a href="$t.url" class="message-link{{ if $t.sel }}message-selected{{ endif }}">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/moderated_comment.tpl b/view/moderated_comment.tpl
deleted file mode 100644
index 911c35f33e..0000000000
--- a/view/moderated_comment.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-		<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" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<div id="mod-cmnt-wrap-$id" class="mod-cmnt-wrap" style="display:none">
-					<div id="mod-cmnt-name-lbl-$id" class="mod-cmnt-name-lbl">$lbl_modname</div>
-					<input type="text" id="mod-cmnt-name-$id" class="mod-cmnt-name" name="mod-cmnt-name" value="$modname" />
-					<div id="mod-cmnt-email-lbl-$id" class="mod-cmnt-email-lbl">$lbl_modemail</div>
-					<input type="text" id="mod-cmnt-email-$id" class="mod-cmnt-email" name="mod-cmnt-email" value="$modemail" />
-					<div id="mod-cmnt-url-lbl-$id" class="mod-cmnt-url-lbl">$lbl_modurl</div>
-					<input type="text" id="mod-cmnt-url-$id" class="mod-cmnt-url" name="mod-cmnt-url" value="$modurl" />
-				</div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/mood_content.tpl b/view/mood_content.tpl
deleted file mode 100644
index 9349c56aef..0000000000
--- a/view/mood_content.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<h3>$title</h3>
-
-<div id="mood-desc">$desc</div>
-
-<form action="mood" method="get">
-<br />
-<br />
-
-<input id="mood-parent" type="hidden" value="$parent" name="parent" />
-
-<select name="verb" id="mood-verb-select" >
-{{ for $verbs as $v }}
-<option value="$v.0">$v.1</option>
-{{ endfor }}
-</select>
-<br />
-<br />
-<input type="submit" name="submit" value="$submit" />
-</form>
-
diff --git a/view/msg-end.tpl b/view/msg-end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/msg-header.tpl b/view/msg-header.tpl
deleted file mode 100644
index 8517ef3832..0000000000
--- a/view/msg-header.tpl
+++ /dev/null
@@ -1,97 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-var plaintext = '$editselect';
-
-if(plaintext != 'none') {
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: /(profile-jot-text|prvmail-text)/,
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		//force_p_newlines : false,
-		//force_br_newlines : true,
-		forced_root_block : 'div',
-		convert_urls: false,
-		content_css: "$baseurl/view/custom_tinymce.css",
-		     //Character count
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				var editorId = ed.editorId;
-				var textarea = $('#'+editorId);
-				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-					textarea.attr('tabindex', null);
-				}
-			});
-		}
-	});
-}
-else
-	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-
-
-</script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
-<script>
-	$(document).ready(function() {
-		var uploader = new window.AjaxUpload(
-			'prvmail-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-	});
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-</script>
-
diff --git a/view/nav.tpl b/view/nav.tpl
deleted file mode 100644
index 04c4931fc6..0000000000
--- a/view/nav.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<nav>
-	$langselector
-
-	<div id="site-location">$sitelocation</div>
-
-	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-	<span id="nav-link-wrapper" >
-
-	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-		
-	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-		
-	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-	{{ if $nav.network }}
-	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.home }}
-	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.community }}
-	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-	{{ endif }}
-	{{ if $nav.introductions }}
-	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.messages }}
-	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{ endif }}
-
-
-
-	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-
-		{{ if $nav.notifications }}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-		{{ endif }}		
-
-	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
-	</span>
-	<span id="nav-end"></span>
-	<span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/navigation.tpl b/view/navigation.tpl
deleted file mode 100644
index 3e03efa30a..0000000000
--- a/view/navigation.tpl
+++ /dev/null
@@ -1,103 +0,0 @@
-{#
- # LOGIN/REGISTER
- #}
-<center>
-{# Use nested if's since the Friendica template engine doesn't support AND or OR in if statements #}
-{{ if $nav.login }}
-<div id="navigation-login-wrapper" >
-{{ else }}
-{{ if $nav.register }}
-<div id="navigation-login-wrapper" >
-{{ endif }}
-{{ endif }}
-{{ if $nav.login }}<a id="navigation-login-link" class="navigation-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><br/> {{ endif }}
-{{ if $nav.register }}<a id="navigation-register-link" class="navigation-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a><br/>{{ endif }}
-{{ if $nav.login }}
-</div>
-{{ else }}
-{{ if $nav.register }}
-</div>
-{{ endif }}
-{{ endif }}
-
-{#
- # NETWORK/HOME
- #}
-{{ if $nav.network }}
-<div id="navigation-network-wrapper" >
-{{ else }}
-{{ if $nav.home }}
-<div id="navigation-network-wrapper" >
-{{ else }}
-{{ if $nav.community }}
-<div id="navigation-network-wrapper" >
-{{ endif }}
-{{ endif }}
-{{ endif }}
-{{ if $nav.network }}
-<a id="navigation-network-link" class="navigation-link navigation-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a><br/>
-<a class="navigation-link navigation-commlink" href="$nav.net_reset.0" title="$nav.net_reset.3">$nav.net_reset.1</a><br/>
-{{ endif }}
-{{ if $nav.home }}
-<a id="navigation-home-link" class="navigation-link navigation-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a><br/>
-{{ endif }}
-{{ if $nav.community }}
-<a id="navigation-community-link" class="navigation-link navigation-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a><br/>
-{{ endif }}
-{{ if $nav.network }}
-</div>
-{{ else }}
-{{ if $nav.home }}
-</div>
-{{ else }}
-{{ if $nav.community }}
-</div>
-{{ endif }}
-{{ endif }}
-{{ endif }}
-
-{#
- # PRIVATE MESSAGES
- #}
-{{ if $nav.messages }}
-<div id="navigation-messages-wrapper">
-<a id="navigation-messages-link" class="navigation-link navigation-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a><br/>
-</div>
-{{ endif }}
-
-	
-{#
- # CONTACTS
- #}
-<div id="navigation-contacts-wrapper">
-{{ if $nav.contacts }}<a id="navigation-contacts-link" class="navigation-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><br/>{{ endif }}
-<a id="navigation-directory-link" class="navigation-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a><br/>
-{{ if $nav.introductions }}
-<a id="navigation-notify-link" class="navigation-link navigation-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a><br/>
-{{ endif }}
-</div>
-
-{#
- # NOTIFICATIONS
- #}
-{{ if $nav.notifications }}
-<div id="navigation-notifications-wrapper">
-<a id="navigation-notifications-link" class="navigation-link navigation-commlink" href="$nav.notifications.0" rel="#navigation-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a><br/>
-</div>
-{{ endif }}		
-
-{#
- # MISCELLANEOUS
- #}
-<div id="navigation-misc-wrapper">
-{{ if $nav.settings }}<a id="navigation-settings-link" class="navigation-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a><br/>{{ endif }}
-{{ if $nav.manage }}<a id="navigation-manage-link" class="navigation-link navigation-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a><br/>{{ endif }}
-{{ if $nav.profiles }}<a id="navigation-profiles-link" class="navigation-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a><br/>{{ endif }}
-{{ if $nav.admin }}<a id="navigation-admin-link" class="navigation-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a><br/>{{ endif }}
-<a id="navigation-search-link" class="navigation-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a><br/>
-{{ if $nav.apps }}<a id="navigation-apps-link" class="navigation-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a><br/>{{ endif }}
-{{ if $nav.help }} <a id="navigation-help-link" class="navigation-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a><br/>{{ endif }}
-</div>
-
-{{ if $nav.logout }}<a id="navigation-logout-link" class="navigation-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a><br/>{{ endif }}
-</center>
diff --git a/view/netfriend.tpl b/view/netfriend.tpl
deleted file mode 100644
index c2a92ce9ed..0000000000
--- a/view/netfriend.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="intro-approve-as-friend-desc">$approve_as</div>
-
-<div class="intro-approve-as-friend-wrapper">
-	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">$as_friend</label>
-	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
-	<div class="intro-approve-friend-break" ></div>	
-</div>
-<div class="intro-approve-as-friend-end"></div>
-<div class="intro-approve-as-fan-wrapper">
-	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">$as_fan</label>
-	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
-	<div class="intro-approve-fan-break"></div>
-</div>
-<div class="intro-approve-as-end"></div>
diff --git a/view/nets.tpl b/view/nets.tpl
deleted file mode 100644
index 920c2332b6..0000000000
--- a/view/nets.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="nets-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	<a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
-	<ul class="nets-ul">
-	{{ for $nets as $net }}
-	<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/nogroup-template.tpl b/view/nogroup-template.tpl
deleted file mode 100644
index dd00ed097a..0000000000
--- a/view/nogroup-template.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<h1>$header</h1>
-
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
-<div id="contact-edit-end"></div>
-
-$paginate
-
-
-
-
diff --git a/view/notifications.tpl b/view/notifications.tpl
deleted file mode 100644
index 1a13b68b90..0000000000
--- a/view/notifications.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<h1>$notif_header</h1>
-
-{{ inc common_tabs.tpl }}{{ endinc }}
-
-<div class="notif-network-wrapper">
-	$notif_content
-</div>
diff --git a/view/notifications_comments_item.tpl b/view/notifications_comments_item.tpl
deleted file mode 100644
index 73cc9f9480..0000000000
--- a/view/notifications_comments_item.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<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/notifications_dislikes_item.tpl b/view/notifications_dislikes_item.tpl
deleted file mode 100644
index 73cc9f9480..0000000000
--- a/view/notifications_dislikes_item.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<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/notifications_friends_item.tpl b/view/notifications_friends_item.tpl
deleted file mode 100644
index 73cc9f9480..0000000000
--- a/view/notifications_friends_item.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<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/notifications_likes_item.tpl b/view/notifications_likes_item.tpl
deleted file mode 100644
index 389144d9b1..0000000000
--- a/view/notifications_likes_item.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<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/notifications_network_item.tpl b/view/notifications_network_item.tpl
deleted file mode 100644
index 261ab36432..0000000000
--- a/view/notifications_network_item.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<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/notifications_posts_item.tpl b/view/notifications_posts_item.tpl
deleted file mode 100644
index 73cc9f9480..0000000000
--- a/view/notifications_posts_item.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<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/notify.tpl b/view/notify.tpl
deleted file mode 100644
index 73cc9f9480..0000000000
--- a/view/notify.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<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/oauth_authorize.tpl b/view/oauth_authorize.tpl
deleted file mode 100644
index 31f02ac505..0000000000
--- a/view/oauth_authorize.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>$title</h1>
-
-<div class='oauthapp'>
-	<img src='$app.icon'>
-	<h4>$app.name</h4>
-</div>
-<h3>$authorize</h3>
-<form method="POST">
-<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="$yes" /></div>
-</form>
diff --git a/view/oauth_authorize_done.tpl b/view/oauth_authorize_done.tpl
deleted file mode 100644
index 51eaea2484..0000000000
--- a/view/oauth_authorize_done.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<h1>$title</h1>
-
-<p>$info</p>
-<code>$code</code>
diff --git a/view/oembed_video.tpl b/view/oembed_video.tpl
deleted file mode 100755
index d3a9a93113..0000000000
--- a/view/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url($baseurl/images/icons/48/play.png) no-repeat center center;'></div>
-</a>
diff --git a/view/oexchange_xrd.tpl b/view/oexchange_xrd.tpl
deleted file mode 100644
index 6735a3e04d..0000000000
--- a/view/oexchange_xrd.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-        
-    <Subject>$base</Subject>
-
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendica</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/title">Friendica Social Network</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/name">Friendica</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendica</Property>
-
-    <Link 
-        rel="icon" 
-        href="$base/images/friendica-16.png"
-        type="image/png" 
-        />
-
-    <Link 
-        rel="icon32" 
-        href="$base/images/friendica-32.png"
-        type="image/png" 
-        />
-
-    <Link 
-        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
-        href="$base/oexchange"
-        type="text/html" 
-        />
-</XRD>
-
diff --git a/view/opensearch.tpl b/view/opensearch.tpl
deleted file mode 100644
index 4b5c01bc90..0000000000
--- a/view/opensearch.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-	<ShortName>Friendica@$nodename</ShortName>
-	<Description>Search in Friendica@$nodename</Description>
-	<Contact>http://bugs.friendica.com/</Contact>
-	<Image height="16" width="16" type="image/png">$baseurl/images/friendica-16.png</Image>
-	<Image height="64" width="64" type="image/png">$baseurl/images/friendica-64.png</Image>
-	<Url type="text/html" 
-        template="$baseurl/search?search={searchTerms}"/>
-	<Url type="application/opensearchdescription+xml"
-      	rel="self"
-      	template="$baseurl/opensearch" />        
-</OpenSearchDescription>
\ No newline at end of file
diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl
deleted file mode 100644
index c9022a1c14..0000000000
--- a/view/pagetypes.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	{{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
-	{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
-	{{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
-	{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
-	{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
diff --git a/view/peoplefind.tpl b/view/peoplefind.tpl
deleted file mode 100644
index 3c2692d25e..0000000000
--- a/view/peoplefind.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div id="peoplefind-sidebar" class="widget">
-	<h3>$findpeople</h3>
-	<div id="peoplefind-desc">$desc</div>
-	<form action="dirfind" method="post" />
-		<input id="side-peoplefind-url" type="text" name="search" size="24" title="$hint" /><input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
-	</form>
-	<div class="side-link" id="side-match-link"><a href="match" >$similar</a></div>
-	<div class="side-link" id="side-suggest-link"><a href="suggest" >$suggest</a></div>
-	<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >$random</a></div>
-	{{ if $inv }} 
-	<div class="side-link" id="side-invite-link" ><a href="invite" >$inv</a></div>
-	{{ endif }}
-</div>
-
diff --git a/view/photo_album.tpl b/view/photo_album.tpl
deleted file mode 100644
index cc3dcfb9cc..0000000000
--- a/view/photo_album.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<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" />
-		<p class='caption'>$desc</p>		
-	</a>
-</div>
-<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/photo_drop.tpl b/view/photo_drop.tpl
deleted file mode 100644
index b4ea62b451..0000000000
--- a/view/photo_drop.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<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>
-<div class="wall-item-delete-end"></div>
diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl
deleted file mode 100644
index 53b69caae5..0000000000
--- a/view/photo_edit.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-
-<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="$item_id" />
-
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
-	<input id="photo-edit-caption" type="text" size="84" name="desc" value="$caption" />
-
-	<div id="photo-edit-caption-end"></div>
-
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
-	<input name="newtag" id="photo-edit-newtag" size="84" title="$help_tags" type="text" />
-
-	<div id="photo-edit-tags-end"></div>
-	<div id="photo-edit-rotate-wrapper">
-		<div id="photo-edit-rotate-label">
-			$rotatecw<br>
-			$rotateccw
-		</div>
-		<input type="radio" name="rotate" value="1" /><br>
-		<input type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="$permissions"/>
-			<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				$aclselect
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-
diff --git a/view/photo_edit_head.tpl b/view/photo_edit_head.tpl
deleted file mode 100644
index c7a36c4ca6..0000000000
--- a/view/photo_edit_head.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<script>
-
-	$(document).keydown(function(event) {
-
-		if("$prevlink" != '') { if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = "$prevlink"; }}
-		if("$nextlink" != '') { if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = "$nextlink"; }}
-
-	});
-
-</script>
diff --git a/view/photo_item.tpl b/view/photo_item.tpl
deleted file mode 100644
index 22884e848e..0000000000
--- a/view/photo_item.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<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">
-		<img src="$thumb" class="wall-item-photo" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-	</div>
-
-	<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-		<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a>
-		<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
-	</div>
-	<div class="wall-item-content" id="wall-item-content-$id" >
-		<div class="wall-item-title" id="wall-item-title-$id">$title</div>
-		<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
-	</div>
-	$drop
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-comment-separator"></div>
-	$comment
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-</div>
-
diff --git a/view/photo_top.tpl b/view/photo_top.tpl
deleted file mode 100644
index 155cab51d5..0000000000
--- a/view/photo_top.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<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">
-		<img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-photo$photo.twist" id="photo-top-photo-$photo.id" />
-	</a>
-	<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
-</div>
-
diff --git a/view/photo_view.tpl b/view/photo_view.tpl
deleted file mode 100644
index 732caf6900..0000000000
--- a/view/photo_view.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
-{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-
diff --git a/view/photos_default_uploader_box.tpl b/view/photos_default_uploader_box.tpl
deleted file mode 100644
index 2f1f69a50d..0000000000
--- a/view/photos_default_uploader_box.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<input id="photos-upload-choose" type="file" name="userfile" />
diff --git a/view/photos_default_uploader_submit.tpl b/view/photos_default_uploader_submit.tpl
deleted file mode 100644
index cacb416569..0000000000
--- a/view/photos_default_uploader_submit.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="photos-upload-submit-wrapper" >
-	<input type="submit" name="submit" value="$submit" id="photos-upload-submit" />
-</div>
diff --git a/view/photos_head.tpl b/view/photos_head.tpl
deleted file mode 100644
index 2f5de0f159..0000000000
--- a/view/photos_head.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-
-<script>
-
-	var ispublic = "$ispublic";
-
-
-	$(document).ready(function() {
-
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-			}
-
-		}).trigger('change');
-
-	});
-
-</script>
-
diff --git a/view/photos_recent.tpl b/view/photos_recent.tpl
deleted file mode 100644
index 1df78cb7be..0000000000
--- a/view/photos_recent.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<h3>$title</h3>
-{{ if $can_post }}
-<a id="photo-top-upload-link" href="$upload.1">$upload.0</a>
-{{ endif }}
-
-<div class="photos">
-{{ for $photos as $photo }}
-	{{ inc photo_top.tpl }}{{ endinc }}
-{{ endfor }}
-</div>
-<div class="photos-end"></div>
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl
deleted file mode 100644
index 7de8d8ab74..0000000000
--- a/view/photos_upload.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-<h3>$pagename</h3>
-
-<div id="photos-usage-message">$usage</div>
-
-<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">$existalbumtext</div>
-		<select id="photos-upload-album-select" name="album" size="4">
-		$albumselect
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
-
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
-	</div>
-
-
-	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
-		<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
-		</a>
-	</div>
-	<div id="photos-upload-perms-end"></div>
-
-	<div style="display: none;">
-		<div id="photos-upload-permissions-wrapper">
-			$aclselect
-		</div>
-	</div>
-
-	<div id="photos-upload-spacer"></div>
-
-	$alt_uploader
-
-	$default_upload_box
-	$default_upload_submit
-
-	<div class="photos-upload-end" ></div>
-</form>
-
diff --git a/view/poco_entry_xml.tpl b/view/poco_entry_xml.tpl
deleted file mode 100644
index 4d84cee416..0000000000
--- a/view/poco_entry_xml.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<entry>
-{{ if $entry.id }}<id>$entry.id</id>{{ endif }}
-{{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }}
-{{ if $entry.preferredUsername }}<preferredUsername>$entry.preferredUsername</preferredUsername>{{ endif }}
-{{ if $entry.urls }}{{ for $entry.urls as $url }}<urls><value>$url.value</value><type>$url.type</type></urls>{{ endfor }}{{ endif }}
-{{ if $entry.photos }}{{ for $entry.photos as $photo }}<photos><value>$photo.value</value><type>$photo.type</type></photos>{{ endfor }}{{ endif }}
-</entry>
diff --git a/view/poco_xml.tpl b/view/poco_xml.tpl
deleted file mode 100644
index 9549b695d1..0000000000
--- a/view/poco_xml.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<response>
-{{ if $response.sorted }}<sorted>$response.sorted</sorted>{{ endif }}
-{{ if $response.filtered }}<filtered>$response.filtered</filtered>{{ endif }}
-{{ if $response.updatedSince }}<updatedSince>$response.updatedSince</updatedSince>{{ endif }}
-<startIndex>$response.startIndex</startIndex>
-<itemsPerPage>$response.itemsPerPage</itemsPerPage>
-<totalResults>$response.totalResults</totalResults>
-
-
-{{ if $response.totalResults }}
-{{ for $response.entry as $entry }}
-{{ inc poco_entry_xml.tpl }}{{ endinc }}
-{{ endfor }}
-{{ else }}
-<entry></entry>
-{{ endif }}
-</response>
diff --git a/view/poke_content.tpl b/view/poke_content.tpl
deleted file mode 100644
index b9e089f5b3..0000000000
--- a/view/poke_content.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<h3>$title</h3>
-
-<div id="poke-desc">$desc</div>
-
-<form action="poke" method="get">
-<br />
-<br />
-
-<div id="poke-recip-label">$clabel</div>
-<br />
-<input id="poke-recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off" />
-<input id="poke-recip-complete" type="hidden" value="$id" name="cid" />
-<input id="poke-parent" type="hidden" value="$parent" name="parent" />
-<br />
-<br />
-<div id="poke-action-label">$choice</div>
-<br />
-<br />
-<select name="verb" id="poke-verb-select" >
-{{ for $verbs as $v }}
-<option value="$v.0">$v.1</option>
-{{ endfor }}
-</select>
-<br />
-<br />
-<div id="poke-private-desc">$prv_desc</div>
-<input type="checkbox" name="private" {{ if $parent }}disabled="disabled"{{ endif }} value="1" />
-<br />
-<br />
-<input type="submit" name="submit" value="$submit" />
-</form>
-
diff --git a/view/posted_date_widget.tpl b/view/posted_date_widget.tpl
deleted file mode 100644
index 3e2ee5a3ed..0000000000
--- a/view/posted_date_widget.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="datebrowse-sidebar" class="widget">
-	<h3>$title</h3>
-<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
-<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="$size">
-{{ for $dates as $d }}
-<option value="$url/$d.1/$d.2" >$d.0</option>
-{{ endfor }}
-</select>
-</div>
diff --git a/view/profed_end.tpl b/view/profed_end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/profed_head.tpl b/view/profed_head.tpl
deleted file mode 100644
index 753e2fa5f3..0000000000
--- a/view/profed_head.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<script type="text/javascript" src="js/country.js" ></script>
-
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-          <script language="javascript" type="text/javascript">
-
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "$editselect",
-	plugins : "bbcode,paste",
-	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",
-	gecko_spellcheck : true,
-	paste_text_sticky : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	//force_p_newlines : false,
-	//force_br_newlines : true,
-	forced_root_block : 'div',
-	content_css: "$baseurl/view/custom_tinymce.css",
-	theme_advanced_path : false,
-	setup : function(ed) {
-		ed.onInit.add(function(ed) {
-            ed.pasteAsPlainText = true;
-        });
-    }
-
-});
-
-
-</script>
-
diff --git a/view/profile-hide-friends.tpl b/view/profile-hide-friends.tpl
deleted file mode 100644
index 9ecacfbe0f..0000000000
--- a/view/profile-hide-friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="hide-friends-text">
-$desc
-</p>
-
-		<div id="hide-friends-yes-wrapper">
-		<label id="hide-friends-yes-label" for="hide-friends-yes">$yes_str</label>
-		<input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" />
-
-		<div id="hide-friends-break" ></div>	
-		</div>
-		<div id="hide-friends-no-wrapper">
-		<label id="hide-friends-no-label" for="hide-friends-no">$no_str</label>
-		<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0"  />
-
-		<div id="hide-friends-end"></div>
-		</div>
diff --git a/view/profile-hide-wall.tpl b/view/profile-hide-wall.tpl
deleted file mode 100644
index 10185e243d..0000000000
--- a/view/profile-hide-wall.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="hide-wall-text">
-$desc
-</p>
-
-		<div id="hide-wall-yes-wrapper">
-		<label id="hide-wall-yes-label" for="hide-wall-yes">$yes_str</label>
-		<input type="radio" name="hidewall" id="hide-wall-yes" $yes_selected value="1" />
-
-		<div id="hide-wall-break" ></div>	
-		</div>
-		<div id="hide-wall-no-wrapper">
-		<label id="hide-wall-no-label" for="hide-wall-no">$no_str</label>
-		<input type="radio" name="hidewall" id="hide-wall-no" $no_selected value="0"  />
-
-		<div id="hide-wall-end"></div>
-		</div>
diff --git a/view/profile-in-directory.tpl b/view/profile-in-directory.tpl
deleted file mode 100644
index 56b28d37e3..0000000000
--- a/view/profile-in-directory.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-$desc
-</p>
-
-		<div id="profile-in-dir-yes-wrapper">
-		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">$yes_str</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-dir-break" ></div>	
-		</div>
-		<div id="profile-in-dir-no-wrapper">
-		<label id="profile-in-dir-no-label" for="profile-in-dir-no">$no_str</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0"  />
-
-		<div id="profile-in-dir-end"></div>
-		</div>
diff --git a/view/profile-in-netdir.tpl b/view/profile-in-netdir.tpl
deleted file mode 100644
index 882ad2d17c..0000000000
--- a/view/profile-in-netdir.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-$desc
-</p>
-
-		<div id="profile-in-netdir-yes-wrapper">
-		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">$yes_str</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-netdir-break" ></div>	
-		</div>
-		<div id="profile-in-netdir-no-wrapper">
-		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">$no_str</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0"  />
-
-		<div id="profile-in-netdir-end"></div>
-		</div>
diff --git a/view/profile_advanced.tpl b/view/profile_advanced.tpl
deleted file mode 100644
index b02b7f27de..0000000000
--- a/view/profile_advanced.tpl
+++ /dev/null
@@ -1,170 +0,0 @@
-<h2>$title</h2>
-
-<dl id="aprofile-fullname" class="aprofile">
- <dt>$profile.fullname.0</dt>
- <dd>$profile.fullname.1</dd>
-</dl>
-
-{{ if $profile.gender }}
-<dl id="aprofile-gender" class="aprofile">
- <dt>$profile.gender.0</dt>
- <dd>$profile.gender.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.birthday }}
-<dl id="aprofile-birthday" class="aprofile">
- <dt>$profile.birthday.0</dt>
- <dd>$profile.birthday.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.age }}
-<dl id="aprofile-age" class="aprofile">
- <dt>$profile.age.0</dt>
- <dd>$profile.age.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.marital }}
-<dl id="aprofile-marital" class="aprofile">
- <dt><span class="heart">&hearts;</span>  $profile.marital.0</dt>
- <dd>$profile.marital.1{{ if $profile.marital.with }} ($profile.marital.with){{ endif }}{{ if $profile.howlong }} $profile.howlong{{ endif }}</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.sexual }}
-<dl id="aprofile-sexual" class="aprofile">
- <dt>$profile.sexual.0</dt>
- <dd>$profile.sexual.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.pub_keywords }}
-<dl id="aprofile-tags" class="aprofile">
- <dt>$profile.pub_keywords.0</dt>
- <dd>$profile.pub_keywords.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.homepage }}
-<dl id="aprofile-homepage" class="aprofile">
- <dt>$profile.homepage.0</dt>
- <dd>$profile.homepage.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.hometown }}
-<dl id="aprofile-hometown" class="aprofile">
- <dt>$profile.hometown.0</dt>
- <dd>$profile.hometown.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.politic }}
-<dl id="aprofile-politic" class="aprofile">
- <dt>$profile.politic.0</dt>
- <dd>$profile.politic.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.religion }}
-<dl id="aprofile-religion" class="aprofile">
- <dt>$profile.religion.0</dt>
- <dd>$profile.religion.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.about }}
-<dl id="aprofile-about" class="aprofile">
- <dt>$profile.about.0</dt>
- <dd>$profile.about.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.interest }}
-<dl id="aprofile-interest" class="aprofile">
- <dt>$profile.interest.0</dt>
- <dd>$profile.interest.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.likes }}
-<dl id="aprofile-likes" class="aprofile">
- <dt>$profile.likes.0</dt>
- <dd>$profile.likes.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.dislikes }}
-<dl id="aprofile-dislikes" class="aprofile">
- <dt>$profile.dislikes.0</dt>
- <dd>$profile.dislikes.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.contact }}
-<dl id="aprofile-contact" class="aprofile">
- <dt>$profile.contact.0</dt>
- <dd>$profile.contact.1</dd>
-</dl>
-{{ endif }}
-
-
-{{ if $profile.music }}
-<dl id="aprofile-music" class="aprofile">
- <dt>$profile.music.0</dt>
- <dd>$profile.music.1</dd>
-</dl>
-{{ endif }}
-
-
-{{ if $profile.book }}
-<dl id="aprofile-book" class="aprofile">
- <dt>$profile.book.0</dt>
- <dd>$profile.book.1</dd>
-</dl>
-{{ endif }}
-
-
-{{ if $profile.tv }}
-<dl id="aprofile-tv" class="aprofile">
- <dt>$profile.tv.0</dt>
- <dd>$profile.tv.1</dd>
-</dl>
-{{ endif }}
-
-
-{{ if $profile.film }}
-<dl id="aprofile-film" class="aprofile">
- <dt>$profile.film.0</dt>
- <dd>$profile.film.1</dd>
-</dl>
-{{ endif }}
-
-
-{{ if $profile.romance }}
-<dl id="aprofile-romance" class="aprofile">
- <dt>$profile.romance.0</dt>
- <dd>$profile.romance.1</dd>
-</dl>
-{{ endif }}
-
-
-{{ if $profile.work }}
-<dl id="aprofile-work" class="aprofile">
- <dt>$profile.work.0</dt>
- <dd>$profile.work.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.education }}
-<dl id="aprofile-education" class="aprofile">
- <dt>$profile.education.0</dt>
- <dd>$profile.education.1</dd>
-</dl>
-{{ endif }}
-
-
-
-
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
deleted file mode 100644
index 4df6ecc694..0000000000
--- a/view/profile_edit.tpl
+++ /dev/null
@@ -1,323 +0,0 @@
-$default
-
-<h1>$banner</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile_photo" id="profile-photo_upload-link" title="$profpic">$profpic</a></li>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
-<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
-<li></li>
-<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
-<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="$hometown" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
-<input type="text" size="32" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
-<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
-<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-$lbl_about
-</p>
-
-<textarea rows="10" cols="72" id="profile-about-text" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" >
-<p id="interest-jot-desc" >
-$lbl_hobbies
-</p>
-
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" >
-<p id="likes-jot-desc" >
-$lbl_likes
-</p>
-
-<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >$likes</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" >
-<p id="dislikes-jot-desc" >
-$lbl_dislikes
-</p>
-
-<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >$dislikes</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-$lbl_social
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" >
-<p id="music-jot-desc" >
-$lbl_music
-</p>
-
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" >
-<p id="book-jot-desc" >
-$lbl_book
-</p>
-
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" >
-<p id="tv-jot-desc" >
-$lbl_tv 
-</p>
-
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" >
-<p id="film-jot-desc" >
-$lbl_film
-</p>
-
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" >
-<p id="romance-jot-desc" >
-$lbl_love
-</p>
-
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" >
-<p id="work-jot-desc" >
-$lbl_work
-</p>
-
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" >
-<p id="education-jot-desc" >
-$lbl_school 
-</p>
-
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
diff --git a/view/profile_edlink.tpl b/view/profile_edlink.tpl
deleted file mode 100644
index ea787b9f53..0000000000
--- a/view/profile_edlink.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<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/profile_entry.tpl b/view/profile_entry.tpl
deleted file mode 100644
index 7ff6d685b8..0000000000
--- a/view/profile_entry.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
-</div>
-<div class="profile-listing-photo-end"></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-<div class="profile-listing-visible">$visible</div>
-</div>
-<div class="profile-listing-end"></div>
-
diff --git a/view/profile_listing_header.tpl b/view/profile_listing_header.tpl
deleted file mode 100644
index 61a2737929..0000000000
--- a/view/profile_listing_header.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<h1>$header</h1>
-<p id="profile-listing-desc" class="button" >
-<a href="profile_photo" >$chg_photo</a>
-</p>
-<div id="profile-listing-new-link-wrapper" class="button" >
-<a href="$cr_new_link" id="profile-listing-new-link" title="$cr_new" >$cr_new</a>
-</div>
-
diff --git a/view/profile_photo.tpl b/view/profile_photo.tpl
deleted file mode 100644
index 04ee8f9167..0000000000
--- a/view/profile_photo.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<h1>$title</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<label id="profile-photo-profiles-label" for="profile-photo-profiles">$lbl_profiles </label>
-<select name="profile" id="profile-photo-profiles" />
-{{ for $profiles as $p }}
-<option value="$p.id" {{ if $p.default }}selected="selected"{{ endif }}>$p.name</option>
-{{ endfor }}
-</select>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="$submit">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-$select
-</div>
\ No newline at end of file
diff --git a/view/profile_publish.tpl b/view/profile_publish.tpl
deleted file mode 100644
index 8fd0bc913b..0000000000
--- a/view/profile_publish.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-publish-desc-$instance">
-$pubdesc
-</p>
-
-		<div id="profile-publish-yes-wrapper-$instance">
-		<label id="profile-publish-yes-label-$instance" for="profile-publish-yes-$instance">$str_yes</label>
-		<input type="radio" name="profile_publish_$instance" id="profile-publish-yes-$instance" $yes_selected value="1" />
-
-		<div id="profile-publish-break-$instance" ></div>	
-		</div>
-		<div id="profile-publish-no-wrapper-$instance">
-		<label id="profile-publish-no-label-$instance" for="profile-publish-no-$instance">$str_no</label>
-		<input type="radio" name="profile_publish_$instance" id="profile-publish-no-$instance" $no_selected value="0"  />
-
-		<div id="profile-publish-end-$instance"></div>
-		</div>
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
deleted file mode 100644
index 6e137f28fa..0000000000
--- a/view/profile_vcard.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-<div class="vcard">
-
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/prv_message.tpl b/view/prv_message.tpl
deleted file mode 100644
index ecfef95d6b..0000000000
--- a/view/prv_message.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-$select
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
-
-<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/pwdreset.tpl b/view/pwdreset.tpl
deleted file mode 100644
index 497b93396d..0000000000
--- a/view/pwdreset.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<h3>$lbl1</h3>
-
-<p>
-$lbl2
-</p>
-<p>
-$lbl3
-</p>
-<p>
-$newpass
-</p>
-<p>
-$lbl4 $lbl5
-</p>
-<p>
-$lbl6
-</p>
diff --git a/view/register.tpl b/view/register.tpl
deleted file mode 100644
index 2275356a21..0000000000
--- a/view/register.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-<h3>$regtitle</h3>
-
-<form action="register" method="post" id="register-form">
-
-	<input type="hidden" name="photo" value="$photo" />
-
-	$registertext
-
-	<p id="register-realpeople">$realpeople</p>
-
-	<p id="register-fill-desc">$fillwith</p>
-	<p id="register-fill-ext">$fillext</p>
-
-{{ 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 }}
-
-{{ if $invitations }}
-
-	<p id="register-invite-desc">$invite_desc</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >$invite_label</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
-	</div>
-	<div id="register-name-end" ></div>
-
-{{ endif }}
-
-
-	<div id="register-name-wrapper" >
-		<label for="register-name" id="label-register-name" >$namelabel</label>
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="$username" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper" >
-		<label for="register-email" id="label-register-email" >$addrlabel</label>
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="$email" >
-	</div>
-	<div id="register-email-end" ></div>
-
-	<p id="register-nickname-desc" >$nickdesc</p>
-
-	<div id="register-nickname-wrapper" >
-		<label for="register-nickname" id="label-register-nickname" >$nicklabel</label>
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="$nickname" ><div id="register-sitename">@$sitename</div>
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	$publish
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
-	</div>
-	<div id="register-submit-end" ></div>
-    
-</form>
-
-$license
-
-
diff --git a/view/remote_friends_common.tpl b/view/remote_friends_common.tpl
deleted file mode 100644
index 9e0562878e..0000000000
--- a/view/remote_friends_common.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<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>{{ endif }}</div>
-	{{ if $items }}
-	{{ for $items as $item }}
-	<div class="profile-match-wrapper">
-		<div class="profile-match-photo">
-			<a href="$item.url">
-				<img src="$item.photo" width="80" height="80" alt="$item.name" title="$item.name" />
-			</a>
-		</div>
-		<div class="profile-match-break"></div>
-		<div class="profile-match-name">
-			<a href="$itemurl" title="$item.name">$item.name</a>
-		</div>
-		<div class="profile-match-end"></div>
-	</div>
-	{{ endfor }}
-	{{ endif }}
-	<div id="rfic-end" class="clear"></div>
-</div>
-
diff --git a/view/removeme.tpl b/view/removeme.tpl
deleted file mode 100644
index a3ca8d4cfa..0000000000
--- a/view/removeme.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<h1>$title</h1>
-
-<div id="remove-account-wrapper">
-
-<div id="remove-account-desc">$desc</div>
-
-<form action="$basedir/removeme" autocomplete="off" method="post" >
-<input type="hidden" name="verify" value="$hash" />
-
-<div id="remove-account-pass-wrapper">
-<label id="remove-account-pass-label" for="remove-account-pass">$passwd</label>
-<input type="password" id="remove-account-pass" name="qxz_password" />
-</div>
-<div id="remove-account-pass-end"></div>
-
-<input type="submit" name="submit" value="$submit" />
-
-</form>
-</div>
-
diff --git a/view/saved_searches_aside.tpl b/view/saved_searches_aside.tpl
deleted file mode 100644
index e6a0d6278d..0000000000
--- a/view/saved_searches_aside.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-	<h3 id="search">$title</h3>
-	$searchbox
-	
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-		<li class="saved-search-li clear">
-			<a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-		</li>
-		{{ endfor }}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/search_item.tpl b/view/search_item.tpl
deleted file mode 100644
index 384f6087ac..0000000000
--- a/view/search_item.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<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" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-
-</div>
-
-
diff --git a/view/settings-end.tpl b/view/settings-end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/settings-head.tpl b/view/settings-head.tpl
deleted file mode 100644
index 2555bedc86..0000000000
--- a/view/settings-head.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<script>
-	var ispublic = "$ispublic";
-
-
-	$(document).ready(function() {
-
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-			}
-
-		}).trigger('change');
-
-	});
-
-</script>
-
diff --git a/view/settings.tpl b/view/settings.tpl
deleted file mode 100644
index 569ebcf101..0000000000
--- a/view/settings.tpl
+++ /dev/null
@@ -1,147 +0,0 @@
-<h1>$ptitle</h1>
-
-$nickname_block
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<h3 class="settings-heading">$h_pass</h3>
-
-{{inc field_password.tpl with $field=$password1 }}{{endinc}}
-{{inc field_password.tpl with $field=$password2 }}{{endinc}}
-{{inc field_password.tpl with $field=$password3 }}{{endinc}}
-
-{{ if $oid_enable }}
-{{inc field_input.tpl with $field=$openid }}{{endinc}}
-{{ endif }}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_basic</h3>
-
-{{inc field_input.tpl with $field=$username }}{{endinc}}
-{{inc field_input.tpl with $field=$email }}{{endinc}}
-{{inc field_password.tpl with $field=$password4 }}{{endinc}}
-{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
-{{inc field_input.tpl with $field=$defloc }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_prv</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-$hide_friends
-
-$hide_wall
-
-$blockwall
-
-$blocktags
-
-$suggestme
-
-$unkmail
-
-
-{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
-
-{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>$expire.advanced</h3>
-			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
-		</div>
-	</div>
-
-</div>
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
-	
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$aclselect
-		</div>
-	</div>
-
-	</div>
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-$group_select
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-
-<h3 class="settings-heading">$h_not</h3>
-<div id="settings-notifications">
-
-<div id="settings-activity-desc">$activity_options</div>
-
-{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
-
-
-<div id="settings-notify-desc">$lbl_not</div>
-
-<div class="group">
-{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
-</div>
-
-</div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_advn</h3>
-<div id="settings-pagetype-desc">$h_descadvn</div>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl
deleted file mode 100644
index 84171dc8db..0000000000
--- a/view/settings_addons.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>$title</h1>
-
-
-<form action="settings/addon" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-$settings_addons
-
-</form>
-
diff --git a/view/settings_connectors.tpl b/view/settings_connectors.tpl
deleted file mode 100644
index bd3d60f0f4..0000000000
--- a/view/settings_connectors.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<h1>$title</h1>
-
-<div class="connector_statusmsg">$diasp_enabled</div>
-<div class="connector_statusmsg">$ostat_enabled</div>
-
-<form action="settings/connectors" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-$settings_connectors
-
-{{ if $mail_disabled }}
-
-{{ else }}
-	<div class="settings-block">
-	<h3 class="settings-heading">$h_imap</h3>
-	<p>$imap_desc</p>
-	{{inc field_custom.tpl with $field=$imap_lastcheck }}{{endinc}}
-	{{inc field_input.tpl with $field=$mail_server }}{{endinc}}
-	{{inc field_input.tpl with $field=$mail_port }}{{endinc}}
-	{{inc field_select.tpl with $field=$mail_ssl }}{{endinc}}
-	{{inc field_input.tpl with $field=$mail_user }}{{endinc}}
-	{{inc field_password.tpl with $field=$mail_pass }}{{endinc}}
-	{{inc field_input.tpl with $field=$mail_replyto }}{{endinc}}
-	{{inc field_checkbox.tpl with $field=$mail_pubmail }}{{endinc}}
-	{{inc field_select.tpl with $field=$mail_action }}{{endinc}}
-	{{inc field_input.tpl with $field=$mail_movetofolder }}{{endinc}}
-
-	<div class="settings-submit-wrapper" >
-		<input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="$submit" />
-	</div>
-	</div>
-{{ endif }}
-
-</form>
-
diff --git a/view/settings_display.tpl b/view/settings_display.tpl
deleted file mode 100644
index 24fc110270..0000000000
--- a/view/settings_display.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<h1>$ptitle</h1>
-
-<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-{{inc field_themeselect.tpl with $field=$theme }}{{endinc}}
-{{inc field_themeselect.tpl with $field=$mobile_theme }}{{endinc}}
-{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
-{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-{{ if $theme_config }}
-<h2>Theme settings</h2>
-$theme_config
-{{ endif }}
-
-</form>
diff --git a/view/settings_display_end.tpl b/view/settings_display_end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/settings_features.tpl b/view/settings_features.tpl
deleted file mode 100644
index 1b106d4111..0000000000
--- a/view/settings_features.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<h1>$title</h1>
-
-
-<form action="settings/features" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-{{ for $features as $f }}
-<h3 class="settings-heading">$f.0</h3>
-
-{{ for $f.1 as $fcat }}
-	{{ inc field_yesno.tpl with $field=$fcat }}{{endinc}}
-{{ endfor }}
-{{ endfor }}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-features-submit" value="$submit" />
-</div>
-
-</form>
-
diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl
deleted file mode 100644
index eb4721d50d..0000000000
--- a/view/settings_nick_set.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<div id="settings-nickname-desc" class="info-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
-</div>
-<div id="settings-nick-end" ></div>
diff --git a/view/settings_nick_subdir.tpl b/view/settings_nick_subdir.tpl
deleted file mode 100644
index 303c24df71..0000000000
--- a/view/settings_nick_subdir.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<p>
-It appears that your website is located in a subdirectory of the<br />
-$hostname website, so this setting may not work reliably.<br />
-</p>
-<p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'.
-</p>
\ No newline at end of file
diff --git a/view/settings_oauth.tpl b/view/settings_oauth.tpl
deleted file mode 100644
index 890c4ee6c8..0000000000
--- a/view/settings_oauth.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<h1>$title</h1>
-
-
-<form action="settings/oauth" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-	<div id="profile-edit-links">
-		<ul>
-			<li>
-				<a id="profile-edit-view-link" href="$baseurl/settings/oauth/add">$add</a>
-			</li>
-		</ul>
-	</div>
-
-	{{ for $apps as $app }}
-	<div class='oauthapp'>
-		<img src='$app.icon' class="{{ if $app.icon }} {{ else }}noicon{{ endif }}">
-		{{ if $app.name }}<h4>$app.name</h4>{{ else }}<h4>$noname</h4>{{ endif }}
-		{{ if $app.my }}
-			{{ if $app.oauth_token }}
-			<div class="settings-submit-wrapper" ><button class="settings-submit"  type="submit" name="remove" value="$app.oauth_token">$remove</button></div>
-			{{ endif }}
-		{{ endif }}
-		{{ if $app.my }}
-		<a href="$baseurl/settings/oauth/edit/$app.client_id" class="icon s22 edit" title="$edit">&nbsp;</a>
-		<a href="$baseurl/settings/oauth/delete/$app.client_id?t=$form_security_token" class="icon s22 delete" title="$delete">&nbsp;</a>
-		{{ endif }}		
-	</div>
-	{{ endfor }}
-
-</form>
diff --git a/view/settings_oauth_edit.tpl b/view/settings_oauth_edit.tpl
deleted file mode 100644
index e6f2abdc24..0000000000
--- a/view/settings_oauth_edit.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1>$title</h1>
-
-<form method="POST">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-{{ inc field_input.tpl with $field=$name }}{{ endinc }}
-{{ inc field_input.tpl with $field=$key }}{{ endinc }}
-{{ inc field_input.tpl with $field=$secret }}{{ endinc }}
-{{ inc field_input.tpl with $field=$redirect }}{{ endinc }}
-{{ inc field_input.tpl with $field=$icon }}{{ endinc }}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-<input type="submit" name="cancel" class="settings-submit" value="$cancel" />
-</div>
-
-</form>
diff --git a/view/smarty3/404.tpl b/view/smarty3/404.tpl
deleted file mode 100644
index 2d581ab8da..0000000000
--- a/view/smarty3/404.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 5fd11e7569..0000000000
--- a/view/smarty3/acl_selector.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-{{*
- *	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>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</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>
-
-<script>
-$(document).ready(function() {
-	if(typeof acl=="undefined"){
-		acl = new ACL(
-			baseurl+"/acl",
-			[ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ]
-		);
-	}
-});
-</script>
diff --git a/view/smarty3/admin_aside.tpl b/view/smarty3/admin_aside.tpl
deleted file mode 100644
index 24f07e28e6..0000000000
--- a/view/smarty3/admin_aside.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script>
-	// update pending count //
-	$(function(){
-
-		$("nav").bind('nav-update',  function(e,data){
-			var elm = $('#pending-update');
-			var register = $(data).find('register').text();
-			if (register=="0") { register=""; elm.hide();} else { elm.show(); }
-			elm.html(register);
-		});
-	});
-</script>
-<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
-<ul class='admin linklist'>
-	<li class='admin link button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
-	<li class='admin link button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
-	<li class='admin link button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
-	<li class='admin link button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
-	<li class='admin link button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
-</ul>
-
-{{if $admin.update}}
-<ul class='admin linklist'>
-	<li class='admin link button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
-	<li class='admin link button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
-</ul>
-{{/if}}
-
-
-{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
-<ul class='admin linklist'>
-	{{foreach $admin.plugins_admin as $l}}
-	<li class='admin link button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
-	{{/foreach}}
-</ul>
-	
-	
-<h4>{{$logtxt}}</h4>
-<ul class='admin linklist'>
-	<li class='admin link button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
-</ul>
-
diff --git a/view/smarty3/admin_logs.tpl b/view/smarty3/admin_logs.tpl
deleted file mode 100644
index 6a2259500c..0000000000
--- a/view/smarty3/admin_logs.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/logs" method="post">
-    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-	{{include file="field_checkbox.tpl" field=$debugging}}
-	{{include file="field_input.tpl" field=$logfile}}
-	{{include file="field_select.tpl" field=$loglevel}}
-	
-	<div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>
-	
-	</form>
-	
-	<h3>{{$logname}}</h3>
-	<div style="width:100%; height:400px; overflow: auto; "><pre>{{$data}}</pre></div>
-<!--	<iframe src='{{$baseurl}}/{{$logname}}' style="width:100%; height:400px"></iframe> -->
-	<!-- <div class="submit"><input type="submit" name="page_logs_clear_log" value="{{$clear}}" /></div> -->
-</div>
diff --git a/view/smarty3/admin_plugins.tpl b/view/smarty3/admin_plugins.tpl
deleted file mode 100644
index 307814e875..0000000000
--- a/view/smarty3/admin_plugins.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-		<ul id='pluginslist'>
-		{{foreach $plugins as $p}}
-			<li class='plugin {{$p.1}}'>
-				<a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><span class='icon {{$p.1}}'></span></a>
-				<a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>
-				{{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
-
-					<div class='desc'>{{$p.2.description}}</div>
-			</li>
-		{{/foreach}}
-		</ul>
-</div>
diff --git a/view/smarty3/admin_plugins_details.tpl b/view/smarty3/admin_plugins_details.tpl
deleted file mode 100644
index e817017328..0000000000
--- a/view/smarty3/admin_plugins_details.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<p><span class='toggleplugin icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
-	<p>{{$info.description}}</p>
-	
-	<p class="author">{{$str_author}}
-	{{foreach $info.author as $a}}
-		{{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}},
-	{{/foreach}}
-	</p>
-
-	<p class="maintainer">{{$str_maintainer}}
-	{{foreach $info.maintainer as $a}}
-		{{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}},
-	{{/foreach}}
-	</p>
-	
-	{{if $screenshot}}
-	<a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a>
-	{{/if}}
-
-	{{if $admin_form}}
-	<h3>{{$settings}}</h3>
-	<form method="post" action="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/">
-		{{$admin_form}}
-	</form>
-	{{/if}}
-
-	{{if $readme}}
-	<h3>Readme</h3>
-	<div id="plugin_readme">
-		{{$readme}}
-	</div>
-	{{/if}}
-</div>
diff --git a/view/smarty3/admin_remoteupdate.tpl b/view/smarty3/admin_remoteupdate.tpl
deleted file mode 100644
index cee0ef9b8d..0000000000
--- a/view/smarty3/admin_remoteupdate.tpl
+++ /dev/null
@@ -1,103 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script src="js/jquery.htmlstream.js"></script>
-<script>
-	/* ajax updater */
-	function updateEnd(data){
-		//$("#updatepopup .panel_text").html(data);
-		$("#remoteupdate_form").find("input").removeAttr('disabled');
-		$(".panel_action_close").fadeIn()	
-	}
-	function updateOn(data){
-		
-		var patt=/§([^§]*)§/g; 
-		var matches = data.match(patt);
-		$(matches).each(function(id,data){
-			data = data.replace(/§/g,"");
-			d = data.split("@");
-			console.log(d);
-			elm = $("#updatepopup .panel_text #"+d[0]);
-			html = "<div id='"+d[0]+"' class='progress'>"+d[1]+"<span>"+d[2]+"</span></div>";
-			if (elm.length==0){
-				$("#updatepopup .panel_text").append(html);
-			} else {
-				$(elm).replaceWith(html);
-			}
-		});
-		
-		
-	}
-	
-	$(function(){
-		$("#remoteupdate_form").submit(function(){
-			var data={};
-			$(this).find("input").each(function(i, e){
-				name = $(e).attr('name');
-				value = $(e).val();
-				e.disabled = true;
-				data[name]=value;
-			});
-
-			$("#updatepopup .panel_text").html("");
-			$("#updatepopup").show();
-			$("#updatepopup .panel").hide().slideDown(500);
-			$(".panel_action_close").hide().click(function(){
-				$("#updatepopup .panel").slideUp(500, function(){
-					$("#updatepopup").hide();
-				});				
-			});
-
-			$.post(
-				$(this).attr('action'), 
-				data, 
-				updateEnd,
-				'text',
-				updateOn
-			);
-
-			
-			return false;
-		})
-	});
-</script>
-<div id="updatepopup" class="popup">
-	<div class="background"></div>
-	<div class="panel">
-		<div class="panel_in">
-			<h1>Friendica Update</h1>
-			<div class="panel_text"></div>
-			<div class="panel_actions">
-				<input type="button" value="{{$close}}" class="panel_action_close">
-			</div>
-		</div>
-	</div>
-</div>
-<div id="adminpage">
-	<dl> <dt>Your version:</dt><dd>{{$localversion}}</dd> </dl>
-{{if $needupdate}}
-	<dl> <dt>New version:</dt><dd>{{$remoteversion}}</dd> </dl>
-
-	<form id="remoteupdate_form" method="POST" action="{{$baseurl}}/admin/update">
-	<input type="hidden" name="{{$remotefile.0}}" value="{{$remotefile.2}}">
-
-	{{if $canwrite}}
-		<div class="submit"><input type="submit" name="remoteupdate" value="{{$submit}}" /></div>
-	{{else}}
-		<h3>Your friendica installation is not writable by web server.</h3>
-		{{if $canftp}}
-			<p>You can try to update via FTP</p>
-			{{include file="field_input.tpl" field=$ftphost}}
-			{{include file="field_input.tpl" field=$ftppath}}
-			{{include file="field_input.tpl" field=$ftpuser}}
-			{{include file="field_password.tpl" field=$ftppwd}}
-			<div class="submit"><input type="submit" name="remoteupdate" value="{{$submit}}" /></div>
-		{{/if}}
-	{{/if}}
-	</form>
-{{else}}
-<h4>No updates</h4>
-{{/if}}
-</div>
diff --git a/view/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl
deleted file mode 100644
index c33897c368..0000000000
--- a/view/smarty3/admin_site.tpl
+++ /dev/null
@@ -1,121 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script>
-	$(function(){
-		
-		$("#cnftheme").click(function(){
-			$.colorbox({
-				width: 800,
-				height: '90%',
-				/*onOpen: function(){
-					var theme = $("#id_theme :selected").val();
-					$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
-				},*/
-				href: "{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val(),
-				onComplete: function(){
-					$("div#fancybox-content form").submit(function(e){
-						var url = $(this).attr('action');
-						// can't get .serialize() to work...
-						var data={};
-						$(this).find("input").each(function(){
-							data[$(this).attr('name')] = $(this).val();
-						});
-						$(this).find("select").each(function(){
-							data[$(this).attr('name')] = $(this).children(":selected").val();
-						});
-						console.log(":)", url, data);
-					
-						$.post(url, data, function(data) {
-							if(timer) clearTimeout(timer);
-							NavUpdate();
-							$.colorbox.close();
-						})
-					
-						return false;
-					});
-				
-				}
-			});
-			return false;
-		});
-	});
-</script>
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-	{{include file="field_input.tpl" field=$sitename}}
-	{{include file="field_textarea.tpl" field=$banner}}
-	{{include file="field_select.tpl" field=$language}}
-	{{include file="field_select.tpl" field=$theme}}
-	{{include file="field_select.tpl" field=$theme_mobile}}
-	{{include file="field_select.tpl" field=$ssl_policy}}
-	{{include file="field_checkbox.tpl" field=$new_share}}
-	{{include file="field_checkbox.tpl" field=$hide_help}}
-	{{include file="field_select.tpl" field=$singleuser}}
-
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$registration}}</h3>
-	{{include file="field_input.tpl" field=$register_text}}
-	{{include file="field_select.tpl" field=$register_policy}}
-	{{include file="field_input.tpl" field=$daily_registrations}}
-	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
-	{{include file="field_checkbox.tpl" field=$no_openid}}
-	{{include file="field_checkbox.tpl" field=$no_regfullname}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-
-	<h3>{{$upload}}</h3>
-	{{include file="field_input.tpl" field=$maximagesize}}
-	{{include file="field_input.tpl" field=$maximagelength}}
-	{{include file="field_input.tpl" field=$jpegimagequality}}
-	
-	<h3>{{$corporate}}</h3>
-	{{include file="field_input.tpl" field=$allowed_sites}}
-	{{include file="field_input.tpl" field=$allowed_email}}
-	{{include file="field_checkbox.tpl" field=$block_public}}
-	{{include file="field_checkbox.tpl" field=$force_publish}}
-	{{include file="field_checkbox.tpl" field=$no_community_page}}
-	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
-	{{include file="field_select.tpl" field=$ostatus_poll_interval}}
-	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
-	{{include file="field_checkbox.tpl" field=$dfrn_only}}
-	{{include file="field_input.tpl" field=$global_directory}}
-	{{include file="field_checkbox.tpl" field=$thread_allow}}
-	{{include file="field_checkbox.tpl" field=$newuser_private}}
-	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
-	{{include file="field_checkbox.tpl" field=$private_addons}}	
-	{{include file="field_checkbox.tpl" field=$disable_embedded}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$advanced}}</h3>
-	{{include file="field_checkbox.tpl" field=$no_utf}}
-	{{include file="field_checkbox.tpl" field=$verifyssl}}
-	{{include file="field_input.tpl" field=$proxy}}
-	{{include file="field_input.tpl" field=$proxyuser}}
-	{{include file="field_input.tpl" field=$timeout}}
-	{{include file="field_input.tpl" field=$delivery_interval}}
-	{{include file="field_input.tpl" field=$poll_interval}}
-	{{include file="field_input.tpl" field=$maxloadavg}}
-	{{include file="field_input.tpl" field=$abandon_days}}
-	{{include file="field_input.tpl" field=$lockpath}}
-	{{include file="field_input.tpl" field=$temppath}}
-	{{include file="field_input.tpl" field=$basepath}}
-
-	<h3>{{$performance}}</h3>
-	{{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
-	{{include file="field_input.tpl" field=$itemcache}}
-	{{include file="field_input.tpl" field=$itemcache_duration}}
-
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	</form>
-</div>
diff --git a/view/smarty3/admin_summary.tpl b/view/smarty3/admin_summary.tpl
deleted file mode 100644
index b3b42a1392..0000000000
--- a/view/smarty3/admin_summary.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-
-	<dl>
-		<dt>{{$queues.label}}</dt>
-		<dd>{{$queues.deliverq}} - {{$queues.queue}}</dd>
-	</dl>
-	<dl>
-		<dt>{{$pending.0}}</dt>
-		<dd>{{$pending.1}}</dt>
-	</dl>
-
-	<dl>
-		<dt>{{$users.0}}</dt>
-		<dd>{{$users.1}}</dd>
-	</dl>
-	{{foreach $accounts as $p}}
-		<dl>
-			<dt>{{$p.0}}</dt>
-			<dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd>
-		</dl>
-	{{/foreach}}
-
-
-	<dl>
-		<dt>{{$plugins.0}}</dt>
-		
-		{{foreach $plugins.1 as $p}}
-			<dd>{{$p}}</dd>
-		{{/foreach}}
-		
-	</dl>
-
-	<dl>
-		<dt>{{$version.0}}</dt>
-		<dd>{{$version.1}} - {{$build}}</dt>
-	</dl>
-
-
-</div>
diff --git a/view/smarty3/admin_users.tpl b/view/smarty3/admin_users.tpl
deleted file mode 100644
index 80345b78bd..0000000000
--- a/view/smarty3/admin_users.tpl
+++ /dev/null
@@ -1,103 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("{{$confirm_delete_multi}}");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		
-		<h3>{{$h_pending}}</h3>
-		{{if $pending}}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{foreach $pending as $u}}
-				<tr>
-					<td class="created">{{$u.created}}</td>
-					<td class="name">{{$u.name}}</td>
-					<td class="email">{{$u.email}}</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='icon like'></span></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
-		{{else}}
-			<p>{{$no_pending}}</p>
-		{{/if}}
-	
-	
-		
-	
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
-						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
-						<td class='email'>{{$u.email}}</td>
-						<td class='register_date'>{{$u.register_date}}</td>
-						<td class='login_date'>{{$u.login_date}}</td>
-						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
-						<td class="checkbox"> 
-                                    {{if $u.is_admin}}
-                                        &nbsp;
-                                    {{else}}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
-                                    {{/if}}
-						<td class="tools">
-                                    {{if $u.is_admin}}
-                                        &nbsp;
-                                    {{else}}
-                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
-                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
-                                    {{/if}}
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-</div>
diff --git a/view/smarty3/album_edit.tpl b/view/smarty3/album_edit.tpl
deleted file mode 100644
index 36c07a9f08..0000000000
--- a/view/smarty3/album_edit.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{*
- *	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" >
-
-
-<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
-<input type="text" size="64" name="albumname" value="{{$album}}" >
-
-<div id="photo-album-edit-name-end"></div>
-
-<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete();" />
-
-</form>
-</div>
-<div id="photo-album-edit-end" ></div>
diff --git a/view/smarty3/api_config_xml.tpl b/view/smarty3/api_config_xml.tpl
deleted file mode 100644
index 09aa00ac44..0000000000
--- a/view/smarty3/api_config_xml.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<config>
- <site>
-  <name>{{$config.site.name}}</name>
-  <server>{{$config.site.server}}</server>
-  <theme>default</theme>
-  <path></path>
-  <logo>{{$config.site.logo}}</logo>
-
-  <fancy>true</fancy>
-  <language>en</language>
-  <email>{{$config.site.email}}</email>
-  <broughtby></broughtby>
-  <broughtbyurl></broughtbyurl>
-  <timezone>UTC</timezone>
-  <closed>{{$config.site.closed}}</closed>
-
-  <inviteonly>false</inviteonly>
-  <private>{{$config.site.private}}</private>
-  <textlimit>{{$config.site.textlimit}}</textlimit>
-  <ssl>{{$config.site.ssl}}</ssl>
-  <sslserver>{{$config.site.sslserver}}</sslserver>
-  <shorturllength>30</shorturllength>
-
-</site>
- <license>
-  <type>cc</type>
-  <owner></owner>
-  <url>http://creativecommons.org/licenses/by/3.0/</url>
-  <title>Creative Commons Attribution 3.0</title>
-  <image>http://i.creativecommons.org/l/by/3.0/80x15.png</image>
-
-</license>
- <nickname>
-  <featured></featured>
-</nickname>
- <profile>
-  <biolimit></biolimit>
-</profile>
- <group>
-  <desclimit></desclimit>
-</group>
- <notice>
-
-  <contentlimit></contentlimit>
-</notice>
- <throttle>
-  <enabled>false</enabled>
-  <count>20</count>
-  <timespan>600</timespan>
-</throttle>
- <xmpp>
-
-  <enabled>false</enabled>
-  <server>INVALID SERVER</server>
-  <port>5222</port>
-  <user>update</user>
-</xmpp>
- <integration>
-  <source>StatusNet</source>
-
-</integration>
- <attachments>
-  <uploads>false</uploads>
-  <file_quota>0</file_quota>
-</attachments>
-</config>
diff --git a/view/smarty3/api_friends_xml.tpl b/view/smarty3/api_friends_xml.tpl
deleted file mode 100644
index c89b96de56..0000000000
--- a/view/smarty3/api_friends_xml.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<!-- TEMPLATE APPEARS UNUSED -->
-
-<users type="array">
-	{{foreach $users as $u}}
-	{{include file="api_user_xml.tpl" user=$u}}
-	{{/foreach}}
-</users>
diff --git a/view/smarty3/api_ratelimit_xml.tpl b/view/smarty3/api_ratelimit_xml.tpl
deleted file mode 100644
index a34eb67234..0000000000
--- a/view/smarty3/api_ratelimit_xml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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>
- <reset-time type="datetime">{{$hash.reset_time}}</reset-time>
- <reset_time_in_seconds type="integer">{{$hash.resettime_in_seconds}}</reset_time_in_seconds>
-</hash>
diff --git a/view/smarty3/api_status_xml.tpl b/view/smarty3/api_status_xml.tpl
deleted file mode 100644
index e3e80d2b1c..0000000000
--- a/view/smarty3/api_status_xml.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-{{*
- *	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>
-    <text>{{$status.text}}</text>
-    <source>{{$status.source}}</source>
-    <truncated>{{$status.truncated}}</truncated>
-    <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id>
-    <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id>
-    <favorited>{{$status.favorited}}</favorited>
-    <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
-    <geo>{{$status.geo}}</geo>
-    <coordinates>{{$status.coordinates}}</coordinates>
-    <place>{{$status.place}}</place>
-    <contributors>{{$status.contributors}}</contributors>
-	<user>
-	  <id>{{$status.user.id}}</id>
-	  <name>{{$status.user.name}}</name>
-	  <screen_name>{{$status.user.screen_name}}</screen_name>
-	  <location>{{$status.user.location}}</location>
-	  <description>{{$status.user.description}}</description>
-	  <profile_image_url>{{$status.user.profile_image_url}}</profile_image_url>
-	  <url>{{$status.user.url}}</url>
-	  <protected>{{$status.user.protected}}</protected>
-	  <followers_count>{{$status.user.followers}}</followers_count>
-	  <profile_background_color>{{$status.user.profile_background_color}}</profile_background_color>
-  	  <profile_text_color>{{$status.user.profile_text_color}}</profile_text_color>
-  	  <profile_link_color>{{$status.user.profile_link_color}}</profile_link_color>
-  	  <profile_sidebar_fill_color>{{$status.user.profile_sidebar_fill_color}}</profile_sidebar_fill_color>
-  	  <profile_sidebar_border_color>{{$status.user.profile_sidebar_border_color}}</profile_sidebar_border_color>
-  	  <friends_count>{{$status.user.friends_count}}</friends_count>
-  	  <created_at>{{$status.user.created_at}}</created_at>
-  	  <favourites_count>{{$status.user.favourites_count}}</favourites_count>
-  	  <utc_offset>{{$status.user.utc_offset}}</utc_offset>
-  	  <time_zone>{{$status.user.time_zone}}</time_zone>
-  	  <profile_background_image_url>{{$status.user.profile_background_image_url}}</profile_background_image_url>
-  	  <profile_background_tile>{{$status.user.profile_background_tile}}</profile_background_tile>
-  	  <profile_use_background_image>{{$status.user.profile_use_background_image}}</profile_use_background_image>
-  	  <notifications></notifications>
-  	  <geo_enabled>{{$status.user.geo_enabled}}</geo_enabled>
-  	  <verified>{{$status.user.verified}}</verified>
-  	  <following></following>
-  	  <statuses_count>{{$status.user.statuses_count}}</statuses_count>
-  	  <lang>{{$status.user.lang}}</lang>
-  	  <contributors_enabled>{{$status.user.contributors_enabled}}</contributors_enabled>
-	  </user>
-{{/if}}</status>
diff --git a/view/smarty3/api_test_xml.tpl b/view/smarty3/api_test_xml.tpl
deleted file mode 100644
index df5009af5c..0000000000
--- a/view/smarty3/api_test_xml.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index b23acacb3f..0000000000
--- a/view/smarty3/api_timeline_atom.tpl
+++ /dev/null
@@ -1,95 +0,0 @@
-{{*
- *	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>
- <title>Friendica</title>
- <subtitle>Friendica API feed</subtitle>
- <logo>{{$rss.logo}}</logo>
- <updated>{{$rss.atom_updated}}</updated>
- <link type="text/html" rel="alternate" href="{{$rss.alternate}}"/>
- <link type="application/atom+xml" rel="self" href="{{$rss.self}}"/>
- 
- 
- <author>
-	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-	<uri>{{$user.url}}</uri>
-	<name>{{$user.name}}</name>
-	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
-	<georss:point></georss:point>
-	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
-	<poco:displayName>{{$user.name}}</poco:displayName>
-	<poco:urls>
-		<poco:type>homepage</poco:type>
-		<poco:value>{{$user.url}}</poco:value>
-		<poco:primary>true</poco:primary>
-	</poco:urls>
-	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
- </author>
-
- <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
- <activity:subject>
-	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-	<id>{{$user.contact_url}}</id>
-	<title>{{$user.name}}</title>
-	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
-	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
-	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
-	<poco:displayName>{{$user.name}}</poco:displayName>
-	<poco:urls>
-		<poco:type>homepage</poco:type>
-		<poco:value>{{$user.url}}</poco:value>
-		<poco:primary>true</poco:primary>
-	</poco:urls>
-	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
- </activity:subject>
- 
- 
-  	{{foreach $statuses as $status}}
-	<entry>
-		<activity:object-type>{{$status.objecttype}}</activity:object-type>
-		<id>{{$status.message_id}}</id>
-		<title>{{$status.text}}</title>
-		<content type="html">{{$status.statusnet_html}}</content>
-		<link rel="alternate" type="text/html" href="{{$status.url}}"/>
-		<activity:verb>{{$status.verb}}</activity:verb>
-		<published>{{$status.published}}</published>
-		<updated>{{$status.updated}}</updated>
-
-		<link rel="self" type="application/atom+xml" href="{{$status.self}}"/>
-		<link rel="edit" type="application/atom+xml" href="{{$status.edit}}"/>
-		<statusnet:notice_info local_id="{{$status.id}}" source="{{$status.source}}" >
-		</statusnet:notice_info>
-
-		<author>
-			<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-			<uri>{{$status.user.url}}</uri>
-			<name>{{$status.user.name}}</name>
-			<link rel="alternate" type="text/html" href="{{$status.user.url}}"/>
-			<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$status.user.profile_image_url}}"/>
-
-			<georss:point/>
-			<poco:preferredUsername>{{$status.user.screen_name}}</poco:preferredUsername>
-			<poco:displayName>{{$status.user.name}}</poco:displayName>
-			<poco:address/>
-			<poco:urls>
-				<poco:type>homepage</poco:type>
-				<poco:value>{{$status.user.url}}</poco:value>
-				<poco:primary>true</poco:primary>
-			</poco:urls>
-		</author>
-		<link rel="ostatus:conversation" type="text/html" href="{{$status.url}}"/> 
-
-	</entry>    
-    {{/foreach}}
-</feed>
diff --git a/view/smarty3/api_timeline_rss.tpl b/view/smarty3/api_timeline_rss.tpl
deleted file mode 100644
index e89c7d0803..0000000000
--- a/view/smarty3/api_timeline_rss.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-{{*
- *	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>
-    <link>{{$rss.alternate}}</link>
-    <atom:link type="application/rss+xml" rel="self" href="{{$rss.self}}"/>
-    <description>Friendica timeline</description>
-    <language>{{$rss.language}}</language>
-    <ttl>40</ttl>
-	<image>
-		<link>{{$user.link}}</link>
-		<title>{{$user.name}}'s items</title>
-		<url>{{$user.profile_image_url}}</url>
-	</image>
-	
-{{foreach $statuses as $status}}
-  <item>
-    <title>{{$status.user.name}}: {{$status.text}}</title>
-    <description>{{$status.text}}</description>
-    <pubDate>{{$status.created_at}}</pubDate>
-    <guid>{{$status.url}}</guid>
-    <link>{{$status.url}}</link>
-    <twitter:source>{{$status.source}}</twitter:source>
-  </item>
-{{/foreach}}
-  </channel>
-</rss>
diff --git a/view/smarty3/api_timeline_xml.tpl b/view/smarty3/api_timeline_xml.tpl
deleted file mode 100644
index 84148d17ff..0000000000
--- a/view/smarty3/api_timeline_xml.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{*
- *	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>
-  <truncated>{{$status.truncated}}</truncated>
-  <created_at>{{$status.created_at}}</created_at>
-  <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id>
-  <source>{{$status.source}}</source>
-  <id>{{$status.id}}</id>
-  <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id>
-  <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
-  <geo>{{$status.geo}}</geo>
-  <favorited>{{$status.favorited}}</favorited>
-{{include file="api_user_xml.tpl" user=$status.user}}  <statusnet:html>{{$status.statusnet_html}}</statusnet:html>
-  <statusnet:conversation_id>{{$status.statusnet_conversation_id}}</statusnet:conversation_id>
-  <url>{{$status.url}}</url>
-  <coordinates>{{$status.coordinates}}</coordinates>
-  <place>{{$status.place}}</place>
-  <contributors>{{$status.contributors}}</contributors>
- </status>
-{{/foreach}}</statuses>
diff --git a/view/smarty3/api_user_xml.tpl b/view/smarty3/api_user_xml.tpl
deleted file mode 100644
index d7efcf3fb0..0000000000
--- a/view/smarty3/api_user_xml.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-  <user>
-   <id>{{$user.id}}</id>
-   <name>{{$user.name}}</name>
-   <screen_name>{{$user.screen_name}}</screen_name>
-   <location>{{$user.location}}</location>
-   <description>{{$user.description}}</description>
-   <profile_image_url>{{$user.profile_image_url}}</profile_image_url>
-   <url>{{$user.url}}</url>
-   <protected>{{$user.protected}}</protected>
-   <followers_count>{{$user.followers_count}}</followers_count>
-   <friends_count>{{$user.friends_count}}</friends_count>
-   <created_at>{{$user.created_at}}</created_at>
-   <favourites_count>{{$user.favourites_count}}</favourites_count>
-   <utc_offset>{{$user.utc_offset}}</utc_offset>
-   <time_zone>{{$user.time_zone}}</time_zone>
-   <statuses_count>{{$user.statuses_count}}</statuses_count>
-   <following>{{$user.following}}</following>
-   <profile_background_color>{{$user.profile_background_color}}</profile_background_color>
-   <profile_text_color>{{$user.profile_text_color}}</profile_text_color>
-   <profile_link_color>{{$user.profile_link_color}}</profile_link_color>
-   <profile_sidebar_fill_color>{{$user.profile_sidebar_fill_color}}</profile_sidebar_fill_color>
-   <profile_sidebar_border_color>{{$user.profile_sidebar_border_color}}</profile_sidebar_border_color>
-   <profile_background_image_url>{{$user.profile_background_image_url}}</profile_background_image_url>
-   <profile_background_tile>{{$user.profile_background_tile}}</profile_background_tile>
-   <profile_use_background_image>{{$user.profile_use_background_image}}</profile_use_background_image>
-   <notifications>{{$user.notifications}}</notifications>
-   <geo_enabled>{{$user.geo_enabled}}</geo_enabled>
-   <verified>{{$user.verified}}</verified>
-   <lang>{{$user.lang}}</lang>
-   <contributors_enabled>{{$user.contributors_enabled}}</contributors_enabled>
-   <status>{{if $user.status}}
-    <created_at>{{$user.status.created_at}}</created_at>
-    <id>{{$user.status.id}}</id>
-    <text>{{$user.status.text}}</text>
-    <source>{{$user.status.source}}</source>
-    <truncated>{{$user.status.truncated}}</truncated>
-    <in_reply_to_status_id>{{$user.status.in_reply_to_status_id}}</in_reply_to_status_id>
-    <in_reply_to_user_id>{{$user.status.in_reply_to_user_id}}</in_reply_to_user_id>
-    <favorited>{{$user.status.favorited}}</favorited>
-    <in_reply_to_screen_name>{{$user.status.in_reply_to_screen_name}}</in_reply_to_screen_name>
-    <geo>{{$user.status.geo}}</geo>
-    <coordinates>{{$user.status.coordinates}}</coordinates>
-    <place>{{$user.status.place}}</place>
-    <contributors>{{$user.status.contributors}}</contributors>
-  {{/if}}</status>
-  </user>
diff --git a/view/smarty3/apps.tpl b/view/smarty3/apps.tpl
deleted file mode 100644
index 01d9bb8c82..0000000000
--- a/view/smarty3/apps.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-
-<ul>
-	{{foreach $apps as $ap}}
-	<li>{{$ap}}</li>
-	{{/foreach}}
-</ul>
diff --git a/view/smarty3/atom_feed.tpl b/view/smarty3/atom_feed.tpl
deleted file mode 100644
index db553d99f4..0000000000
--- a/view/smarty3/atom_feed.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	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"
-      xmlns:at="http://purl.org/atompub/tombstones/1.0"
-      xmlns:media="http://purl.org/syndication/atommedia"
-      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
-      xmlns:as="http://activitystrea.ms/spec/1.0/"
-      xmlns:georss="http://www.georss.org/georss" 
-      xmlns:poco="http://portablecontacts.net/spec/1.0" 
-      xmlns:ostatus="http://ostatus.org/schema/1.0" 
-	  xmlns:statusnet="http://status.net/schema/api/1/" > 
-
-  <id>{{$feed_id}}</id>
-  <title>{{$feed_title}}</title>
-  <generator uri="http://friendica.com" version="{{$version}}">Friendica</generator>
-  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
-  {{$hub}}
-  {{$salmon}}
-  {{$community}}
-
-  <updated>{{$feed_updated}}</updated>
-
-  <dfrn:owner>
-    <name dfrn:updated="{{$namdate}}" >{{$name}}</name>
-    <uri dfrn:updated="{{$uridate}}" >{{$profile_page}}</uri>
-    <link rel="photo"  type="image/jpeg" dfrn:updated="{{$picdate}}" media:width="175" media:height="175" href="{{$photo}}" />
-    <link rel="avatar" type="image/jpeg" dfrn:updated="{{$picdate}}" media:width="175" media:height="175" href="{{$photo}}" />
-    {{$birthday}}
-  </dfrn:owner>
diff --git a/view/smarty3/atom_feed_dfrn.tpl b/view/smarty3/atom_feed_dfrn.tpl
deleted file mode 100644
index 87d78a5186..0000000000
--- a/view/smarty3/atom_feed_dfrn.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	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"
-      xmlns:at="http://purl.org/atompub/tombstones/1.0"
-      xmlns:media="http://purl.org/syndication/atommedia"
-      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
-      xmlns:as="http://activitystrea.ms/spec/1.0/"
-      xmlns:georss="http://www.georss.org/georss" 
-      xmlns:poco="http://portablecontacts.net/spec/1.0" 
-      xmlns:ostatus="http://ostatus.org/schema/1.0" 
-	  xmlns:statusnet="http://status.net/schema/api/1/" > 
-
-  <id>{{$feed_id}}</id>
-  <title>{{$feed_title}}</title>
-  <generator uri="http://friendica.com" version="{{$version}}">Friendica</generator>
-  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
-  {{$hub}}
-  {{$salmon}}
-  {{$community}}
-
-  <updated>{{$feed_updated}}</updated>
-
-  <author>
-    <name dfrn:updated="{{$namdate}}" >{{$name}}</name>
-    <uri dfrn:updated="{{$uridate}}" >{{$profile_page}}</uri>
-    <link rel="photo"  type="image/jpeg" dfrn:updated="{{$picdate}}" media:width="175" media:height="175" href="{{$photo}}" />
-    <link rel="avatar" type="image/jpeg" dfrn:updated="{{$picdate}}" media:width="175" media:height="175" href="{{$photo}}" />
-    {{$birthday}}
-  </author>
diff --git a/view/smarty3/atom_mail.tpl b/view/smarty3/atom_mail.tpl
deleted file mode 100644
index adf75a3e7a..0000000000
--- a/view/smarty3/atom_mail.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<dfrn:mail>
-
-	<dfrn:sender>
-		<dfrn:name>{{$name}}</dfrn:name>
-		<dfrn:uri>{{$profile_page}}</dfrn:uri>
-		<dfrn:avatar>{{$thumb}}</dfrn:avatar>
-	</dfrn:sender>
-
-	<dfrn:id>{{$item_id}}</dfrn:id>
-	<dfrn:in-reply-to>{{$parent_id}}</dfrn:in-reply-to>
-	<dfrn:sentdate>{{$created}}</dfrn:sentdate>
-	<dfrn:subject>{{$subject}}</dfrn:subject>
-	<dfrn:content>{{$content}}</dfrn:content>
-
-</dfrn:mail>
-
diff --git a/view/smarty3/atom_relocate.tpl b/view/smarty3/atom_relocate.tpl
deleted file mode 100644
index 073edeaf53..0000000000
--- a/view/smarty3/atom_relocate.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<dfrn:relocate>
-
-	<dfrn:url>{{$url}}</dfrn:url>
-	<dfrn:name>{{$name}}</dfrn:name>
-	<dfrn:photo>{{$photo}}</dfrn:photo>
-	<dfrn:thumb>{{$thumb}}</dfrn:thumb>
-	<dfrn:micro>{{$micro}}</dfrn:micro>
-	<dfrn:request>{{$request}}</dfrn:request>
-	<dfrn:confirm>{{$confirm}}</dfrn:confirm>
-	<dfrn:notify>{{$notify}}</dfrn:notify>
-	<dfrn:poll>{{$poll}}</dfrn:poll>
-	<dfrn:sitepubkey>{{$sitepubkey}}</dfrn:sitepubkey>
-
-
-</dfrn:relocate>
-
diff --git a/view/smarty3/atom_suggest.tpl b/view/smarty3/atom_suggest.tpl
deleted file mode 100644
index c0d1a1b3c9..0000000000
--- a/view/smarty3/atom_suggest.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<dfrn:suggest>
-
-	<dfrn:url>{{$url}}</dfrn:url>
-	<dfrn:name>{{$name}}</dfrn:name>
-	<dfrn:photo>{{$photo}}</dfrn:photo>
-	<dfrn:request>{{$request}}</dfrn:request>
-	<dfrn:note>{{$note}}</dfrn:note>
-
-</dfrn:suggest>
-
diff --git a/view/smarty3/auto_request.tpl b/view/smarty3/auto_request.tpl
deleted file mode 100644
index 662ca2447e..0000000000
--- a/view/smarty3/auto_request.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h1>{{$header}}</h1>
-
-<p id="dfrn-request-intro">
-{{$page_desc}}<br />
-<ul id="dfrn-request-networks">
-<li><a href="http://friendica.com" title="{{$friendica}}">{{$friendica}}</a></li>
-<li><a href="http://joindiaspora.com" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
-<li><a href="http://ostatus.org" title="{{$public_net}}" >{{$statusnet}}</a></li>
-{{if $emailnet}}<li>{{$emailnet}}</li>{{/if}}
-</ul>
-</p>
-<p>
-{{$invite_desc}}
-</p>
-<p>
-{{$desc}}
-</p>
-
-<form action="dfrn_request/{{$nickname}}" method="post" />
-
-<div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
-	<div id="dfrn-request-url-end"></div>
-</div>
-
-
-<div id="dfrn-request-info-wrapper" >
-
-</div>
-
-	<div id="dfrn-request-submit-wrapper">
-		<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
-		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
-	</div>
-</form>
diff --git a/view/smarty3/birthdays_reminder.tpl b/view/smarty3/birthdays_reminder.tpl
deleted file mode 100644
index 695364cdad..0000000000
--- a/view/smarty3/birthdays_reminder.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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>
-<div id="birthday-title-end"></div>
-{{foreach $events as $event}}
-<div class="birthday-list" id="birthday-{{$event.id}}"> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
-{{/foreach}}
-</div>
-{{/if}}
-
diff --git a/view/smarty3/categories_widget.tpl b/view/smarty3/categories_widget.tpl
deleted file mode 100644
index ab10ef9287..0000000000
--- a/view/smarty3/categories_widget.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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>
-	
-	<ul class="categories-ul">
-		<li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-			<li class="tool"><a href="{{$base}}?f=&category={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/smarty3/comment_item.tpl b/view/smarty3/comment_item.tpl
deleted file mode 100644
index caf98168d0..0000000000
--- a/view/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-{{*
- *	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}}
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
-		{{/if}}
-			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
-				<input type="hidden" name="type" value="{{$type}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
-				{{if $qcomment}}
-					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-					<option value=""></option>
-				{{foreach $qcomment as $qc}}
-					<option value="{{$qc}}">{{$qc}}</option>				
-				{{/foreach}}
-					</select>
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/smarty3/common_friends.tpl b/view/smarty3/common_friends.tpl
deleted file mode 100644
index 499cfe6261..0000000000
--- a/view/smarty3/common_friends.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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}}">
-			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
-	</div>
-	<div class="profile-match-end"></div>
-</div>
\ No newline at end of file
diff --git a/view/smarty3/common_tabs.tpl b/view/smarty3/common_tabs.tpl
deleted file mode 100644
index 69fa377bc9..0000000000
--- a/view/smarty3/common_tabs.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	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>
-	{{/foreach}}
-</ul>
diff --git a/view/smarty3/confirm.tpl b/view/smarty3/confirm.tpl
deleted file mode 100644
index df8d26eaa7..0000000000
--- a/view/smarty3/confirm.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<center>
-<form action="{{$confirm_url}}" id="confirm-form" method="{{$method}}">
-
-	<span id="confirm-message">{{$message}}</span>
-	{{foreach $extra_inputs as $input}}
-	<input type="hidden" name="{{$input.name}}" value="{{$input.value}}" />
-	{{/foreach}}
-
-	<input class="confirm-button" id="confirm-submit-button" type="submit" name="{{$confirm_name}}" value="{{$confirm}}" />
-	<input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="{{$cancel}}" />
-
-</form>
-</center>
-
diff --git a/view/smarty3/contact_block.tpl b/view/smarty3/contact_block.tpl
deleted file mode 100644
index e1d98c3bb0..0000000000
--- a/view/smarty3/contact_block.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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}}
-		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
-		<div class='contact-block-content'>
-		{{foreach $micropro as $m}}
-			{{$m}}
-		{{/foreach}}
-		</div>
-{{/if}}
-</div>
-<div class="clear"></div>
diff --git a/view/smarty3/contact_edit.tpl b/view/smarty3/contact_edit.tpl
deleted file mode 100644
index 6d65288e42..0000000000
--- a/view/smarty3/contact_edit.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h2>{{$header}}</h2>
-
-<div id="contact-edit-wrapper" >
-
-	{{$tab_str}}
-
-	<div id="contact-edit-drop-link" >
-		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
-	</div>
-
-	<div id="contact-edit-drop-link-end"></div>
-
-
-	<div id="contact-edit-nav-wrapper" >
-		<div id="contact-edit-links">
-			<ul>
-				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
-				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
-				{{if $lost_contact}}
-					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
-				{{/if}}
-				{{if $insecure}}
-					<li><div id="insecure-message">{{$insecure}}</div></li>
-				{{/if}}
-				{{if $blocked}}
-					<li><div id="block-message">{{$blocked}}</div></li>
-				{{/if}}
-				{{if $ignored}}
-					<li><div id="ignore-message">{{$ignored}}</div></li>
-				{{/if}}
-				{{if $archived}}
-					<li><div id="archive-message">{{$archived}}</div></li>
-				{{/if}}
-
-				<li>&nbsp;</li>
-
-				{{if $common_text}}
-					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
-				{{/if}}
-				{{if $all_friends}}
-					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
-				{{/if}}
-
-
-				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
-				{{if $lblsuggest}}
-					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
-				{{/if}}
-
-			</ul>
-		</div>
-	</div>
-	<div id="contact-edit-nav-end"></div>
-
-
-<form action="contacts/{{$contact_id}}" method="post" >
-<input type="hidden" name="contact_id" value="{{$contact_id}}">
-
-	{{if $poll_enabled}}
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
-			<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}} <span id="contact-edit-update-now" class="button"><a href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
-		</div>
-	{{/if}}
-	<div id="contact-edit-end" ></div>
-
-	{{include file="field_checkbox.tpl" field=$hidden}}
-
-<div id="contact-edit-info-wrapper">
-<h4>{{$lbl_info1}}</h4>
-	<textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea>
-	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-</div>
-<div id="contact-edit-info-end"></div>
-
-
-<div id="contact-edit-profile-select-text">
-<h4>{{$lbl_vis1}}</h4>
-<p>{{$lbl_vis2}}</p> 
-</div>
-{{$profile_select}}
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-
-</form>
-</div>
diff --git a/view/smarty3/contact_end.tpl b/view/smarty3/contact_end.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/contact_end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index e20f4937a0..0000000000
--- a/view/smarty3/contact_head.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{*
- *	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">
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "{{$editselect}}",
-	elements: "contact-edit-info",
-	plugins : "bbcode",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_styles : "blockquote,code",
-	gecko_spellcheck : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	//force_p_newlines : false,
-	//force_br_newlines : true,
-	forced_root_block : 'div',
-	content_css: "{{$baseurl}}/view/custom_tinymce.css"
-
-
-});
-
-
-</script>
-
diff --git a/view/smarty3/contact_template.tpl b/view/smarty3/contact_template.tpl
deleted file mode 100644
index 8e0e1acc7f..0000000000
--- a/view/smarty3/contact_template.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{{*
- *	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" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
-		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
-		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
-
-			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
-
-			{{if $contact.photo_menu}}
-			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
-                    <ul>
-						{{foreach $contact.photo_menu as $c}}
-						{{if $c.2}}
-						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-						{{else}}
-						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
-						{{/if}}
-						{{/foreach}}
-                    </ul>
-                </div>
-			{{/if}}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/smarty3/contacts-end.tpl b/view/smarty3/contacts-end.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/contacts-end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index d525e834f9..0000000000
--- a/view/smarty3/contacts-head.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	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() { 
-	var a; 
-	a = $("#contacts-search").autocomplete({ 
-		serviceUrl: '{{$base}}/acl',
-		minChars: 2,
-		width: 350,
-	});
-	a.setOptions({ params: { type: 'a' }});
-
-}); 
-
-</script>
-
diff --git a/view/smarty3/contacts-template.tpl b/view/smarty3/contacts-template.tpl
deleted file mode 100644
index 66f3f5c87b..0000000000
--- a/view/smarty3/contacts-template.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-{{*
- *	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}}
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="{{$cmd}}" method="get" >
-<span class="contacts-search-desc">{{$desc}}</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
-<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-{{$tabs}}
-
-
-{{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
-{{/foreach}}
-<div id="contact-edit-end"></div>
-
-{{$paginate}}
-
-
-
-
diff --git a/view/smarty3/contacts-widget-sidebar.tpl b/view/smarty3/contacts-widget-sidebar.tpl
deleted file mode 100644
index c4697a91c5..0000000000
--- a/view/smarty3/contacts-widget-sidebar.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$vcard_widget}}
-{{$follow_widget}}
-{{$groups_widget}}
-{{$findpeople_widget}}
-{{$networks_widget}}
-
diff --git a/view/smarty3/content.tpl b/view/smarty3/content.tpl
deleted file mode 100644
index 811f92dd56..0000000000
--- a/view/smarty3/content.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 24f0d120d5..0000000000
--- a/view/smarty3/conversation.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$live_update}}
-
-{{foreach $threads as $thread}}
-<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
-	{{foreach $thread.items as $item}}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
-			</div>
-			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
-		{{/if}}
-		{{if $item.comment_lastcollapsed}}</div>{{/if}}
-		
-		{{include file="{{$item.template}}"}}
-		
-		
-	{{/foreach}}
-</div>
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}
diff --git a/view/smarty3/crepair.tpl b/view/smarty3/crepair.tpl
deleted file mode 100644
index 8d3ed7df89..0000000000
--- a/view/smarty3/crepair.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
-
-<h4>{{$contact_name}}</h4>
-
-<label id="crepair-name-label" class="crepair-label" for="crepair-name">{{$label_name}}</label>
-<input type="text" id="crepair-name" class="crepair-input" name="name" value="{{$contact_name}}" />
-<div class="clear"></div>
-
-<label id="crepair-nick-label" class="crepair-label" for="crepair-nick">{{$label_nick}}</label>
-<input type="text" id="crepair-nick" class="crepair-input" name="nick" value="{{$contact_nick}}" />
-<div class="clear"></div>
-
-<label id="crepair-attag-label" class="crepair-label" for="crepair-attag">{{$label_attag}}</label>
-<input type="text" id="crepair-attag" class="crepair-input" name="attag" value="{{$contact_attag}}" />
-<div class="clear"></div>
-
-<label id="crepair-url-label" class="crepair-label" for="crepair-url">{{$label_url}}</label>
-<input type="text" id="crepair-url" class="crepair-input" name="url" value="{{$contact_url}}" />
-<div class="clear"></div>
-
-<label id="crepair-request-label" class="crepair-label" for="crepair-request">{{$label_request}}</label>
-<input type="text" id="crepair-request" class="crepair-input" name="request" value="{{$request}}" />
-<div class="clear"></div>
- 
-<label id="crepair-confirm-label" class="crepair-label" for="crepair-confirm">{{$label_confirm}}</label>
-<input type="text" id="crepair-confirm" class="crepair-input" name="confirm" value="{{$confirm}}" />
-<div class="clear"></div>
-
-<label id="crepair-notify-label" class="crepair-label" for="crepair-notify">{{$label_notify}}</label>
-<input type="text" id="crepair-notify" class="crepair-input" name="notify" value="{{$notify}}" />
-<div class="clear"></div>
-
-<label id="crepair-poll-label" class="crepair-label" for="crepair-poll">{{$label_poll}}</label>
-<input type="text" id="crepair-poll" class="crepair-input" name="poll" value="{{$poll}}" />
-<div class="clear"></div>
-
-<label id="crepair-photo-label" class="crepair-label" for="crepair-photo">{{$label_photo}}</label>
-<input type="text" id="crepair-photo" class="crepair-input" name="photo" value="" />
-<div class="clear"></div>
-
-<input type="submit" name="submit" value="{{$lbl_submit}}" />
-
-</form>
-
-
diff --git a/view/smarty3/cropbody.tpl b/view/smarty3/cropbody.tpl
deleted file mode 100644
index e6fcd355f4..0000000000
--- a/view/smarty3/cropbody.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-<p id="cropimage-desc">
-{{$desc}}
-</p>
-<div id="cropimage-wrapper">
-<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<input type='hidden' name='profile' value='{{$profile}}'>
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="{{$done}}" />
-</div>
-
-</form>
diff --git a/view/smarty3/cropend.tpl b/view/smarty3/cropend.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/cropend.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
diff --git a/view/smarty3/crophead.tpl b/view/smarty3/crophead.tpl
deleted file mode 100644
index d51b87d12f..0000000000
--- a/view/smarty3/crophead.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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>
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/smarty3/delegate.tpl b/view/smarty3/delegate.tpl
deleted file mode 100644
index 7aa85cf395..0000000000
--- a/view/smarty3/delegate.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$header}}</h3>
-
-<div id="delegate-desc" class="delegate-desc">{{$desc}}</div>
-
-{{if $managers}}
-<h3>{{$head_managers}}</h3>
-
-{{foreach $managers as $x}}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="#" >
-<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
-</a>
-</div>
-
-{{/foreach}}
-<div class="clear"></div>
-<hr />
-{{/if}}
-
-
-<h3>{{$head_delegates}}</h3>
-
-{{if $delegates}}
-{{foreach $delegates as $x}}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="{{$base}}/delegate/remove/{{$x.uid}}" >
-<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
-</a>
-</div>
-
-{{/foreach}}
-<div class="clear"></div>
-{{else}}
-{{$none}}
-{{/if}}
-<hr />
-
-
-<h3>{{$head_potentials}}</h3>
-{{if $potentials}}
-{{foreach $potentials as $x}}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="{{$base}}/delegate/add/{{$x.uid}}" >
-<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
-</a>
-</div>
-
-{{/foreach}}
-<div class="clear"></div>
-{{else}}
-{{$none}}
-{{/if}}
-<hr />
-
diff --git a/view/smarty3/dfrn_req_confirm.tpl b/view/smarty3/dfrn_req_confirm.tpl
deleted file mode 100644
index c941a201da..0000000000
--- a/view/smarty3/dfrn_req_confirm.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<p id="dfrn-request-homecoming" >
-{{$welcome}}
-<br />
-{{$please}}
-
-</p>
-<form id="dfrn-request-homecoming-form" action="dfrn_request/{{$nickname}}" method="post"> 
-<input type="hidden" name="dfrn_url" value="{{$dfrn_url}}" />
-<input type="hidden" name="confirm_key" value="{{$confirm_key}}" />
-<input type="hidden" name="localconfirm" value="1" />
-{{$aes_allow}}
-
-<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">{{$hidethem}}</label>
-<input type="checkbox" name="hidden-contact" value="1" {{if $hidechecked}}checked="checked" {{/if}} />
-
-
-<div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="{{$submit}}" />
-</div>
-</form>
\ No newline at end of file
diff --git a/view/smarty3/dfrn_request.tpl b/view/smarty3/dfrn_request.tpl
deleted file mode 100644
index 29173a1d77..0000000000
--- a/view/smarty3/dfrn_request.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h1>{{$header}}</h1>
-
-<p id="dfrn-request-intro">
-{{$page_desc}}<br />
-<ul id="dfrn-request-networks">
-<li><a href="http://friendica.com" title="{{$friendica}}">{{$friendica}}</a></li>
-<li><a href="http://joindiaspora.com" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
-<li><a href="http://ostatus.org" title="{{$public_net}}" >{{$statusnet}}</a></li>
-{{if $emailnet}}<li>{{$emailnet}}</li>{{/if}}
-</ul>
-{{$invite_desc}}
-</p>
-<p>
-{{$desc}}
-</p>
-
-<form action="dfrn_request/{{$nickname}}" method="post" />
-
-<div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
-	<div id="dfrn-request-url-end"></div>
-</div>
-
-<p id="dfrn-request-options">
-{{$pls_answer}}
-</p>
-
-<div id="dfrn-request-info-wrapper" >
-
-
-<p id="doiknowyou">
-{{$does_know}}
-</p>
-
-		<div id="dfrn-request-know-yes-wrapper">
-		<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">{{$yes}}</label>
-		<input type="radio" name="knowyou" id="knowyouyes" value="1" />
-
-		<div id="dfrn-request-knowyou-break" ></div>	
-		</div>
-		<div id="dfrn-request-know-no-wrapper">
-		<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">{{$no}}</label>
-		<input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
-
-		<div id="dfrn-request-knowyou-end"></div>
-		</div>
-
-
-<p id="dfrn-request-message-desc">
-{{$add_note}}
-</p>
-	<div id="dfrn-request-message-wrapper">
-	<textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
-	</div>
-
-
-</div>
-
-	<div id="dfrn-request-submit-wrapper">
-		<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
-		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
-	</div>
-</form>
diff --git a/view/smarty3/diasp_dec_hdr.tpl b/view/smarty3/diasp_dec_hdr.tpl
deleted file mode 100644
index c3305ecd0b..0000000000
--- a/view/smarty3/diasp_dec_hdr.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<decrypted_hdeader>
-  <iv>{{$inner_iv}}</iv>
-  <aes_key>{{$inner_key}}</aes_key>
-  <author>
-    <name>{{$author_name}}</name>
-    <uri>{{$author_uri}}</uri>
-  </author>
-</decrypted_header>
diff --git a/view/smarty3/diaspora_comment.tpl b/view/smarty3/diaspora_comment.tpl
deleted file mode 100644
index 8df3842d0b..0000000000
--- a/view/smarty3/diaspora_comment.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-    <comment>
-      <guid>{{$guid}}</guid>
-      <parent_guid>{{$parent_guid}}</parent_guid>
-      <author_signature>{{$authorsig}}</author_signature>
-      <text>{{$body}}</text>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </comment>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/smarty3/diaspora_comment_relay.tpl b/view/smarty3/diaspora_comment_relay.tpl
deleted file mode 100644
index c01441e3c1..0000000000
--- a/view/smarty3/diaspora_comment_relay.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-    <comment>
-      <guid>{{$guid}}</guid>
-      <parent_guid>{{$parent_guid}}</parent_guid>
-      <parent_author_signature>{{$parentsig}}</parent_author_signature>
-      <author_signature>{{$authorsig}}</author_signature>
-      <text>{{$body}}</text>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </comment>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/smarty3/diaspora_conversation.tpl b/view/smarty3/diaspora_conversation.tpl
deleted file mode 100644
index fd11b826a9..0000000000
--- a/view/smarty3/diaspora_conversation.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-    <conversation>
-      <guid>{{$conv.guid}}</guid>
-      <subject>{{$conv.subject}}</subject>
-      <created_at>{{$conv.created_at}}</created_at>
-
-      {{foreach $conv.messages as $msg}}
-
-      <message>
-        <guid>{{$msg.guid}}</guid>
-        <parent_guid>{{$msg.parent_guid}}</parent_guid>
-        {{if $msg.parent_author_signature}}
-        <parent_author_signature>{{$msg.parent_author_signature}}</parent_author_signature>
-        {{/if}}
-        <author_signature>{{$msg.author_signature}}</author_signature>
-        <text>{{$msg.text}}</text>
-        <created_at>{{$msg.created_at}}</created_at>
-        <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle>
-        <conversation_guid>{{$msg.conversation_guid}}</conversation_guid>
-      </message>
-
-      {{/foreach}}
-
-      <diaspora_handle>{{$conv.diaspora_handle}}</diaspora_handle>
-      <participant_handles>{{$conv.participant_handles}}</participant_handles>
-    </conversation>
-  </post>
-</XML>
diff --git a/view/smarty3/diaspora_like.tpl b/view/smarty3/diaspora_like.tpl
deleted file mode 100644
index 1d58d5d3f3..0000000000
--- a/view/smarty3/diaspora_like.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-    <like>
-      <target_type>{{$target_type}}</target_type>
-      <guid>{{$guid}}</guid>
-      <parent_guid>{{$parent_guid}}</parent_guid>
-      <author_signature>{{$authorsig}}</author_signature>
-      <positive>{{$positive}}</positive>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </like>
-  </post>
-</XML>
diff --git a/view/smarty3/diaspora_like_relay.tpl b/view/smarty3/diaspora_like_relay.tpl
deleted file mode 100644
index 7a55d8b203..0000000000
--- a/view/smarty3/diaspora_like_relay.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-    <like>
-      <guid>{{$guid}}</guid>
-      <target_type>{{$target_type}}</target_type>
-      <parent_guid>{{$parent_guid}}</parent_guid>
-      <parent_author_signature>{{$parentsig}}</parent_author_signature>
-      <author_signature>{{$authorsig}}</author_signature>
-      <positive>{{$positive}}</positive>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </like>
-  </post>
-</XML>
diff --git a/view/smarty3/diaspora_message.tpl b/view/smarty3/diaspora_message.tpl
deleted file mode 100644
index e1690734fd..0000000000
--- a/view/smarty3/diaspora_message.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-      <message>
-        <guid>{{$msg.guid}}</guid>
-        <parent_guid>{{$msg.parent_guid}}</parent_guid>
-        <author_signature>{{$msg.author_signature}}</author_signature>
-        <text>{{$msg.text}}</text>
-        <created_at>{{$msg.created_at}}</created_at>
-        <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle>
-        <conversation_guid>{{$msg.conversation_guid}}</conversation_guid>
-      </message>
-  </post>
-</XML>
diff --git a/view/smarty3/diaspora_photo.tpl b/view/smarty3/diaspora_photo.tpl
deleted file mode 100644
index b6220346c4..0000000000
--- a/view/smarty3/diaspora_photo.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-    <photo>
-      <remote_photo_path>{{$path}}</remote_photo_path>
-      <remote_photo_name>{{$filename}}</remote_photo_name>
-      <status_message_guid>{{$msg_guid}}</status_message_guid>
-      <guid>{{$guid}}</guid>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-      <public>{{$public}}</public>
-      <created_at>{{$created_at}}</created_at>
-    </photo>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/smarty3/diaspora_post.tpl b/view/smarty3/diaspora_post.tpl
deleted file mode 100644
index 2817f7d4a0..0000000000
--- a/view/smarty3/diaspora_post.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-    <status_message>
-      <raw_message>{{$body}}</raw_message>
-      <guid>{{$guid}}</guid>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-      <public>{{$public}}</public>
-      <created_at>{{$created}}</created_at>
-    </status_message>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/smarty3/diaspora_profile.tpl b/view/smarty3/diaspora_profile.tpl
deleted file mode 100644
index 11aaf10550..0000000000
--- a/view/smarty3/diaspora_profile.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
- <post><profile>
-  <diaspora_handle>{{$handle}}</diaspora_handle>
-  <first_name>{{$first}}</first_name>
-  <last_name>{{$last}}</last_name>
-  <image_url>{{$large}}</image_url>
-  <image_url_small>{{$small}}</image_url_small>
-  <image_url_medium>{{$medium}}</image_url_medium>
-  <birthday>{{$dob}}</birthday>
-  <gender>{{$gender}}</gender>
-  <bio>{{$about}}</bio>
-  <location>{{$location}}</location>
-  <searchable>{{$searchable}}</searchable>
-  <tag_string>{{$tags}}</tag_string>
-</profile></post>
-      </XML>
diff --git a/view/smarty3/diaspora_relay_retraction.tpl b/view/smarty3/diaspora_relay_retraction.tpl
deleted file mode 100644
index 97a1344c97..0000000000
--- a/view/smarty3/diaspora_relay_retraction.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-    <relayable_retraction>
-      <target_type>{{$type}}</target_type>
-      <target_guid>{{$guid}}</target_guid>
-      <target_author_signature>{{$signature}}</target_author_signature>
-      <sender_handle>{{$handle}}</sender_handle>
-    </relayable_retraction>
-  </post>
-</XML>
diff --git a/view/smarty3/diaspora_relayable_retraction.tpl b/view/smarty3/diaspora_relayable_retraction.tpl
deleted file mode 100644
index 138cbdb317..0000000000
--- a/view/smarty3/diaspora_relayable_retraction.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-    <relayable_retraction>
-      <target_type>{{$target_type}}</target_type>
-      <target_guid>{{$guid}}</target_guid>
-      <parent_author_signature>{{$parentsig}}</parent_author_signature>
-      <target_author_signature>{{$authorsig}}</target_author_signature>
-      <sender_handle>{{$handle}}</sender_handle>
-    </relayable_retraction>
-  </post>
-</XML>
diff --git a/view/smarty3/diaspora_retract.tpl b/view/smarty3/diaspora_retract.tpl
deleted file mode 100644
index 103bfc9d5c..0000000000
--- a/view/smarty3/diaspora_retract.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-    <retraction>
-      <post_guid>{{$guid}}</post_guid>
-      <type>{{$type}}</type>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </retraction>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/smarty3/diaspora_share.tpl b/view/smarty3/diaspora_share.tpl
deleted file mode 100644
index 5ff04440d5..0000000000
--- a/view/smarty3/diaspora_share.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-    <request>
-      <sender_handle>{{$sender}}</sender_handle>
-      <recipient_handle>{{$recipient}}</recipient_handle>
-    </request>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/smarty3/diaspora_signed_retract.tpl b/view/smarty3/diaspora_signed_retract.tpl
deleted file mode 100644
index 58c5cc2376..0000000000
--- a/view/smarty3/diaspora_signed_retract.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<XML>
-  <post>
-    <signed_retraction>
-      <target_guid>{{$guid}}</target_guid>
-      <target_type>{{$type}}</target_type>
-      <sender_handle>{{$handle}}</sender_handle>
-      <target_author_signature>{{$signature}}</target_author_signature>
-    </signed_retraction>
-  </post>
-</XML>
diff --git a/view/smarty3/diaspora_vcard.tpl b/view/smarty3/diaspora_vcard.tpl
deleted file mode 100644
index 5ea6335a87..0000000000
--- a/view/smarty3/diaspora_vcard.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div style="display:none;">
-	<dl class='entity_nickname'>
-		<dt>Nickname</dt>
-		<dd>		
-			<a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.nickname}}</a>
-		</dd>
-	</dl>
-	<dl class='entity_fn'>
-		<dt>Full name</dt>
-		<dd>
-			<span class='fn'>{{$diaspora.fullname}}</span>
-		</dd>
-	</dl>
-
-	<dl class='entity_given_name'>
-		<dt>First name</dt>
-		<dd>
-		<span class='given_name'>{{$diaspora.firstname}}</span>
-		</dd>
-	</dl>
-	<dl class='entity_family_name'>
-		<dt>Family name</dt>
-		<dd>
-		<span class='family_name'>{{$diaspora.lastname}}</span>
-		</dd>
-	</dl>
-	<dl class="entity_url">
-		<dt>URL</dt>
-		<dd>
-			<a class="url" href="{{$diaspora.podloc}}/" id="pod_location" rel="me">{{$diaspora.podloc}}/</a>
-		</dd>
-	</dl>
-	<dl class="entity_photo">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo avatar" height="300" width="300" src="{{$diaspora.photo300}}">
-		</dd>
-	</dl>
-	<dl class="entity_photo_medium">
-		<dt>Photo</dt>
-		<dd> 
-			<img class="photo avatar" height="100" width="100" src="{{$diaspora.photo100}}">
-		</dd>
-	</dl>
-	<dl class="entity_photo_small">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
-		</dd>
-	</dl>
-	<dl class="entity_searchable">
-		<dt>Searchable</dt>
-		<dd>
-			<span class="searchable">{{$diaspora.searchable}}</span>
-		</dd>
-	</dl>
-</div>
diff --git a/view/smarty3/directory_header.tpl b/view/smarty3/directory_header.tpl
deleted file mode 100644
index ed1115de9d..0000000000
--- a/view/smarty3/directory_header.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$sitedir}}</h1>
-
-{{$globaldir}}
-{{$admin}}
-
-{{$finding}}
-
-<div id="directory-search-wrapper">
-<form id="directory-search-form" action="directory" method="get" >
-<span class="dirsearch-desc">{{$desc}}</span>
-<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
-<input type="submit" name="submit" id="directory-search-submit" value="{{$submit}}" class="button" />
-</form>
-</div>
-<div id="directory-search-end"></div>
-
diff --git a/view/smarty3/directory_item.tpl b/view/smarty3/directory_item.tpl
deleted file mode 100644
index ae52646b8f..0000000000
--- a/view/smarty3/directory_item.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	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}}" > 
-		<div class="contact-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>
-		</div>
-	</div>
-
-	<div class="contact-name" id="directory-name-{{$id}}">{{$name}}</div>
-	<div class="contact-details">{{$details}}</div>
-</div>
diff --git a/view/smarty3/display-head.tpl b/view/smarty3/display-head.tpl
deleted file mode 100644
index 7750b655e0..0000000000
--- a/view/smarty3/display-head.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script>
-$(document).ready(function() {
-	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-});
-</script>
-
diff --git a/view/smarty3/email_notify_html.tpl b/view/smarty3/email_notify_html.tpl
deleted file mode 100644
index 7143adbaf2..0000000000
--- a/view/smarty3/email_notify_html.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>{{$banner}}</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
-
-
-	<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
-
-
-	{{if $content_allowed}}
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
-		<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td></tr>
-	<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
-	<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
-	{{/if}}
-	<tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr>
-	<tr><td style="padding-bottom:11px;" colspan="2">{{$hitemlink}}</td></tr>
-	<tr><td></td><td>{{$thanks}}</td></tr>
-	<tr><td></td><td>{{$site_admin}}</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
-
diff --git a/view/smarty3/email_notify_text.tpl b/view/smarty3/email_notify_text.tpl
deleted file mode 100644
index 054a9e1b0e..0000000000
--- a/view/smarty3/email_notify_text.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-{{$preamble}}
-
-{{if $content_allowed}}
-{{$title}}
-
-{{$textversion}}
-
-{{/if}}
-{{$tsitelink}}
-{{$titemlink}}
-
-{{$thanks}}
-{{$site_admin}}
-
-
diff --git a/view/smarty3/end.tpl b/view/smarty3/end.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
diff --git a/view/smarty3/event.tpl b/view/smarty3/event.tpl
deleted file mode 100644
index 4788dcb380..0000000000
--- a/view/smarty3/event.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{foreach $events as $event}}
-	<div class="event">
-	
-	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
-	{{$event.html}}
-	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
-	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
-	</div>
-	<div class="clear"></div>
-{{/foreach}}
diff --git a/view/smarty3/event_end.tpl b/view/smarty3/event_end.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/event_end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 335a9480bf..0000000000
--- a/view/smarty3/event_form.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-
-<p>
-{{$desc}}
-</p>
-
-<form action="{{$post}}" method="post" >
-
-<input type="hidden" name="event_id" value="{{$eid}}" />
-<input type="hidden" name="cid" value="{{$cid}}" />
-<input type="hidden" name="uri" value="{{$uri}}" />
-
-<div id="event-start-text">{{$s_text}}</div>
-{{$s_dsel}} {{$s_tsel}}
-
-<div id="event-finish-text">{{$f_text}}</div>
-{{$f_dsel}} {{$f_tsel}}
-
-<div id="event-datetime-break"></div>
-
-<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
-
-<div id="event-nofinish-break"></div>
-
-<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div>
-
-<div id="event-adjust-break"></div>
-
-<div id="event-summary-text">{{$t_text}}</div>
-<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" />
-
-
-<div id="event-desc-text">{{$d_text}}</div>
-<textarea id="event-desc-textarea" name="desc">{{$d_orig}}</textarea>
-
-
-<div id="event-location-text">{{$l_text}}</div>
-<textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea>
-
-<input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
-<div id="event-share-break"></div>
-
-{{$acl}}
-
-<div class="clear"></div>
-<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
-</form>
-
-
diff --git a/view/smarty3/event_head.tpl b/view/smarty3/event_head.tpl
deleted file mode 100644
index 3d7091fb7a..0000000000
--- a/view/smarty3/event_head.tpl
+++ /dev/null
@@ -1,144 +0,0 @@
-{{*
- *	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>
-
-<script>
-	function showEvent(eventid) {
-		$.get(
-			'{{$baseurl}}/events/?id='+eventid,
-			function(data){
-				$.colorbox({html:data});
-			}
-		);			
-	}
-	
-	$(document).ready(function() {
-		$('#events-calendar').fullCalendar({
-			events: '{{$baseurl}}/events/json/',
-			header: {
-				left: 'prev,next today',
-				center: 'title',
-				right: 'month,agendaWeek,agendaDay'
-			},			
-			timeFormat: 'H(:mm)',
-			eventClick: function(calEvent, jsEvent, view) {
-				showEvent(calEvent.id);
-			},
-			
-			eventRender: function(event, element, view) {
-				//console.log(view.name);
-				if (event.item['author-name']==null) return;
-				switch(view.name){
-					case "month":
-					element.find(".fc-event-title").html(
-						"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
-							event.item['author-avatar'],
-							event.item['author-name'],
-							event.title
-					));
-					break;
-					case "agendaWeek":
-					element.find(".fc-event-title").html(
-						"<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(
-							event.item['author-avatar'],
-							event.item['author-name'],
-							event.item.desc,
-							event.item.location
-					));
-					break;
-					case "agendaDay":
-					element.find(".fc-event-title").html(
-						"<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(
-							event.item['author-avatar'],
-							event.item['author-name'],
-							event.item.desc,
-							event.item.location
-					));
-					break;
-				}
-			}
-			
-		})
-		
-		// center on date
-		var args=location.href.replace(baseurl,"").split("/");
-		if (args.length>=4) {
-			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
-		} 
-		
-		// show event popup
-		var hash = location.hash.split("-")
-		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
-		
-	});
-</script>
-
-
-<script language="javascript" type="text/javascript"
-          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "textareas",
-		plugins : "bbcode,paste",
-		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",
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		//force_p_newlines : false,
-		//force_br_newlines : true,
-		forced_root_block : 'div',
-		content_css: "{{$baseurl}}/view/custom_tinymce.css",
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-			});
-		}
-
-	});
-
-
-	$(document).ready(function() { 
-
-		$('#event-share-checkbox').change(function() {
-
-			if ($('#event-share-checkbox').is(':checked')) { 
-				$('#acl-wrapper').show();
-			}
-			else {
-				$('#acl-wrapper').hide();
-			}
-		}).trigger('change');
-
-
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-public').hide();
-			});
-			if(selstr == null) {
-				$('#jot-public').show();
-			}
-
-		}).trigger('change');
-
-	});
-
-</script>
-
diff --git a/view/smarty3/events-js.tpl b/view/smarty3/events-js.tpl
deleted file mode 100644
index 5fa046f5a1..0000000000
--- a/view/smarty3/events-js.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$tabs}}
-<h2>{{$title}}</h2>
-
-<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
-
-<div id="events-calendar"></div>
diff --git a/view/smarty3/events.tpl b/view/smarty3/events.tpl
deleted file mode 100644
index 054200ca2d..0000000000
--- a/view/smarty3/events.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$tabs}}
-<h2>{{$title}}</h2>
-
-<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
-
-<div id="event-calendar-wrapper">
-	<a href="{{$previus.0}}" class="prevcal {{$previus.2}}"><div id="event-calendar-prev" class="icon s22 prev" title="{{$previus.1}}"></div></a>
-	{{$calendar}}
-	<a href="{{$next.0}}" class="nextcal {{$next.2}}"><div id="event-calendar-prev" class="icon s22 next" title="{{$next.1}}"></div></a>
-</div>
-<div class="event-calendar-end"></div>
-
-
-{{foreach $events as $event}}
-	<div class="event">
-	{{if $event.is_first}}<hr /><a name="link-{{$event.j}}" ><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
-	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
-	{{$event.html}}
-	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
-	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
-	</div>
-	<div class="clear"></div>
-
-{{/foreach}}
diff --git a/view/smarty3/events_reminder.tpl b/view/smarty3/events_reminder.tpl
deleted file mode 100644
index 3448ea45cb..0000000000
--- a/view/smarty3/events_reminder.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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>
-<div id="event-title-end"></div>
-{{foreach $events as $event}}
-<div class="event-list" id="event-{{$event.id}}"> <a href="events/{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
-{{/foreach}}
-</div>
-{{/if}}
-
diff --git a/view/smarty3/failed_updates.tpl b/view/smarty3/failed_updates.tpl
deleted file mode 100644
index 8161ff2ef4..0000000000
--- a/view/smarty3/failed_updates.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h2>{{$banner}}</h2>
-
-<div id="failed_updates_desc">{{$desc}}</div>
-
-{{if $failed}}
-{{foreach $failed as $f}}
-
-<h4>{{$f}}</h4>
-<ul>
-<li><a href="{{$base}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li>
-<li><a href="{{$base}}/admin/dbsync/{{$f}}">{{$apply}}</a></li>
-</ul>
-
-<hr />
-{{/foreach}}
-{{/if}}
-
diff --git a/view/smarty3/fake_feed.tpl b/view/smarty3/fake_feed.tpl
deleted file mode 100644
index fd875de716..0000000000
--- a/view/smarty3/fake_feed.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	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" >
-
-  <id>fake feed</id>
-  <title>fake title</title>
-
-  <updated>1970-01-01T00:00:00Z</updated>
-
-  <author>
-    <name>Fake Name</name>
-    <uri>http://example.com</uri>
-  </author>
-
diff --git a/view/smarty3/field.tpl b/view/smarty3/field.tpl
deleted file mode 100644
index 1bf36d84ef..0000000000
--- a/view/smarty3/field.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
- {{if $field.0==select}}
- {{include file="field_select.tpl"}}
- {{/if}}
diff --git a/view/smarty3/field_checkbox.tpl b/view/smarty3/field_checkbox.tpl
deleted file mode 100644
index 694bce6b57..0000000000
--- a/view/smarty3/field_checkbox.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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>
-		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/smarty3/field_combobox.tpl b/view/smarty3/field_combobox.tpl
deleted file mode 100644
index d3cc75635e..0000000000
--- a/view/smarty3/field_combobox.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	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>
-		{{* html5 don't work on Chrome, Safari and IE9
-		<input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" >
-		<datalist id="data_{{$field.0}}" >
-		   {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}}
-		</datalist> *}}
-		
-		<input id="id_{{$field.0}}" type="text" value="{{$field.2}}">
-		<select id="select_{{$field.0}}" onChange="$('#id_{{$field.0}}').val($(this).val())">
-			<option value="">{{$field.5}}</option>
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
-		</select>
-		
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
-
diff --git a/view/smarty3/field_custom.tpl b/view/smarty3/field_custom.tpl
deleted file mode 100644
index c2d73275c3..0000000000
--- a/view/smarty3/field_custom.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field custom'>
-		<label for='{{$field.0}}'>{{$field.1}}</label>
-		{{$field.2}}
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/smarty3/field_input.tpl b/view/smarty3/field_input.tpl
deleted file mode 100644
index 3c400b5ad2..0000000000
--- a/view/smarty3/field_input.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field input'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/smarty3/field_intcheckbox.tpl b/view/smarty3/field_intcheckbox.tpl
deleted file mode 100644
index 54967feab0..0000000000
--- a/view/smarty3/field_intcheckbox.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field checkbox'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="true"{{/if}}>
-		<span class='field_help'>{{$field.4}}</span>
-	</div>
diff --git a/view/smarty3/field_openid.tpl b/view/smarty3/field_openid.tpl
deleted file mode 100644
index b00ddabcd8..0000000000
--- a/view/smarty3/field_openid.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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>
-		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/smarty3/field_password.tpl b/view/smarty3/field_password.tpl
deleted file mode 100644
index 5889d2e9c0..0000000000
--- a/view/smarty3/field_password.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field password'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/smarty3/field_radio.tpl b/view/smarty3/field_radio.tpl
deleted file mode 100644
index 1d7b56ec6a..0000000000
--- a/view/smarty3/field_radio.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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>
-		<input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/smarty3/field_richtext.tpl b/view/smarty3/field_richtext.tpl
deleted file mode 100644
index 38992f0f83..0000000000
--- a/view/smarty3/field_richtext.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field richtext'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext">{{$field.2}}</textarea>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/smarty3/field_select.tpl b/view/smarty3/field_select.tpl
deleted file mode 100644
index 2a4117a70c..0000000000
--- a/view/smarty3/field_select.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select name='{{$field.0}}' id='id_{{$field.0}}'>
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/smarty3/field_select_raw.tpl b/view/smarty3/field_select_raw.tpl
deleted file mode 100644
index 50e34985f6..0000000000
--- a/view/smarty3/field_select_raw.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select name='{{$field.0}}' id='id_{{$field.0}}'>
-			{{$field.4}}
-		</select>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/smarty3/field_textarea.tpl b/view/smarty3/field_textarea.tpl
deleted file mode 100644
index 5d71999d4a..0000000000
--- a/view/smarty3/field_textarea.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field textarea'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<textarea name='{{$field.0}}' id='id_{{$field.0}}'>{{$field.2}}</textarea>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/smarty3/field_themeselect.tpl b/view/smarty3/field_themeselect.tpl
deleted file mode 100644
index cde744594b..0000000000
--- a/view/smarty3/field_themeselect.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	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>
-		<select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5}}onchange="previewTheme(this);"{{/if}} >
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<span class='field_help'>{{$field.3}}</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/smarty3/field_yesno.tpl b/view/smarty3/field_yesno.tpl
deleted file mode 100644
index e982c2f05d..0000000000
--- a/view/smarty3/field_yesno.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	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">
-			<input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-			<a href="#" class='off'>
-				{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
-			</a>
-			<a href="#" class='on'>
-				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
-			</a>
-		</div>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/smarty3/fileas_widget.tpl b/view/smarty3/fileas_widget.tpl
deleted file mode 100644
index f03f169a2f..0000000000
--- a/view/smarty3/fileas_widget.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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>
-	
-	<ul class="fileas-ul">
-		<li class="tool"><a href="{{$base}}" class="fileas-link fileas-all{{if $sel_all}} fileas-selected{{/if}}">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-			<li class="tool"><a href="{{$base}}?f=&file={{$term.name}}" class="fileas-link{{if $term.selected}} fileas-selected{{/if}}">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/smarty3/filebrowser.tpl b/view/smarty3/filebrowser.tpl
deleted file mode 100644
index b408ca6874..0000000000
--- a/view/smarty3/filebrowser.tpl
+++ /dev/null
@@ -1,89 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<!DOCTYPE html>
-<html>
-	<head>
-	<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
-	<style>
-		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
-		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
-		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
-		.filebrowser ul{ list-style-type: none; padding:0px; }
-		.filebrowser.folders a { display: block; padding: 0.3em }
-		.filebrowser.folders a:hover { background-color: #f0f0ee; }
-		.filebrowser.files.image { overflow: auto; height: auto; }
-		.filebrowser.files.image img { height:50px;}
-		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
-		.filebrowser.files.image span { display: none;}
-		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
-		.filebrowser.files a { display: block;  padding: 0.3em}
-		.filebrowser.files a:hover { background-color: #f0f0ee; }
-		.filebrowser a { text-decoration: none; }
-	</style>
-	<script>
-		var FileBrowserDialogue = {
-			init : function () {
-				// Here goes your code for setting your custom things onLoad.
-			},
-			mySubmit : function (URL) {
-				//var URL = document.my_form.my_field.value;
-				var win = tinyMCEPopup.getWindowArg("window");
-
-				// insert information now
-				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
-
-				// are we an image browser
-				if (typeof(win.ImageDialog) != "undefined") {
-					// we are, so update image dimensions...
-					if (win.ImageDialog.getImageData)
-						win.ImageDialog.getImageData();
-
-					// ... and preview if necessary
-					if (win.ImageDialog.showPreviewImage)
-						win.ImageDialog.showPreviewImage(URL);
-				}
-
-				// close popup window
-				tinyMCEPopup.close();
-			}
-		}
-
-		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
-	</script>
-	</head>
-	<body>
-	
-	<div class="tabs">
-		<ul >
-			<li class="current"><span>FileBrowser</span></li>
-		</ul>
-	</div>
-	<div class="panel_wrapper">
-
-		<div id="general_panel" class="panel current">
-			<div class="filebrowser path">
-				{{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
-			</div>
-			<div class="filebrowser folders">
-				<ul>
-					{{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
-				</ul>
-			</div>
-			<div class="filebrowser files {{$type}}">
-				<ul>
-				{{foreach $files as $f}}
-					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
-				{{/foreach}}
-				</ul>
-			</div>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
-	</div>	
-	</body>
-	
-</html>
diff --git a/view/smarty3/filer_dialog.tpl b/view/smarty3/filer_dialog.tpl
deleted file mode 100644
index f17a067665..0000000000
--- a/view/smarty3/filer_dialog.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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}}" />
-</div>
diff --git a/view/smarty3/follow.tpl b/view/smarty3/follow.tpl
deleted file mode 100644
index 7ea961780f..0000000000
--- a/view/smarty3/follow.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	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>
-	<form action="follow" method="post" >
-		<input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
-	</form>
-</div>
-
diff --git a/view/smarty3/follow_slap.tpl b/view/smarty3/follow_slap.tpl
deleted file mode 100644
index 554853f196..0000000000
--- a/view/smarty3/follow_slap.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	<entry>
-		<author>
-			<name>{{$name}}</name>
-			<uri>{{$profile_page}}</uri>
-			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
-			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
-		</author>
-
-		<id>{{$item_id}}</id>
-		<title>{{$title}}</title>
-		<published>{{$published}}</published>
-		<content type="{{$type}}" >{{$content}}</content>
-
-		<as:actor>
-		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
-		<id>{{$profile_page}}</id>
-		<title></title>
- 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="{{$photo}}"/>
-		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}"/>
-		<poco:preferredUsername>{{$nick}}</poco:preferredUsername>
-		<poco:displayName>{{$name}}</poco:displayName>
-		</as:actor>
- 		<as:verb>{{$verb}}</as:verb>
-		{{$ostat_follow}}
-	</entry>
diff --git a/view/smarty3/generic_links_widget.tpl b/view/smarty3/generic_links_widget.tpl
deleted file mode 100644
index c12273c7be..0000000000
--- a/view/smarty3/generic_links_widget.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	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}}
-	
-	<ul>
-		{{foreach $items as $item}}
-			<li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/smarty3/group_drop.tpl b/view/smarty3/group_drop.tpl
deleted file mode 100644
index 84d380e304..0000000000
--- a/view/smarty3/group_drop.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	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();" 
-		id="group-delete-icon-{{$id}}" 
-		class="icon drophide group-delete-icon" 
-		onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);" ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/smarty3/group_edit.tpl b/view/smarty3/group_edit.tpl
deleted file mode 100644
index b7b14eba37..0000000000
--- a/view/smarty3/group_edit.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h2>{{$title}}</h2>
-
-
-<div id="group-edit-wrapper" >
-	<form action="group/{{$gid}}" id="group-edit-form" method="post" >
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		
-		{{include file="field_input.tpl" field=$gname}}
-		{{if $drop}}{{$drop}}{{/if}}
-		<div id="group-edit-submit-wrapper" >
-			<input type="submit" name="submit" value="{{$submit}}" >
-		</div>
-		<div id="group-edit-select-end" ></div>
-	</form>
-</div>
-
-
-{{if $groupeditor}}
-	<div id="group-update-wrapper">
-		{{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
deleted file mode 100644
index f16bb5159f..0000000000
--- a/view/smarty3/group_selection.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	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" >
-{{foreach $groups as $group}}
-<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option>
-{{/foreach}}
-</select>
-</div>
diff --git a/view/smarty3/group_side.tpl b/view/smarty3/group_side.tpl
deleted file mode 100644
index b6532fb6d4..0000000000
--- a/view/smarty3/group_side.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="widget" id="group-sidebar">
-<h3>{{$title}}</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{foreach $groups as $group}}
-			<li class="sidebar-group-li">
-				{{if $group.cid}}
-					<input type="checkbox" 
-						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
-						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
-						{{if $group.ismember}}checked="checked"{{/if}}
-					/>
-				{{/if}}			
-				{{if $group.edit}}
-					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"></span></a>
-				{{/if}}
-				<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
-			</li>
-		{{/foreach}}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">{{$createtext}}</a>
-  </div>
-  {{if $ungrouped}}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">{{$ungrouped}}</a>
-  </div>
-  {{/if}}
-</div>
-
-
diff --git a/view/smarty3/groupeditor.tpl b/view/smarty3/groupeditor.tpl
deleted file mode 100644
index 4fad30d5a3..0000000000
--- a/view/smarty3/groupeditor.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	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">
-{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
-</div>
-<div id="group-members-end"></div>
-<hr id="group-separator" />
-</div>
-
-<div id="contacts">
-<h3>{{$groupeditor.label_contacts}}</h3>
-<div id="group-all-contacts" class="contact_list">
-{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
-</div>
-<div id="group-all-contacts-end"></div>
-</div>
diff --git a/view/smarty3/head.tpl b/view/smarty3/head.tpl
deleted file mode 100644
index 1b01b71a05..0000000000
--- a/view/smarty3/head.tpl
+++ /dev/null
@@ -1,117 +0,0 @@
-{{*
- *	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}}" />
-{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox.css" type="text/css" media="screen" />-->*}}
-<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
-
-<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
-
-<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
-
-<link rel="apple-touch-icon" href="{{$baseurl}}/images/friendica-128.png"/>
-<meta name="apple-mobile-web-app-capable" content="yes" /> 
-
-
-<link rel="search"
-         href="{{$baseurl}}/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
-<!--[if IE]>
-<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/fk.autocomplete.js" ></script>
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox.pack.js"></script>-->*}}
-<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/acl.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/main.js" ></script>
-<script>
-
-	var updateInterval = {{$update_interval}};
-	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
-
-	function confirmDelete() { return confirm("{{$delitem}}"); }
-	function commentOpen(obj,id) {
-		if(obj.value == '{{$comment}}') {
-			obj.value = '';
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			$("#mod-cmnt-wrap-" + id).show();
-			openMenu("comment-edit-submit-wrapper-" + id);
-			return true;
-		}
-		return false;
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = '{{$comment}}';
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
-			$("#mod-cmnt-wrap-" + id).hide();
-			closeMenu("comment-edit-submit-wrapper-" + id);
-			return true;
-		}
-		return false;
-	}
-
-
-	function commentInsert(obj,id) {
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == '{{$comment}}') {
-			tmpStr = '';
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-		var ins = $(obj).html();
-		ins = ins.replace('&lt;','<');
-		ins = ins.replace('&gt;','>');
-		ins = ins.replace('&amp;','&');
-		ins = ins.replace('&quot;','"');
-		$("#comment-edit-text-" + id).val(tmpStr + ins);
-	}
-
-	function qCommentInsert(obj,id) {
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == '{{$comment}}') {
-			tmpStr = '';
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-		var ins = $(obj).val();
-		ins = ins.replace('&lt;','<');
-		ins = ins.replace('&gt;','>');
-		ins = ins.replace('&amp;','&');
-		ins = ins.replace('&quot;','"');
-		$("#comment-edit-text-" + id).val(tmpStr + ins);
-		$(obj).val('');
-	}
-
-	window.showMore = "{{$showmore}}";
-	window.showFewer = "{{$showfewer}}";
-
-	function showHideCommentBox(id) {
-		if( $('#comment-edit-form-' + id).is(':visible')) {
-			$('#comment-edit-form-' + id).hide();
-		}
-		else {
-			$('#comment-edit-form-' + id).show();
-		}
-	}
-
-
-</script>
-
-
diff --git a/view/smarty3/hide_comments.tpl b/view/smarty3/hide_comments.tpl
deleted file mode 100644
index 50a3541229..0000000000
--- a/view/smarty3/hide_comments.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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>
-<div id="collapsed-comments-{{$id}}" class="collapsed-comments" style="display: {{$display}};">
diff --git a/view/smarty3/install.tpl b/view/smarty3/install.tpl
deleted file mode 100644
index cfb90e61fb..0000000000
--- a/view/smarty3/install.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-{{$text}}
diff --git a/view/smarty3/install_checks.tpl b/view/smarty3/install_checks.tpl
deleted file mode 100644
index 44852b4101..0000000000
--- a/view/smarty3/install_checks.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-{{*
- *	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">
-<table>
-{{foreach $checks as $check}}
-	<tr><td>{{$check.title}} </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if $check.required}}off{{else}}yellow{{/if}}{{/if}}"></td><td>{{if $check.required}}(required){{/if}}</td></tr>
-	{{if $check.help}}
-	<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
-	{{/if}}
-{{/foreach}}
-</table>
-
-{{if $phpath}}
-	<input type="hidden" name="phpath" value="{{$phpath}}">
-{{/if}}
-
-{{if $passed}}
-	<input type="hidden" name="pass" value="2">
-	<input type="submit" value="{{$next}}">
-{{else}}
-	<input type="hidden" name="pass" value="1">
-	<input type="submit" value="{{$reload}}">
-{{/if}}
-</form>
diff --git a/view/smarty3/install_db.tpl b/view/smarty3/install_db.tpl
deleted file mode 100644
index 944666c6a5..0000000000
--- a/view/smarty3/install_db.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-<p>
-{{$info_01}}<br>
-{{$info_02}}<br>
-{{$info_03}}
-</p>
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-<form id="install-form" action="{{$baseurl}}/install" method="post">
-
-<input type="hidden" name="phpath" value="{{$phpath}}" />
-<input type="hidden" name="pass" value="3" />
-
-{{include file="field_input.tpl" field=$dbhost}}
-{{include file="field_input.tpl" field=$dbuser}}
-{{include file="field_password.tpl" field=$dbpass}}
-{{include file="field_input.tpl" field=$dbdata}}
-
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
-
-</form>
-
diff --git a/view/smarty3/install_settings.tpl b/view/smarty3/install_settings.tpl
deleted file mode 100644
index 2e97d06969..0000000000
--- a/view/smarty3/install_settings.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-<form id="install-form" action="{{$baseurl}}/install" method="post">
-
-<input type="hidden" name="phpath" value="{{$phpath}}" />
-<input type="hidden" name="dbhost" value="{{$dbhost}}" />
-<input type="hidden" name="dbuser" value="{{$dbuser}}" />
-<input type="hidden" name="dbpass" value="{{$dbpass}}" />
-<input type="hidden" name="dbdata" value="{{$dbdata}}" />
-<input type="hidden" name="pass" value="4" />
-
-{{include file="field_input.tpl" field=$adminmail}}
-{{$timezone}}
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
-
-</form>
-
diff --git a/view/smarty3/intros.tpl b/view/smarty3/intros.tpl
deleted file mode 100644
index bafdb07a04..0000000000
--- a/view/smarty3/intros.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div class="intro-wrapper" id="intro-{{$contact_id}}" >
-
-<p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
-<div class="intro-fullname" id="intro-fullname-{{$contact_id}}" >{{$fullname}}</div>
-<a class="intro-url-link" id="intro-url-link-{{$contact_id}}" href="{{$url}}" ><img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" /></a>
-<div class="intro-knowyou">{{$knowyou}}</div>
-<div class="intro-note" id="intro-note-{{$contact_id}}">{{$note}}</div>
-<div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
-<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
-<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
-</form>
-<div class="intro-form-end"></div>
-
-<form class="intro-approve-form" action="dfrn_confirm" method="post">
-{{include file="field_checkbox.tpl" field=$hidden}}
-{{include file="field_checkbox.tpl" field=$activity}}
-<input type="hidden" name="dfrn_id" value="{{$dfrn_id}}" >
-<input type="hidden" name="intro_id" value="{{$intro_id}}" >
-<input type="hidden" name="contact_id" value="{{$contact_id}}" >
-
-{{$dfrn_text}}
-
-<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
-</form>
-</div>
-<div class="intro-end"></div>
diff --git a/view/smarty3/invite.tpl b/view/smarty3/invite.tpl
deleted file mode 100644
index e699f1f0ea..0000000000
--- a/view/smarty3/invite.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<form action="invite" method="post" id="invite-form" >
-
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<div id="invite-wrapper">
-
-<h3>{{$invite}}</h3>
-
-<div id="invite-recipient-text">
-{{$addr_text}}
-</div>
-
-<div id="invite-recipient-textarea">
-<textarea id="invite-recipients" name="recipients" rows="8" cols="32" ></textarea>
-</div>
-
-<div id="invite-message-text">
-{{$msg_text}}
-</div>
-
-<div id="invite-message-textarea">
-<textarea id="invite-message" name="message" rows="10" cols="72" >{{$default_message}}</textarea>
-</div>
-
-<div id="invite-submit-wrapper">
-<input type="submit" name="submit" value="{{$submit}}" />
-</div>
-
-</div>
-</form>
diff --git a/view/smarty3/jot-end.tpl b/view/smarty3/jot-end.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/jot-end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index ce7dcf2a4d..0000000000
--- a/view/smarty3/jot-header.tpl
+++ /dev/null
@@ -1,327 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script language="javascript" type="text/javascript">
-
-var editor=false;
-var textlen = 0;
-var plaintext = '{{$editselect}}';
-
-function initEditor(cb){
-	if (editor==false){
-		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").hide();
-			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-			editor = true;
-			$("a#jot-perms-icon").colorbox({
-				'inline' : true,
-				'transition' : 'elastic'
-			});
-			$(".jothidden").show();
-			if (typeof cb!="undefined") cb();
-			return;
-		}	
-		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: {{$editselect}},
-			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,autoresize, 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",
-			gecko_spellcheck : true,
-			paste_text_sticky : true,
-			entity_encoding : "raw",
-			add_unload_trigger : false,
-			remove_linebreaks : false,
-			//force_p_newlines : false,
-			//force_br_newlines : true,
-			forced_root_block : 'div',
-			convert_urls: false,
-			content_css: "{{$baseurl}}/view/custom_tinymce.css",
-			theme_advanced_path : false,
-			file_browser_callback : "fcFileBrowser",
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-
-					textlen = txt.length;
-					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$('#profile-jot-desc').html(ispublic);
-					}
-					else {
-						$('#profile-jot-desc').html('&nbsp;');
-					}	 
-
-				 //Character count
-
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
-					$('#character-counter').text(textlen);
-				});
-
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
-
-			}
-		});
-		editor = true;
-		// setup acl popup
-		$("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-		}); 
-	} else {
-		if (typeof cb!="undefined") cb();
-	}
-}
-
-function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
-	initEditor();
-}
-
-</script>
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
-<script>
-	var ispublic = '{{$ispublic}}';
-
-	$(document).ready(function() {
-		
-		/* enable tinymce on focus and click */
-		$("#profile-jot-text").focus(enableOnUser);
-		$("#profile-jot-text").click(enableOnUser);
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-
-	});
-
-	function deleteCheckedItems() {
-		if(confirm('{{$delitems}}')) {
-			var checkedstr = '';
-
-			$("#item-delete-selected").hide();
-			$('#item-delete-selected-rotator').show();
-
-			$('.item-select').each( function() {
-				if($(this).is(':checked')) {
-					if(checkedstr.length != 0) {
-						checkedstr = checkedstr + ',' + $(this).val();
-					}
-					else {
-						checkedstr = $(this).val();
-					}
-				}	
-			});
-			$.post('item', { dropitems: checkedstr }, function(data) {
-				window.location.reload();
-			});
-		}
-	}
-
-	function jotGetLink() {
-		reply = prompt("{{$linkurl}}");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("{{$vidurl}}");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("{{$audurl}}");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("{{$whereareu}}", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		if ($('#jot-popup').length != 0) $('#jot-popup').show();
-
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-			if (!editor) $("#profile-jot-text").val("");
-			initEditor(function(){
-				addeditortext(data);
-				$('#like-rotator-' + id).hide();
-				$(window).scrollTop(0);
-			});
-
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("{{$term}}");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.colorbox({html:data});
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply, NavUpdate);
-//					if(timer) clearTimeout(timer);
-//					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.colorbox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-	function addeditortext(data) {
-		if(plaintext == 'none') {
-			var currentText = $("#profile-jot-text").val();
-			$("#profile-jot-text").val(currentText + data);
-		}
-		else
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-	}	
-
-	{{$geotag}}
-
-</script>
-
diff --git a/view/smarty3/jot.tpl b/view/smarty3/jot.tpl
deleted file mode 100644
index bd9902159c..0000000000
--- a/view/smarty3/jot.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="{{$action}}" method="post" >
-		<input type="hidden" name="type" value="{{$ptyp}}" />
-		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-		<input type="hidden" name="return" value="{{$return_path}}" />
-		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
-		{{if $placeholdercategory}}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
-		{{/if}}
-		<div id="jot-text-wrap">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
-
-	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	{{$jotplugins}}
-	</div>
-
-	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			{{$acl}}
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-			<div id="profile-jot-email-end"></div>
-			{{$jotnets}}
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/smarty3/jot_geotag.tpl b/view/smarty3/jot_geotag.tpl
deleted file mode 100644
index 1ed2367aa5..0000000000
--- a/view/smarty3/jot_geotag.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
-			$('#profile-nolocation-wrapper').show();
-		});
-	}
-
diff --git a/view/smarty3/lang_selector.tpl b/view/smarty3/lang_selector.tpl
deleted file mode 100644
index 0b4224d7bd..0000000000
--- a/view/smarty3/lang_selector.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{foreach $langs.0 as $v=>$l}}
-				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
-			{{/foreach}}
-		</select>
-	</form>
-</div>
diff --git a/view/smarty3/like_noshare.tpl b/view/smarty3/like_noshare.tpl
deleted file mode 100644
index 62a16227db..0000000000
--- a/view/smarty3/like_noshare.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	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>
-	{{if $nolike}}
-	<a href="#" class="icon dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
-	{{/if}}
-	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-</div>
diff --git a/view/smarty3/login.tpl b/view/smarty3/login.tpl
deleted file mode 100644
index 5d9b5f4f99..0000000000
--- a/view/smarty3/login.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-{{*
- *	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" />
-
-	<div id="login_standard">
-	{{include file="field_input.tpl" field=$lname}}
-	{{include file="field_password.tpl" field=$lpassword}}
-	</div>
-	
-	{{if $openid}}
-			<div id="login_openid">
-			{{include file="field_openid.tpl" field=$lopenid}}
-			</div>
-	{{/if}}
-
-	{{include file="field_checkbox.tpl" field=$lremember}}
-
-	<div id="login-extra-links">
-		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
-        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
-	</div>
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
-	</div>
-	
-	{{foreach $hiddens as $k=>$v}}
-		<input type="hidden" name="{{$k}}" value="{{$v}}" />
-	{{/foreach}}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
diff --git a/view/smarty3/login_head.tpl b/view/smarty3/login_head.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/login_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
diff --git a/view/smarty3/logout.tpl b/view/smarty3/logout.tpl
deleted file mode 100644
index 582d77ed63..0000000000
--- a/view/smarty3/logout.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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" />
-<input type="submit" name="submit" id="logout-button" value="{{$logout}}" />
-</div>
-</form>
diff --git a/view/smarty3/lostpass.tpl b/view/smarty3/lostpass.tpl
deleted file mode 100644
index 0e437ca484..0000000000
--- a/view/smarty3/lostpass.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-
-<p id="lostpass-desc">
-{{$desc}}
-</p>
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">{{$name}}</label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-
diff --git a/view/smarty3/magicsig.tpl b/view/smarty3/magicsig.tpl
deleted file mode 100644
index af8dbb5bc8..0000000000
--- a/view/smarty3/magicsig.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	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">
-{{$data}}
-</me:data>
-<me:encoding>{{$encoding}}</me:encoding>
-<me:alg>{{$algorithm}}</me:alg>
-<me:sig key_id="{{$keyhash}}">{{$signature}}</me:sig>
-</me:env>
diff --git a/view/smarty3/mail_conv.tpl b/view/smarty3/mail_conv.tpl
deleted file mode 100644
index 5083fdb258..0000000000
--- a/view/smarty3/mail_conv.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
-		<div class="mail-conv-date">{{$mail.date}}</div>
-		<div class="mail-conv-subject">{{$mail.subject}}</div>
-		<div class="mail-conv-body">{{$mail.body}}</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
diff --git a/view/smarty3/mail_display.tpl b/view/smarty3/mail_display.tpl
deleted file mode 100644
index 23d05bdeb8..0000000000
--- a/view/smarty3/mail_display.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-{{foreach $mails as $mail}}
-	{{include file="mail_conv.tpl"}}
-{{/foreach}}
-
-{{if $canreply}}
-{{include file="prv_message.tpl"}}
-{{else}}
-{{$unknown_text}}
-{{/if}}
diff --git a/view/smarty3/mail_head.tpl b/view/smarty3/mail_head.tpl
deleted file mode 100644
index f7a39fa8b1..0000000000
--- a/view/smarty3/mail_head.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 9dbfb6a144..0000000000
--- a/view/smarty3/mail_list.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >{{$from_name}}</div>
-		<div class="mail-list-date">{{$date}}</div>
-		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
-		<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
-	</div>
-</div>
-</div>
-<div class="mail-list-delete-end"></div>
-
-<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/smarty3/maintenance.tpl b/view/smarty3/maintenance.tpl
deleted file mode 100644
index f0ea0849c2..0000000000
--- a/view/smarty3/maintenance.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="maintenance-message">{{$sysdown}}</div>
diff --git a/view/smarty3/manage.tpl b/view/smarty3/manage.tpl
deleted file mode 100644
index 857402c04d..0000000000
--- a/view/smarty3/manage.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-<div id="identity-manage-desc">{{$desc}}</div>
-<div id="identity-manage-choose">{{$choose}}</div>
-<div id="identity-selector-wrapper">
-	<form action="manage" method="post" >
-	<select name="identity" size="4" onchange="this.form.submit();" >
-
-	{{foreach $identities as $id}}
-		<option {{$id.selected}} value="{{$id.uid}}">{{$id.username}} ({{$id.nickname}})</option>
-	{{/foreach}}
-
-	</select>
-	<div id="identity-select-break"></div>
-
-	{{*<!--<input id="identity-submit" type="submit" name="submit" value="{{$submit}}" />-->*}}
-</div></form>
-
diff --git a/view/smarty3/match.tpl b/view/smarty3/match.tpl
deleted file mode 100644
index 14b7254669..0000000000
--- a/view/smarty3/match.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	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}}">
-			<img src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{if $connlnk}}
-	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-	{{/if}}
-
-</div>
diff --git a/view/smarty3/message-end.tpl b/view/smarty3/message-end.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/message-end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index ffc6affa4d..0000000000
--- a/view/smarty3/message-head.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	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() { 
-	var a; 
-	a = $("#recip").autocomplete({ 
-		serviceUrl: '{{$base}}/acl',
-		minChars: 2,
-		width: 350,
-		onSelect: function(value,data) {
-			$("#recip-complete").val(data);
-		}			
-	});
-
-}); 
-
-</script>
-
diff --git a/view/smarty3/message_side.tpl b/view/smarty3/message_side.tpl
deleted file mode 100644
index 7da22ee3e3..0000000000
--- a/view/smarty3/message_side.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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>
-	
-	<ul class="message-ul">
-		{{foreach $tabs as $t}}
-			<li class="tool"><a href="{{$t.url}}" class="message-link{{if $t.sel}}message-selected{{/if}}">{{$t.label}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/smarty3/moderated_comment.tpl b/view/smarty3/moderated_comment.tpl
deleted file mode 100644
index 1e4e9b6d4e..0000000000
--- a/view/smarty3/moderated_comment.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{{*
- *	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}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
-					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
-					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
-					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
-					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
-					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
-					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
-				</div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/smarty3/mood_content.tpl b/view/smarty3/mood_content.tpl
deleted file mode 100644
index 461303318b..0000000000
--- a/view/smarty3/mood_content.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-
-<div id="mood-desc">{{$desc}}</div>
-
-<form action="mood" method="get">
-<br />
-<br />
-
-<input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" />
-
-<select name="verb" id="mood-verb-select" >
-{{foreach $verbs as $v}}
-<option value="{{$v.0}}">{{$v.1}}</option>
-{{/foreach}}
-</select>
-<br />
-<br />
-<input type="submit" name="submit" value="{{$submit}}" />
-</form>
-
diff --git a/view/smarty3/msg-end.tpl b/view/smarty3/msg-end.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/msg-end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 0f047f5cdd..0000000000
--- a/view/smarty3/msg-header.tpl
+++ /dev/null
@@ -1,102 +0,0 @@
-{{*
- *	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">
-
-var plaintext = '{{$editselect}}';
-
-if(plaintext != 'none') {
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: /(profile-jot-text|prvmail-text)/,
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		//force_p_newlines : false,
-		//force_br_newlines : true,
-		forced_root_block : 'div',
-		convert_urls: false,
-		content_css: "{{$baseurl}}/view/custom_tinymce.css",
-		     //Character count
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				var editorId = ed.editorId;
-				var textarea = $('#'+editorId);
-				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-					textarea.attr('tabindex', null);
-				}
-			});
-		}
-	});
-}
-else
-	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-
-
-</script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
-<script>
-	$(document).ready(function() {
-		var uploader = new window.AjaxUpload(
-			'prvmail-upload',
-			{ action: 'wall_upload/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-	});
-
-	function jotGetLink() {
-		reply = prompt("{{$linkurl}}");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-</script>
-
diff --git a/view/smarty3/nav.tpl b/view/smarty3/nav.tpl
deleted file mode 100644
index 6119a1a93d..0000000000
--- a/view/smarty3/nav.tpl
+++ /dev/null
@@ -1,73 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<nav>
-	{{$langselector}}
-
-	<div id="site-location">{{$sitelocation}}</div>
-
-	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
-	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
-
-	<span id="nav-link-wrapper" >
-
-	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
-		
-	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
-		
-	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
-
-	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
-	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
-
-	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
-
-	{{if $nav.network}}
-	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.home}}
-	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.community}}
-	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
-	{{/if}}
-	{{if $nav.introductions}}
-	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.messages}}
-	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{/if}}
-
-
-
-	{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
-
-
-		{{if $nav.notifications}}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-		{{/if}}		
-
-	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
-	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
-
-	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
-	</span>
-	<span id="nav-end"></span>
-	<span id="banner">{{$banner}}</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/smarty3/navigation.tpl b/view/smarty3/navigation.tpl
deleted file mode 100644
index 28229c5699..0000000000
--- a/view/smarty3/navigation.tpl
+++ /dev/null
@@ -1,108 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{*
- # LOGIN/REGISTER
- *}}
-<center>
-{{* Use nested if's since the Friendica template engine doesn't support AND or OR in if statements *}}
-{{if $nav.login}}
-<div id="navigation-login-wrapper" >
-{{else}}
-{{if $nav.register}}
-<div id="navigation-login-wrapper" >
-{{/if}}
-{{/if}}
-{{if $nav.login}}<a id="navigation-login-link" class="navigation-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><br/> {{/if}}
-{{if $nav.register}}<a id="navigation-register-link" class="navigation-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><br/>{{/if}}
-{{if $nav.login}}
-</div>
-{{else}}
-{{if $nav.register}}
-</div>
-{{/if}}
-{{/if}}
-
-{{*
- # NETWORK/HOME
- *}}
-{{if $nav.network}}
-<div id="navigation-network-wrapper" >
-{{else}}
-{{if $nav.home}}
-<div id="navigation-network-wrapper" >
-{{else}}
-{{if $nav.community}}
-<div id="navigation-network-wrapper" >
-{{/if}}
-{{/if}}
-{{/if}}
-{{if $nav.network}}
-<a id="navigation-network-link" class="navigation-link navigation-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a><br/>
-<a class="navigation-link navigation-commlink" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">{{$nav.net_reset.1}}</a><br/>
-{{/if}}
-{{if $nav.home}}
-<a id="navigation-home-link" class="navigation-link navigation-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a><br/>
-{{/if}}
-{{if $nav.community}}
-<a id="navigation-community-link" class="navigation-link navigation-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a><br/>
-{{/if}}
-{{if $nav.network}}
-</div>
-{{else}}
-{{if $nav.home}}
-</div>
-{{else}}
-{{if $nav.community}}
-</div>
-{{/if}}
-{{/if}}
-{{/if}}
-
-{{*
- # PRIVATE MESSAGES
- *}}
-{{if $nav.messages}}
-<div id="navigation-messages-wrapper">
-<a id="navigation-messages-link" class="navigation-link navigation-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a><br/>
-</div>
-{{/if}}
-
-	
-{{*
- # CONTACTS
- *}}
-<div id="navigation-contacts-wrapper">
-{{if $nav.contacts}}<a id="navigation-contacts-link" class="navigation-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><br/>{{/if}}
-<a id="navigation-directory-link" class="navigation-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><br/>
-{{if $nav.introductions}}
-<a id="navigation-notify-link" class="navigation-link navigation-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a><br/>
-{{/if}}
-</div>
-
-{{*
- # NOTIFICATIONS
- *}}
-{{if $nav.notifications}}
-<div id="navigation-notifications-wrapper">
-<a id="navigation-notifications-link" class="navigation-link navigation-commlink" href="{{$nav.notifications.0}}" rel="#navigation-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a><br/>
-</div>
-{{/if}}		
-
-{{*
- # MISCELLANEOUS
- *}}
-<div id="navigation-misc-wrapper">
-{{if $nav.settings}}<a id="navigation-settings-link" class="navigation-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a><br/>{{/if}}
-{{if $nav.manage}}<a id="navigation-manage-link" class="navigation-link navigation-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a><br/>{{/if}}
-{{if $nav.profiles}}<a id="navigation-profiles-link" class="navigation-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a><br/>{{/if}}
-{{if $nav.admin}}<a id="navigation-admin-link" class="navigation-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a><br/>{{/if}}
-<a id="navigation-search-link" class="navigation-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a><br/>
-{{if $nav.apps}}<a id="navigation-apps-link" class="navigation-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a><br/>{{/if}}
-{{if $nav.help}} <a id="navigation-help-link" class="navigation-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a><br/>{{/if}}
-</div>
-
-{{if $nav.logout}}<a id="navigation-logout-link" class="navigation-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a><br/>{{/if}}
-</center>
diff --git a/view/smarty3/netfriend.tpl b/view/smarty3/netfriend.tpl
deleted file mode 100644
index e8658e0bc3..0000000000
--- a/view/smarty3/netfriend.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	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">
-	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-{{$intro_id}}">{{$as_friend}}</label>
-	<input type="radio" name="duplex" id="intro-approve-as-friend-{{$intro_id}}" class="intro-approve-as-friend" {{$friend_selected}} value="1" />
-	<div class="intro-approve-friend-break" ></div>	
-</div>
-<div class="intro-approve-as-friend-end"></div>
-<div class="intro-approve-as-fan-wrapper">
-	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-{{$intro_id}}">{{$as_fan}}</label>
-	<input type="radio" name="duplex" id="intro-approve-as-fan-{{$intro_id}}" class="intro-approve-as-fan" {{$fan_selected}} value="0"  />
-	<div class="intro-approve-fan-break"></div>
-</div>
-<div class="intro-approve-as-end"></div>
diff --git a/view/smarty3/nets.tpl b/view/smarty3/nets.tpl
deleted file mode 100644
index 76b2a57d94..0000000000
--- a/view/smarty3/nets.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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>
-	<a href="{{$base}}?nets=all" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a>
-	<ul class="nets-ul">
-	{{foreach $nets as $net}}
-	<li><a href="{{$base}}?nets={{$net.ref}}" class="nets-link{{if $net.selected}} nets-selected{{/if}}">{{$net.name}}</a></li>
-	{{/foreach}}
-	</ul>
-</div>
diff --git a/view/smarty3/nogroup-template.tpl b/view/smarty3/nogroup-template.tpl
deleted file mode 100644
index 7d103a655b..0000000000
--- a/view/smarty3/nogroup-template.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$header}}</h1>
-
-{{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
-{{/foreach}}
-<div id="contact-edit-end"></div>
-
-{{$paginate}}
-
-
-
-
diff --git a/view/smarty3/notifications.tpl b/view/smarty3/notifications.tpl
deleted file mode 100644
index 834a7a016c..0000000000
--- a/view/smarty3/notifications.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h1>{{$notif_header}}</h1>
-
-{{include file="common_tabs.tpl"}}
-
-<div class="notif-network-wrapper">
-	{{$notif_content}}
-</div>
diff --git a/view/smarty3/notifications_comments_item.tpl b/view/smarty3/notifications_comments_item.tpl
deleted file mode 100644
index 9913e6cf71..0000000000
--- a/view/smarty3/notifications_comments_item.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 9913e6cf71..0000000000
--- a/view/smarty3/notifications_dislikes_item.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 9913e6cf71..0000000000
--- a/view/smarty3/notifications_friends_item.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 792b285bce..0000000000
--- a/view/smarty3/notifications_likes_item.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index c3381d682f..0000000000
--- a/view/smarty3/notifications_network_item.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 9913e6cf71..0000000000
--- a/view/smarty3/notifications_posts_item.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 9913e6cf71..0000000000
--- a/view/smarty3/notify.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index d7f1963d24..0000000000
--- a/view/smarty3/oauth_authorize.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-<div class='oauthapp'>
-	<img src='{{$app.icon}}'>
-	<h4>{{$app.name}}</h4>
-</div>
-<h3>{{$authorize}}</h3>
-<form method="POST">
-<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes}}" /></div>
-</form>
diff --git a/view/smarty3/oauth_authorize_done.tpl b/view/smarty3/oauth_authorize_done.tpl
deleted file mode 100644
index 12d4c6f48f..0000000000
--- a/view/smarty3/oauth_authorize_done.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-<p>{{$info}}</p>
-<code>{{$code}}</code>
diff --git a/view/smarty3/oembed_video.tpl b/view/smarty3/oembed_video.tpl
deleted file mode 100644
index bdfa11509f..0000000000
--- a/view/smarty3/oembed_video.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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>
-</a>
diff --git a/view/smarty3/oexchange_xrd.tpl b/view/smarty3/oexchange_xrd.tpl
deleted file mode 100644
index 5af7491821..0000000000
--- a/view/smarty3/oexchange_xrd.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	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">
-        
-    <Subject>{{$base}}</Subject>
-
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendica</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/title">Friendica Social Network</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/name">Friendica</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendica</Property>
-
-    <Link 
-        rel="icon" 
-        href="{{$base}}/images/friendica-16.png"
-        type="image/png" 
-        />
-
-    <Link 
-        rel="icon32" 
-        href="{{$base}}/images/friendica-32.png"
-        type="image/png" 
-        />
-
-    <Link 
-        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
-        href="{{$base}}/oexchange"
-        type="text/html" 
-        />
-</XRD>
-
diff --git a/view/smarty3/opensearch.tpl b/view/smarty3/opensearch.tpl
deleted file mode 100644
index dc5cf8875b..0000000000
--- a/view/smarty3/opensearch.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	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>
-	<Description>Search in Friendica@{{$nodename}}</Description>
-	<Contact>http://bugs.friendica.com/</Contact>
-	<Image height="16" width="16" type="image/png">{{$baseurl}}/images/friendica-16.png</Image>
-	<Image height="64" width="64" type="image/png">{{$baseurl}}/images/friendica-64.png</Image>
-	<Url type="text/html" 
-        template="{{$baseurl}}/search?search={searchTerms}"/>
-	<Url type="application/opensearchdescription+xml"
-      	rel="self"
-      	template="{{$baseurl}}/opensearch" />        
-</OpenSearchDescription>
\ No newline at end of file
diff --git a/view/smarty3/pagetypes.tpl b/view/smarty3/pagetypes.tpl
deleted file mode 100644
index 15cd3047ac..0000000000
--- a/view/smarty3/pagetypes.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	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}}
-	{{include file="field_radio.tpl" field=$page_soapbox}}
-	{{include file="field_radio.tpl" field=$page_freelove}}
diff --git a/view/smarty3/peoplefind.tpl b/view/smarty3/peoplefind.tpl
deleted file mode 100644
index 5417ee0edf..0000000000
--- a/view/smarty3/peoplefind.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	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>
-	<form action="dirfind" method="post" />
-		<input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" />
-	</form>
-	<div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div>
-	<div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div>
-	<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >{{$random}}</a></div>
-	{{if $inv}} 
-	<div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div>
-	{{/if}}
-</div>
-
diff --git a/view/smarty3/photo_album.tpl b/view/smarty3/photo_album.tpl
deleted file mode 100644
index 56ee6b61c6..0000000000
--- a/view/smarty3/photo_album.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	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}}" />
-		<p class='caption'>{{$desc}}</p>		
-	</a>
-</div>
-<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/smarty3/photo_drop.tpl b/view/smarty3/photo_drop.tpl
deleted file mode 100644
index ed500fd0ad..0000000000
--- a/view/smarty3/photo_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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>
-<div class="wall-item-delete-end"></div>
diff --git a/view/smarty3/photo_edit.tpl b/view/smarty3/photo_edit.tpl
deleted file mode 100644
index fefe7f10b5..0000000000
--- a/view/smarty3/photo_edit.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="{{$item_id}}" />
-
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
-	<input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$caption}}" />
-
-	<div id="photo-edit-caption-end"></div>
-
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
-	<input name="newtag" id="photo-edit-newtag" size="84" title="{{$help_tags}}" type="text" />
-
-	<div id="photo-edit-tags-end"></div>
-	<div id="photo-edit-rotate-wrapper">
-		<div id="photo-edit-rotate-label">
-			{{$rotatecw}}<br>
-			{{$rotateccw}}
-		</div>
-		<input type="radio" name="rotate" value="1" /><br>
-		<input type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$permissions}}"/>
-			<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				{{$aclselect}}
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-
diff --git a/view/smarty3/photo_edit_head.tpl b/view/smarty3/photo_edit_head.tpl
deleted file mode 100644
index 50e6802957..0000000000
--- a/view/smarty3/photo_edit_head.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-
-	$(document).keydown(function(event) {
-
-		if("{{$prevlink}}" != '') { if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = "{{$prevlink}}"; }}
-		if("{{$nextlink}}" != '') { if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = "{{$nextlink}}"; }}
-
-	});
-
-</script>
diff --git a/view/smarty3/photo_item.tpl b/view/smarty3/photo_item.tpl
deleted file mode 100644
index 7d6ac96ee1..0000000000
--- a/view/smarty3/photo_item.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{{*
- *	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}}">
-		<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
-	</div>
-
-	<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
-		<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a>
-		<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
-	</div>
-	<div class="wall-item-content" id="wall-item-content-{{$id}}" >
-		<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
-		<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
-	</div>
-	{{$drop}}
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-comment-separator"></div>
-	{{$comment}}
-
-<div class="wall-item-outside-wrapper-end{{$indent}}" ></div>
-</div>
-
diff --git a/view/smarty3/photo_top.tpl b/view/smarty3/photo_top.tpl
deleted file mode 100644
index b34e1e6394..0000000000
--- a/view/smarty3/photo_top.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	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}}">
-		<img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" />
-	</a>
-	<div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div>
-</div>
-
diff --git a/view/smarty3/photo_view.tpl b/view/smarty3/photo_view.tpl
deleted file mode 100644
index 94f71bdd89..0000000000
--- a/view/smarty3/photo_view.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-{{*
- *	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>
-
-<div id="photo-edit-link-wrap">
-{{if $tools}}
-<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
-|
-<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
-{{/if}}
-{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
-</div>
-
-{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
-{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
-<div id="photo-photo-end"></div>
-<div id="photo-caption">{{$desc}}</div>
-{{if $tags}}
-<div id="in-this-photo-text">{{$tags.0}}</div>
-<div id="in-this-photo">{{$tags.1}}</div>
-{{/if}}
-{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
-
-{{if $edit}}{{$edit}}{{/if}}
-
-{{if $likebuttons}}
-<div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
-</div>
-{{/if}}
-
-{{$comments}}
-
-{{$paginate}}
-
diff --git a/view/smarty3/photos_default_uploader_box.tpl b/view/smarty3/photos_default_uploader_box.tpl
deleted file mode 100644
index 001d0a3db9..0000000000
--- a/view/smarty3/photos_default_uploader_box.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<input id="photos-upload-choose" type="file" name="userfile" />
diff --git a/view/smarty3/photos_default_uploader_submit.tpl b/view/smarty3/photos_default_uploader_submit.tpl
deleted file mode 100644
index 87d065d6ea..0000000000
--- a/view/smarty3/photos_default_uploader_submit.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="photos-upload-submit-wrapper" >
-	<input type="submit" name="submit" value="{{$submit}}" id="photos-upload-submit" />
-</div>
diff --git a/view/smarty3/photos_head.tpl b/view/smarty3/photos_head.tpl
deleted file mode 100644
index b90fc92bbb..0000000000
--- a/view/smarty3/photos_head.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-
-	var ispublic = "{{$ispublic}}";
-
-
-	$(document).ready(function() {
-
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-			}
-
-		}).trigger('change');
-
-	});
-
-</script>
-
diff --git a/view/smarty3/photos_recent.tpl b/view/smarty3/photos_recent.tpl
deleted file mode 100644
index cb2411df34..0000000000
--- a/view/smarty3/photos_recent.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	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 $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
deleted file mode 100644
index f2e95a9b14..0000000000
--- a/view/smarty3/photos_upload.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$pagename}}</h3>
-
-<div id="photos-usage-message">{{$usage}}</div>
-
-<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
-		<select id="photos-upload-album-select" name="album" size="4">
-		{{$albumselect}}
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
-
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
-	</div>
-
-
-	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
-		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
-		</a>
-	</div>
-	<div id="photos-upload-perms-end"></div>
-
-	<div style="display: none;">
-		<div id="photos-upload-permissions-wrapper">
-			{{$aclselect}}
-		</div>
-	</div>
-
-	<div id="photos-upload-spacer"></div>
-
-	{{$alt_uploader}}
-
-	{{$default_upload_box}}
-	{{$default_upload_submit}}
-
-	<div class="photos-upload-end" ></div>
-</form>
-
diff --git a/view/smarty3/poco_entry_xml.tpl b/view/smarty3/poco_entry_xml.tpl
deleted file mode 100644
index d6e139cb59..0000000000
--- a/view/smarty3/poco_entry_xml.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	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}}
-{{if $entry.preferredUsername}}<preferredUsername>{{$entry.preferredUsername}}</preferredUsername>{{/if}}
-{{if $entry.urls}}{{foreach $entry.urls as $url}}<urls><value>{{$url.value}}</value><type>{{$url.type}}</type></urls>{{/foreach}}{{/if}}
-{{if $entry.photos}}{{foreach $entry.photos as $photo}}<photos><value>{{$photo.value}}</value><type>{{$photo.type}}</type></photos>{{/foreach}}{{/if}}
-</entry>
diff --git a/view/smarty3/poco_xml.tpl b/view/smarty3/poco_xml.tpl
deleted file mode 100644
index b8cd8fc081..0000000000
--- a/view/smarty3/poco_xml.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	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}}
-{{if $response.filtered}}<filtered>{{$response.filtered}}</filtered>{{/if}}
-{{if $response.updatedSince}}<updatedSince>{{$response.updatedSince}}</updatedSince>{{/if}}
-<startIndex>{{$response.startIndex}}</startIndex>
-<itemsPerPage>{{$response.itemsPerPage}}</itemsPerPage>
-<totalResults>{{$response.totalResults}}</totalResults>
-
-
-{{if $response.totalResults}}
-{{foreach $response.entry as $entry}}
-{{include file="poco_entry_xml.tpl"}}
-{{/foreach}}
-{{else}}
-<entry></entry>
-{{/if}}
-</response>
diff --git a/view/smarty3/poke_content.tpl b/view/smarty3/poke_content.tpl
deleted file mode 100644
index 6235aca0c0..0000000000
--- a/view/smarty3/poke_content.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-
-<div id="poke-desc">{{$desc}}</div>
-
-<form action="poke" method="get">
-<br />
-<br />
-
-<div id="poke-recip-label">{{$clabel}}</div>
-<br />
-<input id="poke-recip" type="text" size="64" maxlength="255" value="{{$name}}" name="pokename" autocomplete="off" />
-<input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
-<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
-<br />
-<br />
-<div id="poke-action-label">{{$choice}}</div>
-<br />
-<br />
-<select name="verb" id="poke-verb-select" >
-{{foreach $verbs as $v}}
-<option value="{{$v.0}}">{{$v.1}}</option>
-{{/foreach}}
-</select>
-<br />
-<br />
-<div id="poke-private-desc">{{$prv_desc}}</div>
-<input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
-<br />
-<br />
-<input type="submit" name="submit" value="{{$submit}}" />
-</form>
-
diff --git a/view/smarty3/posted_date_widget.tpl b/view/smarty3/posted_date_widget.tpl
deleted file mode 100644
index 2f5838edb8..0000000000
--- a/view/smarty3/posted_date_widget.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	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>
-<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="{{$size}}">
-{{foreach $dates as $d}}
-<option value="{{$url}}/{{$d.1}}/{{$d.2}}" >{{$d.0}}</option>
-{{/foreach}}
-</select>
-</div>
diff --git a/view/smarty3/profed_end.tpl b/view/smarty3/profed_end.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/profed_end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 52b9340954..0000000000
--- a/view/smarty3/profed_head.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-{{*
- *	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"
-          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-          <script language="javascript" type="text/javascript">
-
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "{{$editselect}}",
-	plugins : "bbcode,paste",
-	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",
-	gecko_spellcheck : true,
-	paste_text_sticky : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	//force_p_newlines : false,
-	//force_br_newlines : true,
-	forced_root_block : 'div',
-	content_css: "{{$baseurl}}/view/custom_tinymce.css",
-	theme_advanced_path : false,
-	setup : function(ed) {
-		ed.onInit.add(function(ed) {
-            ed.pasteAsPlainText = true;
-        });
-    }
-
-});
-
-
-</script>
-
diff --git a/view/smarty3/profile-hide-friends.tpl b/view/smarty3/profile-hide-friends.tpl
deleted file mode 100644
index 6e3d395d07..0000000000
--- a/view/smarty3/profile-hide-friends.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<p id="hide-friends-text">
-{{$desc}}
-</p>
-
-		<div id="hide-friends-yes-wrapper">
-		<label id="hide-friends-yes-label" for="hide-friends-yes">{{$yes_str}}</label>
-		<input type="radio" name="hide-friends" id="hide-friends-yes" {{$yes_selected}} value="1" />
-
-		<div id="hide-friends-break" ></div>	
-		</div>
-		<div id="hide-friends-no-wrapper">
-		<label id="hide-friends-no-label" for="hide-friends-no">{{$no_str}}</label>
-		<input type="radio" name="hide-friends" id="hide-friends-no" {{$no_selected}} value="0"  />
-
-		<div id="hide-friends-end"></div>
-		</div>
diff --git a/view/smarty3/profile-hide-wall.tpl b/view/smarty3/profile-hide-wall.tpl
deleted file mode 100644
index 755908d176..0000000000
--- a/view/smarty3/profile-hide-wall.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<p id="hide-wall-text">
-{{$desc}}
-</p>
-
-		<div id="hide-wall-yes-wrapper">
-		<label id="hide-wall-yes-label" for="hide-wall-yes">{{$yes_str}}</label>
-		<input type="radio" name="hidewall" id="hide-wall-yes" {{$yes_selected}} value="1" />
-
-		<div id="hide-wall-break" ></div>	
-		</div>
-		<div id="hide-wall-no-wrapper">
-		<label id="hide-wall-no-label" for="hide-wall-no">{{$no_str}}</label>
-		<input type="radio" name="hidewall" id="hide-wall-no" {{$no_selected}} value="0"  />
-
-		<div id="hide-wall-end"></div>
-		</div>
diff --git a/view/smarty3/profile-in-directory.tpl b/view/smarty3/profile-in-directory.tpl
deleted file mode 100644
index 0efd1bf5c0..0000000000
--- a/view/smarty3/profile-in-directory.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<p id="profile-in-directory">
-{{$desc}}
-</p>
-
-		<div id="profile-in-dir-yes-wrapper">
-		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">{{$yes_str}}</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" {{$yes_selected}} value="1" />
-
-		<div id="profile-in-dir-break" ></div>	
-		</div>
-		<div id="profile-in-dir-no-wrapper">
-		<label id="profile-in-dir-no-label" for="profile-in-dir-no">{{$no_str}}</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" {{$no_selected}} value="0"  />
-
-		<div id="profile-in-dir-end"></div>
-		</div>
diff --git a/view/smarty3/profile-in-netdir.tpl b/view/smarty3/profile-in-netdir.tpl
deleted file mode 100644
index b9cb456ea5..0000000000
--- a/view/smarty3/profile-in-netdir.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<p id="profile-in-directory">
-{{$desc}}
-</p>
-
-		<div id="profile-in-netdir-yes-wrapper">
-		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">{{$yes_str}}</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" {{$yes_selected}} value="1" />
-
-		<div id="profile-in-netdir-break" ></div>	
-		</div>
-		<div id="profile-in-netdir-no-wrapper">
-		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">{{$no_str}}</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" {{$no_selected}} value="0"  />
-
-		<div id="profile-in-netdir-end"></div>
-		</div>
diff --git a/view/smarty3/profile_advanced.tpl b/view/smarty3/profile_advanced.tpl
deleted file mode 100644
index b9cc57931b..0000000000
--- a/view/smarty3/profile_advanced.tpl
+++ /dev/null
@@ -1,175 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h2>{{$title}}</h2>
-
-<dl id="aprofile-fullname" class="aprofile">
- <dt>{{$profile.fullname.0}}</dt>
- <dd>{{$profile.fullname.1}}</dd>
-</dl>
-
-{{if $profile.gender}}
-<dl id="aprofile-gender" class="aprofile">
- <dt>{{$profile.gender.0}}</dt>
- <dd>{{$profile.gender.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.birthday}}
-<dl id="aprofile-birthday" class="aprofile">
- <dt>{{$profile.birthday.0}}</dt>
- <dd>{{$profile.birthday.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.age}}
-<dl id="aprofile-age" class="aprofile">
- <dt>{{$profile.age.0}}</dt>
- <dd>{{$profile.age.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.marital}}
-<dl id="aprofile-marital" class="aprofile">
- <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
- <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.sexual}}
-<dl id="aprofile-sexual" class="aprofile">
- <dt>{{$profile.sexual.0}}</dt>
- <dd>{{$profile.sexual.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.pub_keywords}}
-<dl id="aprofile-tags" class="aprofile">
- <dt>{{$profile.pub_keywords.0}}</dt>
- <dd>{{$profile.pub_keywords.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.homepage}}
-<dl id="aprofile-homepage" class="aprofile">
- <dt>{{$profile.homepage.0}}</dt>
- <dd>{{$profile.homepage.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.hometown}}
-<dl id="aprofile-hometown" class="aprofile">
- <dt>{{$profile.hometown.0}}</dt>
- <dd>{{$profile.hometown.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.politic}}
-<dl id="aprofile-politic" class="aprofile">
- <dt>{{$profile.politic.0}}</dt>
- <dd>{{$profile.politic.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.religion}}
-<dl id="aprofile-religion" class="aprofile">
- <dt>{{$profile.religion.0}}</dt>
- <dd>{{$profile.religion.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.about}}
-<dl id="aprofile-about" class="aprofile">
- <dt>{{$profile.about.0}}</dt>
- <dd>{{$profile.about.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.interest}}
-<dl id="aprofile-interest" class="aprofile">
- <dt>{{$profile.interest.0}}</dt>
- <dd>{{$profile.interest.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.likes}}
-<dl id="aprofile-likes" class="aprofile">
- <dt>{{$profile.likes.0}}</dt>
- <dd>{{$profile.likes.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.dislikes}}
-<dl id="aprofile-dislikes" class="aprofile">
- <dt>{{$profile.dislikes.0}}</dt>
- <dd>{{$profile.dislikes.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.contact}}
-<dl id="aprofile-contact" class="aprofile">
- <dt>{{$profile.contact.0}}</dt>
- <dd>{{$profile.contact.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.music}}
-<dl id="aprofile-music" class="aprofile">
- <dt>{{$profile.music.0}}</dt>
- <dd>{{$profile.music.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.book}}
-<dl id="aprofile-book" class="aprofile">
- <dt>{{$profile.book.0}}</dt>
- <dd>{{$profile.book.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.tv}}
-<dl id="aprofile-tv" class="aprofile">
- <dt>{{$profile.tv.0}}</dt>
- <dd>{{$profile.tv.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.film}}
-<dl id="aprofile-film" class="aprofile">
- <dt>{{$profile.film.0}}</dt>
- <dd>{{$profile.film.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.romance}}
-<dl id="aprofile-romance" class="aprofile">
- <dt>{{$profile.romance.0}}</dt>
- <dd>{{$profile.romance.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.work}}
-<dl id="aprofile-work" class="aprofile">
- <dt>{{$profile.work.0}}</dt>
- <dd>{{$profile.work.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.education}}
-<dl id="aprofile-education" class="aprofile">
- <dt>{{$profile.education.0}}</dt>
- <dd>{{$profile.education.1}}</dd>
-</dl>
-{{/if}}
-
-
-
-
diff --git a/view/smarty3/profile_edit.tpl b/view/smarty3/profile_edit.tpl
deleted file mode 100644
index 4b7c4d0b1c..0000000000
--- a/view/smarty3/profile_edit.tpl
+++ /dev/null
@@ -1,328 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$default}}
-
-<h1>{{$banner}}</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li>
-<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
-<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
-<li></li>
-<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name}}" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-{{$gender}}
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
-<div id="profile-edit-dob" >
-{{$dob}} {{$age}}
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-{{$hide_friends}}
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address}}" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality}}" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
-<option selected="selected" >{{$country_name}}</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >{{$region}}</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
-<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
-{{$marital}}
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
-<input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
-<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
-{{$sexual}}
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
-<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic}}" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion}}" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
-</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
-</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-{{$lbl_about}}
-</p>
-
-<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" >
-<p id="interest-jot-desc" >
-{{$lbl_hobbies}}
-</p>
-
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest}}</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" >
-<p id="likes-jot-desc" >
-{{$lbl_likes}}
-</p>
-
-<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes}}</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" >
-<p id="dislikes-jot-desc" >
-{{$lbl_dislikes}}
-</p>
-
-<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes}}</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-{{$lbl_social}}
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" >
-<p id="music-jot-desc" >
-{{$lbl_music}}
-</p>
-
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >{{$music}}</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" >
-<p id="book-jot-desc" >
-{{$lbl_book}}
-</p>
-
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >{{$book}}</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" >
-<p id="tv-jot-desc" >
-{{$lbl_tv}} 
-</p>
-
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv}}</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" >
-<p id="film-jot-desc" >
-{{$lbl_film}}
-</p>
-
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >{{$film}}</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" >
-<p id="romance-jot-desc" >
-{{$lbl_love}}
-</p>
-
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance}}</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" >
-<p id="work-jot-desc" >
-{{$lbl_work}}
-</p>
-
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >{{$work}}</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" >
-<p id="education-jot-desc" >
-{{$lbl_school}} 
-</p>
-
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >{{$education}}</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('{{$country_name}}');Fill_States('{{$region}}');</script>
diff --git a/view/smarty3/profile_edlink.tpl b/view/smarty3/profile_edlink.tpl
deleted file mode 100644
index 9424bcc3dc..0000000000
--- a/view/smarty3/profile_edlink.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 4774fd11b3..0000000000
--- a/view/smarty3/profile_entry.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
-</div>
-<div class="profile-listing-photo-end"></div>
-<div class="profile-listing-name" id="profile-listing-name-{{$id}}"><a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a></div>
-<div class="profile-listing-visible">{{$visible}}</div>
-</div>
-<div class="profile-listing-end"></div>
-
diff --git a/view/smarty3/profile_listing_header.tpl b/view/smarty3/profile_listing_header.tpl
deleted file mode 100644
index f77bdcc807..0000000000
--- a/view/smarty3/profile_listing_header.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	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>
-</p>
-<div id="profile-listing-new-link-wrapper" class="button" >
-<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
-</div>
-
diff --git a/view/smarty3/profile_photo.tpl b/view/smarty3/profile_photo.tpl
deleted file mode 100644
index 8a278cdfe9..0000000000
--- a/view/smarty3/profile_photo.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-{{*
- *	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">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">{{$lbl_upfile}} </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<label id="profile-photo-profiles-label" for="profile-photo-profiles">{{$lbl_profiles}} </label>
-<select name="profile" id="profile-photo-profiles" />
-{{foreach $profiles as $p}}
-<option value="{{$p.id}}" {{if $p.default}}selected="selected"{{/if}}>{{$p.name}}</option>
-{{/foreach}}
-</select>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-{{$select}}
-</div>
\ No newline at end of file
diff --git a/view/smarty3/profile_publish.tpl b/view/smarty3/profile_publish.tpl
deleted file mode 100644
index 1dc9eb7fc6..0000000000
--- a/view/smarty3/profile_publish.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<p id="profile-publish-desc-{{$instance}}">
-{{$pubdesc}}
-</p>
-
-		<div id="profile-publish-yes-wrapper-{{$instance}}">
-		<label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
-		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1" />
-
-		<div id="profile-publish-break-{{$instance}}" ></div>	
-		</div>
-		<div id="profile-publish-no-wrapper-{{$instance}}">
-		<label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
-		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"  />
-
-		<div id="profile-publish-end-{{$instance}}"></div>
-		</div>
diff --git a/view/smarty3/profile_vcard.tpl b/view/smarty3/profile_vcard.tpl
deleted file mode 100644
index 3f4d3c711c..0000000000
--- a/view/smarty3/profile_vcard.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-
-	<div class="fn label">{{$profile.name}}</div>
-	
-				
-	
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
-
-
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{if $connect}}
-				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-			{{/if}}
-			{{if $wallmessage}}
-				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block}}
-
-
diff --git a/view/smarty3/prv_message.tpl b/view/smarty3/prv_message.tpl
deleted file mode 100644
index 83cf7e99c4..0000000000
--- a/view/smarty3/prv_message.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h3>{{$header}}</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-{{$parent}}
-
-<div id="prvmail-to-label">{{$to}}</div>
-{{$select}}
-
-<div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
-
-<div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/smarty3/pwdreset.tpl b/view/smarty3/pwdreset.tpl
deleted file mode 100644
index e86e1227f8..0000000000
--- a/view/smarty3/pwdreset.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$lbl1}}</h3>
-
-<p>
-{{$lbl2}}
-</p>
-<p>
-{{$lbl3}}
-</p>
-<p>
-{{$newpass}}
-</p>
-<p>
-{{$lbl4}} {{$lbl5}}
-</p>
-<p>
-{{$lbl6}}
-</p>
diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl
deleted file mode 100644
index 5e655cd82e..0000000000
--- a/view/smarty3/register.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$regtitle}}</h3>
-
-<form action="register" method="post" id="register-form">
-
-	<input type="hidden" name="photo" value="{{$photo}}" />
-
-	{{$registertext}}
-
-	<p id="register-realpeople">{{$realpeople}}</p>
-
-	<p id="register-fill-desc">{{$fillwith}}</p>
-	<p id="register-fill-ext">{{$fillext}}</p>
-
-{{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}}
-
-{{if $invitations}}
-
-	<p id="register-invite-desc">{{$invite_desc}}</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
-	</div>
-	<div id="register-name-end" ></div>
-
-{{/if}}
-
-
-	<div id="register-name-wrapper" >
-		<label for="register-name" id="label-register-name" >{{$namelabel}}</label>
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper" >
-		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
-	</div>
-	<div id="register-email-end" ></div>
-
-	<p id="register-nickname-desc" >{{$nickdesc}}</p>
-
-	<div id="register-nickname-wrapper" >
-		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" ><div id="register-sitename">@{{$sitename}}</div>
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	{{$publish}}
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
-	</div>
-	<div id="register-submit-end" ></div>
-    
-</form>
-
-{{$license}}
-
-
diff --git a/view/smarty3/remote_friends_common.tpl b/view/smarty3/remote_friends_common.tpl
deleted file mode 100644
index 5844aac87e..0000000000
--- a/view/smarty3/remote_friends_common.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{*
- *	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}}
-	{{foreach $items as $item}}
-	<div class="profile-match-wrapper">
-		<div class="profile-match-photo">
-			<a href="{{$item.url}}">
-				<img src="{{$item.photo}}" width="80" height="80" alt="{{$item.name}}" title="{{$item.name}}" />
-			</a>
-		</div>
-		<div class="profile-match-break"></div>
-		<div class="profile-match-name">
-			<a href="{{$itemurl}}" title="{{$item.name}}">{{$item.name}}</a>
-		</div>
-		<div class="profile-match-end"></div>
-	</div>
-	{{/foreach}}
-	{{/if}}
-	<div id="rfic-end" class="clear"></div>
-</div>
-
diff --git a/view/smarty3/removeme.tpl b/view/smarty3/removeme.tpl
deleted file mode 100644
index 3fe12a2231..0000000000
--- a/view/smarty3/removeme.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-<div id="remove-account-wrapper">
-
-<div id="remove-account-desc">{{$desc}}</div>
-
-<form action="{{$basedir}}/removeme" autocomplete="off" method="post" >
-<input type="hidden" name="verify" value="{{$hash}}" />
-
-<div id="remove-account-pass-wrapper">
-<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
-<input type="password" id="remove-account-pass" name="qxz_password" />
-</div>
-<div id="remove-account-pass-end"></div>
-
-<input type="submit" name="submit" value="{{$submit}}" />
-
-</form>
-</div>
-
diff --git a/view/smarty3/saved_searches_aside.tpl b/view/smarty3/saved_searches_aside.tpl
deleted file mode 100644
index 0685eda7ed..0000000000
--- a/view/smarty3/saved_searches_aside.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	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}}
-	
-	<ul id="saved-search-ul">
-		{{foreach $saved as $search}}
-		<li class="saved-search-li clear">
-			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"></a>
-			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.term}}</a>
-		</li>
-		{{/foreach}}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/smarty3/search_item.tpl b/view/smarty3/search_item.tpl
deleted file mode 100644
index c6b9cc7dc5..0000000000
--- a/view/smarty3/search_item.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-{{*
- *	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}}" >
-		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
-				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
-			{{if $item.has_cats}}
-			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
-
-</div>
-
-
diff --git a/view/smarty3/settings-end.tpl b/view/smarty3/settings-end.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/settings-end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 2182408392..0000000000
--- a/view/smarty3/settings-head.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-	var ispublic = "{{$ispublic}}";
-
-
-	$(document).ready(function() {
-
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-			}
-
-		}).trigger('change');
-
-	});
-
-</script>
-
diff --git a/view/smarty3/settings.tpl b/view/smarty3/settings.tpl
deleted file mode 100644
index 2ab4bd466c..0000000000
--- a/view/smarty3/settings.tpl
+++ /dev/null
@@ -1,152 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$ptitle}}</h1>
-
-{{$nickname_block}}
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<h3 class="settings-heading">{{$h_pass}}</h3>
-
-{{include file="field_password.tpl" field=$password1}}
-{{include file="field_password.tpl" field=$password2}}
-{{include file="field_password.tpl" field=$password3}}
-
-{{if $oid_enable}}
-{{include file="field_input.tpl" field=$openid}}
-{{/if}}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-<h3 class="settings-heading">{{$h_basic}}</h3>
-
-{{include file="field_input.tpl" field=$username}}
-{{include file="field_input.tpl" field=$email}}
-{{include file="field_password.tpl" field=$password4}}
-{{include file="field_custom.tpl" field=$timezone}}
-{{include file="field_input.tpl" field=$defloc}}
-{{include file="field_checkbox.tpl" field=$allowloc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-<h3 class="settings-heading">{{$h_prv}}</h3>
-
-
-<input type="hidden" name="visibility" value="{{$visibility}}" />
-
-{{include file="field_input.tpl" field=$maxreq}}
-
-{{$profile_in_dir}}
-
-{{$profile_in_net_dir}}
-
-{{$hide_friends}}
-
-{{$hide_wall}}
-
-{{$blockwall}}
-
-{{$blocktags}}
-
-{{$suggestme}}
-
-{{$unkmail}}
-
-
-{{include file="field_input.tpl" field=$cntunkmail}}
-
-{{include file="field_input.tpl" field=$expire.days}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="{{$expire.advanced}}">{{$expire.label}}</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>{{$expire.advanced}}</h3>
-			{{include file="field_yesno.tpl" field=$expire.items}}
-			{{include file="field_yesno.tpl" field=$expire.notes}}
-			{{include file="field_yesno.tpl" field=$expire.starred}}
-			{{include file="field_yesno.tpl" field=$expire.network_only}}
-		</div>
-	</div>
-
-</div>
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
-	
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			{{$aclselect}}
-		</div>
-	</div>
-
-	</div>
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-{{$group_select}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-
-<h3 class="settings-heading">{{$h_not}}</h3>
-<div id="settings-notifications">
-
-<div id="settings-activity-desc">{{$activity_options}}</div>
-
-{{include file="field_checkbox.tpl" field=$post_newfriend}}
-{{include file="field_checkbox.tpl" field=$post_joingroup}}
-{{include file="field_checkbox.tpl" field=$post_profilechange}}
-
-
-<div id="settings-notify-desc">{{$lbl_not}}</div>
-
-<div class="group">
-{{include file="field_intcheckbox.tpl" field=$notify1}}
-{{include file="field_intcheckbox.tpl" field=$notify2}}
-{{include file="field_intcheckbox.tpl" field=$notify3}}
-{{include file="field_intcheckbox.tpl" field=$notify4}}
-{{include file="field_intcheckbox.tpl" field=$notify5}}
-{{include file="field_intcheckbox.tpl" field=$notify6}}
-{{include file="field_intcheckbox.tpl" field=$notify7}}
-{{include file="field_intcheckbox.tpl" field=$notify8}}
-</div>
-
-</div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-<h3 class="settings-heading">{{$h_advn}}</h3>
-<div id="settings-pagetype-desc">{{$h_descadvn}}</div>
-
-{{$pagetype}}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
diff --git a/view/smarty3/settings_addons.tpl b/view/smarty3/settings_addons.tpl
deleted file mode 100644
index 52b71f1dbd..0000000000
--- a/view/smarty3/settings_addons.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-
-<form action="settings/addon" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{$settings_addons}}
-
-</form>
-
diff --git a/view/smarty3/settings_connectors.tpl b/view/smarty3/settings_connectors.tpl
deleted file mode 100644
index 0b0d78299b..0000000000
--- a/view/smarty3/settings_connectors.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-<div class="connector_statusmsg">{{$diasp_enabled}}</div>
-<div class="connector_statusmsg">{{$ostat_enabled}}</div>
-
-<form action="settings/connectors" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{$settings_connectors}}
-
-{{if $mail_disabled}}
-
-{{else}}
-	<div class="settings-block">
-	<h3 class="settings-heading">{{$h_imap}}</h3>
-	<p>{{$imap_desc}}</p>
-	{{include file="field_custom.tpl" field=$imap_lastcheck}}
-	{{include file="field_input.tpl" field=$mail_server}}
-	{{include file="field_input.tpl" field=$mail_port}}
-	{{include file="field_select.tpl" field=$mail_ssl}}
-	{{include file="field_input.tpl" field=$mail_user}}
-	{{include file="field_password.tpl" field=$mail_pass}}
-	{{include file="field_input.tpl" field=$mail_replyto}}
-	{{include file="field_checkbox.tpl" field=$mail_pubmail}}
-	{{include file="field_select.tpl" field=$mail_action}}
-	{{include file="field_input.tpl" field=$mail_movetofolder}}
-
-	<div class="settings-submit-wrapper" >
-		<input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" />
-	</div>
-	</div>
-{{/if}}
-
-</form>
-
diff --git a/view/smarty3/settings_display.tpl b/view/smarty3/settings_display.tpl
deleted file mode 100644
index a8826aada1..0000000000
--- a/view/smarty3/settings_display.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{{*
- *	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" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{include file="field_themeselect.tpl" field=$theme}}
-{{include file="field_themeselect.tpl" field=$mobile_theme}}
-{{include file="field_input.tpl" field=$ajaxint}}
-{{include file="field_input.tpl" field=$itemspage_network}}
-{{include file="field_checkbox.tpl" field=$nosmile}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-{{if $theme_config}}
-<h2>Theme settings</h2>
-{{$theme_config}}
-{{/if}}
-
-</form>
diff --git a/view/smarty3/settings_display_end.tpl b/view/smarty3/settings_display_end.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/settings_display_end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index f5c5c50963..0000000000
--- a/view/smarty3/settings_features.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-
-<form action="settings/features" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{foreach $features as $f}}
-<h3 class="settings-heading">{{$f.0}}</h3>
-
-{{foreach $f.1 as $fcat}}
-	{{include file="field_yesno.tpl" field=$fcat}}
-{{/foreach}}
-{{/foreach}}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
-</div>
-
-</form>
-
diff --git a/view/smarty3/settings_nick_set.tpl b/view/smarty3/settings_nick_set.tpl
deleted file mode 100644
index fb886695ea..0000000000
--- a/view/smarty3/settings_nick_set.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	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>
-</div>
-<div id="settings-nick-end" ></div>
diff --git a/view/smarty3/settings_nick_subdir.tpl b/view/smarty3/settings_nick_subdir.tpl
deleted file mode 100644
index 874185db5c..0000000000
--- a/view/smarty3/settings_nick_subdir.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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 />
-</p>
-<p>If you have any issues, you may have better results using the profile<br /> address '<strong>{{$baseurl}}/profile/{{$nickname}}</strong>'.
-</p>
\ No newline at end of file
diff --git a/view/smarty3/settings_oauth.tpl b/view/smarty3/settings_oauth.tpl
deleted file mode 100644
index feab78210b..0000000000
--- a/view/smarty3/settings_oauth.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-
-<form action="settings/oauth" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-	<div id="profile-edit-links">
-		<ul>
-			<li>
-				<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a>
-			</li>
-		</ul>
-	</div>
-
-	{{foreach $apps as $app}}
-	<div class='oauthapp'>
-		<img src='{{$app.icon}}' class="{{if $app.icon}} {{else}}noicon{{/if}}">
-		{{if $app.name}}<h4>{{$app.name}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}}
-		{{if $app.my}}
-			{{if $app.oauth_token}}
-			<div class="settings-submit-wrapper" ><button class="settings-submit"  type="submit" name="remove" value="{{$app.oauth_token}}">{{$remove}}</button></div>
-			{{/if}}
-		{{/if}}
-		{{if $app.my}}
-		<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="icon s22 edit" title="{{$edit}}">&nbsp;</a>
-		<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="icon s22 delete" title="{{$delete}}">&nbsp;</a>
-		{{/if}}		
-	</div>
-	{{/foreach}}
-
-</form>
diff --git a/view/smarty3/settings_oauth_edit.tpl b/view/smarty3/settings_oauth_edit.tpl
deleted file mode 100644
index e3960bf75f..0000000000
--- a/view/smarty3/settings_oauth_edit.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-<form method="POST">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{include file="field_input.tpl" field=$name}}
-{{include file="field_input.tpl" field=$key}}
-{{include file="field_input.tpl" field=$secret}}
-{{include file="field_input.tpl" field=$redirect}}
-{{include file="field_input.tpl" field=$icon}}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-<input type="submit" name="cancel" class="settings-submit" value="{{$cancel}}" />
-</div>
-
-</form>
diff --git a/view/smarty3/suggest_friends.tpl b/view/smarty3/suggest_friends.tpl
deleted file mode 100644
index 060db00050..0000000000
--- a/view/smarty3/suggest_friends.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	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">
-		<a href="{{$url}}">
-			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{if $connlnk}}
-	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-	{{/if}}
-</div>
\ No newline at end of file
diff --git a/view/smarty3/suggestions.tpl b/view/smarty3/suggestions.tpl
deleted file mode 100644
index b4f0cbbe52..0000000000
--- a/view/smarty3/suggestions.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div class="intro-wrapper" >
-
-<p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
-<div class="intro-madeby">{{$madeby}}</div>
-<div class="intro-fullname" >{{$fullname}}</div>
-<a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" /></a>
-<div class="intro-note" >{{$note}}</div>
-<div class="intro-wrapper-end"></div>
-<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
-<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
-</form>
-<div class="intro-form-end"></div>
-
-<form class="intro-approve-form" action="{{$request}}" method="get">
-{{include file="field_checkbox.tpl" field=$hidden}}
-<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
-</form>
-</div>
-<div class="intro-end"></div>
diff --git a/view/smarty3/tag_slap.tpl b/view/smarty3/tag_slap.tpl
deleted file mode 100644
index 6d1bd01d61..0000000000
--- a/view/smarty3/tag_slap.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	<entry>
-		<author>
-			<name>{{$name}}</name>
-			<uri>{{$profile_page}}</uri>
-			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
-			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
-		</author>
-
-		<id>{{$item_id}}</id>
-		<title>{{$title}}</title>
-		<published>{{$published}}</published>
-		<content type="{{$type}}" >{{$content}}</content>
-		<link rel="mentioned" href="{{$accturi}}" />
-		<as:actor>
-		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
-		<id>{{$profile_page}}</id>
-		<title></title>
- 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="{{$photo}}"/>
-		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}"/>
-		<poco:preferredUsername>{{$nick}}</poco:preferredUsername>
-		<poco:displayName>{{$name}}</poco:displayName>
-		</as:actor>
- 		<as:verb>{{$verb}}</as:verb>
-		<as:object>
-		<as:object-type></as:object-type>
-		</as:object>
-		<as:target>
-		<as:object-type></as:object-type>
-		</as:target>
-	</entry>
diff --git a/view/smarty3/threaded_conversation.tpl b/view/smarty3/threaded_conversation.tpl
deleted file mode 100644
index bcdcf6e7be..0000000000
--- a/view/smarty3/threaded_conversation.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$live_update}}
-
-{{foreach $threads as $thread}}
-{{include file="{{$thread.template}}" item=$thread}}
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-<div id="item-delete-selected-end"></div>
-{{/if}}
diff --git a/view/smarty3/toggle_mobile_footer.tpl b/view/smarty3/toggle_mobile_footer.tpl
deleted file mode 100644
index 008d69663b..0000000000
--- a/view/smarty3/toggle_mobile_footer.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 1d9362d724..0000000000
--- a/view/smarty3/uexport.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-
-
-{{foreach $options as $o}}
-<dl>
-    <dt><a href="{{$baseurl}}/{{$o.0}}">{{$o.1}}</a></dt>
-    <dd>{{$o.2}}</dd>
-</dl>
-{{/foreach}}
\ No newline at end of file
diff --git a/view/smarty3/uimport.tpl b/view/smarty3/uimport.tpl
deleted file mode 100644
index cc137514a7..0000000000
--- a/view/smarty3/uimport.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	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>
-    <p>{{$import.instruct}}</p>
-    <p><b>{{$import.warn}}</b></p>
-     {{include file="field_custom.tpl" field=$import.field}}
-     
-     
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
-	</div>
-	<div id="register-submit-end" ></div>    
-</form>
diff --git a/view/smarty3/vcard-widget.tpl b/view/smarty3/vcard-widget.tpl
deleted file mode 100644
index 6ccd2ae1d0..0000000000
--- a/view/smarty3/vcard-widget.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	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>
-	</div>
-
diff --git a/view/smarty3/viewcontact_template.tpl b/view/smarty3/viewcontact_template.tpl
deleted file mode 100644
index a9837c7f9b..0000000000
--- a/view/smarty3/viewcontact_template.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-
-{{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
-{{/foreach}}
-
-<div id="view-contact-end"></div>
-
-{{$paginate}}
diff --git a/view/smarty3/voting_fakelink.tpl b/view/smarty3/voting_fakelink.tpl
deleted file mode 100644
index 3d14ba48bb..0000000000
--- a/view/smarty3/voting_fakelink.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index c0e30c4cbf..0000000000
--- a/view/smarty3/wall_thread.tpl
+++ /dev/null
@@ -1,125 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
-<a name="{{$item.id}}" ></a>
-<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
-			{{if $item.owner_url}}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
-			{{/if}}
-			<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                    <ul>
-                        {{$item.item_photo_menu}}
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-					<div class="body-tag">
-						{{foreach $item.tags as $tag}}
-							<span class='tag'>{{$tag}}</span>
-						{{/foreach}}
-					</div>
-			{{if $item.has_cats}}
-			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{if $item.vote}}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-				{{if $item.vote.dislike}}<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
-				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
-				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-			</div>
-			{{/if}}
-			{{if $item.plink}}
-				<div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link{{$item.sparkle}}"></a></div>
-			{{/if}}
-			{{if $item.edpost}}
-				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-			{{/if}}
-			 
-			{{if $item.star}}
-			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
-			{{/if}}
-			{{if $item.tagger}}
-			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
-			{{/if}}
-			{{if $item.filer}}
-			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
-			{{/if}}			
-			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-
-			{{if $item.threaded}}
-			{{if $item.comment}}
-			<div class="wall-item-comment-wrapper {{$item.indent}}" >
-				{{$item.comment}}
-			</div>
-			{{/if}}
-			{{/if}}
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
-</div>
-{{foreach $item.children as $child}}
-	{{include file="{{$child.template}}" item=$child}}
-{{/foreach}}
-
-{{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >
-	{{$item.comment}}
-</div>
-{{/if}}
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/smarty3/wallmessage.tpl b/view/smarty3/wallmessage.tpl
deleted file mode 100644
index 6eeabe9ed4..0000000000
--- a/view/smarty3/wallmessage.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h3>{{$header}}</h3>
-
-<h4>{{$subheader}}</h4>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="wallmessage/{{$nickname}}" method="post" >
-
-{{$parent}}
-
-<div id="prvmail-to-label">{{$to}}</div>
-{{$recipname}}
-
-<div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
-
-<div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/smarty3/wallmsg-end.tpl b/view/smarty3/wallmsg-end.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/smarty3/wallmsg-end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 8a8ccf00cb..0000000000
--- a/view/smarty3/wallmsg-header.tpl
+++ /dev/null
@@ -1,87 +0,0 @@
-{{*
- *	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">
-
-var plaintext = '{{$editselect}}';
-
-if(plaintext != 'none') {
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: /(profile-jot-text|prvmail-text)/,
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		//force_p_newlines : false,
-		//force_br_newlines : true,
-		forced_root_block : 'div',
-		convert_urls: false,
-		content_css: "{{$baseurl}}/view/custom_tinymce.css",
-		     //Character count
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				var editorId = ed.editorId;
-				var textarea = $('#'+editorId);
-				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-					textarea.attr('tabindex', null);
-				}
-			});
-		}
-	});
-}
-else
-	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-
-
-</script>
-<script>
-
-	function jotGetLink() {
-		reply = prompt("{{$linkurl}}");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-</script>
-
diff --git a/view/smarty3/xrd_diaspora.tpl b/view/smarty3/xrd_diaspora.tpl
deleted file mode 100644
index 143980bcc6..0000000000
--- a/view/smarty3/xrd_diaspora.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 1f273e010a..0000000000
--- a/view/smarty3/xrd_host.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	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'>
- 
-    <hm:Host>{{$zhost}}</hm:Host>
- 
-    <Link rel='lrdd' template='{{$domain}}/xrd/?uri={uri}' />
-    <Link rel='acct-mgmt' href='{{$domain}}/amcd' />
-    <Link rel='http://services.mozilla.com/amcd/0.1' href='{{$domain}}/amcd' />
-	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
-        href="{{$domain}}/oexchange/xrd" />
-
-    <Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
-        type="http://salmon-protocol.org/ns/magic-key"
-        mk:key_id="1">{{$bigkey}}</Property>
-
-
-</XRD>
diff --git a/view/smarty3/xrd_person.tpl b/view/smarty3/xrd_person.tpl
deleted file mode 100644
index 3f12eff515..0000000000
--- a/view/smarty3/xrd_person.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-{{*
- *	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">
- 
-    <Subject>{{$accturi}}</Subject>
-	<Alias>{{$accturi}}</Alias>
-    <Alias>{{$profile_url}}</Alias>
- 
-    <Link rel="http://purl.org/macgirvin/dfrn/1.0"
-          href="{{$profile_url}}" />
-    <Link rel="http://schemas.google.com/g/2010#updates-from" 
-          type="application/atom+xml" 
-          href="{{$atom}}" />
-    <Link rel="http://webfinger.net/rel/profile-page"
-          type="text/html"
-          href="{{$profile_url}}" />
-    <Link rel="http://microformats.org/profile/hcard"
-          type="text/html"
-          href="{{$hcard_url}}" />
-    <Link rel="http://portablecontacts.net/spec/1.0"
-          href="{{$poco_url}}" />
-    <Link rel="http://webfinger.net/rel/avatar"
-          type="image/jpeg"
-          href="{{$photo}}" />
-	{{$dspr}}
-    <Link rel="salmon" 
-          href="{{$salmon}}" />
-    <Link rel="http://salmon-protocol.org/ns/salmon-replies" 
-          href="{{$salmon}}" />
-    <Link rel="http://salmon-protocol.org/ns/salmon-mention" 
-          href="{{$salmen}}" />
-    <Link rel="magic-public-key" 
-          href="{{$modexp}}" />
- 
-	<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
-          type="http://salmon-protocol.org/ns/magic-key"
-          mk:key_id="1">{{$bigkey}}</Property>
-
-</XRD>
diff --git a/view/suggest_friends.tpl b/view/suggest_friends.tpl
deleted file mode 100644
index e97b5e8cce..0000000000
--- a/view/suggest_friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<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">
-		<a href="$url">
-			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="$url" title="$name">$name</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{ if $connlnk }}
-	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
-	{{ endif }}
-</div>
\ No newline at end of file
diff --git a/view/suggestions.tpl b/view/suggestions.tpl
deleted file mode 100644
index 656336496c..0000000000
--- a/view/suggestions.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<div class="intro-wrapper" >
-
-<p class="intro-desc">$str_notifytype $notify_type</p>
-<div class="intro-madeby">$madeby</div>
-<div class="intro-fullname" >$fullname</div>
-<a class="intro-url-link" href="$url" ><img class="intro-photo lframe" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
-<div class="intro-note" >$note</div>
-<div class="intro-wrapper-end"></div>
-<form class="intro-form" action="notifications/$intro_id" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" />
-<input class="intro-submit-discard" type="submit" name="submit" value="$discard" />
-</form>
-<div class="intro-form-end"></div>
-
-<form class="intro-approve-form" action="$request" method="get">
-{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-<input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
-</form>
-</div>
-<div class="intro-end"></div>
diff --git a/view/tag_slap.tpl b/view/tag_slap.tpl
deleted file mode 100644
index 6449df4967..0000000000
--- a/view/tag_slap.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-	<entry>
-		<author>
-			<name>$name</name>
-			<uri>$profile_page</uri>
-			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
-			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
-		</author>
-
-		<id>$item_id</id>
-		<title>$title</title>
-		<published>$published</published>
-		<content type="$type" >$content</content>
-		<link rel="mentioned" href="$accturi" />
-		<as:actor>
-		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
-		<id>$profile_page</id>
-		<title></title>
- 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="$photo"/>
-		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb"/>
-		<poco:preferredUsername>$nick</poco:preferredUsername>
-		<poco:displayName>$name</poco:displayName>
-		</as:actor>
- 		<as:verb>$verb</as:verb>
-		<as:object>
-		<as:object-type></as:object-type>
-		</as:object>
-		<as:target>
-		<as:object-type></as:object-type>
-		</as:target>
-	</entry>
diff --git a/view/theme/cleanzero/nav.tpl b/view/theme/cleanzero/nav.tpl
deleted file mode 100644
index 17a2f72590..0000000000
--- a/view/theme/cleanzero/nav.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
- <nav>
-	$langselector
-
-	<div id="site-location">$sitelocation</div>
-
-
-	<span id="nav-commlink-wrapper">
-
-	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-		
-
-
-	{{ if $nav.network }}
-	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.home }}
-	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.community }}
-	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-	{{ endif }}
-	{{ if $nav.introductions }}
-	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.messages }}
-	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{ endif }}
-		{{ if $nav.notifications }}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-		{{ endif }}	
-	</span>
-       <span id="banner">$banner</span>
-	<span id="nav-link-wrapper">
-	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-		
-	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-
-
-	
-
-	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
-
-
-	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-	</span>
-	<span id="nav-end"></span>
-	
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-<script>
-var pagetitle = null;
-$("nav").bind('nav-update', function(e,data){
-if (pagetitle==null) pagetitle = document.title;
-var count = $(data).find('notif').attr('count');
-if (count>0) {
-document.title = "("+count+") "+pagetitle;
-} else {
-document.title = pagetitle;
-}
-});
-</script>
diff --git a/view/theme/cleanzero/smarty3/nav.tpl b/view/theme/cleanzero/smarty3/nav.tpl
deleted file mode 100644
index 437c7e5959..0000000000
--- a/view/theme/cleanzero/smarty3/nav.tpl
+++ /dev/null
@@ -1,90 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
- <nav>
-	{{$langselector}}
-
-	<div id="site-location">{{$sitelocation}}</div>
-
-
-	<span id="nav-commlink-wrapper">
-
-	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
-		
-
-
-	{{if $nav.network}}
-	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.home}}
-	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.community}}
-	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
-	{{/if}}
-	{{if $nav.introductions}}
-	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.messages}}
-	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{/if}}
-		{{if $nav.notifications}}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-		{{/if}}	
-	</span>
-       <span id="banner">{{$banner}}</span>
-	<span id="nav-link-wrapper">
-	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
-	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
-	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
-		
-	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
-
-	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
-	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
-
-	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
-
-
-
-	
-
-	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
-	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
-
-	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
-
-
-	{{if $nav.manage}}<a id="nav-manage-link" class="nav-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
-	</span>
-	<span id="nav-end"></span>
-	
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-<script>
-var pagetitle = null;
-$("nav").bind('nav-update', function(e,data){
-if (pagetitle==null) pagetitle = document.title;
-var count = $(data).find('notif').attr('count');
-if (count>0) {
-document.title = "("+count+") "+pagetitle;
-} else {
-document.title = pagetitle;
-}
-});
-</script>
diff --git a/view/theme/cleanzero/smarty3/theme_settings.tpl b/view/theme/cleanzero/smarty3/theme_settings.tpl
deleted file mode 100644
index 0743b25947..0000000000
--- a/view/theme/cleanzero/smarty3/theme_settings.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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}}
-{{include file="field_select.tpl" field=$theme_width}}
-
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="cleanzero-settings-submit" />
-</div>
-
diff --git a/view/theme/cleanzero/theme_settings.tpl b/view/theme/cleanzero/theme_settings.tpl
deleted file mode 100644
index bfe18af27d..0000000000
--- a/view/theme/cleanzero/theme_settings.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{inc field_select.tpl with $field=$color}}{{endinc}}
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
-{{inc field_select.tpl with $field=$resize}}{{endinc}}
-{{inc field_select.tpl with $field=$theme_width}}{{endinc}}
-
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="cleanzero-settings-submit" />
-</div>
-
diff --git a/view/theme/comix-plain/comment_item.tpl b/view/theme/comix-plain/comment_item.tpl
deleted file mode 100644
index 045a350f6d..0000000000
--- a/view/theme/comix-plain/comment_item.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-		<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" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-				{{ if $qcomment }}
-				{{ for $qcomment as $qc }}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
-					&nbsp;
-				{{ endfor }}
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/comix-plain/search_item.tpl b/view/theme/comix-plain/search_item.tpl
deleted file mode 100644
index cf1c388cd2..0000000000
--- a/view/theme/comix-plain/search_item.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-<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">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-$item.id" >$item.body</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-
-</div>
-
-
diff --git a/view/theme/comix-plain/smarty3/comment_item.tpl b/view/theme/comix-plain/smarty3/comment_item.tpl
deleted file mode 100644
index 6e1bdd7747..0000000000
--- a/view/theme/comix-plain/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	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}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
-				{{if $qcomment}}
-				{{foreach $qcomment as $qc}}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
-					&nbsp;
-				{{/foreach}}
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/comix-plain/smarty3/search_item.tpl b/view/theme/comix-plain/smarty3/search_item.tpl
deleted file mode 100644
index e07731246c..0000000000
--- a/view/theme/comix-plain/smarty3/search_item.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-{{*
- *	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}}">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
-				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
-
-</div>
-
-
diff --git a/view/theme/comix/comment_item.tpl b/view/theme/comix/comment_item.tpl
deleted file mode 100644
index 045a350f6d..0000000000
--- a/view/theme/comix/comment_item.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-		<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" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-				{{ if $qcomment }}
-				{{ for $qcomment as $qc }}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
-					&nbsp;
-				{{ endfor }}
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/comix/search_item.tpl b/view/theme/comix/search_item.tpl
deleted file mode 100644
index 34c176ceef..0000000000
--- a/view/theme/comix/search_item.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-<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">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-$item.id" >$item.body</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
-
-</div>
-
-
diff --git a/view/theme/comix/smarty3/comment_item.tpl b/view/theme/comix/smarty3/comment_item.tpl
deleted file mode 100644
index 6e1bdd7747..0000000000
--- a/view/theme/comix/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	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}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
-				{{if $qcomment}}
-				{{foreach $qcomment as $qc}}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
-					&nbsp;
-				{{/foreach}}
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/comix/smarty3/search_item.tpl b/view/theme/comix/smarty3/search_item.tpl
deleted file mode 100644
index a52d93f5cd..0000000000
--- a/view/theme/comix/smarty3/search_item.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-{{*
- *	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}}">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
-				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
-
-</div>
-
-
diff --git a/view/theme/decaf-mobile/acl_html_selector.tpl b/view/theme/decaf-mobile/acl_html_selector.tpl
deleted file mode 100644
index e84b0eefca..0000000000
--- a/view/theme/decaf-mobile/acl_html_selector.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<a name="acl-wrapper-target"></a>
-<div id="acl-wrapper">
-	<div id="acl-public-switch">
-		<a href="$return_path#acl-wrapper-target" {{ if $is_private == 1 }}class="acl-public-switch-selected"{{ endif }} >$private</a>
-		<a href="$return_path$public_link#acl-wrapper-target" {{ if $is_private == 0 }}class="acl-public-switch-selected"{{ endif }} >$public</a>
-	</div>
-	<div id="acl-list">
-		<div id="acl-list-content">
-			<div id="acl-html-groups" class="acl-html-select-wrapper">
-			$group_perms<br />
-			<select name="group_allow[]" multiple {{ if $is_private == 0 }}disabled{{ endif }} id="acl-html-group-select" class="acl-html-select" size=7>
-				{{ for $acl_data.groups as $group }}
-				<option value="$group.id" {{ if $is_private == 1 }}{{ if $group.selected }}selected{{ endif }}{{ endif }}>$group.name</option>
-				{{ endfor }}
-			</select>
-			</div>
-			<div id="acl-html-contacts" class="acl-html-select-wrapper">
-			$contact_perms<br />
-			<select name="contact_allow[]" multiple {{ if $is_private == 0 }}disabled{{ endif }} id="acl-html-contact-select" class="acl-html-select" size=7>
-				{{ for $acl_data.contacts as $contact }}
-				<option value="$contact.id" {{ if $is_private == 1 }}{{ if $contact.selected }}selected{{ endif }}{{ endif }}>$contact.name ($contact.networkName)</option>
-				{{ endfor }}
-			</select>
-			</div>
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</div>
-
diff --git a/view/theme/decaf-mobile/acl_selector.tpl b/view/theme/decaf-mobile/acl_selector.tpl
deleted file mode 100644
index 8e9916c950..0000000000
--- a/view/theme/decaf-mobile/acl_selector.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<div id="acl-wrapper">
-	<input id="acl-search">
-	<a href="#" id="acl-showall">$showall</a>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</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>
-
-{#<!--<script>
-	window.allowCID = $allowcid;
-	window.allowGID = $allowgid;
-	window.denyCID = $denycid;
-	window.denyGID = $denygid;
-	window.aclInit = "true";
-</script>-->#}
diff --git a/view/theme/decaf-mobile/admin_aside.tpl b/view/theme/decaf-mobile/admin_aside.tpl
deleted file mode 100644
index da3ed23a88..0000000000
--- a/view/theme/decaf-mobile/admin_aside.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<h4><a href="$admurl">$admtxt</a></h4>
-<ul class='admin linklist'>
-	<li class='admin button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
-	<li class='admin button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
-	<li class='admin button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
-	<li class='admin button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
-	<li class='admin button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
-</ul>
-
-{{ if $admin.update }}
-<ul class='admin linklist'>
-	<li class='admin button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
-	<li class='admin button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
-</ul>
-{{ endif }}
-
-
-{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
-<ul class='admin linklist'>
-	{{ for $admin.plugins_admin as $l }}
-	<li class='admin button $l.2'><a href='$l.0'>$l.1</a></li>
-	{{ endfor }}
-</ul>
-	
-	
-<h4>$logtxt</h4>
-<ul class='admin linklist'>
-	<li class='admin button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
-</ul>
-
diff --git a/view/theme/decaf-mobile/admin_site.tpl b/view/theme/decaf-mobile/admin_site.tpl
deleted file mode 100644
index 61f52b18dc..0000000000
--- a/view/theme/decaf-mobile/admin_site.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='$form_security_token'>
-
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} 
-	{{ inc field_select.tpl with $field=$singleuser }}{{ endinc }} 
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$registration</h3>
-	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	
-	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-
-	<h3>$upload</h3>
-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
-	
-	<h3>$corporate</h3>
-	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ostatus_poll_interval }}{{ endinc }} 
-	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }}	
-	{{ inc field_checkbox.tpl with $field=$disable_embedded }}{{ endinc }}	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$advanced</h3>
-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	</form>
-</div>
diff --git a/view/theme/decaf-mobile/admin_users.tpl b/view/theme/decaf-mobile/admin_users.tpl
deleted file mode 100644
index c3abbeb9c0..0000000000
--- a/view/theme/decaf-mobile/admin_users.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	{#/*function selectall(cls){
-		$j("."+cls).attr('checked','checked');
-		return false;
-	}*/#}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='tool like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='tool dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			{#<!--<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>-->#}
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
-						<td class="checkbox"> 
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-                                    {{ endif }}
-						<td class="tools">
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                        <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
-                                    {{ endif }}
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			{#<!--<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>-->#}
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/decaf-mobile/album_edit.tpl b/view/theme/decaf-mobile/album_edit.tpl
deleted file mode 100644
index 3fe2d9fe92..0000000000
--- a/view/theme/decaf-mobile/album_edit.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="photo-album-edit-wrapper">
-<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/$nickname/album/$hexalbum" method="post" >
-	<input id="photo-album-edit-form-confirm" type="hidden" name="confirm" value="1" />
-
-	<label id="photo-album-edit-name-label" for="photo-album-edit-name" >$nametext</label>
-	<input type="text" size="64" name="albumname" value="$album" >
-
-	<div id="photo-album-edit-name-end"></div>
-
-	<input id="photo-album-edit-submit" type="submit" name="submit" value="$submit" />
-	<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="$dropsubmit" onclick="return confirmDelete(function(){remove('photo-album-edit-form-confirm');});" />
-
-</form>
-</div>
-<div id="photo-album-edit-end" ></div>
diff --git a/view/theme/decaf-mobile/categories_widget.tpl b/view/theme/decaf-mobile/categories_widget.tpl
deleted file mode 100644
index ebc62404b8..0000000000
--- a/view/theme/decaf-mobile/categories_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{#<!--<div id="categories-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="categories-ul">
-		<li class="tool"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
-		{{ for $terms as $term }}
-			<li class="tool"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>-->#}
diff --git a/view/theme/decaf-mobile/comment_item.tpl b/view/theme/decaf-mobile/comment_item.tpl
deleted file mode 100755
index ee0e8c7916..0000000000
--- a/view/theme/decaf-mobile/comment_item.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-{#<!--		<script>
-		$(document).ready( function () {
-			$(document).mouseup(function(e) {
-				var container = $("#comment-edit-wrapper-$id");
-				if( container.has(e.target).length === 0) {
-					commentClose(document.getElementById('comment-edit-text-$id'),$id);
-					cmtBbClose($id);
-				}
-			});
-		});
-		</script>-->#}
-
-		<div class="comment-wwedit-wrapper $indent" id="comment-edit-wrapper-$id" style="display: block;" >
-			<a name="comment-wwedit-wrapper-pos"></a>
-			<form class="comment-edit-form $indent" id="comment-edit-form-$id" action="item" method="post" >
-{#<!--			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">-->#}
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="source" value="$sourceapp" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path#comment-wwedit-wrapper-pos" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				{#<!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->#}
-					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				{#<!--</div>-->#}
-				{#<!--<div class="comment-edit-photo-end"></div>-->#}
-				{#<!--<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>-->#}
-{#<!--					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>-->#}
-				{#<!--</ul>	-->#}
-				{#<!--<div class="comment-edit-bb-end"></div>-->#}
-{#<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->#}
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-full" name="body" ></textarea>
-				{#<!--{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}-->#}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" >
-					<input type="submit" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					{#<!--<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="preview-link fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>-->#}
-				</div>
-
-				{#<!--<div class="comment-edit-end"></div>-->#}
-			</form>
-
-		</div>
diff --git a/view/theme/decaf-mobile/common_tabs.tpl b/view/theme/decaf-mobile/common_tabs.tpl
deleted file mode 100644
index 940e5aeb2f..0000000000
--- a/view/theme/decaf-mobile/common_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<ul class="tabs">
-	{{ for $tabs as $tab }}
-		<li id="$tab.id"><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
-	{{ endfor }}
-	<div id="tabs-end"></div>
-</ul>
diff --git a/view/theme/decaf-mobile/contact_block.tpl b/view/theme/decaf-mobile/contact_block.tpl
deleted file mode 100644
index a8e34fce16..0000000000
--- a/view/theme/decaf-mobile/contact_block.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{#<!--<div id="contact-block">
-<h4 class="contact-block-h4">$contacts</h4>
-{{ if $micropro }}
-		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
-		<div class='contact-block-content'>
-		{{ for $micropro as $m }}
-			$m
-		{{ endfor }}
-		</div>
-{{ endif }}
-</div>
-<div class="clear"></div>-->#}
diff --git a/view/theme/decaf-mobile/contact_edit.tpl b/view/theme/decaf-mobile/contact_edit.tpl
deleted file mode 100644
index e113018b31..0000000000
--- a/view/theme/decaf-mobile/contact_edit.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-wrapper" >
-
-	$tab_str
-
-	<div id="contact-edit-drop-link-wrapper" >
-		<a href="contacts/$contact_id/drop?confirm=1" class="icon drophide" id="contact-edit-drop-link" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'contacts/$contact_id/drop')});"  title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#}></a>
-	</div>
-
-	<div id="contact-edit-drop-link-end"></div>
-
-	<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>
-	</div>
-
-
-	<div id="contact-edit-nav-wrapper" >
-		<div id="contact-edit-links">
-			<ul>
-				<li><div id="contact-edit-rel">$relation_text</div></li>
-				<li><div id="contact-edit-nettype">$nettype</div></li>
-				{{ if $lost_contact }}
-					<li><div id="lost-contact-message">$lost_contact</div></li>
-				{{ endif }}
-				{{ if $insecure }}
-					<li><div id="insecure-message">$insecure</div></li>
-				{{ endif }}
-				{{ if $blocked }}
-					<li><div id="block-message">$blocked</div></li>
-				{{ endif }}
-				{{ if $ignored }}
-					<li><div id="ignore-message">$ignored</div></li>
-				{{ endif }}
-				{{ if $archived }}
-					<li><div id="archive-message">$archived</div></li>
-				{{ endif }}
-
-				<li>&nbsp;</li>
-
-				{{ if $common_text }}
-					<li><div id="contact-edit-common"><a href="$common_link">$common_text</a></div></li>
-				{{ endif }}
-				{{ if $all_friends }}
-					<li><div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div></li>
-				{{ endif }}
-
-
-				<li><a href="network/0?nets=all&cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
-				{{ if $lblsuggest }}
-					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
-				{{ endif }}
-
-			</ul>
-		</div>
-	</div>
-	<div id="contact-edit-nav-end"></div>
-
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-	{{ if $poll_enabled }}
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></div>
-			<span id="contact-edit-poll-text">$updpub $poll_interval</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/$contact_id/update" >$udnow</a></span>
-		</div>
-	{{ endif }}
-	<div id="contact-edit-end" ></div>
-
-	{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-
-<div id="contact-edit-info-wrapper">
-<h4>$lbl_info1</h4>
-	<textarea id="contact-edit-info" rows="8"{# cols="35"#} name="info">$info</textarea>
-	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-</div>
-<div id="contact-edit-info-end"></div>
-
-
-<div id="contact-edit-profile-select-text">
-<h4>$lbl_vis1</h4>
-<p>$lbl_vis2</p> 
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-
-</form>
-</div>
diff --git a/view/theme/decaf-mobile/contact_head.tpl b/view/theme/decaf-mobile/contact_head.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/decaf-mobile/contact_template.tpl b/view/theme/decaf-mobile/contact_template.tpl
deleted file mode 100644
index 4ef0405b7b..0000000000
--- a/view/theme/decaf-mobile/contact_template.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		{#onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id);" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-$contact.id\');',200)"#} >
-
-{#<!--			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>-->#}
-			{#<!--<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">-->#}
-			<a href="$contact.photo_menu.edit.1" title="$contact.photo_menu.edit.0">
-			<img src="$contact.thumb" $contact.sparkle alt="$contact.name" />
-			</a>
-			{#<!--</span>-->#}
-
-{#<!--			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-						{{ for $contact.photo_menu as $c }}
-						{{ if $c.2 }}
-						<li><a target="redir" href="$c.1">$c.0</a></li>
-						{{ else }}
-						<li><a href="$c.1">$c.0</a></li>
-						{{ endif }}
-						{{ endfor }}
-                    </ul>
-                </div>
-			{{ endif }}-->#}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div><br />
-{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-	<div class="contact-entry-network" id="contact-entry-network-$contact.id" >$contact.network</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/decaf-mobile/contacts-end.tpl b/view/theme/decaf-mobile/contacts-end.tpl
deleted file mode 100644
index fea596360b..0000000000
--- a/view/theme/decaf-mobile/contacts-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{#<!--
-<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
-
--->#}
diff --git a/view/theme/decaf-mobile/contacts-head.tpl b/view/theme/decaf-mobile/contacts-head.tpl
deleted file mode 100644
index 6c7355f4c7..0000000000
--- a/view/theme/decaf-mobile/contacts-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{#<!--
-<script>
-	window.autocompleteType = 'contacts-head';
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/contacts-template.tpl b/view/theme/decaf-mobile/contacts-template.tpl
deleted file mode 100644
index 76254c1ca8..0000000000
--- a/view/theme/decaf-mobile/contacts-template.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<h1>$header{{ if $total }} ($total){{ endif }}</h1>
-
-{{ if $finding }}<h4>$finding</h4>{{ endif }}
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="$cmd" method="get" >
-<span class="contacts-search-desc">$desc</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-$tabs
-
-
-<div id="contacts-display-wrapper">
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
-</div>
-<div id="contact-edit-end"></div>
-
-$paginate
-
-
-
-
diff --git a/view/theme/decaf-mobile/contacts-widget-sidebar.tpl b/view/theme/decaf-mobile/contacts-widget-sidebar.tpl
deleted file mode 100644
index 1c63f9eab2..0000000000
--- a/view/theme/decaf-mobile/contacts-widget-sidebar.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-$follow_widget
-
diff --git a/view/theme/decaf-mobile/conversation.tpl b/view/theme/decaf-mobile/conversation.tpl
deleted file mode 100644
index d39976f39f..0000000000
--- a/view/theme/decaf-mobile/conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	{{ for $thread.items as $item }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-		
-		{{ inc $item.template }}{{ endinc }}
-		
-		
-	{{ endfor }}
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{#<!--{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}-->#}
diff --git a/view/theme/decaf-mobile/cropbody.tpl b/view/theme/decaf-mobile/cropbody.tpl
deleted file mode 100644
index 3283084cad..0000000000
--- a/view/theme/decaf-mobile/cropbody.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>$title</h1>
-<p id="cropimage-desc">
-$desc
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="$done" />
-</div>
-
-</form>
diff --git a/view/theme/decaf-mobile/cropend.tpl b/view/theme/decaf-mobile/cropend.tpl
deleted file mode 100644
index a27de0e2f8..0000000000
--- a/view/theme/decaf-mobile/cropend.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{#<!--      <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>
-      <script type="text/javascript" language="javascript">initCrop();</script>-->#}
diff --git a/view/theme/decaf-mobile/crophead.tpl b/view/theme/decaf-mobile/crophead.tpl
deleted file mode 100644
index 56e941e3ab..0000000000
--- a/view/theme/decaf-mobile/crophead.tpl
+++ /dev/null
@@ -1 +0,0 @@
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/decaf-mobile/display-head.tpl b/view/theme/decaf-mobile/display-head.tpl
deleted file mode 100644
index 1c990657f0..0000000000
--- a/view/theme/decaf-mobile/display-head.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{#<!--<script>
-	window.autoCompleteType = 'display-head';
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/end.tpl b/view/theme/decaf-mobile/end.tpl
deleted file mode 100644
index 2e78838e01..0000000000
--- a/view/theme/decaf-mobile/end.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--[if IE]>
-<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-{#<!--<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
-<script type="text/javascript">
-  tinyMCE.init({ mode : "none"});
-</script>-->#}
-{#<!--<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
-<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/fk.autocomplete.js" ></script>-->#}
-{#<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>-->#}
-{#<!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->#}
-{#<!--<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/acl.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/main.js" ></script>-->#}
-<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/theme.js"></script>
-
-<!--<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/jquery.package.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/decaf-mobile.package.js" ></script>-->
-
diff --git a/view/theme/decaf-mobile/event_end.tpl b/view/theme/decaf-mobile/event_end.tpl
deleted file mode 100644
index 3e4be6ec61..0000000000
--- a/view/theme/decaf-mobile/event_end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{#<!--<script language="javascript" type="text/javascript"
-          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
-
--->#}
diff --git a/view/theme/decaf-mobile/event_head.tpl b/view/theme/decaf-mobile/event_head.tpl
deleted file mode 100644
index 63a1135af6..0000000000
--- a/view/theme/decaf-mobile/event_head.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
-{#<!--
-<script language="javascript" type="text/javascript">
-window.aclType = 'event_head';
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/field_checkbox.tpl b/view/theme/decaf-mobile/field_checkbox.tpl
deleted file mode 100644
index 9fbf84eac9..0000000000
--- a/view/theme/decaf-mobile/field_checkbox.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field checkbox' id='div_id_$field.0'>
-		<label id='label_id_$field.0' for='id_$field.0'>$field.1</label>
-		<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}><br />
-		<span class='field_help' id='help_id_$field.0'>$field.3</span>
-	</div>
diff --git a/view/theme/decaf-mobile/field_input.tpl b/view/theme/decaf-mobile/field_input.tpl
deleted file mode 100644
index 58e17406c0..0000000000
--- a/view/theme/decaf-mobile/field_input.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label><br />
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/decaf-mobile/field_openid.tpl b/view/theme/decaf-mobile/field_openid.tpl
deleted file mode 100644
index 8d330a30a0..0000000000
--- a/view/theme/decaf-mobile/field_openid.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input openid' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label><br />
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/decaf-mobile/field_password.tpl b/view/theme/decaf-mobile/field_password.tpl
deleted file mode 100644
index 7a0d3fe9f4..0000000000
--- a/view/theme/decaf-mobile/field_password.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field password' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label><br />
-		<input type='password' name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/decaf-mobile/field_themeselect.tpl b/view/theme/decaf-mobile/field_themeselect.tpl
deleted file mode 100644
index 5ac310f804..0000000000
--- a/view/theme/decaf-mobile/field_themeselect.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0' {#{{ if $field.5 }}onchange="previewTheme(this);"{{ endif }}#} >
-			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
-		</select>
-		<span class='field_help'>$field.3</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/theme/decaf-mobile/field_yesno.tpl b/view/theme/decaf-mobile/field_yesno.tpl
deleted file mode 100644
index c399579b29..0000000000
--- a/view/theme/decaf-mobile/field_yesno.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{#<!--	<div class='field yesno'>
-		<label for='id_$field.0'>$field.1</label>
-		<div class='onoff' id="id_$field.0_onoff">
-			<input  type="hidden" name='$field.0' id='id_$field.0' value="$field.2">
-			<a href="#" class='off'>
-				{{ if $field.4 }}$field.4.0{{ else }}OFF{{ endif }}
-			</a>
-			<a href="#" class='on'>
-				{{ if $field.4 }}$field.4.1{{ else }}ON{{ endif }}
-			</a>
-		</div>
-		<span class='field_help'>$field.3</span>
-	</div>-->#}
-{{ inc field_checkbox.tpl }}{{ endinc }}
diff --git a/view/theme/decaf-mobile/generic_links_widget.tpl b/view/theme/decaf-mobile/generic_links_widget.tpl
deleted file mode 100644
index a976d4573c..0000000000
--- a/view/theme/decaf-mobile/generic_links_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="widget{{ if $class }} $class{{ endif }}">
-{#<!--	{{if $title}}<h3>$title</h3>{{endif}}-->#}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul class="tabs links-widget">
-		{{ for $items as $item }}
-			<li class="tool"><a href="$item.url" class="tab {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-		<div id="tabs-end"></div>
-	</ul>
-	
-</div>
diff --git a/view/theme/decaf-mobile/group_drop.tpl b/view/theme/decaf-mobile/group_drop.tpl
deleted file mode 100644
index 959b77bb21..0000000000
--- a/view/theme/decaf-mobile/group_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id?t=$form_security_token" 
-		onclick="return confirmDelete();" 
-		id="group-delete-icon-$id" 
-		class="icon drophide group-delete-icon" 
-		{#onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);"#} ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/decaf-mobile/group_side.tpl b/view/theme/decaf-mobile/group_side.tpl
deleted file mode 100644
index 0b4564077a..0000000000
--- a/view/theme/decaf-mobile/group_side.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						{#onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"#}
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}			
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
-				{{ endif }}
-				<a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-  {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>
-
-
diff --git a/view/theme/decaf-mobile/head.tpl b/view/theme/decaf-mobile/head.tpl
deleted file mode 100644
index a8b2133189..0000000000
--- a/view/theme/decaf-mobile/head.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<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'>
-<meta content='320' name='MobileOptimized'>-->#}
-<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
-{#<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->#}
-
-<base href="$baseurl/" />
-<meta name="generator" content="$generator" />
-{#<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />-->#}
-
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-
-<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
-<link rel="search"
-         href="$baseurl/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
-<script>
-	window.delItem = "$delitem";
-{#/*	window.commentEmptyText = "$comment";
-	window.showMore = "$showmore";
-	window.showFewer = "$showfewer";
-	var updateInterval = $update_interval;
-	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};*/#}
-</script>
diff --git a/view/theme/decaf-mobile/jot-end.tpl b/view/theme/decaf-mobile/jot-end.tpl
deleted file mode 100644
index 59585d01d5..0000000000
--- a/view/theme/decaf-mobile/jot-end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-{#<!--
-<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
--->#}
diff --git a/view/theme/decaf-mobile/jot-header.tpl b/view/theme/decaf-mobile/jot-header.tpl
deleted file mode 100644
index c239aeecd8..0000000000
--- a/view/theme/decaf-mobile/jot-header.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<script>
-{#/*	var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
-	window.editSelect = $editselect;
-	window.isPublic = "$ispublic";
-	window.nickname = "$nickname";
-	window.linkURL = "$linkurl";
-	window.vidURL = "$vidurl";
-	window.audURL = "$audurl";
-	window.whereAreU = "$whereareu";
-	window.term = "$term";
-	window.baseURL = "$baseurl";
-	window.geoTag = function () { $geotag }*/#}
-	window.jotId = "#profile-jot-text";
-	window.imageUploadButton = 'wall-image-upload';
-</script>
-
diff --git a/view/theme/decaf-mobile/jot.tpl b/view/theme/decaf-mobile/jot.tpl
deleted file mode 100644
index 697a7c8094..0000000000
--- a/view/theme/decaf-mobile/jot.tpl
+++ /dev/null
@@ -1,99 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="source" value="$sourceapp" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" ></div>
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" /></div>
-		{{ endif }}
-		<div id="jot-text-wrap">
-		{#<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />-->#}
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder=$share >{{ if $content }}$content{{ endif }}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" style="display: none;" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" style="display: none;" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div> 
-
-	{#<!--<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->#}
-	{#<!--<div id="profile-link-wrapper" style="display: $visitor;" >
-		<a id="profile-link" class="icon link" title="$weblink" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> -->#}
-
-	{#<!--<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>-->#}
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	{#<!--<div style="display: none;">-->#}
-		<div id="profile-jot-acl-wrapper">
-			{#<!--$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			$jotnets
-			<div id="profile-jot-networks-end"></div>-->#}
-			{{ if $acl_data }}
-			{{ inc acl_html_selector.tpl }}{{ endinc }}
-			{{ endif }}
-			$jotnets
-		</div>
-	{#<!--</div>-->#}
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{#<!--{{ if $content }}<script>window.jotInit = true;</script>{{ endif }}-->#}
-<script>
-document.getElementById('wall-image-upload-div').style.display = "inherit";
-document.getElementById('wall-file-upload-div').style.display = "inherit";
-</script>
diff --git a/view/theme/decaf-mobile/jot_geotag.tpl b/view/theme/decaf-mobile/jot_geotag.tpl
deleted file mode 100644
index 3f8bee91a7..0000000000
--- a/view/theme/decaf-mobile/jot_geotag.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			var lat = position.coords.latitude.toFixed(4);
-			var lon = position.coords.longitude.toFixed(4);
-
-			$j('#jot-coord').val(lat + ', ' + lon);
-			$j('#profile-nolocation-wrapper').show();
-		});
-	}
-
diff --git a/view/theme/decaf-mobile/lang_selector.tpl b/view/theme/decaf-mobile/lang_selector.tpl
deleted file mode 100644
index e777a0a861..0000000000
--- a/view/theme/decaf-mobile/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/decaf-mobile/like_noshare.tpl b/view/theme/decaf-mobile/like_noshare.tpl
deleted file mode 100644
index 5e74850a7a..0000000000
--- a/view/theme/decaf-mobile/like_noshare.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-	<a href="like/$id?verb=like&return=$return_path#$item.id" class="icon like" title="$likethis" ></a>
-	{{ if $nolike }}
-	<a href="like/$id?verb=dislike&return=$return_path#$item.id" class="icon dislike" title="$nolike" ></a>
-	{{ endif }}
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
diff --git a/view/theme/decaf-mobile/login.tpl b/view/theme/decaf-mobile/login.tpl
deleted file mode 100644
index 926ab769d2..0000000000
--- a/view/theme/decaf-mobile/login.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<div class="login-form">
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-
-	<br />
-	<div id='login-footer'>
-	{#<!--<div class="login-extra-links">
-	By signing in you agree to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-	</div>-->#}
-
-	<br />
-	{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
-
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-
-	<br /><br />
-	<div class="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>
-	</div>
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-</div>
-
-{#<!--<script type="text/javascript">window.loginName = "$lname.0";</script>-->#}
diff --git a/view/theme/decaf-mobile/login_head.tpl b/view/theme/decaf-mobile/login_head.tpl
deleted file mode 100644
index 14734821ce..0000000000
--- a/view/theme/decaf-mobile/login_head.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{#<!--<link rel="stylesheet" href="$baseurl/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->#}
-
diff --git a/view/theme/decaf-mobile/lostpass.tpl b/view/theme/decaf-mobile/lostpass.tpl
deleted file mode 100644
index 583e3dbaff..0000000000
--- a/view/theme/decaf-mobile/lostpass.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="lostpass-form">
-<h2>$title</h2>
-<br /><br /><br />
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper" class="field input">
-        <label for="login-name" id="label-login-name">$name</label><br />
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<p id="lostpass-desc">
-$desc
-</p>
-<br />
-
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-</div>
diff --git a/view/theme/decaf-mobile/mail_conv.tpl b/view/theme/decaf-mobile/mail_conv.tpl
deleted file mode 100644
index 7aac8370b2..0000000000
--- a/view/theme/decaf-mobile/mail_conv.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<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>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-	</div>
-	<div class="mail-conv-body">$mail.body</div>
-</div>
-<div class="mail-conv-outside-wrapper-end"></div>
-
-
-<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id?confirm=1" class="icon drophide delete-icon mail-list-delete-icon" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/drop/$mail.id')});" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);#}" ></a></div>
-<div class="mail-conv-delete-end"></div>
-
-<hr class="mail-conv-break" />
diff --git a/view/theme/decaf-mobile/mail_list.tpl b/view/theme/decaf-mobile/mail_list.tpl
deleted file mode 100644
index 74274a246a..0000000000
--- a/view/theme/decaf-mobile/mail_list.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<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>
-	</div>
-	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >$from_name</div>
-		<div class="mail-list-date">$date</div>
-		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
-		<a href="message/dropconv/$id?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/dropconv/$id')});"  title="$delete" class="icon drophide mail-list-delete	delete-icon" id="mail-list-delete-$id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
-	</div>
-</div>
-</div>
-<div class="mail-list-delete-end"></div>
-
-<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/decaf-mobile/manage.tpl b/view/theme/decaf-mobile/manage.tpl
deleted file mode 100644
index fec30db9b0..0000000000
--- a/view/theme/decaf-mobile/manage.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<h3>$title</h3>
-<div id="identity-manage-desc">$desc</div>
-<div id="identity-manage-choose">$choose</div>
-<div id="identity-selector-wrapper">
-	<form action="manage" method="post" >
-	<select name="identity" size="4" onchange="this.form.submit();" >
-
-	{{ for $identities as $id }}
-		<option $id.selected value="$id.uid">$id.username ($id.nickname)</option>
-	{{ endfor }}
-
-	</select>
-	<div id="identity-select-break"></div>
-
-	{# name="submit" interferes with this.form.submit() #}
-	<input id="identity-submit" type="submit" {#name="submit"#} value="$submit" />
-</div></form>
-
diff --git a/view/theme/decaf-mobile/message-end.tpl b/view/theme/decaf-mobile/message-end.tpl
deleted file mode 100644
index fea596360b..0000000000
--- a/view/theme/decaf-mobile/message-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{#<!--
-<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
-
--->#}
diff --git a/view/theme/decaf-mobile/message-head.tpl b/view/theme/decaf-mobile/message-head.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/decaf-mobile/msg-end.tpl b/view/theme/decaf-mobile/msg-end.tpl
deleted file mode 100644
index 6074133798..0000000000
--- a/view/theme/decaf-mobile/msg-end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
diff --git a/view/theme/decaf-mobile/msg-header.tpl b/view/theme/decaf-mobile/msg-header.tpl
deleted file mode 100644
index 9ccf5d6fa2..0000000000
--- a/view/theme/decaf-mobile/msg-header.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-{#/*	window.nickname = "$nickname";
-	window.linkURL = "$linkurl";
-	var plaintext = "none";
-	window.autocompleteType = 'msg-header';*/#}
-	window.jotId = "#prvmail-text";
-	window.imageUploadButton = 'prvmail-upload';
-</script>
-
diff --git a/view/theme/decaf-mobile/nav.tpl b/view/theme/decaf-mobile/nav.tpl
deleted file mode 100644
index 45b7beeefc..0000000000
--- a/view/theme/decaf-mobile/nav.tpl
+++ /dev/null
@@ -1,155 +0,0 @@
-<nav>
-{#<!--	$langselector -->#}
-
-{#<!--	<div id="site-location">$sitelocation</div> -->#}
-
-	<span id="nav-link-wrapper" >
-
-{#<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->#}
-	<div class="nav-button-container">
-{#<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->#}
-	<a href="$nav.navigation.0" title="$nav.navigation.3" >
-	<img rel="#system-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/menu.png">
-	</a>
-{#<!--	</a>-->#}
-	{#<!--<ul id="system-menu-list" class="nav-menu-list">
-		{{ if $nav.login }}
-		<a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-		{{ endif }}
-
-		{{ if $nav.register }}
-		<a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
-		{{ endif }}
-
-		{{ if $nav.settings }}
-		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.manage }}
-		<li>
-		<a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
-		</li>
-		{{ endif }}
-
-		{{ if $nav.profiles }}
-		<li><a id="nav-profiles-link" class="$nav.profiles.2 nav-load-page-link" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.admin }}
-		<li><a id="nav-admin-link" class="$nav.admin.2 nav-load-page-link" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>
-		{{ endif }}
-
-		<li><a id="nav-search-link" class="$nav.search.2 nav-load-page-link" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
-
-		{{ if $nav.apps }}
-		<li><a id="nav-apps-link" class="$nav.apps.2 nav-load-page-link" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.help }}
-		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
-		{{ endif }}
-		
-		{{ if $nav.logout }}
-		<li><a id="nav-logout-link" class="$nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
-		{{ endif }}
-	</ul>-->#}
-	</div>
-
-	{{ if $nav.notifications }}
-{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->#}
-	<div class="nav-button-container">
-{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">-->#}
-	<a href="$nav.notifications.all.0">
-	<img rel="#nav-notifications-menu" class="nav-link" src="view/theme/decaf-mobile/images/notifications.png">
-	</a>
-{#<!--	</a>-->#}
-	{#<!--<span id="notify-update" class="nav-ajax-left"></span>
-	<ul id="nav-notifications-menu" class="notifications-menu-popup">
-		<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-		<li class="empty">$emptynotifications</li>
-	</ul>-->#}
-	</div>
-	{{ endif }}		
-
-{#<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->#}
-	{{ if $nav.contacts }}
-	<div class="nav-button-container">
-{#<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->#}
-	<a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >
-	<img rel="#contacts-menu-list"  class="nav-link" src="view/theme/decaf-mobile/images/contacts.png">
-	</a>
-	{#<!--</a>-->#}
-	{{ if $nav.introductions }}
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{#<!--<ul id="contacts-menu-list" class="nav-menu-list">
-		{{ if $nav.contacts }}
-		<li><a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><li>
-		{{ endif }}
-
-		<li><a id="nav-directory-link" class="$nav.directory.2 nav-load-page-link" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a><li>
-
-		{{ if $nav.introductions }}
-		<li>
-		<a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-		</li>
-		{{ endif }}
-	</ul>-->#}
-	</div>
-	{{ endif }}
-
-	{{ if $nav.messages }}
-{#<!--	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->#}
-	<div class="nav-button-container">
-	<a id="nav-messages-link" class="$nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
-	<img src="view/theme/decaf-mobile/images/message.png" class="nav-link">
-	</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	</div>
-	{{ endif }}
-
-{#<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->#}
-	{{ if $nav.network }}
-	<div class="nav-button-container">
-{#<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->#}
-	<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="/" >
-	<img rel="#network-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/network.png">
-	</a>
-{#<!--	</a>-->#}
-	<span id="net-update" class="nav-ajax-left"></span>
-	</div>
-	{{ endif }}
-<!--	<ul id="network-menu-list" class="nav-menu-list">
-		{{ if $nav.network }}
-		<li>
-		<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-		</li>
-		{{ endif }}
-
-		{{ if $nav.network }}
-		<li>
-		<a class="nav-menu-icon network-reset-link nav-link" href="$nav.net_reset.0" title="$nav.net_reset.3">$nav.net_reset.1</a>
-		</li>
-		{{ endif }}
-
-		{{ if $nav.home }}
-		<li><a id="nav-home-link" class="$nav.home.2 $sel.home nav-load-page-link" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.community }}
-		<li>
-		<a id="nav-community-link" class="$nav.community.2 $sel.community nav-load-page-link" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-		</li>
-		{{ endif }}
-	</ul>
-	</div>-->
-
-	</span>
-	{#<!--<span id="nav-end"></span>-->#}
-	<span id="banner">$banner</span>
-</nav>
-
-{#<!--<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>-->#}
diff --git a/view/theme/decaf-mobile/photo_drop.tpl b/view/theme/decaf-mobile/photo_drop.tpl
deleted file mode 100644
index 296b829091..0000000000
--- a/view/theme/decaf-mobile/photo_drop.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-	<a href="item/drop/$id?confirm=1" onclick="return confirmDelete(function(){this.href='item/drop/$id'});" class="icon drophide" title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
-</div>
-<div class="wall-item-delete-end"></div>
diff --git a/view/theme/decaf-mobile/photo_edit.tpl b/view/theme/decaf-mobile/photo_edit.tpl
deleted file mode 100644
index 5bfa37c366..0000000000
--- a/view/theme/decaf-mobile/photo_edit.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-
-<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="$item_id" />
-	<input id="photo-edit-form-confirm" type="hidden" name="confirm" value="1" />
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
-	</div>
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
-	<input id="photo-edit-caption" type="text" size="32" name="desc" value="$caption" />
-	</div>
-
-	<div id="photo-edit-caption-end"></div>
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
-	<input name="newtag" id="photo-edit-newtag" size="32" title="$help_tags" type="text" />
-	</div>
-
-	<div id="photo-edit-tags-end"></div>
-
-	<div class="photo-edit-rotate-choice">
-	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">$rotatecw</label>
-	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
-	</div>
-
-	<div class="photo-edit-rotate-choice">
-	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">$rotateccw</label>
-	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		{#<!--<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="$permissions"/>
-			<span id="jot-perms-icon" class="icon $lockstate photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">-->#}
-			<div id="photo-edit-perms-select" >
-				{#<!--$aclselect-->#}
-				{{ inc acl_html_selector.tpl }}{{ endinc }}
-			</div>
-		{#<!--</div>-->#}
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete(function(){remove('photo-edit-form-confirm');});" />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-
diff --git a/view/theme/decaf-mobile/photo_edit_head.tpl b/view/theme/decaf-mobile/photo_edit_head.tpl
deleted file mode 100644
index c819e24ce3..0000000000
--- a/view/theme/decaf-mobile/photo_edit_head.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{#<!--
-<script>
-	window.prevLink = "$prevlink";
-	window.nextLink = "$nextlink";
-	window.photoEdit = true;
-
-</script>-->#}
diff --git a/view/theme/decaf-mobile/photo_view.tpl b/view/theme/decaf-mobile/photo_view.tpl
deleted file mode 100644
index 329e0a4e05..0000000000
--- a/view/theme/decaf-mobile/photo_view.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" {#onclick="lockview(event,'photo/$id');"#} /> {{ endif }}
-</div>
-
-<div id="photo-nav">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0"><img src="view/theme/decaf-mobile/images/arrow-left.png"></a></div>{{ endif }}
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0"><img src="view/theme/decaf-mobile/images/arrow-right.png"></a></div>{{ endif }}
-</div>
-<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}
-$edit
-{{ else }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-{{ endif }}
-
diff --git a/view/theme/decaf-mobile/photos_head.tpl b/view/theme/decaf-mobile/photos_head.tpl
deleted file mode 100644
index 5c13a0ae6c..0000000000
--- a/view/theme/decaf-mobile/photos_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{#<!--
-<script>
-	window.isPublic = "$ispublic";
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/photos_upload.tpl b/view/theme/decaf-mobile/photos_upload.tpl
deleted file mode 100644
index 31ad468015..0000000000
--- a/view/theme/decaf-mobile/photos_upload.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<h3>$pagename</h3>
-
-<div id="photos-usage-message">$usage</div>
-
-<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">$existalbumtext</div>
-		<select id="photos-upload-album-select" name="album">
-		$albumselect
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
-
-	$default_upload_box
-
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
-	</div>
-
-
-	{#<!--<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
-		<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
-		</a>
-	</div>
-	<div id="photos-upload-perms-end"></div>
-
-	<div style="display: none;">-->#}
-		<div id="photos-upload-permissions-wrapper">
-			{#<!--$aclselect-->#}
-			{{ inc acl_html_selector.tpl }}{{ endinc }}
-		</div>
-	{#<!--</div>-->#}
-
-	<div id="photos-upload-spacer"></div>
-
-	$alt_uploader
-
-	$default_upload_submit
-
-	<div class="photos-upload-end" ></div>
-</form>
-
diff --git a/view/theme/decaf-mobile/profed_end.tpl b/view/theme/decaf-mobile/profed_end.tpl
deleted file mode 100644
index ff56fda467..0000000000
--- a/view/theme/decaf-mobile/profed_end.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{#<!--
-<script type="text/javascript" src="js/country.min.js" ></script>
-
-<script language="javascript" type="text/javascript">
-	Fill_Country('$country_name');
-	Fill_States('$region');
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/profed_head.tpl b/view/theme/decaf-mobile/profed_head.tpl
deleted file mode 100644
index 02fd46aa49..0000000000
--- a/view/theme/decaf-mobile/profed_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{#<!--
-<script language="javascript" type="text/javascript">
-	window.editSelect = "none";
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/profile_edit.tpl b/view/theme/decaf-mobile/profile_edit.tpl
deleted file mode 100644
index bed1de35ae..0000000000
--- a/view/theme/decaf-mobile/profile_edit.tpl
+++ /dev/null
@@ -1,324 +0,0 @@
-$default
-
-<h1>$banner</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
-<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
-<li></li>
-<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
-<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label>
-<input type="text" size="28" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
-<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
-<input type="text" size="28" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label>
-<input type="text" size="28" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
-<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label>
-<input type="text" size="28" name="country_name" id="profile-edit-country-name" value="$country_name" />
-{#<!--<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>-->#}
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
-<input type="text" size="28" name="region" id="profile-edit-region" value="$region" />
-{#<!--<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>-->#}
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
-<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="$hometown" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
-<input type="text" size="28" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
-<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
-<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
-<input type="text" size="28" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
-<input type="text" size="28" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
-<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
-<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" class="profile-jot-box">
-<p id="about-jot-desc" >
-$lbl_about
-</p>
-
-<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" class="profile-jot-box" >
-<p id="interest-jot-desc" >
-$lbl_hobbies
-</p>
-
-<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" class="profile-jot-box" >
-<p id="likes-jot-desc" >
-$lbl_likes
-</p>
-
-<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >$likes</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" class="profile-jot-box" >
-<p id="dislikes-jot-desc" >
-$lbl_dislikes
-</p>
-
-<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >$dislikes</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" class="profile-jot-box" >
-<p id="contact-jot-desc" >
-$lbl_social
-</p>
-
-<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" class="profile-jot-box" >
-<p id="music-jot-desc" >
-$lbl_music
-</p>
-
-<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" class="profile-jot-box" >
-<p id="book-jot-desc" >
-$lbl_book
-</p>
-
-<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" class="profile-jot-box" >
-<p id="tv-jot-desc" >
-$lbl_tv 
-</p>
-
-<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" class="profile-jot-box" >
-<p id="film-jot-desc" >
-$lbl_film
-</p>
-
-<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" class="profile-jot-box" >
-<p id="romance-jot-desc" >
-$lbl_love
-</p>
-
-<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" class="profile-jot-box" >
-<p id="work-jot-desc" >
-$lbl_work
-</p>
-
-<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" class="profile-jot-box" >
-<p id="education-jot-desc" >
-$lbl_school 
-</p>
-
-<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-
diff --git a/view/theme/decaf-mobile/profile_photo.tpl b/view/theme/decaf-mobile/profile_photo.tpl
deleted file mode 100644
index 42fc139f8f..0000000000
--- a/view/theme/decaf-mobile/profile_photo.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<h1>$title</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="25" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="$submit">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-$select
-</div>
diff --git a/view/theme/decaf-mobile/profile_vcard.tpl b/view/theme/decaf-mobile/profile_vcard.tpl
deleted file mode 100644
index e91e6125ff..0000000000
--- a/view/theme/decaf-mobile/profile_vcard.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="vcard">
-
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-
-	<div id="profile-vcard-break"></div>	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/decaf-mobile/prv_message.tpl b/view/theme/decaf-mobile/prv_message.tpl
deleted file mode 100644
index 5d9925297d..0000000000
--- a/view/theme/decaf-mobile/prv_message.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-
-{{ if $showinputs }}
-<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$preid">
-{{ else }}
-$select
-{{ endif }}
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
-
-<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
-	<div id="prvmail-upload-wrapper"  style="display: none;">
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	{#<!--<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div>-->#} 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
-
-<script>
-document.getElementById('prvmail-upload-wrapper').style.display = "inherit";
-</script>
diff --git a/view/theme/decaf-mobile/register.tpl b/view/theme/decaf-mobile/register.tpl
deleted file mode 100644
index b1f39048e9..0000000000
--- a/view/theme/decaf-mobile/register.tpl
+++ /dev/null
@@ -1,80 +0,0 @@
-<div class='register-form'>
-<h2>$regtitle</h2>
-<br />
-
-<form action="register" method="post" id="register-form">
-
-	<input type="hidden" name="photo" value="$photo" />
-
-	$registertext
-
-	<p id="register-realpeople">$realpeople</p>
-
-	<br />
-{{ 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>
-	</div>
-
-	<br /><br />
-
-{{ if $invitations }}
-
-	<p id="register-invite-desc">$invite_desc</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >$invite_label</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
-	</div>
-	<div id="register-name-end" ></div>
-
-{{ endif }}
-
-
-	<div id="register-name-wrapper" class="field input" >
-		<label for="register-name" id="label-register-name" >$namelabel</label><br />
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="$username" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper"  class="field input" >
-		<label for="register-email" id="label-register-email" >$addrlabel</label><br />
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="$email" >
-	</div>
-	<div id="register-email-end" ></div>
-
-	<div id="register-nickname-wrapper" class="field input" >
-		<label for="register-nickname" id="label-register-nickname" >$nicklabel</label><br />
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="$nickname" >
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >$nickdesc</p>
-	</div>
-
-	$publish
-
-	<div id="register-footer">
-	{#<!--<div class="agreement">
-	By clicking '$regbutt' you are agreeing to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-	</div>-->#}
-	<br />
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
-	</div>
-	<div id="register-submit-end" ></div>
-	</div>
-</form>
-<br /><br /><br />
-
-$license
-
-</div>
diff --git a/view/theme/decaf-mobile/search_item.tpl b/view/theme/decaf-mobile/search_item.tpl
deleted file mode 100644
index 3e14b644b0..0000000000
--- a/view/theme/decaf-mobile/search_item.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<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" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			{#<!--<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				{#<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>-->#}
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" {#onclick="lockview(event,$item.id);" #}/>{#<!--</div>-->#}
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		{#<!--<div class="wall-item-author">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
-				
-		{#<!--</div>-->#}
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			{#<!--<div class="wall-item-title-end"></div>-->#}
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/$item.id')});" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>{{ endif }}
-			{#<!--</div>-->#}
-				{#<!--{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}-->#}
-			{#<!--<div class="wall-item-delete-end"></div>-->#}
-		</div>
-	</div>
-	{#<!--<div class="wall-item-wrapper-end"></div>-->#}
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->#}
-
-{#<!--</div>-->#}
-
-
diff --git a/view/theme/decaf-mobile/settings-head.tpl b/view/theme/decaf-mobile/settings-head.tpl
deleted file mode 100644
index 5c13a0ae6c..0000000000
--- a/view/theme/decaf-mobile/settings-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{#<!--
-<script>
-	window.isPublic = "$ispublic";
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/settings.tpl b/view/theme/decaf-mobile/settings.tpl
deleted file mode 100644
index 036cc16916..0000000000
--- a/view/theme/decaf-mobile/settings.tpl
+++ /dev/null
@@ -1,151 +0,0 @@
-<h1>$ptitle</h1>
-
-$nickname_block
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<h3 class="settings-heading">$h_pass</h3>
-
-{{inc field_password.tpl with $field=$password1 }}{{endinc}}
-{{inc field_password.tpl with $field=$password2 }}{{endinc}}
-{{inc field_password.tpl with $field=$password3 }}{{endinc}}
-
-{{ if $oid_enable }}
-{{inc field_input.tpl with $field=$openid }}{{endinc}}
-{{ endif }}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_basic</h3>
-
-{{inc field_input.tpl with $field=$username }}{{endinc}}
-{{inc field_input.tpl with $field=$email }}{{endinc}}
-{{inc field_password.tpl with $field=$password4 }}{{endinc}}
-{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
-{{inc field_input.tpl with $field=$defloc }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_prv</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-$hide_friends
-
-$hide_wall
-
-$blockwall
-
-$blocktags
-
-$suggestme
-
-$unkmail
-
-
-{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
-
-{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>$expire.advanced</h3>
-			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
-		</div>
-	</div>
-
-</div>
-
-
-<div id="settings-perms-wrapper" class="field">
-<label for="settings-default-perms">$settings_perms</label><br/>
-<div id="settings-default-perms" class="settings-default-perms" >
-{#<!--	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
-	
-	<div style="display: none;">-->#}
-		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
-			{#<!--$aclselect-->#}
-			{{ inc acl_html_selector.tpl }}{{ endinc }}
-		</div>
-{#<!--	</div>
-
-	</div>-->#}
-</div>
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-$group_select
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-
-<h3 class="settings-heading">$h_not</h3>
-<div id="settings-notifications">
-
-<div id="settings-activity-desc">$activity_options</div>
-
-{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
-
-
-<div id="settings-notify-desc">$lbl_not</div>
-
-<div class="group">
-{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
-</div>
-
-</div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_advn</h3>
-<div id="settings-pagetype-desc">$h_descadvn</div>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
diff --git a/view/theme/decaf-mobile/settings_display_end.tpl b/view/theme/decaf-mobile/settings_display_end.tpl
deleted file mode 100644
index 739c43b35a..0000000000
--- a/view/theme/decaf-mobile/settings_display_end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-	<script>$j(function(){ previewTheme($j("#id_$theme.0")[0]); });</script>
-
diff --git a/view/theme/decaf-mobile/smarty3/acl_html_selector.tpl b/view/theme/decaf-mobile/smarty3/acl_html_selector.tpl
deleted file mode 100644
index 05e82f2d05..0000000000
--- a/view/theme/decaf-mobile/smarty3/acl_html_selector.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<a name="acl-wrapper-target"></a>
-<div id="acl-wrapper">
-	<div id="acl-public-switch">
-		<a href="{{$return_path}}#acl-wrapper-target" {{if $is_private == 1}}class="acl-public-switch-selected"{{/if}} >{{$private}}</a>
-		<a href="{{$return_path}}{{$public_link}}#acl-wrapper-target" {{if $is_private == 0}}class="acl-public-switch-selected"{{/if}} >{{$public}}</a>
-	</div>
-	<div id="acl-list">
-		<div id="acl-list-content">
-			<div id="acl-html-groups" class="acl-html-select-wrapper">
-			{{$group_perms}}<br />
-			<select name="group_allow[]" multiple {{if $is_private == 0}}disabled{{/if}} id="acl-html-group-select" class="acl-html-select" size=7>
-				{{foreach $acl_data.groups as $group}}
-				<option value="{{$group.id}}" {{if $is_private == 1}}{{if $group.selected}}selected{{/if}}{{/if}}>{{$group.name}}</option>
-				{{/foreach}}
-			</select>
-			</div>
-			<div id="acl-html-contacts" class="acl-html-select-wrapper">
-			{{$contact_perms}}<br />
-			<select name="contact_allow[]" multiple {{if $is_private == 0}}disabled{{/if}} id="acl-html-contact-select" class="acl-html-select" size=7>
-				{{foreach $acl_data.contacts as $contact}}
-				<option value="{{$contact.id}}" {{if $is_private == 1}}{{if $contact.selected}}selected{{/if}}{{/if}}>{{$contact.name}} ({{$contact.networkName}})</option>
-				{{/foreach}}
-			</select>
-			</div>
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</div>
-
diff --git a/view/theme/decaf-mobile/smarty3/acl_selector.tpl b/view/theme/decaf-mobile/smarty3/acl_selector.tpl
deleted file mode 100644
index b5e8307268..0000000000
--- a/view/theme/decaf-mobile/smarty3/acl_selector.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{{*
- *	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>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</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>
-
-{{*<!--<script>
-	window.allowCID = {{$allowcid}};
-	window.allowGID = {{$allowgid}};
-	window.denyCID = {{$denycid}};
-	window.denyGID = {{$denygid}};
-	window.aclInit = "true";
-</script>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/admin_aside.tpl b/view/theme/decaf-mobile/smarty3/admin_aside.tpl
deleted file mode 100644
index 024d6195b5..0000000000
--- a/view/theme/decaf-mobile/smarty3/admin_aside.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
-<ul class='admin linklist'>
-	<li class='admin button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
-	<li class='admin button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
-	<li class='admin button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
-	<li class='admin button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
-	<li class='admin button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
-</ul>
-
-{{if $admin.update}}
-<ul class='admin linklist'>
-	<li class='admin button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
-	<li class='admin button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
-</ul>
-{{/if}}
-
-
-{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
-<ul class='admin linklist'>
-	{{foreach $admin.plugins_admin as $l}}
-	<li class='admin button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
-	{{/foreach}}
-</ul>
-	
-	
-<h4>{{$logtxt}}</h4>
-<ul class='admin linklist'>
-	<li class='admin button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
-</ul>
-
diff --git a/view/theme/decaf-mobile/smarty3/admin_site.tpl b/view/theme/decaf-mobile/smarty3/admin_site.tpl
deleted file mode 100644
index 035024e689..0000000000
--- a/view/theme/decaf-mobile/smarty3/admin_site.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-	{{include file="field_input.tpl" field=$sitename}}
-	{{include file="field_textarea.tpl" field=$banner}}
-	{{include file="field_select.tpl" field=$language}}
-	{{include file="field_select.tpl" field=$theme}}
-	{{include file="field_select.tpl" field=$theme_mobile}}
-	{{include file="field_select.tpl" field=$ssl_policy}}
-	{{include file="field_checkbox.tpl" field=$new_share}}
-	{{include file="field_checkbox.tpl" field=$hide_help}} 
-	{{include file="field_select.tpl" field=$singleuser}} 
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$registration}}</h3>
-	{{include file="field_input.tpl" field=$register_text}}
-	{{include file="field_select.tpl" field=$register_policy}}
-	
-	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
-	{{include file="field_checkbox.tpl" field=$no_openid}}
-	{{include file="field_checkbox.tpl" field=$no_regfullname}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-
-	<h3>{{$upload}}</h3>
-	{{include file="field_input.tpl" field=$maximagesize}}
-	{{include file="field_input.tpl" field=$maximagelength}}
-	{{include file="field_input.tpl" field=$jpegimagequality}}
-	
-	<h3>{{$corporate}}</h3>
-	{{include file="field_input.tpl" field=$allowed_sites}}
-	{{include file="field_input.tpl" field=$allowed_email}}
-	{{include file="field_checkbox.tpl" field=$block_public}}
-	{{include file="field_checkbox.tpl" field=$force_publish}}
-	{{include file="field_checkbox.tpl" field=$no_community_page}}
-	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
-	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
-	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
-	{{include file="field_checkbox.tpl" field=$dfrn_only}}
-	{{include file="field_input.tpl" field=$global_directory}}
-	{{include file="field_checkbox.tpl" field=$thread_allow}}
-	{{include file="field_checkbox.tpl" field=$newuser_private}}
-	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
-	{{include file="field_checkbox.tpl" field=$private_addons}}	
-	{{include file="field_checkbox.tpl" field=$disable_embedded}}	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$advanced}}</h3>
-	{{include file="field_checkbox.tpl" field=$no_utf}}
-	{{include file="field_checkbox.tpl" field=$verifyssl}}
-	{{include file="field_input.tpl" field=$proxy}}
-	{{include file="field_input.tpl" field=$proxyuser}}
-	{{include file="field_input.tpl" field=$timeout}}
-	{{include file="field_input.tpl" field=$delivery_interval}}
-	{{include file="field_input.tpl" field=$poll_interval}}
-	{{include file="field_input.tpl" field=$maxloadavg}}
-	{{include file="field_input.tpl" field=$abandon_days}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	</form>
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/admin_users.tpl b/view/theme/decaf-mobile/smarty3/admin_users.tpl
deleted file mode 100644
index df795a1f4f..0000000000
--- a/view/theme/decaf-mobile/smarty3/admin_users.tpl
+++ /dev/null
@@ -1,103 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("{{$confirm_delete_multi}}");
-	}
-	{{*/*function selectall(cls){
-		$j("."+cls).attr('checked','checked');
-		return false;
-	}*/*}}
-</script>
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		
-		<h3>{{$h_pending}}</h3>
-		{{if $pending}}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{foreach $pending as $u}}
-				<tr>
-					<td class="created">{{$u.created}}</td>
-					<td class="name">{{$u.name}}</td>
-					<td class="email">{{$u.email}}</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
-					</td>
-				</tr>
-			{{/foreach}}
-				</tbody>
-			</table>
-			{{*<!--<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>-->*}}
-			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
-		{{else}}
-			<p>{{$no_pending}}</p>
-		{{/if}}
-	
-	
-		
-	
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
-						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
-						<td class='email'>{{$u.email}}</td>
-						<td class='register_date'>{{$u.register_date}}</td>
-						<td class='login_date'>{{$u.login_date}}</td>
-						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
-						<td class="checkbox"> 
-                                    {{if $u.is_admin}}
-                                        &nbsp;
-                                    {{else}}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
-                                    {{/if}}
-						<td class="tools">
-                                    {{if $u.is_admin}}
-                                        &nbsp;
-                                    {{else}}
-                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
-                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
-                                    {{/if}}
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			{{*<!--<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>-->*}}
-			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/album_edit.tpl b/view/theme/decaf-mobile/smarty3/album_edit.tpl
deleted file mode 100644
index 094da70a93..0000000000
--- a/view/theme/decaf-mobile/smarty3/album_edit.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{*
- *	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" >
-	<input id="photo-album-edit-form-confirm" type="hidden" name="confirm" value="1" />
-
-	<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
-	<input type="text" size="64" name="albumname" value="{{$album}}" >
-
-	<div id="photo-album-edit-name-end"></div>
-
-	<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-	<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete(function(){remove('photo-album-edit-form-confirm');});" />
-
-</form>
-</div>
-<div id="photo-album-edit-end" ></div>
diff --git a/view/theme/decaf-mobile/smarty3/categories_widget.tpl b/view/theme/decaf-mobile/smarty3/categories_widget.tpl
deleted file mode 100644
index 1749fced3f..0000000000
--- a/view/theme/decaf-mobile/smarty3/categories_widget.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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>
-	
-	<ul class="categories-ul">
-		<li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-			<li class="tool"><a href="{{$base}}?f=&category={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/comment_item.tpl b/view/theme/decaf-mobile/smarty3/comment_item.tpl
deleted file mode 100644
index 63c70aa5be..0000000000
--- a/view/theme/decaf-mobile/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{*<!--		<script>
-		$(document).ready( function () {
-			$(document).mouseup(function(e) {
-				var container = $("#comment-edit-wrapper-{{$id}}");
-				if( container.has(e.target).length === 0) {
-					commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
-					cmtBbClose({{$id}});
-				}
-			});
-		});
-		</script>-->*}}
-
-		<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;" >
-			<a name="comment-wwedit-wrapper-pos"></a>
-			<form class="comment-edit-form {{$indent}}" id="comment-edit-form-{{$id}}" action="item" method="post" >
-{{*<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
-				<input type="hidden" name="type" value="{{$type}}" />
-				<input type="hidden" name="source" value="{{$sourceapp}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}#comment-wwedit-wrapper-pos" />
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				{{*<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
-					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				{{*<!--</div>-->*}}
-				{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
-				{{*<!--<ul class="comment-edit-bb-{{$id}}">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="{{$edbold}}"
-						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="{{$editalic}}"
-						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="{{$eduline}}"
-						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="{{$edquote}}"
-						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="{{$edcode}}"
-						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>-->*}}
-{{*<!--					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="{{$edimg}}"
-						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="{{$edurl}}"
-						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="{{$edvideo}}"
-						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>-->*}}
-				{{*<!--</ul>	-->*}}
-				{{*<!--<div class="comment-edit-bb-end"></div>-->*}}
-{{*<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-full" name="body" ></textarea>
-				{{*<!--{{if $qcomment}}
-					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-					<option value=""></option>
-				{{foreach $qcomment as $qc}}
-					<option value="{{$qc}}">{{$qc}}</option>				
-				{{/foreach}}
-					</select>
-				{{/if}}-->*}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" >
-					<input type="submit" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					{{*<!--<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="preview-link fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>-->*}}
-				</div>
-
-				{{*<!--<div class="comment-edit-end"></div>-->*}}
-			</form>
-
-		</div>
diff --git a/view/theme/decaf-mobile/smarty3/common_tabs.tpl b/view/theme/decaf-mobile/smarty3/common_tabs.tpl
deleted file mode 100644
index 9fa4ed41d9..0000000000
--- a/view/theme/decaf-mobile/smarty3/common_tabs.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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>
-	{{/foreach}}
-	<div id="tabs-end"></div>
-</ul>
diff --git a/view/theme/decaf-mobile/smarty3/contact_block.tpl b/view/theme/decaf-mobile/smarty3/contact_block.tpl
deleted file mode 100644
index 5a0a26b87e..0000000000
--- a/view/theme/decaf-mobile/smarty3/contact_block.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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}}
-		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
-		<div class='contact-block-content'>
-		{{foreach $micropro as $m}}
-			{{$m}}
-		{{/foreach}}
-		</div>
-{{/if}}
-</div>
-<div class="clear"></div>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/contact_edit.tpl b/view/theme/decaf-mobile/smarty3/contact_edit.tpl
deleted file mode 100644
index 0f028d5904..0000000000
--- a/view/theme/decaf-mobile/smarty3/contact_edit.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h2>{{$header}}</h2>
-
-<div id="contact-edit-wrapper" >
-
-	{{$tab_str}}
-
-	<div id="contact-edit-drop-link-wrapper" >
-		<a href="contacts/{{$contact_id}}/drop?confirm=1" class="icon drophide" id="contact-edit-drop-link" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'contacts/{{$contact_id}}/drop')});"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
-	</div>
-
-	<div id="contact-edit-drop-link-end"></div>
-
-	<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>
-	</div>
-
-
-	<div id="contact-edit-nav-wrapper" >
-		<div id="contact-edit-links">
-			<ul>
-				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
-				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
-				{{if $lost_contact}}
-					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
-				{{/if}}
-				{{if $insecure}}
-					<li><div id="insecure-message">{{$insecure}}</div></li>
-				{{/if}}
-				{{if $blocked}}
-					<li><div id="block-message">{{$blocked}}</div></li>
-				{{/if}}
-				{{if $ignored}}
-					<li><div id="ignore-message">{{$ignored}}</div></li>
-				{{/if}}
-				{{if $archived}}
-					<li><div id="archive-message">{{$archived}}</div></li>
-				{{/if}}
-
-				<li>&nbsp;</li>
-
-				{{if $common_text}}
-					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
-				{{/if}}
-				{{if $all_friends}}
-					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
-				{{/if}}
-
-
-				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
-				{{if $lblsuggest}}
-					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
-				{{/if}}
-
-			</ul>
-		</div>
-	</div>
-	<div id="contact-edit-nav-end"></div>
-
-
-<form action="contacts/{{$contact_id}}" method="post" >
-<input type="hidden" name="contact_id" value="{{$contact_id}}">
-
-	{{if $poll_enabled}}
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
-			<span id="contact-edit-poll-text">{{$updpub}} {{$poll_interval}}</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
-		</div>
-	{{/if}}
-	<div id="contact-edit-end" ></div>
-
-	{{include file="field_checkbox.tpl" field=$hidden}}
-
-<div id="contact-edit-info-wrapper">
-<h4>{{$lbl_info1}}</h4>
-	<textarea id="contact-edit-info" rows="8"{{* cols="35"*}} name="info">{{$info}}</textarea>
-	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-</div>
-<div id="contact-edit-info-end"></div>
-
-
-<div id="contact-edit-profile-select-text">
-<h4>{{$lbl_vis1}}</h4>
-<p>{{$lbl_vis2}}</p> 
-</div>
-{{$profile_select}}
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-
-</form>
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/contact_head.tpl b/view/theme/decaf-mobile/smarty3/contact_head.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/theme/decaf-mobile/smarty3/contact_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
diff --git a/view/theme/decaf-mobile/smarty3/contact_template.tpl b/view/theme/decaf-mobile/smarty3/contact_template.tpl
deleted file mode 100644
index f017744f7e..0000000000
--- a/view/theme/decaf-mobile/smarty3/contact_template.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-{{*
- *	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" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
-		{{*onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}});" 
-		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)"*}} >
-
-{{*<!--			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>-->*}}
-			{{*<!--<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">-->*}}
-			<a href="{{$contact.photo_menu.edit.1}}" title="{{$contact.photo_menu.edit.0}}">
-			<img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
-			</a>
-			{{*<!--</span>-->*}}
-
-{{*<!--			{{if $contact.photo_menu}}
-			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
-                    <ul>
-						{{foreach $contact.photo_menu as $c}}
-						{{if $c.2}}
-						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-						{{else}}
-						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
-						{{/if}}
-						{{/foreach}}
-                    </ul>
-                </div>
-			{{/if}}-->*}}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
-{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-	<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/contacts-end.tpl b/view/theme/decaf-mobile/smarty3/contacts-end.tpl
deleted file mode 100644
index adeea280c7..0000000000
--- a/view/theme/decaf-mobile/smarty3/contacts-end.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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/decaf-mobile/smarty3/contacts-head.tpl b/view/theme/decaf-mobile/smarty3/contacts-head.tpl
deleted file mode 100644
index 7fa1411649..0000000000
--- a/view/theme/decaf-mobile/smarty3/contacts-head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{*<!--
-<script>
-	window.autocompleteType = 'contacts-head';
-</script>
--->*}}
diff --git a/view/theme/decaf-mobile/smarty3/contacts-template.tpl b/view/theme/decaf-mobile/smarty3/contacts-template.tpl
deleted file mode 100644
index b9162c2e9e..0000000000
--- a/view/theme/decaf-mobile/smarty3/contacts-template.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{*
- *	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}}
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="{{$cmd}}" method="get" >
-<span class="contacts-search-desc">{{$desc}}</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
-<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-{{$tabs}}
-
-
-<div id="contacts-display-wrapper">
-{{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
-{{/foreach}}
-</div>
-<div id="contact-edit-end"></div>
-
-{{$paginate}}
-
-
-
-
diff --git a/view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl b/view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl
deleted file mode 100644
index bda321896e..0000000000
--- a/view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$follow_widget}}
-
diff --git a/view/theme/decaf-mobile/smarty3/conversation.tpl b/view/theme/decaf-mobile/smarty3/conversation.tpl
deleted file mode 100644
index f6810bb100..0000000000
--- a/view/theme/decaf-mobile/smarty3/conversation.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$live_update}}
-
-{{foreach $threads as $thread}}
-<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
-	{{foreach $thread.items as $item}}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
-			</div>
-			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
-		{{/if}}
-		{{if $item.comment_lastcollapsed}}</div>{{/if}}
-		
-		{{include file="{{$item.template}}"}}
-		
-		
-	{{/foreach}}
-</div>
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
-{{*<!--{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/cropbody.tpl b/view/theme/decaf-mobile/smarty3/cropbody.tpl
deleted file mode 100644
index 5ace9a1aaf..0000000000
--- a/view/theme/decaf-mobile/smarty3/cropbody.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-<p id="cropimage-desc">
-{{$desc}}
-</p>
-<div id="cropimage-wrapper">
-<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="{{$done}}" />
-</div>
-
-</form>
diff --git a/view/theme/decaf-mobile/smarty3/cropend.tpl b/view/theme/decaf-mobile/smarty3/cropend.tpl
deleted file mode 100644
index e75083f512..0000000000
--- a/view/theme/decaf-mobile/smarty3/cropend.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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>
-      <script type="text/javascript" language="javascript">initCrop();</script>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/crophead.tpl b/view/theme/decaf-mobile/smarty3/crophead.tpl
deleted file mode 100644
index 6438cfb354..0000000000
--- a/view/theme/decaf-mobile/smarty3/crophead.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	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/decaf-mobile/smarty3/display-head.tpl b/view/theme/decaf-mobile/smarty3/display-head.tpl
deleted file mode 100644
index 2943201923..0000000000
--- a/view/theme/decaf-mobile/smarty3/display-head.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{*<!--<script>
-	window.autoCompleteType = 'display-head';
-</script>
--->*}}
diff --git a/view/theme/decaf-mobile/smarty3/end.tpl b/view/theme/decaf-mobile/smarty3/end.tpl
deleted file mode 100644
index 6914cfd246..0000000000
--- a/view/theme/decaf-mobile/smarty3/end.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{{*
- *	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]-->
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
-<script type="text/javascript">
-  tinyMCE.init({ mode : "none"});
-</script>-->*}}
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/fk.autocomplete.js" ></script>-->*}}
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>-->*}}
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/acl.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/main.js" ></script>-->*}}
-<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/theme.js"></script>
-
-<!--<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.package.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/decaf-mobile.package.js" ></script>-->
-
diff --git a/view/theme/decaf-mobile/smarty3/event_end.tpl b/view/theme/decaf-mobile/smarty3/event_end.tpl
deleted file mode 100644
index 63dbec4426..0000000000
--- a/view/theme/decaf-mobile/smarty3/event_end.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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/decaf-mobile/smarty3/event_head.tpl b/view/theme/decaf-mobile/smarty3/event_head.tpl
deleted file mode 100644
index bd72758e6f..0000000000
--- a/view/theme/decaf-mobile/smarty3/event_head.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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">
-window.aclType = 'event_head';
-</script>
--->*}}
diff --git a/view/theme/decaf-mobile/smarty3/field_checkbox.tpl b/view/theme/decaf-mobile/smarty3/field_checkbox.tpl
deleted file mode 100644
index f7f857f592..0000000000
--- a/view/theme/decaf-mobile/smarty3/field_checkbox.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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>
-		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><br />
-		<span class='field_help' id='help_id_{{$field.0}}'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/decaf-mobile/smarty3/field_input.tpl b/view/theme/decaf-mobile/smarty3/field_input.tpl
deleted file mode 100644
index 240bed249f..0000000000
--- a/view/theme/decaf-mobile/smarty3/field_input.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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 />
-		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/decaf-mobile/smarty3/field_openid.tpl b/view/theme/decaf-mobile/smarty3/field_openid.tpl
deleted file mode 100644
index d5ebd9a3b6..0000000000
--- a/view/theme/decaf-mobile/smarty3/field_openid.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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 />
-		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/decaf-mobile/smarty3/field_password.tpl b/view/theme/decaf-mobile/smarty3/field_password.tpl
deleted file mode 100644
index f1352f27b2..0000000000
--- a/view/theme/decaf-mobile/smarty3/field_password.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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 />
-		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/decaf-mobile/smarty3/field_themeselect.tpl b/view/theme/decaf-mobile/smarty3/field_themeselect.tpl
deleted file mode 100644
index 95cfd6bcdb..0000000000
--- a/view/theme/decaf-mobile/smarty3/field_themeselect.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-	<div class='field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select name='{{$field.0}}' id='id_{{$field.0}}' {{*{{if $field.5}}onchange="previewTheme(this);"{{/if}}*}} >
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<span class='field_help'>{{$field.3}}</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/theme/decaf-mobile/smarty3/field_yesno.tpl b/view/theme/decaf-mobile/smarty3/field_yesno.tpl
deleted file mode 100644
index 9cdb95e01c..0000000000
--- a/view/theme/decaf-mobile/smarty3/field_yesno.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	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">
-			<input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-			<a href="#" class='off'>
-				{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
-			</a>
-			<a href="#" class='on'>
-				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
-			</a>
-		</div>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>-->*}}
-{{include file="field_checkbox.tpl"}}
diff --git a/view/theme/decaf-mobile/smarty3/generic_links_widget.tpl b/view/theme/decaf-mobile/smarty3/generic_links_widget.tpl
deleted file mode 100644
index 705ddb57cb..0000000000
--- a/view/theme/decaf-mobile/smarty3/generic_links_widget.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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}}
-	
-	<ul class="tabs links-widget">
-		{{foreach $items as $item}}
-			<li class="tool"><a href="{{$item.url}}" class="tab {{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
-		{{/foreach}}
-		<div id="tabs-end"></div>
-	</ul>
-	
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/group_drop.tpl b/view/theme/decaf-mobile/smarty3/group_drop.tpl
deleted file mode 100644
index 2693228154..0000000000
--- a/view/theme/decaf-mobile/smarty3/group_drop.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	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();" 
-		id="group-delete-icon-{{$id}}" 
-		class="icon drophide group-delete-icon" 
-		{{*onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);"*}} ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/decaf-mobile/smarty3/group_side.tpl b/view/theme/decaf-mobile/smarty3/group_side.tpl
deleted file mode 100644
index 7d9d23ebe1..0000000000
--- a/view/theme/decaf-mobile/smarty3/group_side.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="widget" id="group-sidebar">
-<h3>{{$title}}</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{foreach $groups as $group}}
-			<li class="sidebar-group-li">
-				{{if $group.cid}}
-					<input type="checkbox" 
-						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
-						{{*onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"*}}
-						{{if $group.ismember}}checked="checked"{{/if}}
-					/>
-				{{/if}}			
-				{{if $group.edit}}
-					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"></span></a>
-				{{/if}}
-				<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
-			</li>
-		{{/foreach}}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">{{$createtext}}</a>
-  </div>
-  {{if $ungrouped}}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">{{$ungrouped}}</a>
-  </div>
-  {{/if}}
-</div>
-
-
diff --git a/view/theme/decaf-mobile/smarty3/head.tpl b/view/theme/decaf-mobile/smarty3/head.tpl
deleted file mode 100644
index 07398391f1..0000000000
--- a/view/theme/decaf-mobile/smarty3/head.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{*
- *	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'>
-<meta content='320' name='MobileOptimized'>-->*}}
-<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
-{{*<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->*}}
-
-<base href="{{$baseurl}}/" />
-<meta name="generator" content="{{$generator}}" />
-{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />-->*}}
-
-<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
-
-<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
-<link rel="search"
-         href="{{$baseurl}}/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
-<script>
-	window.delItem = "{{$delitem}}";
-{{*/*	window.commentEmptyText = "{{$comment}}";
-	window.showMore = "{{$showmore}}";
-	window.showFewer = "{{$showfewer}}";
-	var updateInterval = {{$update_interval}};
-	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};*/*}}
-</script>
diff --git a/view/theme/decaf-mobile/smarty3/jot-end.tpl b/view/theme/decaf-mobile/smarty3/jot-end.tpl
deleted file mode 100644
index 88c8e59c62..0000000000
--- a/view/theme/decaf-mobile/smarty3/jot-end.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
-{{*<!--
-<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
--->*}}
diff --git a/view/theme/decaf-mobile/smarty3/jot-header.tpl b/view/theme/decaf-mobile/smarty3/jot-header.tpl
deleted file mode 100644
index b0bf78916b..0000000000
--- a/view/theme/decaf-mobile/smarty3/jot-header.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	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
-	window.editSelect = {{$editselect}};
-	window.isPublic = "{{$ispublic}}";
-	window.nickname = "{{$nickname}}";
-	window.linkURL = "{{$linkurl}}";
-	window.vidURL = "{{$vidurl}}";
-	window.audURL = "{{$audurl}}";
-	window.whereAreU = "{{$whereareu}}";
-	window.term = "{{$term}}";
-	window.baseURL = "{{$baseurl}}";
-	window.geoTag = function () { {{$geotag}} }*/*}}
-	window.jotId = "#profile-jot-text";
-	window.imageUploadButton = 'wall-image-upload';
-</script>
-
diff --git a/view/theme/decaf-mobile/smarty3/jot.tpl b/view/theme/decaf-mobile/smarty3/jot.tpl
deleted file mode 100644
index 61a72154c0..0000000000
--- a/view/theme/decaf-mobile/smarty3/jot.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="{{$action}}" method="post" >
-		<input type="hidden" name="type" value="{{$ptyp}}" />
-		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-		<input type="hidden" name="return" value="{{$return_path}}" />
-		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="source" value="{{$sourceapp}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" ></div>
-		{{if $placeholdercategory}}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" /></div>
-		{{/if}}
-		<div id="jot-text-wrap">
-		{{*<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />-->*}}
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder={{$share}} >{{if $content}}{{$content}}{{/if}}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
-
-	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-	
-	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-image-upload-div" style="display: none;" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-file-upload-div" style="display: none;" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
-	</div> 
-
-	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->*}}
-	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-link" class="icon link" title="{{$weblink}}" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
-	</div> -->*}}
-
-	{{*<!--<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>-->*}}
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	{{$jotplugins}}
-	</div>
-
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	{{*<!--<div style="display: none;">-->*}}
-		<div id="profile-jot-acl-wrapper">
-			{{*<!--{{$acl}}
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-			{{$jotnets}}
-			<div id="profile-jot-networks-end"></div>-->*}}
-			{{if $acl_data}}
-			{{include file="acl_html_selector.tpl"}}
-			{{/if}}
-			{{$jotnets}}
-		</div>
-	{{*<!--</div>-->*}}
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{*<!--{{if $content}}<script>window.jotInit = true;</script>{{/if}}-->*}}
-<script>
-document.getElementById('wall-image-upload-div').style.display = "inherit";
-document.getElementById('wall-file-upload-div').style.display = "inherit";
-</script>
diff --git a/view/theme/decaf-mobile/smarty3/jot_geotag.tpl b/view/theme/decaf-mobile/smarty3/jot_geotag.tpl
deleted file mode 100644
index d828980e58..0000000000
--- a/view/theme/decaf-mobile/smarty3/jot_geotag.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			var lat = position.coords.latitude.toFixed(4);
-			var lon = position.coords.longitude.toFixed(4);
-
-			$j('#jot-coord').val(lat + ', ' + lon);
-			$j('#profile-nolocation-wrapper').show();
-		});
-	}
-
diff --git a/view/theme/decaf-mobile/smarty3/lang_selector.tpl b/view/theme/decaf-mobile/smarty3/lang_selector.tpl
deleted file mode 100644
index a1aee8277f..0000000000
--- a/view/theme/decaf-mobile/smarty3/lang_selector.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{foreach $langs.0 as $v=>$l}}
-				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
-			{{/foreach}}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/like_noshare.tpl b/view/theme/decaf-mobile/smarty3/like_noshare.tpl
deleted file mode 100644
index 9d6a58ea20..0000000000
--- a/view/theme/decaf-mobile/smarty3/like_noshare.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	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="like/{{$id}}?verb=like&return={{$return_path}}#{{$item.id}}" class="icon like" title="{{$likethis}}" ></a>
-	{{if $nolike}}
-	<a href="like/{{$id}}?verb=dislike&return={{$return_path}}#{{$item.id}}" class="icon dislike" title="{{$nolike}}" ></a>
-	{{/if}}
-	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/login.tpl b/view/theme/decaf-mobile/smarty3/login.tpl
deleted file mode 100644
index 69d0531815..0000000000
--- a/view/theme/decaf-mobile/smarty3/login.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div class="login-form">
-<form action="{{$dest_url}}" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{include file="field_input.tpl" field=$lname}}
-	{{include file="field_password.tpl" field=$lpassword}}
-	</div>
-	
-	{{if $openid}}
-			<div id="login_openid">
-			{{include file="field_openid.tpl" field=$lopenid}}
-			</div>
-	{{/if}}
-
-	<br />
-	<div id='login-footer'>
-	{{*<!--<div class="login-extra-links">
-	By signing in you agree to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
-	</div>-->*}}
-
-	<br />
-	{{include file="field_checkbox.tpl" field=$lremember}}
-
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
-	</div>
-
-	<br /><br />
-	<div class="login-extra-links">
-		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
-        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
-	</div>
-	</div>
-	
-	{{foreach $hiddens as $k=>$v}}
-		<input type="hidden" name="{{$k}}" value="{{$v}}" />
-	{{/foreach}}
-	
-	
-</form>
-</div>
-
-{{*<!--<script type="text/javascript">window.loginName = "{{$lname.0}}";</script>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/login_head.tpl b/view/theme/decaf-mobile/smarty3/login_head.tpl
deleted file mode 100644
index c2d9504ad3..0000000000
--- a/view/theme/decaf-mobile/smarty3/login_head.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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/decaf-mobile/smarty3/lostpass.tpl b/view/theme/decaf-mobile/smarty3/lostpass.tpl
deleted file mode 100644
index 5a22c245bf..0000000000
--- a/view/theme/decaf-mobile/smarty3/lostpass.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="lostpass-form">
-<h2>{{$title}}</h2>
-<br /><br /><br />
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper" class="field input">
-        <label for="login-name" id="label-login-name">{{$name}}</label><br />
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<p id="lostpass-desc">
-{{$desc}}
-</p>
-<br />
-
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/mail_conv.tpl b/view/theme/decaf-mobile/smarty3/mail_conv.tpl
deleted file mode 100644
index c2b43c538d..0000000000
--- a/view/theme/decaf-mobile/smarty3/mail_conv.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
-		<div class="mail-conv-date">{{$mail.date}}</div>
-		<div class="mail-conv-subject">{{$mail.subject}}</div>
-	</div>
-	<div class="mail-conv-body">{{$mail.body}}</div>
-</div>
-<div class="mail-conv-outside-wrapper-end"></div>
-
-
-<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}?confirm=1" class="icon drophide delete-icon mail-list-delete-icon" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/drop/{{$mail.id}}')});" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);*}}" ></a></div>
-<div class="mail-conv-delete-end"></div>
-
-<hr class="mail-conv-break" />
diff --git a/view/theme/decaf-mobile/smarty3/mail_list.tpl b/view/theme/decaf-mobile/smarty3/mail_list.tpl
deleted file mode 100644
index 538f6affbd..0000000000
--- a/view/theme/decaf-mobile/smarty3/mail_list.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >{{$from_name}}</div>
-		<div class="mail-list-date">{{$date}}</div>
-		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
-		<a href="message/dropconv/{{$id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/dropconv/{{$id}}')});"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" id="mail-list-delete-{{$id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
-	</div>
-</div>
-</div>
-<div class="mail-list-delete-end"></div>
-
-<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/decaf-mobile/smarty3/manage.tpl b/view/theme/decaf-mobile/smarty3/manage.tpl
deleted file mode 100644
index f7d72f653b..0000000000
--- a/view/theme/decaf-mobile/smarty3/manage.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-<div id="identity-manage-desc">{{$desc}}</div>
-<div id="identity-manage-choose">{{$choose}}</div>
-<div id="identity-selector-wrapper">
-	<form action="manage" method="post" >
-	<select name="identity" size="4" onchange="this.form.submit();" >
-
-	{{foreach $identities as $id}}
-		<option {{$id.selected}} value="{{$id.uid}}">{{$id.username}} ({{$id.nickname}})</option>
-	{{/foreach}}
-
-	</select>
-	<div id="identity-select-break"></div>
-
-	{{* name="submit" interferes with this.form.submit() *}}
-	<input id="identity-submit" type="submit" {{*name="submit"*}} value="{{$submit}}" />
-</div></form>
-
diff --git a/view/theme/decaf-mobile/smarty3/message-end.tpl b/view/theme/decaf-mobile/smarty3/message-end.tpl
deleted file mode 100644
index adeea280c7..0000000000
--- a/view/theme/decaf-mobile/smarty3/message-end.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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/decaf-mobile/smarty3/message-head.tpl b/view/theme/decaf-mobile/smarty3/message-head.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/theme/decaf-mobile/smarty3/message-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
diff --git a/view/theme/decaf-mobile/smarty3/moderated_comment.tpl b/view/theme/decaf-mobile/smarty3/moderated_comment.tpl
deleted file mode 100644
index b2401ca483..0000000000
--- a/view/theme/decaf-mobile/smarty3/moderated_comment.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-{{*
- *	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}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
-					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
-					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
-					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
-					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
-					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
-					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
-				</div>
-				<ul class="comment-edit-bb-{{$id}}">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="{{$edbold}}"
-						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="{{$editalic}}"
-						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="{{$eduline}}"
-						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="{{$edquote}}"
-						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="{{$edcode}}"
-						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="{{$edimg}}"
-						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="{{$edurl}}"
-						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="{{$edvideo}}"
-						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>			
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/decaf-mobile/smarty3/msg-end.tpl b/view/theme/decaf-mobile/smarty3/msg-end.tpl
deleted file mode 100644
index 594f3f79b9..0000000000
--- a/view/theme/decaf-mobile/smarty3/msg-end.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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/decaf-mobile/smarty3/msg-header.tpl b/view/theme/decaf-mobile/smarty3/msg-header.tpl
deleted file mode 100644
index 8447bb3006..0000000000
--- a/view/theme/decaf-mobile/smarty3/msg-header.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script language="javascript" type="text/javascript">
-{{*/*	window.nickname = "{{$nickname}}";
-	window.linkURL = "{{$linkurl}}";
-	var plaintext = "none";
-	window.autocompleteType = 'msg-header';*/*}}
-	window.jotId = "#prvmail-text";
-	window.imageUploadButton = 'prvmail-upload';
-</script>
-
diff --git a/view/theme/decaf-mobile/smarty3/nav.tpl b/view/theme/decaf-mobile/smarty3/nav.tpl
deleted file mode 100644
index 87d0bdec7e..0000000000
--- a/view/theme/decaf-mobile/smarty3/nav.tpl
+++ /dev/null
@@ -1,160 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<nav>
-{{*<!--	{{$langselector}} -->*}}
-
-{{*<!--	<div id="site-location">{{$sitelocation}}</div> -->*}}
-
-	<span id="nav-link-wrapper" >
-
-{{*<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->*}}
-	<div class="nav-button-container">
-{{*<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->*}}
-	<a href="{{$nav.navigation.0}}" title="{{$nav.navigation.3}}" >
-	<img rel="#system-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/menu.png">
-	</a>
-{{*<!--	</a>-->*}}
-	{{*<!--<ul id="system-menu-list" class="nav-menu-list">
-		{{if $nav.login}}
-		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
-		{{/if}}
-
-		{{if $nav.register}}
-		<a id="nav-register-link" class="nav-load-page-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>
-		{{/if}}
-
-		{{if $nav.settings}}
-		<li><a id="nav-settings-link" class="{{$nav.settings.2}} nav-load-page-link" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>
-		{{/if}}
-
-		{{if $nav.manage}}
-		<li>
-		<a id="nav-manage-link" class="nav-load-page-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>
-		</li>
-		{{/if}}
-
-		{{if $nav.profiles}}
-		<li><a id="nav-profiles-link" class="{{$nav.profiles.2}} nav-load-page-link" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a></li>
-		{{/if}}
-
-		{{if $nav.admin}}
-		<li><a id="nav-admin-link" class="{{$nav.admin.2}} nav-load-page-link" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>
-		{{/if}}
-
-		<li><a id="nav-search-link" class="{{$nav.search.2}} nav-load-page-link" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a></li>
-
-		{{if $nav.apps}}
-		<li><a id="nav-apps-link" class="{{$nav.apps.2}} nav-load-page-link" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a></li>
-		{{/if}}
-
-		{{if $nav.help}}
-		<li><a id="nav-help-link" class="{{$nav.help.2}} nav-load-page-link" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>
-		{{/if}}
-		
-		{{if $nav.logout}}
-		<li><a id="nav-logout-link" class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
-		{{/if}}
-	</ul>-->*}}
-	</div>
-
-	{{if $nav.notifications}}
-{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->*}}
-	<div class="nav-button-container">
-{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">-->*}}
-	<a href="{{$nav.notifications.all.0}}">
-	<img rel="#nav-notifications-menu" class="nav-link" src="view/theme/decaf-mobile/images/notifications.png">
-	</a>
-{{*<!--	</a>-->*}}
-	{{*<!--<span id="notify-update" class="nav-ajax-left"></span>
-	<ul id="nav-notifications-menu" class="notifications-menu-popup">
-		<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
-		<li class="empty">{{$emptynotifications}}</li>
-	</ul>-->*}}
-	</div>
-	{{/if}}		
-
-{{*<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->*}}
-	{{if $nav.contacts}}
-	<div class="nav-button-container">
-{{*<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->*}}
-	<a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >
-	<img rel="#contacts-menu-list"  class="nav-link" src="view/theme/decaf-mobile/images/contacts.png">
-	</a>
-	{{*<!--</a>-->*}}
-	{{if $nav.introductions}}
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{*<!--<ul id="contacts-menu-list" class="nav-menu-list">
-		{{if $nav.contacts}}
-		<li><a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><li>
-		{{/if}}
-
-		<li><a id="nav-directory-link" class="{{$nav.directory.2}} nav-load-page-link" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><li>
-
-		{{if $nav.introductions}}
-		<li>
-		<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
-		</li>
-		{{/if}}
-	</ul>-->*}}
-	</div>
-	{{/if}}
-
-	{{if $nav.messages}}
-{{*<!--	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->*}}
-	<div class="nav-button-container">
-	<a id="nav-messages-link" class="{{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
-	<img src="view/theme/decaf-mobile/images/message.png" class="nav-link">
-	</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	</div>
-	{{/if}}
-
-{{*<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->*}}
-	{{if $nav.network}}
-	<div class="nav-button-container">
-{{*<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->*}}
-	<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="/" >
-	<img rel="#network-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/network.png">
-	</a>
-{{*<!--	</a>-->*}}
-	<span id="net-update" class="nav-ajax-left"></span>
-	</div>
-	{{/if}}
-<!--	<ul id="network-menu-list" class="nav-menu-list">
-		{{if $nav.network}}
-		<li>
-		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
-		</li>
-		{{/if}}
-
-		{{if $nav.network}}
-		<li>
-		<a class="nav-menu-icon network-reset-link nav-link" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">{{$nav.net_reset.1}}</a>
-		</li>
-		{{/if}}
-
-		{{if $nav.home}}
-		<li><a id="nav-home-link" class="{{$nav.home.2}} {{$sel.home}} nav-load-page-link" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a></li>
-		{{/if}}
-
-		{{if $nav.community}}
-		<li>
-		<a id="nav-community-link" class="{{$nav.community.2}} {{$sel.community}} nav-load-page-link" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
-		</li>
-		{{/if}}
-	</ul>
-	</div>-->
-
-	</span>
-	{{*<!--<span id="nav-end"></span>-->*}}
-	<span id="banner">{{$banner}}</span>
-</nav>
-
-{{*<!--<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/photo_drop.tpl b/view/theme/decaf-mobile/smarty3/photo_drop.tpl
deleted file mode 100644
index 57f26cf52b..0000000000
--- a/view/theme/decaf-mobile/smarty3/photo_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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}}?confirm=1" onclick="return confirmDelete(function(){this.href='item/drop/{{$id}}'});" class="icon drophide" title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
-</div>
-<div class="wall-item-delete-end"></div>
diff --git a/view/theme/decaf-mobile/smarty3/photo_edit.tpl b/view/theme/decaf-mobile/smarty3/photo_edit.tpl
deleted file mode 100644
index 1cff8f0448..0000000000
--- a/view/theme/decaf-mobile/smarty3/photo_edit.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="{{$item_id}}" />
-	<input id="photo-edit-form-confirm" type="hidden" name="confirm" value="1" />
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
-	</div>
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
-	<input id="photo-edit-caption" type="text" size="32" name="desc" value="{{$caption}}" />
-	</div>
-
-	<div id="photo-edit-caption-end"></div>
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
-	<input name="newtag" id="photo-edit-newtag" size="32" title="{{$help_tags}}" type="text" />
-	</div>
-
-	<div id="photo-edit-tags-end"></div>
-
-	<div class="photo-edit-rotate-choice">
-	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">{{$rotatecw}}</label>
-	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
-	</div>
-
-	<div class="photo-edit-rotate-choice">
-	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">{{$rotateccw}}</label>
-	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		{{*<!--<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="{{$permissions}}"/>
-			<span id="jot-perms-icon" class="icon {{$lockstate}} photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">-->*}}
-			<div id="photo-edit-perms-select" >
-				{{*<!--{{$aclselect}}-->*}}
-				{{include file="acl_html_selector.tpl"}}
-			</div>
-		{{*<!--</div>-->*}}
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete(function(){remove('photo-edit-form-confirm');});" />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-
diff --git a/view/theme/decaf-mobile/smarty3/photo_edit_head.tpl b/view/theme/decaf-mobile/smarty3/photo_edit_head.tpl
deleted file mode 100644
index 740c3b425a..0000000000
--- a/view/theme/decaf-mobile/smarty3/photo_edit_head.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{*<!--
-<script>
-	window.prevLink = "{{$prevlink}}";
-	window.nextLink = "{{$nextlink}}";
-	window.photoEdit = true;
-
-</script>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/photo_view.tpl b/view/theme/decaf-mobile/smarty3/photo_view.tpl
deleted file mode 100644
index 5ccb5fb163..0000000000
--- a/view/theme/decaf-mobile/smarty3/photo_view.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{*
- *	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>
-
-<div id="photo-edit-link-wrap">
-{{if $tools}}
-<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
-|
-<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
-{{/if}}
-{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" {{*onclick="lockview(event,'photo/{{$id}}');"*}} /> {{/if}}
-</div>
-
-<div id="photo-nav">
-	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><img src="view/theme/decaf-mobile/images/arrow-left.png"></a></div>{{/if}}
-	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><img src="view/theme/decaf-mobile/images/arrow-right.png"></a></div>{{/if}}
-</div>
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
-<div id="photo-photo-end"></div>
-<div id="photo-caption">{{$desc}}</div>
-{{if $tags}}
-<div id="in-this-photo-text">{{$tags.0}}</div>
-<div id="in-this-photo">{{$tags.1}}</div>
-{{/if}}
-{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
-
-{{if $edit}}
-{{$edit}}
-{{else}}
-
-{{if $likebuttons}}
-<div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
-</div>
-{{/if}}
-
-{{$comments}}
-
-{{$paginate}}
-{{/if}}
-
diff --git a/view/theme/decaf-mobile/smarty3/photos_head.tpl b/view/theme/decaf-mobile/smarty3/photos_head.tpl
deleted file mode 100644
index c8bfa62c1d..0000000000
--- a/view/theme/decaf-mobile/smarty3/photos_head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{*<!--
-<script>
-	window.isPublic = "{{$ispublic}}";
-</script>
--->*}}
diff --git a/view/theme/decaf-mobile/smarty3/photos_upload.tpl b/view/theme/decaf-mobile/smarty3/photos_upload.tpl
deleted file mode 100644
index 9c22448dda..0000000000
--- a/view/theme/decaf-mobile/smarty3/photos_upload.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$pagename}}</h3>
-
-<div id="photos-usage-message">{{$usage}}</div>
-
-<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
-		<select id="photos-upload-album-select" name="album">
-		{{$albumselect}}
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
-
-	{{$default_upload_box}}
-
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
-	</div>
-
-
-	{{*<!--<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
-		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
-		</a>
-	</div>
-	<div id="photos-upload-perms-end"></div>
-
-	<div style="display: none;">-->*}}
-		<div id="photos-upload-permissions-wrapper">
-			{{*<!--{{$aclselect}}-->*}}
-			{{include file="acl_html_selector.tpl"}}
-		</div>
-	{{*<!--</div>-->*}}
-
-	<div id="photos-upload-spacer"></div>
-
-	{{$alt_uploader}}
-
-	{{$default_upload_submit}}
-
-	<div class="photos-upload-end" ></div>
-</form>
-
diff --git a/view/theme/decaf-mobile/smarty3/profed_end.tpl b/view/theme/decaf-mobile/smarty3/profed_end.tpl
deleted file mode 100644
index e9c03543b1..0000000000
--- a/view/theme/decaf-mobile/smarty3/profed_end.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{*<!--
-<script type="text/javascript" src="js/country.min.js" ></script>
-
-<script language="javascript" type="text/javascript">
-	Fill_Country('{{$country_name}}');
-	Fill_States('{{$region}}');
-</script>
--->*}}
diff --git a/view/theme/decaf-mobile/smarty3/profed_head.tpl b/view/theme/decaf-mobile/smarty3/profed_head.tpl
deleted file mode 100644
index c8ce27bb83..0000000000
--- a/view/theme/decaf-mobile/smarty3/profed_head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{*<!--
-<script language="javascript" type="text/javascript">
-	window.editSelect = "none";
-</script>
--->*}}
diff --git a/view/theme/decaf-mobile/smarty3/profile_edit.tpl b/view/theme/decaf-mobile/smarty3/profile_edit.tpl
deleted file mode 100644
index 7583784fbf..0000000000
--- a/view/theme/decaf-mobile/smarty3/profile_edit.tpl
+++ /dev/null
@@ -1,329 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$default}}
-
-<h1>{{$banner}}</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
-<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
-<li></li>
-<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
-<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
-<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
-<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-{{$gender}}
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
-<div id="profile-edit-dob" >
-{{$dob}} {{$age}}
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-{{$hide_friends}}
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
-<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
-<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
-<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
-<input type="text" size="28" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" />
-{{*<!--<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
-<option selected="selected" >{{$country_name}}</option>
-<option>temp</option>
-</select>-->*}}
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
-<input type="text" size="28" name="region" id="profile-edit-region" value="{{$region}}" />
-{{*<!--<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >{{$region}}</option>
-<option>temp</option>
-</select>-->*}}
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
-<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
-{{$marital}}
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
-<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
-<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
-{{$sexual}}
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
-<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
-<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
-<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
-<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
-</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
-<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
-</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" class="profile-jot-box">
-<p id="about-jot-desc" >
-{{$lbl_about}}
-</p>
-
-<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" class="profile-jot-box" >
-<p id="interest-jot-desc" >
-{{$lbl_hobbies}}
-</p>
-
-<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" class="profile-jot-box" >
-<p id="likes-jot-desc" >
-{{$lbl_likes}}
-</p>
-
-<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" class="profile-jot-box" >
-<p id="dislikes-jot-desc" >
-{{$lbl_dislikes}}
-</p>
-
-<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" class="profile-jot-box" >
-<p id="contact-jot-desc" >
-{{$lbl_social}}
-</p>
-
-<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" class="profile-jot-box" >
-<p id="music-jot-desc" >
-{{$lbl_music}}
-</p>
-
-<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" class="profile-jot-box" >
-<p id="book-jot-desc" >
-{{$lbl_book}}
-</p>
-
-<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" class="profile-jot-box" >
-<p id="tv-jot-desc" >
-{{$lbl_tv}} 
-</p>
-
-<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" class="profile-jot-box" >
-<p id="film-jot-desc" >
-{{$lbl_film}}
-</p>
-
-<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" class="profile-jot-box" >
-<p id="romance-jot-desc" >
-{{$lbl_love}}
-</p>
-
-<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" class="profile-jot-box" >
-<p id="work-jot-desc" >
-{{$lbl_work}}
-</p>
-
-<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" class="profile-jot-box" >
-<p id="education-jot-desc" >
-{{$lbl_school}} 
-</p>
-
-<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-
diff --git a/view/theme/decaf-mobile/smarty3/profile_photo.tpl b/view/theme/decaf-mobile/smarty3/profile_photo.tpl
deleted file mode 100644
index 6bcb3cf850..0000000000
--- a/view/theme/decaf-mobile/smarty3/profile_photo.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-{{*
- *	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">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">{{$lbl_upfile}} </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="25" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-{{$select}}
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/profile_vcard.tpl b/view/theme/decaf-mobile/smarty3/profile_vcard.tpl
deleted file mode 100644
index 85c6345d6d..0000000000
--- a/view/theme/decaf-mobile/smarty3/profile_vcard.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-
-	<div class="fn label">{{$profile.name}}</div>
-	
-				
-	
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
-
-
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-
-	<div id="profile-vcard-break"></div>	
-	<div id="profile-extra-links">
-		<ul>
-			{{if $connect}}
-				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-			{{/if}}
-			{{if $wallmessage}}
-				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block}}
-
-
diff --git a/view/theme/decaf-mobile/smarty3/prv_message.tpl b/view/theme/decaf-mobile/smarty3/prv_message.tpl
deleted file mode 100644
index 6372d306ae..0000000000
--- a/view/theme/decaf-mobile/smarty3/prv_message.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h3>{{$header}}</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-{{$parent}}
-
-<div id="prvmail-to-label">{{$to}}</div>
-
-{{if $showinputs}}
-<input type="text" id="recip" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
-{{else}}
-{{$select}}
-{{/if}}
-
-<div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
-
-<div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
-	<div id="prvmail-upload-wrapper"  style="display: none;">
-		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
-	</div> 
-	{{*<!--<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
-	</div>-->*}} 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
-
-<script>
-document.getElementById('prvmail-upload-wrapper').style.display = "inherit";
-</script>
diff --git a/view/theme/decaf-mobile/smarty3/register.tpl b/view/theme/decaf-mobile/smarty3/register.tpl
deleted file mode 100644
index 3f64bb6725..0000000000
--- a/view/theme/decaf-mobile/smarty3/register.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class='register-form'>
-<h2>{{$regtitle}}</h2>
-<br />
-
-<form action="register" method="post" id="register-form">
-
-	<input type="hidden" name="photo" value="{{$photo}}" />
-
-	{{$registertext}}
-
-	<p id="register-realpeople">{{$realpeople}}</p>
-
-	<br />
-{{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>
-	</div>
-
-	<br /><br />
-
-{{if $invitations}}
-
-	<p id="register-invite-desc">{{$invite_desc}}</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
-	</div>
-	<div id="register-name-end" ></div>
-
-{{/if}}
-
-
-	<div id="register-name-wrapper" class="field input" >
-		<label for="register-name" id="label-register-name" >{{$namelabel}}</label><br />
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper"  class="field input" >
-		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label><br />
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
-	</div>
-	<div id="register-email-end" ></div>
-
-	<div id="register-nickname-wrapper" class="field input" >
-		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label><br />
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" >
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >{{$nickdesc}}</p>
-	</div>
-
-	{{$publish}}
-
-	<div id="register-footer">
-	{{*<!--<div class="agreement">
-	By clicking '{{$regbutt}}' you are agreeing to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
-	</div>-->*}}
-	<br />
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
-	</div>
-	<div id="register-submit-end" ></div>
-	</div>
-</form>
-<br /><br /><br />
-
-{{$license}}
-
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/search_item.tpl b/view/theme/decaf-mobile/smarty3/search_item.tpl
deleted file mode 100644
index a6da44d3d6..0000000000
--- a/view/theme/decaf-mobile/smarty3/search_item.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-{{*
- *	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}}" >
-		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
-			{{*<!--<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
-				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>-->*}}
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" {{*onclick="lockview(event,{{$item.id}});" *}}/>{{*<!--</div>-->*}}
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		{{*<!--<div class="wall-item-author">-->*}}
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
-				
-		{{*<!--</div>-->*}}
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			{{*<!--<div class="wall-item-title-end"></div>-->*}}
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
-			{{if $item.has_cats}}
-			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/{{$item.id}}')});" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>{{/if}}
-			{{*<!--</div>-->*}}
-				{{*<!--{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}-->*}}
-			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
-		</div>
-	</div>
-	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-
-{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
-
-{{*<!--</div>-->*}}
-
-
diff --git a/view/theme/decaf-mobile/smarty3/settings-head.tpl b/view/theme/decaf-mobile/smarty3/settings-head.tpl
deleted file mode 100644
index c8bfa62c1d..0000000000
--- a/view/theme/decaf-mobile/smarty3/settings-head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{*<!--
-<script>
-	window.isPublic = "{{$ispublic}}";
-</script>
--->*}}
diff --git a/view/theme/decaf-mobile/smarty3/settings.tpl b/view/theme/decaf-mobile/smarty3/settings.tpl
deleted file mode 100644
index 587b96e28e..0000000000
--- a/view/theme/decaf-mobile/smarty3/settings.tpl
+++ /dev/null
@@ -1,156 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$ptitle}}</h1>
-
-{{$nickname_block}}
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<h3 class="settings-heading">{{$h_pass}}</h3>
-
-{{include file="field_password.tpl" field=$password1}}
-{{include file="field_password.tpl" field=$password2}}
-{{include file="field_password.tpl" field=$password3}}
-
-{{if $oid_enable}}
-{{include file="field_input.tpl" field=$openid}}
-{{/if}}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-<h3 class="settings-heading">{{$h_basic}}</h3>
-
-{{include file="field_input.tpl" field=$username}}
-{{include file="field_input.tpl" field=$email}}
-{{include file="field_password.tpl" field=$password4}}
-{{include file="field_custom.tpl" field=$timezone}}
-{{include file="field_input.tpl" field=$defloc}}
-{{include file="field_checkbox.tpl" field=$allowloc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-<h3 class="settings-heading">{{$h_prv}}</h3>
-
-
-<input type="hidden" name="visibility" value="{{$visibility}}" />
-
-{{include file="field_input.tpl" field=$maxreq}}
-
-{{$profile_in_dir}}
-
-{{$profile_in_net_dir}}
-
-{{$hide_friends}}
-
-{{$hide_wall}}
-
-{{$blockwall}}
-
-{{$blocktags}}
-
-{{$suggestme}}
-
-{{$unkmail}}
-
-
-{{include file="field_input.tpl" field=$cntunkmail}}
-
-{{include file="field_input.tpl" field=$expire.days}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="{{$expire.advanced}}">{{$expire.label}}</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>{{$expire.advanced}}</h3>
-			{{include file="field_yesno.tpl" field=$expire.items}}
-			{{include file="field_yesno.tpl" field=$expire.notes}}
-			{{include file="field_yesno.tpl" field=$expire.starred}}
-			{{include file="field_yesno.tpl" field=$expire.network_only}}
-		</div>
-	</div>
-
-</div>
-
-
-<div id="settings-perms-wrapper" class="field">
-<label for="settings-default-perms">{{$settings_perms}}</label><br/>
-<div id="settings-default-perms" class="settings-default-perms" >
-{{*<!--	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
-	
-	<div style="display: none;">-->*}}
-		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
-			{{*<!--{{$aclselect}}-->*}}
-			{{include file="acl_html_selector.tpl"}}
-		</div>
-{{*<!--	</div>
-
-	</div>-->*}}
-</div>
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-{{$group_select}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-
-<h3 class="settings-heading">{{$h_not}}</h3>
-<div id="settings-notifications">
-
-<div id="settings-activity-desc">{{$activity_options}}</div>
-
-{{include file="field_checkbox.tpl" field=$post_newfriend}}
-{{include file="field_checkbox.tpl" field=$post_joingroup}}
-{{include file="field_checkbox.tpl" field=$post_profilechange}}
-
-
-<div id="settings-notify-desc">{{$lbl_not}}</div>
-
-<div class="group">
-{{include file="field_intcheckbox.tpl" field=$notify1}}
-{{include file="field_intcheckbox.tpl" field=$notify2}}
-{{include file="field_intcheckbox.tpl" field=$notify3}}
-{{include file="field_intcheckbox.tpl" field=$notify4}}
-{{include file="field_intcheckbox.tpl" field=$notify5}}
-{{include file="field_intcheckbox.tpl" field=$notify6}}
-{{include file="field_intcheckbox.tpl" field=$notify7}}
-{{include file="field_intcheckbox.tpl" field=$notify8}}
-</div>
-
-</div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-<h3 class="settings-heading">{{$h_advn}}</h3>
-<div id="settings-pagetype-desc">{{$h_descadvn}}</div>
-
-{{$pagetype}}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
diff --git a/view/theme/decaf-mobile/smarty3/settings_display_end.tpl b/view/theme/decaf-mobile/smarty3/settings_display_end.tpl
deleted file mode 100644
index 4b3db00f5a..0000000000
--- a/view/theme/decaf-mobile/smarty3/settings_display_end.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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/decaf-mobile/smarty3/suggest_friends.tpl b/view/theme/decaf-mobile/smarty3/suggest_friends.tpl
deleted file mode 100644
index 7221dc6898..0000000000
--- a/view/theme/decaf-mobile/smarty3/suggest_friends.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	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}}">
-			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{if $connlnk}}
-	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-	{{/if}}
-	<a href="{{$ignlnk}}&confirm=1" title="{{$ignore}}" class="icon drophide profile-match-ignore" id="profile-match-drop-{{$ignid}}" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);"*}} onclick="id=this.id;return confirmDelete(function(){changeHref(id, '{{$ignlnk}}')});" ></a>
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/threaded_conversation.tpl b/view/theme/decaf-mobile/smarty3/threaded_conversation.tpl
deleted file mode 100644
index e90caf5a70..0000000000
--- a/view/theme/decaf-mobile/smarty3/threaded_conversation.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$live_update}}
-
-{{foreach $threads as $thread}}
-{{if $mode == display}}
-{{include file="{{$thread.template}}" item=$thread}}
-{{else}}
-{{include file="wall_thread_toponly.tpl" item=$thread}}
-{{/if}}
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
diff --git a/view/theme/decaf-mobile/smarty3/voting_fakelink.tpl b/view/theme/decaf-mobile/smarty3/voting_fakelink.tpl
deleted file mode 100644
index 1e073916e1..0000000000
--- a/view/theme/decaf-mobile/smarty3/voting_fakelink.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	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/decaf-mobile/smarty3/wall_thread.tpl b/view/theme/decaf-mobile/smarty3/wall_thread.tpl
deleted file mode 100644
index 058ae43cc5..0000000000
--- a/view/theme/decaf-mobile/smarty3/wall_thread.tpl
+++ /dev/null
@@ -1,124 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
-<a name="{{$item.id}}" ></a>
-{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
-			{{if $item.owner_url}}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
-			{{/if}}
-			{{*<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
-			{{*<!--<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">-->*}}
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                        {{$item.item_photo_menu}}
-                    </ul>
-                </div>-->*}}
-
-			{{*<!--</div>-->*}}
-			{{*<!--<div class="wall-item-photo-end"></div>-->*}}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" {{*onclick="lockview(event,{{$item.id}});"*}} />{{*<!--</div>-->*}}
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		{{*<!--<div class="wall-item-author">-->*}}
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>				
-		{{*<!--</div>-->*}}
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			{{*<!--<div class="wall-item-title-end"></div>-->*}}
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-					{{*<!--<div class="body-tag">-->*}}
-						{{foreach $item.tags as $tag}}
-							<span class='body-tag tag'>{{$tag}}</span>
-						{{/foreach}}
-					{{*<!--</div>-->*}}
-			{{if $item.has_cats}}
-			<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{if $item.vote}}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-				<a href="like/{{$item.id}}?verb=like&return={{$return_path}}#{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" ></a>
-				{{if $item.vote.dislike}}
-				<a href="like/{{$item.id}}?verb=dislike&return={{$return_path}}#{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" ></a>
-				{{/if}}
-				{{*<!--{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}-->*}}
-				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-			</div>
-			{{/if}}
-			{{if $item.plink}}
-				{{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
-			{{/if}}
-			{{if $item.edpost}}
-				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-			{{/if}}
-			 
-			{{if $item.star}}
-			<a href="starred/{{$item.id}}?return={{$return_path}}#{{$item.id}}" id="starred-{{$item.id}}" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
-			{{/if}}
-			{{*<!--{{if $item.tagger}}
-			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
-			{{/if}}-->*}}
-			{{*<!--{{if $item.filer}}
-			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
-			{{/if}}			-->*}}
-			
-			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/{{$item.id}}')});" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>{{/if}}
-			{{*<!--</div>-->*}}
-				{{*<!--{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}-->*}}
-			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
-		</div>
-	</div>	
-	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
-	<div class="wall-item-like wall-item-like-full {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-	<div class="wall-item-dislike wall-item-dislike-full {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-
-	{{if $item.threaded}}
-	{{if $item.comment}}
-	{{*<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->*}}
-		{{$item.comment}}
-	{{*<!--</div>-->*}}
-	{{/if}}
-	{{/if}}
-
-{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
-{{*<!--</div>-->*}}
-{{foreach $item.children as $child}}
-	{{include file="{{$child.template}}" item=$child}}
-{{/foreach}}
-
-{{if $item.flatten}}
-{{*<!--<div class="wall-item-comment-wrapper" >-->*}}
-	{{$item.comment}}
-{{*<!--</div>-->*}}
-{{/if}}
-</div>
-
diff --git a/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl b/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl
deleted file mode 100644
index af8626a844..0000000000
--- a/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl
+++ /dev/null
@@ -1,106 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}-->
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
-<a name="{{$item.id}}" ></a>
-	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
-		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
-			{{if $item.owner_url}}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
-			{{/if}}
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" {{*onclick="lockview(event,{{$item.id}});"*}} />
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>				
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-						{{foreach $item.tags as $tag}}
-							<span class='body-tag tag'>{{$tag}}</span>
-						{{/foreach}}
-			{{if $item.has_cats}}
-			<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{if $item.vote}}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-				<a href="like/{{$item.id}}?verb=like&return={{$return_path}}#{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" ></a>
-				{{if $item.vote.dislike}}
-				<a href="like/{{$item.id}}?verb=dislike&return={{$return_path}}#{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" ></a>
-				{{/if}}
-				{{*<!--{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}-->*}}
-				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-			</div>
-			{{/if}}
-			{{if $item.plink}}
-				<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>
-			{{/if}}
-			{{if $item.edpost}}
-				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-			{{/if}}
-			 
-			{{if $item.star}}
-			<a href="starred/{{$item.id}}?return={{$return_path}}#{{$item.id}}" id="starred-{{$item.id}}" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
-			{{/if}}
-			{{*<!--{{if $item.tagger}}
-			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
-			{{/if}}
-			{{if $item.filer}}
-			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
-			{{/if}}			-->*}}
-			
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/{{$item.id}}')});" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>{{/if}}
-				{{*<!--{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}-->*}}
-		</div>
-	</div>	
-	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-
-	<div class="hide-comments-outer">
-	<a href="display/{{$user.nickname}}/{{$item.id}}"><span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.total_comments_num}} {{$item.total_comments_text}}</span></a>
-	</div>
-<!--	{{if $item.threaded}}
-	{{if $item.comment}}
-		{{$item.comment}}
-	{{/if}}
-	{{/if}}
-
-{{foreach $item.children as $child}}
-	{{include file="{{$child.template}}" item=$child}}
-{{/foreach}}
-
-{{if $item.flatten}}
-	{{$item.comment}}
-{{/if}}-->
-</div>
-<!--{{if $item.comment_lastcollapsed}}</div>{{/if}}-->
-
diff --git a/view/theme/decaf-mobile/smarty3/wallmessage.tpl b/view/theme/decaf-mobile/smarty3/wallmessage.tpl
deleted file mode 100644
index 4cba900917..0000000000
--- a/view/theme/decaf-mobile/smarty3/wallmessage.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h3>{{$header}}</h3>
-
-<h4>{{$subheader}}</h4>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="wallmessage/{{$nickname}}" method="post" >
-
-{{$parent}}
-
-<div id="prvmail-to-label">{{$to}}</div>
-{{$recipname}}
-
-<div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
-
-<div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
-	{{*<!--<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
-	</div> -->*}}
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/wallmsg-end.tpl b/view/theme/decaf-mobile/smarty3/wallmsg-end.tpl
deleted file mode 100644
index 594f3f79b9..0000000000
--- a/view/theme/decaf-mobile/smarty3/wallmsg-end.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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/decaf-mobile/smarty3/wallmsg-header.tpl b/view/theme/decaf-mobile/smarty3/wallmsg-header.tpl
deleted file mode 100644
index e6f1c6737e..0000000000
--- a/view/theme/decaf-mobile/smarty3/wallmsg-header.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script language="javascript" type="text/javascript">
-{{*//window.editSelect = "none";*}}
-window.jotId = "#prvmail-text";
-window.imageUploadButton = 'prvmail-upload';
-</script>
-
diff --git a/view/theme/decaf-mobile/suggest_friends.tpl b/view/theme/decaf-mobile/suggest_friends.tpl
deleted file mode 100644
index d5051e33b5..0000000000
--- a/view/theme/decaf-mobile/suggest_friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" onError="this.src='../../../images/person-48.jpg';" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="$url" title="$name">$name</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{ if $connlnk }}
-	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
-	{{ endif }}
-	<a href="$ignlnk&confirm=1" title="$ignore" class="icon drophide profile-match-ignore" id="profile-match-drop-$ignid" {#onmouseout="imgdull(this);" onmouseover="imgbright(this);"#} onclick="id=this.id;return confirmDelete(function(){changeHref(id, '$ignlnk')});" ></a>
-</div>
diff --git a/view/theme/decaf-mobile/threaded_conversation.tpl b/view/theme/decaf-mobile/threaded_conversation.tpl
deleted file mode 100644
index 5310b323a9..0000000000
--- a/view/theme/decaf-mobile/threaded_conversation.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-{{ if $mode == display }}
-{{ inc $thread.template with $item=$thread }}{{ endinc }}
-{{ else }}
-{{ inc wall_thread_toponly.tpl with $item=$thread }}{{ endinc }}
-{{ endif }}
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
diff --git a/view/theme/decaf-mobile/voting_fakelink.tpl b/view/theme/decaf-mobile/voting_fakelink.tpl
deleted file mode 100644
index b66302cc27..0000000000
--- a/view/theme/decaf-mobile/voting_fakelink.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="fakelink-wrapper"  id="$[type]list-$id-wrapper">$phrase</span>
diff --git a/view/theme/decaf-mobile/wall_thread.tpl b/view/theme/decaf-mobile/wall_thread.tpl
deleted file mode 100644
index a5bcbda7ea..0000000000
--- a/view/theme/decaf-mobile/wall_thread.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-<a name="$item.id" ></a>
-{#<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" 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{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			{#<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->#}
-			{#<!--<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-				{#<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                        $item.item_photo_menu
-                    </ul>
-                </div>-->#}
-
-			{#<!--</div>-->#}
-			{#<!--<div class="wall-item-photo-end"></div>-->#}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" {#onclick="lockview(event,$item.id);"#} />{#<!--</div>-->#}
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		{#<!--<div class="wall-item-author">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
-		{#<!--</div>-->#}
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			{#<!--<div class="wall-item-title-end"></div>-->#}
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					{#<!--<div class="body-tag">-->#}
-						{{ for $item.tags as $tag }}
-							<span class='body-tag tag'>$tag</span>
-						{{ endfor }}
-					{#<!--</div>-->#}
-			{{ if $item.has_cats }}
-			<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="like/$item.id?verb=like&return=$return_path#$item.id" class="icon like" title="$item.vote.like.0" ></a>
-				{{ if $item.vote.dislike }}
-				<a href="like/$item.id?verb=dislike&return=$return_path#$item.id" class="icon dislike" title="$item.vote.dislike.0" ></a>
-				{{ endif }}
-				{#<!--{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}-->#}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				{#<!--<div class="wall-item-links-wrapper">-->#}<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a>{#<!--</div>-->#}
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-			 
-			{{ if $item.star }}
-			<a href="starred/$item.id?return=$return_path#$item.id" id="starred-$item.id" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{#<!--{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-			{{ endif }}-->#}
-			{#<!--{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			-->#}
-			
-			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/$item.id')});" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>{{ endif }}
-			{#<!--</div>-->#}
-				{#<!--{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}-->#}
-			{#<!--<div class="wall-item-delete-end"></div>-->#}
-		</div>
-	</div>	
-	{#<!--<div class="wall-item-wrapper-end"></div>-->#}
-	<div class="wall-item-like wall-item-like-full $item.indent" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike wall-item-dislike-full $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
-
-	{{ if $item.threaded }}
-	{{ if $item.comment }}
-	{#<!--<div class="wall-item-comment-wrapper $item.indent" >-->#}
-		$item.comment
-	{#<!--</div>-->#}
-	{{ endif }}
-	{{ endif }}
-
-{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->#}
-{#<!--</div>-->#}
-{{ for $item.children as $child }}
-	{{ inc $child.template with $item=$child }}{{ endinc }}
-{{ endfor }}
-
-{{ if $item.flatten }}
-{#<!--<div class="wall-item-comment-wrapper" >-->#}
-	$item.comment
-{#<!--</div>-->#}
-{{ endif }}
-</div>
-
diff --git a/view/theme/decaf-mobile/wall_thread_toponly.tpl b/view/theme/decaf-mobile/wall_thread_toponly.tpl
deleted file mode 100644
index 817432da53..0000000000
--- a/view/theme/decaf-mobile/wall_thread_toponly.tpl
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--{{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}-->
-<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-<a name="$item.id" ></a>
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" {#onclick="lockview(event,$item.id);"#} />
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-						{{ for $item.tags as $tag }}
-							<span class='body-tag tag'>$tag</span>
-						{{ endfor }}
-			{{ if $item.has_cats }}
-			<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="like/$item.id?verb=like&return=$return_path#$item.id" class="icon like" title="$item.vote.like.0" ></a>
-				{{ if $item.vote.dislike }}
-				<a href="like/$item.id?verb=dislike&return=$return_path#$item.id" class="icon dislike" title="$item.vote.dislike.0" ></a>
-				{{ endif }}
-				{#<!--{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}-->#}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-			 
-			{{ if $item.star }}
-			<a href="starred/$item.id?return=$return_path#$item.id" id="starred-$item.id" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{#<!--{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			-->#}
-			
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/$item.id')});" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>{{ endif }}
-				{#<!--{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}-->#}
-		</div>
-	</div>	
-	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
-
-	<div class="hide-comments-outer">
-	<a href="display/$user.nickname/$item.id"><span id="hide-comments-total-$item.id" class="hide-comments-total">$item.total_comments_num $item.total_comments_text</span></a>
-	</div>
-<!--	{{ if $item.threaded }}
-	{{ if $item.comment }}
-		$item.comment
-	{{ endif }}
-	{{ endif }}
-
-{{ for $item.children as $child }}
-	{{ inc $child.template with $item=$child }}{{ endinc }}
-{{ endfor }}
-
-{{ if $item.flatten }}
-	$item.comment
-{{ endif }}-->
-</div>
-<!--{{if $item.comment_lastcollapsed}}</div>{{endif}}-->
-
diff --git a/view/theme/decaf-mobile/wallmessage.tpl b/view/theme/decaf-mobile/wallmessage.tpl
deleted file mode 100644
index e7fa0ec048..0000000000
--- a/view/theme/decaf-mobile/wallmessage.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-
-<h3>$header</h3>
-
-<h4>$subheader</h4>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="wallmessage/$nickname" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-$recipname
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
-
-<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
-	{#<!--<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> -->#}
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/decaf-mobile/wallmsg-end.tpl b/view/theme/decaf-mobile/wallmsg-end.tpl
deleted file mode 100644
index 6074133798..0000000000
--- a/view/theme/decaf-mobile/wallmsg-end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
diff --git a/view/theme/decaf-mobile/wallmsg-header.tpl b/view/theme/decaf-mobile/wallmsg-header.tpl
deleted file mode 100644
index dc6cb82199..0000000000
--- a/view/theme/decaf-mobile/wallmsg-header.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-{#//window.editSelect = "none";#}
-window.jotId = "#prvmail-text";
-window.imageUploadButton = 'prvmail-upload';
-</script>
-
diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl
deleted file mode 100644
index b455a8c2ee..0000000000
--- a/view/theme/diabook/admin_users.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-		        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl
deleted file mode 100644
index 08952aad65..0000000000
--- a/view/theme/diabook/bottom.tpl
+++ /dev/null
@@ -1,155 +0,0 @@
-<script type="text/javascript" src="$baseurl/view/theme/diabook/js/jquery.autogrow.textarea.js"></script>
-<script type="text/javascript">
-
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-       
-    });
-    
-    $("div#pause").attr("style", "position: fixed;bottom: 43px;left: 5px;");
-    $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
-    $(document).keydown(function(event) {
-    if (!$("div#pause").html()){
-    $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
-		}});  
-    $(".autocomplete").attr("style", "width: 350px;color: black;border: 1px solid #D2D2D2;background: white;cursor: pointer;text-align: left;max-height: 350px;overflow: auto;");
-	 
-	});
-	
-	$(document).ready(function(){
-		$("#sortable_boxes").sortable({
-			update: function(event, ui) {
-				var BoxOrder = $(this).sortable("toArray").toString();
-				$.cookie("Boxorder", BoxOrder , { expires: 365, path: "/" });
-			}
-		});
-
-    	var cookie = $.cookie("Boxorder");		
-    	if (!cookie) return;
-    	var SavedID = cookie.split(",");
-	   for (var Sitem=0, m = SavedID.length; Sitem < m; Sitem++) {
-           $("#sortable_boxes").append($("#sortable_boxes").children("#" + SavedID[Sitem]));
-	       }
-	     
-	});
-	
-	
-	function tautogrow(id){
-		$("textarea#comment-edit-text-" +id).autogrow(); 	
- 	};
- 	
- 	function open_boxsettings() {
-		$("div#boxsettings").attr("style","display: block;height:500px;width:300px;");
-		$("label").attr("style","width: 150px;");
-		};
- 	
-	function yt_iframe() {
-	$("iframe").load(function() { 
-	var ifr_src = $(this).contents().find("body iframe").attr("src");
-	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-	};
-
-	function scrolldown(){
-			$("html, body").animate({scrollTop:$(document).height()}, "slow");
-			return false;
-		};
-		
-	function scrolltop(){
-			$("html, body").animate({scrollTop:0}, "slow");
-			return false;
-		};
-	 	
-	$(window).scroll(function () { 
-		
-		var footer_top = $(document).height() - 30;
-		$("div#footerbox").css("top", footer_top);
-	
-		var scrollInfo = $(window).scrollTop();      
-		
-		if (scrollInfo <= "900"){
-      $("a#top").attr("id","down");
-      $("a#down").attr("onclick","scrolldown()");
-	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
-	 	$("img#scroll_top_bottom").attr("title","Scroll to bottom");
-	 	} 
-	 	    
-      if (scrollInfo > "900"){
-      $("a#down").attr("id","top");
-      $("a#top").attr("onclick","scrolltop()");
-	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
-	 	$("img#scroll_top_bottom").attr("title","Back to top");
-	 	}
-		
-    });
-  
-
-	function insertFormatting(comment,BBcode,id) {
-	
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == comment) {
-			tmpStr = "";
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-								}
-
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else			
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-	return true;
-	}
-
-	function cmtBbOpen(id) {
-	$(".comment-edit-bb-" + id).show();
-	}
-	function cmtBbClose(id) {
-	$(".comment-edit-bb-" + id).hide();
-	}
-	
-	/*$(document).ready(function(){
-	var doctitle = document.title;
-	function checkNotify() {
-	if(document.getElementById("notify-update").innerHTML != "")
-	document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
-	else
-	document.title = doctitle;
-	};
-	setInterval(function () {checkNotify();}, 10 * 1000);
-	})*/
-</script>
-<script>
-var pagetitle = null;
-$("nav").bind('nav-update',  function(e,data){
-  if (pagetitle==null) pagetitle = document.title;
-  var count = $(data).find('notif').attr('count');
-  if (count>0) {
-    document.title = "("+count+") "+pagetitle;
-  } else {
-    document.title = pagetitle;
-  }
-});
-</script>
diff --git a/view/theme/diabook/ch_directory_item.tpl b/view/theme/diabook/ch_directory_item.tpl
deleted file mode 100644
index f32f5a4f78..0000000000
--- a/view/theme/diabook/ch_directory_item.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<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>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
deleted file mode 100644
index 6f263b3d3a..0000000000
--- a/view/theme/diabook/comment_item.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-		<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" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);"  >$comment</textarea>
-				<div class="comment-edit-bb-$id" style="display:none;">				
-				<a class="icon bb-image" style="cursor: pointer;" title="$edimg" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" title="$edurl" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" title="$edvideo" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" style="cursor: pointer;" title="$eduline" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" style="cursor: pointer;" title="$editalic" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" style="cursor: pointer;"  title="$edbold" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" style="cursor: pointer;" title="$edquote" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
-				</div>				
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
deleted file mode 100644
index dda674f75b..0000000000
--- a/view/theme/diabook/communityhome.tpl
+++ /dev/null
@@ -1,172 +0,0 @@
-
-<div id="twittersettings" style="display:none">
-<form id="twittersettingsform" action="network" method="post" >
-{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
-<div class="settings-submit-wrapper">
-<input id="twittersub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-sub"></input>
-</div>
-</form>
-</div>
-
-<div id="mapcontrol" style="display:none;">
-<form id="mapform" action="network" method="post" >
-<div id="layermanager" style="width: 350px;position: relative;float: right;right:20px;height: 300px;"></div>
-<div id="map2" style="height:350px;width:350px;"></div>
-<div id="mouseposition" style="width: 350px;"></div>
-{{inc field_input.tpl with $field=$ELZoom}}{{endinc}}
-{{inc field_input.tpl with $field=$ELPosX}}{{endinc}}
-{{inc field_input.tpl with $field=$ELPosY}}{{endinc}}
-<div class="settings-submit-wrapper">
-<input id="mapsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-map-sub"></input>
-</div>
-<span style="width: 500px;"><p>this ist still under development. 
-the idea is to provide a map with different layers(e.g. earth population, atomic power plants, wheat growing acreages, sunrise or what you want) 
-and markers(events, demos, friends, anything, that is intersting for you). 
-These layer and markers should be importable and deletable by the user.</p>
-<p>help on this feature is very appreciated. i am not that good in js so it's a start, but needs tweaks and further dev.
-just contact me, if you are intesrested in joining</p>
-<p>https://toktan.org/profile/thomas</p>
-<p>this is build with <b>mapquery</b> http://mapquery.org/ and 
-<b>openlayers</b>http://openlayers.org/</p>
-</span>
-</form>
-</div>
-
-<div id="boxsettings" style="display:none">
-<form id="boxsettingsform" action="network" method="post" >
-<fieldset><legend>$boxsettings.title.1</legend>
-{{inc field_select.tpl with $field=$close_pages}}{{endinc}}
-{{inc field_select.tpl with $field=$close_profiles}}{{endinc}}
-{{inc field_select.tpl with $field=$close_helpers}}{{endinc}}
-{{inc field_select.tpl with $field=$close_services}}{{endinc}}
-{{inc field_select.tpl with $field=$close_friends}}{{endinc}}
-{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}}
-{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}}
-{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}}
-{{inc field_select.tpl with $field=$close_twitter}}{{endinc}}
-{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}}
-<div class="settings-submit-wrapper">
-<input id="boxsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-box-sub"></input>
-</div>
-</fieldset>
-</form>
-</div>
-
-<div id="pos_null" style="margin-bottom:-30px;">
-</div>
-
-<div id="sortable_boxes">
-
-<div id="close_pages" style="margin-top:30px;">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_profiles">
-{{ if $comunity_profiles_title }}
-<h3>$comunity_profiles_title<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $comunity_profiles_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $helpers }}
-<h3>$helpers.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<a href="http://friendica.com/resources" title="How-to's" style="margin-left: 10px; " target="blank">How-To Guides</a><br>
-<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $con_services }}
-<h3>$con_services.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>$nv.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
-$nv.search
-{{ endif }}
-</div>
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>
-
-<div id="close_twitter">
-<h3 style="height:1.17em">$twitter.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<div id="twitter">
-</div>
-</div>
-
-<div id="close_mapquery">
-{{ if $mapquery }}
-<h3>$mapquery.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<div id="map" style="height:165px;width:165px;margin-left:3px;margin-top:3px;margin-bottom:1px;">
-</div>
-<div style="font-size:9px;margin-left:3px;">Data CC-By-SA by <a href="http://openstreetmap.org/">OpenStreetMap</a></div>
-{{ endif }}
-</div>
-</div>
diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl
deleted file mode 100644
index f7ed107509..0000000000
--- a/view/theme/diabook/contact_template.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-						{{ for $contact.photo_menu as $c }}
-						{{ if $c.2 }}
-						<li><a target="redir" href="$c.1">$c.0</a></li>
-						{{ else }}
-						<li><a href="$c.1">$c.0</a></li>
-						{{ endif }}
-						{{ endfor }}
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
deleted file mode 100644
index 163c0c80e7..0000000000
--- a/view/theme/diabook/directory_item.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-
-<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 photo" src="$photo" alt="$alt_text" title="$alt_text" />
-			</a>
-		</div>
-	</div>
-	<div class="directory-profile-wrapper" id="directory-profile-wrapper-$id" >
-		<div class="contact-name" id="directory-name-$id">$name</div>
-		<div class="page-type">$page_type</div>
-		{{ if $pdesc }}<div class="directory-profile-title">$profile.pdesc</div>{{ endif }}
-    	<div class="directory-detailcolumns-wrapper" id="directory-detailcolumns-wrapper-$id">
-        	<div class="directory-detailscolumn-wrapper" id="directory-detailscolumn1-wrapper-$id">	
-			{{ if $location }}
-			    <dl class="location"><dt class="location-label">$location</dt>
-				<dd class="adr">
-					{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-					<span class="city-state-zip">
-						<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-						<span class="region">$profile.region</span>
-						<span class="postal-code">$profile.postal_code</span>
-					</span>
-					{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-				</dd>
-				</dl>
-			{{ endif }}
-
-			{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-			</div>	
-			<div class="directory-detailscolumn-wrapper" id="directory-detailscolumn2-wrapper-$id">	
-				{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-				{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-			</div>
-		</div>
-	  	<div class="directory-copy-wrapper" id="directory-copy-wrapper-$id" >
-			{{ if $about }}<dl class="directory-copy"><dt class="directory-copy-label">$about</dt><dd class="directory-copy-data">$profile.about</dd></dl>{{ endif }}
-  		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/footer.tpl b/view/theme/diabook/footer.tpl
deleted file mode 100644
index 25058a7ff7..0000000000
--- a/view/theme/diabook/footer.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="footerbox" style="display:none">
-<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
-</div>
\ No newline at end of file
diff --git a/view/theme/diabook/generic_links_widget.tpl b/view/theme/diabook/generic_links_widget.tpl
deleted file mode 100644
index 001c1395e6..0000000000
--- a/view/theme/diabook/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="widget_$title">
-	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul  class="rs_tabs">
-		{{ for $items as $item }}
-			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
deleted file mode 100644
index ce4b25fbf7..0000000000
--- a/view/theme/diabook/group_side.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="profile_side" >
-	<div class="">
-		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul class="menu-profile-side">
-			{{ for $groups as $group }}
-			<li class="menu-profile-list">
-				<a href="$group.href" class="menu-profile-list-item">
-					<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-  {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>	
-
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
deleted file mode 100644
index 2c7e521103..0000000000
--- a/view/theme/diabook/jot.tpl
+++ /dev/null
@@ -1,87 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
-		{{ endif }}
-		<div id="character-counter" class="grey"></div>		
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both;"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/login.tpl b/view/theme/diabook/login.tpl
deleted file mode 100644
index efa7c2d6dd..0000000000
--- a/view/theme/diabook/login.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-	
-   <div id="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>	
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl
deleted file mode 100644
index 989f178781..0000000000
--- a/view/theme/diabook/mail_conv.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<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>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/diabook/mail_display.tpl b/view/theme/diabook/mail_display.tpl
deleted file mode 100644
index 2b680ae428..0000000000
--- a/view/theme/diabook/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/diabook/mail_list.tpl b/view/theme/diabook/mail_list.tpl
deleted file mode 100644
index 6bc6c84f60..0000000000
--- a/view/theme/diabook/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook/message_side.tpl b/view/theme/diabook/message_side.tpl
deleted file mode 100644
index 9f15870964..0000000000
--- a/view/theme/diabook/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
deleted file mode 100644
index c91a9f56d2..0000000000
--- a/view/theme/diabook/nav.tpl
+++ /dev/null
@@ -1,188 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			<span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li  style="width: 1%; height: 1px;float: right;"></li>	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-					
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-										
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Scroll to bottom"></a></div>
-<div style="position: fixed; bottom: 61px; left: 6px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
deleted file mode 100644
index faccca398e..0000000000
--- a/view/theme/diabook/nets.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="profile_side">
-	<h3 style="margin-left: 2px;">$title</h3>
-	<div id="nets-desc">$desc</div>
-   
-	<ul class="menu-profile-side">
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a style="text-decoration: none;" href="$base?nets=all" class="menu-profile-list-item">$all</a></li>
-	{{ for $nets as $net }}
-	<li class="menu-profile-list">
-	<a href="$base?nets=$net.ref" class="menu-profile-list-item">
-	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>		
-	$net.name	
-	</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/theme/diabook/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl
deleted file mode 100644
index 99c65cb290..0000000000
--- a/view/theme/diabook/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<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>
-</a>
diff --git a/view/theme/diabook/photo_item.tpl b/view/theme/diabook/photo_item.tpl
deleted file mode 100644
index 5d65a89b79..0000000000
--- a/view/theme/diabook/photo_item.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-{{ 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;" />
-</div>
-{{ endif }}
-
-<div class="wall-item-photo-container $indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper" >
-				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	
-	<div class="wall-item-bottom" style="display: table-row;">
-		<div class="wall-item-actions">
-	   </div>
-		<div class="wall-item-actions">
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
-				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
-				{{ endif }}
-			</div>
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-			
-	</div>
-</div>
-
diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl
deleted file mode 100644
index 272b670488..0000000000
--- a/view/theme/diabook/photo_view.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-<div id="photo-photo"><a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a></div>
-{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-<div style="margin-top:20px">
-</div>
-<div id="wall-photo-container">
-$comments
-</div>
-
-$paginate
-
diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
deleted file mode 100644
index 01e80f2388..0000000000
--- a/view/theme/diabook/profile_side.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>		
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
deleted file mode 100644
index 8251458257..0000000000
--- a/view/theme/diabook/profile_vcard.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-				
-	
-
-	<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/diabook/prv_message.tpl b/view/theme/diabook/prv_message.tpl
deleted file mode 100644
index 7a7413e9d8..0000000000
--- a/view/theme/diabook/prv_message.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-
-{{ if $showinputs }}
-<input type="text" id="recip" style="background: none repeat scroll 0 0 white;border: 1px solid #CCC;border-radius: 5px 5px 5px 5px;height: 20px;margin: 0 0 5px;
-vertical-align: middle;" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$preid">
-{{ else }}
-$select
-{{ endif }}
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
-
-<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/diabook/right_aside.tpl b/view/theme/diabook/right_aside.tpl
deleted file mode 100644
index 18d5f6fd52..0000000000
--- a/view/theme/diabook/right_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendica.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl
deleted file mode 100644
index d0c83c37a3..0000000000
--- a/view/theme/diabook/search_item.tpl
+++ /dev/null
@@ -1,111 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/smarty3/admin_users.tpl b/view/theme/diabook/smarty3/admin_users.tpl
deleted file mode 100644
index 8127944a33..0000000000
--- a/view/theme/diabook/smarty3/admin_users.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("{{$confirm_delete_multi}}");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/users" method="post">
-		        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		<h3>{{$h_pending}}</h3>
-		{{if $pending}}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{foreach $pending as $u}}
-				<tr>
-					<td class="created">{{$u.created}}</td>
-					<td class="name">{{$u.name}}</td>
-					<td class="email">{{$u.email}}</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='icon like'></span></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
-		{{else}}
-			<p>{{$no_pending}}</p>
-		{{/if}}
-	
-	
-		
-	
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
-						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
-						<td class='email'>{{$u.email}}</td>
-						<td class='register_date'>{{$u.register_date}}</td>
-						<td class='login_date'>{{$u.login_date}}</td>
-						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
-							<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-</div>
diff --git a/view/theme/diabook/smarty3/bottom.tpl b/view/theme/diabook/smarty3/bottom.tpl
deleted file mode 100644
index 7d8f63d169..0000000000
--- a/view/theme/diabook/smarty3/bottom.tpl
+++ /dev/null
@@ -1,160 +0,0 @@
-{{*
- *	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">
-
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-       
-    });
-    
-    $("div#pause").attr("style", "position: fixed;bottom: 43px;left: 5px;");
-    $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
-    $(document).keydown(function(event) {
-    if (!$("div#pause").html()){
-    $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
-		}});  
-    $(".autocomplete").attr("style", "width: 350px;color: black;border: 1px solid #D2D2D2;background: white;cursor: pointer;text-align: left;max-height: 350px;overflow: auto;");
-	 
-	});
-	
-	$(document).ready(function(){
-		$("#sortable_boxes").sortable({
-			update: function(event, ui) {
-				var BoxOrder = $(this).sortable("toArray").toString();
-				$.cookie("Boxorder", BoxOrder , { expires: 365, path: "/" });
-			}
-		});
-
-    	var cookie = $.cookie("Boxorder");		
-    	if (!cookie) return;
-    	var SavedID = cookie.split(",");
-	   for (var Sitem=0, m = SavedID.length; Sitem < m; Sitem++) {
-           $("#sortable_boxes").append($("#sortable_boxes").children("#" + SavedID[Sitem]));
-	       }
-	     
-	});
-	
-	
-	function tautogrow(id){
-		$("textarea#comment-edit-text-" +id).autogrow(); 	
- 	};
- 	
- 	function open_boxsettings() {
-		$("div#boxsettings").attr("style","display: block;height:500px;width:300px;");
-		$("label").attr("style","width: 150px;");
-		};
- 	
-	function yt_iframe() {
-	$("iframe").load(function() { 
-	var ifr_src = $(this).contents().find("body iframe").attr("src");
-	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-	};
-
-	function scrolldown(){
-			$("html, body").animate({scrollTop:$(document).height()}, "slow");
-			return false;
-		};
-		
-	function scrolltop(){
-			$("html, body").animate({scrollTop:0}, "slow");
-			return false;
-		};
-	 	
-	$(window).scroll(function () { 
-		
-		var footer_top = $(document).height() - 30;
-		$("div#footerbox").css("top", footer_top);
-	
-		var scrollInfo = $(window).scrollTop();      
-		
-		if (scrollInfo <= "900"){
-      $("a#top").attr("id","down");
-      $("a#down").attr("onclick","scrolldown()");
-	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
-	 	$("img#scroll_top_bottom").attr("title","Scroll to bottom");
-	 	} 
-	 	    
-      if (scrollInfo > "900"){
-      $("a#down").attr("id","top");
-      $("a#top").attr("onclick","scrolltop()");
-	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
-	 	$("img#scroll_top_bottom").attr("title","Back to top");
-	 	}
-		
-    });
-  
-
-	function insertFormatting(comment,BBcode,id) {
-	
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == comment) {
-			tmpStr = "";
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-								}
-
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else			
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-	return true;
-	}
-
-	function cmtBbOpen(id) {
-	$(".comment-edit-bb-" + id).show();
-	}
-	function cmtBbClose(id) {
-	$(".comment-edit-bb-" + id).hide();
-	}
-	
-	/*$(document).ready(function(){
-	var doctitle = document.title;
-	function checkNotify() {
-	if(document.getElementById("notify-update").innerHTML != "")
-	document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
-	else
-	document.title = doctitle;
-	};
-	setInterval(function () {checkNotify();}, 10 * 1000);
-	})*/
-</script>
-<script>
-var pagetitle = null;
-$("nav").bind('nav-update',  function(e,data){
-  if (pagetitle==null) pagetitle = document.title;
-  var count = $(data).find('notif').attr('count');
-  if (count>0) {
-    document.title = "("+count+") "+pagetitle;
-  } else {
-    document.title = pagetitle;
-  }
-});
-</script>
diff --git a/view/theme/diabook/smarty3/ch_directory_item.tpl b/view/theme/diabook/smarty3/ch_directory_item.tpl
deleted file mode 100644
index 2d2d968ca4..0000000000
--- a/view/theme/diabook/smarty3/ch_directory_item.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/smarty3/comment_item.tpl b/view/theme/diabook/smarty3/comment_item.tpl
deleted file mode 100644
index a03d0f2a64..0000000000
--- a/view/theme/diabook/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-{{*
- *	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}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});tautogrow({{$id}});cmtBbOpen({{$id}});"  >{{$comment}}</textarea>
-				<div class="comment-edit-bb-{{$id}}" style="display:none;">				
-				<a class="icon bb-image" style="cursor: pointer;" title="{{$edimg}}" onclick="insertFormatting('{{$comment}}','img',{{$id}});">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});">video</a>														
-				<a class="icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});">u</a>
-				<a class="icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});">i</a>
-				<a class="icon bold" style="cursor: pointer;"  title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});">b</a>
-				<a class="icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});">quote</a>																			
-				</div>				
-				{{if $qcomment}}
-					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-					<option value=""></option>
-				{{foreach $qcomment as $qc}}
-					<option value="{{$qc}}">{{$qc}}</option>				
-				{{/foreach}}
-					</select>
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/diabook/smarty3/communityhome.tpl b/view/theme/diabook/smarty3/communityhome.tpl
deleted file mode 100644
index 197577f309..0000000000
--- a/view/theme/diabook/smarty3/communityhome.tpl
+++ /dev/null
@@ -1,177 +0,0 @@
-{{*
- *	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" >
-{{include file="field_input.tpl" field=$TSearchTerm}}
-<div class="settings-submit-wrapper">
-<input id="twittersub" type="submit" value="{{$sub}}" class="settings-submit" name="diabook-settings-sub"></input>
-</div>
-</form>
-</div>
-
-<div id="mapcontrol" style="display:none;">
-<form id="mapform" action="network" method="post" >
-<div id="layermanager" style="width: 350px;position: relative;float: right;right:20px;height: 300px;"></div>
-<div id="map2" style="height:350px;width:350px;"></div>
-<div id="mouseposition" style="width: 350px;"></div>
-{{include file="field_input.tpl" field=$ELZoom}}
-{{include file="field_input.tpl" field=$ELPosX}}
-{{include file="field_input.tpl" field=$ELPosY}}
-<div class="settings-submit-wrapper">
-<input id="mapsub" type="submit" value="{{$sub}}" class="settings-submit" name="diabook-settings-map-sub"></input>
-</div>
-<span style="width: 500px;"><p>this ist still under development. 
-the idea is to provide a map with different layers(e.g. earth population, atomic power plants, wheat growing acreages, sunrise or what you want) 
-and markers(events, demos, friends, anything, that is intersting for you). 
-These layer and markers should be importable and deletable by the user.</p>
-<p>help on this feature is very appreciated. i am not that good in js so it's a start, but needs tweaks and further dev.
-just contact me, if you are intesrested in joining</p>
-<p>https://toktan.org/profile/thomas</p>
-<p>this is build with <b>mapquery</b> http://mapquery.org/ and 
-<b>openlayers</b>http://openlayers.org/</p>
-</span>
-</form>
-</div>
-
-<div id="boxsettings" style="display:none">
-<form id="boxsettingsform" action="network" method="post" >
-<fieldset><legend>{{$boxsettings.title.1}}</legend>
-{{include file="field_select.tpl" field=$close_pages}}
-{{include file="field_select.tpl" field=$close_profiles}}
-{{include file="field_select.tpl" field=$close_helpers}}
-{{include file="field_select.tpl" field=$close_services}}
-{{include file="field_select.tpl" field=$close_friends}}
-{{include file="field_select.tpl" field=$close_lastusers}}
-{{include file="field_select.tpl" field=$close_lastphotos}}
-{{include file="field_select.tpl" field=$close_lastlikes}}
-{{include file="field_select.tpl" field=$close_twitter}}
-{{include file="field_select.tpl" field=$close_mapquery}}
-<div class="settings-submit-wrapper">
-<input id="boxsub" type="submit" value="{{$sub}}" class="settings-submit" name="diabook-settings-box-sub"></input>
-</div>
-</fieldset>
-</form>
-</div>
-
-<div id="pos_null" style="margin-bottom:-30px;">
-</div>
-
-<div id="sortable_boxes">
-
-<div id="close_pages" style="margin-top:30px;">
-{{if $page}}
-<div>{{$page}}</div>
-{{/if}}
-</div>
-
-<div id="close_profiles">
-{{if $comunity_profiles_title}}
-<h3>{{$comunity_profiles_title}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{foreach $comunity_profiles_items as $i}}
-	{{$i}}
-{{/foreach}}
-</div>
-{{/if}}
-</div>
-
-<div id="close_helpers">
-{{if $helpers}}
-<h3>{{$helpers.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
-<a href="http://friendica.com/resources" title="How-to's" style="margin-left: 10px; " target="blank">How-To Guides</a><br>
-<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{/if}}
-</div>
-
-<div id="close_services">
-{{if $con_services}}
-<h3>{{$con_services.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
-<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
-<a href="{{$url}}/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
-<a href="{{$url}}/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="{{$url}}/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="{{$url}}/settings/connectors"><img alt="Posterous" src="view/theme/diabook/icons/posterous.png?" title="Posterous"></a>
-<a href="{{$url}}/settings/connectors"><img alt="Tumblr" src="view/theme/diabook/icons/tumblr.png?" title="Tumblr"></a>
-<a href="{{$url}}/settings/connectors"><img alt="Twitter" src="view/theme/diabook/icons/twitter.png?" title="Twitter"></a>
-<a href="{{$url}}/settings/connectors"><img alt="WordPress" src="view/theme/diabook/icons/wordpress.png?" title="WordPress"></a>
-<a href="{{$url}}/settings/connectors"><img alt="E-Mail" src="view/theme/diabook/icons/email.png?" title="E-Mail"></a>
-</div>
-{{/if}}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{if $nv}}
-<h3>{{$nv.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
-<a class="{{$nv.directory.2}}" href="{{$nv.directory.0}}" style="margin-left: 10px; " title="{{$nv.directory.3}}" >{{$nv.directory.1}}</a><br>
-<a class="{{$nv.global_directory.2}}" href="{{$nv.global_directory.0}}" target="blank" style="margin-left: 10px; " title="{{$nv.global_directory.3}}" >{{$nv.global_directory.1}}</a><br>
-<a class="{{$nv.match.2}}" href="{{$nv.match.0}}" style="margin-left: 10px; " title="{{$nv.match.3}}" >{{$nv.match.1}}</a><br>
-<a class="{{$nv.suggest.2}}" href="{{$nv.suggest.0}}" style="margin-left: 10px; " title="{{$nv.suggest.3}}" >{{$nv.suggest.1}}</a><br>
-<a class="{{$nv.invite.2}}" href="{{$nv.invite.0}}" style="margin-left: 10px; " title="{{$nv.invite.3}}" >{{$nv.invite.1}}</a>
-{{$nv.search}}
-{{/if}}
-</div>
-
-<div id="close_lastusers">
-{{if $lastusers_title}}
-<h3>{{$lastusers_title}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{foreach $lastusers_items as $i}}
-	{{$i}}
-{{/foreach}}
-</div>
-{{/if}}
-</div>
-
-{{if $activeusers_title}}
-<h3>{{$activeusers_title}}</h3>
-<div class='items-wrapper'>
-{{foreach $activeusers_items as $i}}
-	{{$i}}
-{{/foreach}}
-</div>
-{{/if}}
-
-<div id="close_lastphotos">
-{{if $photos_title}}
-<h3>{{$photos_title}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{foreach $photos_items as $i}}
-	{{$i}}
-{{/foreach}}
-</div>
-{{/if}}
-</div>
-
-<div id="close_lastlikes">
-{{if $like_title}}
-<h3>{{$like_title}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
-<ul id='likes'>
-{{foreach $like_items as $i}}
-	<li id='ra-photos-wrapper'>{{$i}}</li>
-{{/foreach}}
-</ul>
-{{/if}}
-</div>
-
-<div id="close_twitter">
-<h3 style="height:1.17em">{{$twitter.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
-<div id="twitter">
-</div>
-</div>
-
-<div id="close_mapquery">
-{{if $mapquery}}
-<h3>{{$mapquery.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
-<div id="map" style="height:165px;width:165px;margin-left:3px;margin-top:3px;margin-bottom:1px;">
-</div>
-<div style="font-size:9px;margin-left:3px;">Data CC-By-SA by <a href="http://openstreetmap.org/">OpenStreetMap</a></div>
-{{/if}}
-</div>
-</div>
diff --git a/view/theme/diabook/smarty3/contact_template.tpl b/view/theme/diabook/smarty3/contact_template.tpl
deleted file mode 100644
index 8e0e1acc7f..0000000000
--- a/view/theme/diabook/smarty3/contact_template.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{{*
- *	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" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
-		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
-		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
-
-			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
-
-			{{if $contact.photo_menu}}
-			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
-                    <ul>
-						{{foreach $contact.photo_menu as $c}}
-						{{if $c.2}}
-						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-						{{else}}
-						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
-						{{/if}}
-						{{/foreach}}
-                    </ul>
-                </div>
-			{{/if}}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook/smarty3/directory_item.tpl b/view/theme/diabook/smarty3/directory_item.tpl
deleted file mode 100644
index 5394287642..0000000000
--- a/view/theme/diabook/smarty3/directory_item.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{*
- *	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 photo" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" />
-			</a>
-		</div>
-	</div>
-	<div class="directory-profile-wrapper" id="directory-profile-wrapper-{{$id}}" >
-		<div class="contact-name" id="directory-name-{{$id}}">{{$name}}</div>
-		<div class="page-type">{{$page_type}}</div>
-		{{if $pdesc}}<div class="directory-profile-title">{{$profile.pdesc}}</div>{{/if}}
-    	<div class="directory-detailcolumns-wrapper" id="directory-detailcolumns-wrapper-{{$id}}">
-        	<div class="directory-detailscolumn-wrapper" id="directory-detailscolumn1-wrapper-{{$id}}">	
-			{{if $location}}
-			    <dl class="location"><dt class="location-label">{{$location}}</dt>
-				<dd class="adr">
-					{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-					<span class="city-state-zip">
-						<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-						<span class="region">{{$profile.region}}</span>
-						<span class="postal-code">{{$profile.postal_code}}</span>
-					</span>
-					{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-				</dd>
-				</dl>
-			{{/if}}
-
-			{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-			</div>	
-			<div class="directory-detailscolumn-wrapper" id="directory-detailscolumn2-wrapper-{{$id}}">	
-				{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-				{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-			</div>
-		</div>
-	  	<div class="directory-copy-wrapper" id="directory-copy-wrapper-{{$id}}" >
-			{{if $about}}<dl class="directory-copy"><dt class="directory-copy-label">{{$about}}</dt><dd class="directory-copy-data">{{$profile.about}}</dd></dl>{{/if}}
-  		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/smarty3/footer.tpl b/view/theme/diabook/smarty3/footer.tpl
deleted file mode 100644
index 459a229fa9..0000000000
--- a/view/theme/diabook/smarty3/footer.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 1e0805acaa..0000000000
--- a/view/theme/diabook/smarty3/generic_links_widget.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	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}}
-	
-	<ul  class="rs_tabs">
-		{{foreach $items as $item}}
-			<li><a href="{{$item.url}}" class="rs_tab button {{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/smarty3/group_side.tpl b/view/theme/diabook/smarty3/group_side.tpl
deleted file mode 100644
index 45f2e171f1..0000000000
--- a/view/theme/diabook/smarty3/group_side.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{{*
- *	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>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul class="menu-profile-side">
-			{{foreach $groups as $group}}
-			<li class="menu-profile-list">
-				<a href="{{$group.href}}" class="menu-profile-list-item">
-					<span class="menu-profile-icon {{if $group.selected}}group_selected{{else}}group_unselected{{/if}}"></span>
-					{{$group.text}}
-				</a>
-				{{if $group.edit}}
-					<a href="{{$group.edit.href}}" class="action"><span class="icon text_edit" ></span></a>
-				{{/if}}
-				{{if $group.cid}}
-					<input type="checkbox" 
-						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
-						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
-						{{if $group.ismember}}checked="checked"{{/if}}
-					/>
-				{{/if}}
-			</li>
-			{{/foreach}}
-		</ul>
-	</div>
-  {{if $ungrouped}}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">{{$ungrouped}}</a>
-  </div>
-  {{/if}}
-</div>	
-
diff --git a/view/theme/diabook/smarty3/jot.tpl b/view/theme/diabook/smarty3/jot.tpl
deleted file mode 100644
index aa57d17570..0000000000
--- a/view/theme/diabook/smarty3/jot.tpl
+++ /dev/null
@@ -1,92 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="{{$action}}" method="post" >
-		<input type="hidden" name="type" value="{{$ptyp}}" />
-		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-		<input type="hidden" name="return" value="{{$return_path}}" />
-		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none">
-		{{if $placeholdercategory}}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
-		{{/if}}
-		<div id="character-counter" class="grey"></div>		
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="{{$upload}}"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="{{$attach}}"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-video" class="video2" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-audio" class="audio2" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-location" class="globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
-		<a id="profile-nolocation" class="noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="{{$share}}" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">{{$preview}}</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	{{$jotplugins}}
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			{{$acl}}
-			<hr style="clear:both;"/>
-			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-			<div id="profile-jot-email-end"></div>
-			{{$jotnets}}
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/diabook/smarty3/login.tpl b/view/theme/diabook/smarty3/login.tpl
deleted file mode 100644
index 797c33ff94..0000000000
--- a/view/theme/diabook/smarty3/login.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	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" />
-
-	<div id="login_standard">
-	{{include file="field_input.tpl" field=$lname}}
-	{{include file="field_password.tpl" field=$lpassword}}
-	</div>
-	
-	{{if $openid}}
-			<div id="login_openid">
-			{{include file="field_openid.tpl" field=$lopenid}}
-			</div>
-	{{/if}}
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
-	</div>
-	
-   <div id="login-extra-links">
-		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
-        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
-	</div>	
-	
-	{{foreach $hiddens as $k=>$v}}
-		<input type="hidden" name="{{$k}}" value="{{$v}}" />
-	{{/foreach}}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
diff --git a/view/theme/diabook/smarty3/mail_conv.tpl b/view/theme/diabook/smarty3/mail_conv.tpl
deleted file mode 100644
index 915d4c13a7..0000000000
--- a/view/theme/diabook/smarty3/mail_conv.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-{{*
- *	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">
-			<div class="contact-photo-wrapper"
-				<a href="{{$mail.profile_url}}" target="redir" title="{{$mail.from_name}}" class="contact-photo-link" id="wall-item-photo-link-{{$mail.id}}">
-					<img src="{{$mail.from_photo}}" class="contact-photo{{$mail.sparkle}}" id="wall-item-photo-{{$mail.id}}" alt="{{$mail.from_name}}" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			{{$mail.body}}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="{{$mail.from_url}}" target="redir" class="wall-item-name-link"><span class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name}}</span></a> <span class="wall-item-ago">{{$mail.date}}</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$mail.delete}}">{{$mail.delete}}</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{{*
-
-
-<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>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
-		<div class="mail-conv-date">{{$mail.date}}</div>
-		<div class="mail-conv-subject">{{$mail.subject}}</div>
-		<div class="mail-conv-body">{{$mail.body}}</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-*}}
diff --git a/view/theme/diabook/smarty3/mail_display.tpl b/view/theme/diabook/smarty3/mail_display.tpl
deleted file mode 100644
index dc1fbbc6f5..0000000000
--- a/view/theme/diabook/smarty3/mail_display.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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}}
-	<div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
-		{{include file="mail_conv.tpl"}}
-	</div>
-{{/foreach}}
-
-{{include file="prv_message.tpl"}}
diff --git a/view/theme/diabook/smarty3/mail_list.tpl b/view/theme/diabook/smarty3/mail_list.tpl
deleted file mode 100644
index 9dde46bc80..0000000000
--- a/view/theme/diabook/smarty3/mail_list.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	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>
-	<span class="mail-date">{{$date}}</span>
-	<span class="mail-count">{{$count}}</span>
-	
-	<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook/smarty3/message_side.tpl b/view/theme/diabook/smarty3/message_side.tpl
deleted file mode 100644
index 723b0b710c..0000000000
--- a/view/theme/diabook/smarty3/message_side.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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>
-	
-	<ul class="message-ul">
-		{{foreach $tabs as $t}}
-			<li class="tool {{if $t.sel}}selected{{/if}}"><a href="{{$t.url}}" class="message-link">{{$t.label}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/smarty3/nav.tpl b/view/theme/diabook/smarty3/nav.tpl
deleted file mode 100644
index 45dc476141..0000000000
--- a/view/theme/diabook/smarty3/nav.tpl
+++ /dev/null
@@ -1,193 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<header>
-	<div id="site-location">{{$sitelocation}}</div>
-	<div id="banner">{{$banner}}</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{if $nav.network}}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{/if}}
-	
-			{{if $nav.contacts}}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="{{$nav.contacts.0}}" rel="#nav-contacts-menu" title="{{$nav.contacts.1}}">
-				<span class="icon contacts">{{$nav.contacts.1}}</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="{{$nav.notifications.0}}">{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">{{$nav.contacts.1}}</a></li> 
-				</ul>
-			</li>	
-
-			{{/if}}
-			
-			{{if $nav.messages}}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="{{$nav.messages.0}}" rel="#nav-messages-menu" title="{{$nav.messages.1}}">
-			  <span class="icon messages">{{$nav.messages.1}}</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>
-					<li id="nav-messages-see-all"><a href="{{$nav.messages.new.0}}">{{$nav.messages.new.1}}</a></li>
-				</ul>
-			</li>		
-			{{/if}}
-		
-      {{if $nav.notifications}}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">
-			<span class="icon notify">{{$nav.notifications.1}}</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
-					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-			</li>		
-		{{/if}}	
-			
-		{{if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="{{$nav.search.0}}">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{/if}}	
-		
-		<li  style="width: 1%; height: 1px;float: right;"></li>	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}				
-					
-				{{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}									
-										
-										 <li><a class="{{$nav.search.2}}" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-										
-				{{if $nav.settings}}<li><a class="menu-sep {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
-				{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
-
-				{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
-
-				
-			</ul>		
-		</li>
-		
-		
-		{{if $nav.directory}}
-		<li id="nav-directory-link" class="nav-menu {{$sel.directory}}">
-			<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
-		</li>
-		{{/if}}
-		
-		{{if $nav.apps}}
-			<li id="nav-apps-link" class="nav-menu {{$sel.apps}}">
-				<a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{foreach $apps as $ap}}
-					<li>{{$ap}}</li>
-					{{/foreach}}
-				</ul>
-			</li>	
-		{{/if}}		
-		
-      {{if $nav.home}}
-			<li id="nav-home-link" class="nav-menu {{$sel.home}}">
-				<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{/if}}		
-		
-		{{if $userinfo}}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{foreach $nav.usermenu as $usermenu}}
-						<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
-					{{/foreach}}
-					
-					{{if $nav.profiles}}<li><a class="menu-sep {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.3}}</a></li>{{/if}}
-					{{if $nav.notifications}}<li><a class="{{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a></li>{{/if}}
-					{{if $nav.messages}}<li><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a></li>{{/if}}
-					{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}	
-				</ul>
-			</li>
-		{{/if}}
-		
-					{{if $nav.login}}
-					<li id="nav-home-link" class="nav-menu {{$sel.home}}">
-						<a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
-					<li>
-					{{/if}}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Scroll to bottom"></a></div>
-<div style="position: fixed; bottom: 61px; left: 6px;">{{$langselector}}</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{{*
-
-{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
-{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
-
-<span id="nav-link-wrapper" >
-
-{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
-	
-<a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
-	
-{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
-
-<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
-<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
-
-{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
-
-{{if $nav.notifications}}
-<a id="nav-notify-link" class="nav-commlink {{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{/if}}
-{{if $nav.messages}}
-<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{/if}}
-
-{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
-
-{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
-{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">{{$banner}}</span>
-*}}
diff --git a/view/theme/diabook/smarty3/nets.tpl b/view/theme/diabook/smarty3/nets.tpl
deleted file mode 100644
index b9c6b828ff..0000000000
--- a/view/theme/diabook/smarty3/nets.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	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>
-   
-	<ul class="menu-profile-side">
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{if $sel_all}}group_selected{{else}}group_unselected{{/if}}"></span>	
-	<a style="text-decoration: none;" href="{{$base}}?nets=all" class="menu-profile-list-item">{{$all}}</a></li>
-	{{foreach $nets as $net}}
-	<li class="menu-profile-list">
-	<a href="{{$base}}?nets={{$net.ref}}" class="menu-profile-list-item">
-	<span class="menu-profile-icon {{if $net.selected}}group_selected{{else}}group_unselected{{/if}}"></span>		
-	{{$net.name}}	
-	</a></li>
-	{{/foreach}}
-	</ul>
-</div>
diff --git a/view/theme/diabook/smarty3/oembed_video.tpl b/view/theme/diabook/smarty3/oembed_video.tpl
deleted file mode 100644
index 993b410e0b..0000000000
--- a/view/theme/diabook/smarty3/oembed_video.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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>
-</a>
diff --git a/view/theme/diabook/smarty3/photo_item.tpl b/view/theme/diabook/smarty3/photo_item.tpl
deleted file mode 100644
index 344c58a0b6..0000000000
--- a/view/theme/diabook/smarty3/photo_item.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-{{*
- *	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;" />
-</div>
-{{/if}}
-
-<div class="wall-item-photo-container {{$indent}}">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper" >
-				<a href="{{$profile_url}}" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-{{$id}}">
-					<img src="{{$thumb}}" class="contact-photo{{$sparkle}}" id="wall-item-photo-{{$id}}" alt="{{$name}}" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-{{$id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$id}}">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$id}}">
-				{{$photo_menu}}
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="{{$profile_url}}" target="redir" title="{{$name}}" class="wall-item-name-link"><span class="wall-item-name{{$sparkle}}">{{$name}}</span></a> 
-			<span class="wall-item-ago">-
-			{{if $plink}}<a class="link" title="{{$plink.title}}" href="{{$plink.href}}" style="color: #999">{{$ago}}</a>{{else}} {{$ago}} {{/if}}
-			{{if $lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$id}});">{{$lock}}</span> {{/if}}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{if $title}}<h2><a href="{{$plink.href}}">{{$title}}</a></h2>{{/if}}
-			{{$body}}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{foreach $tags as $tag}}
-				<span class='tag'>{{$tag}}</span>
-			{{/foreach}}
-		</div>
-	</div>
-	
-	<div class="wall-item-bottom" style="display: table-row;">
-		<div class="wall-item-actions">
-	   </div>
-		<div class="wall-item-actions">
-			
-			<div class="wall-item-actions-tools">
-
-				{{if $drop.dropping}}
-					<input type="checkbox" title="{{$drop.select}}" name="itemselected[]" class="item-select" value="{{$id}}" />
-					<a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon drop" title="{{$drop.delete}}">{{$drop.delete}}</a>
-				{{/if}}
-				{{if $edpost}}
-					<a class="icon pencil" href="{{$edpost.0}}" title="{{$edpost.1}}"></a>
-				{{/if}}
-			</div>
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-			
-	</div>
-</div>
-
diff --git a/view/theme/diabook/smarty3/photo_view.tpl b/view/theme/diabook/smarty3/photo_view.tpl
deleted file mode 100644
index e3908be006..0000000000
--- a/view/theme/diabook/smarty3/photo_view.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	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>
-
-<div id="photo-edit-link-wrap">
-{{if $tools}}
-<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
-|
-<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
-{{/if}}
-{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
-</div>
-
-{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
-<div id="photo-photo"><a href="{{$photo.href}}" class="lightbox" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
-{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
-<div id="photo-photo-end"></div>
-<div id="photo-caption">{{$desc}}</div>
-{{if $tags}}
-<div id="in-this-photo-text">{{$tags.0}}</div>
-<div id="in-this-photo">{{$tags.1}}</div>
-{{/if}}
-{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
-
-{{if $edit}}{{$edit}}{{/if}}
-
-<div style="margin-top:20px">
-</div>
-<div id="wall-photo-container">
-{{$comments}}
-</div>
-
-{{$paginate}}
-
diff --git a/view/theme/diabook/smarty3/profile_side.tpl b/view/theme/diabook/smarty3/profile_side.tpl
deleted file mode 100644
index 267afc76a0..0000000000
--- a/view/theme/diabook/smarty3/profile_side.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{*
- *	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}}">
-			<img src="{{$userinfo.icon}}" id="ps-usericon" alt="{{$userinfo.name}}">
-		</a>
-		<a href="{{$ps.usermenu.status.0}}" id="ps-username" title="{{$userinfo.name}}">{{$userinfo.name}}</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="{{$ps.usermenu.status.0}}">{{$ps.usermenu.status.1}}<span class="menu-profile-icon home"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="{{$ps.usermenu.photos.0}}">{{$ps.usermenu.photos.1}}<span class="menu-profile-icon photos"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="{{$ps.usermenu.contacts.0}}">{{$ps.usermenu.contacts.1}}<span class="menu-profile-icon pscontacts"></span></a></li>		
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="{{$ps.usermenu.events.0}}">{{$ps.usermenu.events.1}}<span class="menu-profile-icon events"></span></a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="{{$ps.usermenu.notes.0}}">{{$ps.usermenu.notes.1}}<span class="menu-profile-icon notes"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="{{$ps.usermenu.pgroups.0}}" target="blanc">{{$ps.usermenu.pgroups.1}}<span class="menu-profile-icon foren"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="{{$ps.usermenu.community.0}}">{{$ps.usermenu.community.1}}<span class="menu-profile-icon com_side"></span></a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook/smarty3/profile_vcard.tpl b/view/theme/diabook/smarty3/profile_vcard.tpl
deleted file mode 100644
index f2eda1b2d0..0000000000
--- a/view/theme/diabook/smarty3/profile_vcard.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">{{$profile.name}}</div>
-		{{if $profile.edit}}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{foreach $profile.menu.entries as $e}}
-				<li>
-					<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
-				</li>
-				{{/foreach}}
-				<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
-				<li><a href="profiles" >{{$profile.edit.3}}</a></li>
-								
-			</ul>
-			</div>
-		{{/if}}
-	</div>
-				
-	
-
-	<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt><br> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{if $connect}}
-				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block}}
-
-
diff --git a/view/theme/diabook/smarty3/prv_message.tpl b/view/theme/diabook/smarty3/prv_message.tpl
deleted file mode 100644
index 2daf54ecd6..0000000000
--- a/view/theme/diabook/smarty3/prv_message.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h3>{{$header}}</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-{{$parent}}
-
-<div id="prvmail-to-label">{{$to}}</div>
-
-{{if $showinputs}}
-<input type="text" id="recip" style="background: none repeat scroll 0 0 white;border: 1px solid #CCC;border-radius: 5px 5px 5px 5px;height: 20px;margin: 0 0 5px;
-vertical-align: middle;" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
-{{else}}
-{{$select}}
-{{/if}}
-
-<div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
-
-<div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/diabook/smarty3/right_aside.tpl b/view/theme/diabook/smarty3/right_aside.tpl
deleted file mode 100644
index d361840262..0000000000
--- a/view/theme/diabook/smarty3/right_aside.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{*
- *	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}}">
-			<img src="{{$userinfo.icon}}" id="ps-usericon" alt="{{$userinfo.name}}">
-		</a>
-		<a href="{{$ps.usermenu.status.0}}" id="ps-username" title="{{$userinfo.name}}">{{$userinfo.name}}</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="{{$ps.usermenu.status.0}}">{{$ps.usermenu.status.1}}</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="{{$ps.usermenu.photos.0}}">{{$ps.usermenu.photos.1}}</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="{{$ps.usermenu.events.0}}">{{$ps.usermenu.events.1}}</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="{{$ps.usermenu.notes.0}}">{{$ps.usermenu.notes.1}}</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendica.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="{{$ps.usermenu.community.0}}">{{$ps.usermenu.community.1}}</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook/smarty3/search_item.tpl b/view/theme/diabook/smarty3/search_item.tpl
deleted file mode 100644
index d48103298c..0000000000
--- a/view/theme/diabook/smarty3/search_item.tpl
+++ /dev/null
@@ -1,116 +0,0 @@
-{{*
- *	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;" />
-</div>
-{{/if}}
-<div class="wall-item-container {{$item.indent}}">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
-					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-				{{$item.item_photo_menu}}
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> 
-			<span class="wall-item-ago">-
-			{{if $item.plink}}<a class="link" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
-			{{if $item.lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
-			{{$item.body}}
-			{{if $item.has_cats}}
-			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{foreach $item.tags as $tag}}
-				<span class='tag'>{{$tag}}</span>
-			{{/foreach}}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{if $item.vote}}
-				<a href="#" id="like-{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
-				<a href="#" id="dislike-{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
-			{{/if}}
-						
-			{{if $item.vote.share}}
-				<a href="#" id="share-{{$item.id}}" class="icon recycle" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>
-			{{/if}}	
-
-
-			{{if $item.star}}
-				<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}">
-				<img src="images/star_dummy.png" class="icon star" alt="{{$item.star.do}}" /> </a>
-				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.star.tagger}}"></a>					  
-			{{/if}}	
-			
-			{{if $item.filer}}
-			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon file-as" title="{{$item.star.filer}}"></a>
-			{{/if}}				
-			
-			{{if $item.plink}}<a class="icon link" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{if $item.drop.pagedrop}}
-					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
-				{{/if}}
-				{{if $item.drop.dropping}}
-					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drop" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
-				{{/if}}
-				{{if $item.edpost}}
-					<a class="icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-				{{/if}}
-			</div>
-			<div class="wall-item-location">{{$item.location}}&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	{{$item.comment}}
-</div>
diff --git a/view/theme/diabook/smarty3/theme_settings.tpl b/view/theme/diabook/smarty3/theme_settings.tpl
deleted file mode 100644
index 5532d402cf..0000000000
--- a/view/theme/diabook/smarty3/theme_settings.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-{{*
- *	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=$line_height}}
-
-{{include file="field_select.tpl" field=$resolution}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="diabook-settings-submit" />
-</div>
-<br>
-<h3>Show/hide boxes at right-hand column</h3>
-{{include file="field_select.tpl" field=$close_pages}}
-{{include file="field_select.tpl" field=$close_profiles}}
-{{include file="field_select.tpl" field=$close_helpers}}
-{{include file="field_select.tpl" field=$close_services}}
-{{include file="field_select.tpl" field=$close_friends}}
-{{include file="field_select.tpl" field=$close_lastusers}}
-{{include file="field_select.tpl" field=$close_lastphotos}}
-{{include file="field_select.tpl" field=$close_lastlikes}}
-{{include file="field_select.tpl" field=$close_twitter}}
-{{include file="field_input.tpl" field=$TSearchTerm}}
-{{include file="field_select.tpl" field=$close_mapquery}}
-
-{{include file="field_input.tpl" field=$ELPosX}}
-
-{{include file="field_input.tpl" field=$ELPosY}}
-
-{{include file="field_input.tpl" field=$ELZoom}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="diabook-settings-submit" />
-</div>
-
-<br>
-
-<div class="field select">
-<a onClick="restore_boxes()" title="Restore boxorder at right-hand column" style="cursor: pointer;">Restore boxorder at right-hand column</a>
-</div>
-
diff --git a/view/theme/diabook/smarty3/wall_thread.tpl b/view/theme/diabook/smarty3/wall_thread.tpl
deleted file mode 100644
index be143cfbaa..0000000000
--- a/view/theme/diabook/smarty3/wall_thread.tpl
+++ /dev/null
@@ -1,146 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
-{{if $item.indent}}{{else}}
-<div class="wall-item-decor">
-	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-</div>
-{{/if}}
-<div class="wall-item-container {{$item.indent}}">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
-					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-				{{$item.item_photo_menu}}
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> 
-			<span class="wall-item-ago">-
-			{{if $item.plink}}<a class="link{{$item.sparkle}}" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
-			{{if $item.lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
-			{{$item.body}}
-			{{if $item.has_cats}}
-			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{foreach $item.tags as $tag}}
-				<span class='tag'>{{$tag}}</span>
-			{{/foreach}}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{if $item.vote}}
-				<a href="#" id="like-{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
-				{{if $item.vote.dislike}}
-				<a href="#" id="dislike-{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
-				{{/if}}
-			{{/if}}
-						
-			{{if $item.vote.share}}
-				<a href="#" id="share-{{$item.id}}" class="icon recycle" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>
-			{{/if}}	
-
-
-			{{if $item.star}}
-				<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}">
-				<img src="images/star_dummy.png" class="icon star" alt="{{$item.star.do}}" /> </a>
-			{{/if}}
-
-			{{if $item.tagger}}
-				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>					  
-			{{/if}}	
-			
-			{{if $item.filer}}
-			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon file-as" title="{{$item.star.filer}}"></a>
-			{{/if}}				
-			
-			{{if $item.plink}}<a class="icon link" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{if $item.drop.pagedrop}}
-					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
-				{{/if}}
-				{{if $item.drop.dropping}}
-					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drop" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
-				{{/if}}
-				{{if $item.edpost}}
-					<a class="icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-				{{/if}}
-			</div>
-			<div class="wall-item-location">{{$item.location}}&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
-	</div>
-</div>
-
-{{if $item.threaded}}
-{{if $item.comment}}
-<div class="wall-item-comment-wrapper {{$item.indent}}" >
-	{{$item.comment}}
-</div>
-{{/if}}
-{{/if}}
-
-{{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >
-	{{$item.comment}}
-</div>
-{{/if}}
-
-
-{{foreach $item.children as $child_item}}
-	{{include file="{{$child_item.template}}" item=$child_item}}
-{{/foreach}}
-
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl
deleted file mode 100644
index ad024dfe99..0000000000
--- a/view/theme/diabook/theme_settings.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{{inc field_select.tpl with $field=$color}}{{endinc}}
-
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
-
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
-
-{{inc field_select.tpl with $field=$resolution}}{{endinc}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
-</div>
-<br>
-<h3>Show/hide boxes at right-hand column</h3>
-{{inc field_select.tpl with $field=$close_pages}}{{endinc}}
-{{inc field_select.tpl with $field=$close_profiles}}{{endinc}}
-{{inc field_select.tpl with $field=$close_helpers}}{{endinc}}
-{{inc field_select.tpl with $field=$close_services}}{{endinc}}
-{{inc field_select.tpl with $field=$close_friends}}{{endinc}}
-{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}}
-{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}}
-{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}}
-{{inc field_select.tpl with $field=$close_twitter}}{{endinc}}
-{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
-{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}}
-
-{{inc field_input.tpl with $field=$ELPosX}}{{endinc}}
-
-{{inc field_input.tpl with $field=$ELPosY}}{{endinc}}
-
-{{inc field_input.tpl with $field=$ELZoom}}{{endinc}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
-</div>
-
-<br>
-
-<div class="field select">
-<a onClick="restore_boxes()" title="Restore boxorder at right-hand column" style="cursor: pointer;">Restore boxorder at right-hand column</a>
-</div>
-
diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl
deleted file mode 100644
index c4c0ac35fe..0000000000
--- a/view/theme/diabook/wall_thread.tpl
+++ /dev/null
@@ -1,141 +0,0 @@
-{{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link$item.sparkle" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				{{ if $item.vote.dislike }}
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ endif }}
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-			{{ endif }}
-
-			{{ if $item.tagger }}
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-{{ if $item.threaded }}
-{{ if $item.comment }}
-<div class="wall-item-comment-wrapper $item.indent" >
-	$item.comment
-</div>
-{{ endif }}
-{{ endif }}
-
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
-{{ endif }}
-
-
-{{ for $item.children as $child_item }}
-	{{ inc $child_item.template with $item=$child_item }}{{ endinc }}
-{{ endfor }}
-
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
diff --git a/view/theme/dispy/bottom.tpl b/view/theme/dispy/bottom.tpl
deleted file mode 100644
index 82f0201703..0000000000
--- a/view/theme/dispy/bottom.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-<script type="text/javascript" src="$baseurl/view/theme/dispy/js/jquery.autogrow.textarea.js"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-
-});
-function tautogrow(id) {
-	$("textarea#comment-edit-text-" + id).autogrow();
-};
-
-function insertFormatting(comment, BBcode, id) {
-	var tmpStr = $("#comment-edit-text-" + id).val();
-	if(tmpStr == comment) {
-		tmpStr = "";
-		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		openMenu("comment-edit-submit-wrapper-" + id);
-	}
-	textarea = document.getElementById("comment-edit-text-" + id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
-			+ "http://" + textarea.value.substring(start, end)
-			+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start)
-			+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
-			+ textarea.value.substring(end, textarea.value.length);
-		}
-	}
-	return true;
-}
-
-function cmtBbOpen(id) {
-	$(".comment-edit-bb-" + id).show();
-}
-function cmtBbClose(id) {
-    $(".comment-edit-bb-" + id).hide();
-}
-
-var doctitle = document.title;
-function checkNotify() {
-	if(document.getElementById("notify-update").innerHTML != "") {
-		document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
-	} else {
-		document.title = doctitle;
-    };
-    setInterval(function () {checkNotify();}, 10 * 1000);
-}
-
-$(document).ready(function(){
-var doctitle = document.title;
-function checkNotify() {
-if(document.getElementById("notify-update").innerHTML != "")
-document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
-else
-document.title = doctitle;
-};
-setInterval(function () {checkNotify();}, 10 * 1000);
-})
-
-</script>
diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl
deleted file mode 100644
index e940800323..0000000000
--- a/view/theme/dispy/comment_item.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-		<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" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-$id"
-					class="comment-edit-text-empty"
-					name="body"
-					onfocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);"
-					onblur="commentClose(this,$id);"
-					placeholder="Comment">$comment</textarea>
-				{{ if $qcomment }}
-                <div class="qcomment-wrapper">
-					<select id="qcomment-select-$id"
-						name="qcomment-$id"
-						class="qcomment"
-						onchange="qCommentInsert(this,$id);">
-					<option value=""></option>
-					{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>
-					{{ endfor }}
-					</select>
-				</div>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-				<div class="comment-edit-end"></div>
-			</form>
-		</div>
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
deleted file mode 100644
index aaa27465b0..0000000000
--- a/view/theme/dispy/communityhome.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-
-<h3 id="extra-help-header">Help or '@NewHere'?</h3>
-<div id="extra-help">
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
-	title="Friendica Support" target="_blank">Friendica Support</a><br />
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
-	title="Let's talk" target="_blank">Let's talk</a><br />
-<a href="http://newzot.hydra.uberspace.de/profile/newzot"
-	title="Local Friendica" target="_blank">Local Friendica</a><br />
-<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
-</div>
-
-<h3 id="connect-services-header">Connectable Services</h3>
-<ul id="connect-services">
-<li><a href="$url/facebook"><img alt="Facebook"
-	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png" title="StatusNet" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png" title="LiveJournal" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="Posterous" src="view/theme/dispy/icons/posterous.png" title="Posterous" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png" title="Tumblr" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="Twitter" src="view/theme/dispy/icons/twitter.png" title="Twitter" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="WordPress" src="view/theme/dispy/icons/wordpress.png" title="WordPress" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="E-Mail" src="view/theme/dispy/icons/email.png" title="E-Mail" /></a></li>
-</ul>
-
diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl
deleted file mode 100644
index e656ea5527..0000000000
--- a/view/theme/dispy/contact_template.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper">
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)">
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-						{{ for $contact.photo_menu as $c }}
-						{{ if $c.2 }}
-						<li><a target="redir" href="$c.1">$c.0</a></li>
-						{{ else }}
-						<li><a href="$c.1">$c.0</a></li>
-						{{ endif }}
-						{{ endfor }}
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-	<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
-		<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
-	<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
-
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl
deleted file mode 100644
index 8eae2d6d1c..0000000000
--- a/view/theme/dispy/conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	{{ for $thread.items as $item }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-		
-		{{ inc $item.template }}{{ endinc }}
-		
-		
-	{{ endfor }}
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems(); return false;">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl
deleted file mode 100644
index be8e23de09..0000000000
--- a/view/theme/dispy/group_side.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div id="group-sidebar" class="widget">
-<h3 class="label">$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				<a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ else }}group-other{{ endif }}">$group.text</a>
-				{{ if $group.edit }}
-					<a class="groupsideedit"
-                        href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new" title="$createtext"><span class="action text add">$createtext</span></a>
-  </div>
-</div>
-
-
diff --git a/view/theme/dispy/header.tpl b/view/theme/dispy/header.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
deleted file mode 100644
index f4712f0bef..0000000000
--- a/view/theme/dispy/jot-header.tpl
+++ /dev/null
@@ -1,345 +0,0 @@
-<script type="text/javascript">
-var editor=false;
-var textlen = 0;
-var plaintext = '$editselect';
-
-function initEditor(cb) {
-	if (editor==false) {
-		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").hide();
-			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-			editor = true;
-			$("a#jot-perms-icon").colorbox({
-				'inline' : true,
-				'transition' : 'elastic'
-			});
-			$(".jothidden").show();
-			if (typeof cb!="undefined") cb();
-			return;
-		}
-		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: $editselect,
-			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups,contextmenu,style",
-			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen,charmap",
-			theme_advanced_buttons2 : "",
-			theme_advanced_buttons3 : "",
-			theme_advanced_toolbar_location : "top",
-			theme_advanced_toolbar_align : "center",
-			theme_advanced_blockformats : "blockquote,code",
-			gecko_spellcheck : true,
-			paste_text_sticky : true,
-			entity_encoding : "raw",
-			add_unload_trigger : false,
-			remove_linebreaks : false,
-			//force_p_newlines : false,
-			//force_br_newlines : true,
-			forced_root_block : 'div',
-			convert_urls: false,
-			content_css: "$baseurl/view/custom_tinymce.css",
-			theme_advanced_path : false,
-			file_browser_callback : "fcFileBrowser",
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-
-					textlen = txt.length;
-					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$('#profile-jot-desc').html(ispublic);
-					}
-					else {
-						$('#profile-jot-desc').html('&#160;');
-					}	 
-
-				 //Character count
-
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
-					$('#character-counter').text(textlen);
-				});
-
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
-			}
-		});
-		editor = true;
-		// setup acl popup
-		$("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-		}); 
-	} else {
-		if (typeof cb!="undefined") cb();
-	}
-}
-
-function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
-	initEditor();
-}
-
-</script>
-<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
-<script type="text/javascript">
-	var ispublic = '$ispublic';
-	var addtitle = '$addtitle';
-
-	$(document).ready(function() {
-		
-		/* enable tinymce on focus and click */
-		$("#profile-jot-text").focus(enableOnUser);
-		$("#profile-jot-text").click(enableOnUser);
-		/* enable character counter */
-		$("#profile-jot-text").focus(charCounter);
-		$("#profile-jot-text").click(charCounter);
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-	});
-
-	function deleteCheckedItems() {
-		var checkedstr = '';
-
-		$('.item-select').each( function() {
-			if($(this).is(':checked')) {
-				if(checkedstr.length != 0) {
-					checkedstr = checkedstr + ',' + $(this).val();
-				}
-				else {
-					checkedstr = $(this).val();
-				}
-			}	
-		});
-		$.post('item', { dropitems: checkedstr }, function(data) {
-			window.location.reload();
-		});
-	}
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("$vidurl");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("$audurl");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("$whereareu", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		if ($('#jot-popup').length != 0) $('#jot-popup').show();
-
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-			if (!editor) $("#profile-jot-text").val("");
-			initEditor(function(){
-				addeditortext(data);
-				$('#like-rotator-' + id).hide();
-				$(window).scrollTop(0);
-			});
-
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("$term");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.colorbox({html:data});
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply);
-					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.colorbox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-	function addeditortext(data) {
-		if(plaintext == 'none') {
-			var currentText = $("#profile-jot-text").val();
-			$("#profile-jot-text").val(currentText + data);
-		}
-		else
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-	}	
-
-	$geotag
-
-	function charCounter() {
-		// character count part deux
-		//$(this).val().length is not a function Line 282(3)
-		$('#profile-jot-text').keyup(function() {
-			var textlen = 0;
-			var maxLen1 = 140;
-			var maxLen2 = 420;
-
-			$('#character-counter').removeClass('jothidden');
-
-			textLen = $(this).val().length;
-			if(textLen <= maxLen1) {
-				$('#character-counter').removeClass('red');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('grey');
-			}
-			if((textLen > maxLen1) && (textlen <= maxLen2)) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('red');
-				$('#character-counter').addClass('orange');
-			}
-			if(textLen > maxLen2) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('red');
-			}
-			$('#character-counter').text( textLen );
-		});
-		$('#profile-jot-text').keyup();
-	}
-</script>
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
deleted file mode 100644
index 193872f182..0000000000
--- a/view/theme/dispy/jot.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-<form id="profile-jot-form" action="$action" method="post">
-	<div id="jot">
-		<div id="profile-jot-desc" class="jothidden">&#160;</div>
-
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" /></div>
-		<div id="character-counter" class="grey jothidden"></div>
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
-		{{ endif }}
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
-		</textarea>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-<div id="jot-tools" class="jothidden" style="display:none">
-	<div id="profile-jot-submit-wrapper" class="jothidden">
-
-	<div id="profile-upload-wrapper" style="display: $visitor;">
-		<div id="wall-image-upload-div"><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" style="display: $visitor;">
-		<div id="wall-file-upload-div"><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div>
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
-		<a id="profile-link" class="icon link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
-	</div>
-	<div id="profile-video-wrapper" style="display: $visitor;">
-		<a id="profile-video" class="icon video" onclick="jotVideoURL();return false;" title="$video"></a>
-	</div>
-	<div id="profile-audio-wrapper" style="display: $visitor;">
-		<a id="profile-audio" class="icon audio" onclick="jotAudioURL();return false;" title="$audio"></a>
-	</div>
-	<div id="profile-location-wrapper" style="display: $visitor;">
-		<a id="profile-location" class="icon globe" onclick="jotGetLocation();return false;" title="$setloc"></a>
-	</div>
-	<div id="profile-nolocation-wrapper" style="display: none;">
-		<a id="profile-nolocation" class="icon noglobe" onclick="jotClearLocation();return false;" title="$noloc"></a>
-	</div>
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-	<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-	<div id="profile-jot-perms" class="profile-jot-perms">
-		<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
-	</div>
-	<span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
-	</div>
-
-	</div> <!-- /#profile-jot-submit-wrapper -->
-</div> <!-- /#jot-tools -->
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both" />
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/dispy/lang_selector.tpl b/view/theme/dispy/lang_selector.tpl
deleted file mode 100644
index e777a0a861..0000000000
--- a/view/theme/dispy/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/dispy/mail_head.tpl b/view/theme/dispy/mail_head.tpl
deleted file mode 100644
index d49d7c1af9..0000000000
--- a/view/theme/dispy/mail_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<h3>$messages</h3>
-
-<div class="tabs-wrapper">
-$tab_content
-</div>
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
deleted file mode 100644
index d0307b60d0..0000000000
--- a/view/theme/dispy/nav.tpl
+++ /dev/null
@@ -1,145 +0,0 @@
-<nav id="pagenav">
-
-<div id="banner">$banner</div>
-<div id="site-location">$sitelocation</div>
-
-<a name="top" id="top"></a>
-<div id="nav-floater">
-    <ul id="nav-buttons">
-    {{ if $nav.login }}
-    <li><a id="nav-login-link" class="nav-login-link $nav.login.2"
-            href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a></li>
-    {{ endif }}
-    {{ if $nav.home }}
-    <li><a id="nav-home-link" class="nav-link $nav.home.2"
-            href="$nav.home.0" title="$nav.home.1">$nav.home.1</a></li>
-    {{ endif }}
-    {{ if $nav.network }}
-    <li><a id="nav-network-link" class="nav-link $nav.network.2"
-            href="$nav.network.0" title="$nav.network.1">$nav.network.1</a></li>
-    {{ endif }}
-    {{ if $nav.notifications }}
-    <li><a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2"
-            href="$nav.notifications.0"
-            rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a></li>
-        <ul id="nav-notifications-menu" class="menu-popup">
-            <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-            <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-            <li class="empty">$emptynotifications</li>
-        </ul>
-    {{ endif }}
-    {{ if $nav.messages }}
-    <li><a id="nav-messages-link" class="nav-link $nav.messages.2"
-            href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a></li>
-    {{ endif }}
-    {{ if $nav.community }}
-    <li><a id="nav-community-link" class="nav-link $nav.community.2"
-            href="$nav.community.0" title="$nav.community.1">$nav.community.1</a></li>
-    {{ endif }}
-    <li><a id="nav-directory-link" class="nav-link $nav.directory.2"
-            href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
-    <li><a id="nav-search-link" class="nav-link $nav.search.2"
-            href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
-    {{ if $nav.apps }}
-    <li><a id="nav-apps-link" class="nav-link $nav.apps.2"
-        href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li>
-    {{ endif }}
-    </ul>
-
-    <div id="user-menu">
-        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="$nav.home.0"><span class="">User Menu</span></a>
-        <ul id="user-menu-popup"
-            onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
-            onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-        {{ if $nav.register }}
-        <li>
-        <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
-        </li>
-        {{ endif }}
-        {{ if $nav.contacts }}
-        <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
-        {{ endif }}
-        {{ if $nav.profiles }}
-        <li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.1">$nav.profiles.1</a></li>
-        {{ endif }}
-        {{ if $nav.settings }}
-        <li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0" title="$nav.settings.1">$nav.settings.1</a></li>
-        {{ endif }}
-        {{ if $nav.login }}
-        <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
-        {{ endif }}
-        {{ if $nav.logout }}
-        <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
-        {{ endif }}
-        </ul>
-    </div>
-
-    <ul id="nav-buttons-2">
-    {{ if $nav.introductions }}
-    <li><a id="nav-intro-link" class="nav-link $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li>
-    {{ endif }}
-    {{ if $nav.admin }}
-    <li><a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
-    {{ endif }}
-    {{ if $nav.manage }}
-    <li><a id="nav-manage-link" class="nav-link $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
-    {{ endif }}
-    {{ if $nav.help }}
-    <li><a id="nav-help-link" class="nav-link $nav.help.2"
-            href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
-    {{ endif }}
-    </ul>
-
-{{ if $userinfo }}
-        <ul id="nav-user-menu" class="menu-popup">
-            {{ for $nav.usermenu as $usermenu }}
-                <li>
-                    <a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a>
-                </li>
-            {{ endfor }}
-        </ul>
-{{ endif }}
-
-    <div id="notifications">
-        {{ if $nav.home }}
-        <a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>
-        {{ endif }}
-        {{ if $nav.network }}
-        <a id="net-update" class="nav-ajax-left" href="$nav.network.0" title="$nav.network.1"></a>
-        {{ endif }}
-        {{ if $nav.notifications }}
-        <a id="notify-update" class="nav-ajax-left" href="$nav.notifications.0" title="$nav.notifications.1"></a>
-        {{ endif }}
-        {{ if $nav.messages }}
-        <a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
-        {{ endif }}
-        {{if $nav.introductions }}
-        <a id="intro-update" class="nav-ajax-left" href="$nav.introductions.0"></a>
-        {{ endif }}
-    </div>
-</div>
-    <a href="#" class="floaterflip"></a>
-</nav>
-
-<div id="lang-sel-wrap">
-$langselector
-</div>
-
-<div id="scrollup">
-<a href="#top"><img src="view/theme/dispy/icons/scroll_top.png"
-    alt="back to top" title="Back to top" /></a>
-</div>
-
-<div class="search-box">
-    <form method="get" action="$nav.search.0">
-        <input id="mini-search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
-    </form>
-</div>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-    <li class="{4}">
-    <a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a>
-    </li>
-</ul>
-
diff --git a/view/theme/dispy/photo_edit.tpl b/view/theme/dispy/photo_edit.tpl
deleted file mode 100644
index ead8bc9207..0000000000
--- a/view/theme/dispy/photo_edit.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-
-<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="$item_id" />
-
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
-	<input id="photo-edit-albumname" type="text" name="albname" value="$album" />
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
-	<input id="photo-edit-caption" type="text" name="desc" value="$caption" />
-
-	<div id="photo-edit-caption-end"></div>
-
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
-	<input name="newtag" id="photo-edit-newtag" title="$help_tags" type="text" />
-
-	<div id="photo-edit-tags-end"></div>
-	<div id="photo-edit-rotate-wrapper">
-		<div id="photo-edit-rotate-label">$rotate</div>
-		<input type="checkbox" name="rotate" value="1" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select"
-			id="photo-edit-perms-menu"
-			class="button"
-			title="$permissions"/><span id="jot-perms-icon"
-			class="icon $lockstate" ></span>$permissions</a>
-		<div id="photo-edit-perms-menu-end"></div>
-
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				$aclselect
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-<script type="text/javascript">
-	$("a#photo-edit-perms-menu").colorbox({
-		'inline' : true,
-		'transition' : 'none'
-	}); 
-</script>
diff --git a/view/theme/dispy/photo_view.tpl b/view/theme/dispy/photo_view.tpl
deleted file mode 100644
index a559583085..0000000000
--- a/view/theme/dispy/photo_view.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-<div id="photo-photo"><a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a></div>
-{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons $like $dislike
-</div>
-{{ endif }}
-<div id="wall-photo-container">
-$comments
-</div>
-
-$paginate
-
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
deleted file mode 100644
index b7c99edd9d..0000000000
--- a/view/theme/dispy/profile_vcard.tpl
+++ /dev/null
@@ -1,82 +0,0 @@
-<div class="vcard">
-
-	{{ if $profile.edit }}
-	<div class="action">
-	<span class="icon-profile-edit" rel="#profiles-menu"></span>
-	<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
-	<ul id="profiles-menu" class="menu-popup">
-		{{ for $profile.menu.entries as $e }}
-		<li>
-			<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-		</li>
-		{{ endfor }}
-		<li><a href="profile_photo">$profile.menu.chg_photo</a></li>
-		<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-	</ul>
-	</div>
-	{{ endif }}
-
-	<div class="fn label">$profile.name</div>
-
-	{{ if $pdesc }}
-    <div class="title">$profile.pdesc</div>
-    {{ endif }}
-	<div id="profile-photo-wrapper">
-		<img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" />
-    </div>
-
-	{{ if $location }}
-		<div class="location">
-        <span class="location-label">$location</span>
-		<div class="adr">
-			{{ if $profile.address }}
-            <div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</div>
-		</div>
-	{{ endif }}
-
-	{{ if $gender }}
-    <div class="mf">
-        <span class="gender-label">$gender</span>
-        <span class="x-gender">$profile.gender</span>
-    </div>
-    {{ endif }}
-	
-	{{ if $profile.pubkey }}
-    <div class="key" style="display:none;">$profile.pubkey</div>
-    {{ endif }}
-
-	{{ if $marital }}
-    <div class="marital">
-    <span class="marital-label">
-    <span class="heart">&hearts;</span>$marital</span>
-    <span class="marital-text">$profile.marital</span>
-    </div>
-    {{ endif }}
-
-	{{ if $homepage }}
-    <div class="homepage">
-    <span class="homepage-label">$homepage</span>
-    <span class="homepage-url"><a href="$profile.homepage"
-    target="external-link">$profile.homepage</a></span>
-    </div>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
diff --git a/view/theme/dispy/saved_searches_aside.tpl b/view/theme/dispy/saved_searches_aside.tpl
deleted file mode 100644
index fb822fe5db..0000000000
--- a/view/theme/dispy/saved_searches_aside.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-	<h3 id="search">$title</h3>
-	$searchbox
-	
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-		<li class="saved-search-li clear">
-			<a title="$search.delete" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-$search.id" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-		</li>
-		{{ endfor }}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl
deleted file mode 100644
index 5fc8febe9f..0000000000
--- a/view/theme/dispy/search_item.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<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">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
-
-</div>
-
-
diff --git a/view/theme/dispy/smarty3/bottom.tpl b/view/theme/dispy/smarty3/bottom.tpl
deleted file mode 100644
index 49487240dc..0000000000
--- a/view/theme/dispy/smarty3/bottom.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-{{*
- *	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() {
-
-});
-function tautogrow(id) {
-	$("textarea#comment-edit-text-" + id).autogrow();
-};
-
-function insertFormatting(comment, BBcode, id) {
-	var tmpStr = $("#comment-edit-text-" + id).val();
-	if(tmpStr == comment) {
-		tmpStr = "";
-		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		openMenu("comment-edit-submit-wrapper-" + id);
-	}
-	textarea = document.getElementById("comment-edit-text-" + id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
-			+ "http://" + textarea.value.substring(start, end)
-			+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start)
-			+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
-			+ textarea.value.substring(end, textarea.value.length);
-		}
-	}
-	return true;
-}
-
-function cmtBbOpen(id) {
-	$(".comment-edit-bb-" + id).show();
-}
-function cmtBbClose(id) {
-    $(".comment-edit-bb-" + id).hide();
-}
-
-var doctitle = document.title;
-function checkNotify() {
-	if(document.getElementById("notify-update").innerHTML != "") {
-		document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
-	} else {
-		document.title = doctitle;
-    };
-    setInterval(function () {checkNotify();}, 10 * 1000);
-}
-
-$(document).ready(function(){
-var doctitle = document.title;
-function checkNotify() {
-if(document.getElementById("notify-update").innerHTML != "")
-document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
-else
-document.title = doctitle;
-};
-setInterval(function () {checkNotify();}, 10 * 1000);
-})
-
-</script>
diff --git a/view/theme/dispy/smarty3/comment_item.tpl b/view/theme/dispy/smarty3/comment_item.tpl
deleted file mode 100644
index b30aede3da..0000000000
--- a/view/theme/dispy/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,75 +0,0 @@
-{{*
- *	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}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<ul class="comment-edit-bb-{{$id}}">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-				</ul>
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-{{$id}}"
-					class="comment-edit-text-empty"
-					name="body"
-					onfocus="commentOpen(this,{{$id}});tautogrow({{$id}});cmtBbOpen({{$id}});"
-					onblur="commentClose(this,{{$id}});"
-					placeholder="Comment">{{$comment}}</textarea>
-				{{if $qcomment}}
-                <div class="qcomment-wrapper">
-					<select id="qcomment-select-{{$id}}"
-						name="qcomment-{{$id}}"
-						class="qcomment"
-						onchange="qCommentInsert(this,{{$id}});">
-					<option value=""></option>
-					{{foreach $qcomment as $qc}}
-					<option value="{{$qc}}">{{$qc}}</option>
-					{{/foreach}}
-					</select>
-				</div>
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-				<div class="comment-edit-end"></div>
-			</form>
-		</div>
diff --git a/view/theme/dispy/smarty3/communityhome.tpl b/view/theme/dispy/smarty3/communityhome.tpl
deleted file mode 100644
index 83749ae366..0000000000
--- a/view/theme/dispy/smarty3/communityhome.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{if $page}}
-<div>{{$page}}</div>
-{{/if}}
-
-<h3 id="extra-help-header">Help or '@NewHere'?</h3>
-<div id="extra-help">
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
-	title="Friendica Support" target="_blank">Friendica Support</a><br />
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
-	title="Let's talk" target="_blank">Let's talk</a><br />
-<a href="http://newzot.hydra.uberspace.de/profile/newzot"
-	title="Local Friendica" target="_blank">Local Friendica</a><br />
-<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
-</div>
-
-<h3 id="connect-services-header">Connectable Services</h3>
-<ul id="connect-services">
-<li><a href="{{$url}}/facebook"><img alt="Facebook"
-	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a></li>
-<li><a href="{{$url}}/settings/connectors"><img
-	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png" title="StatusNet" /></a></li>
-<li><a href="{{$url}}/settings/connectors"><img
-	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png" title="LiveJournal" /></a></li>
-<li><a href="{{$url}}/settings/connectors"><img
-	alt="Posterous" src="view/theme/dispy/icons/posterous.png" title="Posterous" /></a></li>
-<li><a href="{{$url}}/settings/connectors"><img
-	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png" title="Tumblr" /></a></li>
-<li><a href="{{$url}}/settings/connectors"><img
-	alt="Twitter" src="view/theme/dispy/icons/twitter.png" title="Twitter" /></a></li>
-<li><a href="{{$url}}/settings/connectors"><img
-	alt="WordPress" src="view/theme/dispy/icons/wordpress.png" title="WordPress" /></a></li>
-<li><a href="{{$url}}/settings/connectors"><img
-	alt="E-Mail" src="view/theme/dispy/icons/email.png" title="E-Mail" /></a></li>
-</ul>
-
diff --git a/view/theme/dispy/smarty3/contact_template.tpl b/view/theme/dispy/smarty3/contact_template.tpl
deleted file mode 100644
index d22acd5a6b..0000000000
--- a/view/theme/dispy/smarty3/contact_template.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{{*
- *	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">
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
-		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
-		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)">
-
-			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
-
-			{{if $contact.photo_menu}}
-			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
-                    <ul>
-						{{foreach $contact.photo_menu as $c}}
-						{{if $c.2}}
-						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-						{{else}}
-						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
-						{{/if}}
-						{{/foreach}}
-                    </ul>
-                </div>
-			{{/if}}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
-{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-	<div class="contact-entry-details" id="contact-entry-url-{{$contact.id}}" >
-		<a href="{{$contact.itemurl}}" title="{{$contact.itemurl}}">Profile URL</a></div>
-	<div class="contact-entry-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
-
diff --git a/view/theme/dispy/smarty3/conversation.tpl b/view/theme/dispy/smarty3/conversation.tpl
deleted file mode 100644
index e8cf720717..0000000000
--- a/view/theme/dispy/smarty3/conversation.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$live_update}}
-
-{{foreach $threads as $thread}}
-<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
-	{{foreach $thread.items as $item}}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
-			</div>
-			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
-		{{/if}}
-		{{if $item.comment_lastcollapsed}}</div>{{/if}}
-		
-		{{include file="{{$item.template}}"}}
-		
-		
-	{{/foreach}}
-</div>
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems(); return false;">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}
diff --git a/view/theme/dispy/smarty3/group_side.tpl b/view/theme/dispy/smarty3/group_side.tpl
deleted file mode 100644
index 33250b694b..0000000000
--- a/view/theme/dispy/smarty3/group_side.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="group-sidebar" class="widget">
-<h3 class="label">{{$title}}</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{foreach $groups as $group}}
-			<li class="sidebar-group-li">
-				<a href="{{$group.href}}" class="sidebar-group-element {{if $group.selected}}group-selected{{else}}group-other{{/if}}">{{$group.text}}</a>
-				{{if $group.edit}}
-					<a class="groupsideedit"
-                        href="{{$group.edit.href}}" title="{{$group.edit.title}}"><span class="icon small-pencil"></span></a>
-				{{/if}}
-				{{if $group.cid}}
-					<input type="checkbox" 
-						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
-						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
-						{{if $group.ismember}}checked="checked"{{/if}}
-					/>
-				{{/if}}
-			</li>
-		{{/foreach}}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new" title="{{$createtext}}"><span class="action text add">{{$createtext}}</span></a>
-  </div>
-</div>
-
-
diff --git a/view/theme/dispy/smarty3/header.tpl b/view/theme/dispy/smarty3/header.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/theme/dispy/smarty3/header.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 4aafc2175d..0000000000
--- a/view/theme/dispy/smarty3/jot-header.tpl
+++ /dev/null
@@ -1,350 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script type="text/javascript">
-var editor=false;
-var textlen = 0;
-var plaintext = '{{$editselect}}';
-
-function initEditor(cb) {
-	if (editor==false) {
-		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").hide();
-			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-			editor = true;
-			$("a#jot-perms-icon").colorbox({
-				'inline' : true,
-				'transition' : 'elastic'
-			});
-			$(".jothidden").show();
-			if (typeof cb!="undefined") cb();
-			return;
-		}
-		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: {{$editselect}},
-			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups,contextmenu,style",
-			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen,charmap",
-			theme_advanced_buttons2 : "",
-			theme_advanced_buttons3 : "",
-			theme_advanced_toolbar_location : "top",
-			theme_advanced_toolbar_align : "center",
-			theme_advanced_blockformats : "blockquote,code",
-			gecko_spellcheck : true,
-			paste_text_sticky : true,
-			entity_encoding : "raw",
-			add_unload_trigger : false,
-			remove_linebreaks : false,
-			//force_p_newlines : false,
-			//force_br_newlines : true,
-			forced_root_block : 'div',
-			convert_urls: false,
-			content_css: "{{$baseurl}}/view/custom_tinymce.css",
-			theme_advanced_path : false,
-			file_browser_callback : "fcFileBrowser",
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-
-					textlen = txt.length;
-					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$('#profile-jot-desc').html(ispublic);
-					}
-					else {
-						$('#profile-jot-desc').html('&#160;');
-					}	 
-
-				 //Character count
-
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
-					$('#character-counter').text(textlen);
-				});
-
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
-			}
-		});
-		editor = true;
-		// setup acl popup
-		$("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-		}); 
-	} else {
-		if (typeof cb!="undefined") cb();
-	}
-}
-
-function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
-	initEditor();
-}
-
-</script>
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js"></script>
-<script type="text/javascript">
-	var ispublic = '{{$ispublic}}';
-	var addtitle = '{{$addtitle}}';
-
-	$(document).ready(function() {
-		
-		/* enable tinymce on focus and click */
-		$("#profile-jot-text").focus(enableOnUser);
-		$("#profile-jot-text").click(enableOnUser);
-		/* enable character counter */
-		$("#profile-jot-text").focus(charCounter);
-		$("#profile-jot-text").click(charCounter);
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-	});
-
-	function deleteCheckedItems() {
-		var checkedstr = '';
-
-		$('.item-select').each( function() {
-			if($(this).is(':checked')) {
-				if(checkedstr.length != 0) {
-					checkedstr = checkedstr + ',' + $(this).val();
-				}
-				else {
-					checkedstr = $(this).val();
-				}
-			}	
-		});
-		$.post('item', { dropitems: checkedstr }, function(data) {
-			window.location.reload();
-		});
-	}
-
-	function jotGetLink() {
-		reply = prompt("{{$linkurl}}");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("{{$vidurl}}");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("{{$audurl}}");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("{{$whereareu}}", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		if ($('#jot-popup').length != 0) $('#jot-popup').show();
-
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-			if (!editor) $("#profile-jot-text").val("");
-			initEditor(function(){
-				addeditortext(data);
-				$('#like-rotator-' + id).hide();
-				$(window).scrollTop(0);
-			});
-
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("{{$term}}");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.colorbox({html:data});
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply);
-					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.colorbox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-	function addeditortext(data) {
-		if(plaintext == 'none') {
-			var currentText = $("#profile-jot-text").val();
-			$("#profile-jot-text").val(currentText + data);
-		}
-		else
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-	}	
-
-	{{$geotag}}
-
-	function charCounter() {
-		// character count part deux
-		//$(this).val().length is not a function Line 282(3)
-		$('#profile-jot-text').keyup(function() {
-			var textlen = 0;
-			var maxLen1 = 140;
-			var maxLen2 = 420;
-
-			$('#character-counter').removeClass('jothidden');
-
-			textLen = $(this).val().length;
-			if(textLen <= maxLen1) {
-				$('#character-counter').removeClass('red');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('grey');
-			}
-			if((textLen > maxLen1) && (textlen <= maxLen2)) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('red');
-				$('#character-counter').addClass('orange');
-			}
-			if(textLen > maxLen2) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('red');
-			}
-			$('#character-counter').text( textLen );
-		});
-		$('#profile-jot-text').keyup();
-	}
-</script>
diff --git a/view/theme/dispy/smarty3/jot.tpl b/view/theme/dispy/smarty3/jot.tpl
deleted file mode 100644
index 24dc68462a..0000000000
--- a/view/theme/dispy/smarty3/jot.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-{{*
- *	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>
-
-		<input type="hidden" name="type" value="{{$ptyp}}" />
-		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-		<input type="hidden" name="return" value="{{$return_path}}" />
-		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none" /></div>
-		<div id="character-counter" class="grey jothidden"></div>
-		{{if $placeholdercategory}}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
-		{{/if}}
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}
-		</textarea>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-<div id="jot-tools" class="jothidden" style="display:none">
-	<div id="profile-jot-submit-wrapper" class="jothidden">
-
-	<div id="profile-upload-wrapper" style="display: {{$visitor}};">
-		<div id="wall-image-upload-div"><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" style="display: {{$visitor}};">
-		<div id="wall-file-upload-div"><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
-	</div>
-
-	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
-		<a id="profile-link" class="icon link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="{{$weblink}}"></a>
-	</div>
-	<div id="profile-video-wrapper" style="display: {{$visitor}};">
-		<a id="profile-video" class="icon video" onclick="jotVideoURL();return false;" title="{{$video}}"></a>
-	</div>
-	<div id="profile-audio-wrapper" style="display: {{$visitor}};">
-		<a id="profile-audio" class="icon audio" onclick="jotAudioURL();return false;" title="{{$audio}}"></a>
-	</div>
-	<div id="profile-location-wrapper" style="display: {{$visitor}};">
-		<a id="profile-location" class="icon globe" onclick="jotGetLocation();return false;" title="{{$setloc}}"></a>
-	</div>
-	<div id="profile-nolocation-wrapper" style="display: none;">
-		<a id="profile-nolocation" class="icon noglobe" onclick="jotClearLocation();return false;" title="{{$noloc}}"></a>
-	</div>
-
-	<div id="profile-jot-plugin-wrapper">
-  	{{$jotplugins}}
-	</div>
-
-	<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="{{$preview}}">{{$preview}}</a>
-	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
-	<div id="profile-jot-perms" class="profile-jot-perms">
-		<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon {{$lockstate}} {{$bang}}" title="{{$permset}}"></a>
-	</div>
-	<span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" /></span>
-	</div>
-
-	</div> <!-- /#profile-jot-submit-wrapper -->
-</div> <!-- /#jot-tools -->
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			{{$acl}}
-			<hr style="clear:both" />
-			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-			<div id="profile-jot-email-end"></div>
-			{{$jotnets}}
-		</div>
-	</div>
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/dispy/smarty3/lang_selector.tpl b/view/theme/dispy/smarty3/lang_selector.tpl
deleted file mode 100644
index a1aee8277f..0000000000
--- a/view/theme/dispy/smarty3/lang_selector.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{foreach $langs.0 as $v=>$l}}
-				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
-			{{/foreach}}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/dispy/smarty3/mail_head.tpl b/view/theme/dispy/smarty3/mail_head.tpl
deleted file mode 100644
index 54a0cd471e..0000000000
--- a/view/theme/dispy/smarty3/mail_head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$messages}}</h3>
-
-<div class="tabs-wrapper">
-{{$tab_content}}
-</div>
diff --git a/view/theme/dispy/smarty3/nav.tpl b/view/theme/dispy/smarty3/nav.tpl
deleted file mode 100644
index e240821057..0000000000
--- a/view/theme/dispy/smarty3/nav.tpl
+++ /dev/null
@@ -1,150 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<nav id="pagenav">
-
-<div id="banner">{{$banner}}</div>
-<div id="site-location">{{$sitelocation}}</div>
-
-<a name="top" id="top"></a>
-<div id="nav-floater">
-    <ul id="nav-buttons">
-    {{if $nav.login}}
-    <li><a id="nav-login-link" class="nav-login-link {{$nav.login.2}}"
-            href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a></li>
-    {{/if}}
-    {{if $nav.home}}
-    <li><a id="nav-home-link" class="nav-link {{$nav.home.2}}"
-            href="{{$nav.home.0}}" title="{{$nav.home.1}}">{{$nav.home.1}}</a></li>
-    {{/if}}
-    {{if $nav.network}}
-    <li><a id="nav-network-link" class="nav-link {{$nav.network.2}}"
-            href="{{$nav.network.0}}" title="{{$nav.network.1}}">{{$nav.network.1}}</a></li>
-    {{/if}}
-    {{if $nav.notifications}}
-    <li><a id="nav-notifications-linkmenu" class="nav-link {{$nav.notifications.2}}"
-            href="{{$nav.notifications.0}}"
-            rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a></li>
-        <ul id="nav-notifications-menu" class="menu-popup">
-            <li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-            <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
-            <li class="empty">{{$emptynotifications}}</li>
-        </ul>
-    {{/if}}
-    {{if $nav.messages}}
-    <li><a id="nav-messages-link" class="nav-link {{$nav.messages.2}}"
-            href="{{$nav.messages.0}}" title="{{$nav.messages.1}}">{{$nav.messages.1}}</a></li>
-    {{/if}}
-    {{if $nav.community}}
-    <li><a id="nav-community-link" class="nav-link {{$nav.community.2}}"
-            href="{{$nav.community.0}}" title="{{$nav.community.1}}">{{$nav.community.1}}</a></li>
-    {{/if}}
-    <li><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}"
-            href="{{$nav.directory.0}}" title="{{$nav.directory.1}}">{{$nav.directory.1}}</a></li>
-    <li><a id="nav-search-link" class="nav-link {{$nav.search.2}}"
-            href="{{$nav.search.0}}" title="{{$nav.search.1}}">{{$nav.search.1}}</a></li>
-    {{if $nav.apps}}
-    <li><a id="nav-apps-link" class="nav-link {{$nav.apps.2}}"
-        href="{{$nav.apps.0}}" title="{{$nav.apps.1}}">{{$nav.apps.1}}</a></li>
-    {{/if}}
-    </ul>
-
-    <div id="user-menu">
-        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="{{$nav.home.0}}"><span class="">User Menu</span></a>
-        <ul id="user-menu-popup"
-            onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
-            onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-        {{if $nav.register}}
-        <li>
-        <a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}" title="{{$nav.register.1}}"></a>
-        </li>
-        {{/if}}
-        {{if $nav.contacts}}
-        <li><a id="nav-contacts-link" class="nav-commlink {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.1}}">{{$nav.contacts.1}}</a></li>
-        {{/if}}
-        {{if $nav.profiles}}
-        <li><a id="nav-profiles-link" class="nav-commlink {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.1}}">{{$nav.profiles.1}}</a></li>
-        {{/if}}
-        {{if $nav.settings}}
-        <li><a id="nav-settings-link" class="nav-commlink {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.1}}">{{$nav.settings.1}}</a></li>
-        {{/if}}
-        {{if $nav.login}}
-        <li><a id="nav-login-link" class="nav-commlink {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.1}}">{{$nav.login.1}}</a></li>
-        {{/if}}
-        {{if $nav.logout}}
-        <li><a id="nav-logout-link" class="nav-commlink {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
-        {{/if}}
-        </ul>
-    </div>
-
-    <ul id="nav-buttons-2">
-    {{if $nav.introductions}}
-    <li><a id="nav-intro-link" class="nav-link {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a></li>
-    {{/if}}
-    {{if $nav.admin}}
-    <li><a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.1}}">{{$nav.admin.1}}</a></li>
-    {{/if}}
-    {{if $nav.manage}}
-    <li><a id="nav-manage-link" class="nav-link {{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.1}}">{{$nav.manage.1}}</a></li>
-    {{/if}}
-    {{if $nav.help}}
-    <li><a id="nav-help-link" class="nav-link {{$nav.help.2}}"
-            href="{{$nav.help.0}}" title="{{$nav.help.1}}">{{$nav.help.1}}</a></li>
-    {{/if}}
-    </ul>
-
-{{if $userinfo}}
-        <ul id="nav-user-menu" class="menu-popup">
-            {{foreach $nav.usermenu as $usermenu}}
-                <li>
-                    <a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a>
-                </li>
-            {{/foreach}}
-        </ul>
-{{/if}}
-
-    <div id="notifications">
-        {{if $nav.home}}
-        <a id="home-update" class="nav-ajax-left" href="{{$nav.home.0}}" title="{{$nav.home.1}}"></a>
-        {{/if}}
-        {{if $nav.network}}
-        <a id="net-update" class="nav-ajax-left" href="{{$nav.network.0}}" title="{{$nav.network.1}}"></a>
-        {{/if}}
-        {{if $nav.notifications}}
-        <a id="notify-update" class="nav-ajax-left" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>
-        {{/if}}
-        {{if $nav.messages}}
-        <a id="mail-update" class="nav-ajax-left" href="{{$nav.messages.0}}" title="{{$nav.messages.1}}"></a>
-        {{/if}}
-        {{if $nav.introductions}}
-        <a id="intro-update" class="nav-ajax-left" href="{{$nav.introductions.0}}"></a>
-        {{/if}}
-    </div>
-</div>
-    <a href="#" class="floaterflip"></a>
-</nav>
-
-<div id="lang-sel-wrap">
-{{$langselector}}
-</div>
-
-<div id="scrollup">
-<a href="#top"><img src="view/theme/dispy/icons/scroll_top.png"
-    alt="back to top" title="Back to top" /></a>
-</div>
-
-<div class="search-box">
-    <form method="get" action="{{$nav.search.0}}">
-        <input id="mini-search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
-    </form>
-</div>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-    <li class="{4}">
-    <a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a>
-    </li>
-</ul>
-
diff --git a/view/theme/dispy/smarty3/photo_edit.tpl b/view/theme/dispy/smarty3/photo_edit.tpl
deleted file mode 100644
index b9a92fda81..0000000000
--- a/view/theme/dispy/smarty3/photo_edit.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="{{$item_id}}" />
-
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
-	<input id="photo-edit-albumname" type="text" name="albname" value="{{$album}}" />
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
-	<input id="photo-edit-caption" type="text" name="desc" value="{{$caption}}" />
-
-	<div id="photo-edit-caption-end"></div>
-
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
-	<input name="newtag" id="photo-edit-newtag" title="{{$help_tags}}" type="text" />
-
-	<div id="photo-edit-tags-end"></div>
-	<div id="photo-edit-rotate-wrapper">
-		<div id="photo-edit-rotate-label">{{$rotate}}</div>
-		<input type="checkbox" name="rotate" value="1" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select"
-			id="photo-edit-perms-menu"
-			class="button"
-			title="{{$permissions}}"/><span id="jot-perms-icon"
-			class="icon {{$lockstate}}" ></span>{{$permissions}}</a>
-		<div id="photo-edit-perms-menu-end"></div>
-
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				{{$aclselect}}
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-<script type="text/javascript">
-	$("a#photo-edit-perms-menu").colorbox({
-		'inline' : true,
-		'transition' : 'none'
-	}); 
-</script>
diff --git a/view/theme/dispy/smarty3/photo_view.tpl b/view/theme/dispy/smarty3/photo_view.tpl
deleted file mode 100644
index cfc8868edf..0000000000
--- a/view/theme/dispy/smarty3/photo_view.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{{*
- *	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>
-
-<div id="photo-edit-link-wrap">
-{{if $tools}}
-<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
-|
-<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
-{{/if}}
-{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
-</div>
-
-{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
-<div id="photo-photo"><a href="{{$photo.href}}" class="lightbox" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
-{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
-<div id="photo-photo-end"></div>
-<div id="photo-caption">{{$desc}}</div>
-{{if $tags}}
-<div id="in-this-photo-text">{{$tags.0}}</div>
-<div id="in-this-photo">{{$tags.1}}</div>
-{{/if}}
-{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
-
-{{if $edit}}{{$edit}}{{/if}}
-
-{{if $likebuttons}}
-<div id="photo-like-div">
-	{{$likebuttons}} {{$like}} {{$dislike}}
-</div>
-{{/if}}
-<div id="wall-photo-container">
-{{$comments}}
-</div>
-
-{{$paginate}}
-
diff --git a/view/theme/dispy/smarty3/profile_vcard.tpl b/view/theme/dispy/smarty3/profile_vcard.tpl
deleted file mode 100644
index 01633716d2..0000000000
--- a/view/theme/dispy/smarty3/profile_vcard.tpl
+++ /dev/null
@@ -1,87 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-
-	{{if $profile.edit}}
-	<div class="action">
-	<span class="icon-profile-edit" rel="#profiles-menu"></span>
-	<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="{{$profile.edit.3}}">{{$profile.edit.1}}</a>
-	<ul id="profiles-menu" class="menu-popup">
-		{{foreach $profile.menu.entries as $e}}
-		<li>
-			<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
-		</li>
-		{{/foreach}}
-		<li><a href="profile_photo">{{$profile.menu.chg_photo}}</a></li>
-		<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
-	</ul>
-	</div>
-	{{/if}}
-
-	<div class="fn label">{{$profile.name}}</div>
-
-	{{if $pdesc}}
-    <div class="title">{{$profile.pdesc}}</div>
-    {{/if}}
-	<div id="profile-photo-wrapper">
-		<img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" />
-    </div>
-
-	{{if $location}}
-		<div class="location">
-        <span class="location-label">{{$location}}</span>
-		<div class="adr">
-			{{if $profile.address}}
-            <div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</div>
-		</div>
-	{{/if}}
-
-	{{if $gender}}
-    <div class="mf">
-        <span class="gender-label">{{$gender}}</span>
-        <span class="x-gender">{{$profile.gender}}</span>
-    </div>
-    {{/if}}
-	
-	{{if $profile.pubkey}}
-    <div class="key" style="display:none;">{{$profile.pubkey}}</div>
-    {{/if}}
-
-	{{if $marital}}
-    <div class="marital">
-    <span class="marital-label">
-    <span class="heart">&hearts;</span>{{$marital}}</span>
-    <span class="marital-text">{{$profile.marital}}</span>
-    </div>
-    {{/if}}
-
-	{{if $homepage}}
-    <div class="homepage">
-    <span class="homepage-label">{{$homepage}}</span>
-    <span class="homepage-url"><a href="{{$profile.homepage}}"
-    target="external-link">{{$profile.homepage}}</a></span>
-    </div>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{if $connect}}
-				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block}}
-
diff --git a/view/theme/dispy/smarty3/saved_searches_aside.tpl b/view/theme/dispy/smarty3/saved_searches_aside.tpl
deleted file mode 100644
index 0d9c0747ff..0000000000
--- a/view/theme/dispy/smarty3/saved_searches_aside.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	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}}
-	
-	<ul id="saved-search-ul">
-		{{foreach $saved as $search}}
-		<li class="saved-search-li clear">
-			<a title="{{$search.delete}}" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-{{$search.id}}" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"></a>
-			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.term}}</a>
-		</li>
-		{{/foreach}}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/theme/dispy/smarty3/search_item.tpl b/view/theme/dispy/smarty3/search_item.tpl
deleted file mode 100644
index 8d406514c3..0000000000
--- a/view/theme/dispy/smarty3/search_item.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-{{*
- *	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}}">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
-				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
-			{{if $item.has_cats}}
-			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
-
-</div>
-
-
diff --git a/view/theme/dispy/smarty3/theme_settings.tpl b/view/theme/dispy/smarty3/theme_settings.tpl
deleted file mode 100644
index 7475db28ba..0000000000
--- a/view/theme/dispy/smarty3/theme_settings.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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}}
-
-{{include file="field_select.tpl" field=$line_height}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="dispy-settings-submit" />
-</div>
-
diff --git a/view/theme/dispy/smarty3/threaded_conversation.tpl b/view/theme/dispy/smarty3/threaded_conversation.tpl
deleted file mode 100644
index 9718d0e85d..0000000000
--- a/view/theme/dispy/smarty3/threaded_conversation.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$live_update}}
-
-{{foreach $threads as $thread}}
-{{include file="{{$thread.template}}" item=$thread}}
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems(); return false;">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}
diff --git a/view/theme/dispy/smarty3/wall_thread.tpl b/view/theme/dispy/smarty3/wall_thread.tpl
deleted file mode 100644
index 94620ad530..0000000000
--- a/view/theme/dispy/smarty3/wall_thread.tpl
+++ /dev/null
@@ -1,144 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
-<a name="{{$item.id}}" ></a>
-<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
-			{{if $item.owner_url}}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
-			{{/if}}
-			<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                    <ul>
-                        {{$item.item_photo_menu}}
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">
-				{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}
-			</div>
-			<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}">{{$item.name}}</span></a>
-			</div>
-			<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
-				{{$item.ago}}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			<div class="wall-item-lock-wrapper">
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}
-			</div>
-			<ul class="wall-item-subtools1">
-				{{if $item.star}}
-				<li>
-					<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
-				</li>
-				{{/if}}
-				{{if $item.tagger}}
-				<li>
-					<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
-				</li>
-				{{/if}}
-				{{if $item.vote}}
-				<li class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-					<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-					{{if $item.vote.dislike}}
-					<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
-					{{/if}}
-					{{if $item.vote.share}}
-					<a href="#" id="share-{{$item.id}}"
-class="icon recycle wall-item-share-buttons"  title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
-					<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-				</li>
-				{{/if}}
-			</ul><br style="clear:left;" />
-			<ul class="wall-item-subtools2">
-			{{if $item.filer}}
-				<li class="wall-item-filer-wrapper"><a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon file-as" title="{{$item.star.filer}}"></a></li>
-			{{/if}}
-			{{if $item.plink}}
-				<li class="wall-item-links-wrapper{{$item.sparkle}}"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link"></a></li>
-			{{/if}}
-			{{if $item.edpost}}
-				<li><a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a></li>
-			{{/if}}
-
-			<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			</li>
-			</ul>
-			<div class="wall-item-delete-end"></div>
-		</div>
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}">
-				{{$item.body}}
-				<div class="body-tag">
-					{{foreach $item.tags as $tag}}
-						<span class="tag">{{$tag}}</span>
-					{{/foreach}}
-				</div>			
-			{{if $item.has_cats}}
-			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			</div>
-		</div>
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like {{$item.indent}} {{$item.shiny}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-	<div class="wall-item-dislike {{$item.indent}} {{$item.shiny}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-	<div class="wall-item-comment-separator"></div>
-
-	{{if $item.threaded}}
-	{{if $item.comment}}
-	<div class="wall-item-comment-wrapper {{$item.indent}} {{$item.shiny}}" >
-		{{$item.comment}}
-	</div>
-	{{/if}}
-	{{/if}}
-
-	{{if $item.flatten}}
-	<div class="wall-item-comment-wrapper" >
-		{{$item.comment}}
-	</div>
-	{{/if}}
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
-</div>
-{{foreach $item.children as $child}}
-	{{include file="{{$child.template}}" item=$child}}
-{{/foreach}}
-
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/dispy/theme_settings.tpl b/view/theme/dispy/theme_settings.tpl
deleted file mode 100644
index 9d250cb3aa..0000000000
--- a/view/theme/dispy/theme_settings.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{inc field_select.tpl with $field=$colour}}{{endinc}}
-
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
-
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="dispy-settings-submit" />
-</div>
-
diff --git a/view/theme/dispy/threaded_conversation.tpl b/view/theme/dispy/threaded_conversation.tpl
deleted file mode 100644
index 3deb7b9477..0000000000
--- a/view/theme/dispy/threaded_conversation.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-{{ inc $thread.template with $item=$thread }}{{ endinc }}
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems(); return false;">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl
deleted file mode 100644
index ae70b8c82b..0000000000
--- a/view/theme/dispy/wall_thread.tpl
+++ /dev/null
@@ -1,139 +0,0 @@
-{{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-<a name="$item.id" ></a>
-<div class="wall-item-outside-wrapper $item.indent $item.shiny$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" 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{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul>
-                        $item.item_photo_menu
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-$item.id">
-				{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}
-			</div>
-			<div class="wall-item-author">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id">$item.name</span></a>
-			</div>
-			<div class="wall-item-ago" id="wall-item-ago-$item.id">
-				$item.ago
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-lock-wrapper">
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
-			</div>
-			<ul class="wall-item-subtools1">
-				{{ if $item.star }}
-				<li>
-					<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-				</li>
-				{{ endif }}
-				{{ if $item.tagger }}
-				<li>
-					<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-				</li>
-				{{ endif }}
-				{{ if $item.vote }}
-				<li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-					<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-					{{ if $item.vote.dislike }}
-					<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-					{{ endif }}
-					{{ if $item.vote.share }}
-					<a href="#" id="share-$item.id"
-class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-					<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-				</li>
-				{{ endif }}
-			</ul><br style="clear:left;" />
-			<ul class="wall-item-subtools2">
-			{{ if $item.filer }}
-				<li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
-			{{ endif }}
-			{{ if $item.plink }}
-				<li class="wall-item-links-wrapper$item.sparkle"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
-			{{ endif }}
-
-			<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			</li>
-			</ul>
-			<div class="wall-item-delete-end"></div>
-		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id">
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id">
-				$item.body
-				<div class="body-tag">
-					{{ for $item.tags as $tag }}
-						<span class="tag">$tag</span>
-					{{ endfor }}
-				</div>			
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			</div>
-		</div>
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like $item.indent $item.shiny" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike $item.indent $item.shiny" id="wall-item-dislike-$item.id">$item.dislike</div>
-	<div class="wall-item-comment-separator"></div>
-
-	{{ if $item.threaded }}
-	{{ if $item.comment }}
-	<div class="wall-item-comment-wrapper $item.indent $item.shiny" >
-		$item.comment
-	</div>
-	{{ endif }}
-	{{ endif }}
-
-	{{ if $item.flatten }}
-	<div class="wall-item-comment-wrapper" >
-		$item.comment
-	</div>
-	{{ endif }}
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
-</div>
-{{ for $item.children as $child }}
-	{{ inc $child.template with $item=$child }}{{ endinc }}
-{{ endfor }}
-
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl
deleted file mode 100755
index 24164a0367..0000000000
--- a/view/theme/duepuntozero/comment_item.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-		{{ if $threaded }}
-		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;">
-		{{ else }}
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-		{{ endif }}
-			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen(this, $id);" onBlur="commentClose(this,$id);cmtBbClose(this,$id);" >$comment</textarea>			
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/duepuntozero/lang_selector.tpl b/view/theme/duepuntozero/lang_selector.tpl
deleted file mode 100644
index e777a0a861..0000000000
--- a/view/theme/duepuntozero/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/duepuntozero/moderated_comment.tpl b/view/theme/duepuntozero/moderated_comment.tpl
deleted file mode 100755
index b0451c8c60..0000000000
--- a/view/theme/duepuntozero/moderated_comment.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-		<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" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<div id="mod-cmnt-wrap-$id" class="mod-cmnt-wrap" style="display:none">
-					<div id="mod-cmnt-name-lbl-$id" class="mod-cmnt-name-lbl">$lbl_modname</div>
-					<input type="text" id="mod-cmnt-name-$id" class="mod-cmnt-name" name="mod-cmnt-name" value="$modname" />
-					<div id="mod-cmnt-email-lbl-$id" class="mod-cmnt-email-lbl">$lbl_modemail</div>
-					<input type="text" id="mod-cmnt-email-$id" class="mod-cmnt-email" name="mod-cmnt-email" value="$modemail" />
-					<div id="mod-cmnt-url-lbl-$id" class="mod-cmnt-url-lbl">$lbl_modurl</div>
-					<input type="text" id="mod-cmnt-url-$id" class="mod-cmnt-url" name="mod-cmnt-url" value="$modurl" />
-				</div>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>			
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
deleted file mode 100644
index edffcebf49..0000000000
--- a/view/theme/duepuntozero/nav.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-<nav>
-	$langselector
-
-	<div id="site-location">$sitelocation</div>
-
-	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-	<span id="nav-link-wrapper" >
-
-	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-		
-	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-		
-	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-	{{ if $nav.network }}
-	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.home }}
-	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.community }}
-	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-	{{ endif }}
-	{{ if $nav.introductions }}
-	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.messages }}
-	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{ endif }}
-
-
-
-
-
-		{{ if $nav.notifications }}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-		{{ endif }}		
-
-	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
-
-
-	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-	</span>
-	<span id="nav-end"></span>
-	<span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/duepuntozero/profile_vcard.tpl
deleted file mode 100644
index e91e6125ff..0000000000
--- a/view/theme/duepuntozero/profile_vcard.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="vcard">
-
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-
-	<div id="profile-vcard-break"></div>	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/duepuntozero/prv_message.tpl b/view/theme/duepuntozero/prv_message.tpl
deleted file mode 100644
index 3f0bd937f4..0000000000
--- a/view/theme/duepuntozero/prv_message.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-
-{{ if $showinputs }}
-<input type="text" id="recip" name="messagerecip" value="$prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$preid">
-{{ else }}
-$select
-{{ endif }}
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
-
-<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/duepuntozero/smarty3/comment_item.tpl b/view/theme/duepuntozero/smarty3/comment_item.tpl
deleted file mode 100644
index f4655078dd..0000000000
--- a/view/theme/duepuntozero/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-{{*
- *	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}}
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
-		{{/if}}
-			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
-				<input type="hidden" name="type" value="{{$type}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<ul class="comment-edit-bb-{{$id}}">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="{{$edbold}}"
-						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="{{$editalic}}"
-						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="{{$eduline}}"
-						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="{{$edquote}}"
-						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="{{$edcode}}"
-						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="{{$edimg}}"
-						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="{{$edurl}}"
-						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="{{$edvideo}}"
-						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea>			
-				{{if $qcomment}}
-					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-					<option value=""></option>
-				{{foreach $qcomment as $qc}}
-					<option value="{{$qc}}">{{$qc}}</option>				
-				{{/foreach}}
-					</select>
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/duepuntozero/smarty3/lang_selector.tpl b/view/theme/duepuntozero/smarty3/lang_selector.tpl
deleted file mode 100644
index a1aee8277f..0000000000
--- a/view/theme/duepuntozero/smarty3/lang_selector.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{foreach $langs.0 as $v=>$l}}
-				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
-			{{/foreach}}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/duepuntozero/smarty3/moderated_comment.tpl b/view/theme/duepuntozero/smarty3/moderated_comment.tpl
deleted file mode 100644
index b2401ca483..0000000000
--- a/view/theme/duepuntozero/smarty3/moderated_comment.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-{{*
- *	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}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
-					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
-					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
-					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
-					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
-					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
-					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
-				</div>
-				<ul class="comment-edit-bb-{{$id}}">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="{{$edbold}}"
-						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="{{$editalic}}"
-						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="{{$eduline}}"
-						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="{{$edquote}}"
-						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="{{$edcode}}"
-						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="{{$edimg}}"
-						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="{{$edurl}}"
-						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="{{$edvideo}}"
-						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>			
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/duepuntozero/smarty3/nav.tpl b/view/theme/duepuntozero/smarty3/nav.tpl
deleted file mode 100644
index 24c48403fe..0000000000
--- a/view/theme/duepuntozero/smarty3/nav.tpl
+++ /dev/null
@@ -1,75 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<nav>
-	{{$langselector}}
-
-	<div id="site-location">{{$sitelocation}}</div>
-
-	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
-	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
-
-	<span id="nav-link-wrapper" >
-
-	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
-		
-	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
-		
-	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
-
-	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
-	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
-
-	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
-
-	{{if $nav.network}}
-	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.home}}
-	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.community}}
-	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
-	{{/if}}
-	{{if $nav.introductions}}
-	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.messages}}
-	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{/if}}
-
-
-
-
-
-		{{if $nav.notifications}}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-		{{/if}}		
-
-	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
-	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
-
-	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
-
-
-	{{if $nav.manage}}<a id="nav-manage-link" class="nav-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
-	</span>
-	<span id="nav-end"></span>
-	<span id="banner">{{$banner}}</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/duepuntozero/smarty3/profile_vcard.tpl b/view/theme/duepuntozero/smarty3/profile_vcard.tpl
deleted file mode 100644
index 85c6345d6d..0000000000
--- a/view/theme/duepuntozero/smarty3/profile_vcard.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-
-	<div class="fn label">{{$profile.name}}</div>
-	
-				
-	
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
-
-
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-
-	<div id="profile-vcard-break"></div>	
-	<div id="profile-extra-links">
-		<ul>
-			{{if $connect}}
-				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-			{{/if}}
-			{{if $wallmessage}}
-				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block}}
-
-
diff --git a/view/theme/duepuntozero/smarty3/prv_message.tpl b/view/theme/duepuntozero/smarty3/prv_message.tpl
deleted file mode 100644
index 1f41d26628..0000000000
--- a/view/theme/duepuntozero/smarty3/prv_message.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h3>{{$header}}</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-{{$parent}}
-
-<div id="prvmail-to-label">{{$to}}</div>
-
-{{if $showinputs}}
-<input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
-{{else}}
-{{$select}}
-{{/if}}
-
-<div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
-
-<div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/facepark/comment_item.tpl b/view/theme/facepark/comment_item.tpl
deleted file mode 100644
index bb1d4fa79e..0000000000
--- a/view/theme/facepark/comment_item.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-		<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" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-				{{ if $qcomment }}
-				{{ for $qcomment as $qc }}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
-					&nbsp;
-				{{ endfor }}
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/facepark/group_side.tpl b/view/theme/facepark/group_side.tpl
deleted file mode 100644
index 0353b1d2cc..0000000000
--- a/view/theme/facepark/group_side.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}			
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
-				{{ endif }}
-				<a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-</div>
-
-
diff --git a/view/theme/facepark/jot.tpl b/view/theme/facepark/jot.tpl
deleted file mode 100644
index 6b24045ef3..0000000000
--- a/view/theme/facepark/jot.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		<div id="jot-text-wrap">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/facepark/nav.tpl b/view/theme/facepark/nav.tpl
deleted file mode 100644
index 04c4931fc6..0000000000
--- a/view/theme/facepark/nav.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<nav>
-	$langselector
-
-	<div id="site-location">$sitelocation</div>
-
-	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-	<span id="nav-link-wrapper" >
-
-	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-		
-	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-		
-	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-	{{ if $nav.network }}
-	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.home }}
-	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.community }}
-	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-	{{ endif }}
-	{{ if $nav.introductions }}
-	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.messages }}
-	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{ endif }}
-
-
-
-	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-
-		{{ if $nav.notifications }}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-		{{ endif }}		
-
-	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
-	</span>
-	<span id="nav-end"></span>
-	<span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/facepark/profile_vcard.tpl b/view/theme/facepark/profile_vcard.tpl
deleted file mode 100644
index 07d2df5df3..0000000000
--- a/view/theme/facepark/profile_vcard.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="vcard">
-
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/facepark/search_item.tpl b/view/theme/facepark/search_item.tpl
deleted file mode 100644
index 737f1649e1..0000000000
--- a/view/theme/facepark/search_item.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-<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">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-
-</div>
-
-
diff --git a/view/theme/facepark/smarty3/comment_item.tpl b/view/theme/facepark/smarty3/comment_item.tpl
deleted file mode 100644
index 50bbd89e49..0000000000
--- a/view/theme/facepark/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	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}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
-				{{if $qcomment}}
-				{{foreach $qcomment as $qc}}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
-					&nbsp;
-				{{/foreach}}
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/facepark/smarty3/group_side.tpl b/view/theme/facepark/smarty3/group_side.tpl
deleted file mode 100644
index 139798beee..0000000000
--- a/view/theme/facepark/smarty3/group_side.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="widget" id="group-sidebar">
-<h3>{{$title}}</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{foreach $groups as $group}}
-			<li class="sidebar-group-li">
-				{{if $group.cid}}
-					<input type="checkbox" 
-						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
-						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
-						{{if $group.ismember}}checked="checked"{{/if}}
-					/>
-				{{/if}}			
-				{{if $group.edit}}
-					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"></span></a>
-				{{/if}}
-				<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
-			</li>
-		{{/foreach}}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">{{$createtext}}</a>
-  </div>
-</div>
-
-
diff --git a/view/theme/facepark/smarty3/jot.tpl b/view/theme/facepark/smarty3/jot.tpl
deleted file mode 100644
index 16cc822bdd..0000000000
--- a/view/theme/facepark/smarty3/jot.tpl
+++ /dev/null
@@ -1,90 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="{{$action}}" method="post" >
-		<input type="hidden" name="type" value="{{$ptyp}}" />
-		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-		<input type="hidden" name="return" value="{{$return_path}}" />
-		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
-		<div id="jot-text-wrap">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
-
-	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	{{$jotplugins}}
-	</div>
-
-	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			{{$acl}}
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-			<div id="profile-jot-email-end"></div>
-			{{$jotnets}}
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/facepark/smarty3/nav.tpl b/view/theme/facepark/smarty3/nav.tpl
deleted file mode 100644
index 6119a1a93d..0000000000
--- a/view/theme/facepark/smarty3/nav.tpl
+++ /dev/null
@@ -1,73 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<nav>
-	{{$langselector}}
-
-	<div id="site-location">{{$sitelocation}}</div>
-
-	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
-	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
-
-	<span id="nav-link-wrapper" >
-
-	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
-		
-	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
-		
-	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
-
-	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
-	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
-
-	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
-
-	{{if $nav.network}}
-	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.home}}
-	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.community}}
-	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
-	{{/if}}
-	{{if $nav.introductions}}
-	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.messages}}
-	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{/if}}
-
-
-
-	{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
-
-
-		{{if $nav.notifications}}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-		{{/if}}		
-
-	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
-	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
-
-	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
-	</span>
-	<span id="nav-end"></span>
-	<span id="banner">{{$banner}}</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/facepark/smarty3/profile_vcard.tpl b/view/theme/facepark/smarty3/profile_vcard.tpl
deleted file mode 100644
index 343a0aafa8..0000000000
--- a/view/theme/facepark/smarty3/profile_vcard.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-
-	<div class="fn label">{{$profile.name}}</div>
-	
-				
-	
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
-
-
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{if $connect}}
-				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block}}
-
-
diff --git a/view/theme/facepark/smarty3/search_item.tpl b/view/theme/facepark/smarty3/search_item.tpl
deleted file mode 100644
index d6bf550074..0000000000
--- a/view/theme/facepark/smarty3/search_item.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-{{*
- *	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}}">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
-				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
-
-</div>
-
-
diff --git a/view/theme/frost-mobile/acl_selector.tpl b/view/theme/frost-mobile/acl_selector.tpl
deleted file mode 100644
index df34a1a2ae..0000000000
--- a/view/theme/frost-mobile/acl_selector.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<div id="acl-wrapper">
-	<input id="acl-search">
-	<a href="#" id="acl-showall">$showall</a>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</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>
-
-<script>
-	window.allowCID = $allowcid;
-	window.allowGID = $allowgid;
-	window.denyCID = $denycid;
-	window.denyGID = $denygid;
-	window.aclInit = "true";
-</script>
diff --git a/view/theme/frost-mobile/admin_aside.tpl b/view/theme/frost-mobile/admin_aside.tpl
deleted file mode 100644
index da3ed23a88..0000000000
--- a/view/theme/frost-mobile/admin_aside.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<h4><a href="$admurl">$admtxt</a></h4>
-<ul class='admin linklist'>
-	<li class='admin button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
-	<li class='admin button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
-	<li class='admin button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
-	<li class='admin button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
-	<li class='admin button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
-</ul>
-
-{{ if $admin.update }}
-<ul class='admin linklist'>
-	<li class='admin button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
-	<li class='admin button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
-</ul>
-{{ endif }}
-
-
-{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
-<ul class='admin linklist'>
-	{{ for $admin.plugins_admin as $l }}
-	<li class='admin button $l.2'><a href='$l.0'>$l.1</a></li>
-	{{ endfor }}
-</ul>
-	
-	
-<h4>$logtxt</h4>
-<ul class='admin linklist'>
-	<li class='admin button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
-</ul>
-
diff --git a/view/theme/frost-mobile/admin_site.tpl b/view/theme/frost-mobile/admin_site.tpl
deleted file mode 100644
index 61f52b18dc..0000000000
--- a/view/theme/frost-mobile/admin_site.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='$form_security_token'>
-
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} 
-	{{ inc field_select.tpl with $field=$singleuser }}{{ endinc }} 
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$registration</h3>
-	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	
-	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-
-	<h3>$upload</h3>
-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
-	
-	<h3>$corporate</h3>
-	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ostatus_poll_interval }}{{ endinc }} 
-	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }}	
-	{{ inc field_checkbox.tpl with $field=$disable_embedded }}{{ endinc }}	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$advanced</h3>
-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	</form>
-</div>
diff --git a/view/theme/frost-mobile/admin_users.tpl b/view/theme/frost-mobile/admin_users.tpl
deleted file mode 100644
index a3f6d2416f..0000000000
--- a/view/theme/frost-mobile/admin_users.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$j("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='tool like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='tool dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
-						<td class="checkbox"> 
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-                                    {{ endif }}
-						<td class="tools">
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                        <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
-                                    {{ endif }}
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/frost-mobile/categories_widget.tpl b/view/theme/frost-mobile/categories_widget.tpl
deleted file mode 100644
index ebc62404b8..0000000000
--- a/view/theme/frost-mobile/categories_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{#<!--<div id="categories-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="categories-ul">
-		<li class="tool"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
-		{{ for $terms as $term }}
-			<li class="tool"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>-->#}
diff --git a/view/theme/frost-mobile/comment_item.tpl b/view/theme/frost-mobile/comment_item.tpl
deleted file mode 100755
index 5410cd4cfb..0000000000
--- a/view/theme/frost-mobile/comment_item.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-{#<!--		<script>
-		$(document).ready( function () {
-			$(document).mouseup(function(e) {
-				var container = $("#comment-edit-wrapper-$id");
-				if( container.has(e.target).length === 0) {
-					commentClose(document.getElementById('comment-edit-text-$id'),$id);
-					cmtBbClose($id);
-				}
-			});
-		});
-		</script>-->#}
-
-		<div class="comment-wwedit-wrapper $indent" id="comment-edit-wrapper-$id" style="display: block;" >
-			<form class="comment-edit-form $indent" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;" >
-{#<!--			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">-->#}
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="source" value="$sourceapp" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				{#<!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->#}
-					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				{#<!--</div>-->#}
-				{#<!--<div class="comment-edit-photo-end"></div>-->#}
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-{#<!--					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>-->#}
-				</ul>	
-				{#<!--<div class="comment-edit-bb-end"></div>-->#}
-{#<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->#}
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" >$comment</textarea>
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					{#<!--<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="preview-link fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>-->#}
-				</div>
-
-				{#<!--<div class="comment-edit-end"></div>-->#}
-			</form>
-
-		</div>
diff --git a/view/theme/frost-mobile/common_tabs.tpl b/view/theme/frost-mobile/common_tabs.tpl
deleted file mode 100644
index 940e5aeb2f..0000000000
--- a/view/theme/frost-mobile/common_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<ul class="tabs">
-	{{ for $tabs as $tab }}
-		<li id="$tab.id"><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
-	{{ endfor }}
-	<div id="tabs-end"></div>
-</ul>
diff --git a/view/theme/frost-mobile/contact_block.tpl b/view/theme/frost-mobile/contact_block.tpl
deleted file mode 100644
index a8e34fce16..0000000000
--- a/view/theme/frost-mobile/contact_block.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{#<!--<div id="contact-block">
-<h4 class="contact-block-h4">$contacts</h4>
-{{ if $micropro }}
-		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
-		<div class='contact-block-content'>
-		{{ for $micropro as $m }}
-			$m
-		{{ endfor }}
-		</div>
-{{ endif }}
-</div>
-<div class="clear"></div>-->#}
diff --git a/view/theme/frost-mobile/contact_edit.tpl b/view/theme/frost-mobile/contact_edit.tpl
deleted file mode 100644
index e5f12950c7..0000000000
--- a/view/theme/frost-mobile/contact_edit.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-wrapper" >
-
-	$tab_str
-
-	<div id="contact-edit-drop-link" >
-		<a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#}></a>
-	</div>
-
-	<div id="contact-edit-drop-link-end"></div>
-
-	<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>
-	</div>
-
-
-	<div id="contact-edit-nav-wrapper" >
-		<div id="contact-edit-links">
-			<ul>
-				<li><div id="contact-edit-rel">$relation_text</div></li>
-				<li><div id="contact-edit-nettype">$nettype</div></li>
-				{{ if $lost_contact }}
-					<li><div id="lost-contact-message">$lost_contact</div></li>
-				{{ endif }}
-				{{ if $insecure }}
-					<li><div id="insecure-message">$insecure</div></li>
-				{{ endif }}
-				{{ if $blocked }}
-					<li><div id="block-message">$blocked</div></li>
-				{{ endif }}
-				{{ if $ignored }}
-					<li><div id="ignore-message">$ignored</div></li>
-				{{ endif }}
-				{{ if $archived }}
-					<li><div id="archive-message">$archived</div></li>
-				{{ endif }}
-
-				<li>&nbsp;</li>
-
-				{{ if $common_text }}
-					<li><div id="contact-edit-common"><a href="$common_link">$common_text</a></div></li>
-				{{ endif }}
-				{{ if $all_friends }}
-					<li><div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div></li>
-				{{ endif }}
-
-
-				<li><a href="network/0?nets=all&cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
-				{{ if $lblsuggest }}
-					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
-				{{ endif }}
-
-			</ul>
-		</div>
-	</div>
-	<div id="contact-edit-nav-end"></div>
-
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-	{{ if $poll_enabled }}
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></div>
-			<span id="contact-edit-poll-text">$updpub $poll_interval</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/$contact_id/update" >$udnow</a></span>
-		</div>
-	{{ endif }}
-	<div id="contact-edit-end" ></div>
-
-	{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-
-<div id="contact-edit-info-wrapper">
-<h4>$lbl_info1</h4>
-	<textarea id="contact-edit-info" rows="8"{# cols="35"#} name="info">$info</textarea>
-	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-</div>
-<div id="contact-edit-info-end"></div>
-
-
-<div id="contact-edit-profile-select-text">
-<h4>$lbl_vis1</h4>
-<p>$lbl_vis2</p> 
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-
-</form>
-</div>
diff --git a/view/theme/frost-mobile/contact_head.tpl b/view/theme/frost-mobile/contact_head.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/frost-mobile/contact_template.tpl b/view/theme/frost-mobile/contact_template.tpl
deleted file mode 100644
index 7c19b3272e..0000000000
--- a/view/theme/frost-mobile/contact_template.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id);" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-{#<!--			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>-->#}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">
-			<img src="$contact.thumb" $contact.sparkle alt="$contact.name" />
-			</span>
-
-			{{ if $contact.photo_menu }}
-{#<!--			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>-->#}
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-						{{ for $contact.photo_menu as $c }}
-						{{ if $c.2 }}
-						<li><a target="redir" href="$c.1">$c.0</a></li>
-						{{ else }}
-						<li><a href="$c.1">$c.0</a></li>
-						{{ endif }}
-						{{ endfor }}
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div><br />
-{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-	<div class="contact-entry-network" id="contact-entry-network-$contact.id" >$contact.network</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/frost-mobile/contacts-end.tpl b/view/theme/frost-mobile/contacts-end.tpl
deleted file mode 100644
index 820b1c6a0f..0000000000
--- a/view/theme/frost-mobile/contacts-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
-
-
diff --git a/view/theme/frost-mobile/contacts-head.tpl b/view/theme/frost-mobile/contacts-head.tpl
deleted file mode 100644
index 5ae97f9f0c..0000000000
--- a/view/theme/frost-mobile/contacts-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script>
-	window.autocompleteType = 'contacts-head';
-</script>
-
diff --git a/view/theme/frost-mobile/contacts-template.tpl b/view/theme/frost-mobile/contacts-template.tpl
deleted file mode 100644
index 76254c1ca8..0000000000
--- a/view/theme/frost-mobile/contacts-template.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<h1>$header{{ if $total }} ($total){{ endif }}</h1>
-
-{{ if $finding }}<h4>$finding</h4>{{ endif }}
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="$cmd" method="get" >
-<span class="contacts-search-desc">$desc</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-$tabs
-
-
-<div id="contacts-display-wrapper">
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
-</div>
-<div id="contact-edit-end"></div>
-
-$paginate
-
-
-
-
diff --git a/view/theme/frost-mobile/contacts-widget-sidebar.tpl b/view/theme/frost-mobile/contacts-widget-sidebar.tpl
deleted file mode 100644
index 1c63f9eab2..0000000000
--- a/view/theme/frost-mobile/contacts-widget-sidebar.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-$follow_widget
-
diff --git a/view/theme/frost-mobile/conversation.tpl b/view/theme/frost-mobile/conversation.tpl
deleted file mode 100644
index d39976f39f..0000000000
--- a/view/theme/frost-mobile/conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	{{ for $thread.items as $item }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-		
-		{{ inc $item.template }}{{ endinc }}
-		
-		
-	{{ endfor }}
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{#<!--{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}-->#}
diff --git a/view/theme/frost-mobile/cropbody.tpl b/view/theme/frost-mobile/cropbody.tpl
deleted file mode 100644
index 3283084cad..0000000000
--- a/view/theme/frost-mobile/cropbody.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>$title</h1>
-<p id="cropimage-desc">
-$desc
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="$done" />
-</div>
-
-</form>
diff --git a/view/theme/frost-mobile/cropend.tpl b/view/theme/frost-mobile/cropend.tpl
deleted file mode 100644
index a56c71d92e..0000000000
--- a/view/theme/frost-mobile/cropend.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-      <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>
-      <script type="text/javascript" language="javascript">initCrop();</script>
diff --git a/view/theme/frost-mobile/crophead.tpl b/view/theme/frost-mobile/crophead.tpl
deleted file mode 100644
index 56e941e3ab..0000000000
--- a/view/theme/frost-mobile/crophead.tpl
+++ /dev/null
@@ -1 +0,0 @@
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/frost-mobile/display-head.tpl b/view/theme/frost-mobile/display-head.tpl
deleted file mode 100644
index 1fc82ae779..0000000000
--- a/view/theme/frost-mobile/display-head.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<script>
-	window.autoCompleteType = 'display-head';
-</script>
-
diff --git a/view/theme/frost-mobile/end.tpl b/view/theme/frost-mobile/end.tpl
deleted file mode 100644
index 8bc088421a..0000000000
--- a/view/theme/frost-mobile/end.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--[if IE]>
-<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-{#<!--<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
-<script type="text/javascript">
-  tinyMCE.init({ mode : "none"});
-</script>-->#}
-<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
-<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-{#<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>-->#}
-{#<!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->#}
-<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/acl.min.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.min.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.min.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/theme.min.js"></script>
-
diff --git a/view/theme/frost-mobile/event.tpl b/view/theme/frost-mobile/event.tpl
deleted file mode 100644
index 67de85d5c8..0000000000
--- a/view/theme/frost-mobile/event.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ for $events as $event }}
-	<div class="event">
-	
-	{{ if $event.item.author_name }}<a href="$event.item.author_link" ><img src="$event.item.author_avatar" height="32" width="32" />$event.item.author_name</a>{{ endif }}
-	$event.html
-	{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{ endif }}
-	{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link tool s22 pencil"></a>{{ endif }}
-	</div>
-	<div class="clear"></div>
-{{ endfor }}
diff --git a/view/theme/frost-mobile/event_end.tpl b/view/theme/frost-mobile/event_end.tpl
deleted file mode 100644
index fd9e41f944..0000000000
--- a/view/theme/frost-mobile/event_end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
-
-
diff --git a/view/theme/frost-mobile/event_head.tpl b/view/theme/frost-mobile/event_head.tpl
deleted file mode 100644
index c3f16d5428..0000000000
--- a/view/theme/frost-mobile/event_head.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
-
-<script language="javascript" type="text/javascript">
-window.aclType = 'event_head';
-</script>
-
diff --git a/view/theme/frost-mobile/field_checkbox.tpl b/view/theme/frost-mobile/field_checkbox.tpl
deleted file mode 100644
index 9fbf84eac9..0000000000
--- a/view/theme/frost-mobile/field_checkbox.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field checkbox' id='div_id_$field.0'>
-		<label id='label_id_$field.0' for='id_$field.0'>$field.1</label>
-		<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}><br />
-		<span class='field_help' id='help_id_$field.0'>$field.3</span>
-	</div>
diff --git a/view/theme/frost-mobile/field_input.tpl b/view/theme/frost-mobile/field_input.tpl
deleted file mode 100644
index 58e17406c0..0000000000
--- a/view/theme/frost-mobile/field_input.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label><br />
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/frost-mobile/field_openid.tpl b/view/theme/frost-mobile/field_openid.tpl
deleted file mode 100644
index 8d330a30a0..0000000000
--- a/view/theme/frost-mobile/field_openid.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input openid' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label><br />
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/frost-mobile/field_password.tpl b/view/theme/frost-mobile/field_password.tpl
deleted file mode 100644
index 7a0d3fe9f4..0000000000
--- a/view/theme/frost-mobile/field_password.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field password' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label><br />
-		<input type='password' name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/frost-mobile/field_themeselect.tpl b/view/theme/frost-mobile/field_themeselect.tpl
deleted file mode 100644
index d8ddc2fc74..0000000000
--- a/view/theme/frost-mobile/field_themeselect.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0' {{ if $field.5 }}onchange="previewTheme(this);"{{ endif }} >
-			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
-		</select>
-		<span class='field_help'>$field.3</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/theme/frost-mobile/generic_links_widget.tpl b/view/theme/frost-mobile/generic_links_widget.tpl
deleted file mode 100644
index a976d4573c..0000000000
--- a/view/theme/frost-mobile/generic_links_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="widget{{ if $class }} $class{{ endif }}">
-{#<!--	{{if $title}}<h3>$title</h3>{{endif}}-->#}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul class="tabs links-widget">
-		{{ for $items as $item }}
-			<li class="tool"><a href="$item.url" class="tab {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-		<div id="tabs-end"></div>
-	</ul>
-	
-</div>
diff --git a/view/theme/frost-mobile/group_drop.tpl b/view/theme/frost-mobile/group_drop.tpl
deleted file mode 100644
index 959b77bb21..0000000000
--- a/view/theme/frost-mobile/group_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id?t=$form_security_token" 
-		onclick="return confirmDelete();" 
-		id="group-delete-icon-$id" 
-		class="icon drophide group-delete-icon" 
-		{#onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);"#} ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/frost-mobile/head.tpl b/view/theme/frost-mobile/head.tpl
deleted file mode 100644
index a79b2916dd..0000000000
--- a/view/theme/frost-mobile/head.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<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'>
-<meta content='320' name='MobileOptimized'>-->#}
-<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
-{#<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->#}
-
-<base href="$baseurl/" />
-<meta name="generator" content="$generator" />
-{#<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />-->#}
-<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
-
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-
-<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
-<link rel="search"
-         href="$baseurl/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
-<script>
-	window.delItem = "$delitem";
-	window.commentEmptyText = "$comment";
-	window.showMore = "$showmore";
-	window.showFewer = "$showfewer";
-	var updateInterval = $update_interval;
-	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
-</script>
-
diff --git a/view/theme/frost-mobile/jot-end.tpl b/view/theme/frost-mobile/jot-end.tpl
deleted file mode 100644
index 41f50160f1..0000000000
--- a/view/theme/frost-mobile/jot-end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
-<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
-
diff --git a/view/theme/frost-mobile/jot-header.tpl b/view/theme/frost-mobile/jot-header.tpl
deleted file mode 100644
index 5d8cfa4548..0000000000
--- a/view/theme/frost-mobile/jot-header.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-<script>
-	var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
-	window.editSelect = $editselect;
-	window.isPublic = "$ispublic";
-	window.nickname = "$nickname";
-	window.linkURL = "$linkurl";
-	window.vidURL = "$vidurl";
-	window.audURL = "$audurl";
-	window.whereAreU = "$whereareu";
-	window.term = "$term";
-	window.baseURL = "$baseurl";
-	window.geoTag = function () { $geotag }
-	window.jotId = "#profile-jot-text";
-	window.imageUploadButton = 'wall-image-upload';
-</script>
-
-
diff --git a/view/theme/frost-mobile/jot.tpl b/view/theme/frost-mobile/jot.tpl
deleted file mode 100644
index b345152792..0000000000
--- a/view/theme/frost-mobile/jot.tpl
+++ /dev/null
@@ -1,91 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="source" value="$sourceapp" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
-		{{ endif }}
-		<div id="jot-text-wrap">
-		{#<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />-->#}
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div> 
-
-	{#<!--<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->#}
-	<div id="profile-link-wrapper" style="display: $visitor;" >
-		<a id="profile-link" class="icon link" title="$weblink" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper">
-			$acl
-			<hr/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			$jotnets
-			<div id="profile-jot-networks-end"></div>
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{ if $content }}<script>window.jotInit = true;</script>{{ endif }}
diff --git a/view/theme/frost-mobile/jot_geotag.tpl b/view/theme/frost-mobile/jot_geotag.tpl
deleted file mode 100644
index 3f8bee91a7..0000000000
--- a/view/theme/frost-mobile/jot_geotag.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			var lat = position.coords.latitude.toFixed(4);
-			var lon = position.coords.longitude.toFixed(4);
-
-			$j('#jot-coord').val(lat + ', ' + lon);
-			$j('#profile-nolocation-wrapper').show();
-		});
-	}
-
diff --git a/view/theme/frost-mobile/lang_selector.tpl b/view/theme/frost-mobile/lang_selector.tpl
deleted file mode 100644
index e777a0a861..0000000000
--- a/view/theme/frost-mobile/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/frost-mobile/like_noshare.tpl b/view/theme/frost-mobile/like_noshare.tpl
deleted file mode 100644
index 5bf94f7df7..0000000000
--- a/view/theme/frost-mobile/like_noshare.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-	<a href="#" class="tool like" title="$likethis" onclick="dolike($id,'like'); return false"></a>
-	{{ if $nolike }}
-	<a href="#" class="tool dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
-	{{ endif }}
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
diff --git a/view/theme/frost-mobile/login.tpl b/view/theme/frost-mobile/login.tpl
deleted file mode 100644
index 05ae364c00..0000000000
--- a/view/theme/frost-mobile/login.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<div class="login-form">
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-
-	<br />
-	<div id='login-footer'>
-<!--	<div class="login-extra-links">
-	By signing in you agree to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-	</div>-->
-
-	<br />
-	{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
-
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-
-	<br /><br />
-	<div class="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>
-	</div>
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-</div>
-
-<script type="text/javascript">window.loginName = "$lname.0";</script>
diff --git a/view/theme/frost-mobile/login_head.tpl b/view/theme/frost-mobile/login_head.tpl
deleted file mode 100644
index 14734821ce..0000000000
--- a/view/theme/frost-mobile/login_head.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{#<!--<link rel="stylesheet" href="$baseurl/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->#}
-
diff --git a/view/theme/frost-mobile/lostpass.tpl b/view/theme/frost-mobile/lostpass.tpl
deleted file mode 100644
index 583e3dbaff..0000000000
--- a/view/theme/frost-mobile/lostpass.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="lostpass-form">
-<h2>$title</h2>
-<br /><br /><br />
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper" class="field input">
-        <label for="login-name" id="label-login-name">$name</label><br />
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<p id="lostpass-desc">
-$desc
-</p>
-<br />
-
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-</div>
diff --git a/view/theme/frost-mobile/mail_conv.tpl b/view/theme/frost-mobile/mail_conv.tpl
deleted file mode 100644
index ed32dac5a9..0000000000
--- a/view/theme/frost-mobile/mail_conv.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<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>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-	</div>
-	<div class="mail-conv-body">$mail.body</div>
-</div>
-<div class="mail-conv-outside-wrapper-end"></div>
-
-
-<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a></div>
-<div class="mail-conv-delete-end"></div>
-
-<hr class="mail-conv-break" />
diff --git a/view/theme/frost-mobile/mail_list.tpl b/view/theme/frost-mobile/mail_list.tpl
deleted file mode 100644
index 5be7f38623..0000000000
--- a/view/theme/frost-mobile/mail_list.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<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>
-	</div>
-	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >$from_name</div>
-		<div class="mail-list-date">$date</div>
-		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
-		<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="icon drophide mail-list-delete	delete-icon" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
-	</div>
-</div>
-</div>
-<div class="mail-list-delete-end"></div>
-
-<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/frost-mobile/message-end.tpl b/view/theme/frost-mobile/message-end.tpl
deleted file mode 100644
index 820b1c6a0f..0000000000
--- a/view/theme/frost-mobile/message-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
-
-
diff --git a/view/theme/frost-mobile/message-head.tpl b/view/theme/frost-mobile/message-head.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/frost-mobile/moderated_comment.tpl b/view/theme/frost-mobile/moderated_comment.tpl
deleted file mode 100755
index b0451c8c60..0000000000
--- a/view/theme/frost-mobile/moderated_comment.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-		<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" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<div id="mod-cmnt-wrap-$id" class="mod-cmnt-wrap" style="display:none">
-					<div id="mod-cmnt-name-lbl-$id" class="mod-cmnt-name-lbl">$lbl_modname</div>
-					<input type="text" id="mod-cmnt-name-$id" class="mod-cmnt-name" name="mod-cmnt-name" value="$modname" />
-					<div id="mod-cmnt-email-lbl-$id" class="mod-cmnt-email-lbl">$lbl_modemail</div>
-					<input type="text" id="mod-cmnt-email-$id" class="mod-cmnt-email" name="mod-cmnt-email" value="$modemail" />
-					<div id="mod-cmnt-url-lbl-$id" class="mod-cmnt-url-lbl">$lbl_modurl</div>
-					<input type="text" id="mod-cmnt-url-$id" class="mod-cmnt-url" name="mod-cmnt-url" value="$modurl" />
-				</div>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>			
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/frost-mobile/msg-end.tpl b/view/theme/frost-mobile/msg-end.tpl
deleted file mode 100644
index 6074133798..0000000000
--- a/view/theme/frost-mobile/msg-end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
diff --git a/view/theme/frost-mobile/msg-header.tpl b/view/theme/frost-mobile/msg-header.tpl
deleted file mode 100644
index fb6e0684b7..0000000000
--- a/view/theme/frost-mobile/msg-header.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-	window.nickname = "$nickname";
-	window.linkURL = "$linkurl";
-	var plaintext = "none";
-	window.jotId = "#prvmail-text";
-	window.imageUploadButton = 'prvmail-upload';
-	window.autocompleteType = 'msg-header';
-</script>
-
diff --git a/view/theme/frost-mobile/nav.tpl b/view/theme/frost-mobile/nav.tpl
deleted file mode 100644
index c03ea05d90..0000000000
--- a/view/theme/frost-mobile/nav.tpl
+++ /dev/null
@@ -1,146 +0,0 @@
-<nav>
-{#<!--	$langselector -->#}
-
-{#<!--	<div id="site-location">$sitelocation</div> -->#}
-
-	<span id="nav-link-wrapper" >
-
-{#<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->#}
-	<div class="nav-button-container">
-{#<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->#}
-	<img rel="#system-menu-list" class="nav-link" src="$baseurl/view/theme/frost-mobile/images/menu.png">
-{#<!--	</a>-->#}
-	<ul id="system-menu-list" class="nav-menu-list">
-		{{ if $nav.login }}
-		<a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-		{{ endif }}
-
-		{{ if $nav.register }}
-		<a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
-		{{ endif }}
-
-		{{ if $nav.settings }}
-		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.manage }}
-		<li>
-		<a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
-		</li>
-		{{ endif }}
-
-		{{ if $nav.profiles }}
-		<li><a id="nav-profiles-link" class="$nav.profiles.2 nav-load-page-link" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.admin }}
-		<li><a id="nav-admin-link" class="$nav.admin.2 nav-load-page-link" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>
-		{{ endif }}
-
-		<li><a id="nav-search-link" class="$nav.search.2 nav-load-page-link" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
-
-		{{ if $nav.apps }}
-		<li><a id="nav-apps-link" class="$nav.apps.2 nav-load-page-link" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.help }}
-		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
-		{{ endif }}
-		
-		{{ if $nav.logout }}
-		<li><a id="nav-logout-link" class="$nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
-		{{ endif }}
-	</ul>
-	</div>
-
-	{{ if $nav.notifications }}
-{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->#}
-	<div class="nav-button-container">
-{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">-->#}
-	<img rel="#nav-notifications-menu" class="nav-link" src="$baseurl/view/theme/frost-mobile/images/notifications.png">
-{#<!--	</a>-->#}
-	<span id="notify-update" class="nav-ajax-left"></span>
-	<ul id="nav-notifications-menu" class="notifications-menu-popup">
-		<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-		<li class="empty">$emptynotifications</li>
-	</ul>
-	</div>
-	{{ endif }}		
-
-{#<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->#}
-	<div class="nav-button-container">
-{#<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->#}
-	<img rel="#contacts-menu-list"  class="nav-link" src="$baseurl/view/theme/frost-mobile/images/contacts.png">
-	{#<!--</a>-->#}
-	{{ if $nav.introductions }}
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	<ul id="contacts-menu-list" class="nav-menu-list">
-		{{ if $nav.contacts }}
-		<li><a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><li>
-		{{ endif }}
-
-		<li><a id="nav-directory-link" class="$nav.directory.2 nav-load-page-link" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a><li>
-
-		{{ if $nav.introductions }}
-		<li>
-		<a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-		</li>
-		{{ endif }}
-	</ul>
-	</div>
-
-	{{ if $nav.messages }}
-{#<!--	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->#}
-	<div class="nav-button-container">
-	<a id="nav-messages-link" class="$nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
-	<img src="$baseurl/view/theme/frost-mobile/images/message.png" class="nav-link">
-	</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	</div>
-	{{ endif }}
-
-{#<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->#}
-	<div class="nav-button-container">
-{#<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->#}
-	<img rel="#network-menu-list" class="nav-link" src="$baseurl/view/theme/frost-mobile/images/network.png">
-{#<!--	</a>-->#}
-	{{ if $nav.network }}
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	<ul id="network-menu-list" class="nav-menu-list">
-		{{ if $nav.network }}
-		<li>
-		<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-		</li>
-		{#<!--<span id="net-update" class="nav-ajax-left"></span>-->#}
-		{{ endif }}
-
-		{{ if $nav.network }}
-		<li>
-		<a class="nav-menu-icon network-reset-link nav-link" href="$nav.net_reset.0" title="$nav.net_reset.3">$nav.net_reset.1</a>
-		</li>
-		{{ endif }}
-
-		{{ if $nav.home }}
-		<li><a id="nav-home-link" class="$nav.home.2 $sel.home nav-load-page-link" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a></li>
-		{#<!--<span id="home-update" class="nav-ajax-left"></span>-->#}
-		{{ endif }}
-
-		{{ if $nav.community }}
-		<li>
-		<a id="nav-community-link" class="$nav.community.2 $sel.community nav-load-page-link" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-		</li>
-		{{ endif }}
-	</ul>
-	</div>
-
-	</span>
-	{#<!--<span id="nav-end"></span>-->#}
-	<span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/frost-mobile/photo_drop.tpl b/view/theme/frost-mobile/photo_drop.tpl
deleted file mode 100644
index d004fce977..0000000000
--- a/view/theme/frost-mobile/photo_drop.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<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>
-<div class="wall-item-delete-end"></div>
diff --git a/view/theme/frost-mobile/photo_edit.tpl b/view/theme/frost-mobile/photo_edit.tpl
deleted file mode 100644
index 4265f8c98c..0000000000
--- a/view/theme/frost-mobile/photo_edit.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-
-<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="$item_id" />
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
-	</div>
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
-	<input id="photo-edit-caption" type="text" size="32" name="desc" value="$caption" />
-	</div>
-
-	<div id="photo-edit-caption-end"></div>
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
-	<input name="newtag" id="photo-edit-newtag" size="32" title="$help_tags" type="text" />
-	</div>
-
-	<div id="photo-edit-tags-end"></div>
-
-	<div class="photo-edit-rotate-choice">
-	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">$rotatecw</label>
-	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
-	</div>
-
-	<div class="photo-edit-rotate-choice">
-	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">$rotateccw</label>
-	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="$permissions"/>
-			<span id="jot-perms-icon" class="icon $lockstate photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				$aclselect
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-
diff --git a/view/theme/frost-mobile/photo_edit_head.tpl b/view/theme/frost-mobile/photo_edit_head.tpl
deleted file mode 100644
index 4536dd5dfd..0000000000
--- a/view/theme/frost-mobile/photo_edit_head.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<script>
-	window.prevLink = "$prevlink";
-	window.nextLink = "$nextlink";
-	window.photoEdit = true;
-
-</script>
diff --git a/view/theme/frost-mobile/photo_view.tpl b/view/theme/frost-mobile/photo_view.tpl
deleted file mode 100644
index 92e115487a..0000000000
--- a/view/theme/frost-mobile/photo_view.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-<div id="photo-nav">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0"><img src="view/theme/frost-mobile/images/arrow-left.png"></a></div>{{ endif }}
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0"><img src="view/theme/frost-mobile/images/arrow-right.png"></a></div>{{ endif }}
-</div>
-<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}
-$edit
-{{ else }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-{{ endif }}
-
diff --git a/view/theme/frost-mobile/photos_head.tpl b/view/theme/frost-mobile/photos_head.tpl
deleted file mode 100644
index 8cd22d5b6d..0000000000
--- a/view/theme/frost-mobile/photos_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script>
-	window.isPublic = "$ispublic";
-</script>
-
diff --git a/view/theme/frost-mobile/photos_upload.tpl b/view/theme/frost-mobile/photos_upload.tpl
deleted file mode 100644
index 43dbcaad7b..0000000000
--- a/view/theme/frost-mobile/photos_upload.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-<h3>$pagename</h3>
-
-<div id="photos-usage-message">$usage</div>
-
-<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">$existalbumtext</div>
-		<select id="photos-upload-album-select" name="album">
-		$albumselect
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
-
-	$default_upload_box
-
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
-	</div>
-
-
-	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
-		<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
-		</a>
-	</div>
-	<div id="photos-upload-perms-end"></div>
-
-	<div style="display: none;">
-		<div id="photos-upload-permissions-wrapper">
-			$aclselect
-		</div>
-	</div>
-
-	<div id="photos-upload-spacer"></div>
-
-	$alt_uploader
-
-	$default_upload_submit
-
-	<div class="photos-upload-end" ></div>
-</form>
-
diff --git a/view/theme/frost-mobile/profed_end.tpl b/view/theme/frost-mobile/profed_end.tpl
deleted file mode 100644
index bf9b2a57a1..0000000000
--- a/view/theme/frost-mobile/profed_end.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<script type="text/javascript" src="js/country.min.js" ></script>
-
-<script language="javascript" type="text/javascript">
-	Fill_Country('$country_name');
-	Fill_States('$region');
-</script>
-
diff --git a/view/theme/frost-mobile/profed_head.tpl b/view/theme/frost-mobile/profed_head.tpl
deleted file mode 100644
index 83d22d1745..0000000000
--- a/view/theme/frost-mobile/profed_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-	window.editSelect = "none";
-</script>
-
diff --git a/view/theme/frost-mobile/profile_edit.tpl b/view/theme/frost-mobile/profile_edit.tpl
deleted file mode 100644
index 64dc2a2f27..0000000000
--- a/view/theme/frost-mobile/profile_edit.tpl
+++ /dev/null
@@ -1,322 +0,0 @@
-$default
-
-<h1>$banner</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
-<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
-<li></li>
-<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
-<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label>
-<input type="text" size="28" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
-<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
-<input type="text" size="28" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label>
-<input type="text" size="28" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
-<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
-<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="$hometown" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
-<input type="text" size="28" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
-<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
-<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
-<input type="text" size="28" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
-<input type="text" size="28" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
-<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
-<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" class="profile-jot-box">
-<p id="about-jot-desc" >
-$lbl_about
-</p>
-
-<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" class="profile-jot-box" >
-<p id="interest-jot-desc" >
-$lbl_hobbies
-</p>
-
-<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" class="profile-jot-box" >
-<p id="likes-jot-desc" >
-$lbl_likes
-</p>
-
-<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >$likes</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" class="profile-jot-box" >
-<p id="dislikes-jot-desc" >
-$lbl_dislikes
-</p>
-
-<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >$dislikes</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" class="profile-jot-box" >
-<p id="contact-jot-desc" >
-$lbl_social
-</p>
-
-<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" class="profile-jot-box" >
-<p id="music-jot-desc" >
-$lbl_music
-</p>
-
-<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" class="profile-jot-box" >
-<p id="book-jot-desc" >
-$lbl_book
-</p>
-
-<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" class="profile-jot-box" >
-<p id="tv-jot-desc" >
-$lbl_tv 
-</p>
-
-<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" class="profile-jot-box" >
-<p id="film-jot-desc" >
-$lbl_film
-</p>
-
-<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" class="profile-jot-box" >
-<p id="romance-jot-desc" >
-$lbl_love
-</p>
-
-<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" class="profile-jot-box" >
-<p id="work-jot-desc" >
-$lbl_work
-</p>
-
-<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" class="profile-jot-box" >
-<p id="education-jot-desc" >
-$lbl_school 
-</p>
-
-<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-
diff --git a/view/theme/frost-mobile/profile_photo.tpl b/view/theme/frost-mobile/profile_photo.tpl
deleted file mode 100644
index 42fc139f8f..0000000000
--- a/view/theme/frost-mobile/profile_photo.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<h1>$title</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="25" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="$submit">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-$select
-</div>
diff --git a/view/theme/frost-mobile/profile_vcard.tpl b/view/theme/frost-mobile/profile_vcard.tpl
deleted file mode 100644
index e91e6125ff..0000000000
--- a/view/theme/frost-mobile/profile_vcard.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="vcard">
-
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-
-	<div id="profile-vcard-break"></div>	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/frost-mobile/prv_message.tpl b/view/theme/frost-mobile/prv_message.tpl
deleted file mode 100644
index 27b2f39507..0000000000
--- a/view/theme/frost-mobile/prv_message.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-
-{{ if $showinputs }}
-<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$preid">
-{{ else }}
-$select
-{{ endif }}
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
-
-<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/frost-mobile/register.tpl b/view/theme/frost-mobile/register.tpl
deleted file mode 100644
index 041be5e96e..0000000000
--- a/view/theme/frost-mobile/register.tpl
+++ /dev/null
@@ -1,80 +0,0 @@
-<div class='register-form'>
-<h2>$regtitle</h2>
-<br />
-
-<form action="register" method="post" id="register-form">
-
-	<input type="hidden" name="photo" value="$photo" />
-
-	$registertext
-
-	<p id="register-realpeople">$realpeople</p>
-
-	<br />
-{{ 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>
-	</div>
-
-	<br /><br />
-
-{{ if $invitations }}
-
-	<p id="register-invite-desc">$invite_desc</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >$invite_label</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
-	</div>
-	<div id="register-name-end" ></div>
-
-{{ endif }}
-
-
-	<div id="register-name-wrapper" class="field input" >
-		<label for="register-name" id="label-register-name" >$namelabel</label><br />
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="$username" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper"  class="field input" >
-		<label for="register-email" id="label-register-email" >$addrlabel</label><br />
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="$email" >
-	</div>
-	<div id="register-email-end" ></div>
-
-	<div id="register-nickname-wrapper" class="field input" >
-		<label for="register-nickname" id="label-register-nickname" >$nicklabel</label><br />
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="$nickname" >
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >$nickdesc</p>
-	</div>
-
-	$publish
-
-	<div id="register-footer">
-<!--	<div class="agreement">
-	By clicking '$regbutt' you are agreeing to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-	</div>-->
-	<br />
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
-	</div>
-	<div id="register-submit-end" ></div>
-	</div>
-</form>
-<br /><br /><br />
-
-$license
-
-</div>
diff --git a/view/theme/frost-mobile/search_item.tpl b/view/theme/frost-mobile/search_item.tpl
deleted file mode 100644
index cec365dc80..0000000000
--- a/view/theme/frost-mobile/search_item.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<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$item.previewing" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			{#<!--<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				{#<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>-->#}
-			{#<!--<div class="wall-item-photo-end"></div>	-->#}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />{#<!--</div>-->#}
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		{#<!--<div class="wall-item-author">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
-				
-		{#<!--</div>			-->#}
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			{#<!--<div class="wall-item-title-end"></div>-->#}
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			{#<!--</div>-->#}
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			{#<!--<div class="wall-item-delete-end"></div>-->#}
-		</div>
-	</div>
-	{#<!--<div class="wall-item-wrapper-end"></div>-->#}
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-
-</div>
-
--->#}
diff --git a/view/theme/frost-mobile/settings-head.tpl b/view/theme/frost-mobile/settings-head.tpl
deleted file mode 100644
index 8cd22d5b6d..0000000000
--- a/view/theme/frost-mobile/settings-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script>
-	window.isPublic = "$ispublic";
-</script>
-
diff --git a/view/theme/frost-mobile/settings.tpl b/view/theme/frost-mobile/settings.tpl
deleted file mode 100644
index 8e5aff019b..0000000000
--- a/view/theme/frost-mobile/settings.tpl
+++ /dev/null
@@ -1,147 +0,0 @@
-<h1>$ptitle</h1>
-
-$nickname_block
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<h3 class="settings-heading">$h_pass</h3>
-
-{{inc field_password.tpl with $field=$password1 }}{{endinc}}
-{{inc field_password.tpl with $field=$password2 }}{{endinc}}
-{{inc field_password.tpl with $field=$password3 }}{{endinc}}
-
-{{ if $oid_enable }}
-{{inc field_input.tpl with $field=$openid }}{{endinc}}
-{{ endif }}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_basic</h3>
-
-{{inc field_input.tpl with $field=$username }}{{endinc}}
-{{inc field_input.tpl with $field=$email }}{{endinc}}
-{{inc field_password.tpl with $field=$password4 }}{{endinc}}
-{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
-{{inc field_input.tpl with $field=$defloc }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_prv</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-$hide_friends
-
-$hide_wall
-
-$blockwall
-
-$blocktags
-
-$suggestme
-
-$unkmail
-
-
-{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
-
-{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>$expire.advanced</h3>
-			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
-		</div>
-	</div>
-
-</div>
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
-	<div id="settings-default-perms-menu-end"></div>
-
-{#<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->#}
-	
-	<div style="display: none;">
-		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
-			$aclselect
-		</div>
-	</div>
-
-{#<!--	</div>-->#}
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-$group_select
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-
-<h3 class="settings-heading">$h_not</h3>
-<div id="settings-notifications">
-
-<div id="settings-activity-desc">$activity_options</div>
-
-{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
-
-
-<div id="settings-notify-desc">$lbl_not</div>
-
-<div class="group">
-{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
-</div>
-
-</div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_advn</h3>
-<div id="settings-pagetype-desc">$h_descadvn</div>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
diff --git a/view/theme/frost-mobile/settings_display_end.tpl b/view/theme/frost-mobile/settings_display_end.tpl
deleted file mode 100644
index 739c43b35a..0000000000
--- a/view/theme/frost-mobile/settings_display_end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-	<script>$j(function(){ previewTheme($j("#id_$theme.0")[0]); });</script>
-
diff --git a/view/theme/frost-mobile/smarty3/acl_selector.tpl b/view/theme/frost-mobile/smarty3/acl_selector.tpl
deleted file mode 100644
index d18776e367..0000000000
--- a/view/theme/frost-mobile/smarty3/acl_selector.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{{*
- *	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>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</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>
-
-<script>
-	window.allowCID = {{$allowcid}};
-	window.allowGID = {{$allowgid}};
-	window.denyCID = {{$denycid}};
-	window.denyGID = {{$denygid}};
-	window.aclInit = "true";
-</script>
diff --git a/view/theme/frost-mobile/smarty3/admin_aside.tpl b/view/theme/frost-mobile/smarty3/admin_aside.tpl
deleted file mode 100644
index 024d6195b5..0000000000
--- a/view/theme/frost-mobile/smarty3/admin_aside.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
-<ul class='admin linklist'>
-	<li class='admin button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
-	<li class='admin button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
-	<li class='admin button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
-	<li class='admin button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
-	<li class='admin button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
-</ul>
-
-{{if $admin.update}}
-<ul class='admin linklist'>
-	<li class='admin button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
-	<li class='admin button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
-</ul>
-{{/if}}
-
-
-{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
-<ul class='admin linklist'>
-	{{foreach $admin.plugins_admin as $l}}
-	<li class='admin button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
-	{{/foreach}}
-</ul>
-	
-	
-<h4>{{$logtxt}}</h4>
-<ul class='admin linklist'>
-	<li class='admin button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
-</ul>
-
diff --git a/view/theme/frost-mobile/smarty3/admin_site.tpl b/view/theme/frost-mobile/smarty3/admin_site.tpl
deleted file mode 100644
index 035024e689..0000000000
--- a/view/theme/frost-mobile/smarty3/admin_site.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-	{{include file="field_input.tpl" field=$sitename}}
-	{{include file="field_textarea.tpl" field=$banner}}
-	{{include file="field_select.tpl" field=$language}}
-	{{include file="field_select.tpl" field=$theme}}
-	{{include file="field_select.tpl" field=$theme_mobile}}
-	{{include file="field_select.tpl" field=$ssl_policy}}
-	{{include file="field_checkbox.tpl" field=$new_share}}
-	{{include file="field_checkbox.tpl" field=$hide_help}} 
-	{{include file="field_select.tpl" field=$singleuser}} 
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$registration}}</h3>
-	{{include file="field_input.tpl" field=$register_text}}
-	{{include file="field_select.tpl" field=$register_policy}}
-	
-	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
-	{{include file="field_checkbox.tpl" field=$no_openid}}
-	{{include file="field_checkbox.tpl" field=$no_regfullname}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-
-	<h3>{{$upload}}</h3>
-	{{include file="field_input.tpl" field=$maximagesize}}
-	{{include file="field_input.tpl" field=$maximagelength}}
-	{{include file="field_input.tpl" field=$jpegimagequality}}
-	
-	<h3>{{$corporate}}</h3>
-	{{include file="field_input.tpl" field=$allowed_sites}}
-	{{include file="field_input.tpl" field=$allowed_email}}
-	{{include file="field_checkbox.tpl" field=$block_public}}
-	{{include file="field_checkbox.tpl" field=$force_publish}}
-	{{include file="field_checkbox.tpl" field=$no_community_page}}
-	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
-	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
-	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
-	{{include file="field_checkbox.tpl" field=$dfrn_only}}
-	{{include file="field_input.tpl" field=$global_directory}}
-	{{include file="field_checkbox.tpl" field=$thread_allow}}
-	{{include file="field_checkbox.tpl" field=$newuser_private}}
-	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
-	{{include file="field_checkbox.tpl" field=$private_addons}}	
-	{{include file="field_checkbox.tpl" field=$disable_embedded}}	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$advanced}}</h3>
-	{{include file="field_checkbox.tpl" field=$no_utf}}
-	{{include file="field_checkbox.tpl" field=$verifyssl}}
-	{{include file="field_input.tpl" field=$proxy}}
-	{{include file="field_input.tpl" field=$proxyuser}}
-	{{include file="field_input.tpl" field=$timeout}}
-	{{include file="field_input.tpl" field=$delivery_interval}}
-	{{include file="field_input.tpl" field=$poll_interval}}
-	{{include file="field_input.tpl" field=$maxloadavg}}
-	{{include file="field_input.tpl" field=$abandon_days}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	</form>
-</div>
diff --git a/view/theme/frost-mobile/smarty3/admin_users.tpl b/view/theme/frost-mobile/smarty3/admin_users.tpl
deleted file mode 100644
index 4d88670c17..0000000000
--- a/view/theme/frost-mobile/smarty3/admin_users.tpl
+++ /dev/null
@@ -1,103 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("{{$confirm_delete_multi}}");
-	}
-	function selectall(cls){
-		$j("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		
-		<h3>{{$h_pending}}</h3>
-		{{if $pending}}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{foreach $pending as $u}}
-				<tr>
-					<td class="created">{{$u.created}}</td>
-					<td class="name">{{$u.name}}</td>
-					<td class="email">{{$u.email}}</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
-					</td>
-				</tr>
-			{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
-		{{else}}
-			<p>{{$no_pending}}</p>
-		{{/if}}
-	
-	
-		
-	
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
-						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
-						<td class='email'>{{$u.email}}</td>
-						<td class='register_date'>{{$u.register_date}}</td>
-						<td class='login_date'>{{$u.login_date}}</td>
-						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
-						<td class="checkbox"> 
-                                    {{if $u.is_admin}}
-                                        &nbsp;
-                                    {{else}}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
-                                    {{/if}}
-						<td class="tools">
-                                    {{if $u.is_admin}}
-                                        &nbsp;
-                                    {{else}}
-                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
-                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
-                                    {{/if}}
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-</div>
diff --git a/view/theme/frost-mobile/smarty3/categories_widget.tpl b/view/theme/frost-mobile/smarty3/categories_widget.tpl
deleted file mode 100644
index 1749fced3f..0000000000
--- a/view/theme/frost-mobile/smarty3/categories_widget.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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>
-	
-	<ul class="categories-ul">
-		<li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-			<li class="tool"><a href="{{$base}}?f=&category={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>-->*}}
diff --git a/view/theme/frost-mobile/smarty3/comment_item.tpl b/view/theme/frost-mobile/smarty3/comment_item.tpl
deleted file mode 100644
index 1b22ea9c6e..0000000000
--- a/view/theme/frost-mobile/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,83 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{*<!--		<script>
-		$(document).ready( function () {
-			$(document).mouseup(function(e) {
-				var container = $("#comment-edit-wrapper-{{$id}}");
-				if( container.has(e.target).length === 0) {
-					commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
-					cmtBbClose({{$id}});
-				}
-			});
-		});
-		</script>-->*}}
-
-		<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;" >
-			<form class="comment-edit-form {{$indent}}" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;" >
-{{*<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
-				<input type="hidden" name="type" value="{{$type}}" />
-				<input type="hidden" name="source" value="{{$sourceapp}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				{{*<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
-					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				{{*<!--</div>-->*}}
-				{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
-				<ul class="comment-edit-bb-{{$id}}">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="{{$edbold}}"
-						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="{{$editalic}}"
-						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="{{$eduline}}"
-						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="{{$edquote}}"
-						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="{{$edcode}}"
-						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
-{{*<!--					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="{{$edimg}}"
-						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="{{$edurl}}"
-						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="{{$edvideo}}"
-						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>-->*}}
-				</ul>	
-				{{*<!--<div class="comment-edit-bb-end"></div>-->*}}
-{{*<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
-				{{if $qcomment}}
-					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-					<option value=""></option>
-				{{foreach $qcomment as $qc}}
-					<option value="{{$qc}}">{{$qc}}</option>				
-				{{/foreach}}
-					</select>
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					{{*<!--<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="preview-link fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>-->*}}
-				</div>
-
-				{{*<!--<div class="comment-edit-end"></div>-->*}}
-			</form>
-
-		</div>
diff --git a/view/theme/frost-mobile/smarty3/common_tabs.tpl b/view/theme/frost-mobile/smarty3/common_tabs.tpl
deleted file mode 100644
index 9fa4ed41d9..0000000000
--- a/view/theme/frost-mobile/smarty3/common_tabs.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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>
-	{{/foreach}}
-	<div id="tabs-end"></div>
-</ul>
diff --git a/view/theme/frost-mobile/smarty3/contact_block.tpl b/view/theme/frost-mobile/smarty3/contact_block.tpl
deleted file mode 100644
index 5a0a26b87e..0000000000
--- a/view/theme/frost-mobile/smarty3/contact_block.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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}}
-		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
-		<div class='contact-block-content'>
-		{{foreach $micropro as $m}}
-			{{$m}}
-		{{/foreach}}
-		</div>
-{{/if}}
-</div>
-<div class="clear"></div>-->*}}
diff --git a/view/theme/frost-mobile/smarty3/contact_edit.tpl b/view/theme/frost-mobile/smarty3/contact_edit.tpl
deleted file mode 100644
index 924acb0c1a..0000000000
--- a/view/theme/frost-mobile/smarty3/contact_edit.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h2>{{$header}}</h2>
-
-<div id="contact-edit-wrapper" >
-
-	{{$tab_str}}
-
-	<div id="contact-edit-drop-link" >
-		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
-	</div>
-
-	<div id="contact-edit-drop-link-end"></div>
-
-	<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>
-	</div>
-
-
-	<div id="contact-edit-nav-wrapper" >
-		<div id="contact-edit-links">
-			<ul>
-				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
-				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
-				{{if $lost_contact}}
-					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
-				{{/if}}
-				{{if $insecure}}
-					<li><div id="insecure-message">{{$insecure}}</div></li>
-				{{/if}}
-				{{if $blocked}}
-					<li><div id="block-message">{{$blocked}}</div></li>
-				{{/if}}
-				{{if $ignored}}
-					<li><div id="ignore-message">{{$ignored}}</div></li>
-				{{/if}}
-				{{if $archived}}
-					<li><div id="archive-message">{{$archived}}</div></li>
-				{{/if}}
-
-				<li>&nbsp;</li>
-
-				{{if $common_text}}
-					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
-				{{/if}}
-				{{if $all_friends}}
-					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
-				{{/if}}
-
-
-				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
-				{{if $lblsuggest}}
-					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
-				{{/if}}
-
-			</ul>
-		</div>
-	</div>
-	<div id="contact-edit-nav-end"></div>
-
-
-<form action="contacts/{{$contact_id}}" method="post" >
-<input type="hidden" name="contact_id" value="{{$contact_id}}">
-
-	{{if $poll_enabled}}
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
-			<span id="contact-edit-poll-text">{{$updpub}} {{$poll_interval}}</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
-		</div>
-	{{/if}}
-	<div id="contact-edit-end" ></div>
-
-	{{include file="field_checkbox.tpl" field=$hidden}}
-
-<div id="contact-edit-info-wrapper">
-<h4>{{$lbl_info1}}</h4>
-	<textarea id="contact-edit-info" rows="8"{{* cols="35"*}} name="info">{{$info}}</textarea>
-	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-</div>
-<div id="contact-edit-info-end"></div>
-
-
-<div id="contact-edit-profile-select-text">
-<h4>{{$lbl_vis1}}</h4>
-<p>{{$lbl_vis2}}</p> 
-</div>
-{{$profile_select}}
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-
-</form>
-</div>
diff --git a/view/theme/frost-mobile/smarty3/contact_head.tpl b/view/theme/frost-mobile/smarty3/contact_head.tpl
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/theme/frost-mobile/smarty3/contact_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 7d257dabcc..0000000000
--- a/view/theme/frost-mobile/smarty3/contact_template.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{{*
- *	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" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
-		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}});" 
-		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
-
-{{*<!--			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>-->*}}
-			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">
-			<img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
-			</span>
-
-			{{if $contact.photo_menu}}
-{{*<!--			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>-->*}}
-                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
-                    <ul>
-						{{foreach $contact.photo_menu as $c}}
-						{{if $c.2}}
-						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-						{{else}}
-						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
-						{{/if}}
-						{{/foreach}}
-                    </ul>
-                </div>
-			{{/if}}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
-{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-	<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/frost-mobile/smarty3/contacts-end.tpl b/view/theme/frost-mobile/smarty3/contacts-end.tpl
deleted file mode 100644
index 9298a4245c..0000000000
--- a/view/theme/frost-mobile/smarty3/contacts-end.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index dd66b71d3e..0000000000
--- a/view/theme/frost-mobile/smarty3/contacts-head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-	window.autocompleteType = 'contacts-head';
-</script>
-
diff --git a/view/theme/frost-mobile/smarty3/contacts-template.tpl b/view/theme/frost-mobile/smarty3/contacts-template.tpl
deleted file mode 100644
index b9162c2e9e..0000000000
--- a/view/theme/frost-mobile/smarty3/contacts-template.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{*
- *	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}}
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="{{$cmd}}" method="get" >
-<span class="contacts-search-desc">{{$desc}}</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
-<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-{{$tabs}}
-
-
-<div id="contacts-display-wrapper">
-{{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
-{{/foreach}}
-</div>
-<div id="contact-edit-end"></div>
-
-{{$paginate}}
-
-
-
-
diff --git a/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl b/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl
deleted file mode 100644
index bda321896e..0000000000
--- a/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index f6810bb100..0000000000
--- a/view/theme/frost-mobile/smarty3/conversation.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$live_update}}
-
-{{foreach $threads as $thread}}
-<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
-	{{foreach $thread.items as $item}}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
-			</div>
-			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
-		{{/if}}
-		{{if $item.comment_lastcollapsed}}</div>{{/if}}
-		
-		{{include file="{{$item.template}}"}}
-		
-		
-	{{/foreach}}
-</div>
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
-{{*<!--{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}-->*}}
diff --git a/view/theme/frost-mobile/smarty3/cropbody.tpl b/view/theme/frost-mobile/smarty3/cropbody.tpl
deleted file mode 100644
index 5ace9a1aaf..0000000000
--- a/view/theme/frost-mobile/smarty3/cropbody.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-<p id="cropimage-desc">
-{{$desc}}
-</p>
-<div id="cropimage-wrapper">
-<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="{{$done}}" />
-</div>
-
-</form>
diff --git a/view/theme/frost-mobile/smarty3/cropend.tpl b/view/theme/frost-mobile/smarty3/cropend.tpl
deleted file mode 100644
index 7a828815b9..0000000000
--- a/view/theme/frost-mobile/smarty3/cropend.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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>
-      <script type="text/javascript" language="javascript">initCrop();</script>
diff --git a/view/theme/frost-mobile/smarty3/crophead.tpl b/view/theme/frost-mobile/smarty3/crophead.tpl
deleted file mode 100644
index 6438cfb354..0000000000
--- a/view/theme/frost-mobile/smarty3/crophead.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 17d17dd7db..0000000000
--- a/view/theme/frost-mobile/smarty3/display-head.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 435c190fb9..0000000000
--- a/view/theme/frost-mobile/smarty3/end.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{{*
- *	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]-->
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
-<script type="text/javascript">
-  tinyMCE.init({ mode : "none"});
-</script>-->*}}
-<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>-->*}}
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
-<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/acl.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/theme.min.js"></script>
-
diff --git a/view/theme/frost-mobile/smarty3/event.tpl b/view/theme/frost-mobile/smarty3/event.tpl
deleted file mode 100644
index 15c4e2b937..0000000000
--- a/view/theme/frost-mobile/smarty3/event.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{foreach $events as $event}}
-	<div class="event">
-	
-	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
-	{{$event.html}}
-	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
-	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link tool s22 pencil"></a>{{/if}}
-	</div>
-	<div class="clear"></div>
-{{/foreach}}
diff --git a/view/theme/frost-mobile/smarty3/event_end.tpl b/view/theme/frost-mobile/smarty3/event_end.tpl
deleted file mode 100644
index c275be9236..0000000000
--- a/view/theme/frost-mobile/smarty3/event_end.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 9d1c4b5f94..0000000000
--- a/view/theme/frost-mobile/smarty3/event_head.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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">
-window.aclType = 'event_head';
-</script>
-
diff --git a/view/theme/frost-mobile/smarty3/field_checkbox.tpl b/view/theme/frost-mobile/smarty3/field_checkbox.tpl
deleted file mode 100644
index f7f857f592..0000000000
--- a/view/theme/frost-mobile/smarty3/field_checkbox.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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>
-		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><br />
-		<span class='field_help' id='help_id_{{$field.0}}'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/frost-mobile/smarty3/field_input.tpl b/view/theme/frost-mobile/smarty3/field_input.tpl
deleted file mode 100644
index 240bed249f..0000000000
--- a/view/theme/frost-mobile/smarty3/field_input.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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 />
-		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/frost-mobile/smarty3/field_openid.tpl b/view/theme/frost-mobile/smarty3/field_openid.tpl
deleted file mode 100644
index d5ebd9a3b6..0000000000
--- a/view/theme/frost-mobile/smarty3/field_openid.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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 />
-		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/frost-mobile/smarty3/field_password.tpl b/view/theme/frost-mobile/smarty3/field_password.tpl
deleted file mode 100644
index f1352f27b2..0000000000
--- a/view/theme/frost-mobile/smarty3/field_password.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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 />
-		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/frost-mobile/smarty3/field_themeselect.tpl b/view/theme/frost-mobile/smarty3/field_themeselect.tpl
deleted file mode 100644
index 0d4552c3bf..0000000000
--- a/view/theme/frost-mobile/smarty3/field_themeselect.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-	<div class='field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5}}onchange="previewTheme(this);"{{/if}} >
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<span class='field_help'>{{$field.3}}</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/theme/frost-mobile/smarty3/generic_links_widget.tpl b/view/theme/frost-mobile/smarty3/generic_links_widget.tpl
deleted file mode 100644
index 705ddb57cb..0000000000
--- a/view/theme/frost-mobile/smarty3/generic_links_widget.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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}}
-	
-	<ul class="tabs links-widget">
-		{{foreach $items as $item}}
-			<li class="tool"><a href="{{$item.url}}" class="tab {{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
-		{{/foreach}}
-		<div id="tabs-end"></div>
-	</ul>
-	
-</div>
diff --git a/view/theme/frost-mobile/smarty3/group_drop.tpl b/view/theme/frost-mobile/smarty3/group_drop.tpl
deleted file mode 100644
index 2693228154..0000000000
--- a/view/theme/frost-mobile/smarty3/group_drop.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	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();" 
-		id="group-delete-icon-{{$id}}" 
-		class="icon drophide group-delete-icon" 
-		{{*onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);"*}} ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/frost-mobile/smarty3/head.tpl b/view/theme/frost-mobile/smarty3/head.tpl
deleted file mode 100644
index d11d072f26..0000000000
--- a/view/theme/frost-mobile/smarty3/head.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{{*
- *	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'>
-<meta content='320' name='MobileOptimized'>-->*}}
-<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
-{{*<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->*}}
-
-<base href="{{$baseurl}}/" />
-<meta name="generator" content="{{$generator}}" />
-{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->*}}
-<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
-
-<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
-
-<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
-<link rel="search"
-         href="{{$baseurl}}/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
-<script>
-	window.delItem = "{{$delitem}}";
-	window.commentEmptyText = "{{$comment}}";
-	window.showMore = "{{$showmore}}";
-	window.showFewer = "{{$showfewer}}";
-	var updateInterval = {{$update_interval}};
-	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
-</script>
-
diff --git a/view/theme/frost-mobile/smarty3/jot-end.tpl b/view/theme/frost-mobile/smarty3/jot-end.tpl
deleted file mode 100644
index 055ecc5e61..0000000000
--- a/view/theme/frost-mobile/smarty3/jot-end.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
-
-<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
-
diff --git a/view/theme/frost-mobile/smarty3/jot-header.tpl b/view/theme/frost-mobile/smarty3/jot-header.tpl
deleted file mode 100644
index bfaf3d5e06..0000000000
--- a/view/theme/frost-mobile/smarty3/jot-header.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	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
-	window.editSelect = {{$editselect}};
-	window.isPublic = "{{$ispublic}}";
-	window.nickname = "{{$nickname}}";
-	window.linkURL = "{{$linkurl}}";
-	window.vidURL = "{{$vidurl}}";
-	window.audURL = "{{$audurl}}";
-	window.whereAreU = "{{$whereareu}}";
-	window.term = "{{$term}}";
-	window.baseURL = "{{$baseurl}}";
-	window.geoTag = function () { {{$geotag}} }
-	window.jotId = "#profile-jot-text";
-	window.imageUploadButton = 'wall-image-upload';
-</script>
-
-
diff --git a/view/theme/frost-mobile/smarty3/jot.tpl b/view/theme/frost-mobile/smarty3/jot.tpl
deleted file mode 100644
index 1dcfc0b21c..0000000000
--- a/view/theme/frost-mobile/smarty3/jot.tpl
+++ /dev/null
@@ -1,96 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="{{$action}}" method="post" >
-		<input type="hidden" name="type" value="{{$ptyp}}" />
-		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-		<input type="hidden" name="return" value="{{$return_path}}" />
-		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="source" value="{{$sourceapp}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
-		{{if $placeholdercategory}}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
-		{{/if}}
-		<div id="jot-text-wrap">
-		{{*<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />-->*}}
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
-
-	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-	
-	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
-	</div> 
-
-	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->*}}
-	<div id="profile-link-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-link" class="icon link" title="{{$weblink}}" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	{{$jotplugins}}
-	</div>
-
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper">
-			{{$acl}}
-			<hr/>
-			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-			{{$jotnets}}
-			<div id="profile-jot-networks-end"></div>
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{if $content}}<script>window.jotInit = true;</script>{{/if}}
diff --git a/view/theme/frost-mobile/smarty3/jot_geotag.tpl b/view/theme/frost-mobile/smarty3/jot_geotag.tpl
deleted file mode 100644
index d828980e58..0000000000
--- a/view/theme/frost-mobile/smarty3/jot_geotag.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			var lat = position.coords.latitude.toFixed(4);
-			var lon = position.coords.longitude.toFixed(4);
-
-			$j('#jot-coord').val(lat + ', ' + lon);
-			$j('#profile-nolocation-wrapper').show();
-		});
-	}
-
diff --git a/view/theme/frost-mobile/smarty3/lang_selector.tpl b/view/theme/frost-mobile/smarty3/lang_selector.tpl
deleted file mode 100644
index a1aee8277f..0000000000
--- a/view/theme/frost-mobile/smarty3/lang_selector.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{foreach $langs.0 as $v=>$l}}
-				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
-			{{/foreach}}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/frost-mobile/smarty3/like_noshare.tpl b/view/theme/frost-mobile/smarty3/like_noshare.tpl
deleted file mode 100644
index 1ad1eeaeec..0000000000
--- a/view/theme/frost-mobile/smarty3/like_noshare.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	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="tool like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
-	{{if $nolike}}
-	<a href="#" class="tool dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
-	{{/if}}
-	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-</div>
diff --git a/view/theme/frost-mobile/smarty3/login.tpl b/view/theme/frost-mobile/smarty3/login.tpl
deleted file mode 100644
index a361f3e271..0000000000
--- a/view/theme/frost-mobile/smarty3/login.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div class="login-form">
-<form action="{{$dest_url}}" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{include file="field_input.tpl" field=$lname}}
-	{{include file="field_password.tpl" field=$lpassword}}
-	</div>
-	
-	{{if $openid}}
-			<div id="login_openid">
-			{{include file="field_openid.tpl" field=$lopenid}}
-			</div>
-	{{/if}}
-
-	<br />
-	<div id='login-footer'>
-<!--	<div class="login-extra-links">
-	By signing in you agree to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
-	</div>-->
-
-	<br />
-	{{include file="field_checkbox.tpl" field=$lremember}}
-
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
-	</div>
-
-	<br /><br />
-	<div class="login-extra-links">
-		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
-        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
-	</div>
-	</div>
-	
-	{{foreach $hiddens as $k=>$v}}
-		<input type="hidden" name="{{$k}}" value="{{$v}}" />
-	{{/foreach}}
-	
-	
-</form>
-</div>
-
-<script type="text/javascript">window.loginName = "{{$lname.0}}";</script>
diff --git a/view/theme/frost-mobile/smarty3/login_head.tpl b/view/theme/frost-mobile/smarty3/login_head.tpl
deleted file mode 100644
index c2d9504ad3..0000000000
--- a/view/theme/frost-mobile/smarty3/login_head.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 5a22c245bf..0000000000
--- a/view/theme/frost-mobile/smarty3/lostpass.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="lostpass-form">
-<h2>{{$title}}</h2>
-<br /><br /><br />
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper" class="field input">
-        <label for="login-name" id="label-login-name">{{$name}}</label><br />
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<p id="lostpass-desc">
-{{$desc}}
-</p>
-<br />
-
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-</div>
diff --git a/view/theme/frost-mobile/smarty3/mail_conv.tpl b/view/theme/frost-mobile/smarty3/mail_conv.tpl
deleted file mode 100644
index c6d9aa03af..0000000000
--- a/view/theme/frost-mobile/smarty3/mail_conv.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
-		<div class="mail-conv-date">{{$mail.date}}</div>
-		<div class="mail-conv-subject">{{$mail.subject}}</div>
-	</div>
-	<div class="mail-conv-body">{{$mail.body}}</div>
-</div>
-<div class="mail-conv-outside-wrapper-end"></div>
-
-
-<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a></div>
-<div class="mail-conv-delete-end"></div>
-
-<hr class="mail-conv-break" />
diff --git a/view/theme/frost-mobile/smarty3/mail_list.tpl b/view/theme/frost-mobile/smarty3/mail_list.tpl
deleted file mode 100644
index 0607c15c73..0000000000
--- a/view/theme/frost-mobile/smarty3/mail_list.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >{{$from_name}}</div>
-		<div class="mail-list-date">{{$date}}</div>
-		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
-		<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
-	</div>
-</div>
-</div>
-<div class="mail-list-delete-end"></div>
-
-<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/frost-mobile/smarty3/message-end.tpl b/view/theme/frost-mobile/smarty3/message-end.tpl
deleted file mode 100644
index 9298a4245c..0000000000
--- a/view/theme/frost-mobile/smarty3/message-end.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/theme/frost-mobile/smarty3/message-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index b2401ca483..0000000000
--- a/view/theme/frost-mobile/smarty3/moderated_comment.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-{{*
- *	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}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
-					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
-					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
-					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
-					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
-					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
-					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
-				</div>
-				<ul class="comment-edit-bb-{{$id}}">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="{{$edbold}}"
-						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="{{$editalic}}"
-						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="{{$eduline}}"
-						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="{{$edquote}}"
-						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="{{$edcode}}"
-						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="{{$edimg}}"
-						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="{{$edurl}}"
-						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="{{$edvideo}}"
-						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>			
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/frost-mobile/smarty3/msg-end.tpl b/view/theme/frost-mobile/smarty3/msg-end.tpl
deleted file mode 100644
index 594f3f79b9..0000000000
--- a/view/theme/frost-mobile/smarty3/msg-end.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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/msg-header.tpl b/view/theme/frost-mobile/smarty3/msg-header.tpl
deleted file mode 100644
index b0a0f79457..0000000000
--- a/view/theme/frost-mobile/smarty3/msg-header.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script language="javascript" type="text/javascript">
-	window.nickname = "{{$nickname}}";
-	window.linkURL = "{{$linkurl}}";
-	var plaintext = "none";
-	window.jotId = "#prvmail-text";
-	window.imageUploadButton = 'prvmail-upload';
-	window.autocompleteType = 'msg-header';
-</script>
-
diff --git a/view/theme/frost-mobile/smarty3/nav.tpl b/view/theme/frost-mobile/smarty3/nav.tpl
deleted file mode 100644
index 2c9f29d503..0000000000
--- a/view/theme/frost-mobile/smarty3/nav.tpl
+++ /dev/null
@@ -1,151 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<nav>
-{{*<!--	{{$langselector}} -->*}}
-
-{{*<!--	<div id="site-location">{{$sitelocation}}</div> -->*}}
-
-	<span id="nav-link-wrapper" >
-
-{{*<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->*}}
-	<div class="nav-button-container">
-{{*<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->*}}
-	<img rel="#system-menu-list" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/menu.png">
-{{*<!--	</a>-->*}}
-	<ul id="system-menu-list" class="nav-menu-list">
-		{{if $nav.login}}
-		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
-		{{/if}}
-
-		{{if $nav.register}}
-		<a id="nav-register-link" class="nav-load-page-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>
-		{{/if}}
-
-		{{if $nav.settings}}
-		<li><a id="nav-settings-link" class="{{$nav.settings.2}} nav-load-page-link" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>
-		{{/if}}
-
-		{{if $nav.manage}}
-		<li>
-		<a id="nav-manage-link" class="nav-load-page-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>
-		</li>
-		{{/if}}
-
-		{{if $nav.profiles}}
-		<li><a id="nav-profiles-link" class="{{$nav.profiles.2}} nav-load-page-link" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a></li>
-		{{/if}}
-
-		{{if $nav.admin}}
-		<li><a id="nav-admin-link" class="{{$nav.admin.2}} nav-load-page-link" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>
-		{{/if}}
-
-		<li><a id="nav-search-link" class="{{$nav.search.2}} nav-load-page-link" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a></li>
-
-		{{if $nav.apps}}
-		<li><a id="nav-apps-link" class="{{$nav.apps.2}} nav-load-page-link" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a></li>
-		{{/if}}
-
-		{{if $nav.help}}
-		<li><a id="nav-help-link" class="{{$nav.help.2}} nav-load-page-link" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>
-		{{/if}}
-		
-		{{if $nav.logout}}
-		<li><a id="nav-logout-link" class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
-		{{/if}}
-	</ul>
-	</div>
-
-	{{if $nav.notifications}}
-{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->*}}
-	<div class="nav-button-container">
-{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">-->*}}
-	<img rel="#nav-notifications-menu" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/notifications.png">
-{{*<!--	</a>-->*}}
-	<span id="notify-update" class="nav-ajax-left"></span>
-	<ul id="nav-notifications-menu" class="notifications-menu-popup">
-		<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
-		<li class="empty">{{$emptynotifications}}</li>
-	</ul>
-	</div>
-	{{/if}}		
-
-{{*<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->*}}
-	<div class="nav-button-container">
-{{*<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->*}}
-	<img rel="#contacts-menu-list"  class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/contacts.png">
-	{{*<!--</a>-->*}}
-	{{if $nav.introductions}}
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{/if}}
-	<ul id="contacts-menu-list" class="nav-menu-list">
-		{{if $nav.contacts}}
-		<li><a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><li>
-		{{/if}}
-
-		<li><a id="nav-directory-link" class="{{$nav.directory.2}} nav-load-page-link" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><li>
-
-		{{if $nav.introductions}}
-		<li>
-		<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
-		</li>
-		{{/if}}
-	</ul>
-	</div>
-
-	{{if $nav.messages}}
-{{*<!--	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->*}}
-	<div class="nav-button-container">
-	<a id="nav-messages-link" class="{{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
-	<img src="{{$baseurl}}/view/theme/frost-mobile/images/message.png" class="nav-link">
-	</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	</div>
-	{{/if}}
-
-{{*<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->*}}
-	<div class="nav-button-container">
-{{*<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->*}}
-	<img rel="#network-menu-list" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/network.png">
-{{*<!--	</a>-->*}}
-	{{if $nav.network}}
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{/if}}
-	<ul id="network-menu-list" class="nav-menu-list">
-		{{if $nav.network}}
-		<li>
-		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
-		</li>
-		{{*<!--<span id="net-update" class="nav-ajax-left"></span>-->*}}
-		{{/if}}
-
-		{{if $nav.network}}
-		<li>
-		<a class="nav-menu-icon network-reset-link nav-link" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">{{$nav.net_reset.1}}</a>
-		</li>
-		{{/if}}
-
-		{{if $nav.home}}
-		<li><a id="nav-home-link" class="{{$nav.home.2}} {{$sel.home}} nav-load-page-link" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a></li>
-		{{*<!--<span id="home-update" class="nav-ajax-left"></span>-->*}}
-		{{/if}}
-
-		{{if $nav.community}}
-		<li>
-		<a id="nav-community-link" class="{{$nav.community.2}} {{$sel.community}} nav-load-page-link" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
-		</li>
-		{{/if}}
-	</ul>
-	</div>
-
-	</span>
-	{{*<!--<span id="nav-end"></span>-->*}}
-	<span id="banner">{{$banner}}</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/frost-mobile/smarty3/photo_drop.tpl b/view/theme/frost-mobile/smarty3/photo_drop.tpl
deleted file mode 100644
index 96fa27880c..0000000000
--- a/view/theme/frost-mobile/smarty3/photo_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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>
-<div class="wall-item-delete-end"></div>
diff --git a/view/theme/frost-mobile/smarty3/photo_edit.tpl b/view/theme/frost-mobile/smarty3/photo_edit.tpl
deleted file mode 100644
index 87df97b4bf..0000000000
--- a/view/theme/frost-mobile/smarty3/photo_edit.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="{{$item_id}}" />
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
-	</div>
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
-	<input id="photo-edit-caption" type="text" size="32" name="desc" value="{{$caption}}" />
-	</div>
-
-	<div id="photo-edit-caption-end"></div>
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
-	<input name="newtag" id="photo-edit-newtag" size="32" title="{{$help_tags}}" type="text" />
-	</div>
-
-	<div id="photo-edit-tags-end"></div>
-
-	<div class="photo-edit-rotate-choice">
-	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">{{$rotatecw}}</label>
-	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
-	</div>
-
-	<div class="photo-edit-rotate-choice">
-	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">{{$rotateccw}}</label>
-	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="{{$permissions}}"/>
-			<span id="jot-perms-icon" class="icon {{$lockstate}} photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				{{$aclselect}}
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-
diff --git a/view/theme/frost-mobile/smarty3/photo_edit_head.tpl b/view/theme/frost-mobile/smarty3/photo_edit_head.tpl
deleted file mode 100644
index 857e6e63ac..0000000000
--- a/view/theme/frost-mobile/smarty3/photo_edit_head.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-	window.prevLink = "{{$prevlink}}";
-	window.nextLink = "{{$nextlink}}";
-	window.photoEdit = true;
-
-</script>
diff --git a/view/theme/frost-mobile/smarty3/photo_view.tpl b/view/theme/frost-mobile/smarty3/photo_view.tpl
deleted file mode 100644
index 354fb9c28b..0000000000
--- a/view/theme/frost-mobile/smarty3/photo_view.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{*
- *	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>
-
-<div id="photo-edit-link-wrap">
-{{if $tools}}
-<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
-|
-<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
-{{/if}}
-{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
-</div>
-
-<div id="photo-nav">
-	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><img src="view/theme/frost-mobile/images/arrow-left.png"></a></div>{{/if}}
-	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><img src="view/theme/frost-mobile/images/arrow-right.png"></a></div>{{/if}}
-</div>
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
-<div id="photo-photo-end"></div>
-<div id="photo-caption">{{$desc}}</div>
-{{if $tags}}
-<div id="in-this-photo-text">{{$tags.0}}</div>
-<div id="in-this-photo">{{$tags.1}}</div>
-{{/if}}
-{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
-
-{{if $edit}}
-{{$edit}}
-{{else}}
-
-{{if $likebuttons}}
-<div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
-</div>
-{{/if}}
-
-{{$comments}}
-
-{{$paginate}}
-{{/if}}
-
diff --git a/view/theme/frost-mobile/smarty3/photos_head.tpl b/view/theme/frost-mobile/smarty3/photos_head.tpl
deleted file mode 100644
index 5d7e0152da..0000000000
--- a/view/theme/frost-mobile/smarty3/photos_head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-	window.isPublic = "{{$ispublic}}";
-</script>
-
diff --git a/view/theme/frost-mobile/smarty3/photos_upload.tpl b/view/theme/frost-mobile/smarty3/photos_upload.tpl
deleted file mode 100644
index d0b5135cb7..0000000000
--- a/view/theme/frost-mobile/smarty3/photos_upload.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$pagename}}</h3>
-
-<div id="photos-usage-message">{{$usage}}</div>
-
-<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
-		<select id="photos-upload-album-select" name="album">
-		{{$albumselect}}
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
-
-	{{$default_upload_box}}
-
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
-	</div>
-
-
-	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
-		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
-		</a>
-	</div>
-	<div id="photos-upload-perms-end"></div>
-
-	<div style="display: none;">
-		<div id="photos-upload-permissions-wrapper">
-			{{$aclselect}}
-		</div>
-	</div>
-
-	<div id="photos-upload-spacer"></div>
-
-	{{$alt_uploader}}
-
-	{{$default_upload_submit}}
-
-	<div class="photos-upload-end" ></div>
-</form>
-
diff --git a/view/theme/frost-mobile/smarty3/profed_end.tpl b/view/theme/frost-mobile/smarty3/profed_end.tpl
deleted file mode 100644
index 048c52c44d..0000000000
--- a/view/theme/frost-mobile/smarty3/profed_end.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script type="text/javascript" src="js/country.min.js" ></script>
-
-<script language="javascript" type="text/javascript">
-	Fill_Country('{{$country_name}}');
-	Fill_States('{{$region}}');
-</script>
-
diff --git a/view/theme/frost-mobile/smarty3/profed_head.tpl b/view/theme/frost-mobile/smarty3/profed_head.tpl
deleted file mode 100644
index e4fef64d63..0000000000
--- a/view/theme/frost-mobile/smarty3/profed_head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script language="javascript" type="text/javascript">
-	window.editSelect = "none";
-</script>
-
diff --git a/view/theme/frost-mobile/smarty3/profile_edit.tpl b/view/theme/frost-mobile/smarty3/profile_edit.tpl
deleted file mode 100644
index 2a38795d66..0000000000
--- a/view/theme/frost-mobile/smarty3/profile_edit.tpl
+++ /dev/null
@@ -1,327 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$default}}
-
-<h1>{{$banner}}</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
-<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
-<li></li>
-<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
-<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
-<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
-<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-{{$gender}}
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
-<div id="profile-edit-dob" >
-{{$dob}} {{$age}}
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-{{$hide_friends}}
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
-<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
-<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
-<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
-<option selected="selected" >{{$country_name}}</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >{{$region}}</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
-<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
-{{$marital}}
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
-<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
-<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
-{{$sexual}}
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
-<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
-<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
-<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
-<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
-</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
-<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
-</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" class="profile-jot-box">
-<p id="about-jot-desc" >
-{{$lbl_about}}
-</p>
-
-<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" class="profile-jot-box" >
-<p id="interest-jot-desc" >
-{{$lbl_hobbies}}
-</p>
-
-<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" class="profile-jot-box" >
-<p id="likes-jot-desc" >
-{{$lbl_likes}}
-</p>
-
-<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" class="profile-jot-box" >
-<p id="dislikes-jot-desc" >
-{{$lbl_dislikes}}
-</p>
-
-<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" class="profile-jot-box" >
-<p id="contact-jot-desc" >
-{{$lbl_social}}
-</p>
-
-<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" class="profile-jot-box" >
-<p id="music-jot-desc" >
-{{$lbl_music}}
-</p>
-
-<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" class="profile-jot-box" >
-<p id="book-jot-desc" >
-{{$lbl_book}}
-</p>
-
-<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" class="profile-jot-box" >
-<p id="tv-jot-desc" >
-{{$lbl_tv}} 
-</p>
-
-<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" class="profile-jot-box" >
-<p id="film-jot-desc" >
-{{$lbl_film}}
-</p>
-
-<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" class="profile-jot-box" >
-<p id="romance-jot-desc" >
-{{$lbl_love}}
-</p>
-
-<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" class="profile-jot-box" >
-<p id="work-jot-desc" >
-{{$lbl_work}}
-</p>
-
-<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" class="profile-jot-box" >
-<p id="education-jot-desc" >
-{{$lbl_school}} 
-</p>
-
-<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-
diff --git a/view/theme/frost-mobile/smarty3/profile_photo.tpl b/view/theme/frost-mobile/smarty3/profile_photo.tpl
deleted file mode 100644
index 6bcb3cf850..0000000000
--- a/view/theme/frost-mobile/smarty3/profile_photo.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-{{*
- *	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">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">{{$lbl_upfile}} </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="25" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-{{$select}}
-</div>
diff --git a/view/theme/frost-mobile/smarty3/profile_vcard.tpl b/view/theme/frost-mobile/smarty3/profile_vcard.tpl
deleted file mode 100644
index 85c6345d6d..0000000000
--- a/view/theme/frost-mobile/smarty3/profile_vcard.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-
-	<div class="fn label">{{$profile.name}}</div>
-	
-				
-	
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
-
-
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-
-	<div id="profile-vcard-break"></div>	
-	<div id="profile-extra-links">
-		<ul>
-			{{if $connect}}
-				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-			{{/if}}
-			{{if $wallmessage}}
-				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block}}
-
-
diff --git a/view/theme/frost-mobile/smarty3/prv_message.tpl b/view/theme/frost-mobile/smarty3/prv_message.tpl
deleted file mode 100644
index 17699414e7..0000000000
--- a/view/theme/frost-mobile/smarty3/prv_message.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h3>{{$header}}</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-{{$parent}}
-
-<div id="prvmail-to-label">{{$to}}</div>
-
-{{if $showinputs}}
-<input type="text" id="recip" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
-{{else}}
-{{$select}}
-{{/if}}
-
-<div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
-
-<div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/frost-mobile/smarty3/register.tpl b/view/theme/frost-mobile/smarty3/register.tpl
deleted file mode 100644
index 3cd6dbda13..0000000000
--- a/view/theme/frost-mobile/smarty3/register.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class='register-form'>
-<h2>{{$regtitle}}</h2>
-<br />
-
-<form action="register" method="post" id="register-form">
-
-	<input type="hidden" name="photo" value="{{$photo}}" />
-
-	{{$registertext}}
-
-	<p id="register-realpeople">{{$realpeople}}</p>
-
-	<br />
-{{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>
-	</div>
-
-	<br /><br />
-
-{{if $invitations}}
-
-	<p id="register-invite-desc">{{$invite_desc}}</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
-	</div>
-	<div id="register-name-end" ></div>
-
-{{/if}}
-
-
-	<div id="register-name-wrapper" class="field input" >
-		<label for="register-name" id="label-register-name" >{{$namelabel}}</label><br />
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper"  class="field input" >
-		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label><br />
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
-	</div>
-	<div id="register-email-end" ></div>
-
-	<div id="register-nickname-wrapper" class="field input" >
-		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label><br />
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" >
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >{{$nickdesc}}</p>
-	</div>
-
-	{{$publish}}
-
-	<div id="register-footer">
-<!--	<div class="agreement">
-	By clicking '{{$regbutt}}' you are agreeing to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
-	</div>-->
-	<br />
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
-	</div>
-	<div id="register-submit-end" ></div>
-	</div>
-</form>
-<br /><br /><br />
-
-{{$license}}
-
-</div>
diff --git a/view/theme/frost-mobile/smarty3/search_item.tpl b/view/theme/frost-mobile/smarty3/search_item.tpl
deleted file mode 100644
index 21f4c1adce..0000000000
--- a/view/theme/frost-mobile/smarty3/search_item.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-{{*
- *	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}}{{$item.previewing}}" id="wall-item-content-wrapper-{{$item.id}}" >
-		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
-			{{*<!--<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
-				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>-->*}}
-			{{*<!--<div class="wall-item-photo-end"></div>	-->*}}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		{{*<!--<div class="wall-item-author">-->*}}
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
-				
-		{{*<!--</div>			-->*}}
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			{{*<!--<div class="wall-item-title-end"></div>-->*}}
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
-			{{if $item.has_cats}}
-			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			{{*<!--</div>-->*}}
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
-		</div>
-	</div>
-	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-
-{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
-
-</div>
-
--->*}}
diff --git a/view/theme/frost-mobile/smarty3/settings-head.tpl b/view/theme/frost-mobile/smarty3/settings-head.tpl
deleted file mode 100644
index 5d7e0152da..0000000000
--- a/view/theme/frost-mobile/smarty3/settings-head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-	window.isPublic = "{{$ispublic}}";
-</script>
-
diff --git a/view/theme/frost-mobile/smarty3/settings.tpl b/view/theme/frost-mobile/smarty3/settings.tpl
deleted file mode 100644
index 16a67039b2..0000000000
--- a/view/theme/frost-mobile/smarty3/settings.tpl
+++ /dev/null
@@ -1,152 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$ptitle}}</h1>
-
-{{$nickname_block}}
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<h3 class="settings-heading">{{$h_pass}}</h3>
-
-{{include file="field_password.tpl" field=$password1}}
-{{include file="field_password.tpl" field=$password2}}
-{{include file="field_password.tpl" field=$password3}}
-
-{{if $oid_enable}}
-{{include file="field_input.tpl" field=$openid}}
-{{/if}}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-<h3 class="settings-heading">{{$h_basic}}</h3>
-
-{{include file="field_input.tpl" field=$username}}
-{{include file="field_input.tpl" field=$email}}
-{{include file="field_password.tpl" field=$password4}}
-{{include file="field_custom.tpl" field=$timezone}}
-{{include file="field_input.tpl" field=$defloc}}
-{{include file="field_checkbox.tpl" field=$allowloc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-<h3 class="settings-heading">{{$h_prv}}</h3>
-
-
-<input type="hidden" name="visibility" value="{{$visibility}}" />
-
-{{include file="field_input.tpl" field=$maxreq}}
-
-{{$profile_in_dir}}
-
-{{$profile_in_net_dir}}
-
-{{$hide_friends}}
-
-{{$hide_wall}}
-
-{{$blockwall}}
-
-{{$blocktags}}
-
-{{$suggestme}}
-
-{{$unkmail}}
-
-
-{{include file="field_input.tpl" field=$cntunkmail}}
-
-{{include file="field_input.tpl" field=$expire.days}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="{{$expire.advanced}}">{{$expire.label}}</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>{{$expire.advanced}}</h3>
-			{{include file="field_yesno.tpl" field=$expire.items}}
-			{{include file="field_yesno.tpl" field=$expire.notes}}
-			{{include file="field_yesno.tpl" field=$expire.starred}}
-			{{include file="field_yesno.tpl" field=$expire.network_only}}
-		</div>
-	</div>
-
-</div>
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
-	<div id="settings-default-perms-menu-end"></div>
-
-{{*<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->*}}
-	
-	<div style="display: none;">
-		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
-			{{$aclselect}}
-		</div>
-	</div>
-
-{{*<!--	</div>-->*}}
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-{{$group_select}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-
-<h3 class="settings-heading">{{$h_not}}</h3>
-<div id="settings-notifications">
-
-<div id="settings-activity-desc">{{$activity_options}}</div>
-
-{{include file="field_checkbox.tpl" field=$post_newfriend}}
-{{include file="field_checkbox.tpl" field=$post_joingroup}}
-{{include file="field_checkbox.tpl" field=$post_profilechange}}
-
-
-<div id="settings-notify-desc">{{$lbl_not}}</div>
-
-<div class="group">
-{{include file="field_intcheckbox.tpl" field=$notify1}}
-{{include file="field_intcheckbox.tpl" field=$notify2}}
-{{include file="field_intcheckbox.tpl" field=$notify3}}
-{{include file="field_intcheckbox.tpl" field=$notify4}}
-{{include file="field_intcheckbox.tpl" field=$notify5}}
-{{include file="field_intcheckbox.tpl" field=$notify6}}
-{{include file="field_intcheckbox.tpl" field=$notify7}}
-{{include file="field_intcheckbox.tpl" field=$notify8}}
-</div>
-
-</div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-<h3 class="settings-heading">{{$h_advn}}</h3>
-<div id="settings-pagetype-desc">{{$h_descadvn}}</div>
-
-{{$pagetype}}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
diff --git a/view/theme/frost-mobile/smarty3/settings_display_end.tpl b/view/theme/frost-mobile/smarty3/settings_display_end.tpl
deleted file mode 100644
index 4b3db00f5a..0000000000
--- a/view/theme/frost-mobile/smarty3/settings_display_end.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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/suggest_friends.tpl b/view/theme/frost-mobile/smarty3/suggest_friends.tpl
deleted file mode 100644
index 8843d51284..0000000000
--- a/view/theme/frost-mobile/smarty3/suggest_friends.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	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}}">
-			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{if $connlnk}}
-	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-	{{/if}}
-	<a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
-</div>
diff --git a/view/theme/frost-mobile/smarty3/threaded_conversation.tpl b/view/theme/frost-mobile/smarty3/threaded_conversation.tpl
deleted file mode 100644
index bf6eab47af..0000000000
--- a/view/theme/frost-mobile/smarty3/threaded_conversation.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$live_update}}
-
-{{foreach $threads as $thread}}
-{{include file="{{$thread.template}}" item=$thread}}
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
-{{*<!--{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}-->*}}
diff --git a/view/theme/frost-mobile/smarty3/voting_fakelink.tpl b/view/theme/frost-mobile/smarty3/voting_fakelink.tpl
deleted file mode 100644
index 1e073916e1..0000000000
--- a/view/theme/frost-mobile/smarty3/voting_fakelink.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 18246114da..0000000000
--- a/view/theme/frost-mobile/smarty3/wall_thread.tpl
+++ /dev/null
@@ -1,131 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
-<a name="{{$item.id}}" ></a>
-{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
-			{{if $item.owner_url}}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
-			{{/if}}
-			{{*<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
-			{{*<!--<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">-->*}}
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                        {{$item.item_photo_menu}}
-                    </ul>
-                </div>-->*}}
-
-			{{*<!--</div>-->*}}
-			{{*<!--<div class="wall-item-photo-end"></div>-->*}}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		{{*<!--<div class="wall-item-author">-->*}}
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>				
-		{{*<!--</div>-->*}}
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			{{*<!--<div class="wall-item-title-end"></div>-->*}}
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-					{{*<!--<div class="body-tag">-->*}}
-						{{foreach $item.tags as $tag}}
-							<span class='body-tag tag'>{{$tag}}</span>
-						{{/foreach}}
-					{{*<!--</div>-->*}}
-			{{if $item.has_cats}}
-			<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{if $item.vote}}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-				{{if $item.vote.dislike}}
-				<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
-				{{/if}}
-				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
-				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-			</div>
-			{{/if}}
-			{{if $item.plink}}
-				{{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
-			{{/if}}
-			{{if $item.edpost}}
-				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-			{{/if}}
-			 
-			{{if $item.star}}
-			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
-			{{/if}}
-			{{if $item.tagger}}
-			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
-			{{/if}}
-			{{if $item.filer}}
-			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
-			{{/if}}			
-			
-			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></a>{{/if}}
-			{{*<!--</div>-->*}}
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
-		</div>
-	</div>	
-	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
-	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-
-	{{if $item.threaded}}
-	{{if $item.comment}}
-	{{*<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->*}}
-		{{$item.comment}}
-	{{*<!--</div>-->*}}
-	{{/if}}
-	{{/if}}
-
-{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
-{{*<!--</div>-->*}}
-{{foreach $item.children as $child}}
-	{{include file="{{$child.template}}" item=$child}}
-{{/foreach}}
-
-{{if $item.flatten}}
-{{*<!--<div class="wall-item-comment-wrapper" >-->*}}
-	{{$item.comment}}
-{{*<!--</div>-->*}}
-{{/if}}
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
-
diff --git a/view/theme/frost-mobile/smarty3/wallmsg-end.tpl b/view/theme/frost-mobile/smarty3/wallmsg-end.tpl
deleted file mode 100644
index 594f3f79b9..0000000000
--- a/view/theme/frost-mobile/smarty3/wallmsg-end.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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/wallmsg-header.tpl b/view/theme/frost-mobile/smarty3/wallmsg-header.tpl
deleted file mode 100644
index 5f65cc0014..0000000000
--- a/view/theme/frost-mobile/smarty3/wallmsg-header.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script language="javascript" type="text/javascript">
-window.editSelect = "none";
-window.jotId = "#prvmail-text";
-window.imageUploadButton = 'prvmail-upload';
-</script>
-
diff --git a/view/theme/frost-mobile/suggest_friends.tpl b/view/theme/frost-mobile/suggest_friends.tpl
deleted file mode 100644
index e0d1c29441..0000000000
--- a/view/theme/frost-mobile/suggest_friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" onError="this.src='../../../images/person-48.jpg';" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="$url" title="$name">$name</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{ if $connlnk }}
-	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
-	{{ endif }}
-	<a href="$ignlnk" title="$ignore" class="icon drophide profile-match-ignore" {#onmouseout="imgdull(this);" onmouseover="imgbright(this);" #}onclick="return confirmDelete();" ></a>
-</div>
diff --git a/view/theme/frost-mobile/threaded_conversation.tpl b/view/theme/frost-mobile/threaded_conversation.tpl
deleted file mode 100644
index 9d7f5c325c..0000000000
--- a/view/theme/frost-mobile/threaded_conversation.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-{{ inc $thread.template with $item=$thread }}{{ endinc }}
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{#<!--{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}-->#}
diff --git a/view/theme/frost-mobile/voting_fakelink.tpl b/view/theme/frost-mobile/voting_fakelink.tpl
deleted file mode 100644
index b66302cc27..0000000000
--- a/view/theme/frost-mobile/voting_fakelink.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="fakelink-wrapper"  id="$[type]list-$id-wrapper">$phrase</span>
diff --git a/view/theme/frost-mobile/wall_thread.tpl b/view/theme/frost-mobile/wall_thread.tpl
deleted file mode 100644
index 6d34602a79..0000000000
--- a/view/theme/frost-mobile/wall_thread.tpl
+++ /dev/null
@@ -1,126 +0,0 @@
-{{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-<a name="$item.id" ></a>
-{#<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" 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{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			{#<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->#}
-			{#<!--<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-				{#<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                        $item.item_photo_menu
-                    </ul>
-                </div>-->#}
-
-			{#<!--</div>-->#}
-			{#<!--<div class="wall-item-photo-end"></div>-->#}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />{#<!--</div>-->#}
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		{#<!--<div class="wall-item-author">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
-		{#<!--</div>-->#}
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			{#<!--<div class="wall-item-title-end"></div>-->#}
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					{#<!--<div class="body-tag">-->#}
-						{{ for $item.tags as $tag }}
-							<span class='body-tag tag'>$tag</span>
-						{{ endfor }}
-					{#<!--</div>-->#}
-			{{ if $item.has_cats }}
-			<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				{{ if $item.vote.dislike }}
-				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ endif }}
-				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				{#<!--<div class="wall-item-links-wrapper">-->#}<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a>{#<!--</div>-->#}
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-			 
-			{{ if $item.star }}
-			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			
-			
-			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);" #}></a>{{ endif }}
-			{#<!--</div>-->#}
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			{#<!--<div class="wall-item-delete-end"></div>-->#}
-		</div>
-	</div>	
-	{#<!--<div class="wall-item-wrapper-end"></div>-->#}
-	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
-
-	{{ if $item.threaded }}
-	{{ if $item.comment }}
-	{#<!--<div class="wall-item-comment-wrapper $item.indent" >-->#}
-		$item.comment
-	{#<!--</div>-->#}
-	{{ endif }}
-	{{ endif }}
-
-{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->#}
-{#<!--</div>-->#}
-{{ for $item.children as $child }}
-	{{ inc $child.template with $item=$child }}{{ endinc }}
-{{ endfor }}
-
-{{ if $item.flatten }}
-{#<!--<div class="wall-item-comment-wrapper" >-->#}
-	$item.comment
-{#<!--</div>-->#}
-{{ endif }}
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
-
diff --git a/view/theme/frost-mobile/wallmsg-end.tpl b/view/theme/frost-mobile/wallmsg-end.tpl
deleted file mode 100644
index 6074133798..0000000000
--- a/view/theme/frost-mobile/wallmsg-end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
diff --git a/view/theme/frost-mobile/wallmsg-header.tpl b/view/theme/frost-mobile/wallmsg-header.tpl
deleted file mode 100644
index 8ed5ea130d..0000000000
--- a/view/theme/frost-mobile/wallmsg-header.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-window.editSelect = "none";
-window.jotId = "#prvmail-text";
-window.imageUploadButton = 'prvmail-upload';
-</script>
-
diff --git a/view/theme/frost/acl_selector.tpl b/view/theme/frost/acl_selector.tpl
deleted file mode 100644
index df34a1a2ae..0000000000
--- a/view/theme/frost/acl_selector.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<div id="acl-wrapper">
-	<input id="acl-search">
-	<a href="#" id="acl-showall">$showall</a>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</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>
-
-<script>
-	window.allowCID = $allowcid;
-	window.allowGID = $allowgid;
-	window.denyCID = $denycid;
-	window.denyGID = $denygid;
-	window.aclInit = "true";
-</script>
diff --git a/view/theme/frost/admin_aside.tpl b/view/theme/frost/admin_aside.tpl
deleted file mode 100644
index da3ed23a88..0000000000
--- a/view/theme/frost/admin_aside.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<h4><a href="$admurl">$admtxt</a></h4>
-<ul class='admin linklist'>
-	<li class='admin button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
-	<li class='admin button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
-	<li class='admin button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
-	<li class='admin button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
-	<li class='admin button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
-</ul>
-
-{{ if $admin.update }}
-<ul class='admin linklist'>
-	<li class='admin button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
-	<li class='admin button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
-</ul>
-{{ endif }}
-
-
-{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
-<ul class='admin linklist'>
-	{{ for $admin.plugins_admin as $l }}
-	<li class='admin button $l.2'><a href='$l.0'>$l.1</a></li>
-	{{ endfor }}
-</ul>
-	
-	
-<h4>$logtxt</h4>
-<ul class='admin linklist'>
-	<li class='admin button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
-</ul>
-
diff --git a/view/theme/frost/admin_site.tpl b/view/theme/frost/admin_site.tpl
deleted file mode 100644
index 07a76a827d..0000000000
--- a/view/theme/frost/admin_site.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='$form_security_token'>
-
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} 
-	{{ inc field_select.tpl with $field=$singleuser }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$registration</h3>
-	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-
-	<h3>$upload</h3>
-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
-	
-	<h3>$corporate</h3>
-	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ostatus_poll_interval }}{{ endinc }} 
-	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }}	
-	{{ inc field_checkbox.tpl with $field=$disable_embedded }}{{ endinc }}	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$advanced</h3>
-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$lockpath }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$temppath }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$basepath }}{{ endinc }}
-
-	<h3>$performance</h3>
-	{{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
-
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	</form>
-</div>
diff --git a/view/theme/frost/admin_users.tpl b/view/theme/frost/admin_users.tpl
deleted file mode 100644
index a3f6d2416f..0000000000
--- a/view/theme/frost/admin_users.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$j("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='tool like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='tool dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
-						<td class="checkbox"> 
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-                                    {{ endif }}
-						<td class="tools">
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                        <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
-                                    {{ endif }}
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/frost/comment_item.tpl b/view/theme/frost/comment_item.tpl
deleted file mode 100755
index 5e0919c30f..0000000000
--- a/view/theme/frost/comment_item.tpl
+++ /dev/null
@@ -1,77 +0,0 @@
-{#<!--		<script>
-		$(document).ready( function () {
-			$(document).mouseup(function(e) {
-				var container = $("#comment-edit-wrapper-$id");
-				if( container.has(e.target).length === 0) {
-					commentClose(document.getElementById('comment-edit-text-$id'),$id);
-					cmtBbClose($id);
-				}
-			});
-		});
-		</script>-->#}
-
-		<div class="comment-wwedit-wrapper $indent" 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;">
-{#<!--			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">-->#}
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-{#<!--				<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->#}
-					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-{#<!--				</div>-->#}
-				{#<!--<div class="comment-edit-photo-end"></div>-->#}
-				<ul class="comment-edit-bb" id="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>	
-{#<!--				<div class="comment-edit-bb-end"></div>-->#}
-{#<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->#}
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" >$comment</textarea>
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				{#<!--<div class="comment-edit-end"></div>-->#}
-			</form>
-
-		</div>
diff --git a/view/theme/frost/contact_edit.tpl b/view/theme/frost/contact_edit.tpl
deleted file mode 100644
index f5710063a2..0000000000
--- a/view/theme/frost/contact_edit.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-wrapper" >
-
-	$tab_str
-
-	<div id="contact-edit-drop-link" >
-		<a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#}></a>
-	</div>
-
-	<div id="contact-edit-drop-link-end"></div>
-
-
-	<div id="contact-edit-nav-wrapper" >
-		<div id="contact-edit-links">
-			<ul>
-				<li><div id="contact-edit-rel">$relation_text</div></li>
-				<li><div id="contact-edit-nettype">$nettype</div></li>
-				{{ if $lost_contact }}
-					<li><div id="lost-contact-message">$lost_contact</div></li>
-				{{ endif }}
-				{{ if $insecure }}
-					<li><div id="insecure-message">$insecure</div></li>
-				{{ endif }}
-				{{ if $blocked }}
-					<li><div id="block-message">$blocked</div></li>
-				{{ endif }}
-				{{ if $ignored }}
-					<li><div id="ignore-message">$ignored</div></li>
-				{{ endif }}
-				{{ if $archived }}
-					<li><div id="archive-message">$archived</div></li>
-				{{ endif }}
-
-				<li>&nbsp;</li>
-
-				{{ if $common_text }}
-					<li><div id="contact-edit-common"><a href="$common_link">$common_text</a></div></li>
-				{{ endif }}
-				{{ if $all_friends }}
-					<li><div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div></li>
-				{{ endif }}
-
-
-				<li><a href="network/?cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
-				{{ if $lblsuggest }}
-					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
-				{{ endif }}
-
-			</ul>
-		</div>
-	</div>
-	<div id="contact-edit-nav-end"></div>
-
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-	{{ if $poll_enabled }}
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></div>
-			<span id="contact-edit-poll-text">$updpub</span> $poll_interval <span id="contact-edit-update-now" class="button"><a href="contacts/$contact_id/update" >$udnow</a></span>
-		</div>
-	{{ endif }}
-	<div id="contact-edit-end" ></div>
-
-	{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-
-<div id="contact-edit-info-wrapper">
-<h4>$lbl_info1</h4>
-	<textarea id="contact-edit-info" rows="8" cols="60" name="info">$info</textarea>
-	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-</div>
-<div id="contact-edit-info-end"></div>
-
-
-<div id="contact-edit-profile-select-text">
-<h4>$lbl_vis1</h4>
-<p>$lbl_vis2</p> 
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-
-</form>
-</div>
diff --git a/view/theme/frost/contact_end.tpl b/view/theme/frost/contact_end.tpl
deleted file mode 100644
index 95c78ba7da..0000000000
--- a/view/theme/frost/contact_end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script language="javascript" type="text/javascript">contactInitEditor();</script>
-
diff --git a/view/theme/frost/contact_head.tpl b/view/theme/frost/contact_head.tpl
deleted file mode 100644
index 7b89a20e71..0000000000
--- a/view/theme/frost/contact_head.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<script language="javascript" type="text/javascript">
-window.editSelect = "$editselect";
-</script>
-
diff --git a/view/theme/frost/contact_template.tpl b/view/theme/frost/contact_template.tpl
deleted file mode 100644
index dd3dbf7945..0000000000
--- a/view/theme/frost/contact_template.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-						{{ for $contact.photo_menu as $c }}
-						{{ if $c.2 }}
-						<li><a target="redir" href="$c.1">$c.0</a></li>
-						{{ else }}
-						<li><a href="$c.1">$c.0</a></li>
-						{{ endif }}
-						{{ endfor }}
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div><br />
-{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-	<div class="contact-entry-network" id="contact-entry-network-$contact.id" >$contact.network</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/frost/contacts-end.tpl b/view/theme/frost/contacts-end.tpl
deleted file mode 100644
index 820b1c6a0f..0000000000
--- a/view/theme/frost/contacts-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
-
-
diff --git a/view/theme/frost/contacts-head.tpl b/view/theme/frost/contacts-head.tpl
deleted file mode 100644
index 5ae97f9f0c..0000000000
--- a/view/theme/frost/contacts-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script>
-	window.autocompleteType = 'contacts-head';
-</script>
-
diff --git a/view/theme/frost/contacts-template.tpl b/view/theme/frost/contacts-template.tpl
deleted file mode 100644
index de89b5371e..0000000000
--- a/view/theme/frost/contacts-template.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<h1>$header{{ if $total }} ($total){{ endif }}</h1>
-
-{{ if $finding }}<h4>$finding</h4>{{ endif }}
-
-$tabs
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="$cmd" method="get" >
-<span class="contacts-search-desc">$desc</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-
-<div id="contacts-display-wrapper">
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
-</div>
-<div id="contact-edit-end"></div>
-
-$paginate
-
-
-
-
diff --git a/view/theme/frost/cropbody.tpl b/view/theme/frost/cropbody.tpl
deleted file mode 100644
index 3283084cad..0000000000
--- a/view/theme/frost/cropbody.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>$title</h1>
-<p id="cropimage-desc">
-$desc
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="$done" />
-</div>
-
-</form>
diff --git a/view/theme/frost/cropend.tpl b/view/theme/frost/cropend.tpl
deleted file mode 100644
index a56c71d92e..0000000000
--- a/view/theme/frost/cropend.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-      <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>
-      <script type="text/javascript" language="javascript">initCrop();</script>
diff --git a/view/theme/frost/crophead.tpl b/view/theme/frost/crophead.tpl
deleted file mode 100644
index 56e941e3ab..0000000000
--- a/view/theme/frost/crophead.tpl
+++ /dev/null
@@ -1 +0,0 @@
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/frost/display-head.tpl b/view/theme/frost/display-head.tpl
deleted file mode 100644
index 1fc82ae779..0000000000
--- a/view/theme/frost/display-head.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<script>
-	window.autoCompleteType = 'display-head';
-</script>
-
diff --git a/view/theme/frost/end.tpl b/view/theme/frost/end.tpl
deleted file mode 100644
index c88426bbf4..0000000000
--- a/view/theme/frost/end.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--[if IE]>
-<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-{#<!--<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>-->#}
-{#<!--<script type="text/javascript">
-  tinyMCE.init({ mode : "none"});
-</script>-->#}
-
-<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
-
-<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
-<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>
-{#<!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->#}
-<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-
-<script type="text/javascript" src="$baseurl/view/theme/frost/js/acl.min.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.min.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost/js/fk.autocomplete.min.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost/js/main.min.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost/js/theme.min.js"></script>
-
diff --git a/view/theme/frost/event.tpl b/view/theme/frost/event.tpl
deleted file mode 100644
index 67de85d5c8..0000000000
--- a/view/theme/frost/event.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ for $events as $event }}
-	<div class="event">
-	
-	{{ if $event.item.author_name }}<a href="$event.item.author_link" ><img src="$event.item.author_avatar" height="32" width="32" />$event.item.author_name</a>{{ endif }}
-	$event.html
-	{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{ endif }}
-	{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link tool s22 pencil"></a>{{ endif }}
-	</div>
-	<div class="clear"></div>
-{{ endfor }}
diff --git a/view/theme/frost/event_end.tpl b/view/theme/frost/event_end.tpl
deleted file mode 100644
index 8e8dcd33ab..0000000000
--- a/view/theme/frost/event_end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
-
-<script language="javascript" type="text/javascript">eventInitEditor();</script>
-
diff --git a/view/theme/frost/event_form.tpl b/view/theme/frost/event_form.tpl
deleted file mode 100644
index 36a22a8b2d..0000000000
--- a/view/theme/frost/event_form.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-<h3>$title</h3>
-
-<p>
-$desc
-</p>
-
-<form action="$post" method="post" >
-
-<input type="hidden" name="event_id" value="$eid" />
-<input type="hidden" name="cid" value="$cid" />
-<input type="hidden" name="uri" value="$uri" />
-
-<div id="event-start-text">$s_text</div>
-$s_dsel $s_tsel
-
-<div id="event-finish-text">$f_text</div>
-$f_dsel $f_tsel
-
-<div id="event-datetime-break"></div>
-
-<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" $n_checked /> <div id="event-nofinish-text">$n_text</div>
-
-<div id="event-nofinish-break"></div>
-
-<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" $a_checked /> <div id="event-adjust-text">$a_text</div>
-
-<div id="event-adjust-break"></div>
-
-<div id="event-summary-text">$t_text</div>
-<input type="text" id="event-summary" name="summary" value="$t_orig" />
-
-
-<div id="event-desc-text">$d_text</div>
-<textarea id="event-desc-textarea" rows="10" cols="70" name="desc">$d_orig</textarea>
-
-
-<div id="event-location-text">$l_text</div>
-<textarea id="event-location-textarea" rows="10" cols="70" name="location">$l_orig</textarea>
-<br />
-
-<input type="checkbox" name="share" value="1" id="event-share-checkbox" $sh_checked /> <div id="event-share-text">$sh_text</div>
-<div id="event-share-break"></div>
-
-$acl
-
-<div class="clear"></div>
-<input id="event-submit" type="submit" name="submit" value="$submit" />
-</form>
-
-
diff --git a/view/theme/frost/event_head.tpl b/view/theme/frost/event_head.tpl
deleted file mode 100644
index 44c6090fc1..0000000000
--- a/view/theme/frost/event_head.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
-
-<script language="javascript" type="text/javascript">
-window.aclType = 'event_head';
-window.editSelect = "$editselect";
-</script>
-
diff --git a/view/theme/frost/field_combobox.tpl b/view/theme/frost/field_combobox.tpl
deleted file mode 100644
index c454352d01..0000000000
--- a/view/theme/frost/field_combobox.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-	
-	<div class='field combobox'>
-		<label for='id_$field.0' id='id_$field.0_label'>$field.1</label>
-		{# html5 don't work on Chrome, Safari and IE9
-		<input id="id_$field.0" type="text" list="data_$field.0" >
-		<datalist id="data_$field.0" >
-		   {{ for $field.4 as $opt=>$val }}<option value="$val">{{ endfor }}
-		</datalist> #}
-		
-		<input id="id_$field.0" type="text" value="$field.2">
-		<select id="select_$field.0" onChange="$j('#id_$field.0').val($j(this).val())">
-			<option value="">$field.5</option>
-			{{ for $field.4 as $opt=>$val }}<option value="$val">$val</option>{{ endfor }}
-		</select>
-		
-		<span class='field_help'>$field.3</span>
-	</div>
-
diff --git a/view/theme/frost/field_input.tpl b/view/theme/frost/field_input.tpl
deleted file mode 100644
index 3c2149517f..0000000000
--- a/view/theme/frost/field_input.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label>
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/frost/field_openid.tpl b/view/theme/frost/field_openid.tpl
deleted file mode 100644
index a9f6cacad5..0000000000
--- a/view/theme/frost/field_openid.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input openid' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label>
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/frost/field_password.tpl b/view/theme/frost/field_password.tpl
deleted file mode 100644
index a329b11029..0000000000
--- a/view/theme/frost/field_password.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field password' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label>
-		<input type='password' name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/frost/field_themeselect.tpl b/view/theme/frost/field_themeselect.tpl
deleted file mode 100644
index d8ddc2fc74..0000000000
--- a/view/theme/frost/field_themeselect.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0' {{ if $field.5 }}onchange="previewTheme(this);"{{ endif }} >
-			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
-		</select>
-		<span class='field_help'>$field.3</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/theme/frost/filebrowser.tpl b/view/theme/frost/filebrowser.tpl
deleted file mode 100644
index 9fe3c04ffe..0000000000
--- a/view/theme/frost/filebrowser.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-	<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
-	<style>
-		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
-		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
-		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
-		.filebrowser ul{ list-style-type: none; padding:0px; }
-		.filebrowser.folders a { display: block; padding: 0.3em }
-		.filebrowser.folders a:hover { background-color: #f0f0ee; }
-		.filebrowser.files.image { overflow: auto; height: auto; }
-		.filebrowser.files.image img { height:100px;}
-		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
-		.filebrowser.files.image span { display: none;}
-		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
-		.filebrowser.files a { display: block;  padding: 0.3em}
-		.filebrowser.files a:hover { background-color: #f0f0ee; }
-		.filebrowser a { text-decoration: none; }
-	</style>
-	<script>
-		var FileBrowserDialogue = {
-			init : function () {
-				// Here goes your code for setting your custom things onLoad.
-			},
-			mySubmit : function (URL) {
-				//var URL = document.my_form.my_field.value;
-				var win = tinyMCEPopup.getWindowArg("window");
-
-				// insert information now
-				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
-
-				// are we an image browser
-				if (typeof(win.ImageDialog) != "undefined") {
-					// we are, so update image dimensions...
-					if (win.ImageDialog.getImageData)
-						win.ImageDialog.getImageData();
-
-					// ... and preview if necessary
-					if (win.ImageDialog.showPreviewImage)
-						win.ImageDialog.showPreviewImage(URL);
-				}
-
-				// close popup window
-				tinyMCEPopup.close();
-			}
-		}
-
-		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
-	</script>
-	</head>
-	<body>
-	
-	<div class="tabs">
-		<ul >
-			<li class="current"><span>FileBrowser</span></li>
-		</ul>
-	</div>
-	<div class="panel_wrapper">
-
-		<div id="general_panel" class="panel current">
-			<div class="filebrowser path">
-				{{ for $path as $p }}<a href="$p.0">$p.1</a>{{ endfor }}
-			</div>
-			<div class="filebrowser folders">
-				<ul>
-					{{ for $folders as $f }}<li><a href="$f.0/">$f.1</a></li>{{ endfor }}
-				</ul>
-			</div>
-			<div class="filebrowser files $type">
-				<ul>
-				{{ for $files as $f }}
-					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('$f.0'); return false;"><img src="$f.2"><span>$f.1</span></a></li>
-				{{ endfor }}
-				</ul>
-			</div>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<input type="button" id="cancel" name="cancel" value="$cancel" onclick="tinyMCEPopup.close();" />
-	</div>	
-	</body>
-	
-</html>
diff --git a/view/theme/frost/group_drop.tpl b/view/theme/frost/group_drop.tpl
deleted file mode 100644
index 959b77bb21..0000000000
--- a/view/theme/frost/group_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id?t=$form_security_token" 
-		onclick="return confirmDelete();" 
-		id="group-delete-icon-$id" 
-		class="icon drophide group-delete-icon" 
-		{#onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);"#} ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/frost/head.tpl b/view/theme/frost/head.tpl
deleted file mode 100644
index 3c25da46d0..0000000000
--- a/view/theme/frost/head.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl/" />
-<meta name="generator" content="$generator" />
-<link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
-{#<!--<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />-->#}
-<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
-
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-
-<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
-<link rel="search"
-         href="$baseurl/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
-<script>
-	window.delItem = "$delitem";
-	window.commentEmptyText = "$comment";
-	window.showMore = "$showmore";
-	window.showFewer = "$showfewer";
-	var updateInterval = $update_interval;
-	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
-</script>
diff --git a/view/theme/frost/jot-end.tpl b/view/theme/frost/jot-end.tpl
deleted file mode 100644
index 0ed2a3af6b..0000000000
--- a/view/theme/frost/jot-end.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
-<script language="javascript" type="text/javascript">if(typeof window.jotInit != 'undefined') initEditor();</script>
diff --git a/view/theme/frost/jot-header.tpl b/view/theme/frost/jot-header.tpl
deleted file mode 100644
index 5291907072..0000000000
--- a/view/theme/frost/jot-header.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<script>
-	window.editSelect = "$editselect";
-	window.isPublic = "$ispublic";
-	window.nickname = "$nickname";
-	window.linkURL = "$linkurl";
-	window.vidURL = "$vidurl";
-	window.audURL = "$audurl";
-	window.whereAreU = "$whereareu";
-	window.term = "$term";
-	window.baseURL = "$baseurl";
-	window.geoTag = function () { $geotag }
-	window.jotId = "#profile-jot-text";
-	window.imageUploadButton = 'wall-image-upload';
-	window.delItems = '$delitems';
-</script>
-
diff --git a/view/theme/frost/jot.tpl b/view/theme/frost/jot.tpl
deleted file mode 100644
index 96abeecba7..0000000000
--- a/view/theme/frost/jot.tpl
+++ /dev/null
@@ -1,91 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
-		{{ endif }}
-		<div id="jot-text-wrap">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div> 
-
-	{#<!--<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >-->#}
-	<div id="profile-link-wrapper" style="display: $visitor;" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-{#<!--	<span id="jot-display-location" style="display: none;"></span>-->#}
-
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{ if $content }}<script>window.jotInit = true;</script>{{ endif }}
diff --git a/view/theme/frost/jot_geotag.tpl b/view/theme/frost/jot_geotag.tpl
deleted file mode 100644
index 3f8bee91a7..0000000000
--- a/view/theme/frost/jot_geotag.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			var lat = position.coords.latitude.toFixed(4);
-			var lon = position.coords.longitude.toFixed(4);
-
-			$j('#jot-coord').val(lat + ', ' + lon);
-			$j('#profile-nolocation-wrapper').show();
-		});
-	}
-
diff --git a/view/theme/frost/lang_selector.tpl b/view/theme/frost/lang_selector.tpl
deleted file mode 100644
index e777a0a861..0000000000
--- a/view/theme/frost/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/frost/like_noshare.tpl b/view/theme/frost/like_noshare.tpl
deleted file mode 100644
index 5bf94f7df7..0000000000
--- a/view/theme/frost/like_noshare.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-	<a href="#" class="tool like" title="$likethis" onclick="dolike($id,'like'); return false"></a>
-	{{ if $nolike }}
-	<a href="#" class="tool dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
-	{{ endif }}
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
diff --git a/view/theme/frost/login.tpl b/view/theme/frost/login.tpl
deleted file mode 100644
index af315ac5e5..0000000000
--- a/view/theme/frost/login.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<div class="login-form">
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<br /><br />
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-
-<!--	<br /><br />
-	<div class="login-extra-links">
-	By signing in you agree to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-	</div>-->
-
-	<br /><br />
-	{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
-
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-
-	<br /><br />
-
-	<div class="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-</div>
-
-<script type="text/javascript">window.loginName = "$lname.0";</script>
diff --git a/view/theme/frost/login_head.tpl b/view/theme/frost/login_head.tpl
deleted file mode 100644
index 25339c327d..0000000000
--- a/view/theme/frost/login_head.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{#<!--<link rel="stylesheet" href="$baseurl/view/theme/frost/login-style.css" type="text/css" media="all" />-->#}
-
diff --git a/view/theme/frost/lostpass.tpl b/view/theme/frost/lostpass.tpl
deleted file mode 100644
index f2a802494e..0000000000
--- a/view/theme/frost/lostpass.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="lostpass-form">
-<h2>$title</h2>
-<br /><br /><br />
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper" class="field input">
-        <label for="login-name" id="label-login-name">$name</label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<p id="lostpass-desc">
-$desc
-</p>
-<br />
-
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-</div>
diff --git a/view/theme/frost/mail_conv.tpl b/view/theme/frost/mail_conv.tpl
deleted file mode 100644
index 97e814e1fb..0000000000
--- a/view/theme/frost/mail_conv.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<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>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
diff --git a/view/theme/frost/mail_list.tpl b/view/theme/frost/mail_list.tpl
deleted file mode 100644
index 5be7f38623..0000000000
--- a/view/theme/frost/mail_list.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<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>
-	</div>
-	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >$from_name</div>
-		<div class="mail-list-date">$date</div>
-		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
-		<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="icon drophide mail-list-delete	delete-icon" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
-	</div>
-</div>
-</div>
-<div class="mail-list-delete-end"></div>
-
-<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/frost/message-end.tpl b/view/theme/frost/message-end.tpl
deleted file mode 100644
index 820b1c6a0f..0000000000
--- a/view/theme/frost/message-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
-
-
diff --git a/view/theme/frost/message-head.tpl b/view/theme/frost/message-head.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/frost/moderated_comment.tpl b/view/theme/frost/moderated_comment.tpl
deleted file mode 100755
index b0451c8c60..0000000000
--- a/view/theme/frost/moderated_comment.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-		<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" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<div id="mod-cmnt-wrap-$id" class="mod-cmnt-wrap" style="display:none">
-					<div id="mod-cmnt-name-lbl-$id" class="mod-cmnt-name-lbl">$lbl_modname</div>
-					<input type="text" id="mod-cmnt-name-$id" class="mod-cmnt-name" name="mod-cmnt-name" value="$modname" />
-					<div id="mod-cmnt-email-lbl-$id" class="mod-cmnt-email-lbl">$lbl_modemail</div>
-					<input type="text" id="mod-cmnt-email-$id" class="mod-cmnt-email" name="mod-cmnt-email" value="$modemail" />
-					<div id="mod-cmnt-url-lbl-$id" class="mod-cmnt-url-lbl">$lbl_modurl</div>
-					<input type="text" id="mod-cmnt-url-$id" class="mod-cmnt-url" name="mod-cmnt-url" value="$modurl" />
-				</div>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>			
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/frost/msg-end.tpl b/view/theme/frost/msg-end.tpl
deleted file mode 100644
index 84448efd53..0000000000
--- a/view/theme/frost/msg-end.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
-<script language="javascript" type="text/javascript">msgInitEditor();</script>
diff --git a/view/theme/frost/msg-header.tpl b/view/theme/frost/msg-header.tpl
deleted file mode 100644
index c1eabcec74..0000000000
--- a/view/theme/frost/msg-header.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-	window.nickname = "$nickname";
-	window.linkURL = "$linkurl";
-	window.editSelect = "$editselect";
-	window.jotId = "#prvmail-text";
-	window.imageUploadButton = 'prvmail-upload';
-	window.autocompleteType = 'msg-header';
-</script>
-
diff --git a/view/theme/frost/nav.tpl b/view/theme/frost/nav.tpl
deleted file mode 100644
index 3c9a4102fb..0000000000
--- a/view/theme/frost/nav.tpl
+++ /dev/null
@@ -1,150 +0,0 @@
-<nav>
-	$langselector
-
-	<div id="site-location">$sitelocation</div>
-
-	<span id="nav-link-wrapper" >
-
-{#<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->#}
-	<div class="nav-button-container nav-menu-link" rel="#system-menu-list">
-	<a class="system-menu-link nav-link nav-menu-icon" href="$nav.settings.0" title="Main Menu" point="#system-menu-list">
-	<img class="system-menu-link" src="$baseurl/view/theme/frost/images/menu.png">
-	</a>
-	<ul id="system-menu-list" class="nav-menu-list" point="#system-menu-list">
-		{{ if $nav.login }}
-		<a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-		{{ endif }}
-
-		{{ if $nav.register }}
-		<a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
-		{{ endif }}
-
-		{{ if $nav.settings }}
-		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.manage }}
-		<li>
-		<a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
-		</li>
-		{{ endif }}
-
-		{{ if $nav.profiles }}
-		<li><a id="nav-profiles-link" class="$nav.profiles.2 nav-load-page-link" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.admin }}
-		<li><a id="nav-admin-link" class="$nav.admin.2 nav-load-page-link" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>
-		{{ endif }}
-
-		<li><a id="nav-search-link" class="$nav.search.2 nav-load-page-link" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
-
-		{{ if $nav.apps }}
-		<li><a id="nav-apps-link" class="$nav.apps.2 nav-load-page-link" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.help }}
-		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
-		{{ endif }}
-		
-		{{ if $nav.logout }}
-		<li><a id="nav-logout-link" class="$nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
-		{{ endif }}
-	</ul>
-	</div>
-
-	{{ if $nav.notifications }}
-{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->#}
-	<div class="nav-button-container">
-	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-	<img rel="#nav-notifications-menu" src="$baseurl/view/theme/frost/images/notifications.png">
-	</a>
-	<span id="notify-update" class="nav-ajax-left" rel="#nav-network-notifications-popup"></span>
-	<ul id="nav-notifications-menu" class="notifications-menu-popup">
-		<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-		<li class="empty">$emptynotifications</li>
-	</ul>
-	</div>
-	{{ endif }}		
-
-{#<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->#}
-	<div class="nav-button-container nav-menu-link" rel="#contacts-menu-list">
-	<a class="contacts-menu-link nav-link nav-menu-icon" href="$nav.contacts.0" title="Contacts" point="#contacts-menu-list">
-	<img class="contacts-menu-link" src="$baseurl/view/theme/frost/images/contacts.png">
-	</a>
-	{{ if $nav.introductions }}
-	<a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >
-	<span id="intro-update" class="nav-ajax-left"></span>
-	</a>
-	{{ endif }}
-	<ul id="contacts-menu-list" class="nav-menu-list" point="#contacts-menu-list">
-		{{ if $nav.contacts }}
-		<li><a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><li>
-		{{ endif }}
-
-		<li><a id="nav-directory-link" class="$nav.directory.2 nav-load-page-link" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a><li>
-
-		{{ if $nav.introductions }}
-		<li>
-		<a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-		</li>
-		{{ endif }}
-	</ul>
-	</div>
-
-	{{ if $nav.messages }}
-{#<!--	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->#}
-	<div class="nav-button-container">
-	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
-	<img src="$baseurl/view/theme/frost/images/message.png">
-	</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	</div>
-	{{ endif }}
-
-{#<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->#}
-	<div class="nav-button-container nav-menu-link" rel="#network-menu-list">
-	<a class="nav-menu-icon network-menu-link nav-link" href="$nav.network.0" title="Network" point="#network-menu-list">
-	<img class="network-menu-link" src="$baseurl/view/theme/frost/images/network.png">
-	</a>
-	{{ if $nav.network }}
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	<ul id="network-menu-list" class="nav-menu-list" point="#network-menu-list">
-		{{ if $nav.network }}
-		<li>
-		<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-		</li>
-		{#<!--<span id="net-update" class="nav-ajax-left"></span>-->#}
-		{{ endif }}
-
-		{{ if $nav.home }}
-		<li><a id="nav-home-link" class="$nav.home.2 $sel.home nav-load-page-link" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a></li>
-		{#<!--<span id="home-update" class="nav-ajax-left"></span>-->#}
-		{{ endif }}
-
-		{{ if $nav.community }}
-		<li>
-		<a id="nav-community-link" class="$nav.community.2 $sel.community nav-load-page-link" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-		</li>
-		{{ endif }}
-	</ul>
-	</div>
-
-	{{ if $nav.network }}
-	<div class="nav-button-container nav-menu-link" rel="#network-reset-button">
-	<a class="nav-menu-icon network-reset-link nav-link" href="$nav.net_reset.0" title="$nav.net_reset.3">
-	<img class="network-reset-link" src="$baseurl/view/theme/frost/images/net-reset.png">
-	</a>
-	</div>
-	{{ endif }}
-		
-	</span>
-	{#<!--<span id="nav-end"></span>-->#}
-	<span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/frost/photo_drop.tpl b/view/theme/frost/photo_drop.tpl
deleted file mode 100644
index f55e62344a..0000000000
--- a/view/theme/frost/photo_drop.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<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>
-<div class="wall-item-delete-end"></div>
diff --git a/view/theme/frost/photo_edit.tpl b/view/theme/frost/photo_edit.tpl
deleted file mode 100644
index 5ed3c1d036..0000000000
--- a/view/theme/frost/photo_edit.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-
-<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="$item_id" />
-
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
-	<input id="photo-edit-caption" type="text" size="32" name="desc" value="$caption" />
-
-	<div id="photo-edit-caption-end"></div>
-
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
-	<input name="newtag" id="photo-edit-newtag" size="32" title="$help_tags" type="text" />
-
-	<div id="photo-edit-tags-end"></div>
-	<div id="photo-edit-rotate-wrapper">
-		<div class="photo-edit-rotate-label">
-			$rotatecw
-		</div>
-		<input class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
-
-		<div class="photo-edit-rotate-label">
-			$rotateccw
-		</div>
-		<input class="photo-edit-rotate" type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="$permissions"/>
-			<span id="jot-perms-icon" class="icon $lockstate photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				$aclselect
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-{#<!--<script>
-	$("a#photo-edit-perms-menu").colorbox({
-		'inline' : true,
-		'transition' : 'none'
-	}); 
-</script>-->#}
diff --git a/view/theme/frost/photo_edit_head.tpl b/view/theme/frost/photo_edit_head.tpl
deleted file mode 100644
index 4536dd5dfd..0000000000
--- a/view/theme/frost/photo_edit_head.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<script>
-	window.prevLink = "$prevlink";
-	window.nextLink = "$nextlink";
-	window.photoEdit = true;
-
-</script>
diff --git a/view/theme/frost/photo_view.tpl b/view/theme/frost/photo_view.tpl
deleted file mode 100644
index 92e115487a..0000000000
--- a/view/theme/frost/photo_view.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-<div id="photo-nav">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0"><img src="view/theme/frost-mobile/images/arrow-left.png"></a></div>{{ endif }}
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0"><img src="view/theme/frost-mobile/images/arrow-right.png"></a></div>{{ endif }}
-</div>
-<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}
-$edit
-{{ else }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-{{ endif }}
-
diff --git a/view/theme/frost/photos_head.tpl b/view/theme/frost/photos_head.tpl
deleted file mode 100644
index 8cd22d5b6d..0000000000
--- a/view/theme/frost/photos_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script>
-	window.isPublic = "$ispublic";
-</script>
-
diff --git a/view/theme/frost/photos_upload.tpl b/view/theme/frost/photos_upload.tpl
deleted file mode 100644
index 1a41fcbdb0..0000000000
--- a/view/theme/frost/photos_upload.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-<h3>$pagename</h3>
-
-<div id="photos-usage-message">$usage</div>
-
-<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">$existalbumtext</div>
-		<select id="photos-upload-album-select" name="album" size="4">
-		$albumselect
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
-
-	<div id="photos-upload-choosefile-outer-wrapper">
-	$default_upload_box
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
-		<div id="photos-upload-noshare-label">
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
-		</div>
-	</div>
-
-	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="popupbox button" />
-		<span id="jot-perms-icon" class="icon $lockstate  photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
-		</a>
-	</div>
-	<div id="photos-upload-perms-end"></div>
-
-	<div style="display: none;">
-		<div id="photos-upload-permissions-wrapper">
-			$aclselect
-		</div>
-	</div>
-
-	<div id="photos-upload-spacer"></div>
-
-	$alt_uploader
-
-	$default_upload_submit
-
-	<div class="photos-upload-end" ></div>
-	</div>
-</form>
-
diff --git a/view/theme/frost/posted_date_widget.tpl b/view/theme/frost/posted_date_widget.tpl
deleted file mode 100644
index ce70b74255..0000000000
--- a/view/theme/frost/posted_date_widget.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="datebrowse-sidebar" class="widget">
-	<h3>$title</h3>
-<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
-<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($j(this).val());" size="$size">
-{{ for $dates as $d }}
-<option value="$url/$d.1/$d.2" >$d.0</option>
-{{ endfor }}
-</select>
-</div>
diff --git a/view/theme/frost/profed_end.tpl b/view/theme/frost/profed_end.tpl
deleted file mode 100644
index 73a08c1328..0000000000
--- a/view/theme/frost/profed_end.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<script type="text/javascript" src="js/country.min.js" ></script>
-
-<script language="javascript" type="text/javascript">
-profInitEditor();
-Fill_Country('$country_name');
-Fill_States('$region');
-</script>
-
diff --git a/view/theme/frost/profed_head.tpl b/view/theme/frost/profed_head.tpl
deleted file mode 100644
index 55fd5f4a76..0000000000
--- a/view/theme/frost/profed_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-	window.editSelect = "$editselect";
-</script>
-
diff --git a/view/theme/frost/profile_edit.tpl b/view/theme/frost/profile_edit.tpl
deleted file mode 100644
index 11b2a5b3a8..0000000000
--- a/view/theme/frost/profile_edit.tpl
+++ /dev/null
@@ -1,322 +0,0 @@
-$default
-
-<h1>$banner</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
-<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
-<li></li>
-<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
-<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label>
-<input type="text" size="28" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
-<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
-<input type="text" size="28" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label>
-<input type="text" size="28" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
-<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
-<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="$hometown" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
-<input type="text" size="28" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
-<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
-<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
-<input type="text" size="28" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
-<input type="text" size="28" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
-<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
-<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" class="profile-jot-box">
-<p id="about-jot-desc" >
-$lbl_about
-</p>
-
-<textarea rows="10" cols="70" id="profile-about-text" class="profile-edit-textarea" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" class="profile-jot-box" >
-<p id="interest-jot-desc" >
-$lbl_hobbies
-</p>
-
-<textarea rows="10" cols="70" id="interest-jot-text" class="profile-edit-textarea" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" class="profile-jot-box" >
-<p id="likes-jot-desc" >
-$lbl_likes
-</p>
-
-<textarea rows="10" cols="70" id="likes-jot-text" class="profile-edit-textarea" name="likes" >$likes</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" class="profile-jot-box" >
-<p id="dislikes-jot-desc" >
-$lbl_dislikes
-</p>
-
-<textarea rows="10" cols="70" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >$dislikes</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" class="profile-jot-box" >
-<p id="contact-jot-desc" >
-$lbl_social
-</p>
-
-<textarea rows="10" cols="70" id="contact-jot-text" class="profile-edit-textarea" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" class="profile-jot-box" >
-<p id="music-jot-desc" >
-$lbl_music
-</p>
-
-<textarea rows="10" cols="70" id="music-jot-text" class="profile-edit-textarea" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" class="profile-jot-box" >
-<p id="book-jot-desc" >
-$lbl_book
-</p>
-
-<textarea rows="10" cols="70" id="book-jot-text" class="profile-edit-textarea" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" class="profile-jot-box" >
-<p id="tv-jot-desc" >
-$lbl_tv 
-</p>
-
-<textarea rows="10" cols="70" id="tv-jot-text" class="profile-edit-textarea" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" class="profile-jot-box" >
-<p id="film-jot-desc" >
-$lbl_film
-</p>
-
-<textarea rows="10" cols="70" id="film-jot-text" class="profile-edit-textarea" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" class="profile-jot-box" >
-<p id="romance-jot-desc" >
-$lbl_love
-</p>
-
-<textarea rows="10" cols="70" id="romance-jot-text" class="profile-edit-textarea" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" class="profile-jot-box" >
-<p id="work-jot-desc" >
-$lbl_work
-</p>
-
-<textarea rows="10" cols="70" id="work-jot-text" class="profile-edit-textarea" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" class="profile-jot-box" >
-<p id="education-jot-desc" >
-$lbl_school 
-</p>
-
-<textarea rows="10" cols="70" id="education-jot-text" class="profile-edit-textarea" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-
diff --git a/view/theme/frost/profile_vcard.tpl b/view/theme/frost/profile_vcard.tpl
deleted file mode 100644
index e91e6125ff..0000000000
--- a/view/theme/frost/profile_vcard.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="vcard">
-
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-
-	<div id="profile-vcard-break"></div>	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/frost/prv_message.tpl b/view/theme/frost/prv_message.tpl
deleted file mode 100644
index 25d7e1116c..0000000000
--- a/view/theme/frost/prv_message.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-
-{{ if $showinputs }}
-<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$preid">
-{{ else }}
-$select
-{{ endif }}
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
-
-<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/frost/register.tpl b/view/theme/frost/register.tpl
deleted file mode 100644
index 15ce5040e2..0000000000
--- a/view/theme/frost/register.tpl
+++ /dev/null
@@ -1,80 +0,0 @@
-<div class='register-form'>
-<h2>$regtitle</h2>
-<br /><br />
-
-<form action="register" method="post" id="register-form">
-
-	<input type="hidden" name="photo" value="$photo" />
-
-	$registertext
-
-	<p id="register-realpeople">$realpeople</p>
-
-	<br />
-{{ 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>
-	</div>
-
-	<br /><br />
-
-{{ if $invitations }}
-
-	<p id="register-invite-desc">$invite_desc</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >$invite_label</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
-	</div>
-	<div id="register-name-end" ></div>
-
-{{ endif }}
-
-
-	<div id="register-name-wrapper" class="field input" >
-		<label for="register-name" id="label-register-name" >$namelabel</label>
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="$username" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper"  class="field input" >
-		<label for="register-email" id="label-register-email" >$addrlabel</label>
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="$email" >
-	</div>
-	<div id="register-email-end" ></div>
-	<br /><br />
-
-	<div id="register-nickname-wrapper" class="field input" >
-		<label for="register-nickname" id="label-register-nickname" >$nicklabel</label>
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="$nickname" >
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >$nickdesc</p>
-	</div>
-
-	$publish
-
-	<br />
-<!--	<br><br>
-	<div class="agreement">
-	By clicking '$regbutt' you are agreeing to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-	</div>-->
-	<br><br>
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
-	</div>
-	<div id="register-submit-end" ></div>
-</form>
-
-$license
-
-</div>
diff --git a/view/theme/frost/search_item.tpl b/view/theme/frost/search_item.tpl
deleted file mode 100644
index b78f05d661..0000000000
--- a/view/theme/frost/search_item.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<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$item.previewing" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				{#<!--<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">-->#}
-					<ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-						$item.item_photo_menu
-					</ul>
-				{#<!--</div>-->#}
-			</div>
-			{#<!--<div class="wall-item-photo-end"></div>	-->#}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />{#<!--</div>-->#}
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		{#<!--<div class="wall-item-author">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
-				
-		{#<!--</div>			-->#}
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			{#<!--<div class="wall-item-title-end"></div>-->#}
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			{#<!--</div>-->#}
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			{#<!--<div class="wall-item-delete-end"></div>-->#}
-		</div>
-	</div>
-	{#<!--<div class="wall-item-wrapper-end"></div>-->#}
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-
-</div>
-
--->#}
diff --git a/view/theme/frost/settings-head.tpl b/view/theme/frost/settings-head.tpl
deleted file mode 100644
index 8cd22d5b6d..0000000000
--- a/view/theme/frost/settings-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script>
-	window.isPublic = "$ispublic";
-</script>
-
diff --git a/view/theme/frost/settings_display_end.tpl b/view/theme/frost/settings_display_end.tpl
deleted file mode 100644
index 739c43b35a..0000000000
--- a/view/theme/frost/settings_display_end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-	<script>$j(function(){ previewTheme($j("#id_$theme.0")[0]); });</script>
-
diff --git a/view/theme/frost/smarty3/acl_selector.tpl b/view/theme/frost/smarty3/acl_selector.tpl
deleted file mode 100644
index d18776e367..0000000000
--- a/view/theme/frost/smarty3/acl_selector.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{{*
- *	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>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</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>
-
-<script>
-	window.allowCID = {{$allowcid}};
-	window.allowGID = {{$allowgid}};
-	window.denyCID = {{$denycid}};
-	window.denyGID = {{$denygid}};
-	window.aclInit = "true";
-</script>
diff --git a/view/theme/frost/smarty3/admin_aside.tpl b/view/theme/frost/smarty3/admin_aside.tpl
deleted file mode 100644
index 024d6195b5..0000000000
--- a/view/theme/frost/smarty3/admin_aside.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
-<ul class='admin linklist'>
-	<li class='admin button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
-	<li class='admin button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
-	<li class='admin button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
-	<li class='admin button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
-	<li class='admin button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
-</ul>
-
-{{if $admin.update}}
-<ul class='admin linklist'>
-	<li class='admin button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
-	<li class='admin button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
-</ul>
-{{/if}}
-
-
-{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
-<ul class='admin linklist'>
-	{{foreach $admin.plugins_admin as $l}}
-	<li class='admin button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
-	{{/foreach}}
-</ul>
-	
-	
-<h4>{{$logtxt}}</h4>
-<ul class='admin linklist'>
-	<li class='admin button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
-</ul>
-
diff --git a/view/theme/frost/smarty3/admin_site.tpl b/view/theme/frost/smarty3/admin_site.tpl
deleted file mode 100644
index af0eebacc6..0000000000
--- a/view/theme/frost/smarty3/admin_site.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-	{{include file="field_input.tpl" field=$sitename}}
-	{{include file="field_textarea.tpl" field=$banner}}
-	{{include file="field_select.tpl" field=$language}}
-	{{include file="field_select.tpl" field=$theme}}
-	{{include file="field_select.tpl" field=$theme_mobile}}
-	{{include file="field_select.tpl" field=$ssl_policy}}
-	{{include file="field_checkbox.tpl" field=$new_share}}
-	{{include file="field_checkbox.tpl" field=$hide_help}} 
-	{{include file="field_select.tpl" field=$singleuser}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$registration}}</h3>
-	{{include file="field_input.tpl" field=$register_text}}
-	{{include file="field_select.tpl" field=$register_policy}}
-	{{include file="field_input.tpl" field=$daily_registrations}}
-	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
-	{{include file="field_checkbox.tpl" field=$no_openid}}
-	{{include file="field_checkbox.tpl" field=$no_regfullname}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-
-	<h3>{{$upload}}</h3>
-	{{include file="field_input.tpl" field=$maximagesize}}
-	{{include file="field_input.tpl" field=$maximagelength}}
-	{{include file="field_input.tpl" field=$jpegimagequality}}
-	
-	<h3>{{$corporate}}</h3>
-	{{include file="field_input.tpl" field=$allowed_sites}}
-	{{include file="field_input.tpl" field=$allowed_email}}
-	{{include file="field_checkbox.tpl" field=$block_public}}
-	{{include file="field_checkbox.tpl" field=$force_publish}}
-	{{include file="field_checkbox.tpl" field=$no_community_page}}
-	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
-	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
-	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
-	{{include file="field_checkbox.tpl" field=$dfrn_only}}
-	{{include file="field_input.tpl" field=$global_directory}}
-	{{include file="field_checkbox.tpl" field=$thread_allow}}
-	{{include file="field_checkbox.tpl" field=$newuser_private}}
-	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
-	{{include file="field_checkbox.tpl" field=$private_addons}}	
-	{{include file="field_checkbox.tpl" field=$disable_embedded}}	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$advanced}}</h3>
-	{{include file="field_checkbox.tpl" field=$no_utf}}
-	{{include file="field_checkbox.tpl" field=$verifyssl}}
-	{{include file="field_input.tpl" field=$proxy}}
-	{{include file="field_input.tpl" field=$proxyuser}}
-	{{include file="field_input.tpl" field=$timeout}}
-	{{include file="field_input.tpl" field=$delivery_interval}}
-	{{include file="field_input.tpl" field=$poll_interval}}
-	{{include file="field_input.tpl" field=$maxloadavg}}
-	{{include file="field_input.tpl" field=$abandon_days}}
-	{{include file="field_input.tpl" field=$lockpath}}
-	{{include file="field_input.tpl" field=$temppath}}
-	{{include file="field_input.tpl" field=$basepath}}
-
-	<h3>{{$performance}}</h3>
-	{{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
-	{{include file="field_input.tpl" field=$itemcache}}
-	{{include file="field_input.tpl" field=$itemcache_duration}}
-
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	</form>
-</div>
diff --git a/view/theme/frost/smarty3/admin_users.tpl b/view/theme/frost/smarty3/admin_users.tpl
deleted file mode 100644
index 4d88670c17..0000000000
--- a/view/theme/frost/smarty3/admin_users.tpl
+++ /dev/null
@@ -1,103 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("{{$confirm_delete_multi}}");
-	}
-	function selectall(cls){
-		$j("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<form action="{{$baseurl}}/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		
-		<h3>{{$h_pending}}</h3>
-		{{if $pending}}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{foreach $pending as $u}}
-				<tr>
-					<td class="created">{{$u.created}}</td>
-					<td class="name">{{$u.name}}</td>
-					<td class="email">{{$u.email}}</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
-					</td>
-				</tr>
-			{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
-		{{else}}
-			<p>{{$no_pending}}</p>
-		{{/if}}
-	
-	
-		
-	
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
-						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
-						<td class='email'>{{$u.email}}</td>
-						<td class='register_date'>{{$u.register_date}}</td>
-						<td class='login_date'>{{$u.login_date}}</td>
-						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
-						<td class="checkbox"> 
-                                    {{if $u.is_admin}}
-                                        &nbsp;
-                                    {{else}}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
-                                    {{/if}}
-						<td class="tools">
-                                    {{if $u.is_admin}}
-                                        &nbsp;
-                                    {{else}}
-                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
-                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
-                                    {{/if}}
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-</div>
diff --git a/view/theme/frost/smarty3/comment_item.tpl b/view/theme/frost/smarty3/comment_item.tpl
deleted file mode 100644
index 4b18abce2e..0000000000
--- a/view/theme/frost/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,82 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{*<!--		<script>
-		$(document).ready( function () {
-			$(document).mouseup(function(e) {
-				var container = $("#comment-edit-wrapper-{{$id}}");
-				if( container.has(e.target).length === 0) {
-					commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
-					cmtBbClose({{$id}});
-				}
-			});
-		});
-		</script>-->*}}
-
-		<div class="comment-wwedit-wrapper {{$indent}}" 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;">
-{{*<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
-				<input type="hidden" name="type" value="{{$type}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-{{*<!--				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
-					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-{{*<!--				</div>-->*}}
-				{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
-				<ul class="comment-edit-bb" id="comment-edit-bb-{{$id}}">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="{{$edbold}}"
-						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="{{$editalic}}"
-						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="{{$eduline}}"
-						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="{{$edquote}}"
-						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="{{$edcode}}"
-						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="{{$edimg}}"
-						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="{{$edurl}}"
-						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="{{$edvideo}}"
-						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-				</ul>	
-{{*<!--				<div class="comment-edit-bb-end"></div>-->*}}
-{{*<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
-				{{if $qcomment}}
-					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-					<option value=""></option>
-				{{foreach $qcomment as $qc}}
-					<option value="{{$qc}}">{{$qc}}</option>				
-				{{/foreach}}
-					</select>
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				{{*<!--<div class="comment-edit-end"></div>-->*}}
-			</form>
-
-		</div>
diff --git a/view/theme/frost/smarty3/contact_edit.tpl b/view/theme/frost/smarty3/contact_edit.tpl
deleted file mode 100644
index 7105d0057e..0000000000
--- a/view/theme/frost/smarty3/contact_edit.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h2>{{$header}}</h2>
-
-<div id="contact-edit-wrapper" >
-
-	{{$tab_str}}
-
-	<div id="contact-edit-drop-link" >
-		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
-	</div>
-
-	<div id="contact-edit-drop-link-end"></div>
-
-
-	<div id="contact-edit-nav-wrapper" >
-		<div id="contact-edit-links">
-			<ul>
-				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
-				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
-				{{if $lost_contact}}
-					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
-				{{/if}}
-				{{if $insecure}}
-					<li><div id="insecure-message">{{$insecure}}</div></li>
-				{{/if}}
-				{{if $blocked}}
-					<li><div id="block-message">{{$blocked}}</div></li>
-				{{/if}}
-				{{if $ignored}}
-					<li><div id="ignore-message">{{$ignored}}</div></li>
-				{{/if}}
-				{{if $archived}}
-					<li><div id="archive-message">{{$archived}}</div></li>
-				{{/if}}
-
-				<li>&nbsp;</li>
-
-				{{if $common_text}}
-					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
-				{{/if}}
-				{{if $all_friends}}
-					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
-				{{/if}}
-
-
-				<li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
-				{{if $lblsuggest}}
-					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
-				{{/if}}
-
-			</ul>
-		</div>
-	</div>
-	<div id="contact-edit-nav-end"></div>
-
-
-<form action="contacts/{{$contact_id}}" method="post" >
-<input type="hidden" name="contact_id" value="{{$contact_id}}">
-
-	{{if $poll_enabled}}
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
-			<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}} <span id="contact-edit-update-now" class="button"><a href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
-		</div>
-	{{/if}}
-	<div id="contact-edit-end" ></div>
-
-	{{include file="field_checkbox.tpl" field=$hidden}}
-
-<div id="contact-edit-info-wrapper">
-<h4>{{$lbl_info1}}</h4>
-	<textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea>
-	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-</div>
-<div id="contact-edit-info-end"></div>
-
-
-<div id="contact-edit-profile-select-text">
-<h4>{{$lbl_vis1}}</h4>
-<p>{{$lbl_vis2}}</p> 
-</div>
-{{$profile_select}}
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-
-</form>
-</div>
diff --git a/view/theme/frost/smarty3/contact_end.tpl b/view/theme/frost/smarty3/contact_end.tpl
deleted file mode 100644
index 962f0c346e..0000000000
--- a/view/theme/frost/smarty3/contact_end.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script language="javascript" type="text/javascript">contactInitEditor();</script>
-
diff --git a/view/theme/frost/smarty3/contact_head.tpl b/view/theme/frost/smarty3/contact_head.tpl
deleted file mode 100644
index 959c4e2b41..0000000000
--- a/view/theme/frost/smarty3/contact_head.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script language="javascript" type="text/javascript">
-window.editSelect = "{{$editselect}}";
-</script>
-
diff --git a/view/theme/frost/smarty3/contact_template.tpl b/view/theme/frost/smarty3/contact_template.tpl
deleted file mode 100644
index 7eba7efeee..0000000000
--- a/view/theme/frost/smarty3/contact_template.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	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" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
-		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
-		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
-
-			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
-
-			{{if $contact.photo_menu}}
-			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
-                    <ul>
-						{{foreach $contact.photo_menu as $c}}
-						{{if $c.2}}
-						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-						{{else}}
-						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
-						{{/if}}
-						{{/foreach}}
-                    </ul>
-                </div>
-			{{/if}}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
-{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-	<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/frost/smarty3/contacts-end.tpl b/view/theme/frost/smarty3/contacts-end.tpl
deleted file mode 100644
index 9298a4245c..0000000000
--- a/view/theme/frost/smarty3/contacts-end.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index dd66b71d3e..0000000000
--- a/view/theme/frost/smarty3/contacts-head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-	window.autocompleteType = 'contacts-head';
-</script>
-
diff --git a/view/theme/frost/smarty3/contacts-template.tpl b/view/theme/frost/smarty3/contacts-template.tpl
deleted file mode 100644
index de33d141bb..0000000000
--- a/view/theme/frost/smarty3/contacts-template.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{*
- *	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}}
-
-{{$tabs}}
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="{{$cmd}}" method="get" >
-<span class="contacts-search-desc">{{$desc}}</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
-<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-
-<div id="contacts-display-wrapper">
-{{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
-{{/foreach}}
-</div>
-<div id="contact-edit-end"></div>
-
-{{$paginate}}
-
-
-
-
diff --git a/view/theme/frost/smarty3/cropbody.tpl b/view/theme/frost/smarty3/cropbody.tpl
deleted file mode 100644
index 5ace9a1aaf..0000000000
--- a/view/theme/frost/smarty3/cropbody.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-<p id="cropimage-desc">
-{{$desc}}
-</p>
-<div id="cropimage-wrapper">
-<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="{{$done}}" />
-</div>
-
-</form>
diff --git a/view/theme/frost/smarty3/cropend.tpl b/view/theme/frost/smarty3/cropend.tpl
deleted file mode 100644
index 7a828815b9..0000000000
--- a/view/theme/frost/smarty3/cropend.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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>
-      <script type="text/javascript" language="javascript">initCrop();</script>
diff --git a/view/theme/frost/smarty3/crophead.tpl b/view/theme/frost/smarty3/crophead.tpl
deleted file mode 100644
index 6438cfb354..0000000000
--- a/view/theme/frost/smarty3/crophead.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 17d17dd7db..0000000000
--- a/view/theme/frost/smarty3/display-head.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 7cdb2e3f7a..0000000000
--- a/view/theme/frost/smarty3/end.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{{*
- *	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]-->
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>-->*}}
-{{*<!--<script type="text/javascript">
-  tinyMCE.init({ mode : "none"});
-</script>-->*}}
-
-<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
-
-<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
-<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/fk.autocomplete.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/main.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/theme.min.js"></script>
-
diff --git a/view/theme/frost/smarty3/event.tpl b/view/theme/frost/smarty3/event.tpl
deleted file mode 100644
index 15c4e2b937..0000000000
--- a/view/theme/frost/smarty3/event.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{foreach $events as $event}}
-	<div class="event">
-	
-	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
-	{{$event.html}}
-	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
-	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link tool s22 pencil"></a>{{/if}}
-	</div>
-	<div class="clear"></div>
-{{/foreach}}
diff --git a/view/theme/frost/smarty3/event_end.tpl b/view/theme/frost/smarty3/event_end.tpl
deleted file mode 100644
index 813047e6ab..0000000000
--- a/view/theme/frost/smarty3/event_end.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	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>
-
-<script language="javascript" type="text/javascript">eventInitEditor();</script>
-
diff --git a/view/theme/frost/smarty3/event_form.tpl b/view/theme/frost/smarty3/event_form.tpl
deleted file mode 100644
index f4a9719ebb..0000000000
--- a/view/theme/frost/smarty3/event_form.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-
-<p>
-{{$desc}}
-</p>
-
-<form action="{{$post}}" method="post" >
-
-<input type="hidden" name="event_id" value="{{$eid}}" />
-<input type="hidden" name="cid" value="{{$cid}}" />
-<input type="hidden" name="uri" value="{{$uri}}" />
-
-<div id="event-start-text">{{$s_text}}</div>
-{{$s_dsel}} {{$s_tsel}}
-
-<div id="event-finish-text">{{$f_text}}</div>
-{{$f_dsel}} {{$f_tsel}}
-
-<div id="event-datetime-break"></div>
-
-<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
-
-<div id="event-nofinish-break"></div>
-
-<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div>
-
-<div id="event-adjust-break"></div>
-
-<div id="event-summary-text">{{$t_text}}</div>
-<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" />
-
-
-<div id="event-desc-text">{{$d_text}}</div>
-<textarea id="event-desc-textarea" rows="10" cols="70" name="desc">{{$d_orig}}</textarea>
-
-
-<div id="event-location-text">{{$l_text}}</div>
-<textarea id="event-location-textarea" rows="10" cols="70" name="location">{{$l_orig}}</textarea>
-<br />
-
-<input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
-<div id="event-share-break"></div>
-
-{{$acl}}
-
-<div class="clear"></div>
-<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
-</form>
-
-
diff --git a/view/theme/frost/smarty3/event_head.tpl b/view/theme/frost/smarty3/event_head.tpl
deleted file mode 100644
index ee23e43056..0000000000
--- a/view/theme/frost/smarty3/event_head.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	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">
-window.aclType = 'event_head';
-window.editSelect = "{{$editselect}}";
-</script>
-
diff --git a/view/theme/frost/smarty3/field_combobox.tpl b/view/theme/frost/smarty3/field_combobox.tpl
deleted file mode 100644
index 8f0e17619f..0000000000
--- a/view/theme/frost/smarty3/field_combobox.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	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>
-		{{* html5 don't work on Chrome, Safari and IE9
-		<input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" >
-		<datalist id="data_{{$field.0}}" >
-		   {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}}
-		</datalist> *}}
-		
-		<input id="id_{{$field.0}}" type="text" value="{{$field.2}}">
-		<select id="select_{{$field.0}}" onChange="$j('#id_{{$field.0}}').val($j(this).val())">
-			<option value="">{{$field.5}}</option>
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
-		</select>
-		
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
-
diff --git a/view/theme/frost/smarty3/field_input.tpl b/view/theme/frost/smarty3/field_input.tpl
deleted file mode 100644
index 0847961887..0000000000
--- a/view/theme/frost/smarty3/field_input.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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>
-		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/frost/smarty3/field_openid.tpl b/view/theme/frost/smarty3/field_openid.tpl
deleted file mode 100644
index ed94fad7a5..0000000000
--- a/view/theme/frost/smarty3/field_openid.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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>
-		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/frost/smarty3/field_password.tpl b/view/theme/frost/smarty3/field_password.tpl
deleted file mode 100644
index c88d3ef58a..0000000000
--- a/view/theme/frost/smarty3/field_password.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	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>
-		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/theme/frost/smarty3/field_themeselect.tpl b/view/theme/frost/smarty3/field_themeselect.tpl
deleted file mode 100644
index 0d4552c3bf..0000000000
--- a/view/theme/frost/smarty3/field_themeselect.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-	<div class='field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5}}onchange="previewTheme(this);"{{/if}} >
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<span class='field_help'>{{$field.3}}</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/theme/frost/smarty3/filebrowser.tpl b/view/theme/frost/smarty3/filebrowser.tpl
deleted file mode 100644
index c9e1df9749..0000000000
--- a/view/theme/frost/smarty3/filebrowser.tpl
+++ /dev/null
@@ -1,89 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<!DOCTYPE html>
-<html>
-	<head>
-	<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
-	<style>
-		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
-		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
-		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
-		.filebrowser ul{ list-style-type: none; padding:0px; }
-		.filebrowser.folders a { display: block; padding: 0.3em }
-		.filebrowser.folders a:hover { background-color: #f0f0ee; }
-		.filebrowser.files.image { overflow: auto; height: auto; }
-		.filebrowser.files.image img { height:100px;}
-		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
-		.filebrowser.files.image span { display: none;}
-		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
-		.filebrowser.files a { display: block;  padding: 0.3em}
-		.filebrowser.files a:hover { background-color: #f0f0ee; }
-		.filebrowser a { text-decoration: none; }
-	</style>
-	<script>
-		var FileBrowserDialogue = {
-			init : function () {
-				// Here goes your code for setting your custom things onLoad.
-			},
-			mySubmit : function (URL) {
-				//var URL = document.my_form.my_field.value;
-				var win = tinyMCEPopup.getWindowArg("window");
-
-				// insert information now
-				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
-
-				// are we an image browser
-				if (typeof(win.ImageDialog) != "undefined") {
-					// we are, so update image dimensions...
-					if (win.ImageDialog.getImageData)
-						win.ImageDialog.getImageData();
-
-					// ... and preview if necessary
-					if (win.ImageDialog.showPreviewImage)
-						win.ImageDialog.showPreviewImage(URL);
-				}
-
-				// close popup window
-				tinyMCEPopup.close();
-			}
-		}
-
-		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
-	</script>
-	</head>
-	<body>
-	
-	<div class="tabs">
-		<ul >
-			<li class="current"><span>FileBrowser</span></li>
-		</ul>
-	</div>
-	<div class="panel_wrapper">
-
-		<div id="general_panel" class="panel current">
-			<div class="filebrowser path">
-				{{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
-			</div>
-			<div class="filebrowser folders">
-				<ul>
-					{{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
-				</ul>
-			</div>
-			<div class="filebrowser files {{$type}}">
-				<ul>
-				{{foreach $files as $f}}
-					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
-				{{/foreach}}
-				</ul>
-			</div>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
-	</div>	
-	</body>
-	
-</html>
diff --git a/view/theme/frost/smarty3/group_drop.tpl b/view/theme/frost/smarty3/group_drop.tpl
deleted file mode 100644
index 2693228154..0000000000
--- a/view/theme/frost/smarty3/group_drop.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	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();" 
-		id="group-delete-icon-{{$id}}" 
-		class="icon drophide group-delete-icon" 
-		{{*onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);"*}} ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/frost/smarty3/head.tpl b/view/theme/frost/smarty3/head.tpl
deleted file mode 100644
index 095743e9b2..0000000000
--- a/view/theme/frost/smarty3/head.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{{*
- *	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}}" />
-<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
-{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->*}}
-<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
-
-<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
-
-<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
-<link rel="search"
-         href="{{$baseurl}}/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
-<script>
-	window.delItem = "{{$delitem}}";
-	window.commentEmptyText = "{{$comment}}";
-	window.showMore = "{{$showmore}}";
-	window.showFewer = "{{$showfewer}}";
-	var updateInterval = {{$update_interval}};
-	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
-</script>
diff --git a/view/theme/frost/smarty3/jot-end.tpl b/view/theme/frost/smarty3/jot-end.tpl
deleted file mode 100644
index ebbef166db..0000000000
--- a/view/theme/frost/smarty3/jot-end.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
-
-<script language="javascript" type="text/javascript">if(typeof window.jotInit != 'undefined') initEditor();</script>
diff --git a/view/theme/frost/smarty3/jot-header.tpl b/view/theme/frost/smarty3/jot-header.tpl
deleted file mode 100644
index 92a6aed1d8..0000000000
--- a/view/theme/frost/smarty3/jot-header.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-	window.editSelect = "{{$editselect}}";
-	window.isPublic = "{{$ispublic}}";
-	window.nickname = "{{$nickname}}";
-	window.linkURL = "{{$linkurl}}";
-	window.vidURL = "{{$vidurl}}";
-	window.audURL = "{{$audurl}}";
-	window.whereAreU = "{{$whereareu}}";
-	window.term = "{{$term}}";
-	window.baseURL = "{{$baseurl}}";
-	window.geoTag = function () { {{$geotag}} }
-	window.jotId = "#profile-jot-text";
-	window.imageUploadButton = 'wall-image-upload';
-	window.delItems = '{{$delitems}}';
-</script>
-
diff --git a/view/theme/frost/smarty3/jot.tpl b/view/theme/frost/smarty3/jot.tpl
deleted file mode 100644
index dc4f2cfe17..0000000000
--- a/view/theme/frost/smarty3/jot.tpl
+++ /dev/null
@@ -1,96 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="{{$action}}" method="post" >
-		<input type="hidden" name="type" value="{{$ptyp}}" />
-		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-		<input type="hidden" name="return" value="{{$return_path}}" />
-		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
-		{{if $placeholdercategory}}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
-		{{/if}}
-		<div id="jot-text-wrap">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
-
-	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-	
-	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
-	</div> 
-
-	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >-->*}}
-	<div id="profile-link-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
-		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	{{$jotplugins}}
-	</div>
-
-{{*<!--	<span id="jot-display-location" style="display: none;"></span>-->*}}
-
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			{{$acl}}
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-			<div id="profile-jot-email-end"></div>
-			{{$jotnets}}
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{if $content}}<script>window.jotInit = true;</script>{{/if}}
diff --git a/view/theme/frost/smarty3/jot_geotag.tpl b/view/theme/frost/smarty3/jot_geotag.tpl
deleted file mode 100644
index d828980e58..0000000000
--- a/view/theme/frost/smarty3/jot_geotag.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			var lat = position.coords.latitude.toFixed(4);
-			var lon = position.coords.longitude.toFixed(4);
-
-			$j('#jot-coord').val(lat + ', ' + lon);
-			$j('#profile-nolocation-wrapper').show();
-		});
-	}
-
diff --git a/view/theme/frost/smarty3/lang_selector.tpl b/view/theme/frost/smarty3/lang_selector.tpl
deleted file mode 100644
index a1aee8277f..0000000000
--- a/view/theme/frost/smarty3/lang_selector.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{foreach $langs.0 as $v=>$l}}
-				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
-			{{/foreach}}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/frost/smarty3/like_noshare.tpl b/view/theme/frost/smarty3/like_noshare.tpl
deleted file mode 100644
index 1ad1eeaeec..0000000000
--- a/view/theme/frost/smarty3/like_noshare.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	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="tool like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
-	{{if $nolike}}
-	<a href="#" class="tool dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
-	{{/if}}
-	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-</div>
diff --git a/view/theme/frost/smarty3/login.tpl b/view/theme/frost/smarty3/login.tpl
deleted file mode 100644
index 872f1455e7..0000000000
--- a/view/theme/frost/smarty3/login.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div class="login-form">
-<form action="{{$dest_url}}" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{include file="field_input.tpl" field=$lname}}
-	{{include file="field_password.tpl" field=$lpassword}}
-	</div>
-	
-	{{if $openid}}
-			<br /><br />
-			<div id="login_openid">
-			{{include file="field_openid.tpl" field=$lopenid}}
-			</div>
-	{{/if}}
-
-<!--	<br /><br />
-	<div class="login-extra-links">
-	By signing in you agree to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
-	</div>-->
-
-	<br /><br />
-	{{include file="field_checkbox.tpl" field=$lremember}}
-
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
-	</div>
-
-	<br /><br />
-
-	<div class="login-extra-links">
-		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
-        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
-	</div>
-	
-	{{foreach $hiddens as $k=>$v}}
-		<input type="hidden" name="{{$k}}" value="{{$v}}" />
-	{{/foreach}}
-	
-	
-</form>
-</div>
-
-<script type="text/javascript">window.loginName = "{{$lname.0}}";</script>
diff --git a/view/theme/frost/smarty3/login_head.tpl b/view/theme/frost/smarty3/login_head.tpl
deleted file mode 100644
index 5cac7bd1d7..0000000000
--- a/view/theme/frost/smarty3/login_head.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index bbcdbdb53a..0000000000
--- a/view/theme/frost/smarty3/lostpass.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="lostpass-form">
-<h2>{{$title}}</h2>
-<br /><br /><br />
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper" class="field input">
-        <label for="login-name" id="label-login-name">{{$name}}</label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<p id="lostpass-desc">
-{{$desc}}
-</p>
-<br />
-
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-</div>
diff --git a/view/theme/frost/smarty3/mail_conv.tpl b/view/theme/frost/smarty3/mail_conv.tpl
deleted file mode 100644
index effaa73c2a..0000000000
--- a/view/theme/frost/smarty3/mail_conv.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
-		<div class="mail-conv-date">{{$mail.date}}</div>
-		<div class="mail-conv-subject">{{$mail.subject}}</div>
-		<div class="mail-conv-body">{{$mail.body}}</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
diff --git a/view/theme/frost/smarty3/mail_list.tpl b/view/theme/frost/smarty3/mail_list.tpl
deleted file mode 100644
index 0607c15c73..0000000000
--- a/view/theme/frost/smarty3/mail_list.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >{{$from_name}}</div>
-		<div class="mail-list-date">{{$date}}</div>
-		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
-		<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
-	</div>
-</div>
-</div>
-<div class="mail-list-delete-end"></div>
-
-<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/frost/smarty3/message-end.tpl b/view/theme/frost/smarty3/message-end.tpl
deleted file mode 100644
index 9298a4245c..0000000000
--- a/view/theme/frost/smarty3/message-end.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index a7fb961089..0000000000
--- a/view/theme/frost/smarty3/message-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index b2401ca483..0000000000
--- a/view/theme/frost/smarty3/moderated_comment.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-{{*
- *	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}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
-					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
-					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
-					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
-					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
-					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
-					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
-				</div>
-				<ul class="comment-edit-bb-{{$id}}">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="{{$edbold}}"
-						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="{{$editalic}}"
-						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="{{$eduline}}"
-						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="{{$edquote}}"
-						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="{{$edcode}}"
-						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="{{$edimg}}"
-						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="{{$edurl}}"
-						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="{{$edvideo}}"
-						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>			
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/frost/smarty3/msg-end.tpl b/view/theme/frost/smarty3/msg-end.tpl
deleted file mode 100644
index 0115bfad40..0000000000
--- a/view/theme/frost/smarty3/msg-end.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
-
-<script language="javascript" type="text/javascript">msgInitEditor();</script>
diff --git a/view/theme/frost/smarty3/msg-header.tpl b/view/theme/frost/smarty3/msg-header.tpl
deleted file mode 100644
index bb7cac0e43..0000000000
--- a/view/theme/frost/smarty3/msg-header.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script language="javascript" type="text/javascript">
-	window.nickname = "{{$nickname}}";
-	window.linkURL = "{{$linkurl}}";
-	window.editSelect = "{{$editselect}}";
-	window.jotId = "#prvmail-text";
-	window.imageUploadButton = 'prvmail-upload';
-	window.autocompleteType = 'msg-header';
-</script>
-
diff --git a/view/theme/frost/smarty3/nav.tpl b/view/theme/frost/smarty3/nav.tpl
deleted file mode 100644
index db5f696baf..0000000000
--- a/view/theme/frost/smarty3/nav.tpl
+++ /dev/null
@@ -1,155 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<nav>
-	{{$langselector}}
-
-	<div id="site-location">{{$sitelocation}}</div>
-
-	<span id="nav-link-wrapper" >
-
-{{*<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->*}}
-	<div class="nav-button-container nav-menu-link" rel="#system-menu-list">
-	<a class="system-menu-link nav-link nav-menu-icon" href="{{$nav.settings.0}}" title="Main Menu" point="#system-menu-list">
-	<img class="system-menu-link" src="{{$baseurl}}/view/theme/frost/images/menu.png">
-	</a>
-	<ul id="system-menu-list" class="nav-menu-list" point="#system-menu-list">
-		{{if $nav.login}}
-		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
-		{{/if}}
-
-		{{if $nav.register}}
-		<a id="nav-register-link" class="nav-load-page-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>
-		{{/if}}
-
-		{{if $nav.settings}}
-		<li><a id="nav-settings-link" class="{{$nav.settings.2}} nav-load-page-link" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>
-		{{/if}}
-
-		{{if $nav.manage}}
-		<li>
-		<a id="nav-manage-link" class="nav-load-page-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>
-		</li>
-		{{/if}}
-
-		{{if $nav.profiles}}
-		<li><a id="nav-profiles-link" class="{{$nav.profiles.2}} nav-load-page-link" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a></li>
-		{{/if}}
-
-		{{if $nav.admin}}
-		<li><a id="nav-admin-link" class="{{$nav.admin.2}} nav-load-page-link" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>
-		{{/if}}
-
-		<li><a id="nav-search-link" class="{{$nav.search.2}} nav-load-page-link" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a></li>
-
-		{{if $nav.apps}}
-		<li><a id="nav-apps-link" class="{{$nav.apps.2}} nav-load-page-link" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a></li>
-		{{/if}}
-
-		{{if $nav.help}}
-		<li><a id="nav-help-link" class="{{$nav.help.2}} nav-load-page-link" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>
-		{{/if}}
-		
-		{{if $nav.logout}}
-		<li><a id="nav-logout-link" class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
-		{{/if}}
-	</ul>
-	</div>
-
-	{{if $nav.notifications}}
-{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->*}}
-	<div class="nav-button-container">
-	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">
-	<img rel="#nav-notifications-menu" src="{{$baseurl}}/view/theme/frost/images/notifications.png">
-	</a>
-	<span id="notify-update" class="nav-ajax-left" rel="#nav-network-notifications-popup"></span>
-	<ul id="nav-notifications-menu" class="notifications-menu-popup">
-		<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
-		<li class="empty">{{$emptynotifications}}</li>
-	</ul>
-	</div>
-	{{/if}}		
-
-{{*<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->*}}
-	<div class="nav-button-container nav-menu-link" rel="#contacts-menu-list">
-	<a class="contacts-menu-link nav-link nav-menu-icon" href="{{$nav.contacts.0}}" title="Contacts" point="#contacts-menu-list">
-	<img class="contacts-menu-link" src="{{$baseurl}}/view/theme/frost/images/contacts.png">
-	</a>
-	{{if $nav.introductions}}
-	<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >
-	<span id="intro-update" class="nav-ajax-left"></span>
-	</a>
-	{{/if}}
-	<ul id="contacts-menu-list" class="nav-menu-list" point="#contacts-menu-list">
-		{{if $nav.contacts}}
-		<li><a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><li>
-		{{/if}}
-
-		<li><a id="nav-directory-link" class="{{$nav.directory.2}} nav-load-page-link" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><li>
-
-		{{if $nav.introductions}}
-		<li>
-		<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
-		</li>
-		{{/if}}
-	</ul>
-	</div>
-
-	{{if $nav.messages}}
-{{*<!--	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->*}}
-	<div class="nav-button-container">
-	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
-	<img src="{{$baseurl}}/view/theme/frost/images/message.png">
-	</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	</div>
-	{{/if}}
-
-{{*<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->*}}
-	<div class="nav-button-container nav-menu-link" rel="#network-menu-list">
-	<a class="nav-menu-icon network-menu-link nav-link" href="{{$nav.network.0}}" title="Network" point="#network-menu-list">
-	<img class="network-menu-link" src="{{$baseurl}}/view/theme/frost/images/network.png">
-	</a>
-	{{if $nav.network}}
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{/if}}
-	<ul id="network-menu-list" class="nav-menu-list" point="#network-menu-list">
-		{{if $nav.network}}
-		<li>
-		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
-		</li>
-		{{*<!--<span id="net-update" class="nav-ajax-left"></span>-->*}}
-		{{/if}}
-
-		{{if $nav.home}}
-		<li><a id="nav-home-link" class="{{$nav.home.2}} {{$sel.home}} nav-load-page-link" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a></li>
-		{{*<!--<span id="home-update" class="nav-ajax-left"></span>-->*}}
-		{{/if}}
-
-		{{if $nav.community}}
-		<li>
-		<a id="nav-community-link" class="{{$nav.community.2}} {{$sel.community}} nav-load-page-link" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
-		</li>
-		{{/if}}
-	</ul>
-	</div>
-
-	{{if $nav.network}}
-	<div class="nav-button-container nav-menu-link" rel="#network-reset-button">
-	<a class="nav-menu-icon network-reset-link nav-link" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">
-	<img class="network-reset-link" src="{{$baseurl}}/view/theme/frost/images/net-reset.png">
-	</a>
-	</div>
-	{{/if}}
-		
-	</span>
-	{{*<!--<span id="nav-end"></span>-->*}}
-	<span id="banner">{{$banner}}</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/frost/smarty3/photo_drop.tpl b/view/theme/frost/smarty3/photo_drop.tpl
deleted file mode 100644
index 9b037d4cd9..0000000000
--- a/view/theme/frost/smarty3/photo_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	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>
-<div class="wall-item-delete-end"></div>
diff --git a/view/theme/frost/smarty3/photo_edit.tpl b/view/theme/frost/smarty3/photo_edit.tpl
deleted file mode 100644
index 890c829fa0..0000000000
--- a/view/theme/frost/smarty3/photo_edit.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="{{$item_id}}" />
-
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
-	<input id="photo-edit-caption" type="text" size="32" name="desc" value="{{$caption}}" />
-
-	<div id="photo-edit-caption-end"></div>
-
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
-	<input name="newtag" id="photo-edit-newtag" size="32" title="{{$help_tags}}" type="text" />
-
-	<div id="photo-edit-tags-end"></div>
-	<div id="photo-edit-rotate-wrapper">
-		<div class="photo-edit-rotate-label">
-			{{$rotatecw}}
-		</div>
-		<input class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
-
-		<div class="photo-edit-rotate-label">
-			{{$rotateccw}}
-		</div>
-		<input class="photo-edit-rotate" type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="{{$permissions}}"/>
-			<span id="jot-perms-icon" class="icon {{$lockstate}} photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				{{$aclselect}}
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-{{*<!--<script>
-	$("a#photo-edit-perms-menu").colorbox({
-		'inline' : true,
-		'transition' : 'none'
-	}); 
-</script>-->*}}
diff --git a/view/theme/frost/smarty3/photo_edit_head.tpl b/view/theme/frost/smarty3/photo_edit_head.tpl
deleted file mode 100644
index 857e6e63ac..0000000000
--- a/view/theme/frost/smarty3/photo_edit_head.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-	window.prevLink = "{{$prevlink}}";
-	window.nextLink = "{{$nextlink}}";
-	window.photoEdit = true;
-
-</script>
diff --git a/view/theme/frost/smarty3/photo_view.tpl b/view/theme/frost/smarty3/photo_view.tpl
deleted file mode 100644
index 354fb9c28b..0000000000
--- a/view/theme/frost/smarty3/photo_view.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{*
- *	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>
-
-<div id="photo-edit-link-wrap">
-{{if $tools}}
-<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
-|
-<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
-{{/if}}
-{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
-</div>
-
-<div id="photo-nav">
-	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><img src="view/theme/frost-mobile/images/arrow-left.png"></a></div>{{/if}}
-	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><img src="view/theme/frost-mobile/images/arrow-right.png"></a></div>{{/if}}
-</div>
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
-<div id="photo-photo-end"></div>
-<div id="photo-caption">{{$desc}}</div>
-{{if $tags}}
-<div id="in-this-photo-text">{{$tags.0}}</div>
-<div id="in-this-photo">{{$tags.1}}</div>
-{{/if}}
-{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
-
-{{if $edit}}
-{{$edit}}
-{{else}}
-
-{{if $likebuttons}}
-<div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
-</div>
-{{/if}}
-
-{{$comments}}
-
-{{$paginate}}
-{{/if}}
-
diff --git a/view/theme/frost/smarty3/photos_head.tpl b/view/theme/frost/smarty3/photos_head.tpl
deleted file mode 100644
index 5d7e0152da..0000000000
--- a/view/theme/frost/smarty3/photos_head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-	window.isPublic = "{{$ispublic}}";
-</script>
-
diff --git a/view/theme/frost/smarty3/photos_upload.tpl b/view/theme/frost/smarty3/photos_upload.tpl
deleted file mode 100644
index 4c829a2962..0000000000
--- a/view/theme/frost/smarty3/photos_upload.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$pagename}}</h3>
-
-<div id="photos-usage-message">{{$usage}}</div>
-
-<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
-		<select id="photos-upload-album-select" name="album" size="4">
-		{{$albumselect}}
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
-
-	<div id="photos-upload-choosefile-outer-wrapper">
-	{{$default_upload_box}}
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
-		<div id="photos-upload-noshare-label">
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
-		</div>
-	</div>
-
-	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="popupbox button" />
-		<span id="jot-perms-icon" class="icon {{$lockstate}}  photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
-		</a>
-	</div>
-	<div id="photos-upload-perms-end"></div>
-
-	<div style="display: none;">
-		<div id="photos-upload-permissions-wrapper">
-			{{$aclselect}}
-		</div>
-	</div>
-
-	<div id="photos-upload-spacer"></div>
-
-	{{$alt_uploader}}
-
-	{{$default_upload_submit}}
-
-	<div class="photos-upload-end" ></div>
-	</div>
-</form>
-
diff --git a/view/theme/frost/smarty3/posted_date_widget.tpl b/view/theme/frost/smarty3/posted_date_widget.tpl
deleted file mode 100644
index 6482f66559..0000000000
--- a/view/theme/frost/smarty3/posted_date_widget.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	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>
-<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($j(this).val());" size="{{$size}}">
-{{foreach $dates as $d}}
-<option value="{{$url}}/{{$d.1}}/{{$d.2}}" >{{$d.0}}</option>
-{{/foreach}}
-</select>
-</div>
diff --git a/view/theme/frost/smarty3/profed_end.tpl b/view/theme/frost/smarty3/profed_end.tpl
deleted file mode 100644
index dac8db42d5..0000000000
--- a/view/theme/frost/smarty3/profed_end.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script type="text/javascript" src="js/country.min.js" ></script>
-
-<script language="javascript" type="text/javascript">
-profInitEditor();
-Fill_Country('{{$country_name}}');
-Fill_States('{{$region}}');
-</script>
-
diff --git a/view/theme/frost/smarty3/profed_head.tpl b/view/theme/frost/smarty3/profed_head.tpl
deleted file mode 100644
index c8dbe562f9..0000000000
--- a/view/theme/frost/smarty3/profed_head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script language="javascript" type="text/javascript">
-	window.editSelect = "{{$editselect}}";
-</script>
-
diff --git a/view/theme/frost/smarty3/profile_edit.tpl b/view/theme/frost/smarty3/profile_edit.tpl
deleted file mode 100644
index 1d25a0d9d0..0000000000
--- a/view/theme/frost/smarty3/profile_edit.tpl
+++ /dev/null
@@ -1,327 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$default}}
-
-<h1>{{$banner}}</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
-<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
-<li></li>
-<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
-<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
-<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
-<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-{{$gender}}
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
-<div id="profile-edit-dob" >
-{{$dob}} {{$age}}
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-{{$hide_friends}}
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
-<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
-<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
-<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
-<option selected="selected" >{{$country_name}}</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >{{$region}}</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
-<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
-{{$marital}}
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
-<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
-<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
-{{$sexual}}
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
-<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
-<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
-<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
-<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
-</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
-<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
-</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" class="profile-jot-box">
-<p id="about-jot-desc" >
-{{$lbl_about}}
-</p>
-
-<textarea rows="10" cols="70" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" class="profile-jot-box" >
-<p id="interest-jot-desc" >
-{{$lbl_hobbies}}
-</p>
-
-<textarea rows="10" cols="70" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" class="profile-jot-box" >
-<p id="likes-jot-desc" >
-{{$lbl_likes}}
-</p>
-
-<textarea rows="10" cols="70" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" class="profile-jot-box" >
-<p id="dislikes-jot-desc" >
-{{$lbl_dislikes}}
-</p>
-
-<textarea rows="10" cols="70" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" class="profile-jot-box" >
-<p id="contact-jot-desc" >
-{{$lbl_social}}
-</p>
-
-<textarea rows="10" cols="70" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" class="profile-jot-box" >
-<p id="music-jot-desc" >
-{{$lbl_music}}
-</p>
-
-<textarea rows="10" cols="70" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" class="profile-jot-box" >
-<p id="book-jot-desc" >
-{{$lbl_book}}
-</p>
-
-<textarea rows="10" cols="70" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" class="profile-jot-box" >
-<p id="tv-jot-desc" >
-{{$lbl_tv}} 
-</p>
-
-<textarea rows="10" cols="70" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" class="profile-jot-box" >
-<p id="film-jot-desc" >
-{{$lbl_film}}
-</p>
-
-<textarea rows="10" cols="70" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" class="profile-jot-box" >
-<p id="romance-jot-desc" >
-{{$lbl_love}}
-</p>
-
-<textarea rows="10" cols="70" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" class="profile-jot-box" >
-<p id="work-jot-desc" >
-{{$lbl_work}}
-</p>
-
-<textarea rows="10" cols="70" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" class="profile-jot-box" >
-<p id="education-jot-desc" >
-{{$lbl_school}} 
-</p>
-
-<textarea rows="10" cols="70" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-
diff --git a/view/theme/frost/smarty3/profile_vcard.tpl b/view/theme/frost/smarty3/profile_vcard.tpl
deleted file mode 100644
index 85c6345d6d..0000000000
--- a/view/theme/frost/smarty3/profile_vcard.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-
-	<div class="fn label">{{$profile.name}}</div>
-	
-				
-	
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
-
-
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-
-	<div id="profile-vcard-break"></div>	
-	<div id="profile-extra-links">
-		<ul>
-			{{if $connect}}
-				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-			{{/if}}
-			{{if $wallmessage}}
-				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block}}
-
-
diff --git a/view/theme/frost/smarty3/prv_message.tpl b/view/theme/frost/smarty3/prv_message.tpl
deleted file mode 100644
index 363ca4e26c..0000000000
--- a/view/theme/frost/smarty3/prv_message.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h3>{{$header}}</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-{{$parent}}
-
-<div id="prvmail-to-label">{{$to}}</div>
-
-{{if $showinputs}}
-<input type="text" id="recip" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
-{{else}}
-{{$select}}
-{{/if}}
-
-<div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
-
-<div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/frost/smarty3/register.tpl b/view/theme/frost/smarty3/register.tpl
deleted file mode 100644
index 6cb4c6d859..0000000000
--- a/view/theme/frost/smarty3/register.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class='register-form'>
-<h2>{{$regtitle}}</h2>
-<br /><br />
-
-<form action="register" method="post" id="register-form">
-
-	<input type="hidden" name="photo" value="{{$photo}}" />
-
-	{{$registertext}}
-
-	<p id="register-realpeople">{{$realpeople}}</p>
-
-	<br />
-{{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>
-	</div>
-
-	<br /><br />
-
-{{if $invitations}}
-
-	<p id="register-invite-desc">{{$invite_desc}}</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
-	</div>
-	<div id="register-name-end" ></div>
-
-{{/if}}
-
-
-	<div id="register-name-wrapper" class="field input" >
-		<label for="register-name" id="label-register-name" >{{$namelabel}}</label>
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper"  class="field input" >
-		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
-	</div>
-	<div id="register-email-end" ></div>
-	<br /><br />
-
-	<div id="register-nickname-wrapper" class="field input" >
-		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" >
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >{{$nickdesc}}</p>
-	</div>
-
-	{{$publish}}
-
-	<br />
-<!--	<br><br>
-	<div class="agreement">
-	By clicking '{{$regbutt}}' you are agreeing to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
-	</div>-->
-	<br><br>
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
-	</div>
-	<div id="register-submit-end" ></div>
-</form>
-
-{{$license}}
-
-</div>
diff --git a/view/theme/frost/smarty3/search_item.tpl b/view/theme/frost/smarty3/search_item.tpl
deleted file mode 100644
index 2b37b24583..0000000000
--- a/view/theme/frost/smarty3/search_item.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-{{*
- *	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}}{{$item.previewing}}" id="wall-item-content-wrapper-{{$item.id}}" >
-		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
-				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				{{*<!--<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">-->*}}
-					<ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-						{{$item.item_photo_menu}}
-					</ul>
-				{{*<!--</div>-->*}}
-			</div>
-			{{*<!--<div class="wall-item-photo-end"></div>	-->*}}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		{{*<!--<div class="wall-item-author">-->*}}
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
-				
-		{{*<!--</div>			-->*}}
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			{{*<!--<div class="wall-item-title-end"></div>-->*}}
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
-			{{if $item.has_cats}}
-			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			{{*<!--</div>-->*}}
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
-		</div>
-	</div>
-	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-
-{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
-
-</div>
-
--->*}}
diff --git a/view/theme/frost/smarty3/settings-head.tpl b/view/theme/frost/smarty3/settings-head.tpl
deleted file mode 100644
index 5d7e0152da..0000000000
--- a/view/theme/frost/smarty3/settings-head.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-	window.isPublic = "{{$ispublic}}";
-</script>
-
diff --git a/view/theme/frost/smarty3/settings_display_end.tpl b/view/theme/frost/smarty3/settings_display_end.tpl
deleted file mode 100644
index 4b3db00f5a..0000000000
--- a/view/theme/frost/smarty3/settings_display_end.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	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/suggest_friends.tpl b/view/theme/frost/smarty3/suggest_friends.tpl
deleted file mode 100644
index 8843d51284..0000000000
--- a/view/theme/frost/smarty3/suggest_friends.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	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}}">
-			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{if $connlnk}}
-	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-	{{/if}}
-	<a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
-</div>
diff --git a/view/theme/frost/smarty3/threaded_conversation.tpl b/view/theme/frost/smarty3/threaded_conversation.tpl
deleted file mode 100644
index fbaafa2674..0000000000
--- a/view/theme/frost/smarty3/threaded_conversation.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{*
- *	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>
-  <div id="item-delete-selected-top-desc" >{{$dropping}}</div>
-</div>
-<img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-{{else}}
-{{if $mode==display}}
-<div id="display-top-padding"></div>
-{{/if}}
-{{/if}}
-
-{{$live_update}}
-
-{{foreach $threads as $thread}}
-{{include file="{{$thread.template}}" item=$thread}}
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected');">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-<div id="item-delete-selected-end"></div>
-{{/if}}
diff --git a/view/theme/frost/smarty3/voting_fakelink.tpl b/view/theme/frost/smarty3/voting_fakelink.tpl
deleted file mode 100644
index 1e073916e1..0000000000
--- a/view/theme/frost/smarty3/voting_fakelink.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index d6fbb3cf06..0000000000
--- a/view/theme/frost/smarty3/wall_thread.tpl
+++ /dev/null
@@ -1,130 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
-<a name="{{$item.id}}" ></a>
-{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
-	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-content-wrapper-{{$item.id}}" >
-		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
-			{{if $item.owner_url}}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
-			{{/if}}
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-{{*<!--                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">-->*}}
-                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                        {{$item.item_photo_menu}}
-                    </ul>
-{{*<!--                </div>-->*}}
-
-			</div>
-			{{*<!--<div class="wall-item-photo-end"></div>-->*}}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		{{*<!--<div class="wall-item-author">-->*}}
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}" ><a href="display/{{$user.nickname}}/{{$item.id}}">{{$item.ago}}</a></div>
-		{{*<!--</div>-->*}}
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			{{*<!--<div class="wall-item-title-end"></div>-->*}}
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-					{{*<!--<div class="body-tag">-->*}}
-						{{foreach $item.tags as $tag}}
-							<span class='body-tag tag'>{{$tag}}</span>
-						{{/foreach}}
-					{{*<!--</div>-->*}}
-			{{if $item.has_cats}}
-			<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{if $item.vote}}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-				<a href="#" class="tool like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-				{{if $item.vote.dislike}}
-				<a href="#" class="tool dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
-				{{/if}}
-				{{if $item.vote.share}}<a href="#" class="tool recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
-				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-			</div>
-			{{/if}}
-			{{if $item.plink}}
-				{{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
-			{{/if}}
-			{{if $item.edpost}}
-				<a class="editpost tool pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-			{{/if}}
-			 
-			{{if $item.star}}
-			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item tool {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
-			{{/if}}
-			{{if $item.tagger}}
-			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item tool tagged" title="{{$item.tagger.add}}"></a>
-			{{/if}}
-			{{if $item.filer}}
-			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
-			{{/if}}			
-			
-			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></a>{{/if}}
-			{{*<!--</div>-->*}}
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
-		</div>
-	</div>	
-	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
-	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-
-	{{if $item.threaded}}
-	{{if $item.comment}}
-	{{*<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->*}}
-		{{$item.comment}}
-	{{*<!--</div>-->*}}
-	{{/if}}
-	{{/if}}
-
-{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
-{{*<!--</div>-->*}}
-{{foreach $item.children as $child}}
-	{{include file="{{$child.template}}" item=$child}}
-{{/foreach}}
-
-{{if $item.flatten}}
-{{*<!--<div class="wall-item-comment-wrapper" >-->*}}
-	{{$item.comment}}
-{{*<!--</div>-->*}}
-{{/if}}
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
-
diff --git a/view/theme/frost/smarty3/wallmsg-end.tpl b/view/theme/frost/smarty3/wallmsg-end.tpl
deleted file mode 100644
index c7ad27401f..0000000000
--- a/view/theme/frost/smarty3/wallmsg-end.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
-
-<script language="javascript" type="text/javascript">msgInitEditor();</script>
-
diff --git a/view/theme/frost/smarty3/wallmsg-header.tpl b/view/theme/frost/smarty3/wallmsg-header.tpl
deleted file mode 100644
index 6107a8a087..0000000000
--- a/view/theme/frost/smarty3/wallmsg-header.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script language="javascript" type="text/javascript">
-window.editSelect = "{{$editselect}}";
-window.jotId = "#prvmail-text";
-window.imageUploadButton = 'prvmail-upload';
-</script>
-
diff --git a/view/theme/frost/suggest_friends.tpl b/view/theme/frost/suggest_friends.tpl
deleted file mode 100644
index e0d1c29441..0000000000
--- a/view/theme/frost/suggest_friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" onError="this.src='../../../images/person-48.jpg';" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="$url" title="$name">$name</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{ if $connlnk }}
-	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
-	{{ endif }}
-	<a href="$ignlnk" title="$ignore" class="icon drophide profile-match-ignore" {#onmouseout="imgdull(this);" onmouseover="imgbright(this);" #}onclick="return confirmDelete();" ></a>
-</div>
diff --git a/view/theme/frost/threaded_conversation.tpl b/view/theme/frost/threaded_conversation.tpl
deleted file mode 100644
index a987541831..0000000000
--- a/view/theme/frost/threaded_conversation.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{{ 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>
-  <div id="item-delete-selected-top-desc" >$dropping</div>
-</div>
-<img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-{{ else }}
-{{ if $mode==display }}
-<div id="display-top-padding"></div>
-{{ endif }}
-{{ endif }}
-
-$live_update
-
-{{ for $threads as $thread }}
-{{ inc $thread.template with $item=$thread }}{{ endinc }}
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected');">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);" #}></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/theme/frost/voting_fakelink.tpl b/view/theme/frost/voting_fakelink.tpl
deleted file mode 100644
index b66302cc27..0000000000
--- a/view/theme/frost/voting_fakelink.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="fakelink-wrapper"  id="$[type]list-$id-wrapper">$phrase</span>
diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl
deleted file mode 100644
index 9c63bef227..0000000000
--- a/view/theme/frost/wall_thread.tpl
+++ /dev/null
@@ -1,125 +0,0 @@
-{{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-<a name="$item.id" ></a>
-{#<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->#}
-	<div class="wall-item-content-wrapper $item.indent $item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-{#<!--                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">-->#}
-                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                        $item.item_photo_menu
-                    </ul>
-{#<!--                </div>-->#}
-
-			</div>
-			{#<!--<div class="wall-item-photo-end"></div>-->#}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />{#<!--</div>-->#}
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		{#<!--<div class="wall-item-author">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime" ><a href="display/$user.nickname/$item.id">$item.ago</a></div>
-		{#<!--</div>-->#}
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			{#<!--<div class="wall-item-title-end"></div>-->#}
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					{#<!--<div class="body-tag">-->#}
-						{{ for $item.tags as $tag }}
-							<span class='body-tag tag'>$tag</span>
-						{{ endfor }}
-					{#<!--</div>-->#}
-			{{ if $item.has_cats }}
-			<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="#" class="tool like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				{{ if $item.vote.dislike }}
-				<a href="#" class="tool dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ endif }}
-				{{ if $item.vote.share }}<a href="#" class="tool recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				{#<!--<div class="wall-item-links-wrapper">-->#}<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a>{#<!--</div>-->#}
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost tool pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-			 
-			{{ if $item.star }}
-			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item tool $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item tool tagged" title="$item.tagger.add"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			
-			
-			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);" #}></a>{{ endif }}
-			{#<!--</div>-->#}
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			{#<!--<div class="wall-item-delete-end"></div>-->#}
-		</div>
-	</div>	
-	{#<!--<div class="wall-item-wrapper-end"></div>-->#}
-	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
-
-	{{ if $item.threaded }}
-	{{ if $item.comment }}
-	{#<!--<div class="wall-item-comment-wrapper $item.indent" >-->#}
-		$item.comment
-	{#<!--</div>-->#}
-	{{ endif }}
-	{{ endif }}
-
-{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->#}
-{#<!--</div>-->#}
-{{ for $item.children as $child }}
-	{{ inc $child.template with $item=$child }}{{ endinc }}
-{{ endfor }}
-
-{{ if $item.flatten }}
-{#<!--<div class="wall-item-comment-wrapper" >-->#}
-	$item.comment
-{#<!--</div>-->#}
-{{ endif }}
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
-
diff --git a/view/theme/frost/wallmsg-end.tpl b/view/theme/frost/wallmsg-end.tpl
deleted file mode 100644
index 6baa6e7dc1..0000000000
--- a/view/theme/frost/wallmsg-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
-<script language="javascript" type="text/javascript">msgInitEditor();</script>
-
diff --git a/view/theme/frost/wallmsg-header.tpl b/view/theme/frost/wallmsg-header.tpl
deleted file mode 100644
index 7523539483..0000000000
--- a/view/theme/frost/wallmsg-header.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-window.editSelect = "$editselect";
-window.jotId = "#prvmail-text";
-window.imageUploadButton = 'prvmail-upload';
-</script>
-
diff --git a/view/theme/quattro/birthdays_reminder.tpl b/view/theme/quattro/birthdays_reminder.tpl
deleted file mode 100644
index 8b13789179..0000000000
--- a/view/theme/quattro/birthdays_reminder.tpl
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl
deleted file mode 100644
index 293f93f948..0000000000
--- a/view/theme/quattro/comment_item.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-		<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" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<ul id="comment-edit-bb-$id"
-					class="comment-edit-bb">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>	
-				<textarea id="comment-edit-text-$id" 
-					class="comment-edit-text-empty" 
-					name="body" 
-					onFocus="commentOpen(this,$id) && cmtBbOpen($id);" 
-					onBlur="commentClose(this,$id) && cmtBbClose($id);" >$comment</textarea>
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-			</form>
-
-		</div>
diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl
deleted file mode 100644
index 485ee6cac0..0000000000
--- a/view/theme/quattro/contact_template.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-
-<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
-	<div class="contact-photo-wrapper" >
-		<div class="contact-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<a href="#" rel="#contact-photo-menu-$contact.id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$contact.id">menu</a>
-			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$contact.id">
-				{{ for $contact.photo_menu as $c }}
-				{{ if $c.2 }}
-				<li><a target="redir" href="$c.1">$c.0</a></li>
-				{{ else }}
-				<li><a href="$c.1">$c.0</a></li>
-				{{ endif }}
-				{{ endfor }}
-			</ul>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-	{{ if $contact.alt_text }}<div class="contact-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-	<div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
-	<div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</div>
-
-
-</div>
-
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl
deleted file mode 100644
index 36afc392eb..0000000000
--- a/view/theme/quattro/conversation.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	{{ for $thread.items as $item }}
-        {{if $mode == display}}
-        {{ else }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-        {{ endif }}
-        
-		{{ if $item.type == tag }}
-			{{ inc wall_item_tag.tpl }}{{ endinc }}
-		{{ else }}
-			{{ inc $item.template }}{{ endinc }}
-		{{ endif }}
-		
-	{{ endfor }}
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<a href="#" onclick="deleteCheckedItems();return false;">
-	<span class="icon s22 delete text">$dropping</span>
-</a>
-{{ endif }}
-
-<script>
-// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
-    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
-    var colWhite = {backgroundColor:'#EFF0F1'};
-    var colShiny = {backgroundColor:'#FCE94F'};
-</script>
-
-{{ if $mode == display }}
-<script>
-    var id = window.location.pathname.split("/").pop();
-    $(window).scrollTop($('#item-'+id).position().top);
-    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
-</script>
-{{ endif }}
-
diff --git a/view/theme/quattro/events_reminder.tpl b/view/theme/quattro/events_reminder.tpl
deleted file mode 100644
index 28b6a6675f..0000000000
--- a/view/theme/quattro/events_reminder.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-<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>
-<script>
-	// start calendar from yesterday
-	var yesterday= new Date()
-	yesterday.setDate(yesterday.getDate()-1)
-	
-	function showEvent(eventid) {
-		$.get(
-			'$baseurl/events/?id='+eventid,
-			function(data){
-				$.colorbox({html:data});
-			}
-		);			
-	}
-	$(document).ready(function() {
-		$('#events-reminder').fullCalendar({
-			firstDay: yesterday.getDay(),
-			year: yesterday.getFullYear(),
-			month: yesterday.getMonth(),
-			date: yesterday.getDate(),
-			events: '$baseurl/events/json/',
-			header: {
-				left: '',
-				center: '',
-				right: ''
-			},			
-			timeFormat: 'H(:mm)',
-			defaultView: 'basicWeek',
-			height: 50,
-			eventClick: function(calEvent, jsEvent, view) {
-				showEvent(calEvent.id);
-			}
-		});
-	});
-</script>
-<div id="events-reminder"></div>
-<br>
diff --git a/view/theme/quattro/fileas_widget.tpl b/view/theme/quattro/fileas_widget.tpl
deleted file mode 100644
index 1e5a760449..0000000000
--- a/view/theme/quattro/fileas_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="fileas-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="fileas-ul">
-		<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="fileas-link fileas-all">$all</a></li>
-		{{ for $terms as $term }}
-			<li class="tool {{ if $term.selected }}selected{{ endif }}"><a href="$base?f=&file=$term.name" class="fileas-link">$term.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/quattro/generic_links_widget.tpl b/view/theme/quattro/generic_links_widget.tpl
deleted file mode 100644
index 29580bbc71..0000000000
--- a/view/theme/quattro/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="widget">
-	{{if $title}}<h3>$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul>
-		{{ for $items as $item }}
-			<li class="tool {{ if $item.selected }}selected{{ endif }}"><a href="$item.url" class="link">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/quattro/group_side.tpl b/view/theme/quattro/group_side.tpl
deleted file mode 100644
index 596a8d13fd..0000000000
--- a/view/theme/quattro/group_side.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div id="group-sidebar" class="widget">
-	<div class="title tool">
-		<h3 class="label">$title</h3>
-		<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"> $add</span></a>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul>
-			{{ for $groups as $group }}
-			<li class="tool  {{ if $group.selected }}selected{{ endif }}">
-				<a href="$group.href" class="label">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text s10 edit">$group.edit.title</span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-</div>	
-
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
deleted file mode 100644
index 55de92d08f..0000000000
--- a/view/theme/quattro/jot.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-<form id="profile-jot-form" action="$action" method="post">
-	<div id="jot">
-		<div id="profile-jot-desc" class="jothidden">&nbsp;</div>
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" title="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
-		{{ if $placeholdercategory }}
-		<input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" title="$placeholdercategory" value="$category" class="jothidden" style="display:none" />
-		{{ endif }}
-		<div id="character-counter" class="grey jothidden"></div>
-		
-
-
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-		<ul id="jot-tools" class="jothidden" style="display:none">
-			<li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li>
-			<li><a href="#" onclick="return false;" id="wall-file-upload"  title="$attach">$shortattach</a></li>
-			<li><a id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li>
-			<li><a id="profile-video" onclick="jotVideoURL();return false;" title="$video">$shortvideo</a></li>
-			<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
-			<!-- TODO: waiting for a better placement 
-			<li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
-			<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li>
-			-->
-			<li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li>
-			$jotplugins
-
-			<li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang"  title="$permset" ></a></li>
-			<li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
-			<li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait"  /></li>
-		</ul>
-	</div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-</form>
-
-{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/mail_conv.tpl
deleted file mode 100644
index 0d673236b7..0000000000
--- a/view/theme/quattro/mail_conv.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir"
-                                class="wall-item-name-link"><span
-                                class="wall-item-name$mail.sparkle">$mail.from_name</span></a>
-                                <span class="wall-item-ago" title="$mail.date">$mail.ago</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<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>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/quattro/mail_display.tpl b/view/theme/quattro/mail_display.tpl
deleted file mode 100644
index 2b680ae428..0000000000
--- a/view/theme/quattro/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/quattro/mail_list.tpl b/view/theme/quattro/mail_list.tpl
deleted file mode 100644
index 4f0fe673a0..0000000000
--- a/view/theme/quattro/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date" title="$date">$ago</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/quattro/message_side.tpl b/view/theme/quattro/message_side.tpl
deleted file mode 100644
index 9f15870964..0000000000
--- a/view/theme/quattro/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl
deleted file mode 100644
index ca84e7db54..0000000000
--- a/view/theme/quattro/nav.tpl
+++ /dev/null
@@ -1,95 +0,0 @@
-<header>
-	{# $langselector #}
-
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-	<ul>
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-		{{ if $nav.community }}
-			<li id="nav-community-link" class="nav-menu $sel.community">
-				<a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-			</li>
-		{{ endif }}
-		
-		{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu $sel.network">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-				<span id="net-update" class="nav-notify"></span>
-			</li>
-		{{ endif }}
-		{{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-				<span id="home-update" class="nav-notify"></span>
-			</li>
-		{{ endif }}
-		
-		{{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
-				<span id="notify-update" class="nav-notify"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<!-- TODO: better icons! -->
-					<li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="$nav.notifications.mark.1"><span class="icon s10 edit"></span></a></a><a href="$nav.notifications.all.0" title="$nav.notifications.all.1"><span class="icon s10 plugin"></span></a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}		
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
-			</ul>		
-		</li>
-		
-		{{ if $nav.help }} 
-		<li id="nav-help-link" class="nav-menu $sel.help">
-			<a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-		</li>
-		{{ endif }}
-
-		<li id="nav-search-link" class="nav-menu $sel.search">
-			<a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-		</li>
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>
-		{{ endif }}
-	</ul>
-
-</nav>
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div>
diff --git a/view/theme/quattro/nets.tpl b/view/theme/quattro/nets.tpl
deleted file mode 100644
index f596df8209..0000000000
--- a/view/theme/quattro/nets.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="nets-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="nets-ul">
-		<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base?nets=all" class="nets-link nets-all">$all</a>
-		{{ for $nets as $net }}
-			<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/quattro/photo_view.tpl b/view/theme/quattro/photo_view.tpl
deleted file mode 100644
index 3b7a662716..0000000000
--- a/view/theme/quattro/photo_view.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<div id="live-display"></div>
-<h3 id="photo-album-title"><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
-{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-<div class="wall-item-comment-wrapper">
-    $comments
-</div>
-
-$paginate
-
diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl
deleted file mode 100644
index 13037c8a21..0000000000
--- a/view/theme/quattro/profile_vcard.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-
-
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt
-        class="homepage-label">$homepage</dt><dd class="homepage-url"><a
-        href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/quattro/prv_message.tpl b/view/theme/quattro/prv_message.tpl
deleted file mode 100644
index 9db4fc0176..0000000000
--- a/view/theme/quattro/prv_message.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-{{ if $showinputs }}
-<input type="text" id="recip" name="messagerecip" value="$prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$preid">
-{{ else }}
-$select
-{{ endif }}
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
-
-<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="20" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/quattro/saved_searches_aside.tpl b/view/theme/quattro/saved_searches_aside.tpl
deleted file mode 100644
index 9c10a26dec..0000000000
--- a/view/theme/quattro/saved_searches_aside.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="saved-search-list" class="widget">
-	<h3 class="title">$title</h3>
-
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-			<li class="tool {{if $search.selected}}selected{{endif}}">
-					<a href="network/?f=&search=$search.encodedterm" class="label" >$search.term</a>
-					<a href="network/?f=&remove=1&search=$search.encodedterm" class="action icon s10 delete" title="$search.delete" onclick="return confirmDelete();"></a>
-			</li>
-		{{ endfor }}
-	</ul>
-	
-	$searchbox
-	
-</div>
diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/search_item.tpl
deleted file mode 100644
index 55868e5483..0000000000
--- a/view/theme/quattro/search_item.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-
-<div class="wall-item-decor">
-	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-			<div class="wall-item-location">$item.location</div>	
-		</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			{{ if $item.star }}
-				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
-			{{ endif }}
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
-			{{ endif }}			
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-		{{ if $item.conv }}
-		<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-		{{ endif }}
-		</div>
-	</div>
-	
-	
-</div>
-
diff --git a/view/theme/quattro/smarty3/birthdays_reminder.tpl b/view/theme/quattro/smarty3/birthdays_reminder.tpl
deleted file mode 100644
index f951fc97a8..0000000000
--- a/view/theme/quattro/smarty3/birthdays_reminder.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index eca1f14f40..0000000000
--- a/view/theme/quattro/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-{{*
- *	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}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<ul id="comment-edit-bb-{{$id}}"
-					class="comment-edit-bb">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="{{$edbold}}"
-						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="{{$editalic}}"
-						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="{{$eduline}}"
-						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="{{$edquote}}"
-						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="{{$edcode}}"
-						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="{{$edimg}}"
-						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="{{$edurl}}"
-						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="{{$edvideo}}"
-						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-				</ul>	
-				<textarea id="comment-edit-text-{{$id}}" 
-					class="comment-edit-text-empty" 
-					name="body" 
-					onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});" 
-					onBlur="commentClose(this,{{$id}}) && cmtBbClose({{$id}});" >{{$comment}}</textarea>
-				{{if $qcomment}}
-					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-					<option value=""></option>
-				{{foreach $qcomment as $qc}}
-					<option value="{{$qc}}">{{$qc}}</option>				
-				{{/foreach}}
-					</select>
-				{{/if}}
-
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-			</form>
-
-		</div>
diff --git a/view/theme/quattro/smarty3/contact_template.tpl b/view/theme/quattro/smarty3/contact_template.tpl
deleted file mode 100644
index c74a513b8f..0000000000
--- a/view/theme/quattro/smarty3/contact_template.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{{*
- *	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" >
-		<div class="contact-photo mframe" id="contact-entry-photo-{{$contact.id}}"
-		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
-		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
-
-			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
-
-			{{if $contact.photo_menu}}
-			<a href="#" rel="#contact-photo-menu-{{$contact.id}}" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-{{$contact.id}}">menu</a>
-			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-{{$contact.id}}">
-				{{foreach $contact.photo_menu as $c}}
-				{{if $c.2}}
-				<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-				{{else}}
-				<li><a href="{{$c.1}}">{{$c.0}}</a></li>
-				{{/if}}
-				{{/foreach}}
-			</ul>
-			{{/if}}
-		</div>
-			
-	</div>
-	<div class="contact-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
-	{{if $contact.alt_text}}<div class="contact-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-	<div class="contact-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>
-	<div class="contact-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
-
-
-</div>
-
diff --git a/view/theme/quattro/smarty3/conversation.tpl b/view/theme/quattro/smarty3/conversation.tpl
deleted file mode 100644
index 4e3553894b..0000000000
--- a/view/theme/quattro/smarty3/conversation.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$live_update}}
-
-{{foreach $threads as $thread}}
-<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
-	{{foreach $thread.items as $item}}
-        {{if $mode == display}}
-        {{else}}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
-			</div>
-			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
-		{{/if}}
-		{{if $item.comment_lastcollapsed}}</div>{{/if}}
-        {{/if}}
-        
-		{{if $item.type == tag}}
-			{{include file="wall_item_tag.tpl"}}
-		{{else}}
-			{{include file="{{$item.template}}"}}
-		{{/if}}
-		
-	{{/foreach}}
-</div>
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
-{{if $dropping}}
-<a href="#" onclick="deleteCheckedItems();return false;">
-	<span class="icon s22 delete text">{{$dropping}}</span>
-</a>
-{{/if}}
-
-<script>
-// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
-    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
-    var colWhite = {backgroundColor:'#EFF0F1'};
-    var colShiny = {backgroundColor:'#FCE94F'};
-</script>
-
-{{if $mode == display}}
-<script>
-    var id = window.location.pathname.split("/").pop();
-    $(window).scrollTop($('#item-'+id).position().top);
-    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
-</script>
-{{/if}}
-
diff --git a/view/theme/quattro/smarty3/events_reminder.tpl b/view/theme/quattro/smarty3/events_reminder.tpl
deleted file mode 100644
index b188bd4a37..0000000000
--- a/view/theme/quattro/smarty3/events_reminder.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-{{*
- *	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>
-<script>
-	// start calendar from yesterday
-	var yesterday= new Date()
-	yesterday.setDate(yesterday.getDate()-1)
-	
-	function showEvent(eventid) {
-		$.get(
-			'{{$baseurl}}/events/?id='+eventid,
-			function(data){
-				$.colorbox({html:data});
-			}
-		);			
-	}
-	$(document).ready(function() {
-		$('#events-reminder').fullCalendar({
-			firstDay: yesterday.getDay(),
-			year: yesterday.getFullYear(),
-			month: yesterday.getMonth(),
-			date: yesterday.getDate(),
-			events: '{{$baseurl}}/events/json/',
-			header: {
-				left: '',
-				center: '',
-				right: ''
-			},			
-			timeFormat: 'H(:mm)',
-			defaultView: 'basicWeek',
-			height: 50,
-			eventClick: function(calEvent, jsEvent, view) {
-				showEvent(calEvent.id);
-			}
-		});
-	});
-</script>
-<div id="events-reminder"></div>
-<br>
diff --git a/view/theme/quattro/smarty3/fileas_widget.tpl b/view/theme/quattro/smarty3/fileas_widget.tpl
deleted file mode 100644
index 555ac5feb3..0000000000
--- a/view/theme/quattro/smarty3/fileas_widget.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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>
-	
-	<ul class="fileas-ul">
-		<li class="tool {{if $sel_all}}selected{{/if}}"><a href="{{$base}}" class="fileas-link fileas-all">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-			<li class="tool {{if $term.selected}}selected{{/if}}"><a href="{{$base}}?f=&file={{$term.name}}" class="fileas-link">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/theme/quattro/smarty3/generic_links_widget.tpl b/view/theme/quattro/smarty3/generic_links_widget.tpl
deleted file mode 100644
index 802563255c..0000000000
--- a/view/theme/quattro/smarty3/generic_links_widget.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	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}}
-	
-	<ul>
-		{{foreach $items as $item}}
-			<li class="tool {{if $item.selected}}selected{{/if}}"><a href="{{$item.url}}" class="link">{{$item.label}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/theme/quattro/smarty3/group_side.tpl b/view/theme/quattro/smarty3/group_side.tpl
deleted file mode 100644
index b71f1f1e2f..0000000000
--- a/view/theme/quattro/smarty3/group_side.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	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>
-		<a href="group/new" title="{{$createtext}}" class="action"><span class="icon text s16 add"> {{$add}}</span></a>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul>
-			{{foreach $groups as $group}}
-			<li class="tool  {{if $group.selected}}selected{{/if}}">
-				<a href="{{$group.href}}" class="label">
-					{{$group.text}}
-				</a>
-				{{if $group.edit}}
-					<a href="{{$group.edit.href}}" class="action"><span class="icon text s10 edit">{{$group.edit.title}}</span></a>
-				{{/if}}
-				{{if $group.cid}}
-					<input type="checkbox" 
-						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
-						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
-						{{if $group.ismember}}checked="checked"{{/if}}
-					/>
-				{{/if}}
-			</li>
-			{{/foreach}}
-		</ul>
-	</div>
-</div>	
-
diff --git a/view/theme/quattro/smarty3/jot.tpl b/view/theme/quattro/smarty3/jot.tpl
deleted file mode 100644
index f9f36a37db..0000000000
--- a/view/theme/quattro/smarty3/jot.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-{{*
- *	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>
-		<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" title="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none" />
-		{{if $placeholdercategory}}
-		<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" title="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" />
-		{{/if}}
-		<div id="character-counter" class="grey jothidden"></div>
-		
-
-
-		<input type="hidden" name="type" value="{{$ptyp}}" />
-		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-		<input type="hidden" name="return" value="{{$return_path}}" />
-		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
-
-		<ul id="jot-tools" class="jothidden" style="display:none">
-			<li><a href="#" onclick="return false;" id="wall-image-upload" title="{{$upload}}">{{$shortupload}}</a></a></li>
-			<li><a href="#" onclick="return false;" id="wall-file-upload"  title="{{$attach}}">{{$shortattach}}</a></li>
-			<li><a id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="{{$weblink}}">{{$shortweblink}}</a></li>
-			<li><a id="profile-video" onclick="jotVideoURL();return false;" title="{{$video}}">{{$shortvideo}}</a></li>
-			<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="{{$audio}}">{{$shortaudio}}</a></li>
-			<!-- TODO: waiting for a better placement 
-			<li><a id="profile-location" onclick="jotGetLocation();return false;" title="{{$setloc}}">{{$shortsetloc}}</a></li>
-			<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="{{$noloc}}">{{$shortnoloc}}</a></li>
-			-->
-			<li><a id="jot-preview-link" onclick="preview_post(); return false;" title="{{$preview}}">{{$preview}}</a></li>
-			{{$jotplugins}}
-
-			<li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 {{$lockstate}} {{$bang}}"  title="{{$permset}}" ></a></li>
-			<li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" /></li>
-			<li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}"  /></li>
-		</ul>
-	</div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			{{$acl}}
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-			<div id="profile-jot-email-end"></div>
-			{{$jotnets}}
-		</div>
-	</div>
-
-</form>
-
-{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/quattro/smarty3/mail_conv.tpl b/view/theme/quattro/smarty3/mail_conv.tpl
deleted file mode 100644
index 3ddc8e99f8..0000000000
--- a/view/theme/quattro/smarty3/mail_conv.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-{{*
- *	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">
-			<div class="contact-photo-wrapper"
-				<a href="{{$mail.profile_url}}" target="redir" title="{{$mail.from_name}}" class="contact-photo-link" id="wall-item-photo-link-{{$mail.id}}">
-					<img src="{{$mail.from_photo}}" class="contact-photo{{$mail.sparkle}}" id="wall-item-photo-{{$mail.id}}" alt="{{$mail.from_name}}" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			{{$mail.body}}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="{{$mail.from_url}}" target="redir"
-                                class="wall-item-name-link"><span
-                                class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name}}</span></a>
-                                <span class="wall-item-ago" title="{{$mail.date}}">{{$mail.ago}}</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$mail.delete}}">{{$mail.delete}}</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{{*
-
-
-<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>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
-		<div class="mail-conv-date">{{$mail.date}}</div>
-		<div class="mail-conv-subject">{{$mail.subject}}</div>
-		<div class="mail-conv-body">{{$mail.body}}</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-*}}
diff --git a/view/theme/quattro/smarty3/mail_display.tpl b/view/theme/quattro/smarty3/mail_display.tpl
deleted file mode 100644
index dc1fbbc6f5..0000000000
--- a/view/theme/quattro/smarty3/mail_display.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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}}
-	<div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
-		{{include file="mail_conv.tpl"}}
-	</div>
-{{/foreach}}
-
-{{include file="prv_message.tpl"}}
diff --git a/view/theme/quattro/smarty3/mail_list.tpl b/view/theme/quattro/smarty3/mail_list.tpl
deleted file mode 100644
index 0090668740..0000000000
--- a/view/theme/quattro/smarty3/mail_list.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	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>
-	<span class="mail-date" title="{{$date}}">{{$ago}}</span>
-	<span class="mail-count">{{$count}}</span>
-	
-	<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/quattro/smarty3/message_side.tpl b/view/theme/quattro/smarty3/message_side.tpl
deleted file mode 100644
index 723b0b710c..0000000000
--- a/view/theme/quattro/smarty3/message_side.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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>
-	
-	<ul class="message-ul">
-		{{foreach $tabs as $t}}
-			<li class="tool {{if $t.sel}}selected{{/if}}"><a href="{{$t.url}}" class="message-link">{{$t.label}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/theme/quattro/smarty3/nav.tpl b/view/theme/quattro/smarty3/nav.tpl
deleted file mode 100644
index 2118c1e348..0000000000
--- a/view/theme/quattro/smarty3/nav.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<header>
-	{{* {{$langselector}} *}}
-
-	<div id="site-location">{{$sitelocation}}</div>
-	<div id="banner">{{$banner}}</div>
-</header>
-<nav>
-	<ul>
-		{{if $userinfo}}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{foreach $nav.usermenu as $usermenu}}
-						<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
-					{{/foreach}}
-					
-					{{if $nav.notifications}}<li><a class="{{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a></li>{{/if}}
-					{{if $nav.messages}}<li><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a></li>{{/if}}
-					{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}	
-				</ul>
-			</li>
-		{{/if}}
-		
-		{{if $nav.community}}
-			<li id="nav-community-link" class="nav-menu {{$sel.community}}">
-				<a class="{{$nav.community.2}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
-			</li>
-		{{/if}}
-		
-		{{if $nav.network}}
-			<li id="nav-network-link" class="nav-menu {{$sel.network}}">
-				<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
-				<span id="net-update" class="nav-notify"></span>
-			</li>
-		{{/if}}
-		{{if $nav.home}}
-			<li id="nav-home-link" class="nav-menu {{$sel.home}}">
-				<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
-				<span id="home-update" class="nav-notify"></span>
-			</li>
-		{{/if}}
-		
-		{{if $nav.notifications}}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a>
-				<span id="notify-update" class="nav-notify"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<!-- TODO: better icons! -->
-					<li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="{{$nav.notifications.mark.1}}"><span class="icon s10 edit"></span></a></a><a href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.all.1}}"><span class="icon s10 plugin"></span></a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-			</li>		
-		{{/if}}		
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}				
-
-				{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
-				{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
-
-				{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
-				{{if $nav.login}}<li><a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
-			</ul>		
-		</li>
-		
-		{{if $nav.help}} 
-		<li id="nav-help-link" class="nav-menu {{$sel.help}}">
-			<a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
-		</li>
-		{{/if}}
-
-		<li id="nav-search-link" class="nav-menu {{$sel.search}}">
-			<a class="{{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
-		</li>
-		<li id="nav-directory-link" class="nav-menu {{$sel.directory}}">
-			<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
-		</li>
-		
-		{{if $nav.apps}}
-			<li id="nav-apps-link" class="nav-menu {{$sel.apps}}">
-				<a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{foreach $apps as $ap}}
-					<li>{{$ap}}</li>
-					{{/foreach}}
-				</ul>
-			</li>
-		{{/if}}
-	</ul>
-
-</nav>
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-<div style="position: fixed; top: 3px; left: 5px; z-index:9999">{{$langselector}}</div>
diff --git a/view/theme/quattro/smarty3/nets.tpl b/view/theme/quattro/smarty3/nets.tpl
deleted file mode 100644
index dfe133251f..0000000000
--- a/view/theme/quattro/smarty3/nets.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	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>
-	
-	<ul class="nets-ul">
-		<li class="tool {{if $sel_all}}selected{{/if}}"><a href="{{$base}}?nets=all" class="nets-link nets-all">{{$all}}</a>
-		{{foreach $nets as $net}}
-			<li class="tool {{if $net.selected}}selected{{/if}}"><a href="{{$base}}?f=&nets={{$net.ref}}" class="nets-link">{{$net.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/theme/quattro/smarty3/photo_view.tpl b/view/theme/quattro/smarty3/photo_view.tpl
deleted file mode 100644
index 38b3b5216e..0000000000
--- a/view/theme/quattro/smarty3/photo_view.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-{{*
- *	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>
-
-<div id="photo-edit-link-wrap">
-{{if $tools}}
-<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
-|
-<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
-{{/if}}
-{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
-</div>
-
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
-{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
-{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
-<div id="photo-caption">{{$desc}}</div>
-{{if $tags}}
-<div id="in-this-photo-text">{{$tags.0}}</div>
-<div id="in-this-photo">{{$tags.1}}</div>
-{{/if}}
-{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
-
-{{if $edit}}{{$edit}}{{/if}}
-
-{{if $likebuttons}}
-<div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
-</div>
-{{/if}}
-<div class="wall-item-comment-wrapper">
-    {{$comments}}
-</div>
-
-{{$paginate}}
-
diff --git a/view/theme/quattro/smarty3/profile_vcard.tpl b/view/theme/quattro/smarty3/profile_vcard.tpl
deleted file mode 100644
index 4b1ddb6e6e..0000000000
--- a/view/theme/quattro/smarty3/profile_vcard.tpl
+++ /dev/null
@@ -1,73 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">{{$profile.name}}</div>
-		{{if $profile.edit}}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{foreach $profile.menu.entries as $e}}
-				<li>
-					<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
-				</li>
-				{{/foreach}}
-				<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
-				
-			</ul>
-			</div>
-		{{/if}}
-	</div>
-
-
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
-
-
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt
-        class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a
-        href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{if $connect}}
-				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-			{{/if}}
-			{{if $wallmessage}}
-				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block}}
-
-
diff --git a/view/theme/quattro/smarty3/prv_message.tpl b/view/theme/quattro/smarty3/prv_message.tpl
deleted file mode 100644
index 26b14d6e0e..0000000000
--- a/view/theme/quattro/smarty3/prv_message.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h3>{{$header}}</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-{{$parent}}
-
-<div id="prvmail-to-label">{{$to}}</div>
-{{if $showinputs}}
-<input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
-{{else}}
-{{$select}}
-{{/if}}
-
-<div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
-
-<div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea rows="20" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/quattro/smarty3/saved_searches_aside.tpl b/view/theme/quattro/smarty3/saved_searches_aside.tpl
deleted file mode 100644
index 6ff59afae4..0000000000
--- a/view/theme/quattro/smarty3/saved_searches_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="saved-search-list" class="widget">
-	<h3 class="title">{{$title}}</h3>
-
-	<ul id="saved-search-ul">
-		{{foreach $saved as $search}}
-			<li class="tool {{if $search.selected}}selected{{/if}}">
-					<a href="network/?f=&search={{$search.encodedterm}}" class="label" >{{$search.term}}</a>
-					<a href="network/?f=&remove=1&search={{$search.encodedterm}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a>
-			</li>
-		{{/foreach}}
-	</ul>
-	
-	{{$searchbox}}
-	
-</div>
diff --git a/view/theme/quattro/smarty3/search_item.tpl b/view/theme/quattro/smarty3/search_item.tpl
deleted file mode 100644
index a5dafa643c..0000000000
--- a/view/theme/quattro/smarty3/search_item.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-{{*
- *	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>
-	{{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}	
-	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-</div>
-
-<div class="wall-item-container {{$item.indent}}">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
-				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-				{{$item.item_photo_menu}}
-				</ul>
-				
-			</div>
-			<div class="wall-item-location">{{$item.location}}</div>	
-		</div>
-		<div class="wall-item-content">
-			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
-			{{$item.body}}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{foreach $item.tags as $tag}}
-				<span class='tag'>{{$tag}}</span>
-			{{/foreach}}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-			{{if $item.plink}}<a class="icon s16 link" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> <span class="wall-item-ago" title="{{$item.localtime}}">{{$item.ago}}</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			{{if $item.star}}
-				<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
-				<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
-				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger}}">{{$item.star.tagger}}</a>
-			{{/if}}
-			
-			{{if $item.vote}}
-				<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
-				<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
-			{{/if}}
-						
-			{{if $item.vote.share}}
-				<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
-			{{/if}}			
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{if $item.drop.pagedrop}}
-					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
-				{{/if}}
-				{{if $item.drop.dropping}}
-					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
-				{{/if}}
-				{{if $item.edpost}}
-					<a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-				{{/if}}
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-		{{if $item.conv}}
-		<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-		{{/if}}
-		</div>
-	</div>
-	
-	
-</div>
-
diff --git a/view/theme/quattro/smarty3/theme_settings.tpl b/view/theme/quattro/smarty3/theme_settings.tpl
deleted file mode 100644
index 5df1e99ede..0000000000
--- a/view/theme/quattro/smarty3/theme_settings.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{{*
- *	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}}
-
-{{include file="field_select.tpl" field=$align}}
-
-
-<div class="field">
-    <label for="id_{{$pfs.0}}">{{$pfs.1}}</label>
-    <input type="range" class="inputRange" id="id_{{$pfs.0}}" name="{{$pfs.0}}" value="{{$pfs.2}}" min="10" max="22" step="1"  />
-    <span class="field_help"></span>
-</div>
-
-
-<div class="field">
-    <label for="id_{{$tfs.0}}">{{$tfs.1}}</label>
-    <input type="range" class="inputRange" id="id_{{$tfs.0}}" name="{{$tfs.0}}" value="{{$tfs.2}}" min="10" max="22" step="1"  />
-    <span class="field_help"></span>
-</div>
-
-
-
-
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="quattro-settings-submit" />
-</div>
-
-<script>
-    
-    $(".inputRange").rangeinput();
-</script>
diff --git a/view/theme/quattro/smarty3/threaded_conversation.tpl b/view/theme/quattro/smarty3/threaded_conversation.tpl
deleted file mode 100644
index dc3e918f61..0000000000
--- a/view/theme/quattro/smarty3/threaded_conversation.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$live_update}}
-
-{{foreach $threads as $thread}}
-
-<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}}  {{$thread.toplevel}}">
-       
-       
-		{{if $thread.type == tag}}
-			{{include file="wall_item_tag.tpl" item=$thread}}
-		{{else}}
-			{{include file="{{$thread.template}}" item=$thread}}
-		{{/if}}
-		
-</div>
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
-{{if $dropping}}
-<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;">
-	<span class="icon s22 delete text">{{$dropping}}</span>
-</a>
-<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-{{/if}}
-
-<script>
-// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
-    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
-    var colWhite = {backgroundColor:'#EFF0F1'};
-    var colShiny = {backgroundColor:'#FCE94F'};
-</script>
-
-{{if $mode == display}}
-<script>
-    var id = window.location.pathname.split("/").pop();
-    $(window).scrollTop($('#item-'+id).position().top);
-    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
-</script>
-{{/if}}
-
diff --git a/view/theme/quattro/smarty3/wall_item_tag.tpl b/view/theme/quattro/smarty3/wall_item_tag.tpl
deleted file mode 100644
index 1e658883c7..0000000000
--- a/view/theme/quattro/smarty3/wall_item_tag.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{if $mode == display}}
-{{else}}
-{{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>
-			{{if $item.thread_level==3}} - 
-			<span id="hide-thread-{{$item}}-id"
-				class="fakelink"
-				onclick="showThread({{$item.id}});">expand</span> /
-			<span id="hide-thread-{{$item}}-id"
-				class="fakelink"
-				onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}}
-	</div>
-	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-{{/if}}
-
-{{if $item.thread_level!=1}}<div class="children">{{/if}}
-
-
-<div class="wall-item-container item-tag {{$item.indent}} {{$item.shiny}}">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
-					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
-				</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-				{{$item.item_photo_menu}}
-				</ul>
-				
-			</div>
-			<div class="wall-item-location">{{$item.location}}</div>	
-		</div>
-		<div class="wall-item-content">
-			{{$item.ago}} {{$item.body}} 
-		</div>
-			<div class="wall-item-tools">
-				{{if $item.drop.pagedrop}}
-					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
-				{{/if}}
-				{{if $item.drop.dropping}}
-					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
-				{{/if}}
-			</div>
-	</div>
-</div>
-
-{{if $item.thread_level!=1}}</div>{{/if}}
-
-{{if $mode == display}}
-{{else}}
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
-{{/if}}
-
-{{* top thread comment box *}}
-{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
-{{/if}}{{/if}}{{/if}}
-
-{{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
-{{/if}}
diff --git a/view/theme/quattro/smarty3/wall_thread.tpl b/view/theme/quattro/smarty3/wall_thread.tpl
deleted file mode 100644
index 805ddfaaa9..0000000000
--- a/view/theme/quattro/smarty3/wall_thread.tpl
+++ /dev/null
@@ -1,177 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{if $mode == display}}
-{{else}}
-{{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>
-			{{if $item.thread_level==3}} - 
-			<span id="hide-thread-{{$item}}-id"
-				class="fakelink"
-				onclick="showThread({{$item.id}});">expand</span> /
-			<span id="hide-thread-{{$item}}-id"
-				class="fakelink"
-				onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}}
-	</div>
-	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-{{/if}}
-
-{{if $item.thread_level!=1}}<div class="children">{{/if}}
-
-<div class="wall-item-decor">
-	<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
-	{{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}	
-	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-</div>
-
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}}" id="item-{{$item.id}}">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}"
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
-					<img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-				{{$item.item_photo_menu}}
-				</ul>
-				
-			</div>	
-			{{if $item.owner_url}}
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-					<img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
-				</a>
-			</div>
-			{{/if}}			
-			<div class="wall-item-location">{{$item.location}}</div>	
-		</div>
-		<div class="wall-item-content">
-			{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h2>{{/if}}
-			{{$item.body}}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{foreach $item.hashtags as $tag}}
-				<span class='tag'>{{$tag}}</span>
-			{{/foreach}}
-  			{{foreach $item.mentions as $tag}}
-				<span class='mention'>{{$tag}}</span>
-			{{/foreach}}
-               {{foreach $item.folders as $cat}}
-                    <span class='folder'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
-               {{/foreach}}
-                {{foreach $item.categories as $cat}}
-                    <span class='category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
-                {{/foreach}}
-		</div>
-	</div>	
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-			{{if $item.plink}}<a class="icon s16 link{{$item.sparkle}}" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="{{$item.profile_url}}" target="redir"
-                                title="{{$item.linktitle}}"
-                                class="wall-item-name-link"><span
-                                class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
-                                <span class="wall-item-ago" title="{{$item.localtime}}">{{$item.ago}}</span>
-				 {{if $item.owner_url}}<br/>{{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}
-				 {{/if}}
-			</div>
-			
-			<div class="wall-item-actions-social">
-			{{if $item.star}}
-				<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
-				<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
-			{{/if}}
-			{{if $item.tagger}}
-				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}">{{$item.tagger.add}}</a>
-			{{/if}}
-			{{if $item.filer}}
-                                <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}">{{$item.filer}}</a>
-			{{/if}}			
-			
-			{{if $item.vote}}
-				<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
-				{{if $item.vote.dislike}}
-				<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
-				{{/if}}
-			{{/if}}
-						
-			{{if $item.vote.share}}
-				<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
-			{{/if}}			
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{if $item.drop.pagedrop}}
-					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
-				{{/if}}
-				{{if $item.drop.dropping}}
-					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
-				{{/if}}
-				{{if $item.edpost}}
-					<a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-				{{/if}}
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
-	</div>
-	
-	{{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}}
-	<div class="wall-item-bottom commentbox">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-comment-wrapper">
-					{{$item.comment}}
-		</div>
-	</div>
-	{{/if}}{{/if}}{{/if}}
-</div>
-
-
-{{foreach $item.children as $child}}
-	{{if $child.type == tag}}
-		{{include file="wall_item_tag.tpl" item=$child}}
-	{{else}}
-		{{include file="{{$item.template}}" item=$child}}
-	{{/if}}
-{{/foreach}}
-
-{{if $item.thread_level!=1}}</div>{{/if}}
-
-
-{{if $mode == display}}
-{{else}}
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
-{{/if}}
-
-{{* top thread comment box *}}
-{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
-{{/if}}{{/if}}{{/if}}
-
-
-{{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
-{{/if}}
diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl
deleted file mode 100644
index b957532cf5..0000000000
--- a/view/theme/quattro/theme_settings.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
- <script src="$baseurl/view/theme/quattro/jquery.tools.min.js"></script>
- 
-{{inc field_select.tpl with $field=$color}}{{endinc}}
-
-{{inc field_select.tpl with $field=$align}}{{endinc}}
-
-
-<div class="field">
-    <label for="id_$pfs.0">$pfs.1</label>
-    <input type="range" class="inputRange" id="id_$pfs.0" name="$pfs.0" value="$pfs.2" min="10" max="22" step="1"  />
-    <span class="field_help"></span>
-</div>
-
-
-<div class="field">
-    <label for="id_$tfs.0">$tfs.1</label>
-    <input type="range" class="inputRange" id="id_$tfs.0" name="$tfs.0" value="$tfs.2" min="10" max="22" step="1"  />
-    <span class="field_help"></span>
-</div>
-
-
-
-
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="quattro-settings-submit" />
-</div>
-
-<script>
-    
-    $(".inputRange").rangeinput();
-</script>
diff --git a/view/theme/quattro/threaded_conversation.tpl b/view/theme/quattro/threaded_conversation.tpl
deleted file mode 100644
index 82e071134e..0000000000
--- a/view/theme/quattro/threaded_conversation.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-
-<div id="tread-wrapper-$thread.id" class="tread-wrapper {{ if $thread.threaded }}threaded{{ endif }}  $thread.toplevel">
-       
-       
-		{{ if $thread.type == tag }}
-			{{ inc wall_item_tag.tpl with $item=$thread }}{{ endinc }}
-		{{ else }}
-			{{ inc $thread.template with $item=$thread }}{{ endinc }}
-		{{ endif }}
-		
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;">
-	<span class="icon s22 delete text">$dropping</span>
-</a>
-<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-{{ endif }}
-
-<script>
-// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
-    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
-    var colWhite = {backgroundColor:'#EFF0F1'};
-    var colShiny = {backgroundColor:'#FCE94F'};
-</script>
-
-{{ if $mode == display }}
-<script>
-    var id = window.location.pathname.split("/").pop();
-    $(window).scrollTop($('#item-'+id).position().top);
-    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
-</script>
-{{ endif }}
-
diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl
deleted file mode 100644
index 63373ab163..0000000000
--- a/view/theme/quattro/wall_item_tag.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-{{if $mode == display}}
-{{ else }}
-{{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>
-			{{ if $item.thread_level==3 }} - 
-			<span id="hide-thread-$item-id"
-				class="fakelink"
-				onclick="showThread($item.id);">expand</span> /
-			<span id="hide-thread-$item-id"
-				class="fakelink"
-				onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-{{ endif }}
-
-{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
-
-
-<div class="wall-item-container item-tag $item.indent $item.shiny">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-			<div class="wall-item-location">$item.location</div>	
-		</div>
-		<div class="wall-item-content">
-			$item.ago $item.body 
-		</div>
-			<div class="wall-item-tools">
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-			</div>
-	</div>
-</div>
-
-{{ if $item.thread_level!=1 }}</div>{{ endif }}
-
-{{if $mode == display}}
-{{ else }}
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
-{{ endif }}
-
-{# top thread comment box #}
-{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >$item.comment</div>
-{{ endif }}{{ endif }}{{ endif }}
-
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >$item.comment</div>
-{{ endif }}
diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl
deleted file mode 100644
index eee27776be..0000000000
--- a/view/theme/quattro/wall_thread.tpl
+++ /dev/null
@@ -1,172 +0,0 @@
-{{if $mode == display}}
-{{ else }}
-{{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>
-			{{ if $item.thread_level==3 }} - 
-			<span id="hide-thread-$item-id"
-				class="fakelink"
-				onclick="showThread($item.id);">expand</span> /
-			<span id="hide-thread-$item-id"
-				class="fakelink"
-				onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-{{ endif }}
-
-{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
-
-<div class="wall-item-decor">
-	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<div class="wall-item-container $item.indent $item.shiny" id="item-$item.id">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>	
-			{{ if $item.owner_url }}
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			{{ endif }}			
-			<div class="wall-item-location">$item.location</div>	
-		</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href" class="$item.sparkle">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.hashtags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-  			{{ for $item.mentions as $tag }}
-				<span class='mention'>$tag</span>
-			{{ endfor }}
-               {{ for $item.folders as $cat }}
-                    <span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
-               {{ endfor }}
-                {{ for $item.categories as $cat }}
-                    <span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
-                {{ endfor }}
-		</div>
-	</div>	
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-			{{ if $item.plink }}<a class="icon s16 link$item.sparkle" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir"
-                                title="$item.linktitle"
-                                class="wall-item-name-link"><span
-                                class="wall-item-name$item.sparkle">$item.name</span></a>
-                                <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
-				 {{ if $item.owner_url }}<br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
-				 {{ endif }}
-			</div>
-			
-			<div class="wall-item-actions-social">
-			{{ if $item.star }}
-				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-			{{ endif }}
-			{{ if $item.tagger }}
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.tagger.class" title="$item.tagger.add">$item.tagger.add</a>
-			{{ endif }}
-			{{ if $item.filer }}
-                                <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a>
-			{{ endif }}			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				{{ if $item.vote.dislike }}
-				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
-				{{ endif }}
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
-			{{ endif }}			
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-	
-	{{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
-	<div class="wall-item-bottom commentbox">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-comment-wrapper">
-					$item.comment
-		</div>
-	</div>
-	{{ endif }}{{ endif }}{{ endif }}
-</div>
-
-
-{{ for $item.children as $child }}
-	{{ if $child.type == tag }}
-		{{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
-	{{ else }}
-		{{ inc $item.template with $item=$child }}{{ endinc }}
-	{{ endif }}
-{{ endfor }}
-
-{{ if $item.thread_level!=1 }}</div>{{ endif }}
-
-
-{{if $mode == display}}
-{{ else }}
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
-{{ endif }}
-
-{# top thread comment box #}
-{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >$item.comment</div>
-{{ endif }}{{ endif }}{{ endif }}
-
-
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >$item.comment</div>
-{{ endif }}
diff --git a/view/theme/slackr/birthdays_reminder.tpl b/view/theme/slackr/birthdays_reminder.tpl
deleted file mode 100644
index 1dc65295a9..0000000000
--- a/view/theme/slackr/birthdays_reminder.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ if $classtoday }}
-<script>
-	$(document).ready(function() $lbr
-		$('#events-reminder').addClass($.trim('$classtoday'));
-	$rbr);
-</script>
-{{ endif }}
-
diff --git a/view/theme/slackr/events_reminder.tpl b/view/theme/slackr/events_reminder.tpl
deleted file mode 100644
index 93c493432a..0000000000
--- a/view/theme/slackr/events_reminder.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-<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>
-<script>
-	// start calendar from yesterday
-	var yesterday= new Date()
-	yesterday.setDate(yesterday.getDate()-1)
-	
-	function showEvent(eventid) {
-		$.get(
-			'$baseurl/events/?id='+eventid,
-			function(data){
-				$.colorbox({html:data});
-			}
-		);			
-	}
-	$(document).ready(function() {
-		$('#events-reminder').fullCalendar({
-			firstDay: yesterday.getDay(),
-			year: yesterday.getFullYear(),
-			month: yesterday.getMonth(),
-			date: yesterday.getDate(),
-			events: '$baseurl/events/json/',
-			header: {
-				left: '',
-				center: '',
-				right: ''
-			},			
-			timeFormat: 'HH(:mm)',
-			defaultView: 'basicWeek',
-			height: 50,
-			eventClick: function(calEvent, jsEvent, view) {
-				showEvent(calEvent.id);
-			}
-		});
-	});
-</script>
-<div id="events-reminder" class="$classtoday"></div>
-<br>
diff --git a/view/theme/slackr/smarty3/birthdays_reminder.tpl b/view/theme/slackr/smarty3/birthdays_reminder.tpl
deleted file mode 100644
index 8af03b33a8..0000000000
--- a/view/theme/slackr/smarty3/birthdays_reminder.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{if $classtoday}}
-<script>
-	$(document).ready(function() {{$lbr}}
-		$('#events-reminder').addClass($.trim('{{$classtoday}}'));
-	{{$rbr}});
-</script>
-{{/if}}
-
diff --git a/view/theme/slackr/smarty3/events_reminder.tpl b/view/theme/slackr/smarty3/events_reminder.tpl
deleted file mode 100644
index 0f699a3022..0000000000
--- a/view/theme/slackr/smarty3/events_reminder.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-{{*
- *	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>
-<script>
-	// start calendar from yesterday
-	var yesterday= new Date()
-	yesterday.setDate(yesterday.getDate()-1)
-	
-	function showEvent(eventid) {
-		$.get(
-			'{{$baseurl}}/events/?id='+eventid,
-			function(data){
-				$.colorbox({html:data});
-			}
-		);			
-	}
-	$(document).ready(function() {
-		$('#events-reminder').fullCalendar({
-			firstDay: yesterday.getDay(),
-			year: yesterday.getFullYear(),
-			month: yesterday.getMonth(),
-			date: yesterday.getDate(),
-			events: '{{$baseurl}}/events/json/',
-			header: {
-				left: '',
-				center: '',
-				right: ''
-			},			
-			timeFormat: 'HH(:mm)',
-			defaultView: 'basicWeek',
-			height: 50,
-			eventClick: function(calEvent, jsEvent, view) {
-				showEvent(calEvent.id);
-			}
-		});
-	});
-</script>
-<div id="events-reminder" class="{{$classtoday}}"></div>
-<br>
diff --git a/view/theme/smoothly/bottom.tpl b/view/theme/smoothly/bottom.tpl
deleted file mode 100644
index 347d87094b..0000000000
--- a/view/theme/smoothly/bottom.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-<script type="text/javascript" src="$baseurl/view/theme/smoothly/js/jquery.autogrow.textarea.js"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-
-});
-function tautogrow(id) {
-$("textarea#comment-edit-text-" + id).autogrow();
-};
-
-function insertFormatting(comment, BBcode, id) {
-var tmpStr = $("#comment-edit-text-" + id).val();
-if(tmpStr == comment) {
-tmpStr = "";
-$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-openMenu("comment-edit-submit-wrapper-" + id);
-}
-textarea = document.getElementById("comment-edit-text-" + id);
-if (document.selection) {
-textarea.focus();
-selected = document.selection.createRange();
-if (BBcode == "url") {
-selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
-} else {
-selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-}
-} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-var start = textarea.selectionStart;
-var end = textarea.selectionEnd;
-if (BBcode == "url") {
-textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
-+ "http://" + textarea.value.substring(start, end)
-+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-} else {
-textarea.value = textarea.value.substring(0, start)
-+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
-+ textarea.value.substring(end, textarea.value.length);
-}
-}
-return true;
-}
-
-function cmtBbOpen(id) {
-$(".comment-edit-bb-" + id).show();
-}
-function cmtBbClose(id) {
-    $(".comment-edit-bb-" + id).hide();
-}
-
-
-
-</script>
diff --git a/view/theme/smoothly/follow.tpl b/view/theme/smoothly/follow.tpl
deleted file mode 100644
index 09258b9c30..0000000000
--- a/view/theme/smoothly/follow.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="follow-sidebar" class="widget">
-	<h3>$connect</h3>
-	<div id="connect-desc">$desc</div>
-	<form action="follow" method="post" >
-		<input id="side-follow-url" type="text-sidebar" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" />
-	</form>
-</div>
-
diff --git a/view/theme/smoothly/jot-header.tpl b/view/theme/smoothly/jot-header.tpl
deleted file mode 100644
index 79d8799a5f..0000000000
--- a/view/theme/smoothly/jot-header.tpl
+++ /dev/null
@@ -1,374 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-
-var editor=false;
-var textlen = 0;
-var plaintext = '$editselect';
-
-function initEditor(cb){
-	if (editor==false){
-		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").hide();
-            		$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-            		$(".jothidden").show();
-            		editor = true;
-            		$("a#jot-perms-icon").colorbox({
-						'inline' : true,
-						'transition' : 'elastic'
-            		});
-	                            $("#profile-jot-submit-wrapper").show();
-								{{ if $newpost }}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{ endif }}   
-
-
-			if (typeof cb!="undefined") cb();
-			return;
-        }
-        tinyMCE.init({
-                theme : "advanced",
-                mode : "specific_textareas",
-                editor_selector: /(profile-jot-text|prvmail-text)/,
-                plugins : "bbcode,paste,fullscreen,autoresize",
-                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : "",
-                theme_advanced_toolbar_location : "top",
-                theme_advanced_toolbar_align : "center",
-                theme_advanced_blockformats : "blockquote,code",
-                //theme_advanced_resizing : true,
-                //theme_advanced_statusbar_location : "bottom",
-                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 : 'div',
-                convert_urls: false,
-                content_css: "$baseurl/view/custom_tinymce.css",
-                theme_advanced_path : false,
-                setup : function(ed) {
-					cPopup = null;
-					ed.onKeyDown.add(function(ed,e) {
-						if(cPopup !== null)
-							cPopup.onkey(e);
-					});
-
-
-
-					ed.onKeyUp.add(function(ed, e) {
-						var txt = tinyMCE.activeEditor.getContent();
-						match = txt.match(/@([^ \n]+)$/);
-						if(match!==null) {
-							if(cPopup === null) {
-								cPopup = new ACPopup(this,baseurl+"/acl");
-							}
-							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-							if(! cPopup.ready) cPopup = null;
-						}
-						else {
-							if(cPopup !== null) { cPopup.close(); cPopup = null; }
-						}
-
-						textlen = txt.length;
-						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-							$('#profile-jot-desc').html(ispublic);
-						}
-                        else {
-                            $('#profile-jot-desc').html('&nbsp;');
-                        }
-
-				//Character count
-
-                                if(textlen <= 140) {
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('grey');
-                                }
-                                if((textlen > 140) && (textlen <= 420)) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').addClass('orange');
-                                }
-                                if(textlen > 420) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('red');
-                                }
-                                $('#character-counter').text(textlen);
-                        });
-                        ed.onInit.add(function(ed) {
-                                ed.pasteAsPlainText = true;
-								$("#profile-jot-text-loading").hide();
-								$(".jothidden").show();
-	                            $("#profile-jot-submit-wrapper").show();
-								{{ if $newpost }}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{ endif }}   
-                             $("#character-counter").show();
-                                if (typeof cb!="undefined") cb();
-                        });
-                }
-        });
-        editor = true;
-        // setup acl popup
-        $("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-        }); 
-    } else {
-        if (typeof cb!="undefined") cb();
-    }
-} // initEditor
-
-function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
-	initEditor();
-}
-
-</script>
-
-<script type="text/javascript" src="js/ajaxupload.js" >
-</script>
-
-<script>
-	var ispublic = '$ispublic';
-
-	$(document).ready(function() {
-		
-		/* enable tinymce on focus and click */
-		$("#profile-jot-text").focus(enableOnUser);
-		$("#profile-jot-text").click(enableOnUser);
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);		
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);
-			}
-
-		}).trigger('change');
-
-	});
-
-	function deleteCheckedItems() {
-		if(confirm('$delitems')) {
-			var checkedstr = '';
-
-			$("#item-delete-selected").hide();
-			$('#item-delete-selected-rotator').show();
-
-			$('.item-select').each( function() {
-				if($(this).is(':checked')) {
-					if(checkedstr.length != 0) {
-						checkedstr = checkedstr + ',' + $(this).val();
-					}
-					else {
-						checkedstr = $(this).val();
-					}
-				}	
-			});
-			$.post('item', { dropitems: checkedstr }, function(data) {
-				window.location.reload();
-			});
-		}
-	}
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("$vidurl");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("$audurl");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("$whereareu", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotTitle() {
-		reply = prompt("$title", $('#jot-title').val());
-		if(reply && reply.length) {
-			$('#jot-title').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#like-rotator-' + id).hide();
-					$(window).scrollTop(0);
-				});
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("$term");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-	
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.colorbox({html:data});
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply, NavUpdate);
-//					if(timer) clearTimeout(timer);
-//					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.colorbox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-  function addeditortext(data) {
-        if(plaintext == 'none') {
-            var currentText = $("#profile-jot-text").val();
-            $("#profile-jot-text").val(currentText + data);
-        }
-        else
-            tinyMCE.execCommand('mceInsertRawHTML',false,data);
-    }
-
-
-	$geotag
-
-</script>
diff --git a/view/theme/smoothly/jot.tpl b/view/theme/smoothly/jot.tpl
deleted file mode 100644
index 12792fa0b4..0000000000
--- a/view/theme/smoothly/jot.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-
-<div id="profile-jot-wrapper" > 
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey" style="display: none;">0</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap">
-			<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		</div>
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap">
-			<input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" />
-		</div>
-		{{ endif }}
-		<div id="jot-text-wrap">
-                	<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /><br>
-                	<textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" >
-			{{ if $content }}$content{{ else }}$share
-			{{ endif }}
-			</textarea>
-		</div>
-
-	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div>
-	</div>  
-	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a href="#" id="profile-link" class="icon border  link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
-		<a href="#" id="profile-video" class="icon border  video" title="$video" onclick="jotVideoURL(); return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
-		<a href="#" id="profile-audio" class="icon border  audio" title="$audio" onclick="jotAudioURL(); return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
-		<a href="#" id="profile-location" class="icon border  globe" title="$setloc" onclick="jotGetLocation(); return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
-		<a href="#" id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
-	</div> 
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >$preview</span>
-
-	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
-		<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-		<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate sharePerms" title="$permset"></a>$bang</div>
-	</div>
-
-	<div id="profile-jot-plugin-wrapper" style="display: none;">
-  	$jotplugins
-	</div>
-	<div id="profile-jot-tools-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-        <div style="display: none;">
-            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                $acl
-                <hr style="clear:both"/>
-                <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-                <div id="profile-jot-email-end"></div>
-                $jotnets
-            </div>
-        </div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-                {{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/smoothly/lang_selector.tpl b/view/theme/smoothly/lang_selector.tpl
deleted file mode 100644
index e777a0a861..0000000000
--- a/view/theme/smoothly/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/smoothly/nav.tpl b/view/theme/smoothly/nav.tpl
deleted file mode 100644
index b923718da0..0000000000
--- a/view/theme/smoothly/nav.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-<nav>
-	<span id="banner">$banner</span>
-
-	<div id="notifications">	
-		{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
-		{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
-<!--		{{ if $nav.notifications }}<a id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }} -->
-		{{ if $nav.introductions }}<a id="intro-update" class="nav-ajax-update" href="$nav.introductions.0" title="$nav.introductions.1"></a>{{ endif }}
-		{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
-		{{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="$nav.notifications.0"  title="$nav.notifications.1"></a>{{ endif }}
-
-		<ul id="nav-notifications-menu" class="menu-popup">
-			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-			<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-			<li class="empty">$emptynotifications</li>
-		</ul>
-	</div>
-	
-	<div id="user-menu" >
-		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
-		
-		<ul id="user-menu-popup" 
-			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
-			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-			{{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0">$nav.register.1</a></li>{{ endif }}
-			
-			{{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
-		
-			{{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
-		
-				{{ if $nav.community }}
-				<li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0">$nav.community.1</a></li>
-				{{ endif }}
-
-			<li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0">$nav.search.1</a></li>
-			<li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0">$nav.directory.1</a></li>
-			{{ if $nav.apps }}<li><a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0">$nav.apps.1</a></li>{{ endif }}
-			
-			{{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
-			{{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
-			{{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
-		
-			{{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
-			{{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
-			
-			{{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
-		
-			{{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
-			
-			{{ if $nav.help }}<li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0">$nav.help.1</a></li>{{ endif }}
-
-			{{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0">$nav.login.1</a></li> {{ endif }}
-			{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
-		</ul>
-	</div>
-</nav>
-
-<div id="scrollup" >
-<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a><br />
-<a href="javascript:ScrollToBottom()"><img src="view/theme/smoothly/images/tobottom.png" alt="to bottom" title="to bottom" /></a>
-</div>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div>
-
-<script>
-var pagetitle = null;
-$("nav").bind('nav-update', function(e,data){
-if (pagetitle==null) pagetitle = document.title;
-var count = $(data).find('notif').attr('count');
-if (count>0) {
-document.title = "("+count+") "+pagetitle;
-} else {
-document.title = pagetitle;
-}
-});
-</script>
diff --git a/view/theme/smoothly/search_item.tpl b/view/theme/smoothly/search_item.tpl
deleted file mode 100644
index 9c90fd0402..0000000000
--- a/view/theme/smoothly/search_item.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-<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">
-			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}			
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
diff --git a/view/theme/smoothly/smarty3/bottom.tpl b/view/theme/smoothly/smarty3/bottom.tpl
deleted file mode 100644
index 0c6aa29040..0000000000
--- a/view/theme/smoothly/smarty3/bottom.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-{{*
- *	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() {
-
-});
-function tautogrow(id) {
-$("textarea#comment-edit-text-" + id).autogrow();
-};
-
-function insertFormatting(comment, BBcode, id) {
-var tmpStr = $("#comment-edit-text-" + id).val();
-if(tmpStr == comment) {
-tmpStr = "";
-$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-openMenu("comment-edit-submit-wrapper-" + id);
-}
-textarea = document.getElementById("comment-edit-text-" + id);
-if (document.selection) {
-textarea.focus();
-selected = document.selection.createRange();
-if (BBcode == "url") {
-selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
-} else {
-selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-}
-} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-var start = textarea.selectionStart;
-var end = textarea.selectionEnd;
-if (BBcode == "url") {
-textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
-+ "http://" + textarea.value.substring(start, end)
-+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-} else {
-textarea.value = textarea.value.substring(0, start)
-+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
-+ textarea.value.substring(end, textarea.value.length);
-}
-}
-return true;
-}
-
-function cmtBbOpen(id) {
-$(".comment-edit-bb-" + id).show();
-}
-function cmtBbClose(id) {
-    $(".comment-edit-bb-" + id).hide();
-}
-
-
-
-</script>
diff --git a/view/theme/smoothly/smarty3/follow.tpl b/view/theme/smoothly/smarty3/follow.tpl
deleted file mode 100644
index 4d9e2a62b8..0000000000
--- a/view/theme/smoothly/smarty3/follow.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	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>
-	<form action="follow" method="post" >
-		<input id="side-follow-url" type="text-sidebar" name="url" size="24" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
-	</form>
-</div>
-
diff --git a/view/theme/smoothly/smarty3/jot-header.tpl b/view/theme/smoothly/smarty3/jot-header.tpl
deleted file mode 100644
index 0560969a6e..0000000000
--- a/view/theme/smoothly/smarty3/jot-header.tpl
+++ /dev/null
@@ -1,379 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script language="javascript" type="text/javascript">
-
-var editor=false;
-var textlen = 0;
-var plaintext = '{{$editselect}}';
-
-function initEditor(cb){
-	if (editor==false){
-		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").hide();
-            		$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-            		$(".jothidden").show();
-            		editor = true;
-            		$("a#jot-perms-icon").colorbox({
-						'inline' : true,
-						'transition' : 'elastic'
-            		});
-	                            $("#profile-jot-submit-wrapper").show();
-								{{if $newpost}}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{/if}}   
-
-
-			if (typeof cb!="undefined") cb();
-			return;
-        }
-        tinyMCE.init({
-                theme : "advanced",
-                mode : "specific_textareas",
-                editor_selector: /(profile-jot-text|prvmail-text)/,
-                plugins : "bbcode,paste,fullscreen,autoresize",
-                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : "",
-                theme_advanced_toolbar_location : "top",
-                theme_advanced_toolbar_align : "center",
-                theme_advanced_blockformats : "blockquote,code",
-                //theme_advanced_resizing : true,
-                //theme_advanced_statusbar_location : "bottom",
-                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 : 'div',
-                convert_urls: false,
-                content_css: "{{$baseurl}}/view/custom_tinymce.css",
-                theme_advanced_path : false,
-                setup : function(ed) {
-					cPopup = null;
-					ed.onKeyDown.add(function(ed,e) {
-						if(cPopup !== null)
-							cPopup.onkey(e);
-					});
-
-
-
-					ed.onKeyUp.add(function(ed, e) {
-						var txt = tinyMCE.activeEditor.getContent();
-						match = txt.match(/@([^ \n]+)$/);
-						if(match!==null) {
-							if(cPopup === null) {
-								cPopup = new ACPopup(this,baseurl+"/acl");
-							}
-							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-							if(! cPopup.ready) cPopup = null;
-						}
-						else {
-							if(cPopup !== null) { cPopup.close(); cPopup = null; }
-						}
-
-						textlen = txt.length;
-						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-							$('#profile-jot-desc').html(ispublic);
-						}
-                        else {
-                            $('#profile-jot-desc').html('&nbsp;');
-                        }
-
-				//Character count
-
-                                if(textlen <= 140) {
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('grey');
-                                }
-                                if((textlen > 140) && (textlen <= 420)) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').addClass('orange');
-                                }
-                                if(textlen > 420) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('red');
-                                }
-                                $('#character-counter').text(textlen);
-                        });
-                        ed.onInit.add(function(ed) {
-                                ed.pasteAsPlainText = true;
-								$("#profile-jot-text-loading").hide();
-								$(".jothidden").show();
-	                            $("#profile-jot-submit-wrapper").show();
-								{{if $newpost}}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{/if}}   
-                             $("#character-counter").show();
-                                if (typeof cb!="undefined") cb();
-                        });
-                }
-        });
-        editor = true;
-        // setup acl popup
-        $("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-        }); 
-    } else {
-        if (typeof cb!="undefined") cb();
-    }
-} // initEditor
-
-function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
-	initEditor();
-}
-
-</script>
-
-<script type="text/javascript" src="js/ajaxupload.js" >
-</script>
-
-<script>
-	var ispublic = '{{$ispublic}}';
-
-	$(document).ready(function() {
-		
-		/* enable tinymce on focus and click */
-		$("#profile-jot-text").focus(enableOnUser);
-		$("#profile-jot-text").click(enableOnUser);
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);		
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);
-			}
-
-		}).trigger('change');
-
-	});
-
-	function deleteCheckedItems() {
-		if(confirm('{{$delitems}}')) {
-			var checkedstr = '';
-
-			$("#item-delete-selected").hide();
-			$('#item-delete-selected-rotator').show();
-
-			$('.item-select').each( function() {
-				if($(this).is(':checked')) {
-					if(checkedstr.length != 0) {
-						checkedstr = checkedstr + ',' + $(this).val();
-					}
-					else {
-						checkedstr = $(this).val();
-					}
-				}	
-			});
-			$.post('item', { dropitems: checkedstr }, function(data) {
-				window.location.reload();
-			});
-		}
-	}
-
-	function jotGetLink() {
-		reply = prompt("{{$linkurl}}");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("{{$vidurl}}");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("{{$audurl}}");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("{{$whereareu}}", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotTitle() {
-		reply = prompt("{{$title}}", $('#jot-title').val());
-		if(reply && reply.length) {
-			$('#jot-title').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#like-rotator-' + id).hide();
-					$(window).scrollTop(0);
-				});
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("{{$term}}");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-	
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.colorbox({html:data});
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply, NavUpdate);
-//					if(timer) clearTimeout(timer);
-//					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.colorbox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-  function addeditortext(data) {
-        if(plaintext == 'none') {
-            var currentText = $("#profile-jot-text").val();
-            $("#profile-jot-text").val(currentText + data);
-        }
-        else
-            tinyMCE.execCommand('mceInsertRawHTML',false,data);
-    }
-
-
-	{{$geotag}}
-
-</script>
diff --git a/view/theme/smoothly/smarty3/jot.tpl b/view/theme/smoothly/smarty3/jot.tpl
deleted file mode 100644
index 0fd09c1965..0000000000
--- a/view/theme/smoothly/smarty3/jot.tpl
+++ /dev/null
@@ -1,89 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div id="profile-jot-wrapper" > 
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey" style="display: none;">0</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="{{$action}}" method="post" >
-		<input type="hidden" name="type" value="{{$ptyp}}" />
-		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-		<input type="hidden" name="return" value="{{$return_path}}" />
-		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-		<div id="jot-title-wrap">
-			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none">
-		</div>
-		{{if $placeholdercategory}}
-		<div id="jot-category-wrap">
-			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" />
-		</div>
-		{{/if}}
-		<div id="jot-text-wrap">
-                	<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /><br>
-                	<textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" >
-			{{if $content}}{{$content}}{{else}}{{$share}}
-			{{/if}}
-			</textarea>
-		</div>
-
-	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="{{$upload}}"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="{{$attach}}"></a></div>
-	</div>  
-	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a href="#" id="profile-link" class="icon border  link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
-		<a href="#" id="profile-video" class="icon border  video" title="{{$video}}" onclick="jotVideoURL(); return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
-		<a href="#" id="profile-audio" class="icon border  audio" title="{{$audio}}" onclick="jotAudioURL(); return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
-		<a href="#" id="profile-location" class="icon border  globe" title="{{$setloc}}" onclick="jotGetLocation(); return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
-		<a href="#" id="profile-nolocation" class="icon border  noglobe" title="{{$noloc}}" onclick="jotClearLocation(); return false;"></a>
-	</div> 
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >{{$preview}}</span>
-
-	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
-		<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
-		<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}} sharePerms" title="{{$permset}}"></a>{{$bang}}</div>
-	</div>
-
-	<div id="profile-jot-plugin-wrapper" style="display: none;">
-  	{{$jotplugins}}
-	</div>
-	<div id="profile-jot-tools-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-        <div style="display: none;">
-            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                {{$acl}}
-                <hr style="clear:both"/>
-                <div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-                <div id="profile-jot-email-end"></div>
-                {{$jotnets}}
-            </div>
-        </div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-                {{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/smoothly/smarty3/lang_selector.tpl b/view/theme/smoothly/smarty3/lang_selector.tpl
deleted file mode 100644
index a1aee8277f..0000000000
--- a/view/theme/smoothly/smarty3/lang_selector.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	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" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{foreach $langs.0 as $v=>$l}}
-				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
-			{{/foreach}}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/smoothly/smarty3/nav.tpl b/view/theme/smoothly/smarty3/nav.tpl
deleted file mode 100644
index 0bbca7e694..0000000000
--- a/view/theme/smoothly/smarty3/nav.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<nav>
-	<span id="banner">{{$banner}}</span>
-
-	<div id="notifications">	
-		{{if $nav.network}}<a id="net-update" class="nav-ajax-update" href="{{$nav.network.0}}" title="{{$nav.network.1}}"></a>{{/if}}
-		{{if $nav.home}}<a id="home-update" class="nav-ajax-update" href="{{$nav.home.0}}" title="{{$nav.home.1}}"></a>{{/if}}
-<!--		{{if $nav.notifications}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>{{/if}} -->
-		{{if $nav.introductions}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.introductions.0}}" title="{{$nav.introductions.1}}"></a>{{/if}}
-		{{if $nav.messages}}<a id="mail-update" class="nav-ajax-update" href="{{$nav.messages.0}}" title="{{$nav.messages.1}}"></a>{{/if}}
-		{{if $nav.notifications}}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="{{$nav.notifications.0}}"  title="{{$nav.notifications.1}}"></a>{{/if}}
-
-		<ul id="nav-notifications-menu" class="menu-popup">
-			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
-			<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-			<li class="empty">{{$emptynotifications}}</li>
-		</ul>
-	</div>
-	
-	<div id="user-menu" >
-		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="{{$nav.home.0}}">{{$sitelocation}}</a>
-		
-		<ul id="user-menu-popup" 
-			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
-			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-			{{if $nav.register}}<li><a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}">{{$nav.register.1}}</a></li>{{/if}}
-			
-			{{if $nav.home}}<li><a id="nav-home-link" class="nav-commlink {{$nav.home.2}}" href="{{$nav.home.0}}">{{$nav.home.1}}</a></li>{{/if}}
-		
-			{{if $nav.network}}<li><a id="nav-network-link" class="nav-commlink {{$nav.network.2}}" href="{{$nav.network.0}}">{{$nav.network.1}}</a></li>{{/if}}
-		
-				{{if $nav.community}}
-				<li><a id="nav-community-link" class="nav-commlink {{$nav.community.2}}" href="{{$nav.community.0}}">{{$nav.community.1}}</a></li>
-				{{/if}}
-
-			<li><a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}">{{$nav.search.1}}</a></li>
-			<li><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}">{{$nav.directory.1}}</a></li>
-			{{if $nav.apps}}<li><a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}">{{$nav.apps.1}}</a></li>{{/if}}
-			
-			{{if $nav.notifications}}<li><a id="nav-notify-link" class="nav-commlink nav-sep {{$nav.notifications.2}}" href="{{$nav.notifications.0}}">{{$nav.notifications.1}}</a></li>{{/if}}
-			{{if $nav.messages}}<li><a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>{{/if}}
-			{{if $nav.contacts}}<li><a id="nav-contacts-link" class="nav-commlink {{$nav.contacts.2}}" href="{{$nav.contacts.0}}">{{$nav.contacts.1}}</a></li>{{/if}}
-		
-			{{if $nav.profiles}}<li><a id="nav-profiles-link" class="nav-commlink nav-sep {{$nav.profiles.2}}" href="{{$nav.profiles.0}}">{{$nav.profiles.1}}</a></li>{{/if}}
-			{{if $nav.settings}}<li><a id="nav-settings-link" class="nav-commlink {{$nav.settings.2}}" href="{{$nav.settings.0}}">{{$nav.settings.1}}</a></li>{{/if}}
-			
-			{{if $nav.manage}}<li><a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}">{{$nav.manage.1}}</a></li>{{/if}}
-		
-			{{if $nav.admin}}<li><a id="nav-admin-link" class="nav-commlink {{$nav.admin.2}}" href="{{$nav.admin.0}}">{{$nav.admin.1}}</a></li>{{/if}}
-			
-			{{if $nav.help}}<li><a id="nav-help-link" class="nav-link {{$nav.help.2}}" href="{{$nav.help.0}}">{{$nav.help.1}}</a></li>{{/if}}
-
-			{{if $nav.login}}<li><a id="nav-login-link" class="nav-link {{$nav.login.2}}" href="{{$nav.login.0}}">{{$nav.login.1}}</a></li> {{/if}}
-			{{if $nav.logout}}<li><a id="nav-logout-link" class="nav-commlink nav-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}">{{$nav.logout.1}}</a></li> {{/if}}
-		</ul>
-	</div>
-</nav>
-
-<div id="scrollup" >
-<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a><br />
-<a href="javascript:ScrollToBottom()"><img src="view/theme/smoothly/images/tobottom.png" alt="to bottom" title="to bottom" /></a>
-</div>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-<div style="position: fixed; top: 3px; left: 5px; z-index:9999">{{$langselector}}</div>
-
-<script>
-var pagetitle = null;
-$("nav").bind('nav-update', function(e,data){
-if (pagetitle==null) pagetitle = document.title;
-var count = $(data).find('notif').attr('count');
-if (count>0) {
-document.title = "("+count+") "+pagetitle;
-} else {
-document.title = pagetitle;
-}
-});
-</script>
diff --git a/view/theme/smoothly/smarty3/search_item.tpl b/view/theme/smoothly/smarty3/search_item.tpl
deleted file mode 100644
index 0d77d544af..0000000000
--- a/view/theme/smoothly/smarty3/search_item.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-{{*
- *	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}}">
-			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-{{$item.id}}" 
-				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}			
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
-				
-		</div>			
-		
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
diff --git a/view/theme/smoothly/smarty3/wall_thread.tpl b/view/theme/smoothly/smarty3/wall_thread.tpl
deleted file mode 100644
index f652de90b8..0000000000
--- a/view/theme/smoothly/smarty3/wall_thread.tpl
+++ /dev/null
@@ -1,165 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
-<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}} wallwall" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
-			{{if $item.owner_url}}
-			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="view/theme/smoothly/images/larrow.gif" alt="{{$item.wall}}" /></div>
-			{{/if}}
-			<div class="wall-item-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                    <ul>
-                        {{$item.item_photo_menu}}
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-			{{if $item.lock}}
-			<div class="wall-item-lock">
-			<img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />
-			</div>
-			{{else}}
-			<div class="wall-item-lock"></div>
-			{{/if}}
-		</div>
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-		<div class="wall-item-author">
-			<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link">
-			<span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span>
-			</a>
-			<div class="wall-item-ago">&bull;</div>
-			<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
-		</div>	
-
-		<div>
-		<hr class="line-dots">
-		</div>
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-				<div class="body-tag">
-					{{foreach $item.tags as $tag}}
-					<span class='tag'>{{$tag}}</span>
-					{{/foreach}}
-				</div>
-
-				{{if $item.has_cats}}
-				<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} 
-				<a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> 
-				{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-				</div>
-				{{/if}}
-
-				{{if $item.has_folders}}
-				<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} 
-				<a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> 
-				{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-				</div>
-				{{/if}}
-
-			</div>
-		</div>
-		<div class="wall-item-social" id="wall-item-social-{{$item.id}}">
-
-			{{if $item.vote}}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-				{{if $item.vote.dislike}}
-				<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
-				{{/if}}
-				{{if $item.vote.share}}
-				<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>				{{/if}}
-				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-			</div>
-			{{/if}}
-
-			{{if $item.plink}}
-			<div class="wall-item-links-wrapper">
-				<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link"></a>
-			</div>
-			{{/if}}
-		 
-			{{if $item.star}}
-			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
-			{{/if}}
-			{{if $item.tagger}}
-			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
-			{{/if}}
-
-			{{if $item.filer}}
-			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
-			{{/if}}
-	
-		</div>
-
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{if $item.edpost}}
-			<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-			{{/if}}
-
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}
-				<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
-				{{/if}}
-			</div>
-
-			{{if $item.drop.pagedrop}}
-			<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />
-			{{/if}}
-
-			<div class="wall-item-delete-end"></div>
-		</div>
-
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-
-	{{if $item.threaded}}
-	{{if $item.comment}}
-        <div class="wall-item-comment-wrapper {{$item.indent}} {{$item.shiny}}" >
-		{{$item.comment}}
-	</div>
-	{{/if}}
-	{{/if}}
-</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
-
-{{foreach $item.children as $child}}
-	{{include file="{{$child.template}}" item=$child}}
-{{/foreach}}
-
-{{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >
-	{{$item.comment}}
-</div>
-{{/if}}
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl
deleted file mode 100644
index 6d1e947754..0000000000
--- a/view/theme/smoothly/wall_thread.tpl
+++ /dev/null
@@ -1,160 +0,0 @@
-{{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-		<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> 
-		<span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-
-<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-<div class="wall-item-outside-wrapper $item.indent $item.shiny wallwall" 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{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="view/theme/smoothly/images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			<div class="wall-item-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul>
-                        $item.item_photo_menu
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-			{{ if $item.lock }}
-			<div class="wall-item-lock">
-			<img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />
-			</div>
-			{{ else }}
-			<div class="wall-item-lock"></div>
-			{{ endif }}
-		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-		<div class="wall-item-author">
-			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link">
-			<span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span>
-			</a>
-			<div class="wall-item-ago">&bull;</div>
-			<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
-		</div>	
-
-		<div>
-		<hr class="line-dots">
-		</div>
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-				<div class="body-tag">
-					{{ for $item.tags as $tag }}
-					<span class='tag'>$tag</span>
-					{{ endfor }}
-				</div>
-
-				{{ if $item.has_cats }}
-				<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name 
-				<a href="$cat.removeurl" title="$remove">[$remove]</a> 
-				{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-				</div>
-				{{ endif }}
-
-				{{ if $item.has_folders }}
-				<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name 
-				<a href="$cat.removeurl" title="$remove">[$remove]</a> 
-				{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-				</div>
-				{{ endif }}
-
-			</div>
-		</div>
-		<div class="wall-item-social" id="wall-item-social-$item.id">
-
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				{{ if $item.vote.dislike }}
-				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ endif }}
-				{{ if $item.vote.share }}
-				<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>				{{ endif }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-
-			{{ if $item.plink }}
-			<div class="wall-item-links-wrapper">
-				<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a>
-			</div>
-			{{ endif }}
-		 
-			{{ if $item.star }}
-			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-			{{ endif }}
-
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}
-	
-		</div>
-
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.edpost }}
-			<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}
-				<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
-				{{ endif }}
-			</div>
-
-			{{ if $item.drop.pagedrop }}
-			<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />
-			{{ endif }}
-
-			<div class="wall-item-delete-end"></div>
-		</div>
-
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-
-	{{ if $item.threaded }}
-	{{ if $item.comment }}
-        <div class="wall-item-comment-wrapper $item.indent $item.shiny" >
-		$item.comment
-	</div>
-	{{ endif }}
-	{{ endif }}
-</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
-
-{{ for $item.children as $child }}
-	{{ inc $child.template with $item=$child }}{{ endinc }}
-{{ endfor }}
-
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
-{{ endif }}
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl
deleted file mode 100644
index f7fe22dd77..0000000000
--- a/view/theme/testbubble/comment_item.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-		<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" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-				{{ if $qcomment }}
-				{{ for $qcomment as $qc }}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
-					&nbsp;
-				{{ endfor }}
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
-		<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
diff --git a/view/theme/testbubble/group_drop.tpl b/view/theme/testbubble/group_drop.tpl
deleted file mode 100644
index f088fc06ff..0000000000
--- a/view/theme/testbubble/group_drop.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="group-delete-wrapper" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id" 
-		onclick="return confirmDelete();" 
-		title="$delete" 
-		id="group-delete-icon-$id" 
-		class="drophide group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >Delete Group</a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/testbubble/group_edit.tpl b/view/theme/testbubble/group_edit.tpl
deleted file mode 100644
index a8b3f92a07..0000000000
--- a/view/theme/testbubble/group_edit.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h2>$title</h2>
-
-
-<div id="group-edit-wrapper" >
-	<form action="group/$gid" id="group-edit-form" method="post" >
-		<div id="group-edit-name-wrapper" >
-			<label id="group-edit-name-label" for="group-edit-name" >$gname</label>
-			<input type="text" id="group-edit-name" name="groupname" value="$name" />
-			<input type="submit" name="submit" value="$submit">
-			$drop
-		</div>
-		<div id="group-edit-name-end"></div>
-		<div id="group-edit-desc">$desc</div>
-		<div id="group-edit-select-end" ></div>
-	</form>
-</div>
diff --git a/view/theme/testbubble/group_side.tpl b/view/theme/testbubble/group_side.tpl
deleted file mode 100644
index a1fc70a22e..0000000000
--- a/view/theme/testbubble/group_side.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}			
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href"><span class="icon small-pencil"></span></a>
-				{{ endif }}
-				<a class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-</div>
-
-
diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
deleted file mode 100644
index 9c0037f7f2..0000000000
--- a/view/theme/testbubble/jot-header.tpl
+++ /dev/null
@@ -1,366 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-var editor=false;
-var textlen = 0;
-var plaintext = '$editselect';
-
-function initEditor(cb) {
-    if (editor==false) {
-        $("#profile-jot-text-loading").show();
- if(plaintext == 'none') {
-            $("#profile-jot-text-loading").hide();
-            $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-            $(".jothidden").show();
-            editor = true;
-            $("a#jot-perms-icon").colorbox({
-				'inline' : true,
-				'transition' : 'elastic'
-            });
-	                            $("#profile-jot-submit-wrapper").show();
-								{{ if $newpost }}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{ endif }}   
-
-
-            if (typeof cb!="undefined") cb();
-            return;
-        }
-        tinyMCE.init({
-                theme : "advanced",
-                mode : "specific_textareas",
-                editor_selector: /(profile-jot-text|prvmail-text)/,
-                plugins : "bbcode,paste,fullscreen,autoresize",
-                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : "",
-                theme_advanced_toolbar_location : "top",
-                theme_advanced_toolbar_align : "center",
-                theme_advanced_blockformats : "blockquote,code",
-                //theme_advanced_resizing : true,
-                //theme_advanced_statusbar_location : "bottom",
-                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 : 'div',
-                convert_urls: false,
-                content_css: "$baseurl/view/custom_tinymce.css",
-                theme_advanced_path : false,
-                setup : function(ed) {
-					cPopup = null;
-					ed.onKeyDown.add(function(ed,e) {
-						if(cPopup !== null)
-							cPopup.onkey(e);
-					});
-
-
-
-					ed.onKeyUp.add(function(ed, e) {
-						var txt = tinyMCE.activeEditor.getContent();
-						match = txt.match(/@([^ \n]+)$/);
-						if(match!==null) {
-							if(cPopup === null) {
-								cPopup = new ACPopup(this,baseurl+"/acl");
-							}
-							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-							if(! cPopup.ready) cPopup = null;
-						}
-						else {
-							if(cPopup !== null) { cPopup.close(); cPopup = null; }
-						}
-
-						textlen = txt.length;
-						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-							$('#profile-jot-desc').html(ispublic);
-						}
-                        else {
-                            $('#profile-jot-desc').html('&nbsp;');
-                        }
-
-								//Character count
-
-                                if(textlen <= 140) {
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('grey');
-                                }
-                                if((textlen > 140) && (textlen <= 420)) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').addClass('orange');
-                                }
-                                if(textlen > 420) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('red');
-                                }
-                                $('#character-counter').text(textlen);
-                        });
-                        ed.onInit.add(function(ed) {
-                                ed.pasteAsPlainText = true;
-								$("#profile-jot-text-loading").hide();
-								$(".jothidden").show();
-	                            $("#profile-jot-submit-wrapper").show();
-								{{ if $newpost }}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{ endif }}   
-                             $("#character-counter").show();
-                                if (typeof cb!="undefined") cb();
-                        });
-                }
-        });
-        editor = true;
-        // setup acl popup
-        $("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-        }); 
-    } else {
-        if (typeof cb!="undefined") cb();
-    }
-} // initEditor
-</script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
-<script>
-    var ispublic = '$ispublic';
-	$(document).ready(function() {
-                /* enable tinymce on focus */
-                $("#profile-jot-text").focus(function(){
-                    if (editor) return;
-                    $(this).val("");
-                    initEditor();
-                }); 
-
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);		
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);
-			}
-
-		}).trigger('change');
-
-	});
-
-	function deleteCheckedItems() {
-		if(confirm('$delitems')) {
-			var checkedstr = '';
-
-			$("#item-delete-selected").hide();
-			$('#item-delete-selected-rotator').show();
-
-			$('.item-select').each( function() {
-				if($(this).is(':checked')) {
-					if(checkedstr.length != 0) {
-						checkedstr = checkedstr + ',' + $(this).val();
-					}
-					else {
-						checkedstr = $(this).val();
-					}
-				}	
-			});
-			$.post('item', { dropitems: checkedstr }, function(data) {
-				window.location.reload();
-			});
-		}
-	}
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("$vidurl");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("$audurl");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("$whereareu", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotTitle() {
-		reply = prompt("$title", $('#jot-title').val());
-		if(reply && reply.length) {
-			$('#jot-title').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#like-rotator-' + id).hide();
-					$(window).scrollTop(0);
-				});
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("$term");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-	
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.colorbox({html:data});
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply);
-					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.colorbox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-  function addeditortext(data) {
-        if(plaintext == 'none') {
-            var currentText = $("#profile-jot-text").val();
-            $("#profile-jot-text").val(currentText + data);
-        }
-        else
-            tinyMCE.execCommand('mceInsertRawHTML',false,data);
-    }
-
-
-	$geotag
-
-</script>
-
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
deleted file mode 100644
index 12f60b29c0..0000000000
--- a/view/theme/testbubble/jot.tpl
+++ /dev/null
@@ -1,75 +0,0 @@
-
-<div id="profile-jot-wrapper" > 
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey" style="display: none;">0</div>
-		<div id="profile-rotator-wrapper" style="display: $visitor;" >
-			<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display:none;"  />
-		</div> 		
-	</div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		<div id="jot-text-wrap">
-                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-		</div>
-	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div>
-	</div>  
-	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon border  link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-video" class="icon border  video" title="$video" onclick="jotVideoURL(); return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-audio" class="icon border  audio" title="$audio" onclick="jotAudioURL(); return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-location" class="icon border  globe" title="$setloc" onclick="jotGetLocation(); return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
-	</div> 
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >$preview</span>
-
-	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
-		<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-		<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate sharePerms" title="$permset"></a>$bang</div>
-	</div>
-
-	<div id="profile-jot-plugin-wrapper" style="display: none;">
-  	$jotplugins
-	</div>
-	<div id="profile-jot-tools-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-        <div style="display: none;">
-            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                $acl
-                <hr style="clear:both"/>
-                <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-                <div id="profile-jot-email-end"></div>
-                $jotnets
-            </div>
-        </div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-                {{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl
deleted file mode 100644
index 244b243ece..0000000000
--- a/view/theme/testbubble/match.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" />
-		</a>
-	</div>
-	<span><a href="$url">$name</a>$inttxt<br />$tags</span>
-	<div class="profile-match-break"></div>
-	{{ if $connlnk }}
-	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
-	{{ endif }}
-	<div class="profile-match-end"></div>
-</div>
\ No newline at end of file
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
deleted file mode 100644
index f4c504d365..0000000000
--- a/view/theme/testbubble/nav.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<nav>
-	$langselector
-
-	<span id="banner">$banner</span>
-
-	<div id="notifications">	
-		{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
-		{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
-<!--		{{ if $nav.notifications }}<a id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }} -->
-		{{ if $nav.introductions }}<a id="intro-update" class="nav-ajax-update" href="$nav.introductions.0" title="$nav.introductions.1"></a>{{ endif }}
-		{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
-		{{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="$nav.notifications.0"  title="$nav.notifications.1"></a>{{ endif }}
-
-		<ul id="nav-notifications-menu" class="menu-popup">
-			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-			<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-			<li class="empty">$emptynotifications</li>
-		</ul>
-	</div>
-	
-	<div id="user-menu" >
-		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
-		
-		<ul id="user-menu-popup" 
-			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
-			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-			{{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0">$nav.register.1</a></li>{{ endif }}
-			
-			{{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
-		
-			{{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
-		
-				{{ if $nav.community }}
-				<li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0">$nav.community.1</a></li>
-				{{ endif }}
-
-			<li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0">$nav.search.1</a></li>
-			<li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0">$nav.directory.1</a></li>
-			{{ if $nav.apps }}<li><a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0">$nav.apps.1</a></li>{{ endif }}
-			
-			{{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
-			{{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
-			{{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
-		
-			{{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
-			{{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
-			
-			{{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
-		
-			{{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
-			
-			{{ if $nav.help }}<li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0">$nav.help.1</a></li>{{ endif }}
-
-			{{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0">$nav.login.1</a></li> {{ endif }}
-			{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
-		</ul>
-	</div>
-</nav>
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
diff --git a/view/theme/testbubble/photo_album.tpl b/view/theme/testbubble/photo_album.tpl
deleted file mode 100644
index a0e3f46c49..0000000000
--- a/view/theme/testbubble/photo_album.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<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" />
-	</div>
-		<p class='caption'>$desc</p>		
-	</a>
-	</div>
-<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/photo_top.tpl b/view/theme/testbubble/photo_top.tpl
deleted file mode 100644
index 48a546a16e..0000000000
--- a/view/theme/testbubble/photo_top.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
-	<div id="photo-album-wrapper-inner">
-	<a href="$photo.link" class="photo-top-photo-link" id="photo-top-photo-link-$id" title="$photo.title"><img src="$photo.src" alt="$phoyo.alt" title="$photo.title" class="photo-top-photo" id="photo-top-photo-$id" /></a>
-	</div>
-	<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
-</div>
-<div class="photo-top-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/photo_view.tpl b/view/theme/testbubble/photo_view.tpl
deleted file mode 100644
index 4c754f5978..0000000000
--- a/view/theme/testbubble/photo_view.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo" class="lframe">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-
diff --git a/view/theme/testbubble/profile_entry.tpl b/view/theme/testbubble/profile_entry.tpl
deleted file mode 100644
index 5bea298ac5..0000000000
--- a/view/theme/testbubble/profile_entry.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo mframe" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
-</div>
-<div class="profile-listing-photo-end"></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-<div class='profile-visible'>$visible</div>
-</div>
-<div class="profile-listing-end"></div>
-
diff --git a/view/theme/testbubble/profile_vcard.tpl b/view/theme/testbubble/profile_vcard.tpl
deleted file mode 100644
index 1686706995..0000000000
--- a/view/theme/testbubble/profile_vcard.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<div class="vcard">
-	<div class="fn label">$profile.name</div>
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/testbubble/saved_searches_aside.tpl b/view/theme/testbubble/saved_searches_aside.tpl
deleted file mode 100644
index e2aae1e77c..0000000000
--- a/view/theme/testbubble/saved_searches_aside.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-	<h3 id="search">$title</h3>
-	$searchbox
-	
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-		<li class="saved-search-li clear">
-			<a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-		</li>
-		{{ endfor }}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl
deleted file mode 100644
index 9c90fd0402..0000000000
--- a/view/theme/testbubble/search_item.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-<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">
-			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}			
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
diff --git a/view/theme/testbubble/smarty3/comment_item.tpl b/view/theme/testbubble/smarty3/comment_item.tpl
deleted file mode 100644
index ef993e8f53..0000000000
--- a/view/theme/testbubble/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	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}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
-				{{if $qcomment}}
-				{{foreach $qcomment as $qc}}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
-					&nbsp;
-				{{/foreach}}
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
-		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
diff --git a/view/theme/testbubble/smarty3/group_drop.tpl b/view/theme/testbubble/smarty3/group_drop.tpl
deleted file mode 100644
index f5039fd8fa..0000000000
--- a/view/theme/testbubble/smarty3/group_drop.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	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();" 
-		title="{{$delete}}" 
-		id="group-delete-icon-{{$id}}" 
-		class="drophide group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >Delete Group</a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/testbubble/smarty3/group_edit.tpl b/view/theme/testbubble/smarty3/group_edit.tpl
deleted file mode 100644
index aaa0d5670e..0000000000
--- a/view/theme/testbubble/smarty3/group_edit.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h2>{{$title}}</h2>
-
-
-<div id="group-edit-wrapper" >
-	<form action="group/{{$gid}}" id="group-edit-form" method="post" >
-		<div id="group-edit-name-wrapper" >
-			<label id="group-edit-name-label" for="group-edit-name" >{{$gname}}</label>
-			<input type="text" id="group-edit-name" name="groupname" value="{{$name}}" />
-			<input type="submit" name="submit" value="{{$submit}}">
-			{{$drop}}
-		</div>
-		<div id="group-edit-name-end"></div>
-		<div id="group-edit-desc">{{$desc}}</div>
-		<div id="group-edit-select-end" ></div>
-	</form>
-</div>
diff --git a/view/theme/testbubble/smarty3/group_side.tpl b/view/theme/testbubble/smarty3/group_side.tpl
deleted file mode 100644
index db246b6de9..0000000000
--- a/view/theme/testbubble/smarty3/group_side.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="widget" id="group-sidebar">
-<h3>{{$title}}</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{foreach $groups as $group}}
-			<li class="sidebar-group-li">
-				{{if $group.cid}}
-					<input type="checkbox" 
-						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
-						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
-						{{if $group.ismember}}checked="checked"{{/if}}
-					/>
-				{{/if}}			
-				{{if $group.edit}}
-					<a class="groupsideedit" href="{{$group.edit.href}}"><span class="icon small-pencil"></span></a>
-				{{/if}}
-				<a class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
-			</li>
-		{{/foreach}}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">{{$createtext}}</a>
-  </div>
-</div>
-
-
diff --git a/view/theme/testbubble/smarty3/jot-header.tpl b/view/theme/testbubble/smarty3/jot-header.tpl
deleted file mode 100644
index 6b082738de..0000000000
--- a/view/theme/testbubble/smarty3/jot-header.tpl
+++ /dev/null
@@ -1,371 +0,0 @@
-{{*
- *	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">
-
-var editor=false;
-var textlen = 0;
-var plaintext = '{{$editselect}}';
-
-function initEditor(cb) {
-    if (editor==false) {
-        $("#profile-jot-text-loading").show();
- if(plaintext == 'none') {
-            $("#profile-jot-text-loading").hide();
-            $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-            $(".jothidden").show();
-            editor = true;
-            $("a#jot-perms-icon").colorbox({
-				'inline' : true,
-				'transition' : 'elastic'
-            });
-	                            $("#profile-jot-submit-wrapper").show();
-								{{if $newpost}}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{/if}}   
-
-
-            if (typeof cb!="undefined") cb();
-            return;
-        }
-        tinyMCE.init({
-                theme : "advanced",
-                mode : "specific_textareas",
-                editor_selector: /(profile-jot-text|prvmail-text)/,
-                plugins : "bbcode,paste,fullscreen,autoresize",
-                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : "",
-                theme_advanced_toolbar_location : "top",
-                theme_advanced_toolbar_align : "center",
-                theme_advanced_blockformats : "blockquote,code",
-                //theme_advanced_resizing : true,
-                //theme_advanced_statusbar_location : "bottom",
-                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 : 'div',
-                convert_urls: false,
-                content_css: "{{$baseurl}}/view/custom_tinymce.css",
-                theme_advanced_path : false,
-                setup : function(ed) {
-					cPopup = null;
-					ed.onKeyDown.add(function(ed,e) {
-						if(cPopup !== null)
-							cPopup.onkey(e);
-					});
-
-
-
-					ed.onKeyUp.add(function(ed, e) {
-						var txt = tinyMCE.activeEditor.getContent();
-						match = txt.match(/@([^ \n]+)$/);
-						if(match!==null) {
-							if(cPopup === null) {
-								cPopup = new ACPopup(this,baseurl+"/acl");
-							}
-							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-							if(! cPopup.ready) cPopup = null;
-						}
-						else {
-							if(cPopup !== null) { cPopup.close(); cPopup = null; }
-						}
-
-						textlen = txt.length;
-						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-							$('#profile-jot-desc').html(ispublic);
-						}
-                        else {
-                            $('#profile-jot-desc').html('&nbsp;');
-                        }
-
-								//Character count
-
-                                if(textlen <= 140) {
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('grey');
-                                }
-                                if((textlen > 140) && (textlen <= 420)) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').addClass('orange');
-                                }
-                                if(textlen > 420) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('red');
-                                }
-                                $('#character-counter').text(textlen);
-                        });
-                        ed.onInit.add(function(ed) {
-                                ed.pasteAsPlainText = true;
-								$("#profile-jot-text-loading").hide();
-								$(".jothidden").show();
-	                            $("#profile-jot-submit-wrapper").show();
-								{{if $newpost}}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{/if}}   
-                             $("#character-counter").show();
-                                if (typeof cb!="undefined") cb();
-                        });
-                }
-        });
-        editor = true;
-        // setup acl popup
-        $("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-        }); 
-    } else {
-        if (typeof cb!="undefined") cb();
-    }
-} // initEditor
-</script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
-<script>
-    var ispublic = '{{$ispublic}}';
-	$(document).ready(function() {
-                /* enable tinymce on focus */
-                $("#profile-jot-text").focus(function(){
-                    if (editor) return;
-                    $(this).val("");
-                    initEditor();
-                }); 
-
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);		
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);
-			}
-
-		}).trigger('change');
-
-	});
-
-	function deleteCheckedItems() {
-		if(confirm('{{$delitems}}')) {
-			var checkedstr = '';
-
-			$("#item-delete-selected").hide();
-			$('#item-delete-selected-rotator').show();
-
-			$('.item-select').each( function() {
-				if($(this).is(':checked')) {
-					if(checkedstr.length != 0) {
-						checkedstr = checkedstr + ',' + $(this).val();
-					}
-					else {
-						checkedstr = $(this).val();
-					}
-				}	
-			});
-			$.post('item', { dropitems: checkedstr }, function(data) {
-				window.location.reload();
-			});
-		}
-	}
-
-	function jotGetLink() {
-		reply = prompt("{{$linkurl}}");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("{{$vidurl}}");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("{{$audurl}}");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("{{$whereareu}}", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotTitle() {
-		reply = prompt("{{$title}}", $('#jot-title').val());
-		if(reply && reply.length) {
-			$('#jot-title').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#like-rotator-' + id).hide();
-					$(window).scrollTop(0);
-				});
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("{{$term}}");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-	
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.colorbox({html:data});
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply);
-					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.colorbox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-  function addeditortext(data) {
-        if(plaintext == 'none') {
-            var currentText = $("#profile-jot-text").val();
-            $("#profile-jot-text").val(currentText + data);
-        }
-        else
-            tinyMCE.execCommand('mceInsertRawHTML',false,data);
-    }
-
-
-	{{$geotag}}
-
-</script>
-
diff --git a/view/theme/testbubble/smarty3/jot.tpl b/view/theme/testbubble/smarty3/jot.tpl
deleted file mode 100644
index 8d281dbaaa..0000000000
--- a/view/theme/testbubble/smarty3/jot.tpl
+++ /dev/null
@@ -1,80 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div id="profile-jot-wrapper" > 
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey" style="display: none;">0</div>
-		<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-			<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display:none;"  />
-		</div> 		
-	</div>
-
-	<form id="profile-jot-form" action="{{$action}}" method="post" >
-		<input type="hidden" name="type" value="{{$ptyp}}" />
-		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-		<input type="hidden" name="return" value="{{$return_path}}" />
-		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="{{$post_id}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
-		<div id="jot-text-wrap">
-                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
-		</div>
-	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="{{$upload}}"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="{{$attach}}"></a></div>
-	</div>  
-	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon border  link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-video" class="icon border  video" title="{{$video}}" onclick="jotVideoURL(); return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-audio" class="icon border  audio" title="{{$audio}}" onclick="jotAudioURL(); return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-location" class="icon border  globe" title="{{$setloc}}" onclick="jotGetLocation(); return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-nolocation" class="icon border  noglobe" title="{{$noloc}}" onclick="jotClearLocation(); return false;"></a>
-	</div> 
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >{{$preview}}</span>
-
-	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
-		<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
-		<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}} sharePerms" title="{{$permset}}"></a>{{$bang}}</div>
-	</div>
-
-	<div id="profile-jot-plugin-wrapper" style="display: none;">
-  	{{$jotplugins}}
-	</div>
-	<div id="profile-jot-tools-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-        <div style="display: none;">
-            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                {{$acl}}
-                <hr style="clear:both"/>
-                <div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-                <div id="profile-jot-email-end"></div>
-                {{$jotnets}}
-            </div>
-        </div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-                {{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/testbubble/smarty3/match.tpl b/view/theme/testbubble/smarty3/match.tpl
deleted file mode 100644
index 61a861c1cc..0000000000
--- a/view/theme/testbubble/smarty3/match.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	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}}">
-			<img src="{{$photo}}" alt="{{$name}}" />
-		</a>
-	</div>
-	<span><a href="{{$url}}">{{$name}}</a>{{$inttxt}}<br />{{$tags}}</span>
-	<div class="profile-match-break"></div>
-	{{if $connlnk}}
-	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-	{{/if}}
-	<div class="profile-match-end"></div>
-</div>
\ No newline at end of file
diff --git a/view/theme/testbubble/smarty3/nav.tpl b/view/theme/testbubble/smarty3/nav.tpl
deleted file mode 100644
index be7c2e7b66..0000000000
--- a/view/theme/testbubble/smarty3/nav.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<nav>
-	{{$langselector}}
-
-	<span id="banner">{{$banner}}</span>
-
-	<div id="notifications">	
-		{{if $nav.network}}<a id="net-update" class="nav-ajax-update" href="{{$nav.network.0}}" title="{{$nav.network.1}}"></a>{{/if}}
-		{{if $nav.home}}<a id="home-update" class="nav-ajax-update" href="{{$nav.home.0}}" title="{{$nav.home.1}}"></a>{{/if}}
-<!--		{{if $nav.notifications}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>{{/if}} -->
-		{{if $nav.introductions}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.introductions.0}}" title="{{$nav.introductions.1}}"></a>{{/if}}
-		{{if $nav.messages}}<a id="mail-update" class="nav-ajax-update" href="{{$nav.messages.0}}" title="{{$nav.messages.1}}"></a>{{/if}}
-		{{if $nav.notifications}}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="{{$nav.notifications.0}}"  title="{{$nav.notifications.1}}"></a>{{/if}}
-
-		<ul id="nav-notifications-menu" class="menu-popup">
-			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
-			<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-			<li class="empty">{{$emptynotifications}}</li>
-		</ul>
-	</div>
-	
-	<div id="user-menu" >
-		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="{{$nav.home.0}}">{{$sitelocation}}</a>
-		
-		<ul id="user-menu-popup" 
-			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
-			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-			{{if $nav.register}}<li><a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}">{{$nav.register.1}}</a></li>{{/if}}
-			
-			{{if $nav.home}}<li><a id="nav-home-link" class="nav-commlink {{$nav.home.2}}" href="{{$nav.home.0}}">{{$nav.home.1}}</a></li>{{/if}}
-		
-			{{if $nav.network}}<li><a id="nav-network-link" class="nav-commlink {{$nav.network.2}}" href="{{$nav.network.0}}">{{$nav.network.1}}</a></li>{{/if}}
-		
-				{{if $nav.community}}
-				<li><a id="nav-community-link" class="nav-commlink {{$nav.community.2}}" href="{{$nav.community.0}}">{{$nav.community.1}}</a></li>
-				{{/if}}
-
-			<li><a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}">{{$nav.search.1}}</a></li>
-			<li><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}">{{$nav.directory.1}}</a></li>
-			{{if $nav.apps}}<li><a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}">{{$nav.apps.1}}</a></li>{{/if}}
-			
-			{{if $nav.notifications}}<li><a id="nav-notify-link" class="nav-commlink nav-sep {{$nav.notifications.2}}" href="{{$nav.notifications.0}}">{{$nav.notifications.1}}</a></li>{{/if}}
-			{{if $nav.messages}}<li><a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>{{/if}}
-			{{if $nav.contacts}}<li><a id="nav-contacts-link" class="nav-commlink {{$nav.contacts.2}}" href="{{$nav.contacts.0}}">{{$nav.contacts.1}}</a></li>{{/if}}
-		
-			{{if $nav.profiles}}<li><a id="nav-profiles-link" class="nav-commlink nav-sep {{$nav.profiles.2}}" href="{{$nav.profiles.0}}">{{$nav.profiles.1}}</a></li>{{/if}}
-			{{if $nav.settings}}<li><a id="nav-settings-link" class="nav-commlink {{$nav.settings.2}}" href="{{$nav.settings.0}}">{{$nav.settings.1}}</a></li>{{/if}}
-			
-			{{if $nav.manage}}<li><a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}">{{$nav.manage.1}}</a></li>{{/if}}
-		
-			{{if $nav.admin}}<li><a id="nav-admin-link" class="nav-commlink {{$nav.admin.2}}" href="{{$nav.admin.0}}">{{$nav.admin.1}}</a></li>{{/if}}
-			
-			{{if $nav.help}}<li><a id="nav-help-link" class="nav-link {{$nav.help.2}}" href="{{$nav.help.0}}">{{$nav.help.1}}</a></li>{{/if}}
-
-			{{if $nav.login}}<li><a id="nav-login-link" class="nav-link {{$nav.login.2}}" href="{{$nav.login.0}}">{{$nav.login.1}}</a></li> {{/if}}
-			{{if $nav.logout}}<li><a id="nav-logout-link" class="nav-commlink nav-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}">{{$nav.logout.1}}</a></li> {{/if}}
-		</ul>
-	</div>
-</nav>
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
diff --git a/view/theme/testbubble/smarty3/photo_album.tpl b/view/theme/testbubble/smarty3/photo_album.tpl
deleted file mode 100644
index 7ca7bd9d62..0000000000
--- a/view/theme/testbubble/smarty3/photo_album.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	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}}" />
-	</div>
-		<p class='caption'>{{$desc}}</p>		
-	</a>
-	</div>
-<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/smarty3/photo_top.tpl b/view/theme/testbubble/smarty3/photo_top.tpl
deleted file mode 100644
index 915609b7f0..0000000000
--- a/view/theme/testbubble/smarty3/photo_top.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	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">
-	<a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$id}}" title="{{$photo.title}}"><img src="{{$photo.src}}" alt="{{$phoyo.alt}}" title="{{$photo.title}}" class="photo-top-photo" id="photo-top-photo-{{$id}}" /></a>
-	</div>
-	<div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div>
-</div>
-<div class="photo-top-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/smarty3/photo_view.tpl b/view/theme/testbubble/smarty3/photo_view.tpl
deleted file mode 100644
index fa5af03a1e..0000000000
--- a/view/theme/testbubble/smarty3/photo_view.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{{*
- *	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>
-
-<div id="photo-edit-link-wrap">
-{{if $tools}}
-<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
--
-<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
-{{/if}}
-{{if $lock}} - <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo{{$id}}');" /> {{/if}}
-</div>
-
-<div id="photo-photo" class="lframe">
-	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
-	<a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a>
-	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >{{$desc}}</div>
-{{if $tags}}
-<div id="in-this-photo-text">{{$tags.0}}</div>
-<div id="in-this-photo">{{$tags.1}}</div>
-{{/if}}
-{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
-
-{{if $edit}}{{$edit}}{{/if}}
-
-{{if $likebuttons}}
-<div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
-</div>
-{{/if}}
-
-{{$comments}}
-
-{{$paginate}}
-
diff --git a/view/theme/testbubble/smarty3/profile_entry.tpl b/view/theme/testbubble/smarty3/profile_entry.tpl
deleted file mode 100644
index 66997c3788..0000000000
--- a/view/theme/testbubble/smarty3/profile_entry.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo mframe" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
-</div>
-<div class="profile-listing-photo-end"></div>
-<div class="profile-listing-name" id="profile-listing-name-{{$id}}"><a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a></div>
-<div class='profile-visible'>{{$visible}}</div>
-</div>
-<div class="profile-listing-end"></div>
-
diff --git a/view/theme/testbubble/smarty3/profile_vcard.tpl b/view/theme/testbubble/smarty3/profile_vcard.tpl
deleted file mode 100644
index 96e37d5e44..0000000000
--- a/view/theme/testbubble/smarty3/profile_vcard.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-	<div class="fn label">{{$profile.name}}</div>
-				
-	
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></div>
-
-
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{if $connect}}
-				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block}}
-
-
diff --git a/view/theme/testbubble/smarty3/saved_searches_aside.tpl b/view/theme/testbubble/smarty3/saved_searches_aside.tpl
deleted file mode 100644
index 6778dde36e..0000000000
--- a/view/theme/testbubble/smarty3/saved_searches_aside.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	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}}
-	
-	<ul id="saved-search-ul">
-		{{foreach $saved as $search}}
-		<li class="saved-search-li clear">
-			<a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"></a>
-			<a class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.term}}</a>
-		</li>
-		{{/foreach}}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/theme/testbubble/smarty3/search_item.tpl b/view/theme/testbubble/smarty3/search_item.tpl
deleted file mode 100644
index 0d77d544af..0000000000
--- a/view/theme/testbubble/smarty3/search_item.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-{{*
- *	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}}">
-			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-{{$item.id}}" 
-				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}			
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
-				
-		</div>			
-		
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
diff --git a/view/theme/testbubble/smarty3/wall_thread.tpl b/view/theme/testbubble/smarty3/wall_thread.tpl
deleted file mode 100644
index 5c1a70f73d..0000000000
--- a/view/theme/testbubble/smarty3/wall_thread.tpl
+++ /dev/null
@@ -1,112 +0,0 @@
-{{*
- *	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>
-	</div>
-	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
-<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}} wallwall" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
-			{{if $item.owner_url}}
-			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
-			{{/if}}
-			<div class="wall-item-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                    <ul>
-                        {{$item.item_photo_menu}}
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}
-		</div>
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-					<div class="body-tag">
-						{{foreach $item.tags as $tag}}
-							<span class='tag'>{{$tag}}</span>
-						{{/foreach}}
-					</div>
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{if $item.vote}}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-				{{if $item.vote.dislike}}<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
-				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
-				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-			</div>
-			{{/if}}
-			{{if $item.plink}}
-				<div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link"></a></div>
-			{{/if}}
-			{{if $item.edpost}}
-				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-			{{/if}}
-			 
-			{{if $item.star}}
-			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
-			{{/if}}
-			{{if $item.tagger}}
-			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
-			{{/if}}
-			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-		<div class="wall-item-author">
-			<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-			<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
-		</div>	
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-	{{if $item.threaded}}
-	{{if $item.comment}}
-	<div class="wall-item-comment-wrapper {{$item.indent}} {{$item.shiny}}" >
-		{{$item.comment}}
-	</div>
-	{{/if}}
-	{{/if}}
-</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
-
-{{foreach $item.children as $child}}
-	{{include file="{{$child.template}}" item=$child}}
-{{/foreach}}
-
-{{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >
-	{{$item.comment}}
-</div>
-{{/if}}
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/testbubble/wall_thread.tpl b/view/theme/testbubble/wall_thread.tpl
deleted file mode 100644
index c2ccf9d721..0000000000
--- a/view/theme/testbubble/wall_thread.tpl
+++ /dev/null
@@ -1,107 +0,0 @@
-{{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-<div class="wall-item-outside-wrapper $item.indent $item.shiny wallwall" 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{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			<div class="wall-item-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul>
-                        $item.item_photo_menu
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
-		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					<div class="body-tag">
-						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
-						{{ endfor }}
-					</div>
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				{{ if $item.vote.dislike }}<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>{{ endif }}
-				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-			 
-			{{ if $item.star }}
-			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-			{{ endif }}
-			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-		<div class="wall-item-author">
-			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-			<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-		</div>	
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-	{{ if $item.threaded }}
-	{{ if $item.comment }}
-	<div class="wall-item-comment-wrapper $item.indent $item.shiny" >
-		$item.comment
-	</div>
-	{{ endif }}
-	{{ endif }}
-</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
-
-{{ for $item.children as $child }}
-	{{ inc $child.template with $item=$child }}{{ endinc }}
-{{ endfor }}
-
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
-{{ endif }}
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
diff --git a/view/theme/vier/comment_item.tpl b/view/theme/vier/comment_item.tpl
deleted file mode 100644
index 4e39c0772a..0000000000
--- a/view/theme/vier/comment_item.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-		{{ if $threaded }}
-		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;">
-		{{ else }}
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-		{{ endif }}
-			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);">$comment</textarea>
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-
-				<div class="comment-edit-bb">
-	                                <a title="$edimg" onclick="insertFormatting('$comment','img',$id);"><i class="icon-picture"></i></a>      
-	                                <a title="$edurl" onclick="insertFormatting('$comment','url',$id);"><i class="icon-bookmark"></i></a>
-	                                <a title="$edvideo" onclick="insertFormatting('$comment','video',$id);"><i class="icon-film"></i></a>
-                                                                                
-	                                <a title="$eduline" onclick="insertFormatting('$comment','u',$id);"><i class="icon-underline"></i></a>
-	                                <a title="$editalic" onclick="insertFormatting('$comment','i',$id);"><i class="icon-italic"></i></a>
-	                                <a title="$edbold" onclick="insertFormatting('$comment','b',$id);"><i class="icon-bold"></i></a>
-	                                <a title="$edquote" onclick="insertFormatting('$comment','quote',$id);"><i class="icon-comments"></i></a>
-
-                                </div>
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/vier/mail_list.tpl b/view/theme/vier/mail_list.tpl
deleted file mode 100644
index 1d78db2fc5..0000000000
--- a/view/theme/vier/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete"><i class="icon-trash icon-large"></i></a>
-</div>
diff --git a/view/theme/vier/nav.tpl b/view/theme/vier/nav.tpl
deleted file mode 100644
index dfb35a62c0..0000000000
--- a/view/theme/vier/nav.tpl
+++ /dev/null
@@ -1,145 +0,0 @@
-<header>
-	{# $langselector #}
-
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-	<ul>
-		{{ if $nav.community }}
-			<li id="nav-community-link" class="nav-menu $sel.community">
-				<a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-			</li>
-		{{ endif }}
-		
-		{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu $sel.network">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-				<span id="net-update" class="nav-notify"></span>
-			</li>
-		{{ endif }}
-		{{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-				<span id="home-update" class="nav-notify"></span>
-			</li>
-		{{ endif }}
-		{{ if $nav.messages }}
-			<li id="nav-messages-linkmenu" class="nav-menu">
-				<a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">$nav.messages.1
-                        	<span id="mail-update" class="nav-notify"></span></a>
-                        	<ul id="nav-messages-menu" class="menu-popup">
-                                	<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-                                        <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-                        	</ul>
-                        </li>           
-                {{ endif }}
-
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear"></span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
-				<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-				<li><a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a></li>
-				{{ if $nav.delegations }}<li><a class="$nav.delegations.2" href="$nav.delegations.0" title="$nav.delegations.3">$nav.delegations.1</a></li>{{ endif }}
-				{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
-			</ul>		
-		</li>
-		{{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify"></span></a>
-				<span id="notify-update" class="nav-notify"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}		
-		
-<!--		
-		{{ if $nav.help }} 
-		<li id="nav-help-link" class="nav-menu $sel.help">
-			<a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-		</li>
-		{{ endif }}
--->
-
-		{{ if $userinfo }}
-			<li id="nav-user-linklabel" class="nav-menu"><a href="#" rel="#nav-user-menu" title="$sitelocation">$userinfo.name</a>
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-		{{ if $nav.search}}
-                <li id="search-box">
-                        <form method="get" action="$nav.search.0">
-                        	<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-                        </form>
-                </li>
-		{{ endif }}
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>
-		{{ endif }}
-	</ul>
-
-</nav>
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/vier/profile_edlink.tpl b/view/theme/vier/profile_edlink.tpl
deleted file mode 100644
index 5bdbb834a5..0000000000
--- a/view/theme/vier/profile_edlink.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<div class="clear"></div>
diff --git a/view/theme/vier/profile_vcard.tpl b/view/theme/vier/profile_vcard.tpl
deleted file mode 100644
index aa716f100b..0000000000
--- a/view/theme/vier/profile_vcard.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ else }}
-			<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles" ></a></div>
-		{{ endif }}
-	</div>
-
-
-	<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl
deleted file mode 100644
index 334e33fca7..0000000000
--- a/view/theme/vier/search_item.tpl
+++ /dev/null
@@ -1,92 +0,0 @@
-
-<div class="wall-item-decor">
-	<span class="icon star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<div class="wall-item-container $item.indent $item.shiny ">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-		<div class="wall-item-actions-author">
-			<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">
-				{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-				{{ if $item.lock }}<span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-		</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-			<!-- {{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href"><i class="icon-link icon-large"></i></a>{{ endif }} -->
-			{{ if $item.conv }}<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'><i class="icon-link icon-large"></i></a>{{ endif }}
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-location">$item.location&nbsp;</div>	
-			
-			<div class="wall-item-actions-social">
-			{{ if $item.star }}
-				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
-			{{ endif }}
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
-			{{ endif }}			
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
diff --git a/view/theme/vier/smarty3/comment_item.tpl b/view/theme/vier/smarty3/comment_item.tpl
deleted file mode 100644
index b683f12424..0000000000
--- a/view/theme/vier/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{{*
- *	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}}
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
-		{{/if}}
-			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
-				<input type="hidden" name="type" value="{{$type}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});">{{$comment}}</textarea>
-				{{if $qcomment}}
-					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-					<option value=""></option>
-				{{foreach $qcomment as $qc}}
-					<option value="{{$qc}}">{{$qc}}</option>				
-				{{/foreach}}
-					</select>
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-
-				<div class="comment-edit-bb">
-	                                <a title="{{$edimg}}" onclick="insertFormatting('{{$comment}}','img',{{$id}});"><i class="icon-picture"></i></a>      
-	                                <a title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});"><i class="icon-bookmark"></i></a>
-	                                <a title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});"><i class="icon-film"></i></a>
-                                                                                
-	                                <a title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});"><i class="icon-underline"></i></a>
-	                                <a title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});"><i class="icon-italic"></i></a>
-	                                <a title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});"><i class="icon-bold"></i></a>
-	                                <a title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});"><i class="icon-comments"></i></a>
-
-                                </div>
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/vier/smarty3/mail_list.tpl b/view/theme/vier/smarty3/mail_list.tpl
deleted file mode 100644
index c4d9d68070..0000000000
--- a/view/theme/vier/smarty3/mail_list.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	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>
-	<span class="mail-date">{{$date}}</span>
-	<span class="mail-count">{{$count}}</span>
-	
-	<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete"><i class="icon-trash icon-large"></i></a>
-</div>
diff --git a/view/theme/vier/smarty3/nav.tpl b/view/theme/vier/smarty3/nav.tpl
deleted file mode 100644
index f4754e2d6a..0000000000
--- a/view/theme/vier/smarty3/nav.tpl
+++ /dev/null
@@ -1,150 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<header>
-	{{* {{$langselector}} *}}
-
-	<div id="site-location">{{$sitelocation}}</div>
-	<div id="banner">{{$banner}}</div>
-</header>
-<nav>
-	<ul>
-		{{if $nav.community}}
-			<li id="nav-community-link" class="nav-menu {{$sel.community}}">
-				<a class="{{$nav.community.2}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
-			</li>
-		{{/if}}
-		
-		{{if $nav.network}}
-			<li id="nav-network-link" class="nav-menu {{$sel.network}}">
-				<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
-				<span id="net-update" class="nav-notify"></span>
-			</li>
-		{{/if}}
-		{{if $nav.home}}
-			<li id="nav-home-link" class="nav-menu {{$sel.home}}">
-				<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
-				<span id="home-update" class="nav-notify"></span>
-			</li>
-		{{/if}}
-		{{if $nav.messages}}
-			<li id="nav-messages-linkmenu" class="nav-menu">
-				<a href="{{$nav.messages.0}}" rel="#nav-messages-menu" title="{{$nav.messages.1}}">{{$nav.messages.1}}
-                        	<span id="mail-update" class="nav-notify"></span></a>
-                        	<ul id="nav-messages-menu" class="menu-popup">
-                                	<li id="nav-messages-see-all"><a href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>
-                                        <li id="nav-messages-see-all"><a href="{{$nav.messages.new.0}}">{{$nav.messages.new.1}}</a></li>
-                        	</ul>
-                        </li>           
-                {{/if}}
-
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear"></span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}				
-				{{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}
-				<li><a class="{{$nav.search.2}}" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-				<li><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a></li>
-				{{if $nav.delegations}}<li><a class="{{$nav.delegations.2}}" href="{{$nav.delegations.0}}" title="{{$nav.delegations.3}}">{{$nav.delegations.1}}</a></li>{{/if}}
-				{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
-				{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
-
-				{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
-				{{if $nav.login}}<li><a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
-			</ul>		
-		</li>
-		{{if $nav.notifications}}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify"></span></a>
-				<span id="notify-update" class="nav-notify"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
-					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-			</li>		
-		{{/if}}		
-		
-<!--		
-		{{if $nav.help}} 
-		<li id="nav-help-link" class="nav-menu {{$sel.help}}">
-			<a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
-		</li>
-		{{/if}}
--->
-
-		{{if $userinfo}}
-			<li id="nav-user-linklabel" class="nav-menu"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}">{{$userinfo.name}}</a>
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{foreach $nav.usermenu as $usermenu}}
-						<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
-					{{/foreach}}
-					{{if $nav.notifications}}<li><a class="{{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a></li>{{/if}}
-					{{if $nav.messages}}<li><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a></li>{{/if}}
-					{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}	
-				</ul>
-			</li>
-		{{/if}}
-		
-		{{if $nav.search}}
-                <li id="search-box">
-                        <form method="get" action="{{$nav.search.0}}">
-                        	<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-                        </form>
-                </li>
-		{{/if}}
-		
-		{{if $nav.apps}}
-			<li id="nav-apps-link" class="nav-menu {{$sel.apps}}">
-				<a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{foreach $apps as $ap}}
-					<li>{{$ap}}</li>
-					{{/foreach}}
-				</ul>
-			</li>
-		{{/if}}
-	</ul>
-
-</nav>
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-{{*
-
-{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
-{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
-
-<span id="nav-link-wrapper" >
-
-{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
-
-<a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
-	
-{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
-
-<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
-<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
-
-{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
-
-{{if $nav.notifications}}
-<a id="nav-notify-link" class="nav-commlink {{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{/if}}
-{{if $nav.messages}}
-<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{/if}}
-
-{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
-{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
-{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">{{$banner}}</span>
-*}}
diff --git a/view/theme/vier/smarty3/profile_edlink.tpl b/view/theme/vier/smarty3/profile_edlink.tpl
deleted file mode 100644
index 97990f7bef..0000000000
--- a/view/theme/vier/smarty3/profile_edlink.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	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
deleted file mode 100644
index 9e0da287cf..0000000000
--- a/view/theme/vier/smarty3/profile_vcard.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">{{$profile.name}}</div>
-		{{if $profile.edit}}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{foreach $profile.menu.entries as $e}}
-				<li>
-					<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
-				</li>
-				{{/foreach}}
-				<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
-				<li><a href="profiles" >{{$profile.edit.3}}</a></li>
-								
-			</ul>
-			</div>
-		{{else}}
-			<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
-		{{/if}}
-	</div>
-
-
-	<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt><br> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal-code}}</span>
-			</span>
-			{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{if $connect}}
-				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block}}
-
-
diff --git a/view/theme/vier/smarty3/search_item.tpl b/view/theme/vier/smarty3/search_item.tpl
deleted file mode 100644
index 0a62fd5843..0000000000
--- a/view/theme/vier/smarty3/search_item.tpl
+++ /dev/null
@@ -1,97 +0,0 @@
-{{*
- *	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>
-	{{if $item.lock}}<span class="icon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}	
-	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-</div>
-
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} ">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
-				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-				{{$item.item_photo_menu}}
-				</ul>
-				
-			</div>
-		</div>
-		<div class="wall-item-actions-author">
-			<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> 
-			<span class="wall-item-ago">
-				{{if $item.plink}}<a class="link" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
-				{{if $item.lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
-			</span>
-		</div>
-		<div class="wall-item-content">
-			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
-			{{$item.body}}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{foreach $item.tags as $tag}}
-				<span class='tag'>{{$tag}}</span>
-			{{/foreach}}
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-			<!-- {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
-			{{if $item.conv}}<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'><i class="icon-link icon-large"></i></a>{{/if}}
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-location">{{$item.location}}&nbsp;</div>	
-			
-			<div class="wall-item-actions-social">
-			{{if $item.star}}
-				<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
-				<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
-				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger}}">{{$item.star.tagger}}</a>
-			{{/if}}
-			
-			{{if $item.vote}}
-				<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
-				<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
-			{{/if}}
-						
-			{{if $item.vote.share}}
-				<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
-			{{/if}}			
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{if $item.drop.pagedrop}}
-					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
-				{{/if}}
-				{{if $item.drop.dropping}}
-					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
-				{{/if}}
-				{{if $item.edpost}}
-					<a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-				{{/if}}
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
-	</div>
-</div>
diff --git a/view/theme/vier/smarty3/threaded_conversation.tpl b/view/theme/vier/smarty3/threaded_conversation.tpl
deleted file mode 100644
index dc3e918f61..0000000000
--- a/view/theme/vier/smarty3/threaded_conversation.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$live_update}}
-
-{{foreach $threads as $thread}}
-
-<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}}  {{$thread.toplevel}}">
-       
-       
-		{{if $thread.type == tag}}
-			{{include file="wall_item_tag.tpl" item=$thread}}
-		{{else}}
-			{{include file="{{$thread.template}}" item=$thread}}
-		{{/if}}
-		
-</div>
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
-{{if $dropping}}
-<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;">
-	<span class="icon s22 delete text">{{$dropping}}</span>
-</a>
-<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-{{/if}}
-
-<script>
-// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
-    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
-    var colWhite = {backgroundColor:'#EFF0F1'};
-    var colShiny = {backgroundColor:'#FCE94F'};
-</script>
-
-{{if $mode == display}}
-<script>
-    var id = window.location.pathname.split("/").pop();
-    $(window).scrollTop($('#item-'+id).position().top);
-    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
-</script>
-{{/if}}
-
diff --git a/view/theme/vier/smarty3/wall_thread.tpl b/view/theme/vier/smarty3/wall_thread.tpl
deleted file mode 100644
index f2f6f186e8..0000000000
--- a/view/theme/vier/smarty3/wall_thread.tpl
+++ /dev/null
@@ -1,177 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{if $mode == display}}
-{{else}}
-{{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>
-			{{if $item.thread_level==3}} - 
-			<span id="hide-thread-{{$item}}-id"
-				class="fakelink"
-				onclick="showThread({{$item.id}});">expand</span> /
-			<span id="hide-thread-{{$item}}-id"
-				class="fakelink"
-				onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}}
-	</div>
-	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-{{/if}}
-
-{{if $item.thread_level!=1}}<div class="children">{{/if}}
-
-<div class="wall-item-decor">
-	<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
-	{{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}	
-	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-</div>
-
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} " id="item-{{$item.id}}">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}"
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
-					<img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-				{{$item.item_photo_menu}}
-				</ul>
-				
-			</div>
-			{{if $item.owner_url}}
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-					<img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
-				</a>
-			</div>
-			{{/if}}			
-		</div>
-		<div class="wall-item-actions-author">
-			<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
-			 {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> <!-- {{$item.vwall}} -->{{/if}}
-			<span class="wall-item-ago">
-				{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
-				{{if $item.lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
-			</span>
-		</div>
-
-		<div itemprop="description" class="wall-item-content">
-			{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h2>{{/if}}
-			{{$item.body}}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{foreach $item.hashtags as $tag}}
-				<span class='tag'>{{$tag}}</span>
-			{{/foreach}}
-  			{{foreach $item.mentions as $tag}}
-				<span class='mention'>{{$tag}}</span>
-			{{/foreach}}
-               {{foreach $item.folders as $cat}}
-                    <span class='folder'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
-               {{/foreach}}
-                {{foreach $item.categories as $cat}}
-                    <span class='category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
-                {{/foreach}}
-		</div>
-	</div>	
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-			{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}}
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-social">
-			{{if $item.threaded}}{{if $item.comment}}
-				<span id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}');"><i class="icon-comment"></i></span>
-			{{/if}}{{/if}}
-			{{if $item.vote}}
-				<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"><i class="icon-thumbs-up icon-large"></i></a>
-				{{if $item.vote.dislike}}
-				<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"><i class="icon-thumbs-down icon-large"></i></a>
-				{{/if}}
-			{{/if}}
-			{{if $item.vote.share}}
-				<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet icon-large"></i></a>
-			{{/if}}
-			{{if $item.star}}
-				<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}"><i class="icon-star icon-large"></i></a>
-				<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}"><i class="icon-star-empty icon-large"></i></a>
-			{{/if}}
-			{{if $item.tagger}}
-				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="icon-tags icon-large"></i></a>
-			{{/if}}
-			{{if $item.filer}}
-                                <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="icon-folder-close icon-large"></i></a>
-			{{/if}}
-			</div>
-			<div class="wall-item-location">{{$item.location}} {{$item.postopts}}</div>				
-			<div class="wall-item-actions-tools">
-
-				{{if $item.drop.pagedrop}}
-					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
-				{{/if}}
-				{{if $item.drop.dropping}}
-					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}"><i class="icon-trash icon-large"></i></a>
-				{{/if}}
-				{{if $item.edpost}}
-					<a href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="icon-edit icon-large"></i></a>
-				{{/if}}
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
-	</div>
-	
-	{{if $item.threaded}}{{if $item.comment}}
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">
-					{{$item.comment}}
-		</div>
-	</div>
-	{{/if}}{{/if}}
-</div>
-
-
-{{foreach $item.children as $child}}
-	{{if $item.type == tag}}
-		{{include file="wall_item_tag.tpl" item=$child}}
-	{{else}}
-		{{include file="{{$item.template}}" item=$child}}
-	{{/if}}
-{{/foreach}}
-
-{{if $item.thread_level!=1}}</div>{{/if}}
-
-
-{{if $mode == display}}
-{{else}}
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
-{{/if}}
-
-{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
-{{/if}}{{/if}}{{/if}}
-
-
-{{if $item.flatten}}
-<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
-{{/if}}
diff --git a/view/theme/vier/threaded_conversation.tpl b/view/theme/vier/threaded_conversation.tpl
deleted file mode 100644
index 82e071134e..0000000000
--- a/view/theme/vier/threaded_conversation.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-
-<div id="tread-wrapper-$thread.id" class="tread-wrapper {{ if $thread.threaded }}threaded{{ endif }}  $thread.toplevel">
-       
-       
-		{{ if $thread.type == tag }}
-			{{ inc wall_item_tag.tpl with $item=$thread }}{{ endinc }}
-		{{ else }}
-			{{ inc $thread.template with $item=$thread }}{{ endinc }}
-		{{ endif }}
-		
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;">
-	<span class="icon s22 delete text">$dropping</span>
-</a>
-<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-{{ endif }}
-
-<script>
-// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
-    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
-    var colWhite = {backgroundColor:'#EFF0F1'};
-    var colShiny = {backgroundColor:'#FCE94F'};
-</script>
-
-{{ if $mode == display }}
-<script>
-    var id = window.location.pathname.split("/").pop();
-    $(window).scrollTop($('#item-'+id).position().top);
-    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
-</script>
-{{ endif }}
-
diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl
deleted file mode 100644
index 756015bc0f..0000000000
--- a/view/theme/vier/wall_thread.tpl
+++ /dev/null
@@ -1,172 +0,0 @@
-{{if $mode == display}}
-{{ else }}
-{{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>
-			{{ if $item.thread_level==3 }} - 
-			<span id="hide-thread-$item-id"
-				class="fakelink"
-				onclick="showThread($item.id);">expand</span> /
-			<span id="hide-thread-$item-id"
-				class="fakelink"
-				onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-{{ endif }}
-
-{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
-
-<div class="wall-item-decor">
-	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<div class="wall-item-container $item.indent $item.shiny " id="item-$item.id">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-			{{ if $item.owner_url }}
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			{{ endif }}			
-		</div>
-		<div class="wall-item-actions-author">
-			<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-			 {{ if $item.owner_url }}$item.via <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> <!-- $item.vwall -->{{ endif }}
-			<span class="wall-item-ago">
-				{{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-				{{ if $item.lock }}<span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-		</div>
-
-		<div itemprop="description" class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href" class="$item.sparkle">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.hashtags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-  			{{ for $item.mentions as $tag }}
-				<span class='mention'>$tag</span>
-			{{ endfor }}
-               {{ for $item.folders as $cat }}
-                    <span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
-               {{ endfor }}
-                {{ for $item.categories as $cat }}
-                    <span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
-                {{ endfor }}
-		</div>
-	</div>	
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-			{{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href"><i class="icon-link icon-large"></i></a>{{ endif }}
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-social">
-			{{ if $item.threaded }}{{ if $item.comment }}
-				<span id="comment-$item.id" class="fakelink togglecomment" onclick="openClose('item-comments-$item.id');"><i class="icon-comment"></i></span>
-			{{ endif }}{{ endif }}
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"><i class="icon-thumbs-up icon-large"></i></a>
-				{{ if $item.vote.dislike }}
-				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"><i class="icon-thumbs-down icon-large"></i></a>
-				{{ endif }}
-			{{ endif }}
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false"><i class="icon-retweet icon-large"></i></a>
-			{{ endif }}
-			{{ if $item.star }}
-				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do"><i class="icon-star icon-large"></i></a>
-				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo"><i class="icon-star-empty icon-large"></i></a>
-			{{ endif }}
-			{{ if $item.tagger }}
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.tagger.class" title="$item.tagger.add"><i class="icon-tags icon-large"></i></a>
-			{{ endif }}
-			{{ if $item.filer }}
-                                <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"><i class="icon-folder-close icon-large"></i></a>
-			{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location $item.postopts</div>				
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" title="$item.drop.delete"><i class="icon-trash icon-large"></i></a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a href="$item.edpost.0" title="$item.edpost.1"><i class="icon-edit icon-large"></i></a>
-				{{ endif }}
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-	
-	{{ if $item.threaded }}{{ if $item.comment }}
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-comment-wrapper" id="item-comments-$item.id" style="display: none;">
-					$item.comment
-		</div>
-	</div>
-	{{ endif }}{{ endif }}
-</div>
-
-
-{{ for $item.children as $child }}
-	{{ if $item.type == tag }}
-		{{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
-	{{ else }}
-		{{ inc $item.template with $item=$child }}{{ endinc }}
-	{{ endif }}
-{{ endfor }}
-
-{{ if $item.thread_level!=1 }}</div>{{ endif }}
-
-
-{{if $mode == display}}
-{{ else }}
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
-{{ endif }}
-
-{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" id="item-comments-$item.id">$item.comment</div>
-{{ endif }}{{ endif }}{{ endif }}
-
-
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" id="item-comments-$item.id">$item.comment</div>
-{{ endif }}
diff --git a/view/threaded_conversation.tpl b/view/threaded_conversation.tpl
deleted file mode 100644
index c95ab52967..0000000000
--- a/view/threaded_conversation.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-{{ inc $thread.template with $item=$thread }}{{ endinc }}
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/toggle_mobile_footer.tpl b/view/toggle_mobile_footer.tpl
deleted file mode 100644
index 58695f4dff..0000000000
--- a/view/toggle_mobile_footer.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<a id="toggle_mobile_link" href="$toggle_link">$toggle_text</a>
-
diff --git a/view/uexport.tpl b/view/uexport.tpl
deleted file mode 100644
index 30d11d58e0..0000000000
--- a/view/uexport.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<h3>$title</h3>
-
-
-{{ for $options as $o }}
-<dl>
-    <dt><a href="$baseurl/$o.0">$o.1</a></dt>
-    <dd>$o.2</dd>
-</dl>
-{{ endfor }}
\ No newline at end of file
diff --git a/view/uimport.tpl b/view/uimport.tpl
deleted file mode 100644
index 8950c8b541..0000000000
--- a/view/uimport.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<form action="uimport" method="post" id="uimport-form" enctype="multipart/form-data">
-<h1>$import.title</h1>
-    <p>$import.intro</p>
-    <p>$import.instruct</p>
-    <p><b>$import.warn</b></p>
-     {{inc field_custom.tpl with $field=$import.field }}{{ endinc }}
-     
-     
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
-	</div>
-	<div id="register-submit-end" ></div>    
-</form>
diff --git a/view/vcard-widget.tpl b/view/vcard-widget.tpl
deleted file mode 100644
index d00099adba..0000000000
--- a/view/vcard-widget.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<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>
-	</div>
-
diff --git a/view/viewcontact_template.tpl b/view/viewcontact_template.tpl
deleted file mode 100644
index d6f01643ea..0000000000
--- a/view/viewcontact_template.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<h3>$title</h3>
-
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
-
-<div id="view-contact-end"></div>
-
-$paginate
diff --git a/view/voting_fakelink.tpl b/view/voting_fakelink.tpl
deleted file mode 100644
index a1ff04a703..0000000000
--- a/view/voting_fakelink.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$phrase
diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl
deleted file mode 100644
index 716956c655..0000000000
--- a/view/wall_thread.tpl
+++ /dev/null
@@ -1,120 +0,0 @@
-{{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-<a name="$item.id" ></a>
-<div class="wall-item-outside-wrapper $item.indent$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" 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{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul>
-                        $item.item_photo_menu
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					<div class="body-tag">
-						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
-						{{ endfor }}
-					</div>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl}} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				{{ if $item.vote.dislike }}<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>{{ endif }}
-				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link$item.sparkle"></a></div>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-			 
-			{{ if $item.star }}
-			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			
-			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
-
-			{{ if $item.threaded }}
-			{{ if $item.comment }}
-			<div class="wall-item-comment-wrapper $item.indent" >
-				$item.comment
-			</div>
-			{{ endif }}
-			{{ endif }}
-
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-</div>
-{{ for $item.children as $child }}
-	{{ inc $child.template with $item=$child }}{{ endinc }}
-{{ endfor }}
-
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
-{{ endif }}
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
diff --git a/view/wallmessage.tpl b/view/wallmessage.tpl
deleted file mode 100644
index 66b2bc3a05..0000000000
--- a/view/wallmessage.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-
-<h3>$header</h3>
-
-<h4>$subheader</h4>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="wallmessage/$nickname" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-$recipname
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
-
-<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/wallmsg-end.tpl b/view/wallmsg-end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/wallmsg-header.tpl b/view/wallmsg-header.tpl
deleted file mode 100644
index 200dfcbd06..0000000000
--- a/view/wallmsg-header.tpl
+++ /dev/null
@@ -1,82 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-var plaintext = '$editselect';
-
-if(plaintext != 'none') {
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: /(profile-jot-text|prvmail-text)/,
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		//force_p_newlines : false,
-		//force_br_newlines : true,
-		forced_root_block : 'div',
-		convert_urls: false,
-		content_css: "$baseurl/view/custom_tinymce.css",
-		     //Character count
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				var editorId = ed.editorId;
-				var textarea = $('#'+editorId);
-				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-					textarea.attr('tabindex', null);
-				}
-			});
-		}
-	});
-}
-else
-	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-
-
-</script>
-<script>
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-</script>
-
diff --git a/view/xrd_diaspora.tpl b/view/xrd_diaspora.tpl
deleted file mode 100644
index 25cda533cb..0000000000
--- a/view/xrd_diaspora.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-	<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/xrd_host.tpl b/view/xrd_host.tpl
deleted file mode 100644
index 94e3c2146e..0000000000
--- a/view/xrd_host.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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'>
- 
-    <hm:Host>$zhost</hm:Host>
- 
-    <Link rel='lrdd' template='$domain/xrd/?uri={uri}' />
-    <Link rel='acct-mgmt' href='$domain/amcd' />
-    <Link rel='http://services.mozilla.com/amcd/0.1' href='$domain/amcd' />
-	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
-        href="$domain/oexchange/xrd" />
-
-    <Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
-        type="http://salmon-protocol.org/ns/magic-key"
-        mk:key_id="1">$bigkey</Property>
-
-
-</XRD>
diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl
deleted file mode 100644
index d79203465b..0000000000
--- a/view/xrd_person.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
- 
-    <Subject>$accturi</Subject>
-	<Alias>$accturi</Alias>
-    <Alias>$profile_url</Alias>
- 
-    <Link rel="http://purl.org/macgirvin/dfrn/1.0"
-          href="$profile_url" />
-    <Link rel="http://schemas.google.com/g/2010#updates-from" 
-          type="application/atom+xml" 
-          href="$atom" />
-    <Link rel="http://webfinger.net/rel/profile-page"
-          type="text/html"
-          href="$profile_url" />
-    <Link rel="http://microformats.org/profile/hcard"
-          type="text/html"
-          href="$hcard_url" />
-    <Link rel="http://portablecontacts.net/spec/1.0"
-          href="$poco_url" />
-    <Link rel="http://webfinger.net/rel/avatar"
-          type="image/jpeg"
-          href="$photo" />
-	$dspr
-    <Link rel="salmon" 
-          href="$salmon" />
-    <Link rel="http://salmon-protocol.org/ns/salmon-replies" 
-          href="$salmon" />
-    <Link rel="http://salmon-protocol.org/ns/salmon-mention" 
-          href="$salmen" />
-    <Link rel="magic-public-key" 
-          href="$modexp" />
- 
-	<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
-          type="http://salmon-protocol.org/ns/magic-key"
-          mk:key_id="1">$bigkey</Property>
-
-</XRD>

From d36292c532d8fe98fa224f9b172f019ac1db238a Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Thu, 28 Mar 2013 09:07:51 +0100
Subject: [PATCH 24/67] template: set smarty3 as default template engine in
 theme info array. remove commented code from get_markup_template. add check
 for $root/$filename in get_template_file.

---
 boot.php         |  8 +++++---
 include/text.php | 24 ++----------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/boot.php b/boot.php
index 477b8331c0..94b9fdc8f7 100644
--- a/boot.php
+++ b/boot.php
@@ -383,7 +383,7 @@ if(! class_exists('App')) {
 			'force_max_items' => 0,
 			'thread_allow' => true,
 			'stylesheet' => '',
-			'template_engine' => 'internal',
+			'template_engine' => 'smarty3',
 		);
 		
 		// array of registered template engines ('name'=>'class name')
@@ -755,7 +755,6 @@ if(! class_exists('App')) {
 		 * @return object Template Engine instance
 		 */
 		function template_engine($name = ''){
-			
 			if ($name!=="") {
 				$template_engine = $name;
 			} else {
@@ -764,6 +763,7 @@ if(! class_exists('App')) {
 					$template_engine = $this->theme['template_engine'];
 				}
 			}
+			
 			if (isset($this->template_engines[$template_engine])){
 				if(isset($this->template_engine_instance[$template_engine])){
 					return $this->template_engine_instance[$template_engine];
@@ -783,7 +783,8 @@ if(! class_exists('App')) {
 		}
 
 		function set_template_engine($engine = 'smarty3') {
-
+			$this->theme['template_engine'] = $engine;
+			/*
 			$this->theme['template_engine'] = 'smarty3';
 
 			switch($engine) {
@@ -794,6 +795,7 @@ if(! class_exists('App')) {
 				default:
 					break;
 			}
+			*/
 		}
 
 		function get_template_ldelim($engine = 'smarty3') {
diff --git a/include/text.php b/include/text.php
index 628b4fc2da..72a2e1c372 100644
--- a/include/text.php
+++ b/include/text.php
@@ -570,28 +570,6 @@ function get_markup_template($s, $root = '') {
 	$a->save_timestamp($stamp1, "file");
 	
 	return $template;
-	/*
-
-	if($a->theme['template_engine'] === 'smarty3') {
-		$template_file = get_template_file($a, 'smarty3/' . $s, $root);
-
-		$template = new FriendicaSmarty();
-		$template->filename = $template_file;
-		$a->save_timestamp($stamp1, "rendering");
-
-		return $template;
-	}
-	else {
-		$template_file = get_template_file($a, $s, $root);
-		$a->save_timestamp($stamp1, "rendering");
-
-		$stamp1 = microtime(true);
-		$content = file_get_contents($template_file);
-		$a->save_timestamp($stamp1, "file");
-		return $content;
-
-	}
-	 */
 }}
 
 if(! function_exists("get_template_file")) {
@@ -613,6 +591,8 @@ function get_template_file($a, $filename, $root = '') {
 		$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";
+	elseif (file_exists("{$root}/$filename"))
+		$template_file = "{$root}/$filename";
 	else
 		$template_file = "{$root}view/$filename";
 

From 379c761c3f4708f7ae2c5543fdb619a040d69413 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 23 Apr 2013 07:47:57 -0400
Subject: [PATCH 25/67] missing "templates" folders

---
 view/templates/404.tpl                        |    6 +
 view/templates/acl_selector.tpl               |   31 +
 view/templates/admin_aside.tpl                |   47 +
 view/templates/admin_logs.tpl                 |   24 +
 view/templates/admin_plugins.tpl              |   20 +
 view/templates/admin_plugins_details.tpl      |   41 +
 view/templates/admin_remoteupdate.tpl         |  103 +
 view/templates/admin_site.tpl                 |  121 +
 view/templates/admin_summary.tpl              |   45 +
 view/templates/admin_users.tpl                |  103 +
 view/templates/album_edit.tpl                 |   20 +
 view/templates/api_config_xml.tpl             |   71 +
 view/templates/api_friends_xml.tpl            |   12 +
 view/templates/api_ratelimit_xml.tpl          |   11 +
 view/templates/api_status_xml.tpl             |   51 +
 view/templates/api_test_xml.tpl               |    6 +
 view/templates/api_timeline_atom.tpl          |   95 +
 view/templates/api_timeline_rss.tpl           |   31 +
 view/templates/api_timeline_xml.tpl           |   25 +
 view/templates/api_user_xml.tpl               |   51 +
 view/templates/apps.tpl                       |   12 +
 view/templates/atom_feed.tpl                  |   34 +
 view/templates/atom_feed_dfrn.tpl             |   34 +
 view/templates/atom_mail.tpl                  |   22 +
 view/templates/atom_relocate.tpl              |   22 +
 view/templates/atom_suggest.tpl               |   16 +
 view/templates/auto_request.tpl               |   42 +
 view/templates/birthdays_reminder.tpl         |   15 +
 view/templates/categories_widget.tpl          |   17 +
 view/templates/comment_item.tpl               |   44 +
 view/templates/common_friends.tpl             |   17 +
 view/templates/common_tabs.tpl                |   10 +
 view/templates/confirm.tpl                    |   19 +
 view/templates/contact_block.tpl              |   17 +
 view/templates/contact_edit.tpl               |   93 +
 view/templates/contact_end.tpl                |    5 +
 view/templates/contact_head.tpl               |   35 +
 view/templates/contact_template.tpl           |   36 +
 view/templates/contacts-end.tpl               |    5 +
 view/templates/contacts-head.tpl              |   22 +
 view/templates/contacts-template.tpl          |   31 +
 view/templates/contacts-widget-sidebar.tpl    |   11 +
 view/templates/content.tpl                    |    7 +
 view/templates/conversation.tpl               |   34 +
 view/templates/crepair.tpl                    |   51 +
 view/templates/cropbody.tpl                   |   63 +
 view/templates/cropend.tpl                    |    5 +
 view/templates/crophead.tpl                   |    9 +
 view/templates/delegate.tpl                   |   62 +
 view/templates/dfrn_req_confirm.tpl           |   26 +
 view/templates/dfrn_request.tpl               |   70 +
 view/templates/diasp_dec_hdr.tpl              |   13 +
 view/templates/diaspora_comment.tpl           |   16 +
 view/templates/diaspora_comment_relay.tpl     |   17 +
 view/templates/diaspora_conversation.tpl      |   34 +
 view/templates/diaspora_like.tpl              |   17 +
 view/templates/diaspora_like_relay.tpl        |   18 +
 view/templates/diaspora_message.tpl           |   18 +
 view/templates/diaspora_photo.tpl             |   18 +
 view/templates/diaspora_post.tpl              |   16 +
 view/templates/diaspora_profile.tpl           |   21 +
 view/templates/diaspora_relay_retraction.tpl  |   15 +
 .../diaspora_relayable_retraction.tpl         |   16 +
 view/templates/diaspora_retract.tpl           |   14 +
 view/templates/diaspora_share.tpl             |   13 +
 view/templates/diaspora_signed_retract.tpl    |   15 +
 view/templates/diaspora_vcard.tpl             |   62 +
 view/templates/directory_header.tpl           |   21 +
 view/templates/directory_item.tpl             |   16 +
 view/templates/display-head.tpl               |   13 +
 view/templates/email_notify_html.tpl          |   35 +
 view/templates/email_notify_text.tpl          |   21 +
 view/templates/end.tpl                        |    5 +
 view/templates/event.tpl                      |   15 +
 view/templates/event_end.tpl                  |    5 +
 view/templates/event_form.tpl                 |   54 +
 view/templates/event_head.tpl                 |  144 +
 view/templates/events-js.tpl                  |   11 +
 view/templates/events.tpl                     |   29 +
 view/templates/events_reminder.tpl            |   15 +
 view/templates/failed_updates.tpl             |   22 +
 view/templates/fake_feed.tpl                  |   18 +
 view/templates/field.tpl                      |    9 +
 view/templates/field_checkbox.tpl             |   11 +
 view/templates/field_combobox.tpl             |   23 +
 view/templates/field_custom.tpl               |   11 +
 view/templates/field_input.tpl                |   11 +
 view/templates/field_intcheckbox.tpl          |   11 +
 view/templates/field_openid.tpl               |   11 +
 view/templates/field_password.tpl             |   11 +
 view/templates/field_radio.tpl                |   11 +
 view/templates/field_richtext.tpl             |   11 +
 view/templates/field_select.tpl               |   13 +
 view/templates/field_select_raw.tpl           |   13 +
 view/templates/field_textarea.tpl             |   11 +
 view/templates/field_themeselect.tpl          |   14 +
 view/templates/field_yesno.tpl                |   18 +
 view/templates/fileas_widget.tpl              |   17 +
 view/templates/filebrowser.tpl                |   89 +
 view/templates/filer_dialog.tpl               |    9 +
 view/templates/follow.tpl                     |   13 +
 view/templates/follow_slap.tpl                |   30 +
 view/templates/generic_links_widget.tpl       |   16 +
 view/templates/group_drop.tpl                 |   14 +
 view/templates/group_edit.tpl                 |   28 +
 view/templates/group_selection.tpl            |   13 +
 view/templates/group_side.tpl                 |   38 +
 view/templates/groupeditor.tpl                |   21 +
 view/templates/head.tpl                       |  117 +
 view/templates/hide_comments.tpl              |    9 +
 view/templates/install.tpl                    |   15 +
 view/templates/install_checks.tpl             |   29 +
 view/templates/install_db.tpl                 |   35 +
 view/templates/install_settings.tpl           |   30 +
 view/templates/intros.tpl                     |   33 +
 view/templates/invite.tpl                     |   35 +
 view/templates/jot-end.tpl                    |    5 +
 view/templates/jot-header.tpl                 |  327 +
 view/templates/jot.tpl                        |   93 +
 view/templates/jot_geotag.tpl                 |   13 +
 view/templates/lang_selector.tpl              |   15 +
 view/templates/like_noshare.tpl               |   12 +
 view/templates/login.tpl                      |   40 +
 view/templates/login_head.tpl                 |    5 +
 view/templates/logout.tpl                     |   11 +
 view/templates/lostpass.tpl                   |   23 +
 view/templates/magicsig.tpl                   |   14 +
 view/templates/mail_conv.tpl                  |   19 +
 view/templates/mail_display.tpl               |   15 +
 view/templates/mail_head.tpl                  |    8 +
 view/templates/mail_list.tpl                  |   21 +
 view/templates/maintenance.tpl                |    6 +
 view/templates/manage.tpl                     |   22 +
 view/templates/match.tpl                      |   21 +
 view/templates/message-end.tpl                |    5 +
 view/templates/message-head.tpl               |   22 +
 view/templates/message_side.tpl               |   15 +
 view/templates/moderated_comment.tpl          |   39 +
 view/templates/mood_content.tpl               |   25 +
 view/templates/msg-end.tpl                    |    5 +
 view/templates/msg-header.tpl                 |  102 +
 view/templates/nav.tpl                        |   73 +
 view/templates/navigation.tpl                 |  108 +
 view/templates/netfriend.tpl                  |   19 +
 view/templates/nets.tpl                       |   15 +
 view/templates/nogroup-template.tpl           |   17 +
 view/templates/notifications.tpl              |   13 +
 .../templates/notifications_comments_item.tpl |    8 +
 .../templates/notifications_dislikes_item.tpl |    8 +
 view/templates/notifications_friends_item.tpl |    8 +
 view/templates/notifications_likes_item.tpl   |    8 +
 view/templates/notifications_network_item.tpl |    8 +
 view/templates/notifications_posts_item.tpl   |    8 +
 view/templates/notify.tpl                     |    8 +
 view/templates/oauth_authorize.tpl            |   15 +
 view/templates/oauth_authorize_done.tpl       |    9 +
 view/templates/oembed_video.tpl               |    9 +
 view/templates/oexchange_xrd.tpl              |   38 +
 view/templates/opensearch.tpl                 |   18 +
 view/templates/pagetypes.tpl                  |   10 +
 view/templates/peoplefind.tpl                 |   19 +
 view/templates/photo_album.tpl                |   12 +
 view/templates/photo_drop.tpl                 |    9 +
 view/templates/photo_edit.tpl                 |   55 +
 view/templates/photo_edit_head.tpl            |   16 +
 view/templates/photo_item.tpl                 |   27 +
 view/templates/photo_top.tpl                  |   13 +
 view/templates/photo_view.tpl                 |   42 +
 .../templates/photos_default_uploader_box.tpl |    6 +
 .../photos_default_uploader_submit.tpl        |    8 +
 view/templates/photos_head.tpl                |   31 +
 view/templates/photos_recent.tpl              |   16 +
 view/templates/photos_upload.tpl              |   54 +
 view/templates/poco_entry_xml.tpl             |   12 +
 view/templates/poco_xml.tpl                   |   23 +
 view/templates/poke_content.tpl               |   37 +
 view/templates/posted_date_widget.tpl         |   14 +
 view/templates/profed_end.tpl                 |    5 +
 view/templates/profed_head.tpl                |   43 +
 view/templates/profile-hide-friends.tpl       |   21 +
 view/templates/profile-hide-wall.tpl          |   21 +
 view/templates/profile-in-directory.tpl       |   21 +
 view/templates/profile-in-netdir.tpl          |   21 +
 view/templates/profile_advanced.tpl           |  175 +
 view/templates/profile_edit.tpl               |  328 +
 view/templates/profile_edlink.tpl             |    7 +
 view/templates/profile_entry.tpl              |   16 +
 view/templates/profile_listing_header.tpl     |   13 +
 view/templates/profile_photo.tpl              |   31 +
 view/templates/profile_publish.tpl            |   21 +
 view/templates/profile_vcard.tpl              |   55 +
 view/templates/prv_message.tpl                |   38 +
 view/templates/pwdreset.tpl                   |   22 +
 view/templates/register.tpl                   |   70 +
 view/templates/remote_friends_common.tpl      |   26 +
 view/templates/removeme.tpl                   |   25 +
 view/templates/saved_searches_aside.tpl       |   19 +
 view/templates/search_item.tpl                |   69 +
 view/templates/settings-end.tpl               |    5 +
 view/templates/settings-head.tpl              |   30 +
 view/templates/settings.tpl                   |  152 +
 view/templates/settings_addons.tpl            |   15 +
 view/templates/settings_connectors.tpl        |   40 +
 view/templates/settings_display.tpl           |   27 +
 view/templates/settings_display_end.tpl       |    5 +
 view/templates/settings_features.tpl          |   25 +
 view/templates/settings_nick_set.tpl          |   10 +
 view/templates/settings_nick_subdir.tpl       |   11 +
 view/templates/settings_oauth.tpl             |   36 +
 view/templates/settings_oauth_edit.tpl        |   22 +
 view/templates/suggest_friends.tpl            |   21 +
 view/templates/suggestions.tpl                |   26 +
 view/templates/tag_slap.tpl                   |   35 +
 view/templates/threaded_conversation.tpl      |   21 +
 view/templates/toggle_mobile_footer.tpl       |    7 +
 view/templates/uexport.tpl                    |   14 +
 view/templates/uimport.tpl                    |   18 +
 view/templates/vcard-widget.tpl               |   10 +
 view/templates/viewcontact_template.tpl       |   14 +
 view/templates/voting_fakelink.tpl            |    6 +
 view/templates/wall_thread.tpl                |  125 +
 view/templates/wallmessage.tpl                |   37 +
 view/templates/wallmsg-end.tpl                |    5 +
 view/templates/wallmsg-header.tpl             |   87 +
 view/templates/xrd_diaspora.tpl               |    8 +
 view/templates/xrd_host.tpl                   |   23 +
 view/templates/xrd_person.tpl                 |   43 +
 view/theme/cleanzero/templates/nav.tpl        |   90 +
 .../cleanzero/templates/theme_settings.tpl    |   15 +
 .../comix-plain/templates/comment_item.tpl    |   38 +
 .../comix-plain/templates/search_item.tpl     |   59 +
 view/theme/comix/templates/comment_item.tpl   |   38 +
 view/theme/comix/templates/search_item.tpl    |   59 +
 .../templates/acl_html_selector.tpl           |   34 +
 .../decaf-mobile/templates/acl_selector.tpl   |   28 +
 .../decaf-mobile/templates/admin_aside.tpl    |   36 +
 .../decaf-mobile/templates/admin_site.tpl     |   72 +
 .../decaf-mobile/templates/admin_users.tpl    |  103 +
 .../decaf-mobile/templates/album_edit.tpl     |   20 +
 .../templates/categories_widget.tpl           |   17 +
 .../decaf-mobile/templates/comment_item.tpl   |   84 +
 .../decaf-mobile/templates/common_tabs.tpl    |   11 +
 .../decaf-mobile/templates/contact_block.tpl  |   17 +
 .../decaf-mobile/templates/contact_edit.tpl   |   98 +
 .../decaf-mobile/templates/contact_head.tpl   |    5 +
 .../templates/contact_template.tpl            |   43 +
 .../decaf-mobile/templates/contacts-end.tpl   |    9 +
 .../decaf-mobile/templates/contacts-head.tpl  |   10 +
 .../templates/contacts-template.tpl           |   33 +
 .../templates/contacts-widget-sidebar.tpl     |    7 +
 .../decaf-mobile/templates/conversation.tpl   |   34 +
 .../theme/decaf-mobile/templates/cropbody.tpl |   32 +
 view/theme/decaf-mobile/templates/cropend.tpl |    9 +
 .../theme/decaf-mobile/templates/crophead.tpl |    6 +
 .../decaf-mobile/templates/display-head.tpl   |    9 +
 view/theme/decaf-mobile/templates/end.tpl     |   30 +
 .../decaf-mobile/templates/event_end.tpl      |    9 +
 .../decaf-mobile/templates/event_head.tpl     |   11 +
 .../decaf-mobile/templates/field_checkbox.tpl |   11 +
 .../decaf-mobile/templates/field_input.tpl    |   11 +
 .../decaf-mobile/templates/field_openid.tpl   |   11 +
 .../decaf-mobile/templates/field_password.tpl |   11 +
 .../templates/field_themeselect.tpl           |   14 +
 .../decaf-mobile/templates/field_yesno.tpl    |   19 +
 .../templates/generic_links_widget.tpl        |   17 +
 .../decaf-mobile/templates/group_drop.tpl     |   14 +
 .../decaf-mobile/templates/group_side.tpl     |   38 +
 view/theme/decaf-mobile/templates/head.tpl    |   35 +
 view/theme/decaf-mobile/templates/jot-end.tpl |   10 +
 .../decaf-mobile/templates/jot-header.tpl     |   22 +
 view/theme/decaf-mobile/templates/jot.tpl     |  104 +
 .../decaf-mobile/templates/jot_geotag.tpl     |   16 +
 .../decaf-mobile/templates/lang_selector.tpl  |   15 +
 .../decaf-mobile/templates/like_noshare.tpl   |   12 +
 view/theme/decaf-mobile/templates/login.tpl   |   50 +
 .../decaf-mobile/templates/login_head.tpl     |    7 +
 .../theme/decaf-mobile/templates/lostpass.tpl |   26 +
 .../decaf-mobile/templates/mail_conv.tpl      |   23 +
 .../decaf-mobile/templates/mail_list.tpl      |   21 +
 view/theme/decaf-mobile/templates/manage.tpl  |   23 +
 .../decaf-mobile/templates/message-end.tpl    |    9 +
 .../decaf-mobile/templates/message-head.tpl   |    5 +
 .../templates/moderated_comment.tpl           |   66 +
 view/theme/decaf-mobile/templates/msg-end.tpl |    7 +
 .../decaf-mobile/templates/msg-header.tpl     |   15 +
 view/theme/decaf-mobile/templates/nav.tpl     |  160 +
 .../decaf-mobile/templates/photo_drop.tpl     |    9 +
 .../decaf-mobile/templates/photo_edit.tpl     |   65 +
 .../templates/photo_edit_head.tpl             |   12 +
 .../decaf-mobile/templates/photo_view.tpl     |   47 +
 .../decaf-mobile/templates/photos_head.tpl    |   10 +
 .../decaf-mobile/templates/photos_upload.tpl  |   56 +
 .../decaf-mobile/templates/profed_end.tpl     |   13 +
 .../decaf-mobile/templates/profed_head.tpl    |   10 +
 .../decaf-mobile/templates/profile_edit.tpl   |  329 +
 .../decaf-mobile/templates/profile_photo.tpl  |   24 +
 .../decaf-mobile/templates/profile_vcard.tpl  |   56 +
 .../decaf-mobile/templates/prv_message.tpl    |   48 +
 .../theme/decaf-mobile/templates/register.tpl |   85 +
 .../decaf-mobile/templates/search_item.tpl    |   69 +
 .../decaf-mobile/templates/settings-head.tpl  |   10 +
 .../theme/decaf-mobile/templates/settings.tpl |  156 +
 .../templates/settings_display_end.tpl        |    7 +
 .../templates/suggest_friends.tpl             |   21 +
 .../templates/threaded_conversation.tpl       |   17 +
 .../templates/voting_fakelink.tpl             |    6 +
 .../decaf-mobile/templates/wall_thread.tpl    |  124 +
 .../templates/wall_thread_toponly.tpl         |  106 +
 .../decaf-mobile/templates/wallmessage.tpl    |   37 +
 .../decaf-mobile/templates/wallmsg-end.tpl    |    7 +
 .../decaf-mobile/templates/wallmsg-header.tpl |   12 +
 view/theme/diabook/templates/admin_users.tpl  |   93 +
 view/theme/diabook/templates/bottom.tpl       |  160 +
 .../diabook/templates/ch_directory_item.tpl   |   15 +
 view/theme/diabook/templates/comment_item.tpl |   48 +
 .../theme/diabook/templates/communityhome.tpl |  177 +
 .../diabook/templates/contact_template.tpl    |   36 +
 .../diabook/templates/directory_item.tpl      |   47 +
 view/theme/diabook/templates/footer.tpl       |    8 +
 .../templates/generic_links_widget.tpl        |   16 +
 view/theme/diabook/templates/group_side.tpl   |   39 +
 view/theme/diabook/templates/jot.tpl          |   92 +
 view/theme/diabook/templates/login.tpl        |   38 +
 view/theme/diabook/templates/mail_conv.tpl    |   65 +
 view/theme/diabook/templates/mail_display.tpl |   17 +
 view/theme/diabook/templates/mail_list.tpl    |   13 +
 view/theme/diabook/templates/message_side.tpl |   15 +
 view/theme/diabook/templates/nav.tpl          |  193 +
 view/theme/diabook/templates/nets.tpl         |   22 +
 view/theme/diabook/templates/oembed_video.tpl |    9 +
 view/theme/diabook/templates/photo_item.tpl   |   70 +
 view/theme/diabook/templates/photo_view.tpl   |   38 +
 view/theme/diabook/templates/profile_side.tpl |   26 +
 .../theme/diabook/templates/profile_vcard.tpl |   69 +
 view/theme/diabook/templates/prv_message.tpl  |   45 +
 view/theme/diabook/templates/right_aside.tpl  |   25 +
 view/theme/diabook/templates/search_item.tpl  |  116 +
 .../diabook/templates/theme_settings.tpl      |   46 +
 view/theme/diabook/templates/wall_thread.tpl  |  146 +
 view/theme/dispy/templates/bottom.tpl         |   76 +
 view/theme/dispy/templates/comment_item.tpl   |   75 +
 view/theme/dispy/templates/communityhome.tpl  |   40 +
 .../dispy/templates/contact_template.tpl      |   41 +
 view/theme/dispy/templates/conversation.tpl   |   34 +
 view/theme/dispy/templates/group_side.tpl     |   34 +
 view/theme/dispy/templates/header.tpl         |    5 +
 view/theme/dispy/templates/jot-header.tpl     |  350 +
 view/theme/dispy/templates/jot.tpl            |   84 +
 view/theme/dispy/templates/lang_selector.tpl  |   15 +
 view/theme/dispy/templates/mail_head.tpl      |   10 +
 view/theme/dispy/templates/nav.tpl            |  150 +
 view/theme/dispy/templates/photo_edit.tpl     |   58 +
 view/theme/dispy/templates/photo_view.tpl     |   41 +
 view/theme/dispy/templates/profile_vcard.tpl  |   87 +
 .../dispy/templates/saved_searches_aside.tpl  |   19 +
 view/theme/dispy/templates/search_item.tpl    |   69 +
 view/theme/dispy/templates/theme_settings.tpl |   15 +
 .../dispy/templates/threaded_conversation.tpl |   20 +
 view/theme/dispy/templates/wall_thread.tpl    |  144 +
 .../duepuntozero/templates/comment_item.tpl   |   71 +
 .../duepuntozero/templates/lang_selector.tpl  |   15 +
 .../templates/moderated_comment.tpl           |   66 +
 view/theme/duepuntozero/templates/nav.tpl     |   75 +
 .../duepuntozero/templates/profile_vcard.tpl  |   56 +
 .../duepuntozero/templates/prv_message.tpl    |   44 +
 .../theme/facepark/templates/comment_item.tpl |   38 +
 view/theme/facepark/templates/group_side.tpl  |   33 +
 view/theme/facepark/templates/jot.tpl         |   90 +
 view/theme/facepark/templates/nav.tpl         |   73 +
 .../facepark/templates/profile_vcard.tpl      |   52 +
 view/theme/facepark/templates/search_item.tpl |   59 +
 .../frost-mobile/settings.tpl.BASE.8446.tpl   |  144 +
 .../frost-mobile/settings.tpl.LOCAL.8446.tpl  |  147 +
 .../frost-mobile/templates/acl_selector.tpl   |   28 +
 .../frost-mobile/templates/admin_aside.tpl    |   36 +
 .../frost-mobile/templates/admin_site.tpl     |   72 +
 .../frost-mobile/templates/admin_users.tpl    |  103 +
 .../templates/categories_widget.tpl           |   17 +
 .../frost-mobile/templates/comment_item.tpl   |   83 +
 .../frost-mobile/templates/common_tabs.tpl    |   11 +
 .../frost-mobile/templates/contact_block.tpl  |   17 +
 .../frost-mobile/templates/contact_edit.tpl   |   98 +
 .../frost-mobile/templates/contact_head.tpl   |    5 +
 .../templates/contact_template.tpl            |   41 +
 .../frost-mobile/templates/contacts-end.tpl   |    9 +
 .../frost-mobile/templates/contacts-head.tpl  |   10 +
 .../templates/contacts-template.tpl           |   33 +
 .../templates/contacts-widget-sidebar.tpl     |    7 +
 .../frost-mobile/templates/conversation.tpl   |   34 +
 .../theme/frost-mobile/templates/cropbody.tpl |   32 +
 view/theme/frost-mobile/templates/cropend.tpl |    9 +
 .../theme/frost-mobile/templates/crophead.tpl |    6 +
 .../frost-mobile/templates/display-head.tpl   |    9 +
 view/theme/frost-mobile/templates/end.tpl     |   27 +
 view/theme/frost-mobile/templates/event.tpl   |   15 +
 .../frost-mobile/templates/event_end.tpl      |    9 +
 .../frost-mobile/templates/event_head.tpl     |   11 +
 .../frost-mobile/templates/field_checkbox.tpl |   11 +
 .../frost-mobile/templates/field_input.tpl    |   11 +
 .../frost-mobile/templates/field_openid.tpl   |   11 +
 .../frost-mobile/templates/field_password.tpl |   11 +
 .../templates/field_themeselect.tpl           |   14 +
 .../templates/generic_links_widget.tpl        |   17 +
 .../frost-mobile/templates/group_drop.tpl     |   14 +
 view/theme/frost-mobile/templates/head.tpl    |   36 +
 view/theme/frost-mobile/templates/jot-end.tpl |   10 +
 .../frost-mobile/templates/jot-header.tpl     |   23 +
 view/theme/frost-mobile/templates/jot.tpl     |   96 +
 .../frost-mobile/templates/jot_geotag.tpl     |   16 +
 .../frost-mobile/templates/lang_selector.tpl  |   15 +
 .../frost-mobile/templates/like_noshare.tpl   |   12 +
 view/theme/frost-mobile/templates/login.tpl   |   50 +
 .../frost-mobile/templates/login_head.tpl     |    7 +
 .../theme/frost-mobile/templates/lostpass.tpl |   26 +
 .../frost-mobile/templates/mail_conv.tpl      |   23 +
 .../frost-mobile/templates/mail_list.tpl      |   21 +
 .../frost-mobile/templates/message-end.tpl    |    9 +
 .../frost-mobile/templates/message-head.tpl   |    5 +
 .../templates/moderated_comment.tpl           |   66 +
 view/theme/frost-mobile/templates/msg-end.tpl |    7 +
 .../frost-mobile/templates/msg-header.tpl     |   15 +
 view/theme/frost-mobile/templates/nav.tpl     |  151 +
 .../frost-mobile/templates/photo_drop.tpl     |    9 +
 .../frost-mobile/templates/photo_edit.tpl     |   63 +
 .../templates/photo_edit_head.tpl             |   12 +
 .../frost-mobile/templates/photo_view.tpl     |   47 +
 .../frost-mobile/templates/photos_head.tpl    |   10 +
 .../frost-mobile/templates/photos_upload.tpl  |   55 +
 .../frost-mobile/templates/profed_end.tpl     |   13 +
 .../frost-mobile/templates/profed_head.tpl    |   10 +
 .../frost-mobile/templates/profile_edit.tpl   |  327 +
 .../frost-mobile/templates/profile_photo.tpl  |   24 +
 .../frost-mobile/templates/profile_vcard.tpl  |   56 +
 .../frost-mobile/templates/prv_message.tpl    |   44 +
 .../theme/frost-mobile/templates/register.tpl |   85 +
 .../frost-mobile/templates/search_item.tpl    |   69 +
 .../frost-mobile/templates/settings-head.tpl  |   10 +
 .../theme/frost-mobile/templates/settings.tpl |  152 +
 .../templates/settings_display_end.tpl        |    7 +
 .../templates/suggest_friends.tpl             |   21 +
 .../templates/threaded_conversation.tpl       |   20 +
 .../templates/voting_fakelink.tpl             |    6 +
 .../frost-mobile/templates/wall_thread.tpl    |  131 +
 .../frost-mobile/templates/wallmsg-end.tpl    |    7 +
 .../frost-mobile/templates/wallmsg-header.tpl |   12 +
 view/theme/frost/templates/acl_selector.tpl   |   28 +
 view/theme/frost/templates/admin_aside.tpl    |   36 +
 view/theme/frost/templates/admin_site.tpl     |   81 +
 view/theme/frost/templates/admin_users.tpl    |  103 +
 view/theme/frost/templates/comment_item.tpl   |   82 +
 view/theme/frost/templates/contact_edit.tpl   |   93 +
 view/theme/frost/templates/contact_end.tpl    |    7 +
 view/theme/frost/templates/contact_head.tpl   |    9 +
 .../frost/templates/contact_template.tpl      |   38 +
 view/theme/frost/templates/contacts-end.tpl   |    9 +
 view/theme/frost/templates/contacts-head.tpl  |   10 +
 .../frost/templates/contacts-template.tpl     |   33 +
 view/theme/frost/templates/cropbody.tpl       |   32 +
 view/theme/frost/templates/cropend.tpl        |    9 +
 view/theme/frost/templates/crophead.tpl       |    6 +
 view/theme/frost/templates/display-head.tpl   |    9 +
 view/theme/frost/templates/end.tpl            |   30 +
 view/theme/frost/templates/event.tpl          |   15 +
 view/theme/frost/templates/event_end.tpl      |   10 +
 view/theme/frost/templates/event_form.tpl     |   55 +
 view/theme/frost/templates/event_head.tpl     |   12 +
 view/theme/frost/templates/field_combobox.tpl |   23 +
 view/theme/frost/templates/field_input.tpl    |   11 +
 view/theme/frost/templates/field_openid.tpl   |   11 +
 view/theme/frost/templates/field_password.tpl |   11 +
 .../frost/templates/field_themeselect.tpl     |   14 +
 view/theme/frost/templates/filebrowser.tpl    |   89 +
 view/theme/frost/templates/group_drop.tpl     |   14 +
 view/theme/frost/templates/head.tpl           |   28 +
 view/theme/frost/templates/jot-end.tpl        |    8 +
 view/theme/frost/templates/jot-header.tpl     |   22 +
 view/theme/frost/templates/jot.tpl            |   96 +
 view/theme/frost/templates/jot_geotag.tpl     |   16 +
 view/theme/frost/templates/lang_selector.tpl  |   15 +
 view/theme/frost/templates/like_noshare.tpl   |   12 +
 view/theme/frost/templates/login.tpl          |   50 +
 view/theme/frost/templates/login_head.tpl     |    7 +
 view/theme/frost/templates/lostpass.tpl       |   26 +
 view/theme/frost/templates/mail_conv.tpl      |   19 +
 view/theme/frost/templates/mail_list.tpl      |   21 +
 view/theme/frost/templates/message-end.tpl    |    9 +
 view/theme/frost/templates/message-head.tpl   |    5 +
 .../frost/templates/moderated_comment.tpl     |   66 +
 view/theme/frost/templates/msg-end.tpl        |    8 +
 view/theme/frost/templates/msg-header.tpl     |   15 +
 view/theme/frost/templates/nav.tpl            |  155 +
 view/theme/frost/templates/photo_drop.tpl     |    9 +
 view/theme/frost/templates/photo_edit.tpl     |   63 +
 .../theme/frost/templates/photo_edit_head.tpl |   12 +
 view/theme/frost/templates/photo_view.tpl     |   47 +
 view/theme/frost/templates/photos_head.tpl    |   10 +
 view/theme/frost/templates/photos_upload.tpl  |   57 +
 .../frost/templates/posted_date_widget.tpl    |   14 +
 view/theme/frost/templates/profed_end.tpl     |   13 +
 view/theme/frost/templates/profed_head.tpl    |   10 +
 view/theme/frost/templates/profile_edit.tpl   |  327 +
 view/theme/frost/templates/profile_vcard.tpl  |   56 +
 view/theme/frost/templates/prv_message.tpl    |   44 +
 view/theme/frost/templates/register.tpl       |   85 +
 view/theme/frost/templates/search_item.tpl    |   69 +
 view/theme/frost/templates/settings-head.tpl  |   10 +
 .../frost/templates/settings_display_end.tpl  |    7 +
 .../theme/frost/templates/suggest_friends.tpl |   21 +
 .../frost/templates/threaded_conversation.tpl |   33 +
 .../theme/frost/templates/voting_fakelink.tpl |    6 +
 view/theme/frost/templates/wall_thread.tpl    |  130 +
 view/theme/frost/templates/wallmsg-end.tpl    |    9 +
 view/theme/frost/templates/wallmsg-header.tpl |   12 +
 view/theme/oldtest/app/app.js                 |   85 +
 view/theme/oldtest/bootstrap.zip              |  Bin 0 -> 85566 bytes
 .../oldtest/css/bootstrap-responsive.css      | 1109 +++
 .../oldtest/css/bootstrap-responsive.min.css  |    9 +
 view/theme/oldtest/css/bootstrap.css          | 6158 +++++++++++++++++
 view/theme/oldtest/css/bootstrap.min.css      |    9 +
 view/theme/oldtest/default.php                |   52 +
 .../img/glyphicons-halflings-white.png        |  Bin 0 -> 8777 bytes
 .../oldtest/img/glyphicons-halflings.png      |  Bin 0 -> 12799 bytes
 view/theme/oldtest/js/bootstrap.js            | 2276 ++++++
 view/theme/oldtest/js/bootstrap.min.js        |    6 +
 view/theme/oldtest/js/knockout-2.2.1.js       |   85 +
 view/theme/oldtest/style.css                  |    0
 view/theme/oldtest/theme.php                  |   46 +
 .../quattro/templates/birthdays_reminder.tpl  |    6 +
 view/theme/quattro/templates/comment_item.tpl |   68 +
 .../quattro/templates/contact_template.tpl    |   37 +
 view/theme/quattro/templates/conversation.tpl |   54 +
 .../quattro/templates/events_reminder.tpl     |   44 +
 .../theme/quattro/templates/fileas_widget.tpl |   17 +
 .../templates/generic_links_widget.tpl        |   16 +
 view/theme/quattro/templates/group_side.tpl   |   34 +
 view/theme/quattro/templates/jot.tpl          |   61 +
 view/theme/quattro/templates/mail_conv.tpl    |   68 +
 view/theme/quattro/templates/mail_display.tpl |   17 +
 view/theme/quattro/templates/mail_list.tpl    |   13 +
 view/theme/quattro/templates/message_side.tpl |   15 +
 view/theme/quattro/templates/nav.tpl          |  100 +
 view/theme/quattro/templates/nets.tpl         |   17 +
 view/theme/quattro/templates/photo_view.tpl   |   42 +
 .../theme/quattro/templates/profile_vcard.tpl |   73 +
 view/theme/quattro/templates/prv_message.tpl  |   43 +
 .../templates/saved_searches_aside.tpl        |   20 +
 view/theme/quattro/templates/search_item.tpl  |   98 +
 .../quattro/templates/theme_settings.tpl      |   37 +
 .../templates/threaded_conversation.tpl       |   45 +
 .../theme/quattro/templates/wall_item_tag.tpl |   72 +
 view/theme/quattro/templates/wall_thread.tpl  |  177 +
 .../slackr/templates/birthdays_reminder.tpl   |   13 +
 .../slackr/templates/events_reminder.tpl      |   44 +
 view/theme/smoothly/templates/bottom.tpl      |   57 +
 view/theme/smoothly/templates/follow.tpl      |   13 +
 view/theme/smoothly/templates/jot-header.tpl  |  379 +
 view/theme/smoothly/templates/jot.tpl         |   89 +
 .../smoothly/templates/lang_selector.tpl      |   15 +
 view/theme/smoothly/templates/nav.tpl         |   86 +
 view/theme/smoothly/templates/search_item.tpl |   58 +
 view/theme/smoothly/templates/wall_thread.tpl |  165 +
 .../testbubble/templates/comment_item.tpl     |   38 +
 .../theme/testbubble/templates/group_drop.tpl |   13 +
 .../theme/testbubble/templates/group_edit.tpl |   21 +
 .../theme/testbubble/templates/group_side.tpl |   33 +
 .../theme/testbubble/templates/jot-header.tpl |  371 +
 view/theme/testbubble/templates/jot.tpl       |   80 +
 view/theme/testbubble/templates/match.tpl     |   18 +
 view/theme/testbubble/templates/nav.tpl       |   71 +
 .../testbubble/templates/photo_album.tpl      |   13 +
 view/theme/testbubble/templates/photo_top.tpl |   13 +
 .../theme/testbubble/templates/photo_view.tpl |   45 +
 .../testbubble/templates/profile_entry.tpl    |   16 +
 .../testbubble/templates/profile_vcard.tpl    |   50 +
 .../templates/saved_searches_aside.tpl        |   19 +
 .../testbubble/templates/search_item.tpl      |   58 +
 .../testbubble/templates/wall_thread.tpl      |  112 +
 view/theme/vier/templates/comment_item.tpl    |   56 +
 view/theme/vier/templates/mail_list.tpl       |   13 +
 view/theme/vier/templates/nav.tpl             |  150 +
 view/theme/vier/templates/profile_edlink.tpl  |    6 +
 view/theme/vier/templates/profile_vcard.tpl   |   70 +
 view/theme/vier/templates/search_item.tpl     |   97 +
 .../vier/templates/threaded_conversation.tpl  |   45 +
 view/theme/vier/templates/wall_thread.tpl     |  177 +
 585 files changed, 32721 insertions(+)
 create mode 100644 view/templates/404.tpl
 create mode 100644 view/templates/acl_selector.tpl
 create mode 100644 view/templates/admin_aside.tpl
 create mode 100644 view/templates/admin_logs.tpl
 create mode 100644 view/templates/admin_plugins.tpl
 create mode 100644 view/templates/admin_plugins_details.tpl
 create mode 100644 view/templates/admin_remoteupdate.tpl
 create mode 100644 view/templates/admin_site.tpl
 create mode 100644 view/templates/admin_summary.tpl
 create mode 100644 view/templates/admin_users.tpl
 create mode 100644 view/templates/album_edit.tpl
 create mode 100644 view/templates/api_config_xml.tpl
 create mode 100644 view/templates/api_friends_xml.tpl
 create mode 100644 view/templates/api_ratelimit_xml.tpl
 create mode 100644 view/templates/api_status_xml.tpl
 create mode 100644 view/templates/api_test_xml.tpl
 create mode 100644 view/templates/api_timeline_atom.tpl
 create mode 100644 view/templates/api_timeline_rss.tpl
 create mode 100644 view/templates/api_timeline_xml.tpl
 create mode 100644 view/templates/api_user_xml.tpl
 create mode 100644 view/templates/apps.tpl
 create mode 100644 view/templates/atom_feed.tpl
 create mode 100644 view/templates/atom_feed_dfrn.tpl
 create mode 100644 view/templates/atom_mail.tpl
 create mode 100644 view/templates/atom_relocate.tpl
 create mode 100644 view/templates/atom_suggest.tpl
 create mode 100644 view/templates/auto_request.tpl
 create mode 100644 view/templates/birthdays_reminder.tpl
 create mode 100644 view/templates/categories_widget.tpl
 create mode 100644 view/templates/comment_item.tpl
 create mode 100644 view/templates/common_friends.tpl
 create mode 100644 view/templates/common_tabs.tpl
 create mode 100644 view/templates/confirm.tpl
 create mode 100644 view/templates/contact_block.tpl
 create mode 100644 view/templates/contact_edit.tpl
 create mode 100644 view/templates/contact_end.tpl
 create mode 100644 view/templates/contact_head.tpl
 create mode 100644 view/templates/contact_template.tpl
 create mode 100644 view/templates/contacts-end.tpl
 create mode 100644 view/templates/contacts-head.tpl
 create mode 100644 view/templates/contacts-template.tpl
 create mode 100644 view/templates/contacts-widget-sidebar.tpl
 create mode 100644 view/templates/content.tpl
 create mode 100644 view/templates/conversation.tpl
 create mode 100644 view/templates/crepair.tpl
 create mode 100644 view/templates/cropbody.tpl
 create mode 100644 view/templates/cropend.tpl
 create mode 100644 view/templates/crophead.tpl
 create mode 100644 view/templates/delegate.tpl
 create mode 100644 view/templates/dfrn_req_confirm.tpl
 create mode 100644 view/templates/dfrn_request.tpl
 create mode 100644 view/templates/diasp_dec_hdr.tpl
 create mode 100644 view/templates/diaspora_comment.tpl
 create mode 100644 view/templates/diaspora_comment_relay.tpl
 create mode 100644 view/templates/diaspora_conversation.tpl
 create mode 100644 view/templates/diaspora_like.tpl
 create mode 100644 view/templates/diaspora_like_relay.tpl
 create mode 100644 view/templates/diaspora_message.tpl
 create mode 100644 view/templates/diaspora_photo.tpl
 create mode 100644 view/templates/diaspora_post.tpl
 create mode 100644 view/templates/diaspora_profile.tpl
 create mode 100644 view/templates/diaspora_relay_retraction.tpl
 create mode 100644 view/templates/diaspora_relayable_retraction.tpl
 create mode 100644 view/templates/diaspora_retract.tpl
 create mode 100644 view/templates/diaspora_share.tpl
 create mode 100644 view/templates/diaspora_signed_retract.tpl
 create mode 100644 view/templates/diaspora_vcard.tpl
 create mode 100644 view/templates/directory_header.tpl
 create mode 100644 view/templates/directory_item.tpl
 create mode 100644 view/templates/display-head.tpl
 create mode 100644 view/templates/email_notify_html.tpl
 create mode 100644 view/templates/email_notify_text.tpl
 create mode 100644 view/templates/end.tpl
 create mode 100644 view/templates/event.tpl
 create mode 100644 view/templates/event_end.tpl
 create mode 100644 view/templates/event_form.tpl
 create mode 100644 view/templates/event_head.tpl
 create mode 100644 view/templates/events-js.tpl
 create mode 100644 view/templates/events.tpl
 create mode 100644 view/templates/events_reminder.tpl
 create mode 100644 view/templates/failed_updates.tpl
 create mode 100644 view/templates/fake_feed.tpl
 create mode 100644 view/templates/field.tpl
 create mode 100644 view/templates/field_checkbox.tpl
 create mode 100644 view/templates/field_combobox.tpl
 create mode 100644 view/templates/field_custom.tpl
 create mode 100644 view/templates/field_input.tpl
 create mode 100644 view/templates/field_intcheckbox.tpl
 create mode 100644 view/templates/field_openid.tpl
 create mode 100644 view/templates/field_password.tpl
 create mode 100644 view/templates/field_radio.tpl
 create mode 100644 view/templates/field_richtext.tpl
 create mode 100644 view/templates/field_select.tpl
 create mode 100644 view/templates/field_select_raw.tpl
 create mode 100644 view/templates/field_textarea.tpl
 create mode 100644 view/templates/field_themeselect.tpl
 create mode 100644 view/templates/field_yesno.tpl
 create mode 100644 view/templates/fileas_widget.tpl
 create mode 100644 view/templates/filebrowser.tpl
 create mode 100644 view/templates/filer_dialog.tpl
 create mode 100644 view/templates/follow.tpl
 create mode 100644 view/templates/follow_slap.tpl
 create mode 100644 view/templates/generic_links_widget.tpl
 create mode 100644 view/templates/group_drop.tpl
 create mode 100644 view/templates/group_edit.tpl
 create mode 100644 view/templates/group_selection.tpl
 create mode 100644 view/templates/group_side.tpl
 create mode 100644 view/templates/groupeditor.tpl
 create mode 100644 view/templates/head.tpl
 create mode 100644 view/templates/hide_comments.tpl
 create mode 100644 view/templates/install.tpl
 create mode 100644 view/templates/install_checks.tpl
 create mode 100644 view/templates/install_db.tpl
 create mode 100644 view/templates/install_settings.tpl
 create mode 100644 view/templates/intros.tpl
 create mode 100644 view/templates/invite.tpl
 create mode 100644 view/templates/jot-end.tpl
 create mode 100644 view/templates/jot-header.tpl
 create mode 100644 view/templates/jot.tpl
 create mode 100644 view/templates/jot_geotag.tpl
 create mode 100644 view/templates/lang_selector.tpl
 create mode 100644 view/templates/like_noshare.tpl
 create mode 100644 view/templates/login.tpl
 create mode 100644 view/templates/login_head.tpl
 create mode 100644 view/templates/logout.tpl
 create mode 100644 view/templates/lostpass.tpl
 create mode 100644 view/templates/magicsig.tpl
 create mode 100644 view/templates/mail_conv.tpl
 create mode 100644 view/templates/mail_display.tpl
 create mode 100644 view/templates/mail_head.tpl
 create mode 100644 view/templates/mail_list.tpl
 create mode 100644 view/templates/maintenance.tpl
 create mode 100644 view/templates/manage.tpl
 create mode 100644 view/templates/match.tpl
 create mode 100644 view/templates/message-end.tpl
 create mode 100644 view/templates/message-head.tpl
 create mode 100644 view/templates/message_side.tpl
 create mode 100644 view/templates/moderated_comment.tpl
 create mode 100644 view/templates/mood_content.tpl
 create mode 100644 view/templates/msg-end.tpl
 create mode 100644 view/templates/msg-header.tpl
 create mode 100644 view/templates/nav.tpl
 create mode 100644 view/templates/navigation.tpl
 create mode 100644 view/templates/netfriend.tpl
 create mode 100644 view/templates/nets.tpl
 create mode 100644 view/templates/nogroup-template.tpl
 create mode 100644 view/templates/notifications.tpl
 create mode 100644 view/templates/notifications_comments_item.tpl
 create mode 100644 view/templates/notifications_dislikes_item.tpl
 create mode 100644 view/templates/notifications_friends_item.tpl
 create mode 100644 view/templates/notifications_likes_item.tpl
 create mode 100644 view/templates/notifications_network_item.tpl
 create mode 100644 view/templates/notifications_posts_item.tpl
 create mode 100644 view/templates/notify.tpl
 create mode 100644 view/templates/oauth_authorize.tpl
 create mode 100644 view/templates/oauth_authorize_done.tpl
 create mode 100644 view/templates/oembed_video.tpl
 create mode 100644 view/templates/oexchange_xrd.tpl
 create mode 100644 view/templates/opensearch.tpl
 create mode 100644 view/templates/pagetypes.tpl
 create mode 100644 view/templates/peoplefind.tpl
 create mode 100644 view/templates/photo_album.tpl
 create mode 100644 view/templates/photo_drop.tpl
 create mode 100644 view/templates/photo_edit.tpl
 create mode 100644 view/templates/photo_edit_head.tpl
 create mode 100644 view/templates/photo_item.tpl
 create mode 100644 view/templates/photo_top.tpl
 create mode 100644 view/templates/photo_view.tpl
 create mode 100644 view/templates/photos_default_uploader_box.tpl
 create mode 100644 view/templates/photos_default_uploader_submit.tpl
 create mode 100644 view/templates/photos_head.tpl
 create mode 100644 view/templates/photos_recent.tpl
 create mode 100644 view/templates/photos_upload.tpl
 create mode 100644 view/templates/poco_entry_xml.tpl
 create mode 100644 view/templates/poco_xml.tpl
 create mode 100644 view/templates/poke_content.tpl
 create mode 100644 view/templates/posted_date_widget.tpl
 create mode 100644 view/templates/profed_end.tpl
 create mode 100644 view/templates/profed_head.tpl
 create mode 100644 view/templates/profile-hide-friends.tpl
 create mode 100644 view/templates/profile-hide-wall.tpl
 create mode 100644 view/templates/profile-in-directory.tpl
 create mode 100644 view/templates/profile-in-netdir.tpl
 create mode 100644 view/templates/profile_advanced.tpl
 create mode 100644 view/templates/profile_edit.tpl
 create mode 100644 view/templates/profile_edlink.tpl
 create mode 100644 view/templates/profile_entry.tpl
 create mode 100644 view/templates/profile_listing_header.tpl
 create mode 100644 view/templates/profile_photo.tpl
 create mode 100644 view/templates/profile_publish.tpl
 create mode 100644 view/templates/profile_vcard.tpl
 create mode 100644 view/templates/prv_message.tpl
 create mode 100644 view/templates/pwdreset.tpl
 create mode 100644 view/templates/register.tpl
 create mode 100644 view/templates/remote_friends_common.tpl
 create mode 100644 view/templates/removeme.tpl
 create mode 100644 view/templates/saved_searches_aside.tpl
 create mode 100644 view/templates/search_item.tpl
 create mode 100644 view/templates/settings-end.tpl
 create mode 100644 view/templates/settings-head.tpl
 create mode 100644 view/templates/settings.tpl
 create mode 100644 view/templates/settings_addons.tpl
 create mode 100644 view/templates/settings_connectors.tpl
 create mode 100644 view/templates/settings_display.tpl
 create mode 100644 view/templates/settings_display_end.tpl
 create mode 100644 view/templates/settings_features.tpl
 create mode 100644 view/templates/settings_nick_set.tpl
 create mode 100644 view/templates/settings_nick_subdir.tpl
 create mode 100644 view/templates/settings_oauth.tpl
 create mode 100644 view/templates/settings_oauth_edit.tpl
 create mode 100644 view/templates/suggest_friends.tpl
 create mode 100644 view/templates/suggestions.tpl
 create mode 100644 view/templates/tag_slap.tpl
 create mode 100644 view/templates/threaded_conversation.tpl
 create mode 100644 view/templates/toggle_mobile_footer.tpl
 create mode 100644 view/templates/uexport.tpl
 create mode 100644 view/templates/uimport.tpl
 create mode 100644 view/templates/vcard-widget.tpl
 create mode 100644 view/templates/viewcontact_template.tpl
 create mode 100644 view/templates/voting_fakelink.tpl
 create mode 100644 view/templates/wall_thread.tpl
 create mode 100644 view/templates/wallmessage.tpl
 create mode 100644 view/templates/wallmsg-end.tpl
 create mode 100644 view/templates/wallmsg-header.tpl
 create mode 100644 view/templates/xrd_diaspora.tpl
 create mode 100644 view/templates/xrd_host.tpl
 create mode 100644 view/templates/xrd_person.tpl
 create mode 100644 view/theme/cleanzero/templates/nav.tpl
 create mode 100644 view/theme/cleanzero/templates/theme_settings.tpl
 create mode 100644 view/theme/comix-plain/templates/comment_item.tpl
 create mode 100644 view/theme/comix-plain/templates/search_item.tpl
 create mode 100644 view/theme/comix/templates/comment_item.tpl
 create mode 100644 view/theme/comix/templates/search_item.tpl
 create mode 100644 view/theme/decaf-mobile/templates/acl_html_selector.tpl
 create mode 100644 view/theme/decaf-mobile/templates/acl_selector.tpl
 create mode 100644 view/theme/decaf-mobile/templates/admin_aside.tpl
 create mode 100644 view/theme/decaf-mobile/templates/admin_site.tpl
 create mode 100644 view/theme/decaf-mobile/templates/admin_users.tpl
 create mode 100644 view/theme/decaf-mobile/templates/album_edit.tpl
 create mode 100644 view/theme/decaf-mobile/templates/categories_widget.tpl
 create mode 100644 view/theme/decaf-mobile/templates/comment_item.tpl
 create mode 100644 view/theme/decaf-mobile/templates/common_tabs.tpl
 create mode 100644 view/theme/decaf-mobile/templates/contact_block.tpl
 create mode 100644 view/theme/decaf-mobile/templates/contact_edit.tpl
 create mode 100644 view/theme/decaf-mobile/templates/contact_head.tpl
 create mode 100644 view/theme/decaf-mobile/templates/contact_template.tpl
 create mode 100644 view/theme/decaf-mobile/templates/contacts-end.tpl
 create mode 100644 view/theme/decaf-mobile/templates/contacts-head.tpl
 create mode 100644 view/theme/decaf-mobile/templates/contacts-template.tpl
 create mode 100644 view/theme/decaf-mobile/templates/contacts-widget-sidebar.tpl
 create mode 100644 view/theme/decaf-mobile/templates/conversation.tpl
 create mode 100644 view/theme/decaf-mobile/templates/cropbody.tpl
 create mode 100644 view/theme/decaf-mobile/templates/cropend.tpl
 create mode 100644 view/theme/decaf-mobile/templates/crophead.tpl
 create mode 100644 view/theme/decaf-mobile/templates/display-head.tpl
 create mode 100644 view/theme/decaf-mobile/templates/end.tpl
 create mode 100644 view/theme/decaf-mobile/templates/event_end.tpl
 create mode 100644 view/theme/decaf-mobile/templates/event_head.tpl
 create mode 100644 view/theme/decaf-mobile/templates/field_checkbox.tpl
 create mode 100644 view/theme/decaf-mobile/templates/field_input.tpl
 create mode 100644 view/theme/decaf-mobile/templates/field_openid.tpl
 create mode 100644 view/theme/decaf-mobile/templates/field_password.tpl
 create mode 100644 view/theme/decaf-mobile/templates/field_themeselect.tpl
 create mode 100644 view/theme/decaf-mobile/templates/field_yesno.tpl
 create mode 100644 view/theme/decaf-mobile/templates/generic_links_widget.tpl
 create mode 100644 view/theme/decaf-mobile/templates/group_drop.tpl
 create mode 100644 view/theme/decaf-mobile/templates/group_side.tpl
 create mode 100644 view/theme/decaf-mobile/templates/head.tpl
 create mode 100644 view/theme/decaf-mobile/templates/jot-end.tpl
 create mode 100644 view/theme/decaf-mobile/templates/jot-header.tpl
 create mode 100644 view/theme/decaf-mobile/templates/jot.tpl
 create mode 100644 view/theme/decaf-mobile/templates/jot_geotag.tpl
 create mode 100644 view/theme/decaf-mobile/templates/lang_selector.tpl
 create mode 100644 view/theme/decaf-mobile/templates/like_noshare.tpl
 create mode 100644 view/theme/decaf-mobile/templates/login.tpl
 create mode 100644 view/theme/decaf-mobile/templates/login_head.tpl
 create mode 100644 view/theme/decaf-mobile/templates/lostpass.tpl
 create mode 100644 view/theme/decaf-mobile/templates/mail_conv.tpl
 create mode 100644 view/theme/decaf-mobile/templates/mail_list.tpl
 create mode 100644 view/theme/decaf-mobile/templates/manage.tpl
 create mode 100644 view/theme/decaf-mobile/templates/message-end.tpl
 create mode 100644 view/theme/decaf-mobile/templates/message-head.tpl
 create mode 100644 view/theme/decaf-mobile/templates/moderated_comment.tpl
 create mode 100644 view/theme/decaf-mobile/templates/msg-end.tpl
 create mode 100644 view/theme/decaf-mobile/templates/msg-header.tpl
 create mode 100644 view/theme/decaf-mobile/templates/nav.tpl
 create mode 100644 view/theme/decaf-mobile/templates/photo_drop.tpl
 create mode 100644 view/theme/decaf-mobile/templates/photo_edit.tpl
 create mode 100644 view/theme/decaf-mobile/templates/photo_edit_head.tpl
 create mode 100644 view/theme/decaf-mobile/templates/photo_view.tpl
 create mode 100644 view/theme/decaf-mobile/templates/photos_head.tpl
 create mode 100644 view/theme/decaf-mobile/templates/photos_upload.tpl
 create mode 100644 view/theme/decaf-mobile/templates/profed_end.tpl
 create mode 100644 view/theme/decaf-mobile/templates/profed_head.tpl
 create mode 100644 view/theme/decaf-mobile/templates/profile_edit.tpl
 create mode 100644 view/theme/decaf-mobile/templates/profile_photo.tpl
 create mode 100644 view/theme/decaf-mobile/templates/profile_vcard.tpl
 create mode 100644 view/theme/decaf-mobile/templates/prv_message.tpl
 create mode 100644 view/theme/decaf-mobile/templates/register.tpl
 create mode 100644 view/theme/decaf-mobile/templates/search_item.tpl
 create mode 100644 view/theme/decaf-mobile/templates/settings-head.tpl
 create mode 100644 view/theme/decaf-mobile/templates/settings.tpl
 create mode 100644 view/theme/decaf-mobile/templates/settings_display_end.tpl
 create mode 100644 view/theme/decaf-mobile/templates/suggest_friends.tpl
 create mode 100644 view/theme/decaf-mobile/templates/threaded_conversation.tpl
 create mode 100644 view/theme/decaf-mobile/templates/voting_fakelink.tpl
 create mode 100644 view/theme/decaf-mobile/templates/wall_thread.tpl
 create mode 100644 view/theme/decaf-mobile/templates/wall_thread_toponly.tpl
 create mode 100644 view/theme/decaf-mobile/templates/wallmessage.tpl
 create mode 100644 view/theme/decaf-mobile/templates/wallmsg-end.tpl
 create mode 100644 view/theme/decaf-mobile/templates/wallmsg-header.tpl
 create mode 100644 view/theme/diabook/templates/admin_users.tpl
 create mode 100644 view/theme/diabook/templates/bottom.tpl
 create mode 100644 view/theme/diabook/templates/ch_directory_item.tpl
 create mode 100644 view/theme/diabook/templates/comment_item.tpl
 create mode 100644 view/theme/diabook/templates/communityhome.tpl
 create mode 100644 view/theme/diabook/templates/contact_template.tpl
 create mode 100644 view/theme/diabook/templates/directory_item.tpl
 create mode 100644 view/theme/diabook/templates/footer.tpl
 create mode 100644 view/theme/diabook/templates/generic_links_widget.tpl
 create mode 100644 view/theme/diabook/templates/group_side.tpl
 create mode 100644 view/theme/diabook/templates/jot.tpl
 create mode 100644 view/theme/diabook/templates/login.tpl
 create mode 100644 view/theme/diabook/templates/mail_conv.tpl
 create mode 100644 view/theme/diabook/templates/mail_display.tpl
 create mode 100644 view/theme/diabook/templates/mail_list.tpl
 create mode 100644 view/theme/diabook/templates/message_side.tpl
 create mode 100644 view/theme/diabook/templates/nav.tpl
 create mode 100644 view/theme/diabook/templates/nets.tpl
 create mode 100644 view/theme/diabook/templates/oembed_video.tpl
 create mode 100644 view/theme/diabook/templates/photo_item.tpl
 create mode 100644 view/theme/diabook/templates/photo_view.tpl
 create mode 100644 view/theme/diabook/templates/profile_side.tpl
 create mode 100644 view/theme/diabook/templates/profile_vcard.tpl
 create mode 100644 view/theme/diabook/templates/prv_message.tpl
 create mode 100644 view/theme/diabook/templates/right_aside.tpl
 create mode 100644 view/theme/diabook/templates/search_item.tpl
 create mode 100644 view/theme/diabook/templates/theme_settings.tpl
 create mode 100644 view/theme/diabook/templates/wall_thread.tpl
 create mode 100644 view/theme/dispy/templates/bottom.tpl
 create mode 100644 view/theme/dispy/templates/comment_item.tpl
 create mode 100644 view/theme/dispy/templates/communityhome.tpl
 create mode 100644 view/theme/dispy/templates/contact_template.tpl
 create mode 100644 view/theme/dispy/templates/conversation.tpl
 create mode 100644 view/theme/dispy/templates/group_side.tpl
 create mode 100644 view/theme/dispy/templates/header.tpl
 create mode 100644 view/theme/dispy/templates/jot-header.tpl
 create mode 100644 view/theme/dispy/templates/jot.tpl
 create mode 100644 view/theme/dispy/templates/lang_selector.tpl
 create mode 100644 view/theme/dispy/templates/mail_head.tpl
 create mode 100644 view/theme/dispy/templates/nav.tpl
 create mode 100644 view/theme/dispy/templates/photo_edit.tpl
 create mode 100644 view/theme/dispy/templates/photo_view.tpl
 create mode 100644 view/theme/dispy/templates/profile_vcard.tpl
 create mode 100644 view/theme/dispy/templates/saved_searches_aside.tpl
 create mode 100644 view/theme/dispy/templates/search_item.tpl
 create mode 100644 view/theme/dispy/templates/theme_settings.tpl
 create mode 100644 view/theme/dispy/templates/threaded_conversation.tpl
 create mode 100644 view/theme/dispy/templates/wall_thread.tpl
 create mode 100644 view/theme/duepuntozero/templates/comment_item.tpl
 create mode 100644 view/theme/duepuntozero/templates/lang_selector.tpl
 create mode 100644 view/theme/duepuntozero/templates/moderated_comment.tpl
 create mode 100644 view/theme/duepuntozero/templates/nav.tpl
 create mode 100644 view/theme/duepuntozero/templates/profile_vcard.tpl
 create mode 100644 view/theme/duepuntozero/templates/prv_message.tpl
 create mode 100644 view/theme/facepark/templates/comment_item.tpl
 create mode 100644 view/theme/facepark/templates/group_side.tpl
 create mode 100644 view/theme/facepark/templates/jot.tpl
 create mode 100644 view/theme/facepark/templates/nav.tpl
 create mode 100644 view/theme/facepark/templates/profile_vcard.tpl
 create mode 100644 view/theme/facepark/templates/search_item.tpl
 create mode 100644 view/theme/frost-mobile/settings.tpl.BASE.8446.tpl
 create mode 100644 view/theme/frost-mobile/settings.tpl.LOCAL.8446.tpl
 create mode 100644 view/theme/frost-mobile/templates/acl_selector.tpl
 create mode 100644 view/theme/frost-mobile/templates/admin_aside.tpl
 create mode 100644 view/theme/frost-mobile/templates/admin_site.tpl
 create mode 100644 view/theme/frost-mobile/templates/admin_users.tpl
 create mode 100644 view/theme/frost-mobile/templates/categories_widget.tpl
 create mode 100644 view/theme/frost-mobile/templates/comment_item.tpl
 create mode 100644 view/theme/frost-mobile/templates/common_tabs.tpl
 create mode 100644 view/theme/frost-mobile/templates/contact_block.tpl
 create mode 100644 view/theme/frost-mobile/templates/contact_edit.tpl
 create mode 100644 view/theme/frost-mobile/templates/contact_head.tpl
 create mode 100644 view/theme/frost-mobile/templates/contact_template.tpl
 create mode 100644 view/theme/frost-mobile/templates/contacts-end.tpl
 create mode 100644 view/theme/frost-mobile/templates/contacts-head.tpl
 create mode 100644 view/theme/frost-mobile/templates/contacts-template.tpl
 create mode 100644 view/theme/frost-mobile/templates/contacts-widget-sidebar.tpl
 create mode 100644 view/theme/frost-mobile/templates/conversation.tpl
 create mode 100644 view/theme/frost-mobile/templates/cropbody.tpl
 create mode 100644 view/theme/frost-mobile/templates/cropend.tpl
 create mode 100644 view/theme/frost-mobile/templates/crophead.tpl
 create mode 100644 view/theme/frost-mobile/templates/display-head.tpl
 create mode 100644 view/theme/frost-mobile/templates/end.tpl
 create mode 100644 view/theme/frost-mobile/templates/event.tpl
 create mode 100644 view/theme/frost-mobile/templates/event_end.tpl
 create mode 100644 view/theme/frost-mobile/templates/event_head.tpl
 create mode 100644 view/theme/frost-mobile/templates/field_checkbox.tpl
 create mode 100644 view/theme/frost-mobile/templates/field_input.tpl
 create mode 100644 view/theme/frost-mobile/templates/field_openid.tpl
 create mode 100644 view/theme/frost-mobile/templates/field_password.tpl
 create mode 100644 view/theme/frost-mobile/templates/field_themeselect.tpl
 create mode 100644 view/theme/frost-mobile/templates/generic_links_widget.tpl
 create mode 100644 view/theme/frost-mobile/templates/group_drop.tpl
 create mode 100644 view/theme/frost-mobile/templates/head.tpl
 create mode 100644 view/theme/frost-mobile/templates/jot-end.tpl
 create mode 100644 view/theme/frost-mobile/templates/jot-header.tpl
 create mode 100644 view/theme/frost-mobile/templates/jot.tpl
 create mode 100644 view/theme/frost-mobile/templates/jot_geotag.tpl
 create mode 100644 view/theme/frost-mobile/templates/lang_selector.tpl
 create mode 100644 view/theme/frost-mobile/templates/like_noshare.tpl
 create mode 100644 view/theme/frost-mobile/templates/login.tpl
 create mode 100644 view/theme/frost-mobile/templates/login_head.tpl
 create mode 100644 view/theme/frost-mobile/templates/lostpass.tpl
 create mode 100644 view/theme/frost-mobile/templates/mail_conv.tpl
 create mode 100644 view/theme/frost-mobile/templates/mail_list.tpl
 create mode 100644 view/theme/frost-mobile/templates/message-end.tpl
 create mode 100644 view/theme/frost-mobile/templates/message-head.tpl
 create mode 100644 view/theme/frost-mobile/templates/moderated_comment.tpl
 create mode 100644 view/theme/frost-mobile/templates/msg-end.tpl
 create mode 100644 view/theme/frost-mobile/templates/msg-header.tpl
 create mode 100644 view/theme/frost-mobile/templates/nav.tpl
 create mode 100644 view/theme/frost-mobile/templates/photo_drop.tpl
 create mode 100644 view/theme/frost-mobile/templates/photo_edit.tpl
 create mode 100644 view/theme/frost-mobile/templates/photo_edit_head.tpl
 create mode 100644 view/theme/frost-mobile/templates/photo_view.tpl
 create mode 100644 view/theme/frost-mobile/templates/photos_head.tpl
 create mode 100644 view/theme/frost-mobile/templates/photos_upload.tpl
 create mode 100644 view/theme/frost-mobile/templates/profed_end.tpl
 create mode 100644 view/theme/frost-mobile/templates/profed_head.tpl
 create mode 100644 view/theme/frost-mobile/templates/profile_edit.tpl
 create mode 100644 view/theme/frost-mobile/templates/profile_photo.tpl
 create mode 100644 view/theme/frost-mobile/templates/profile_vcard.tpl
 create mode 100644 view/theme/frost-mobile/templates/prv_message.tpl
 create mode 100644 view/theme/frost-mobile/templates/register.tpl
 create mode 100644 view/theme/frost-mobile/templates/search_item.tpl
 create mode 100644 view/theme/frost-mobile/templates/settings-head.tpl
 create mode 100644 view/theme/frost-mobile/templates/settings.tpl
 create mode 100644 view/theme/frost-mobile/templates/settings_display_end.tpl
 create mode 100644 view/theme/frost-mobile/templates/suggest_friends.tpl
 create mode 100644 view/theme/frost-mobile/templates/threaded_conversation.tpl
 create mode 100644 view/theme/frost-mobile/templates/voting_fakelink.tpl
 create mode 100644 view/theme/frost-mobile/templates/wall_thread.tpl
 create mode 100644 view/theme/frost-mobile/templates/wallmsg-end.tpl
 create mode 100644 view/theme/frost-mobile/templates/wallmsg-header.tpl
 create mode 100644 view/theme/frost/templates/acl_selector.tpl
 create mode 100644 view/theme/frost/templates/admin_aside.tpl
 create mode 100644 view/theme/frost/templates/admin_site.tpl
 create mode 100644 view/theme/frost/templates/admin_users.tpl
 create mode 100644 view/theme/frost/templates/comment_item.tpl
 create mode 100644 view/theme/frost/templates/contact_edit.tpl
 create mode 100644 view/theme/frost/templates/contact_end.tpl
 create mode 100644 view/theme/frost/templates/contact_head.tpl
 create mode 100644 view/theme/frost/templates/contact_template.tpl
 create mode 100644 view/theme/frost/templates/contacts-end.tpl
 create mode 100644 view/theme/frost/templates/contacts-head.tpl
 create mode 100644 view/theme/frost/templates/contacts-template.tpl
 create mode 100644 view/theme/frost/templates/cropbody.tpl
 create mode 100644 view/theme/frost/templates/cropend.tpl
 create mode 100644 view/theme/frost/templates/crophead.tpl
 create mode 100644 view/theme/frost/templates/display-head.tpl
 create mode 100644 view/theme/frost/templates/end.tpl
 create mode 100644 view/theme/frost/templates/event.tpl
 create mode 100644 view/theme/frost/templates/event_end.tpl
 create mode 100644 view/theme/frost/templates/event_form.tpl
 create mode 100644 view/theme/frost/templates/event_head.tpl
 create mode 100644 view/theme/frost/templates/field_combobox.tpl
 create mode 100644 view/theme/frost/templates/field_input.tpl
 create mode 100644 view/theme/frost/templates/field_openid.tpl
 create mode 100644 view/theme/frost/templates/field_password.tpl
 create mode 100644 view/theme/frost/templates/field_themeselect.tpl
 create mode 100644 view/theme/frost/templates/filebrowser.tpl
 create mode 100644 view/theme/frost/templates/group_drop.tpl
 create mode 100644 view/theme/frost/templates/head.tpl
 create mode 100644 view/theme/frost/templates/jot-end.tpl
 create mode 100644 view/theme/frost/templates/jot-header.tpl
 create mode 100644 view/theme/frost/templates/jot.tpl
 create mode 100644 view/theme/frost/templates/jot_geotag.tpl
 create mode 100644 view/theme/frost/templates/lang_selector.tpl
 create mode 100644 view/theme/frost/templates/like_noshare.tpl
 create mode 100644 view/theme/frost/templates/login.tpl
 create mode 100644 view/theme/frost/templates/login_head.tpl
 create mode 100644 view/theme/frost/templates/lostpass.tpl
 create mode 100644 view/theme/frost/templates/mail_conv.tpl
 create mode 100644 view/theme/frost/templates/mail_list.tpl
 create mode 100644 view/theme/frost/templates/message-end.tpl
 create mode 100644 view/theme/frost/templates/message-head.tpl
 create mode 100644 view/theme/frost/templates/moderated_comment.tpl
 create mode 100644 view/theme/frost/templates/msg-end.tpl
 create mode 100644 view/theme/frost/templates/msg-header.tpl
 create mode 100644 view/theme/frost/templates/nav.tpl
 create mode 100644 view/theme/frost/templates/photo_drop.tpl
 create mode 100644 view/theme/frost/templates/photo_edit.tpl
 create mode 100644 view/theme/frost/templates/photo_edit_head.tpl
 create mode 100644 view/theme/frost/templates/photo_view.tpl
 create mode 100644 view/theme/frost/templates/photos_head.tpl
 create mode 100644 view/theme/frost/templates/photos_upload.tpl
 create mode 100644 view/theme/frost/templates/posted_date_widget.tpl
 create mode 100644 view/theme/frost/templates/profed_end.tpl
 create mode 100644 view/theme/frost/templates/profed_head.tpl
 create mode 100644 view/theme/frost/templates/profile_edit.tpl
 create mode 100644 view/theme/frost/templates/profile_vcard.tpl
 create mode 100644 view/theme/frost/templates/prv_message.tpl
 create mode 100644 view/theme/frost/templates/register.tpl
 create mode 100644 view/theme/frost/templates/search_item.tpl
 create mode 100644 view/theme/frost/templates/settings-head.tpl
 create mode 100644 view/theme/frost/templates/settings_display_end.tpl
 create mode 100644 view/theme/frost/templates/suggest_friends.tpl
 create mode 100644 view/theme/frost/templates/threaded_conversation.tpl
 create mode 100644 view/theme/frost/templates/voting_fakelink.tpl
 create mode 100644 view/theme/frost/templates/wall_thread.tpl
 create mode 100644 view/theme/frost/templates/wallmsg-end.tpl
 create mode 100644 view/theme/frost/templates/wallmsg-header.tpl
 create mode 100644 view/theme/oldtest/app/app.js
 create mode 100644 view/theme/oldtest/bootstrap.zip
 create mode 100644 view/theme/oldtest/css/bootstrap-responsive.css
 create mode 100644 view/theme/oldtest/css/bootstrap-responsive.min.css
 create mode 100644 view/theme/oldtest/css/bootstrap.css
 create mode 100644 view/theme/oldtest/css/bootstrap.min.css
 create mode 100644 view/theme/oldtest/default.php
 create mode 100644 view/theme/oldtest/img/glyphicons-halflings-white.png
 create mode 100644 view/theme/oldtest/img/glyphicons-halflings.png
 create mode 100644 view/theme/oldtest/js/bootstrap.js
 create mode 100644 view/theme/oldtest/js/bootstrap.min.js
 create mode 100644 view/theme/oldtest/js/knockout-2.2.1.js
 create mode 100644 view/theme/oldtest/style.css
 create mode 100644 view/theme/oldtest/theme.php
 create mode 100644 view/theme/quattro/templates/birthdays_reminder.tpl
 create mode 100644 view/theme/quattro/templates/comment_item.tpl
 create mode 100644 view/theme/quattro/templates/contact_template.tpl
 create mode 100644 view/theme/quattro/templates/conversation.tpl
 create mode 100644 view/theme/quattro/templates/events_reminder.tpl
 create mode 100644 view/theme/quattro/templates/fileas_widget.tpl
 create mode 100644 view/theme/quattro/templates/generic_links_widget.tpl
 create mode 100644 view/theme/quattro/templates/group_side.tpl
 create mode 100644 view/theme/quattro/templates/jot.tpl
 create mode 100644 view/theme/quattro/templates/mail_conv.tpl
 create mode 100644 view/theme/quattro/templates/mail_display.tpl
 create mode 100644 view/theme/quattro/templates/mail_list.tpl
 create mode 100644 view/theme/quattro/templates/message_side.tpl
 create mode 100644 view/theme/quattro/templates/nav.tpl
 create mode 100644 view/theme/quattro/templates/nets.tpl
 create mode 100644 view/theme/quattro/templates/photo_view.tpl
 create mode 100644 view/theme/quattro/templates/profile_vcard.tpl
 create mode 100644 view/theme/quattro/templates/prv_message.tpl
 create mode 100644 view/theme/quattro/templates/saved_searches_aside.tpl
 create mode 100644 view/theme/quattro/templates/search_item.tpl
 create mode 100644 view/theme/quattro/templates/theme_settings.tpl
 create mode 100644 view/theme/quattro/templates/threaded_conversation.tpl
 create mode 100644 view/theme/quattro/templates/wall_item_tag.tpl
 create mode 100644 view/theme/quattro/templates/wall_thread.tpl
 create mode 100644 view/theme/slackr/templates/birthdays_reminder.tpl
 create mode 100644 view/theme/slackr/templates/events_reminder.tpl
 create mode 100644 view/theme/smoothly/templates/bottom.tpl
 create mode 100644 view/theme/smoothly/templates/follow.tpl
 create mode 100644 view/theme/smoothly/templates/jot-header.tpl
 create mode 100644 view/theme/smoothly/templates/jot.tpl
 create mode 100644 view/theme/smoothly/templates/lang_selector.tpl
 create mode 100644 view/theme/smoothly/templates/nav.tpl
 create mode 100644 view/theme/smoothly/templates/search_item.tpl
 create mode 100644 view/theme/smoothly/templates/wall_thread.tpl
 create mode 100644 view/theme/testbubble/templates/comment_item.tpl
 create mode 100644 view/theme/testbubble/templates/group_drop.tpl
 create mode 100644 view/theme/testbubble/templates/group_edit.tpl
 create mode 100644 view/theme/testbubble/templates/group_side.tpl
 create mode 100644 view/theme/testbubble/templates/jot-header.tpl
 create mode 100644 view/theme/testbubble/templates/jot.tpl
 create mode 100644 view/theme/testbubble/templates/match.tpl
 create mode 100644 view/theme/testbubble/templates/nav.tpl
 create mode 100644 view/theme/testbubble/templates/photo_album.tpl
 create mode 100644 view/theme/testbubble/templates/photo_top.tpl
 create mode 100644 view/theme/testbubble/templates/photo_view.tpl
 create mode 100644 view/theme/testbubble/templates/profile_entry.tpl
 create mode 100644 view/theme/testbubble/templates/profile_vcard.tpl
 create mode 100644 view/theme/testbubble/templates/saved_searches_aside.tpl
 create mode 100644 view/theme/testbubble/templates/search_item.tpl
 create mode 100644 view/theme/testbubble/templates/wall_thread.tpl
 create mode 100644 view/theme/vier/templates/comment_item.tpl
 create mode 100644 view/theme/vier/templates/mail_list.tpl
 create mode 100644 view/theme/vier/templates/nav.tpl
 create mode 100644 view/theme/vier/templates/profile_edlink.tpl
 create mode 100644 view/theme/vier/templates/profile_vcard.tpl
 create mode 100644 view/theme/vier/templates/search_item.tpl
 create mode 100644 view/theme/vier/templates/threaded_conversation.tpl
 create mode 100644 view/theme/vier/templates/wall_thread.tpl

diff --git a/view/templates/404.tpl b/view/templates/404.tpl
new file mode 100644
index 0000000000..2d581ab8da
--- /dev/null
+++ b/view/templates/404.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$message}}</h1>
diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl
new file mode 100644
index 0000000000..5fd11e7569
--- /dev/null
+++ b/view/templates/acl_selector.tpl
@@ -0,0 +1,31 @@
+{{*
+ *	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>
+	<div id="acl-list">
+		<div id="acl-list-content">
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</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>
+
+<script>
+$(document).ready(function() {
+	if(typeof acl=="undefined"){
+		acl = new ACL(
+			baseurl+"/acl",
+			[ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ]
+		);
+	}
+});
+</script>
diff --git a/view/templates/admin_aside.tpl b/view/templates/admin_aside.tpl
new file mode 100644
index 0000000000..24f07e28e6
--- /dev/null
+++ b/view/templates/admin_aside.tpl
@@ -0,0 +1,47 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+	// update pending count //
+	$(function(){
+
+		$("nav").bind('nav-update',  function(e,data){
+			var elm = $('#pending-update');
+			var register = $(data).find('register').text();
+			if (register=="0") { register=""; elm.hide();} else { elm.show(); }
+			elm.html(register);
+		});
+	});
+</script>
+<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
+<ul class='admin linklist'>
+	<li class='admin link button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
+	<li class='admin link button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
+	<li class='admin link button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
+	<li class='admin link button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
+	<li class='admin link button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
+</ul>
+
+{{if $admin.update}}
+<ul class='admin linklist'>
+	<li class='admin link button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+	<li class='admin link button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{/if}}
+
+
+{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
+<ul class='admin linklist'>
+	{{foreach $admin.plugins_admin as $l}}
+	<li class='admin link button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
+	{{/foreach}}
+</ul>
+	
+	
+<h4>{{$logtxt}}</h4>
+<ul class='admin linklist'>
+	<li class='admin link button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
+</ul>
+
diff --git a/view/templates/admin_logs.tpl b/view/templates/admin_logs.tpl
new file mode 100644
index 0000000000..6a2259500c
--- /dev/null
+++ b/view/templates/admin_logs.tpl
@@ -0,0 +1,24 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/logs" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_checkbox.tpl" field=$debugging}}
+	{{include file="field_input.tpl" field=$logfile}}
+	{{include file="field_select.tpl" field=$loglevel}}
+	
+	<div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>
+	
+	</form>
+	
+	<h3>{{$logname}}</h3>
+	<div style="width:100%; height:400px; overflow: auto; "><pre>{{$data}}</pre></div>
+<!--	<iframe src='{{$baseurl}}/{{$logname}}' style="width:100%; height:400px"></iframe> -->
+	<!-- <div class="submit"><input type="submit" name="page_logs_clear_log" value="{{$clear}}" /></div> -->
+</div>
diff --git a/view/templates/admin_plugins.tpl b/view/templates/admin_plugins.tpl
new file mode 100644
index 0000000000..307814e875
--- /dev/null
+++ b/view/templates/admin_plugins.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+		<ul id='pluginslist'>
+		{{foreach $plugins as $p}}
+			<li class='plugin {{$p.1}}'>
+				<a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><span class='icon {{$p.1}}'></span></a>
+				<a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>
+				{{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
+
+					<div class='desc'>{{$p.2.description}}</div>
+			</li>
+		{{/foreach}}
+		</ul>
+</div>
diff --git a/view/templates/admin_plugins_details.tpl b/view/templates/admin_plugins_details.tpl
new file mode 100644
index 0000000000..e817017328
--- /dev/null
+++ b/view/templates/admin_plugins_details.tpl
@@ -0,0 +1,41 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<p><span class='toggleplugin icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
+	<p>{{$info.description}}</p>
+	
+	<p class="author">{{$str_author}}
+	{{foreach $info.author as $a}}
+		{{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}},
+	{{/foreach}}
+	</p>
+
+	<p class="maintainer">{{$str_maintainer}}
+	{{foreach $info.maintainer as $a}}
+		{{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}},
+	{{/foreach}}
+	</p>
+	
+	{{if $screenshot}}
+	<a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a>
+	{{/if}}
+
+	{{if $admin_form}}
+	<h3>{{$settings}}</h3>
+	<form method="post" action="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/">
+		{{$admin_form}}
+	</form>
+	{{/if}}
+
+	{{if $readme}}
+	<h3>Readme</h3>
+	<div id="plugin_readme">
+		{{$readme}}
+	</div>
+	{{/if}}
+</div>
diff --git a/view/templates/admin_remoteupdate.tpl b/view/templates/admin_remoteupdate.tpl
new file mode 100644
index 0000000000..cee0ef9b8d
--- /dev/null
+++ b/view/templates/admin_remoteupdate.tpl
@@ -0,0 +1,103 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script src="js/jquery.htmlstream.js"></script>
+<script>
+	/* ajax updater */
+	function updateEnd(data){
+		//$("#updatepopup .panel_text").html(data);
+		$("#remoteupdate_form").find("input").removeAttr('disabled');
+		$(".panel_action_close").fadeIn()	
+	}
+	function updateOn(data){
+		
+		var patt=/§([^§]*)§/g; 
+		var matches = data.match(patt);
+		$(matches).each(function(id,data){
+			data = data.replace(/§/g,"");
+			d = data.split("@");
+			console.log(d);
+			elm = $("#updatepopup .panel_text #"+d[0]);
+			html = "<div id='"+d[0]+"' class='progress'>"+d[1]+"<span>"+d[2]+"</span></div>";
+			if (elm.length==0){
+				$("#updatepopup .panel_text").append(html);
+			} else {
+				$(elm).replaceWith(html);
+			}
+		});
+		
+		
+	}
+	
+	$(function(){
+		$("#remoteupdate_form").submit(function(){
+			var data={};
+			$(this).find("input").each(function(i, e){
+				name = $(e).attr('name');
+				value = $(e).val();
+				e.disabled = true;
+				data[name]=value;
+			});
+
+			$("#updatepopup .panel_text").html("");
+			$("#updatepopup").show();
+			$("#updatepopup .panel").hide().slideDown(500);
+			$(".panel_action_close").hide().click(function(){
+				$("#updatepopup .panel").slideUp(500, function(){
+					$("#updatepopup").hide();
+				});				
+			});
+
+			$.post(
+				$(this).attr('action'), 
+				data, 
+				updateEnd,
+				'text',
+				updateOn
+			);
+
+			
+			return false;
+		})
+	});
+</script>
+<div id="updatepopup" class="popup">
+	<div class="background"></div>
+	<div class="panel">
+		<div class="panel_in">
+			<h1>Friendica Update</h1>
+			<div class="panel_text"></div>
+			<div class="panel_actions">
+				<input type="button" value="{{$close}}" class="panel_action_close">
+			</div>
+		</div>
+	</div>
+</div>
+<div id="adminpage">
+	<dl> <dt>Your version:</dt><dd>{{$localversion}}</dd> </dl>
+{{if $needupdate}}
+	<dl> <dt>New version:</dt><dd>{{$remoteversion}}</dd> </dl>
+
+	<form id="remoteupdate_form" method="POST" action="{{$baseurl}}/admin/update">
+	<input type="hidden" name="{{$remotefile.0}}" value="{{$remotefile.2}}">
+
+	{{if $canwrite}}
+		<div class="submit"><input type="submit" name="remoteupdate" value="{{$submit}}" /></div>
+	{{else}}
+		<h3>Your friendica installation is not writable by web server.</h3>
+		{{if $canftp}}
+			<p>You can try to update via FTP</p>
+			{{include file="field_input.tpl" field=$ftphost}}
+			{{include file="field_input.tpl" field=$ftppath}}
+			{{include file="field_input.tpl" field=$ftpuser}}
+			{{include file="field_password.tpl" field=$ftppwd}}
+			<div class="submit"><input type="submit" name="remoteupdate" value="{{$submit}}" /></div>
+		{{/if}}
+	{{/if}}
+	</form>
+{{else}}
+<h4>No updates</h4>
+{{/if}}
+</div>
diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
new file mode 100644
index 0000000000..c33897c368
--- /dev/null
+++ b/view/templates/admin_site.tpl
@@ -0,0 +1,121 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+	$(function(){
+		
+		$("#cnftheme").click(function(){
+			$.colorbox({
+				width: 800,
+				height: '90%',
+				/*onOpen: function(){
+					var theme = $("#id_theme :selected").val();
+					$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
+				},*/
+				href: "{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val(),
+				onComplete: function(){
+					$("div#fancybox-content form").submit(function(e){
+						var url = $(this).attr('action');
+						// can't get .serialize() to work...
+						var data={};
+						$(this).find("input").each(function(){
+							data[$(this).attr('name')] = $(this).val();
+						});
+						$(this).find("select").each(function(){
+							data[$(this).attr('name')] = $(this).children(":selected").val();
+						});
+						console.log(":)", url, data);
+					
+						$.post(url, data, function(data) {
+							if(timer) clearTimeout(timer);
+							NavUpdate();
+							$.colorbox.close();
+						})
+					
+						return false;
+					});
+				
+				}
+			});
+			return false;
+		});
+	});
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+	{{include file="field_select.tpl" field=$theme_mobile}}
+	{{include file="field_select.tpl" field=$ssl_policy}}
+	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$hide_help}}
+	{{include file="field_select.tpl" field=$singleuser}}
+
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$registration}}</h3>
+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	{{include file="field_input.tpl" field=$daily_registrations}}
+	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+	{{include file="field_checkbox.tpl" field=$no_openid}}
+	{{include file="field_checkbox.tpl" field=$no_regfullname}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+
+	<h3>{{$upload}}</h3>
+	{{include file="field_input.tpl" field=$maximagesize}}
+	{{include file="field_input.tpl" field=$maximagelength}}
+	{{include file="field_input.tpl" field=$jpegimagequality}}
+	
+	<h3>{{$corporate}}</h3>
+	{{include file="field_input.tpl" field=$allowed_sites}}
+	{{include file="field_input.tpl" field=$allowed_email}}
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$no_community_page}}
+	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_select.tpl" field=$ostatus_poll_interval}}
+	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+	{{include file="field_checkbox.tpl" field=$dfrn_only}}
+	{{include file="field_input.tpl" field=$global_directory}}
+	{{include file="field_checkbox.tpl" field=$thread_allow}}
+	{{include file="field_checkbox.tpl" field=$newuser_private}}
+	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
+	{{include file="field_checkbox.tpl" field=$private_addons}}	
+	{{include file="field_checkbox.tpl" field=$disable_embedded}}
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$advanced}}</h3>
+	{{include file="field_checkbox.tpl" field=$no_utf}}
+	{{include file="field_checkbox.tpl" field=$verifyssl}}
+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	{{include file="field_input.tpl" field=$lockpath}}
+	{{include file="field_input.tpl" field=$temppath}}
+	{{include file="field_input.tpl" field=$basepath}}
+
+	<h3>{{$performance}}</h3>
+	{{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
+	{{include file="field_input.tpl" field=$itemcache}}
+	{{include file="field_input.tpl" field=$itemcache_duration}}
+
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	</form>
+</div>
diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl
new file mode 100644
index 0000000000..b3b42a1392
--- /dev/null
+++ b/view/templates/admin_summary.tpl
@@ -0,0 +1,45 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+
+	<dl>
+		<dt>{{$queues.label}}</dt>
+		<dd>{{$queues.deliverq}} - {{$queues.queue}}</dd>
+	</dl>
+	<dl>
+		<dt>{{$pending.0}}</dt>
+		<dd>{{$pending.1}}</dt>
+	</dl>
+
+	<dl>
+		<dt>{{$users.0}}</dt>
+		<dd>{{$users.1}}</dd>
+	</dl>
+	{{foreach $accounts as $p}}
+		<dl>
+			<dt>{{$p.0}}</dt>
+			<dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd>
+		</dl>
+	{{/foreach}}
+
+
+	<dl>
+		<dt>{{$plugins.0}}</dt>
+		
+		{{foreach $plugins.1 as $p}}
+			<dd>{{$p}}</dd>
+		{{/foreach}}
+		
+	</dl>
+
+	<dl>
+		<dt>{{$version.0}}</dt>
+		<dd>{{$version.1}} - {{$build}}</dt>
+	</dl>
+
+
+</div>
diff --git a/view/templates/admin_users.tpl b/view/templates/admin_users.tpl
new file mode 100644
index 0000000000..80345b78bd
--- /dev/null
+++ b/view/templates/admin_users.tpl
@@ -0,0 +1,103 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.created}}</td>
+					<td class="name">{{$u.name}}</td>
+					<td class="email">{{$u.email}}</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='icon like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/templates/album_edit.tpl b/view/templates/album_edit.tpl
new file mode 100644
index 0000000000..36c07a9f08
--- /dev/null
+++ b/view/templates/album_edit.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	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" >
+
+
+<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
+<input type="text" size="64" name="albumname" value="{{$album}}" >
+
+<div id="photo-album-edit-name-end"></div>
+
+<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete();" />
+
+</form>
+</div>
+<div id="photo-album-edit-end" ></div>
diff --git a/view/templates/api_config_xml.tpl b/view/templates/api_config_xml.tpl
new file mode 100644
index 0000000000..09aa00ac44
--- /dev/null
+++ b/view/templates/api_config_xml.tpl
@@ -0,0 +1,71 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<config>
+ <site>
+  <name>{{$config.site.name}}</name>
+  <server>{{$config.site.server}}</server>
+  <theme>default</theme>
+  <path></path>
+  <logo>{{$config.site.logo}}</logo>
+
+  <fancy>true</fancy>
+  <language>en</language>
+  <email>{{$config.site.email}}</email>
+  <broughtby></broughtby>
+  <broughtbyurl></broughtbyurl>
+  <timezone>UTC</timezone>
+  <closed>{{$config.site.closed}}</closed>
+
+  <inviteonly>false</inviteonly>
+  <private>{{$config.site.private}}</private>
+  <textlimit>{{$config.site.textlimit}}</textlimit>
+  <ssl>{{$config.site.ssl}}</ssl>
+  <sslserver>{{$config.site.sslserver}}</sslserver>
+  <shorturllength>30</shorturllength>
+
+</site>
+ <license>
+  <type>cc</type>
+  <owner></owner>
+  <url>http://creativecommons.org/licenses/by/3.0/</url>
+  <title>Creative Commons Attribution 3.0</title>
+  <image>http://i.creativecommons.org/l/by/3.0/80x15.png</image>
+
+</license>
+ <nickname>
+  <featured></featured>
+</nickname>
+ <profile>
+  <biolimit></biolimit>
+</profile>
+ <group>
+  <desclimit></desclimit>
+</group>
+ <notice>
+
+  <contentlimit></contentlimit>
+</notice>
+ <throttle>
+  <enabled>false</enabled>
+  <count>20</count>
+  <timespan>600</timespan>
+</throttle>
+ <xmpp>
+
+  <enabled>false</enabled>
+  <server>INVALID SERVER</server>
+  <port>5222</port>
+  <user>update</user>
+</xmpp>
+ <integration>
+  <source>StatusNet</source>
+
+</integration>
+ <attachments>
+  <uploads>false</uploads>
+  <file_quota>0</file_quota>
+</attachments>
+</config>
diff --git a/view/templates/api_friends_xml.tpl b/view/templates/api_friends_xml.tpl
new file mode 100644
index 0000000000..c89b96de56
--- /dev/null
+++ b/view/templates/api_friends_xml.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<!-- TEMPLATE APPEARS UNUSED -->
+
+<users type="array">
+	{{foreach $users as $u}}
+	{{include file="api_user_xml.tpl" user=$u}}
+	{{/foreach}}
+</users>
diff --git a/view/templates/api_ratelimit_xml.tpl b/view/templates/api_ratelimit_xml.tpl
new file mode 100644
index 0000000000..a34eb67234
--- /dev/null
+++ b/view/templates/api_ratelimit_xml.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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>
+ <reset-time type="datetime">{{$hash.reset_time}}</reset-time>
+ <reset_time_in_seconds type="integer">{{$hash.resettime_in_seconds}}</reset_time_in_seconds>
+</hash>
diff --git a/view/templates/api_status_xml.tpl b/view/templates/api_status_xml.tpl
new file mode 100644
index 0000000000..e3e80d2b1c
--- /dev/null
+++ b/view/templates/api_status_xml.tpl
@@ -0,0 +1,51 @@
+{{*
+ *	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>
+    <text>{{$status.text}}</text>
+    <source>{{$status.source}}</source>
+    <truncated>{{$status.truncated}}</truncated>
+    <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id>
+    <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id>
+    <favorited>{{$status.favorited}}</favorited>
+    <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
+    <geo>{{$status.geo}}</geo>
+    <coordinates>{{$status.coordinates}}</coordinates>
+    <place>{{$status.place}}</place>
+    <contributors>{{$status.contributors}}</contributors>
+	<user>
+	  <id>{{$status.user.id}}</id>
+	  <name>{{$status.user.name}}</name>
+	  <screen_name>{{$status.user.screen_name}}</screen_name>
+	  <location>{{$status.user.location}}</location>
+	  <description>{{$status.user.description}}</description>
+	  <profile_image_url>{{$status.user.profile_image_url}}</profile_image_url>
+	  <url>{{$status.user.url}}</url>
+	  <protected>{{$status.user.protected}}</protected>
+	  <followers_count>{{$status.user.followers}}</followers_count>
+	  <profile_background_color>{{$status.user.profile_background_color}}</profile_background_color>
+  	  <profile_text_color>{{$status.user.profile_text_color}}</profile_text_color>
+  	  <profile_link_color>{{$status.user.profile_link_color}}</profile_link_color>
+  	  <profile_sidebar_fill_color>{{$status.user.profile_sidebar_fill_color}}</profile_sidebar_fill_color>
+  	  <profile_sidebar_border_color>{{$status.user.profile_sidebar_border_color}}</profile_sidebar_border_color>
+  	  <friends_count>{{$status.user.friends_count}}</friends_count>
+  	  <created_at>{{$status.user.created_at}}</created_at>
+  	  <favourites_count>{{$status.user.favourites_count}}</favourites_count>
+  	  <utc_offset>{{$status.user.utc_offset}}</utc_offset>
+  	  <time_zone>{{$status.user.time_zone}}</time_zone>
+  	  <profile_background_image_url>{{$status.user.profile_background_image_url}}</profile_background_image_url>
+  	  <profile_background_tile>{{$status.user.profile_background_tile}}</profile_background_tile>
+  	  <profile_use_background_image>{{$status.user.profile_use_background_image}}</profile_use_background_image>
+  	  <notifications></notifications>
+  	  <geo_enabled>{{$status.user.geo_enabled}}</geo_enabled>
+  	  <verified>{{$status.user.verified}}</verified>
+  	  <following></following>
+  	  <statuses_count>{{$status.user.statuses_count}}</statuses_count>
+  	  <lang>{{$status.user.lang}}</lang>
+  	  <contributors_enabled>{{$status.user.contributors_enabled}}</contributors_enabled>
+	  </user>
+{{/if}}</status>
diff --git a/view/templates/api_test_xml.tpl b/view/templates/api_test_xml.tpl
new file mode 100644
index 0000000000..df5009af5c
--- /dev/null
+++ b/view/templates/api_test_xml.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<ok>{{$ok}}</ok>
diff --git a/view/templates/api_timeline_atom.tpl b/view/templates/api_timeline_atom.tpl
new file mode 100644
index 0000000000..b23acacb3f
--- /dev/null
+++ b/view/templates/api_timeline_atom.tpl
@@ -0,0 +1,95 @@
+{{*
+ *	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>
+ <title>Friendica</title>
+ <subtitle>Friendica API feed</subtitle>
+ <logo>{{$rss.logo}}</logo>
+ <updated>{{$rss.atom_updated}}</updated>
+ <link type="text/html" rel="alternate" href="{{$rss.alternate}}"/>
+ <link type="application/atom+xml" rel="self" href="{{$rss.self}}"/>
+ 
+ 
+ <author>
+	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+	<uri>{{$user.url}}</uri>
+	<name>{{$user.name}}</name>
+	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
+	<georss:point></georss:point>
+	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
+	<poco:displayName>{{$user.name}}</poco:displayName>
+	<poco:urls>
+		<poco:type>homepage</poco:type>
+		<poco:value>{{$user.url}}</poco:value>
+		<poco:primary>true</poco:primary>
+	</poco:urls>
+	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
+ </author>
+
+ <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
+ <activity:subject>
+	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+	<id>{{$user.contact_url}}</id>
+	<title>{{$user.name}}</title>
+	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
+	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
+	<poco:displayName>{{$user.name}}</poco:displayName>
+	<poco:urls>
+		<poco:type>homepage</poco:type>
+		<poco:value>{{$user.url}}</poco:value>
+		<poco:primary>true</poco:primary>
+	</poco:urls>
+	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
+ </activity:subject>
+ 
+ 
+  	{{foreach $statuses as $status}}
+	<entry>
+		<activity:object-type>{{$status.objecttype}}</activity:object-type>
+		<id>{{$status.message_id}}</id>
+		<title>{{$status.text}}</title>
+		<content type="html">{{$status.statusnet_html}}</content>
+		<link rel="alternate" type="text/html" href="{{$status.url}}"/>
+		<activity:verb>{{$status.verb}}</activity:verb>
+		<published>{{$status.published}}</published>
+		<updated>{{$status.updated}}</updated>
+
+		<link rel="self" type="application/atom+xml" href="{{$status.self}}"/>
+		<link rel="edit" type="application/atom+xml" href="{{$status.edit}}"/>
+		<statusnet:notice_info local_id="{{$status.id}}" source="{{$status.source}}" >
+		</statusnet:notice_info>
+
+		<author>
+			<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+			<uri>{{$status.user.url}}</uri>
+			<name>{{$status.user.name}}</name>
+			<link rel="alternate" type="text/html" href="{{$status.user.url}}"/>
+			<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$status.user.profile_image_url}}"/>
+
+			<georss:point/>
+			<poco:preferredUsername>{{$status.user.screen_name}}</poco:preferredUsername>
+			<poco:displayName>{{$status.user.name}}</poco:displayName>
+			<poco:address/>
+			<poco:urls>
+				<poco:type>homepage</poco:type>
+				<poco:value>{{$status.user.url}}</poco:value>
+				<poco:primary>true</poco:primary>
+			</poco:urls>
+		</author>
+		<link rel="ostatus:conversation" type="text/html" href="{{$status.url}}"/> 
+
+	</entry>    
+    {{/foreach}}
+</feed>
diff --git a/view/templates/api_timeline_rss.tpl b/view/templates/api_timeline_rss.tpl
new file mode 100644
index 0000000000..e89c7d0803
--- /dev/null
+++ b/view/templates/api_timeline_rss.tpl
@@ -0,0 +1,31 @@
+{{*
+ *	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>
+    <link>{{$rss.alternate}}</link>
+    <atom:link type="application/rss+xml" rel="self" href="{{$rss.self}}"/>
+    <description>Friendica timeline</description>
+    <language>{{$rss.language}}</language>
+    <ttl>40</ttl>
+	<image>
+		<link>{{$user.link}}</link>
+		<title>{{$user.name}}'s items</title>
+		<url>{{$user.profile_image_url}}</url>
+	</image>
+	
+{{foreach $statuses as $status}}
+  <item>
+    <title>{{$status.user.name}}: {{$status.text}}</title>
+    <description>{{$status.text}}</description>
+    <pubDate>{{$status.created_at}}</pubDate>
+    <guid>{{$status.url}}</guid>
+    <link>{{$status.url}}</link>
+    <twitter:source>{{$status.source}}</twitter:source>
+  </item>
+{{/foreach}}
+  </channel>
+</rss>
diff --git a/view/templates/api_timeline_xml.tpl b/view/templates/api_timeline_xml.tpl
new file mode 100644
index 0000000000..84148d17ff
--- /dev/null
+++ b/view/templates/api_timeline_xml.tpl
@@ -0,0 +1,25 @@
+{{*
+ *	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>
+  <truncated>{{$status.truncated}}</truncated>
+  <created_at>{{$status.created_at}}</created_at>
+  <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id>
+  <source>{{$status.source}}</source>
+  <id>{{$status.id}}</id>
+  <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id>
+  <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
+  <geo>{{$status.geo}}</geo>
+  <favorited>{{$status.favorited}}</favorited>
+{{include file="api_user_xml.tpl" user=$status.user}}  <statusnet:html>{{$status.statusnet_html}}</statusnet:html>
+  <statusnet:conversation_id>{{$status.statusnet_conversation_id}}</statusnet:conversation_id>
+  <url>{{$status.url}}</url>
+  <coordinates>{{$status.coordinates}}</coordinates>
+  <place>{{$status.place}}</place>
+  <contributors>{{$status.contributors}}</contributors>
+ </status>
+{{/foreach}}</statuses>
diff --git a/view/templates/api_user_xml.tpl b/view/templates/api_user_xml.tpl
new file mode 100644
index 0000000000..d7efcf3fb0
--- /dev/null
+++ b/view/templates/api_user_xml.tpl
@@ -0,0 +1,51 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+  <user>
+   <id>{{$user.id}}</id>
+   <name>{{$user.name}}</name>
+   <screen_name>{{$user.screen_name}}</screen_name>
+   <location>{{$user.location}}</location>
+   <description>{{$user.description}}</description>
+   <profile_image_url>{{$user.profile_image_url}}</profile_image_url>
+   <url>{{$user.url}}</url>
+   <protected>{{$user.protected}}</protected>
+   <followers_count>{{$user.followers_count}}</followers_count>
+   <friends_count>{{$user.friends_count}}</friends_count>
+   <created_at>{{$user.created_at}}</created_at>
+   <favourites_count>{{$user.favourites_count}}</favourites_count>
+   <utc_offset>{{$user.utc_offset}}</utc_offset>
+   <time_zone>{{$user.time_zone}}</time_zone>
+   <statuses_count>{{$user.statuses_count}}</statuses_count>
+   <following>{{$user.following}}</following>
+   <profile_background_color>{{$user.profile_background_color}}</profile_background_color>
+   <profile_text_color>{{$user.profile_text_color}}</profile_text_color>
+   <profile_link_color>{{$user.profile_link_color}}</profile_link_color>
+   <profile_sidebar_fill_color>{{$user.profile_sidebar_fill_color}}</profile_sidebar_fill_color>
+   <profile_sidebar_border_color>{{$user.profile_sidebar_border_color}}</profile_sidebar_border_color>
+   <profile_background_image_url>{{$user.profile_background_image_url}}</profile_background_image_url>
+   <profile_background_tile>{{$user.profile_background_tile}}</profile_background_tile>
+   <profile_use_background_image>{{$user.profile_use_background_image}}</profile_use_background_image>
+   <notifications>{{$user.notifications}}</notifications>
+   <geo_enabled>{{$user.geo_enabled}}</geo_enabled>
+   <verified>{{$user.verified}}</verified>
+   <lang>{{$user.lang}}</lang>
+   <contributors_enabled>{{$user.contributors_enabled}}</contributors_enabled>
+   <status>{{if $user.status}}
+    <created_at>{{$user.status.created_at}}</created_at>
+    <id>{{$user.status.id}}</id>
+    <text>{{$user.status.text}}</text>
+    <source>{{$user.status.source}}</source>
+    <truncated>{{$user.status.truncated}}</truncated>
+    <in_reply_to_status_id>{{$user.status.in_reply_to_status_id}}</in_reply_to_status_id>
+    <in_reply_to_user_id>{{$user.status.in_reply_to_user_id}}</in_reply_to_user_id>
+    <favorited>{{$user.status.favorited}}</favorited>
+    <in_reply_to_screen_name>{{$user.status.in_reply_to_screen_name}}</in_reply_to_screen_name>
+    <geo>{{$user.status.geo}}</geo>
+    <coordinates>{{$user.status.coordinates}}</coordinates>
+    <place>{{$user.status.place}}</place>
+    <contributors>{{$user.status.contributors}}</contributors>
+  {{/if}}</status>
+  </user>
diff --git a/view/templates/apps.tpl b/view/templates/apps.tpl
new file mode 100644
index 0000000000..01d9bb8c82
--- /dev/null
+++ b/view/templates/apps.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+
+<ul>
+	{{foreach $apps as $ap}}
+	<li>{{$ap}}</li>
+	{{/foreach}}
+</ul>
diff --git a/view/templates/atom_feed.tpl b/view/templates/atom_feed.tpl
new file mode 100644
index 0000000000..db553d99f4
--- /dev/null
+++ b/view/templates/atom_feed.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	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"
+      xmlns:at="http://purl.org/atompub/tombstones/1.0"
+      xmlns:media="http://purl.org/syndication/atommedia"
+      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
+      xmlns:as="http://activitystrea.ms/spec/1.0/"
+      xmlns:georss="http://www.georss.org/georss" 
+      xmlns:poco="http://portablecontacts.net/spec/1.0" 
+      xmlns:ostatus="http://ostatus.org/schema/1.0" 
+	  xmlns:statusnet="http://status.net/schema/api/1/" > 
+
+  <id>{{$feed_id}}</id>
+  <title>{{$feed_title}}</title>
+  <generator uri="http://friendica.com" version="{{$version}}">Friendica</generator>
+  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
+  {{$hub}}
+  {{$salmon}}
+  {{$community}}
+
+  <updated>{{$feed_updated}}</updated>
+
+  <dfrn:owner>
+    <name dfrn:updated="{{$namdate}}" >{{$name}}</name>
+    <uri dfrn:updated="{{$uridate}}" >{{$profile_page}}</uri>
+    <link rel="photo"  type="image/jpeg" dfrn:updated="{{$picdate}}" media:width="175" media:height="175" href="{{$photo}}" />
+    <link rel="avatar" type="image/jpeg" dfrn:updated="{{$picdate}}" media:width="175" media:height="175" href="{{$photo}}" />
+    {{$birthday}}
+  </dfrn:owner>
diff --git a/view/templates/atom_feed_dfrn.tpl b/view/templates/atom_feed_dfrn.tpl
new file mode 100644
index 0000000000..87d78a5186
--- /dev/null
+++ b/view/templates/atom_feed_dfrn.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	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"
+      xmlns:at="http://purl.org/atompub/tombstones/1.0"
+      xmlns:media="http://purl.org/syndication/atommedia"
+      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
+      xmlns:as="http://activitystrea.ms/spec/1.0/"
+      xmlns:georss="http://www.georss.org/georss" 
+      xmlns:poco="http://portablecontacts.net/spec/1.0" 
+      xmlns:ostatus="http://ostatus.org/schema/1.0" 
+	  xmlns:statusnet="http://status.net/schema/api/1/" > 
+
+  <id>{{$feed_id}}</id>
+  <title>{{$feed_title}}</title>
+  <generator uri="http://friendica.com" version="{{$version}}">Friendica</generator>
+  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
+  {{$hub}}
+  {{$salmon}}
+  {{$community}}
+
+  <updated>{{$feed_updated}}</updated>
+
+  <author>
+    <name dfrn:updated="{{$namdate}}" >{{$name}}</name>
+    <uri dfrn:updated="{{$uridate}}" >{{$profile_page}}</uri>
+    <link rel="photo"  type="image/jpeg" dfrn:updated="{{$picdate}}" media:width="175" media:height="175" href="{{$photo}}" />
+    <link rel="avatar" type="image/jpeg" dfrn:updated="{{$picdate}}" media:width="175" media:height="175" href="{{$photo}}" />
+    {{$birthday}}
+  </author>
diff --git a/view/templates/atom_mail.tpl b/view/templates/atom_mail.tpl
new file mode 100644
index 0000000000..adf75a3e7a
--- /dev/null
+++ b/view/templates/atom_mail.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<dfrn:mail>
+
+	<dfrn:sender>
+		<dfrn:name>{{$name}}</dfrn:name>
+		<dfrn:uri>{{$profile_page}}</dfrn:uri>
+		<dfrn:avatar>{{$thumb}}</dfrn:avatar>
+	</dfrn:sender>
+
+	<dfrn:id>{{$item_id}}</dfrn:id>
+	<dfrn:in-reply-to>{{$parent_id}}</dfrn:in-reply-to>
+	<dfrn:sentdate>{{$created}}</dfrn:sentdate>
+	<dfrn:subject>{{$subject}}</dfrn:subject>
+	<dfrn:content>{{$content}}</dfrn:content>
+
+</dfrn:mail>
+
diff --git a/view/templates/atom_relocate.tpl b/view/templates/atom_relocate.tpl
new file mode 100644
index 0000000000..073edeaf53
--- /dev/null
+++ b/view/templates/atom_relocate.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<dfrn:relocate>
+
+	<dfrn:url>{{$url}}</dfrn:url>
+	<dfrn:name>{{$name}}</dfrn:name>
+	<dfrn:photo>{{$photo}}</dfrn:photo>
+	<dfrn:thumb>{{$thumb}}</dfrn:thumb>
+	<dfrn:micro>{{$micro}}</dfrn:micro>
+	<dfrn:request>{{$request}}</dfrn:request>
+	<dfrn:confirm>{{$confirm}}</dfrn:confirm>
+	<dfrn:notify>{{$notify}}</dfrn:notify>
+	<dfrn:poll>{{$poll}}</dfrn:poll>
+	<dfrn:sitepubkey>{{$sitepubkey}}</dfrn:sitepubkey>
+
+
+</dfrn:relocate>
+
diff --git a/view/templates/atom_suggest.tpl b/view/templates/atom_suggest.tpl
new file mode 100644
index 0000000000..c0d1a1b3c9
--- /dev/null
+++ b/view/templates/atom_suggest.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<dfrn:suggest>
+
+	<dfrn:url>{{$url}}</dfrn:url>
+	<dfrn:name>{{$name}}</dfrn:name>
+	<dfrn:photo>{{$photo}}</dfrn:photo>
+	<dfrn:request>{{$request}}</dfrn:request>
+	<dfrn:note>{{$note}}</dfrn:note>
+
+</dfrn:suggest>
+
diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl
new file mode 100644
index 0000000000..662ca2447e
--- /dev/null
+++ b/view/templates/auto_request.tpl
@@ -0,0 +1,42 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h1>{{$header}}</h1>
+
+<p id="dfrn-request-intro">
+{{$page_desc}}<br />
+<ul id="dfrn-request-networks">
+<li><a href="http://friendica.com" title="{{$friendica}}">{{$friendica}}</a></li>
+<li><a href="http://joindiaspora.com" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
+<li><a href="http://ostatus.org" title="{{$public_net}}" >{{$statusnet}}</a></li>
+{{if $emailnet}}<li>{{$emailnet}}</li>{{/if}}
+</ul>
+</p>
+<p>
+{{$invite_desc}}
+</p>
+<p>
+{{$desc}}
+</p>
+
+<form action="dfrn_request/{{$nickname}}" method="post" />
+
+<div id="dfrn-request-url-wrapper" >
+	<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
+	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
+	<div id="dfrn-request-url-end"></div>
+</div>
+
+
+<div id="dfrn-request-info-wrapper" >
+
+</div>
+
+	<div id="dfrn-request-submit-wrapper">
+		<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
+	</div>
+</form>
diff --git a/view/templates/birthdays_reminder.tpl b/view/templates/birthdays_reminder.tpl
new file mode 100644
index 0000000000..695364cdad
--- /dev/null
+++ b/view/templates/birthdays_reminder.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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>
+<div id="birthday-title-end"></div>
+{{foreach $events as $event}}
+<div class="birthday-list" id="birthday-{{$event.id}}"> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
+{{/foreach}}
+</div>
+{{/if}}
+
diff --git a/view/templates/categories_widget.tpl b/view/templates/categories_widget.tpl
new file mode 100644
index 0000000000..ab10ef9287
--- /dev/null
+++ b/view/templates/categories_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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>
+	
+	<ul class="categories-ul">
+		<li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+			<li class="tool"><a href="{{$base}}?f=&category={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/templates/comment_item.tpl b/view/templates/comment_item.tpl
new file mode 100644
index 0000000000..caf98168d0
--- /dev/null
+++ b/view/templates/comment_item.tpl
@@ -0,0 +1,44 @@
+{{*
+ *	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}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+		{{/if}}
+			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
+					</select>
+				{{/if}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/templates/common_friends.tpl b/view/templates/common_friends.tpl
new file mode 100644
index 0000000000..499cfe6261
--- /dev/null
+++ b/view/templates/common_friends.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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}}">
+			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+</div>
\ No newline at end of file
diff --git a/view/templates/common_tabs.tpl b/view/templates/common_tabs.tpl
new file mode 100644
index 0000000000..69fa377bc9
--- /dev/null
+++ b/view/templates/common_tabs.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	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>
+	{{/foreach}}
+</ul>
diff --git a/view/templates/confirm.tpl b/view/templates/confirm.tpl
new file mode 100644
index 0000000000..df8d26eaa7
--- /dev/null
+++ b/view/templates/confirm.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<center>
+<form action="{{$confirm_url}}" id="confirm-form" method="{{$method}}">
+
+	<span id="confirm-message">{{$message}}</span>
+	{{foreach $extra_inputs as $input}}
+	<input type="hidden" name="{{$input.name}}" value="{{$input.value}}" />
+	{{/foreach}}
+
+	<input class="confirm-button" id="confirm-submit-button" type="submit" name="{{$confirm_name}}" value="{{$confirm}}" />
+	<input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="{{$cancel}}" />
+
+</form>
+</center>
+
diff --git a/view/templates/contact_block.tpl b/view/templates/contact_block.tpl
new file mode 100644
index 0000000000..e1d98c3bb0
--- /dev/null
+++ b/view/templates/contact_block.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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}}
+		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
+		<div class='contact-block-content'>
+		{{foreach $micropro as $m}}
+			{{$m}}
+		{{/foreach}}
+		</div>
+{{/if}}
+</div>
+<div class="clear"></div>
diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
new file mode 100644
index 0000000000..6d65288e42
--- /dev/null
+++ b/view/templates/contact_edit.tpl
@@ -0,0 +1,93 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h2>{{$header}}</h2>
+
+<div id="contact-edit-wrapper" >
+
+	{{$tab_str}}
+
+	<div id="contact-edit-drop-link" >
+		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
+	</div>
+
+	<div id="contact-edit-drop-link-end"></div>
+
+
+	<div id="contact-edit-nav-wrapper" >
+		<div id="contact-edit-links">
+			<ul>
+				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
+				{{if $lost_contact}}
+					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
+				{{/if}}
+				{{if $insecure}}
+					<li><div id="insecure-message">{{$insecure}}</div></li>
+				{{/if}}
+				{{if $blocked}}
+					<li><div id="block-message">{{$blocked}}</div></li>
+				{{/if}}
+				{{if $ignored}}
+					<li><div id="ignore-message">{{$ignored}}</div></li>
+				{{/if}}
+				{{if $archived}}
+					<li><div id="archive-message">{{$archived}}</div></li>
+				{{/if}}
+
+				<li>&nbsp;</li>
+
+				{{if $common_text}}
+					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
+				{{/if}}
+				{{if $all_friends}}
+					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
+				{{/if}}
+
+
+				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+				{{if $lblsuggest}}
+					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
+				{{/if}}
+
+			</ul>
+		</div>
+	</div>
+	<div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/{{$contact_id}}" method="post" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}">
+
+	{{if $poll_enabled}}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
+			<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}} <span id="contact-edit-update-now" class="button"><a href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
+		</div>
+	{{/if}}
+	<div id="contact-edit-end" ></div>
+
+	{{include file="field_checkbox.tpl" field=$hidden}}
+
+<div id="contact-edit-info-wrapper">
+<h4>{{$lbl_info1}}</h4>
+	<textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea>
+	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>{{$lbl_vis1}}</h4>
+<p>{{$lbl_vis2}}</p> 
+</div>
+{{$profile_select}}
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+</div>
diff --git a/view/templates/contact_end.tpl b/view/templates/contact_end.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/contact_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/contact_head.tpl b/view/templates/contact_head.tpl
new file mode 100644
index 0000000000..e20f4937a0
--- /dev/null
+++ b/view/templates/contact_head.tpl
@@ -0,0 +1,35 @@
+{{*
+ *	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">
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "{{$editselect}}",
+	elements: "contact-edit-info",
+	plugins : "bbcode",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_styles : "blockquote,code",
+	gecko_spellcheck : true,
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	//force_p_newlines : false,
+	//force_br_newlines : true,
+	forced_root_block : 'div',
+	content_css: "{{$baseurl}}/view/custom_tinymce.css"
+
+
+});
+
+
+</script>
+
diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl
new file mode 100644
index 0000000000..8e0e1acc7f
--- /dev/null
+++ b/view/templates/contact_template.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	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" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
+
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
+
+			{{if $contact.photo_menu}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                    <ul>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/templates/contacts-end.tpl b/view/templates/contacts-end.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/contacts-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/contacts-head.tpl b/view/templates/contacts-head.tpl
new file mode 100644
index 0000000000..d525e834f9
--- /dev/null
+++ b/view/templates/contacts-head.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	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() { 
+	var a; 
+	a = $("#contacts-search").autocomplete({ 
+		serviceUrl: '{{$base}}/acl',
+		minChars: 2,
+		width: 350,
+	});
+	a.setOptions({ params: { type: 'a' }});
+
+}); 
+
+</script>
+
diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl
new file mode 100644
index 0000000000..66f3f5c87b
--- /dev/null
+++ b/view/templates/contacts-template.tpl
@@ -0,0 +1,31 @@
+{{*
+ *	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}}
+
+<div id="contacts-search-wrapper">
+<form id="contacts-search-form" action="{{$cmd}}" method="get" >
+<span class="contacts-search-desc">{{$desc}}</span>
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
+<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
+</form>
+</div>
+<div id="contacts-search-end"></div>
+
+{{$tabs}}
+
+
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+<div id="contact-edit-end"></div>
+
+{{$paginate}}
+
+
+
+
diff --git a/view/templates/contacts-widget-sidebar.tpl b/view/templates/contacts-widget-sidebar.tpl
new file mode 100644
index 0000000000..c4697a91c5
--- /dev/null
+++ b/view/templates/contacts-widget-sidebar.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$vcard_widget}}
+{{$follow_widget}}
+{{$groups_widget}}
+{{$findpeople_widget}}
+{{$networks_widget}}
+
diff --git a/view/templates/content.tpl b/view/templates/content.tpl
new file mode 100644
index 0000000000..811f92dd56
--- /dev/null
+++ b/view/templates/content.tpl
@@ -0,0 +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/templates/conversation.tpl b/view/templates/conversation.tpl
new file mode 100644
index 0000000000..24f0d120d5
--- /dev/null
+++ b/view/templates/conversation.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
+	{{foreach $thread.items as $item}}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
+			</div>
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
+		
+		{{include file="{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+</div>
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{/if}}
diff --git a/view/templates/crepair.tpl b/view/templates/crepair.tpl
new file mode 100644
index 0000000000..8d3ed7df89
--- /dev/null
+++ b/view/templates/crepair.tpl
@@ -0,0 +1,51 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
+
+<h4>{{$contact_name}}</h4>
+
+<label id="crepair-name-label" class="crepair-label" for="crepair-name">{{$label_name}}</label>
+<input type="text" id="crepair-name" class="crepair-input" name="name" value="{{$contact_name}}" />
+<div class="clear"></div>
+
+<label id="crepair-nick-label" class="crepair-label" for="crepair-nick">{{$label_nick}}</label>
+<input type="text" id="crepair-nick" class="crepair-input" name="nick" value="{{$contact_nick}}" />
+<div class="clear"></div>
+
+<label id="crepair-attag-label" class="crepair-label" for="crepair-attag">{{$label_attag}}</label>
+<input type="text" id="crepair-attag" class="crepair-input" name="attag" value="{{$contact_attag}}" />
+<div class="clear"></div>
+
+<label id="crepair-url-label" class="crepair-label" for="crepair-url">{{$label_url}}</label>
+<input type="text" id="crepair-url" class="crepair-input" name="url" value="{{$contact_url}}" />
+<div class="clear"></div>
+
+<label id="crepair-request-label" class="crepair-label" for="crepair-request">{{$label_request}}</label>
+<input type="text" id="crepair-request" class="crepair-input" name="request" value="{{$request}}" />
+<div class="clear"></div>
+ 
+<label id="crepair-confirm-label" class="crepair-label" for="crepair-confirm">{{$label_confirm}}</label>
+<input type="text" id="crepair-confirm" class="crepair-input" name="confirm" value="{{$confirm}}" />
+<div class="clear"></div>
+
+<label id="crepair-notify-label" class="crepair-label" for="crepair-notify">{{$label_notify}}</label>
+<input type="text" id="crepair-notify" class="crepair-input" name="notify" value="{{$notify}}" />
+<div class="clear"></div>
+
+<label id="crepair-poll-label" class="crepair-label" for="crepair-poll">{{$label_poll}}</label>
+<input type="text" id="crepair-poll" class="crepair-input" name="poll" value="{{$poll}}" />
+<div class="clear"></div>
+
+<label id="crepair-photo-label" class="crepair-label" for="crepair-photo">{{$label_photo}}</label>
+<input type="text" id="crepair-photo" class="crepair-input" name="photo" value="" />
+<div class="clear"></div>
+
+<input type="submit" name="submit" value="{{$lbl_submit}}" />
+
+</form>
+
+
diff --git a/view/templates/cropbody.tpl b/view/templates/cropbody.tpl
new file mode 100644
index 0000000000..e6fcd355f4
--- /dev/null
+++ b/view/templates/cropbody.tpl
@@ -0,0 +1,63 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+<p id="cropimage-desc">
+{{$desc}}
+</p>
+<div id="cropimage-wrapper">
+<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<script type="text/javascript" language="javascript">
+
+	function onEndCrop( coords, dimensions ) {
+		$( 'x1' ).value = coords.x1;
+		$( 'y1' ).value = coords.y1;
+		$( 'x2' ).value = coords.x2;
+		$( 'y2' ).value = coords.y2;
+		$( 'width' ).value = dimensions.width;
+		$( 'height' ).value = dimensions.height;
+	}
+
+	Event.observe( window, 'load', function() {
+		new Cropper.ImgWithPreview(
+		'croppa',
+		{
+			previewWrap: 'previewWrap',
+			minWidth: 175,
+			minHeight: 175,
+			maxWidth: 640,
+			maxHeight: 640,
+			ratioDim: { x: 100, y:100 },
+			displayOnInit: true,
+			onEndCrop: onEndCrop
+		}
+		);
+	}
+	);
+
+</script>
+
+<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<input type='hidden' name='profile' value='{{$profile}}'>
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="{{$done}}" />
+</div>
+
+</form>
diff --git a/view/templates/cropend.tpl b/view/templates/cropend.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/cropend.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/crophead.tpl b/view/templates/crophead.tpl
new file mode 100644
index 0000000000..d51b87d12f
--- /dev/null
+++ b/view/templates/crophead.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/templates/delegate.tpl b/view/templates/delegate.tpl
new file mode 100644
index 0000000000..7aa85cf395
--- /dev/null
+++ b/view/templates/delegate.tpl
@@ -0,0 +1,62 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$header}}</h3>
+
+<div id="delegate-desc" class="delegate-desc">{{$desc}}</div>
+
+{{if $managers}}
+<h3>{{$head_managers}}</h3>
+
+{{foreach $managers as $x}}
+
+<div class="contact-block-div">
+<a class="contact-block-link" href="#" >
+<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
+</a>
+</div>
+
+{{/foreach}}
+<div class="clear"></div>
+<hr />
+{{/if}}
+
+
+<h3>{{$head_delegates}}</h3>
+
+{{if $delegates}}
+{{foreach $delegates as $x}}
+
+<div class="contact-block-div">
+<a class="contact-block-link" href="{{$base}}/delegate/remove/{{$x.uid}}" >
+<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
+</a>
+</div>
+
+{{/foreach}}
+<div class="clear"></div>
+{{else}}
+{{$none}}
+{{/if}}
+<hr />
+
+
+<h3>{{$head_potentials}}</h3>
+{{if $potentials}}
+{{foreach $potentials as $x}}
+
+<div class="contact-block-div">
+<a class="contact-block-link" href="{{$base}}/delegate/add/{{$x.uid}}" >
+<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
+</a>
+</div>
+
+{{/foreach}}
+<div class="clear"></div>
+{{else}}
+{{$none}}
+{{/if}}
+<hr />
+
diff --git a/view/templates/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl
new file mode 100644
index 0000000000..c941a201da
--- /dev/null
+++ b/view/templates/dfrn_req_confirm.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<p id="dfrn-request-homecoming" >
+{{$welcome}}
+<br />
+{{$please}}
+
+</p>
+<form id="dfrn-request-homecoming-form" action="dfrn_request/{{$nickname}}" method="post"> 
+<input type="hidden" name="dfrn_url" value="{{$dfrn_url}}" />
+<input type="hidden" name="confirm_key" value="{{$confirm_key}}" />
+<input type="hidden" name="localconfirm" value="1" />
+{{$aes_allow}}
+
+<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">{{$hidethem}}</label>
+<input type="checkbox" name="hidden-contact" value="1" {{if $hidechecked}}checked="checked" {{/if}} />
+
+
+<div id="dfrn-request-homecoming-submit-wrapper" >
+<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="{{$submit}}" />
+</div>
+</form>
\ No newline at end of file
diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
new file mode 100644
index 0000000000..29173a1d77
--- /dev/null
+++ b/view/templates/dfrn_request.tpl
@@ -0,0 +1,70 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h1>{{$header}}</h1>
+
+<p id="dfrn-request-intro">
+{{$page_desc}}<br />
+<ul id="dfrn-request-networks">
+<li><a href="http://friendica.com" title="{{$friendica}}">{{$friendica}}</a></li>
+<li><a href="http://joindiaspora.com" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
+<li><a href="http://ostatus.org" title="{{$public_net}}" >{{$statusnet}}</a></li>
+{{if $emailnet}}<li>{{$emailnet}}</li>{{/if}}
+</ul>
+{{$invite_desc}}
+</p>
+<p>
+{{$desc}}
+</p>
+
+<form action="dfrn_request/{{$nickname}}" method="post" />
+
+<div id="dfrn-request-url-wrapper" >
+	<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
+	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
+	<div id="dfrn-request-url-end"></div>
+</div>
+
+<p id="dfrn-request-options">
+{{$pls_answer}}
+</p>
+
+<div id="dfrn-request-info-wrapper" >
+
+
+<p id="doiknowyou">
+{{$does_know}}
+</p>
+
+		<div id="dfrn-request-know-yes-wrapper">
+		<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">{{$yes}}</label>
+		<input type="radio" name="knowyou" id="knowyouyes" value="1" />
+
+		<div id="dfrn-request-knowyou-break" ></div>	
+		</div>
+		<div id="dfrn-request-know-no-wrapper">
+		<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">{{$no}}</label>
+		<input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
+
+		<div id="dfrn-request-knowyou-end"></div>
+		</div>
+
+
+<p id="dfrn-request-message-desc">
+{{$add_note}}
+</p>
+	<div id="dfrn-request-message-wrapper">
+	<textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
+	</div>
+
+
+</div>
+
+	<div id="dfrn-request-submit-wrapper">
+		<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
+	</div>
+</form>
diff --git a/view/templates/diasp_dec_hdr.tpl b/view/templates/diasp_dec_hdr.tpl
new file mode 100644
index 0000000000..c3305ecd0b
--- /dev/null
+++ b/view/templates/diasp_dec_hdr.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<decrypted_hdeader>
+  <iv>{{$inner_iv}}</iv>
+  <aes_key>{{$inner_key}}</aes_key>
+  <author>
+    <name>{{$author_name}}</name>
+    <uri>{{$author_uri}}</uri>
+  </author>
+</decrypted_header>
diff --git a/view/templates/diaspora_comment.tpl b/view/templates/diaspora_comment.tpl
new file mode 100644
index 0000000000..8df3842d0b
--- /dev/null
+++ b/view/templates/diaspora_comment.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <comment>
+      <guid>{{$guid}}</guid>
+      <parent_guid>{{$parent_guid}}</parent_guid>
+      <author_signature>{{$authorsig}}</author_signature>
+      <text>{{$body}}</text>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+    </comment>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/templates/diaspora_comment_relay.tpl b/view/templates/diaspora_comment_relay.tpl
new file mode 100644
index 0000000000..c01441e3c1
--- /dev/null
+++ b/view/templates/diaspora_comment_relay.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <comment>
+      <guid>{{$guid}}</guid>
+      <parent_guid>{{$parent_guid}}</parent_guid>
+      <parent_author_signature>{{$parentsig}}</parent_author_signature>
+      <author_signature>{{$authorsig}}</author_signature>
+      <text>{{$body}}</text>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+    </comment>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/templates/diaspora_conversation.tpl b/view/templates/diaspora_conversation.tpl
new file mode 100644
index 0000000000..fd11b826a9
--- /dev/null
+++ b/view/templates/diaspora_conversation.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <conversation>
+      <guid>{{$conv.guid}}</guid>
+      <subject>{{$conv.subject}}</subject>
+      <created_at>{{$conv.created_at}}</created_at>
+
+      {{foreach $conv.messages as $msg}}
+
+      <message>
+        <guid>{{$msg.guid}}</guid>
+        <parent_guid>{{$msg.parent_guid}}</parent_guid>
+        {{if $msg.parent_author_signature}}
+        <parent_author_signature>{{$msg.parent_author_signature}}</parent_author_signature>
+        {{/if}}
+        <author_signature>{{$msg.author_signature}}</author_signature>
+        <text>{{$msg.text}}</text>
+        <created_at>{{$msg.created_at}}</created_at>
+        <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle>
+        <conversation_guid>{{$msg.conversation_guid}}</conversation_guid>
+      </message>
+
+      {{/foreach}}
+
+      <diaspora_handle>{{$conv.diaspora_handle}}</diaspora_handle>
+      <participant_handles>{{$conv.participant_handles}}</participant_handles>
+    </conversation>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_like.tpl b/view/templates/diaspora_like.tpl
new file mode 100644
index 0000000000..1d58d5d3f3
--- /dev/null
+++ b/view/templates/diaspora_like.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <like>
+      <target_type>{{$target_type}}</target_type>
+      <guid>{{$guid}}</guid>
+      <parent_guid>{{$parent_guid}}</parent_guid>
+      <author_signature>{{$authorsig}}</author_signature>
+      <positive>{{$positive}}</positive>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+    </like>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_like_relay.tpl b/view/templates/diaspora_like_relay.tpl
new file mode 100644
index 0000000000..7a55d8b203
--- /dev/null
+++ b/view/templates/diaspora_like_relay.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <like>
+      <guid>{{$guid}}</guid>
+      <target_type>{{$target_type}}</target_type>
+      <parent_guid>{{$parent_guid}}</parent_guid>
+      <parent_author_signature>{{$parentsig}}</parent_author_signature>
+      <author_signature>{{$authorsig}}</author_signature>
+      <positive>{{$positive}}</positive>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+    </like>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_message.tpl b/view/templates/diaspora_message.tpl
new file mode 100644
index 0000000000..e1690734fd
--- /dev/null
+++ b/view/templates/diaspora_message.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+      <message>
+        <guid>{{$msg.guid}}</guid>
+        <parent_guid>{{$msg.parent_guid}}</parent_guid>
+        <author_signature>{{$msg.author_signature}}</author_signature>
+        <text>{{$msg.text}}</text>
+        <created_at>{{$msg.created_at}}</created_at>
+        <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle>
+        <conversation_guid>{{$msg.conversation_guid}}</conversation_guid>
+      </message>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_photo.tpl b/view/templates/diaspora_photo.tpl
new file mode 100644
index 0000000000..b6220346c4
--- /dev/null
+++ b/view/templates/diaspora_photo.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <photo>
+      <remote_photo_path>{{$path}}</remote_photo_path>
+      <remote_photo_name>{{$filename}}</remote_photo_name>
+      <status_message_guid>{{$msg_guid}}</status_message_guid>
+      <guid>{{$guid}}</guid>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+      <public>{{$public}}</public>
+      <created_at>{{$created_at}}</created_at>
+    </photo>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/templates/diaspora_post.tpl b/view/templates/diaspora_post.tpl
new file mode 100644
index 0000000000..2817f7d4a0
--- /dev/null
+++ b/view/templates/diaspora_post.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <status_message>
+      <raw_message>{{$body}}</raw_message>
+      <guid>{{$guid}}</guid>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+      <public>{{$public}}</public>
+      <created_at>{{$created}}</created_at>
+    </status_message>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/templates/diaspora_profile.tpl b/view/templates/diaspora_profile.tpl
new file mode 100644
index 0000000000..11aaf10550
--- /dev/null
+++ b/view/templates/diaspora_profile.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+ <post><profile>
+  <diaspora_handle>{{$handle}}</diaspora_handle>
+  <first_name>{{$first}}</first_name>
+  <last_name>{{$last}}</last_name>
+  <image_url>{{$large}}</image_url>
+  <image_url_small>{{$small}}</image_url_small>
+  <image_url_medium>{{$medium}}</image_url_medium>
+  <birthday>{{$dob}}</birthday>
+  <gender>{{$gender}}</gender>
+  <bio>{{$about}}</bio>
+  <location>{{$location}}</location>
+  <searchable>{{$searchable}}</searchable>
+  <tag_string>{{$tags}}</tag_string>
+</profile></post>
+      </XML>
diff --git a/view/templates/diaspora_relay_retraction.tpl b/view/templates/diaspora_relay_retraction.tpl
new file mode 100644
index 0000000000..97a1344c97
--- /dev/null
+++ b/view/templates/diaspora_relay_retraction.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <relayable_retraction>
+      <target_type>{{$type}}</target_type>
+      <target_guid>{{$guid}}</target_guid>
+      <target_author_signature>{{$signature}}</target_author_signature>
+      <sender_handle>{{$handle}}</sender_handle>
+    </relayable_retraction>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_relayable_retraction.tpl b/view/templates/diaspora_relayable_retraction.tpl
new file mode 100644
index 0000000000..138cbdb317
--- /dev/null
+++ b/view/templates/diaspora_relayable_retraction.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <relayable_retraction>
+      <target_type>{{$target_type}}</target_type>
+      <target_guid>{{$guid}}</target_guid>
+      <parent_author_signature>{{$parentsig}}</parent_author_signature>
+      <target_author_signature>{{$authorsig}}</target_author_signature>
+      <sender_handle>{{$handle}}</sender_handle>
+    </relayable_retraction>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_retract.tpl b/view/templates/diaspora_retract.tpl
new file mode 100644
index 0000000000..103bfc9d5c
--- /dev/null
+++ b/view/templates/diaspora_retract.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <retraction>
+      <post_guid>{{$guid}}</post_guid>
+      <type>{{$type}}</type>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+    </retraction>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/templates/diaspora_share.tpl b/view/templates/diaspora_share.tpl
new file mode 100644
index 0000000000..5ff04440d5
--- /dev/null
+++ b/view/templates/diaspora_share.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <request>
+      <sender_handle>{{$sender}}</sender_handle>
+      <recipient_handle>{{$recipient}}</recipient_handle>
+    </request>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/templates/diaspora_signed_retract.tpl b/view/templates/diaspora_signed_retract.tpl
new file mode 100644
index 0000000000..58c5cc2376
--- /dev/null
+++ b/view/templates/diaspora_signed_retract.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <signed_retraction>
+      <target_guid>{{$guid}}</target_guid>
+      <target_type>{{$type}}</target_type>
+      <sender_handle>{{$handle}}</sender_handle>
+      <target_author_signature>{{$signature}}</target_author_signature>
+    </signed_retraction>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_vcard.tpl b/view/templates/diaspora_vcard.tpl
new file mode 100644
index 0000000000..5ea6335a87
--- /dev/null
+++ b/view/templates/diaspora_vcard.tpl
@@ -0,0 +1,62 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div style="display:none;">
+	<dl class='entity_nickname'>
+		<dt>Nickname</dt>
+		<dd>		
+			<a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.nickname}}</a>
+		</dd>
+	</dl>
+	<dl class='entity_fn'>
+		<dt>Full name</dt>
+		<dd>
+			<span class='fn'>{{$diaspora.fullname}}</span>
+		</dd>
+	</dl>
+
+	<dl class='entity_given_name'>
+		<dt>First name</dt>
+		<dd>
+		<span class='given_name'>{{$diaspora.firstname}}</span>
+		</dd>
+	</dl>
+	<dl class='entity_family_name'>
+		<dt>Family name</dt>
+		<dd>
+		<span class='family_name'>{{$diaspora.lastname}}</span>
+		</dd>
+	</dl>
+	<dl class="entity_url">
+		<dt>URL</dt>
+		<dd>
+			<a class="url" href="{{$diaspora.podloc}}/" id="pod_location" rel="me">{{$diaspora.podloc}}/</a>
+		</dd>
+	</dl>
+	<dl class="entity_photo">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo avatar" height="300" width="300" src="{{$diaspora.photo300}}">
+		</dd>
+	</dl>
+	<dl class="entity_photo_medium">
+		<dt>Photo</dt>
+		<dd> 
+			<img class="photo avatar" height="100" width="100" src="{{$diaspora.photo100}}">
+		</dd>
+	</dl>
+	<dl class="entity_photo_small">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
+		</dd>
+	</dl>
+	<dl class="entity_searchable">
+		<dt>Searchable</dt>
+		<dd>
+			<span class="searchable">{{$diaspora.searchable}}</span>
+		</dd>
+	</dl>
+</div>
diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl
new file mode 100644
index 0000000000..ed1115de9d
--- /dev/null
+++ b/view/templates/directory_header.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$sitedir}}</h1>
+
+{{$globaldir}}
+{{$admin}}
+
+{{$finding}}
+
+<div id="directory-search-wrapper">
+<form id="directory-search-form" action="directory" method="get" >
+<span class="dirsearch-desc">{{$desc}}</span>
+<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
+<input type="submit" name="submit" id="directory-search-submit" value="{{$submit}}" class="button" />
+</form>
+</div>
+<div id="directory-search-end"></div>
+
diff --git a/view/templates/directory_item.tpl b/view/templates/directory_item.tpl
new file mode 100644
index 0000000000..ae52646b8f
--- /dev/null
+++ b/view/templates/directory_item.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	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}}" > 
+		<div class="contact-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>
+		</div>
+	</div>
+
+	<div class="contact-name" id="directory-name-{{$id}}">{{$name}}</div>
+	<div class="contact-details">{{$details}}</div>
+</div>
diff --git a/view/templates/display-head.tpl b/view/templates/display-head.tpl
new file mode 100644
index 0000000000..7750b655e0
--- /dev/null
+++ b/view/templates/display-head.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+$(document).ready(function() {
+	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+	// make auto-complete work in more places
+	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+});
+</script>
+
diff --git a/view/templates/email_notify_html.tpl b/view/templates/email_notify_html.tpl
new file mode 100644
index 0000000000..7143adbaf2
--- /dev/null
+++ b/view/templates/email_notify_html.tpl
@@ -0,0 +1,35 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>{{$banner}}</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
+
+
+	<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
+
+
+	{{if $content_allowed}}
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
+		<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
+	<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
+	{{/if}}
+	<tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr>
+	<tr><td style="padding-bottom:11px;" colspan="2">{{$hitemlink}}</td></tr>
+	<tr><td></td><td>{{$thanks}}</td></tr>
+	<tr><td></td><td>{{$site_admin}}</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
+
diff --git a/view/templates/email_notify_text.tpl b/view/templates/email_notify_text.tpl
new file mode 100644
index 0000000000..054a9e1b0e
--- /dev/null
+++ b/view/templates/email_notify_text.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+{{$preamble}}
+
+{{if $content_allowed}}
+{{$title}}
+
+{{$textversion}}
+
+{{/if}}
+{{$tsitelink}}
+{{$titemlink}}
+
+{{$thanks}}
+{{$site_admin}}
+
+
diff --git a/view/templates/end.tpl b/view/templates/end.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/event.tpl b/view/templates/event.tpl
new file mode 100644
index 0000000000..4788dcb380
--- /dev/null
+++ b/view/templates/event.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{foreach $events as $event}}
+	<div class="event">
+	
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
+	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
+	</div>
+	<div class="clear"></div>
+{{/foreach}}
diff --git a/view/templates/event_end.tpl b/view/templates/event_end.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/event_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/event_form.tpl b/view/templates/event_form.tpl
new file mode 100644
index 0000000000..335a9480bf
--- /dev/null
+++ b/view/templates/event_form.tpl
@@ -0,0 +1,54 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+
+<p>
+{{$desc}}
+</p>
+
+<form action="{{$post}}" method="post" >
+
+<input type="hidden" name="event_id" value="{{$eid}}" />
+<input type="hidden" name="cid" value="{{$cid}}" />
+<input type="hidden" name="uri" value="{{$uri}}" />
+
+<div id="event-start-text">{{$s_text}}</div>
+{{$s_dsel}} {{$s_tsel}}
+
+<div id="event-finish-text">{{$f_text}}</div>
+{{$f_dsel}} {{$f_tsel}}
+
+<div id="event-datetime-break"></div>
+
+<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
+
+<div id="event-nofinish-break"></div>
+
+<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div>
+
+<div id="event-adjust-break"></div>
+
+<div id="event-summary-text">{{$t_text}}</div>
+<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" />
+
+
+<div id="event-desc-text">{{$d_text}}</div>
+<textarea id="event-desc-textarea" name="desc">{{$d_orig}}</textarea>
+
+
+<div id="event-location-text">{{$l_text}}</div>
+<textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea>
+
+<input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
+<div id="event-share-break"></div>
+
+{{$acl}}
+
+<div class="clear"></div>
+<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
+</form>
+
+
diff --git a/view/templates/event_head.tpl b/view/templates/event_head.tpl
new file mode 100644
index 0000000000..3d7091fb7a
--- /dev/null
+++ b/view/templates/event_head.tpl
@@ -0,0 +1,144 @@
+{{*
+ *	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>
+
+<script>
+	function showEvent(eventid) {
+		$.get(
+			'{{$baseurl}}/events/?id='+eventid,
+			function(data){
+				$.colorbox({html:data});
+			}
+		);			
+	}
+	
+	$(document).ready(function() {
+		$('#events-calendar').fullCalendar({
+			events: '{{$baseurl}}/events/json/',
+			header: {
+				left: 'prev,next today',
+				center: 'title',
+				right: 'month,agendaWeek,agendaDay'
+			},			
+			timeFormat: 'H(:mm)',
+			eventClick: function(calEvent, jsEvent, view) {
+				showEvent(calEvent.id);
+			},
+			
+			eventRender: function(event, element, view) {
+				//console.log(view.name);
+				if (event.item['author-name']==null) return;
+				switch(view.name){
+					case "month":
+					element.find(".fc-event-title").html(
+						"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
+							event.item['author-avatar'],
+							event.item['author-name'],
+							event.title
+					));
+					break;
+					case "agendaWeek":
+					element.find(".fc-event-title").html(
+						"<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(
+							event.item['author-avatar'],
+							event.item['author-name'],
+							event.item.desc,
+							event.item.location
+					));
+					break;
+					case "agendaDay":
+					element.find(".fc-event-title").html(
+						"<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(
+							event.item['author-avatar'],
+							event.item['author-name'],
+							event.item.desc,
+							event.item.location
+					));
+					break;
+				}
+			}
+			
+		})
+		
+		// center on date
+		var args=location.href.replace(baseurl,"").split("/");
+		if (args.length>=4) {
+			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
+		} 
+		
+		// show event popup
+		var hash = location.hash.split("-")
+		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
+		
+	});
+</script>
+
+
+<script language="javascript" type="text/javascript"
+          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "textareas",
+		plugins : "bbcode,paste",
+		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",
+		gecko_spellcheck : true,
+		paste_text_sticky : true,
+		entity_encoding : "raw",
+		add_unload_trigger : false,
+		remove_linebreaks : false,
+		//force_p_newlines : false,
+		//force_br_newlines : true,
+		forced_root_block : 'div',
+		content_css: "{{$baseurl}}/view/custom_tinymce.css",
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+			});
+		}
+
+	});
+
+
+	$(document).ready(function() { 
+
+		$('#event-share-checkbox').change(function() {
+
+			if ($('#event-share-checkbox').is(':checked')) { 
+				$('#acl-wrapper').show();
+			}
+			else {
+				$('#acl-wrapper').hide();
+			}
+		}).trigger('change');
+
+
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-public').hide();
+			});
+			if(selstr == null) {
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+
+	});
+
+</script>
+
diff --git a/view/templates/events-js.tpl b/view/templates/events-js.tpl
new file mode 100644
index 0000000000..5fa046f5a1
--- /dev/null
+++ b/view/templates/events-js.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$tabs}}
+<h2>{{$title}}</h2>
+
+<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
+
+<div id="events-calendar"></div>
diff --git a/view/templates/events.tpl b/view/templates/events.tpl
new file mode 100644
index 0000000000..054200ca2d
--- /dev/null
+++ b/view/templates/events.tpl
@@ -0,0 +1,29 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$tabs}}
+<h2>{{$title}}</h2>
+
+<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
+
+<div id="event-calendar-wrapper">
+	<a href="{{$previus.0}}" class="prevcal {{$previus.2}}"><div id="event-calendar-prev" class="icon s22 prev" title="{{$previus.1}}"></div></a>
+	{{$calendar}}
+	<a href="{{$next.0}}" class="nextcal {{$next.2}}"><div id="event-calendar-prev" class="icon s22 next" title="{{$next.1}}"></div></a>
+</div>
+<div class="event-calendar-end"></div>
+
+
+{{foreach $events as $event}}
+	<div class="event">
+	{{if $event.is_first}}<hr /><a name="link-{{$event.j}}" ><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
+	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
+	</div>
+	<div class="clear"></div>
+
+{{/foreach}}
diff --git a/view/templates/events_reminder.tpl b/view/templates/events_reminder.tpl
new file mode 100644
index 0000000000..3448ea45cb
--- /dev/null
+++ b/view/templates/events_reminder.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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>
+<div id="event-title-end"></div>
+{{foreach $events as $event}}
+<div class="event-list" id="event-{{$event.id}}"> <a href="events/{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
+{{/foreach}}
+</div>
+{{/if}}
+
diff --git a/view/templates/failed_updates.tpl b/view/templates/failed_updates.tpl
new file mode 100644
index 0000000000..8161ff2ef4
--- /dev/null
+++ b/view/templates/failed_updates.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h2>{{$banner}}</h2>
+
+<div id="failed_updates_desc">{{$desc}}</div>
+
+{{if $failed}}
+{{foreach $failed as $f}}
+
+<h4>{{$f}}</h4>
+<ul>
+<li><a href="{{$base}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li>
+<li><a href="{{$base}}/admin/dbsync/{{$f}}">{{$apply}}</a></li>
+</ul>
+
+<hr />
+{{/foreach}}
+{{/if}}
+
diff --git a/view/templates/fake_feed.tpl b/view/templates/fake_feed.tpl
new file mode 100644
index 0000000000..fd875de716
--- /dev/null
+++ b/view/templates/fake_feed.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	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" >
+
+  <id>fake feed</id>
+  <title>fake title</title>
+
+  <updated>1970-01-01T00:00:00Z</updated>
+
+  <author>
+    <name>Fake Name</name>
+    <uri>http://example.com</uri>
+  </author>
+
diff --git a/view/templates/field.tpl b/view/templates/field.tpl
new file mode 100644
index 0000000000..1bf36d84ef
--- /dev/null
+++ b/view/templates/field.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+ {{if $field.0==select}}
+ {{include file="field_select.tpl"}}
+ {{/if}}
diff --git a/view/templates/field_checkbox.tpl b/view/templates/field_checkbox.tpl
new file mode 100644
index 0000000000..694bce6b57
--- /dev/null
+++ b/view/templates/field_checkbox.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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>
+		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl
new file mode 100644
index 0000000000..d3cc75635e
--- /dev/null
+++ b/view/templates/field_combobox.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	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>
+		{{* html5 don't work on Chrome, Safari and IE9
+		<input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" >
+		<datalist id="data_{{$field.0}}" >
+		   {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}}
+		</datalist> *}}
+		
+		<input id="id_{{$field.0}}" type="text" value="{{$field.2}}">
+		<select id="select_{{$field.0}}" onChange="$('#id_{{$field.0}}').val($(this).val())">
+			<option value="">{{$field.5}}</option>
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
+		</select>
+		
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
+
diff --git a/view/templates/field_custom.tpl b/view/templates/field_custom.tpl
new file mode 100644
index 0000000000..c2d73275c3
--- /dev/null
+++ b/view/templates/field_custom.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field custom'>
+		<label for='{{$field.0}}'>{{$field.1}}</label>
+		{{$field.2}}
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl
new file mode 100644
index 0000000000..3c400b5ad2
--- /dev/null
+++ b/view/templates/field_input.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field input'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl
new file mode 100644
index 0000000000..54967feab0
--- /dev/null
+++ b/view/templates/field_intcheckbox.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field checkbox'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="true"{{/if}}>
+		<span class='field_help'>{{$field.4}}</span>
+	</div>
diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl
new file mode 100644
index 0000000000..b00ddabcd8
--- /dev/null
+++ b/view/templates/field_openid.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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>
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl
new file mode 100644
index 0000000000..5889d2e9c0
--- /dev/null
+++ b/view/templates/field_password.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field password'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_radio.tpl b/view/templates/field_radio.tpl
new file mode 100644
index 0000000000..1d7b56ec6a
--- /dev/null
+++ b/view/templates/field_radio.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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>
+		<input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_richtext.tpl b/view/templates/field_richtext.tpl
new file mode 100644
index 0000000000..38992f0f83
--- /dev/null
+++ b/view/templates/field_richtext.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field richtext'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext">{{$field.2}}</textarea>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_select.tpl b/view/templates/field_select.tpl
new file mode 100644
index 0000000000..2a4117a70c
--- /dev/null
+++ b/view/templates/field_select.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select name='{{$field.0}}' id='id_{{$field.0}}'>
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_select_raw.tpl b/view/templates/field_select_raw.tpl
new file mode 100644
index 0000000000..50e34985f6
--- /dev/null
+++ b/view/templates/field_select_raw.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select name='{{$field.0}}' id='id_{{$field.0}}'>
+			{{$field.4}}
+		</select>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_textarea.tpl b/view/templates/field_textarea.tpl
new file mode 100644
index 0000000000..5d71999d4a
--- /dev/null
+++ b/view/templates/field_textarea.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field textarea'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<textarea name='{{$field.0}}' id='id_{{$field.0}}'>{{$field.2}}</textarea>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl
new file mode 100644
index 0000000000..cde744594b
--- /dev/null
+++ b/view/templates/field_themeselect.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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>
+		<select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5}}onchange="previewTheme(this);"{{/if}} >
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<span class='field_help'>{{$field.3}}</span>
+		<div id="theme-preview"></div>
+	</div>
diff --git a/view/templates/field_yesno.tpl b/view/templates/field_yesno.tpl
new file mode 100644
index 0000000000..e982c2f05d
--- /dev/null
+++ b/view/templates/field_yesno.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	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">
+			<input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+			<a href="#" class='off'>
+				{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
+			</a>
+			<a href="#" class='on'>
+				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
+			</a>
+		</div>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/fileas_widget.tpl b/view/templates/fileas_widget.tpl
new file mode 100644
index 0000000000..f03f169a2f
--- /dev/null
+++ b/view/templates/fileas_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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>
+	
+	<ul class="fileas-ul">
+		<li class="tool"><a href="{{$base}}" class="fileas-link fileas-all{{if $sel_all}} fileas-selected{{/if}}">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+			<li class="tool"><a href="{{$base}}?f=&file={{$term.name}}" class="fileas-link{{if $term.selected}} fileas-selected{{/if}}">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/templates/filebrowser.tpl b/view/templates/filebrowser.tpl
new file mode 100644
index 0000000000..b408ca6874
--- /dev/null
+++ b/view/templates/filebrowser.tpl
@@ -0,0 +1,89 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<!DOCTYPE html>
+<html>
+	<head>
+	<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
+	<style>
+		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
+		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
+		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
+		.filebrowser ul{ list-style-type: none; padding:0px; }
+		.filebrowser.folders a { display: block; padding: 0.3em }
+		.filebrowser.folders a:hover { background-color: #f0f0ee; }
+		.filebrowser.files.image { overflow: auto; height: auto; }
+		.filebrowser.files.image img { height:50px;}
+		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
+		.filebrowser.files.image span { display: none;}
+		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
+		.filebrowser.files a { display: block;  padding: 0.3em}
+		.filebrowser.files a:hover { background-color: #f0f0ee; }
+		.filebrowser a { text-decoration: none; }
+	</style>
+	<script>
+		var FileBrowserDialogue = {
+			init : function () {
+				// Here goes your code for setting your custom things onLoad.
+			},
+			mySubmit : function (URL) {
+				//var URL = document.my_form.my_field.value;
+				var win = tinyMCEPopup.getWindowArg("window");
+
+				// insert information now
+				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
+
+				// are we an image browser
+				if (typeof(win.ImageDialog) != "undefined") {
+					// we are, so update image dimensions...
+					if (win.ImageDialog.getImageData)
+						win.ImageDialog.getImageData();
+
+					// ... and preview if necessary
+					if (win.ImageDialog.showPreviewImage)
+						win.ImageDialog.showPreviewImage(URL);
+				}
+
+				// close popup window
+				tinyMCEPopup.close();
+			}
+		}
+
+		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
+	</script>
+	</head>
+	<body>
+	
+	<div class="tabs">
+		<ul >
+			<li class="current"><span>FileBrowser</span></li>
+		</ul>
+	</div>
+	<div class="panel_wrapper">
+
+		<div id="general_panel" class="panel current">
+			<div class="filebrowser path">
+				{{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
+			</div>
+			<div class="filebrowser folders">
+				<ul>
+					{{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
+				</ul>
+			</div>
+			<div class="filebrowser files {{$type}}">
+				<ul>
+				{{foreach $files as $f}}
+					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
+				{{/foreach}}
+				</ul>
+			</div>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
+	</div>	
+	</body>
+	
+</html>
diff --git a/view/templates/filer_dialog.tpl b/view/templates/filer_dialog.tpl
new file mode 100644
index 0000000000..f17a067665
--- /dev/null
+++ b/view/templates/filer_dialog.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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}}" />
+</div>
diff --git a/view/templates/follow.tpl b/view/templates/follow.tpl
new file mode 100644
index 0000000000..7ea961780f
--- /dev/null
+++ b/view/templates/follow.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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>
+	<form action="follow" method="post" >
+		<input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
+	</form>
+</div>
+
diff --git a/view/templates/follow_slap.tpl b/view/templates/follow_slap.tpl
new file mode 100644
index 0000000000..554853f196
--- /dev/null
+++ b/view/templates/follow_slap.tpl
@@ -0,0 +1,30 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	<entry>
+		<author>
+			<name>{{$name}}</name>
+			<uri>{{$profile_page}}</uri>
+			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
+			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
+		</author>
+
+		<id>{{$item_id}}</id>
+		<title>{{$title}}</title>
+		<published>{{$published}}</published>
+		<content type="{{$type}}" >{{$content}}</content>
+
+		<as:actor>
+		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
+		<id>{{$profile_page}}</id>
+		<title></title>
+ 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="{{$photo}}"/>
+		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}"/>
+		<poco:preferredUsername>{{$nick}}</poco:preferredUsername>
+		<poco:displayName>{{$name}}</poco:displayName>
+		</as:actor>
+ 		<as:verb>{{$verb}}</as:verb>
+		{{$ostat_follow}}
+	</entry>
diff --git a/view/templates/generic_links_widget.tpl b/view/templates/generic_links_widget.tpl
new file mode 100644
index 0000000000..c12273c7be
--- /dev/null
+++ b/view/templates/generic_links_widget.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	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}}
+	
+	<ul>
+		{{foreach $items as $item}}
+			<li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/templates/group_drop.tpl b/view/templates/group_drop.tpl
new file mode 100644
index 0000000000..84d380e304
--- /dev/null
+++ b/view/templates/group_drop.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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();" 
+		id="group-delete-icon-{{$id}}" 
+		class="icon drophide group-delete-icon" 
+		onmouseover="imgbright(this);" 
+		onmouseout="imgdull(this);" ></a>
+</div>
+<div class="group-delete-end"></div>
diff --git a/view/templates/group_edit.tpl b/view/templates/group_edit.tpl
new file mode 100644
index 0000000000..b7b14eba37
--- /dev/null
+++ b/view/templates/group_edit.tpl
@@ -0,0 +1,28 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h2>{{$title}}</h2>
+
+
+<div id="group-edit-wrapper" >
+	<form action="group/{{$gid}}" id="group-edit-form" method="post" >
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		{{include file="field_input.tpl" field=$gname}}
+		{{if $drop}}{{$drop}}{{/if}}
+		<div id="group-edit-submit-wrapper" >
+			<input type="submit" name="submit" value="{{$submit}}" >
+		</div>
+		<div id="group-edit-select-end" ></div>
+	</form>
+</div>
+
+
+{{if $groupeditor}}
+	<div id="group-update-wrapper">
+		{{include file="groupeditor.tpl"}}
+	</div>
+{{/if}}
+{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}
diff --git a/view/templates/group_selection.tpl b/view/templates/group_selection.tpl
new file mode 100644
index 0000000000..f16bb5159f
--- /dev/null
+++ b/view/templates/group_selection.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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" >
+{{foreach $groups as $group}}
+<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option>
+{{/foreach}}
+</select>
+</div>
diff --git a/view/templates/group_side.tpl b/view/templates/group_side.tpl
new file mode 100644
index 0000000000..b6532fb6d4
--- /dev/null
+++ b/view/templates/group_side.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="widget" id="group-sidebar">
+<h3>{{$title}}</h3>
+
+<div id="sidebar-group-list">
+	<ul id="sidebar-group-ul">
+		{{foreach $groups as $group}}
+			<li class="sidebar-group-li">
+				{{if $group.cid}}
+					<input type="checkbox" 
+						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
+						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
+						{{if $group.ismember}}checked="checked"{{/if}}
+					/>
+				{{/if}}			
+				{{if $group.edit}}
+					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"></span></a>
+				{{/if}}
+				<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
+			</li>
+		{{/foreach}}
+	</ul>
+	</div>
+  <div id="sidebar-new-group">
+  <a href="group/new">{{$createtext}}</a>
+  </div>
+  {{if $ungrouped}}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">{{$ungrouped}}</a>
+  </div>
+  {{/if}}
+</div>
+
+
diff --git a/view/templates/groupeditor.tpl b/view/templates/groupeditor.tpl
new file mode 100644
index 0000000000..4fad30d5a3
--- /dev/null
+++ b/view/templates/groupeditor.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	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">
+{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
+</div>
+<div id="group-members-end"></div>
+<hr id="group-separator" />
+</div>
+
+<div id="contacts">
+<h3>{{$groupeditor.label_contacts}}</h3>
+<div id="group-all-contacts" class="contact_list">
+{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
+</div>
+<div id="group-all-contacts-end"></div>
+</div>
diff --git a/view/templates/head.tpl b/view/templates/head.tpl
new file mode 100644
index 0000000000..1b01b71a05
--- /dev/null
+++ b/view/templates/head.tpl
@@ -0,0 +1,117 @@
+{{*
+ *	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}}" />
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox.css" type="text/css" media="screen" />-->*}}
+<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
+
+<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
+
+<link rel="apple-touch-icon" href="{{$baseurl}}/images/friendica-128.png"/>
+<meta name="apple-mobile-web-app-capable" content="yes" /> 
+
+
+<link rel="search"
+         href="{{$baseurl}}/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/fk.autocomplete.js" ></script>
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox.pack.js"></script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/acl.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/main.js" ></script>
+<script>
+
+	var updateInterval = {{$update_interval}};
+	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
+
+	function confirmDelete() { return confirm("{{$delitem}}"); }
+	function commentOpen(obj,id) {
+		if(obj.value == '{{$comment}}') {
+			obj.value = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			$("#mod-cmnt-wrap-" + id).show();
+			openMenu("comment-edit-submit-wrapper-" + id);
+			return true;
+		}
+		return false;
+	}
+	function commentClose(obj,id) {
+		if(obj.value == '') {
+			obj.value = '{{$comment}}';
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+			$("#mod-cmnt-wrap-" + id).hide();
+			closeMenu("comment-edit-submit-wrapper-" + id);
+			return true;
+		}
+		return false;
+	}
+
+
+	function commentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '{{$comment}}') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).html();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+	}
+
+	function qCommentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '{{$comment}}') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).val();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+		$(obj).val('');
+	}
+
+	window.showMore = "{{$showmore}}";
+	window.showFewer = "{{$showfewer}}";
+
+	function showHideCommentBox(id) {
+		if( $('#comment-edit-form-' + id).is(':visible')) {
+			$('#comment-edit-form-' + id).hide();
+		}
+		else {
+			$('#comment-edit-form-' + id).show();
+		}
+	}
+
+
+</script>
+
+
diff --git a/view/templates/hide_comments.tpl b/view/templates/hide_comments.tpl
new file mode 100644
index 0000000000..50a3541229
--- /dev/null
+++ b/view/templates/hide_comments.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+<div id="collapsed-comments-{{$id}}" class="collapsed-comments" style="display: {{$display}};">
diff --git a/view/templates/install.tpl b/view/templates/install.tpl
new file mode 100644
index 0000000000..cfb90e61fb
--- /dev/null
+++ b/view/templates/install.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+
+{{if $status}}
+<h3 class="error-message">{{$status}}</h3>
+{{/if}}
+
+{{$text}}
diff --git a/view/templates/install_checks.tpl b/view/templates/install_checks.tpl
new file mode 100644
index 0000000000..44852b4101
--- /dev/null
+++ b/view/templates/install_checks.tpl
@@ -0,0 +1,29 @@
+{{*
+ *	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">
+<table>
+{{foreach $checks as $check}}
+	<tr><td>{{$check.title}} </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if $check.required}}off{{else}}yellow{{/if}}{{/if}}"></td><td>{{if $check.required}}(required){{/if}}</td></tr>
+	{{if $check.help}}
+	<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
+	{{/if}}
+{{/foreach}}
+</table>
+
+{{if $phpath}}
+	<input type="hidden" name="phpath" value="{{$phpath}}">
+{{/if}}
+
+{{if $passed}}
+	<input type="hidden" name="pass" value="2">
+	<input type="submit" value="{{$next}}">
+{{else}}
+	<input type="hidden" name="pass" value="1">
+	<input type="submit" value="{{$reload}}">
+{{/if}}
+</form>
diff --git a/view/templates/install_db.tpl b/view/templates/install_db.tpl
new file mode 100644
index 0000000000..944666c6a5
--- /dev/null
+++ b/view/templates/install_db.tpl
@@ -0,0 +1,35 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+
+<p>
+{{$info_01}}<br>
+{{$info_02}}<br>
+{{$info_03}}
+</p>
+
+{{if $status}}
+<h3 class="error-message">{{$status}}</h3>
+{{/if}}
+
+<form id="install-form" action="{{$baseurl}}/install" method="post">
+
+<input type="hidden" name="phpath" value="{{$phpath}}" />
+<input type="hidden" name="pass" value="3" />
+
+{{include file="field_input.tpl" field=$dbhost}}
+{{include file="field_input.tpl" field=$dbuser}}
+{{include file="field_password.tpl" field=$dbpass}}
+{{include file="field_input.tpl" field=$dbdata}}
+
+
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
+
+</form>
+
diff --git a/view/templates/install_settings.tpl b/view/templates/install_settings.tpl
new file mode 100644
index 0000000000..2e97d06969
--- /dev/null
+++ b/view/templates/install_settings.tpl
@@ -0,0 +1,30 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+
+{{if $status}}
+<h3 class="error-message">{{$status}}</h3>
+{{/if}}
+
+<form id="install-form" action="{{$baseurl}}/install" method="post">
+
+<input type="hidden" name="phpath" value="{{$phpath}}" />
+<input type="hidden" name="dbhost" value="{{$dbhost}}" />
+<input type="hidden" name="dbuser" value="{{$dbuser}}" />
+<input type="hidden" name="dbpass" value="{{$dbpass}}" />
+<input type="hidden" name="dbdata" value="{{$dbdata}}" />
+<input type="hidden" name="pass" value="4" />
+
+{{include file="field_input.tpl" field=$adminmail}}
+{{$timezone}}
+
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
+
+</form>
+
diff --git a/view/templates/intros.tpl b/view/templates/intros.tpl
new file mode 100644
index 0000000000..bafdb07a04
--- /dev/null
+++ b/view/templates/intros.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="intro-wrapper" id="intro-{{$contact_id}}" >
+
+<p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
+<div class="intro-fullname" id="intro-fullname-{{$contact_id}}" >{{$fullname}}</div>
+<a class="intro-url-link" id="intro-url-link-{{$contact_id}}" href="{{$url}}" ><img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" /></a>
+<div class="intro-knowyou">{{$knowyou}}</div>
+<div class="intro-note" id="intro-note-{{$contact_id}}">{{$note}}</div>
+<div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
+<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
+<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
+<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
+</form>
+<div class="intro-form-end"></div>
+
+<form class="intro-approve-form" action="dfrn_confirm" method="post">
+{{include file="field_checkbox.tpl" field=$hidden}}
+{{include file="field_checkbox.tpl" field=$activity}}
+<input type="hidden" name="dfrn_id" value="{{$dfrn_id}}" >
+<input type="hidden" name="intro_id" value="{{$intro_id}}" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}" >
+
+{{$dfrn_text}}
+
+<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
+</form>
+</div>
+<div class="intro-end"></div>
diff --git a/view/templates/invite.tpl b/view/templates/invite.tpl
new file mode 100644
index 0000000000..e699f1f0ea
--- /dev/null
+++ b/view/templates/invite.tpl
@@ -0,0 +1,35 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<form action="invite" method="post" id="invite-form" >
+
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<div id="invite-wrapper">
+
+<h3>{{$invite}}</h3>
+
+<div id="invite-recipient-text">
+{{$addr_text}}
+</div>
+
+<div id="invite-recipient-textarea">
+<textarea id="invite-recipients" name="recipients" rows="8" cols="32" ></textarea>
+</div>
+
+<div id="invite-message-text">
+{{$msg_text}}
+</div>
+
+<div id="invite-message-textarea">
+<textarea id="invite-message" name="message" rows="10" cols="72" >{{$default_message}}</textarea>
+</div>
+
+<div id="invite-submit-wrapper">
+<input type="submit" name="submit" value="{{$submit}}" />
+</div>
+
+</div>
+</form>
diff --git a/view/templates/jot-end.tpl b/view/templates/jot-end.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/jot-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/jot-header.tpl b/view/templates/jot-header.tpl
new file mode 100644
index 0000000000..ce7dcf2a4d
--- /dev/null
+++ b/view/templates/jot-header.tpl
@@ -0,0 +1,327 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+
+var editor=false;
+var textlen = 0;
+var plaintext = '{{$editselect}}';
+
+function initEditor(cb){
+	if (editor==false){
+		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+			editor = true;
+			$("a#jot-perms-icon").colorbox({
+				'inline' : true,
+				'transition' : 'elastic'
+			});
+			$(".jothidden").show();
+			if (typeof cb!="undefined") cb();
+			return;
+		}	
+		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: {{$editselect}},
+			auto_focus: "profile-jot-text",
+			plugins : "bbcode,paste,autoresize, 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",
+			gecko_spellcheck : true,
+			paste_text_sticky : true,
+			entity_encoding : "raw",
+			add_unload_trigger : false,
+			remove_linebreaks : false,
+			//force_p_newlines : false,
+			//force_br_newlines : true,
+			forced_root_block : 'div',
+			convert_urls: false,
+			content_css: "{{$baseurl}}/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			file_browser_callback : "fcFileBrowser",
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null)
+						cPopup.onkey(e);
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) cPopup = null;
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+
+					textlen = txt.length;
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$('#profile-jot-desc').html('&nbsp;');
+					}	 
+
+				 //Character count
+
+					if(textlen <= 140) {
+						$('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('grey');
+					}
+					if((textlen > 140) && (textlen <= 420)) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('red');
+						$('#character-counter').addClass('orange');
+					}
+					if(textlen > 420) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('red');
+					}
+					$('#character-counter').text(textlen);
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$("#profile-jot-text-loading").hide();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+
+			}
+		});
+		editor = true;
+		// setup acl popup
+		$("a#jot-perms-icon").colorbox({
+			'inline' : true,
+			'transition' : 'elastic'
+		}); 
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
+</script>
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script>
+	var ispublic = '{{$ispublic}}';
+
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+
+	});
+
+	function deleteCheckedItems() {
+		if(confirm('{{$delitems}}')) {
+			var checkedstr = '';
+
+			$("#item-delete-selected").hide();
+			$('#item-delete-selected-rotator').show();
+
+			$('.item-select').each( function() {
+				if($(this).is(':checked')) {
+					if(checkedstr.length != 0) {
+						checkedstr = checkedstr + ',' + $(this).val();
+					}
+					else {
+						checkedstr = $(this).val();
+					}
+				}	
+			});
+			$.post('item', { dropitems: checkedstr }, function(data) {
+				window.location.reload();
+			});
+		}
+	}
+
+	function jotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				addeditortext(data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("{{$vidurl}}");
+		if(reply && reply.length) {
+			addeditortext('[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("{{$audurl}}");
+		if(reply && reply.length) {
+			addeditortext('[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("{{$whereareu}}", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+			if (!editor) $("#profile-jot-text").val("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).hide();
+				$(window).scrollTop(0);
+			});
+
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}
+
+	function itemTag(id) {
+		reply = prompt("{{$term}}");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.colorbox({html:data});
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply, NavUpdate);
+//					if(timer) clearTimeout(timer);
+//					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.colorbox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#profile-jot-text").val();
+			$("#profile-jot-text").val(currentText + data);
+		}
+		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+	}	
+
+	{{$geotag}}
+
+</script>
+
diff --git a/view/templates/jot.tpl b/view/templates/jot.tpl
new file mode 100644
index 0000000000..bd9902159c
--- /dev/null
+++ b/view/templates/jot.tpl
@@ -0,0 +1,93 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
+		{{/if}}
+		<div id="jot-text-wrap">
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+		</div>
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>
+
+	<div id="profile-jot-perms-end"></div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$acl}}
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			<div id="profile-jot-email-end"></div>
+			{{$jotnets}}
+		</div>
+	</div>
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/templates/jot_geotag.tpl b/view/templates/jot_geotag.tpl
new file mode 100644
index 0000000000..1ed2367aa5
--- /dev/null
+++ b/view/templates/jot_geotag.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
+			$('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/templates/lang_selector.tpl b/view/templates/lang_selector.tpl
new file mode 100644
index 0000000000..0b4224d7bd
--- /dev/null
+++ b/view/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{foreach $langs.0 as $v=>$l}}
+				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
+			{{/foreach}}
+		</select>
+	</form>
+</div>
diff --git a/view/templates/like_noshare.tpl b/view/templates/like_noshare.tpl
new file mode 100644
index 0000000000..62a16227db
--- /dev/null
+++ b/view/templates/like_noshare.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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>
+	{{if $nolike}}
+	<a href="#" class="icon dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
+	{{/if}}
+	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+</div>
diff --git a/view/templates/login.tpl b/view/templates/login.tpl
new file mode 100644
index 0000000000..5d9b5f4f99
--- /dev/null
+++ b/view/templates/login.tpl
@@ -0,0 +1,40 @@
+{{*
+ *	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" />
+
+	<div id="login_standard">
+	{{include file="field_input.tpl" field=$lname}}
+	{{include file="field_password.tpl" field=$lpassword}}
+	</div>
+	
+	{{if $openid}}
+			<div id="login_openid">
+			{{include file="field_openid.tpl" field=$lopenid}}
+			</div>
+	{{/if}}
+
+	{{include file="field_checkbox.tpl" field=$lremember}}
+
+	<div id="login-extra-links">
+		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
+        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+	</div>
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
+	</div>
+	
+	{{foreach $hiddens as $k=>$v}}
+		<input type="hidden" name="{{$k}}" value="{{$v}}" />
+	{{/foreach}}
+	
+	
+</form>
+
+
+<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
diff --git a/view/templates/login_head.tpl b/view/templates/login_head.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/login_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/logout.tpl b/view/templates/logout.tpl
new file mode 100644
index 0000000000..582d77ed63
--- /dev/null
+++ b/view/templates/logout.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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" />
+<input type="submit" name="submit" id="logout-button" value="{{$logout}}" />
+</div>
+</form>
diff --git a/view/templates/lostpass.tpl b/view/templates/lostpass.tpl
new file mode 100644
index 0000000000..0e437ca484
--- /dev/null
+++ b/view/templates/lostpass.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+
+<p id="lostpass-desc">
+{{$desc}}
+</p>
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper">
+        <label for="login-name" id="label-login-name">{{$name}}</label>
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+</div>
+<div id="login-extra-end"></div>
+<div id="login-submit-wrapper" >
+        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+
diff --git a/view/templates/magicsig.tpl b/view/templates/magicsig.tpl
new file mode 100644
index 0000000000..af8dbb5bc8
--- /dev/null
+++ b/view/templates/magicsig.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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">
+{{$data}}
+</me:data>
+<me:encoding>{{$encoding}}</me:encoding>
+<me:alg>{{$algorithm}}</me:alg>
+<me:sig key_id="{{$keyhash}}">{{$signature}}</me:sig>
+</me:env>
diff --git a/view/templates/mail_conv.tpl b/view/templates/mail_conv.tpl
new file mode 100644
index 0000000000..5083fdb258
--- /dev/null
+++ b/view/templates/mail_conv.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	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>
+	</div>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<div class="mail-conv-date">{{$mail.date}}</div>
+		<div class="mail-conv-subject">{{$mail.subject}}</div>
+		<div class="mail-conv-body">{{$mail.body}}</div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-outside-wrapper-end"></div>
+</div>
+</div>
+<hr class="mail-conv-break" />
diff --git a/view/templates/mail_display.tpl b/view/templates/mail_display.tpl
new file mode 100644
index 0000000000..23d05bdeb8
--- /dev/null
+++ b/view/templates/mail_display.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+{{foreach $mails as $mail}}
+	{{include file="mail_conv.tpl"}}
+{{/foreach}}
+
+{{if $canreply}}
+{{include file="prv_message.tpl"}}
+{{else}}
+{{$unknown_text}}
+{{/if}}
diff --git a/view/templates/mail_head.tpl b/view/templates/mail_head.tpl
new file mode 100644
index 0000000000..f7a39fa8b1
--- /dev/null
+++ b/view/templates/mail_head.tpl
@@ -0,0 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$messages}}</h3>
+
+{{$tab_content}}
diff --git a/view/templates/mail_list.tpl b/view/templates/mail_list.tpl
new file mode 100644
index 0000000000..9dbfb6a144
--- /dev/null
+++ b/view/templates/mail_list.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	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>
+	</div>
+	<div class="mail-list-detail">
+		<div class="mail-list-sender-name" >{{$from_name}}</div>
+		<div class="mail-list-date">{{$date}}</div>
+		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
+		<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
+	</div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/templates/maintenance.tpl b/view/templates/maintenance.tpl
new file mode 100644
index 0000000000..f0ea0849c2
--- /dev/null
+++ b/view/templates/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/templates/manage.tpl b/view/templates/manage.tpl
new file mode 100644
index 0000000000..857402c04d
--- /dev/null
+++ b/view/templates/manage.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+<div id="identity-manage-desc">{{$desc}}</div>
+<div id="identity-manage-choose">{{$choose}}</div>
+<div id="identity-selector-wrapper">
+	<form action="manage" method="post" >
+	<select name="identity" size="4" onchange="this.form.submit();" >
+
+	{{foreach $identities as $id}}
+		<option {{$id.selected}} value="{{$id.uid}}">{{$id.username}} ({{$id.nickname}})</option>
+	{{/foreach}}
+
+	</select>
+	<div id="identity-select-break"></div>
+
+	{{*<!--<input id="identity-submit" type="submit" name="submit" value="{{$submit}}" />-->*}}
+</div></form>
+
diff --git a/view/templates/match.tpl b/view/templates/match.tpl
new file mode 100644
index 0000000000..14b7254669
--- /dev/null
+++ b/view/templates/match.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	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}}">
+			<img src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
+
+</div>
diff --git a/view/templates/message-end.tpl b/view/templates/message-end.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/message-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/message-head.tpl b/view/templates/message-head.tpl
new file mode 100644
index 0000000000..ffc6affa4d
--- /dev/null
+++ b/view/templates/message-head.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	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() { 
+	var a; 
+	a = $("#recip").autocomplete({ 
+		serviceUrl: '{{$base}}/acl',
+		minChars: 2,
+		width: 350,
+		onSelect: function(value,data) {
+			$("#recip-complete").val(data);
+		}			
+	});
+
+}); 
+
+</script>
+
diff --git a/view/templates/message_side.tpl b/view/templates/message_side.tpl
new file mode 100644
index 0000000000..7da22ee3e3
--- /dev/null
+++ b/view/templates/message_side.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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>
+	
+	<ul class="message-ul">
+		{{foreach $tabs as $t}}
+			<li class="tool"><a href="{{$t.url}}" class="message-link{{if $t.sel}}message-selected{{/if}}">{{$t.label}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/templates/moderated_comment.tpl b/view/templates/moderated_comment.tpl
new file mode 100644
index 0000000000..1e4e9b6d4e
--- /dev/null
+++ b/view/templates/moderated_comment.tpl
@@ -0,0 +1,39 @@
+{{*
+ *	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}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
+					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
+					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
+					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
+					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
+					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
+				</div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/templates/mood_content.tpl b/view/templates/mood_content.tpl
new file mode 100644
index 0000000000..461303318b
--- /dev/null
+++ b/view/templates/mood_content.tpl
@@ -0,0 +1,25 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+
+<div id="mood-desc">{{$desc}}</div>
+
+<form action="mood" method="get">
+<br />
+<br />
+
+<input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" />
+
+<select name="verb" id="mood-verb-select" >
+{{foreach $verbs as $v}}
+<option value="{{$v.0}}">{{$v.1}}</option>
+{{/foreach}}
+</select>
+<br />
+<br />
+<input type="submit" name="submit" value="{{$submit}}" />
+</form>
+
diff --git a/view/templates/msg-end.tpl b/view/templates/msg-end.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/msg-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/msg-header.tpl b/view/templates/msg-header.tpl
new file mode 100644
index 0000000000..0f047f5cdd
--- /dev/null
+++ b/view/templates/msg-header.tpl
@@ -0,0 +1,102 @@
+{{*
+ *	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">
+
+var plaintext = '{{$editselect}}';
+
+if(plaintext != 'none') {
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: /(profile-jot-text|prvmail-text)/,
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		gecko_spellcheck : true,
+		paste_text_sticky : true,
+		entity_encoding : "raw",
+		add_unload_trigger : false,
+		remove_linebreaks : false,
+		//force_p_newlines : false,
+		//force_br_newlines : true,
+		forced_root_block : 'div',
+		convert_urls: false,
+		content_css: "{{$baseurl}}/view/custom_tinymce.css",
+		     //Character count
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+				var editorId = ed.editorId;
+				var textarea = $('#'+editorId);
+				if (typeof(textarea.attr('tabindex')) != "undefined") {
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					textarea.attr('tabindex', null);
+				}
+			});
+		}
+	});
+}
+else
+	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+
+
+</script>
+<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script>
+	$(document).ready(function() {
+		var uploader = new window.AjaxUpload(
+			'prvmail-upload',
+			{ action: 'wall_upload/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+	});
+
+	function jotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+</script>
+
diff --git a/view/templates/nav.tpl b/view/templates/nav.tpl
new file mode 100644
index 0000000000..6119a1a93d
--- /dev/null
+++ b/view/templates/nav.tpl
@@ -0,0 +1,73 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+	{{$langselector}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+
+	<span id="nav-link-wrapper" >
+
+	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+		
+	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
+		
+	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+
+	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+
+	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+
+	{{if $nav.network}}
+	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.home}}
+	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.community}}
+	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+	{{/if}}
+	{{if $nav.introductions}}
+	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.messages}}
+	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{/if}}
+
+
+
+	{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
+
+
+		{{if $nav.notifications}}
+			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
+				<span id="notify-update" class="nav-ajax-left"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+		{{/if}}		
+
+	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
+	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+
+	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/templates/navigation.tpl b/view/templates/navigation.tpl
new file mode 100644
index 0000000000..28229c5699
--- /dev/null
+++ b/view/templates/navigation.tpl
@@ -0,0 +1,108 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*
+ # LOGIN/REGISTER
+ *}}
+<center>
+{{* Use nested if's since the Friendica template engine doesn't support AND or OR in if statements *}}
+{{if $nav.login}}
+<div id="navigation-login-wrapper" >
+{{else}}
+{{if $nav.register}}
+<div id="navigation-login-wrapper" >
+{{/if}}
+{{/if}}
+{{if $nav.login}}<a id="navigation-login-link" class="navigation-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><br/> {{/if}}
+{{if $nav.register}}<a id="navigation-register-link" class="navigation-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><br/>{{/if}}
+{{if $nav.login}}
+</div>
+{{else}}
+{{if $nav.register}}
+</div>
+{{/if}}
+{{/if}}
+
+{{*
+ # NETWORK/HOME
+ *}}
+{{if $nav.network}}
+<div id="navigation-network-wrapper" >
+{{else}}
+{{if $nav.home}}
+<div id="navigation-network-wrapper" >
+{{else}}
+{{if $nav.community}}
+<div id="navigation-network-wrapper" >
+{{/if}}
+{{/if}}
+{{/if}}
+{{if $nav.network}}
+<a id="navigation-network-link" class="navigation-link navigation-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a><br/>
+<a class="navigation-link navigation-commlink" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">{{$nav.net_reset.1}}</a><br/>
+{{/if}}
+{{if $nav.home}}
+<a id="navigation-home-link" class="navigation-link navigation-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a><br/>
+{{/if}}
+{{if $nav.community}}
+<a id="navigation-community-link" class="navigation-link navigation-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a><br/>
+{{/if}}
+{{if $nav.network}}
+</div>
+{{else}}
+{{if $nav.home}}
+</div>
+{{else}}
+{{if $nav.community}}
+</div>
+{{/if}}
+{{/if}}
+{{/if}}
+
+{{*
+ # PRIVATE MESSAGES
+ *}}
+{{if $nav.messages}}
+<div id="navigation-messages-wrapper">
+<a id="navigation-messages-link" class="navigation-link navigation-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a><br/>
+</div>
+{{/if}}
+
+	
+{{*
+ # CONTACTS
+ *}}
+<div id="navigation-contacts-wrapper">
+{{if $nav.contacts}}<a id="navigation-contacts-link" class="navigation-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><br/>{{/if}}
+<a id="navigation-directory-link" class="navigation-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><br/>
+{{if $nav.introductions}}
+<a id="navigation-notify-link" class="navigation-link navigation-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a><br/>
+{{/if}}
+</div>
+
+{{*
+ # NOTIFICATIONS
+ *}}
+{{if $nav.notifications}}
+<div id="navigation-notifications-wrapper">
+<a id="navigation-notifications-link" class="navigation-link navigation-commlink" href="{{$nav.notifications.0}}" rel="#navigation-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a><br/>
+</div>
+{{/if}}		
+
+{{*
+ # MISCELLANEOUS
+ *}}
+<div id="navigation-misc-wrapper">
+{{if $nav.settings}}<a id="navigation-settings-link" class="navigation-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a><br/>{{/if}}
+{{if $nav.manage}}<a id="navigation-manage-link" class="navigation-link navigation-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a><br/>{{/if}}
+{{if $nav.profiles}}<a id="navigation-profiles-link" class="navigation-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a><br/>{{/if}}
+{{if $nav.admin}}<a id="navigation-admin-link" class="navigation-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a><br/>{{/if}}
+<a id="navigation-search-link" class="navigation-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a><br/>
+{{if $nav.apps}}<a id="navigation-apps-link" class="navigation-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a><br/>{{/if}}
+{{if $nav.help}} <a id="navigation-help-link" class="navigation-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a><br/>{{/if}}
+</div>
+
+{{if $nav.logout}}<a id="navigation-logout-link" class="navigation-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a><br/>{{/if}}
+</center>
diff --git a/view/templates/netfriend.tpl b/view/templates/netfriend.tpl
new file mode 100644
index 0000000000..e8658e0bc3
--- /dev/null
+++ b/view/templates/netfriend.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	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">
+	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-{{$intro_id}}">{{$as_friend}}</label>
+	<input type="radio" name="duplex" id="intro-approve-as-friend-{{$intro_id}}" class="intro-approve-as-friend" {{$friend_selected}} value="1" />
+	<div class="intro-approve-friend-break" ></div>	
+</div>
+<div class="intro-approve-as-friend-end"></div>
+<div class="intro-approve-as-fan-wrapper">
+	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-{{$intro_id}}">{{$as_fan}}</label>
+	<input type="radio" name="duplex" id="intro-approve-as-fan-{{$intro_id}}" class="intro-approve-as-fan" {{$fan_selected}} value="0"  />
+	<div class="intro-approve-fan-break"></div>
+</div>
+<div class="intro-approve-as-end"></div>
diff --git a/view/templates/nets.tpl b/view/templates/nets.tpl
new file mode 100644
index 0000000000..76b2a57d94
--- /dev/null
+++ b/view/templates/nets.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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>
+	<a href="{{$base}}?nets=all" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a>
+	<ul class="nets-ul">
+	{{foreach $nets as $net}}
+	<li><a href="{{$base}}?nets={{$net.ref}}" class="nets-link{{if $net.selected}} nets-selected{{/if}}">{{$net.name}}</a></li>
+	{{/foreach}}
+	</ul>
+</div>
diff --git a/view/templates/nogroup-template.tpl b/view/templates/nogroup-template.tpl
new file mode 100644
index 0000000000..7d103a655b
--- /dev/null
+++ b/view/templates/nogroup-template.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$header}}</h1>
+
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+<div id="contact-edit-end"></div>
+
+{{$paginate}}
+
+
+
+
diff --git a/view/templates/notifications.tpl b/view/templates/notifications.tpl
new file mode 100644
index 0000000000..834a7a016c
--- /dev/null
+++ b/view/templates/notifications.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h1>{{$notif_header}}</h1>
+
+{{include file="common_tabs.tpl"}}
+
+<div class="notif-network-wrapper">
+	{{$notif_content}}
+</div>
diff --git a/view/templates/notifications_comments_item.tpl b/view/templates/notifications_comments_item.tpl
new file mode 100644
index 0000000000..9913e6cf71
--- /dev/null
+++ b/view/templates/notifications_comments_item.tpl
@@ -0,0 +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/templates/notifications_dislikes_item.tpl b/view/templates/notifications_dislikes_item.tpl
new file mode 100644
index 0000000000..9913e6cf71
--- /dev/null
+++ b/view/templates/notifications_dislikes_item.tpl
@@ -0,0 +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/templates/notifications_friends_item.tpl b/view/templates/notifications_friends_item.tpl
new file mode 100644
index 0000000000..9913e6cf71
--- /dev/null
+++ b/view/templates/notifications_friends_item.tpl
@@ -0,0 +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/templates/notifications_likes_item.tpl b/view/templates/notifications_likes_item.tpl
new file mode 100644
index 0000000000..792b285bce
--- /dev/null
+++ b/view/templates/notifications_likes_item.tpl
@@ -0,0 +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/templates/notifications_network_item.tpl b/view/templates/notifications_network_item.tpl
new file mode 100644
index 0000000000..c3381d682f
--- /dev/null
+++ b/view/templates/notifications_network_item.tpl
@@ -0,0 +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/templates/notifications_posts_item.tpl b/view/templates/notifications_posts_item.tpl
new file mode 100644
index 0000000000..9913e6cf71
--- /dev/null
+++ b/view/templates/notifications_posts_item.tpl
@@ -0,0 +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/templates/notify.tpl b/view/templates/notify.tpl
new file mode 100644
index 0000000000..9913e6cf71
--- /dev/null
+++ b/view/templates/notify.tpl
@@ -0,0 +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/templates/oauth_authorize.tpl b/view/templates/oauth_authorize.tpl
new file mode 100644
index 0000000000..d7f1963d24
--- /dev/null
+++ b/view/templates/oauth_authorize.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+
+<div class='oauthapp'>
+	<img src='{{$app.icon}}'>
+	<h4>{{$app.name}}</h4>
+</div>
+<h3>{{$authorize}}</h3>
+<form method="POST">
+<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes}}" /></div>
+</form>
diff --git a/view/templates/oauth_authorize_done.tpl b/view/templates/oauth_authorize_done.tpl
new file mode 100644
index 0000000000..12d4c6f48f
--- /dev/null
+++ b/view/templates/oauth_authorize_done.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+
+<p>{{$info}}</p>
+<code>{{$code}}</code>
diff --git a/view/templates/oembed_video.tpl b/view/templates/oembed_video.tpl
new file mode 100644
index 0000000000..bdfa11509f
--- /dev/null
+++ b/view/templates/oembed_video.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+</a>
diff --git a/view/templates/oexchange_xrd.tpl b/view/templates/oexchange_xrd.tpl
new file mode 100644
index 0000000000..5af7491821
--- /dev/null
+++ b/view/templates/oexchange_xrd.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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">
+        
+    <Subject>{{$base}}</Subject>
+
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendica</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/title">Friendica Social Network</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/name">Friendica</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendica</Property>
+
+    <Link 
+        rel="icon" 
+        href="{{$base}}/images/friendica-16.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel="icon32" 
+        href="{{$base}}/images/friendica-32.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
+        href="{{$base}}/oexchange"
+        type="text/html" 
+        />
+</XRD>
+
diff --git a/view/templates/opensearch.tpl b/view/templates/opensearch.tpl
new file mode 100644
index 0000000000..dc5cf8875b
--- /dev/null
+++ b/view/templates/opensearch.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	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>
+	<Description>Search in Friendica@{{$nodename}}</Description>
+	<Contact>http://bugs.friendica.com/</Contact>
+	<Image height="16" width="16" type="image/png">{{$baseurl}}/images/friendica-16.png</Image>
+	<Image height="64" width="64" type="image/png">{{$baseurl}}/images/friendica-64.png</Image>
+	<Url type="text/html" 
+        template="{{$baseurl}}/search?search={searchTerms}"/>
+	<Url type="application/opensearchdescription+xml"
+      	rel="self"
+      	template="{{$baseurl}}/opensearch" />        
+</OpenSearchDescription>
\ No newline at end of file
diff --git a/view/templates/pagetypes.tpl b/view/templates/pagetypes.tpl
new file mode 100644
index 0000000000..15cd3047ac
--- /dev/null
+++ b/view/templates/pagetypes.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	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}}
+	{{include file="field_radio.tpl" field=$page_soapbox}}
+	{{include file="field_radio.tpl" field=$page_freelove}}
diff --git a/view/templates/peoplefind.tpl b/view/templates/peoplefind.tpl
new file mode 100644
index 0000000000..5417ee0edf
--- /dev/null
+++ b/view/templates/peoplefind.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	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>
+	<form action="dirfind" method="post" />
+		<input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" />
+	</form>
+	<div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div>
+	<div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div>
+	<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >{{$random}}</a></div>
+	{{if $inv}} 
+	<div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div>
+	{{/if}}
+</div>
+
diff --git a/view/templates/photo_album.tpl b/view/templates/photo_album.tpl
new file mode 100644
index 0000000000..56ee6b61c6
--- /dev/null
+++ b/view/templates/photo_album.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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}}" />
+		<p class='caption'>{{$desc}}</p>		
+	</a>
+</div>
+<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/templates/photo_drop.tpl b/view/templates/photo_drop.tpl
new file mode 100644
index 0000000000..ed500fd0ad
--- /dev/null
+++ b/view/templates/photo_drop.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+<div class="wall-item-delete-end"></div>
diff --git a/view/templates/photo_edit.tpl b/view/templates/photo_edit.tpl
new file mode 100644
index 0000000000..fefe7f10b5
--- /dev/null
+++ b/view/templates/photo_edit.tpl
@@ -0,0 +1,55 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
+
+	<input type="hidden" name="item_id" value="{{$item_id}}" />
+
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
+	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
+	<input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$caption}}" />
+
+	<div id="photo-edit-caption-end"></div>
+
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
+	<input name="newtag" id="photo-edit-newtag" size="84" title="{{$help_tags}}" type="text" />
+
+	<div id="photo-edit-tags-end"></div>
+	<div id="photo-edit-rotate-wrapper">
+		<div id="photo-edit-rotate-label">
+			{{$rotatecw}}<br>
+			{{$rotateccw}}
+		</div>
+		<input type="radio" name="rotate" value="1" /><br>
+		<input type="radio" name="rotate" value="2" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$permissions}}"/>
+			<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
+		</a>
+		<div id="photo-edit-perms-menu-end"></div>
+		
+		<div style="display: none;">
+			<div id="photo-edit-perms-select" >
+				{{$aclselect}}
+			</div>
+		</div>
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+
diff --git a/view/templates/photo_edit_head.tpl b/view/templates/photo_edit_head.tpl
new file mode 100644
index 0000000000..50e6802957
--- /dev/null
+++ b/view/templates/photo_edit_head.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+
+	$(document).keydown(function(event) {
+
+		if("{{$prevlink}}" != '') { if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = "{{$prevlink}}"; }}
+		if("{{$nextlink}}" != '') { if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = "{{$nextlink}}"; }}
+
+	});
+
+</script>
diff --git a/view/templates/photo_item.tpl b/view/templates/photo_item.tpl
new file mode 100644
index 0000000000..7d6ac96ee1
--- /dev/null
+++ b/view/templates/photo_item.tpl
@@ -0,0 +1,27 @@
+{{*
+ *	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}}">
+		<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
+	</div>
+
+	<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
+		<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a>
+		<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
+	</div>
+	<div class="wall-item-content" id="wall-item-content-{{$id}}" >
+		<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
+		<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
+	</div>
+	{{$drop}}
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-comment-separator"></div>
+	{{$comment}}
+
+<div class="wall-item-outside-wrapper-end{{$indent}}" ></div>
+</div>
+
diff --git a/view/templates/photo_top.tpl b/view/templates/photo_top.tpl
new file mode 100644
index 0000000000..b34e1e6394
--- /dev/null
+++ b/view/templates/photo_top.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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}}">
+		<img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" />
+	</a>
+	<div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div>
+</div>
+
diff --git a/view/templates/photo_view.tpl b/view/templates/photo_view.tpl
new file mode 100644
index 0000000000..94f71bdd89
--- /dev/null
+++ b/view/templates/photo_view.tpl
@@ -0,0 +1,42 @@
+{{*
+ *	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>
+
+<div id="photo-edit-link-wrap">
+{{if $tools}}
+<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
+|
+<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
+{{/if}}
+{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
+</div>
+
+{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
+<div id="photo-photo-end"></div>
+<div id="photo-caption">{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
+
+{{if $edit}}{{$edit}}{{/if}}
+
+{{if $likebuttons}}
+<div id="photo-like-div">
+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
+</div>
+{{/if}}
+
+{{$comments}}
+
+{{$paginate}}
+
diff --git a/view/templates/photos_default_uploader_box.tpl b/view/templates/photos_default_uploader_box.tpl
new file mode 100644
index 0000000000..001d0a3db9
--- /dev/null
+++ b/view/templates/photos_default_uploader_box.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<input id="photos-upload-choose" type="file" name="userfile" />
diff --git a/view/templates/photos_default_uploader_submit.tpl b/view/templates/photos_default_uploader_submit.tpl
new file mode 100644
index 0000000000..87d065d6ea
--- /dev/null
+++ b/view/templates/photos_default_uploader_submit.tpl
@@ -0,0 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="photos-upload-submit-wrapper" >
+	<input type="submit" name="submit" value="{{$submit}}" id="photos-upload-submit" />
+</div>
diff --git a/view/templates/photos_head.tpl b/view/templates/photos_head.tpl
new file mode 100644
index 0000000000..b90fc92bbb
--- /dev/null
+++ b/view/templates/photos_head.tpl
@@ -0,0 +1,31 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+
+	var ispublic = "{{$ispublic}}";
+
+
+	$(document).ready(function() {
+
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+
+	});
+
+</script>
+
diff --git a/view/templates/photos_recent.tpl b/view/templates/photos_recent.tpl
new file mode 100644
index 0000000000..cb2411df34
--- /dev/null
+++ b/view/templates/photos_recent.tpl
@@ -0,0 +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 $photo}}
+	{{include file="photo_top.tpl"}}
+{{/foreach}}
+</div>
+<div class="photos-end"></div>
diff --git a/view/templates/photos_upload.tpl b/view/templates/photos_upload.tpl
new file mode 100644
index 0000000000..f2e95a9b14
--- /dev/null
+++ b/view/templates/photos_upload.tpl
@@ -0,0 +1,54 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$pagename}}</h3>
+
+<div id="photos-usage-message">{{$usage}}</div>
+
+<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
+		<select id="photos-upload-album-select" name="album" size="4">
+		{{$albumselect}}
+		</select>
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+	</div>
+
+
+	<div id="photos-upload-perms" class="photos-upload-perms" >
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
+		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
+		</a>
+	</div>
+	<div id="photos-upload-perms-end"></div>
+
+	<div style="display: none;">
+		<div id="photos-upload-permissions-wrapper">
+			{{$aclselect}}
+		</div>
+	</div>
+
+	<div id="photos-upload-spacer"></div>
+
+	{{$alt_uploader}}
+
+	{{$default_upload_box}}
+	{{$default_upload_submit}}
+
+	<div class="photos-upload-end" ></div>
+</form>
+
diff --git a/view/templates/poco_entry_xml.tpl b/view/templates/poco_entry_xml.tpl
new file mode 100644
index 0000000000..d6e139cb59
--- /dev/null
+++ b/view/templates/poco_entry_xml.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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}}
+{{if $entry.preferredUsername}}<preferredUsername>{{$entry.preferredUsername}}</preferredUsername>{{/if}}
+{{if $entry.urls}}{{foreach $entry.urls as $url}}<urls><value>{{$url.value}}</value><type>{{$url.type}}</type></urls>{{/foreach}}{{/if}}
+{{if $entry.photos}}{{foreach $entry.photos as $photo}}<photos><value>{{$photo.value}}</value><type>{{$photo.type}}</type></photos>{{/foreach}}{{/if}}
+</entry>
diff --git a/view/templates/poco_xml.tpl b/view/templates/poco_xml.tpl
new file mode 100644
index 0000000000..b8cd8fc081
--- /dev/null
+++ b/view/templates/poco_xml.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	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}}
+{{if $response.filtered}}<filtered>{{$response.filtered}}</filtered>{{/if}}
+{{if $response.updatedSince}}<updatedSince>{{$response.updatedSince}}</updatedSince>{{/if}}
+<startIndex>{{$response.startIndex}}</startIndex>
+<itemsPerPage>{{$response.itemsPerPage}}</itemsPerPage>
+<totalResults>{{$response.totalResults}}</totalResults>
+
+
+{{if $response.totalResults}}
+{{foreach $response.entry as $entry}}
+{{include file="poco_entry_xml.tpl"}}
+{{/foreach}}
+{{else}}
+<entry></entry>
+{{/if}}
+</response>
diff --git a/view/templates/poke_content.tpl b/view/templates/poke_content.tpl
new file mode 100644
index 0000000000..6235aca0c0
--- /dev/null
+++ b/view/templates/poke_content.tpl
@@ -0,0 +1,37 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+
+<div id="poke-desc">{{$desc}}</div>
+
+<form action="poke" method="get">
+<br />
+<br />
+
+<div id="poke-recip-label">{{$clabel}}</div>
+<br />
+<input id="poke-recip" type="text" size="64" maxlength="255" value="{{$name}}" name="pokename" autocomplete="off" />
+<input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
+<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
+<br />
+<br />
+<div id="poke-action-label">{{$choice}}</div>
+<br />
+<br />
+<select name="verb" id="poke-verb-select" >
+{{foreach $verbs as $v}}
+<option value="{{$v.0}}">{{$v.1}}</option>
+{{/foreach}}
+</select>
+<br />
+<br />
+<div id="poke-private-desc">{{$prv_desc}}</div>
+<input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
+<br />
+<br />
+<input type="submit" name="submit" value="{{$submit}}" />
+</form>
+
diff --git a/view/templates/posted_date_widget.tpl b/view/templates/posted_date_widget.tpl
new file mode 100644
index 0000000000..2f5838edb8
--- /dev/null
+++ b/view/templates/posted_date_widget.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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>
+<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="{{$size}}">
+{{foreach $dates as $d}}
+<option value="{{$url}}/{{$d.1}}/{{$d.2}}" >{{$d.0}}</option>
+{{/foreach}}
+</select>
+</div>
diff --git a/view/templates/profed_end.tpl b/view/templates/profed_end.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/profed_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/profed_head.tpl b/view/templates/profed_head.tpl
new file mode 100644
index 0000000000..52b9340954
--- /dev/null
+++ b/view/templates/profed_head.tpl
@@ -0,0 +1,43 @@
+{{*
+ *	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"
+          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          <script language="javascript" type="text/javascript">
+
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "{{$editselect}}",
+	plugins : "bbcode,paste",
+	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",
+	gecko_spellcheck : true,
+	paste_text_sticky : true,
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	//force_p_newlines : false,
+	//force_br_newlines : true,
+	forced_root_block : 'div',
+	content_css: "{{$baseurl}}/view/custom_tinymce.css",
+	theme_advanced_path : false,
+	setup : function(ed) {
+		ed.onInit.add(function(ed) {
+            ed.pasteAsPlainText = true;
+        });
+    }
+
+});
+
+
+</script>
+
diff --git a/view/templates/profile-hide-friends.tpl b/view/templates/profile-hide-friends.tpl
new file mode 100644
index 0000000000..6e3d395d07
--- /dev/null
+++ b/view/templates/profile-hide-friends.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<p id="hide-friends-text">
+{{$desc}}
+</p>
+
+		<div id="hide-friends-yes-wrapper">
+		<label id="hide-friends-yes-label" for="hide-friends-yes">{{$yes_str}}</label>
+		<input type="radio" name="hide-friends" id="hide-friends-yes" {{$yes_selected}} value="1" />
+
+		<div id="hide-friends-break" ></div>	
+		</div>
+		<div id="hide-friends-no-wrapper">
+		<label id="hide-friends-no-label" for="hide-friends-no">{{$no_str}}</label>
+		<input type="radio" name="hide-friends" id="hide-friends-no" {{$no_selected}} value="0"  />
+
+		<div id="hide-friends-end"></div>
+		</div>
diff --git a/view/templates/profile-hide-wall.tpl b/view/templates/profile-hide-wall.tpl
new file mode 100644
index 0000000000..755908d176
--- /dev/null
+++ b/view/templates/profile-hide-wall.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<p id="hide-wall-text">
+{{$desc}}
+</p>
+
+		<div id="hide-wall-yes-wrapper">
+		<label id="hide-wall-yes-label" for="hide-wall-yes">{{$yes_str}}</label>
+		<input type="radio" name="hidewall" id="hide-wall-yes" {{$yes_selected}} value="1" />
+
+		<div id="hide-wall-break" ></div>	
+		</div>
+		<div id="hide-wall-no-wrapper">
+		<label id="hide-wall-no-label" for="hide-wall-no">{{$no_str}}</label>
+		<input type="radio" name="hidewall" id="hide-wall-no" {{$no_selected}} value="0"  />
+
+		<div id="hide-wall-end"></div>
+		</div>
diff --git a/view/templates/profile-in-directory.tpl b/view/templates/profile-in-directory.tpl
new file mode 100644
index 0000000000..0efd1bf5c0
--- /dev/null
+++ b/view/templates/profile-in-directory.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<p id="profile-in-directory">
+{{$desc}}
+</p>
+
+		<div id="profile-in-dir-yes-wrapper">
+		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">{{$yes_str}}</label>
+		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" {{$yes_selected}} value="1" />
+
+		<div id="profile-in-dir-break" ></div>	
+		</div>
+		<div id="profile-in-dir-no-wrapper">
+		<label id="profile-in-dir-no-label" for="profile-in-dir-no">{{$no_str}}</label>
+		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" {{$no_selected}} value="0"  />
+
+		<div id="profile-in-dir-end"></div>
+		</div>
diff --git a/view/templates/profile-in-netdir.tpl b/view/templates/profile-in-netdir.tpl
new file mode 100644
index 0000000000..b9cb456ea5
--- /dev/null
+++ b/view/templates/profile-in-netdir.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<p id="profile-in-directory">
+{{$desc}}
+</p>
+
+		<div id="profile-in-netdir-yes-wrapper">
+		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">{{$yes_str}}</label>
+		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" {{$yes_selected}} value="1" />
+
+		<div id="profile-in-netdir-break" ></div>	
+		</div>
+		<div id="profile-in-netdir-no-wrapper">
+		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">{{$no_str}}</label>
+		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" {{$no_selected}} value="0"  />
+
+		<div id="profile-in-netdir-end"></div>
+		</div>
diff --git a/view/templates/profile_advanced.tpl b/view/templates/profile_advanced.tpl
new file mode 100644
index 0000000000..b9cc57931b
--- /dev/null
+++ b/view/templates/profile_advanced.tpl
@@ -0,0 +1,175 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h2>{{$title}}</h2>
+
+<dl id="aprofile-fullname" class="aprofile">
+ <dt>{{$profile.fullname.0}}</dt>
+ <dd>{{$profile.fullname.1}}</dd>
+</dl>
+
+{{if $profile.gender}}
+<dl id="aprofile-gender" class="aprofile">
+ <dt>{{$profile.gender.0}}</dt>
+ <dd>{{$profile.gender.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.birthday}}
+<dl id="aprofile-birthday" class="aprofile">
+ <dt>{{$profile.birthday.0}}</dt>
+ <dd>{{$profile.birthday.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.age}}
+<dl id="aprofile-age" class="aprofile">
+ <dt>{{$profile.age.0}}</dt>
+ <dd>{{$profile.age.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.marital}}
+<dl id="aprofile-marital" class="aprofile">
+ <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
+ <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.sexual}}
+<dl id="aprofile-sexual" class="aprofile">
+ <dt>{{$profile.sexual.0}}</dt>
+ <dd>{{$profile.sexual.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.pub_keywords}}
+<dl id="aprofile-tags" class="aprofile">
+ <dt>{{$profile.pub_keywords.0}}</dt>
+ <dd>{{$profile.pub_keywords.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.homepage}}
+<dl id="aprofile-homepage" class="aprofile">
+ <dt>{{$profile.homepage.0}}</dt>
+ <dd>{{$profile.homepage.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.hometown}}
+<dl id="aprofile-hometown" class="aprofile">
+ <dt>{{$profile.hometown.0}}</dt>
+ <dd>{{$profile.hometown.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.politic}}
+<dl id="aprofile-politic" class="aprofile">
+ <dt>{{$profile.politic.0}}</dt>
+ <dd>{{$profile.politic.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.religion}}
+<dl id="aprofile-religion" class="aprofile">
+ <dt>{{$profile.religion.0}}</dt>
+ <dd>{{$profile.religion.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.about}}
+<dl id="aprofile-about" class="aprofile">
+ <dt>{{$profile.about.0}}</dt>
+ <dd>{{$profile.about.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.interest}}
+<dl id="aprofile-interest" class="aprofile">
+ <dt>{{$profile.interest.0}}</dt>
+ <dd>{{$profile.interest.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.likes}}
+<dl id="aprofile-likes" class="aprofile">
+ <dt>{{$profile.likes.0}}</dt>
+ <dd>{{$profile.likes.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.dislikes}}
+<dl id="aprofile-dislikes" class="aprofile">
+ <dt>{{$profile.dislikes.0}}</dt>
+ <dd>{{$profile.dislikes.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.contact}}
+<dl id="aprofile-contact" class="aprofile">
+ <dt>{{$profile.contact.0}}</dt>
+ <dd>{{$profile.contact.1}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.music}}
+<dl id="aprofile-music" class="aprofile">
+ <dt>{{$profile.music.0}}</dt>
+ <dd>{{$profile.music.1}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.book}}
+<dl id="aprofile-book" class="aprofile">
+ <dt>{{$profile.book.0}}</dt>
+ <dd>{{$profile.book.1}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.tv}}
+<dl id="aprofile-tv" class="aprofile">
+ <dt>{{$profile.tv.0}}</dt>
+ <dd>{{$profile.tv.1}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.film}}
+<dl id="aprofile-film" class="aprofile">
+ <dt>{{$profile.film.0}}</dt>
+ <dd>{{$profile.film.1}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.romance}}
+<dl id="aprofile-romance" class="aprofile">
+ <dt>{{$profile.romance.0}}</dt>
+ <dd>{{$profile.romance.1}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.work}}
+<dl id="aprofile-work" class="aprofile">
+ <dt>{{$profile.work.0}}</dt>
+ <dd>{{$profile.work.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.education}}
+<dl id="aprofile-education" class="aprofile">
+ <dt>{{$profile.education.0}}</dt>
+ <dd>{{$profile.education.1}}</dd>
+</dl>
+{{/if}}
+
+
+
+
diff --git a/view/templates/profile_edit.tpl b/view/templates/profile_edit.tpl
new file mode 100644
index 0000000000..4b7c4d0b1c
--- /dev/null
+++ b/view/templates/profile_edit.tpl
@@ -0,0 +1,328 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$default}}
+
+<h1>{{$banner}}</h1>
+
+<div id="profile-edit-links">
+<ul>
+<li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li>
+<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
+<li></li>
+<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+
+<div id="profile-edit-wrapper" >
+<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<div id="profile-edit-profile-name-wrapper" >
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
+<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
+</div>
+<div id="profile-edit-profile-name-end"></div>
+
+<div id="profile-edit-name-wrapper" >
+<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
+<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name}}" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-pdesc-wrapper" >
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
+<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
+</div>
+<div id="profile-edit-pdesc-end"></div>
+
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
+{{$gender}}
+</div>
+<div id="profile-edit-gender-end"></div>
+
+<div id="profile-edit-dob-wrapper" >
+<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
+<div id="profile-edit-dob" >
+{{$dob}} {{$age}}
+</div>
+</div>
+<div id="profile-edit-dob-end"></div>
+
+{{$hide_friends}}
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
+<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address}}" />
+</div>
+<div id="profile-edit-address-end"></div>
+
+<div id="profile-edit-locality-wrapper" >
+<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
+<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality}}" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
+<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
+</div>
+<div id="profile-edit-postal-code-end"></div>
+
+<div id="profile-edit-country-name-wrapper" >
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
+<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
+<option selected="selected" >{{$country_name}}</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
+<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >{{$region}}</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
+<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
+{{$marital}}
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
+<input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
+<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
+
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
+{{$sexual}}
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
+<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+<div id="profile-edit-politic-wrapper" >
+<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
+<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic}}" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
+<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion}}" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
+</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
+</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
+<div id="profile-edit-prvkeywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" >
+<p id="about-jot-desc" >
+{{$lbl_about}}
+</p>
+
+<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+
+
+<div id="interest-jot-wrapper" >
+<p id="interest-jot-desc" >
+{{$lbl_hobbies}}
+</p>
+
+<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest}}</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+
+
+<div id="likes-jot-wrapper" >
+<p id="likes-jot-desc" >
+{{$lbl_likes}}
+</p>
+
+<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes}}</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+
+
+<div id="dislikes-jot-wrapper" >
+<p id="dislikes-jot-desc" >
+{{$lbl_dislikes}}
+</p>
+
+<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes}}</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+
+
+<div id="contact-jot-wrapper" >
+<p id="contact-jot-desc" >
+{{$lbl_social}}
+</p>
+
+<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" >
+<p id="music-jot-desc" >
+{{$lbl_music}}
+</p>
+
+<textarea rows="10" cols="72" id="music-jot-text" name="music" >{{$music}}</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+
+<div id="book-jot-wrapper" >
+<p id="book-jot-desc" >
+{{$lbl_book}}
+</p>
+
+<textarea rows="10" cols="72" id="book-jot-text" name="book" >{{$book}}</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+
+
+
+<div id="tv-jot-wrapper" >
+<p id="tv-jot-desc" >
+{{$lbl_tv}} 
+</p>
+
+<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv}}</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+
+
+
+<div id="film-jot-wrapper" >
+<p id="film-jot-desc" >
+{{$lbl_film}}
+</p>
+
+<textarea rows="10" cols="72" id="film-jot-text" name="film" >{{$film}}</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" >
+<p id="romance-jot-desc" >
+{{$lbl_love}}
+</p>
+
+<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance}}</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+
+
+
+<div id="work-jot-wrapper" >
+<p id="work-jot-desc" >
+{{$lbl_work}}
+</p>
+
+<textarea rows="10" cols="72" id="work-jot-text" name="work" >{{$work}}</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+
+
+
+<div id="education-jot-wrapper" >
+<p id="education-jot-desc" >
+{{$lbl_school}} 
+</p>
+
+<textarea rows="10" cols="72" id="education-jot-text" name="education" >{{$education}}</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+<script type="text/javascript">Fill_Country('{{$country_name}}');Fill_States('{{$region}}');</script>
diff --git a/view/templates/profile_edlink.tpl b/view/templates/profile_edlink.tpl
new file mode 100644
index 0000000000..9424bcc3dc
--- /dev/null
+++ b/view/templates/profile_edlink.tpl
@@ -0,0 +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/templates/profile_entry.tpl b/view/templates/profile_entry.tpl
new file mode 100644
index 0000000000..4774fd11b3
--- /dev/null
+++ b/view/templates/profile_entry.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="profile-listing" >
+<div class="profile-listing-photo-wrapper" >
+<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
+</div>
+<div class="profile-listing-photo-end"></div>
+<div class="profile-listing-name" id="profile-listing-name-{{$id}}"><a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a></div>
+<div class="profile-listing-visible">{{$visible}}</div>
+</div>
+<div class="profile-listing-end"></div>
+
diff --git a/view/templates/profile_listing_header.tpl b/view/templates/profile_listing_header.tpl
new file mode 100644
index 0000000000..f77bdcc807
--- /dev/null
+++ b/view/templates/profile_listing_header.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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>
+</p>
+<div id="profile-listing-new-link-wrapper" class="button" >
+<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
+</div>
+
diff --git a/view/templates/profile_photo.tpl b/view/templates/profile_photo.tpl
new file mode 100644
index 0000000000..8a278cdfe9
--- /dev/null
+++ b/view/templates/profile_photo.tpl
@@ -0,0 +1,31 @@
+{{*
+ *	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">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<div id="profile-photo-upload-wrapper">
+<label id="profile-photo-upload-label" for="profile-photo-upload">{{$lbl_upfile}} </label>
+<input name="userfile" type="file" id="profile-photo-upload" size="48" />
+</div>
+
+<label id="profile-photo-profiles-label" for="profile-photo-profiles">{{$lbl_profiles}} </label>
+<select name="profile" id="profile-photo-profiles" />
+{{foreach $profiles as $p}}
+<option value="{{$p.id}}" {{if $p.default}}selected="selected"{{/if}}>{{$p.name}}</option>
+{{/foreach}}
+</select>
+
+<div id="profile-photo-submit-wrapper">
+<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+</div>
+
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+{{$select}}
+</div>
\ No newline at end of file
diff --git a/view/templates/profile_publish.tpl b/view/templates/profile_publish.tpl
new file mode 100644
index 0000000000..1dc9eb7fc6
--- /dev/null
+++ b/view/templates/profile_publish.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<p id="profile-publish-desc-{{$instance}}">
+{{$pubdesc}}
+</p>
+
+		<div id="profile-publish-yes-wrapper-{{$instance}}">
+		<label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
+		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1" />
+
+		<div id="profile-publish-break-{{$instance}}" ></div>	
+		</div>
+		<div id="profile-publish-no-wrapper-{{$instance}}">
+		<label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
+		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"  />
+
+		<div id="profile-publish-end-{{$instance}}"></div>
+		</div>
diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
new file mode 100644
index 0000000000..3f4d3c711c
--- /dev/null
+++ b/view/templates/profile_vcard.tpl
@@ -0,0 +1,55 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="fn label">{{$profile.name}}</div>
+	
+				
+	
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+
+
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/templates/prv_message.tpl b/view/templates/prv_message.tpl
new file mode 100644
index 0000000000..83cf7e99c4
--- /dev/null
+++ b/view/templates/prv_message.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h3>{{$header}}</h3>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="message" method="post" >
+
+{{$parent}}
+
+<div id="prvmail-to-label">{{$to}}</div>
+{{$select}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
+	<div id="prvmail-upload-wrapper" >
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	</div> 
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/templates/pwdreset.tpl b/view/templates/pwdreset.tpl
new file mode 100644
index 0000000000..e86e1227f8
--- /dev/null
+++ b/view/templates/pwdreset.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$lbl1}}</h3>
+
+<p>
+{{$lbl2}}
+</p>
+<p>
+{{$lbl3}}
+</p>
+<p>
+{{$newpass}}
+</p>
+<p>
+{{$lbl4}} {{$lbl5}}
+</p>
+<p>
+{{$lbl6}}
+</p>
diff --git a/view/templates/register.tpl b/view/templates/register.tpl
new file mode 100644
index 0000000000..5e655cd82e
--- /dev/null
+++ b/view/templates/register.tpl
@@ -0,0 +1,70 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$regtitle}}</h3>
+
+<form action="register" method="post" id="register-form">
+
+	<input type="hidden" name="photo" value="{{$photo}}" />
+
+	{{$registertext}}
+
+	<p id="register-realpeople">{{$realpeople}}</p>
+
+	<p id="register-fill-desc">{{$fillwith}}</p>
+	<p id="register-fill-ext">{{$fillext}}</p>
+
+{{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}}
+
+{{if $invitations}}
+
+	<p id="register-invite-desc">{{$invite_desc}}</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{/if}}
+
+
+	<div id="register-name-wrapper" >
+		<label for="register-name" id="label-register-name" >{{$namelabel}}</label>
+		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+
+	<div id="register-email-wrapper" >
+		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
+		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
+	</div>
+	<div id="register-email-end" ></div>
+
+	<p id="register-nickname-desc" >{{$nickdesc}}</p>
+
+	<div id="register-nickname-wrapper" >
+		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
+		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" ><div id="register-sitename">@{{$sitename}}</div>
+	</div>
+	<div id="register-nickname-end" ></div>
+
+	{{$publish}}
+
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
+	</div>
+	<div id="register-submit-end" ></div>
+    
+</form>
+
+{{$license}}
+
+
diff --git a/view/templates/remote_friends_common.tpl b/view/templates/remote_friends_common.tpl
new file mode 100644
index 0000000000..5844aac87e
--- /dev/null
+++ b/view/templates/remote_friends_common.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	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}}
+	{{foreach $items as $item}}
+	<div class="profile-match-wrapper">
+		<div class="profile-match-photo">
+			<a href="{{$item.url}}">
+				<img src="{{$item.photo}}" width="80" height="80" alt="{{$item.name}}" title="{{$item.name}}" />
+			</a>
+		</div>
+		<div class="profile-match-break"></div>
+		<div class="profile-match-name">
+			<a href="{{$itemurl}}" title="{{$item.name}}">{{$item.name}}</a>
+		</div>
+		<div class="profile-match-end"></div>
+	</div>
+	{{/foreach}}
+	{{/if}}
+	<div id="rfic-end" class="clear"></div>
+</div>
+
diff --git a/view/templates/removeme.tpl b/view/templates/removeme.tpl
new file mode 100644
index 0000000000..3fe12a2231
--- /dev/null
+++ b/view/templates/removeme.tpl
@@ -0,0 +1,25 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+
+<div id="remove-account-wrapper">
+
+<div id="remove-account-desc">{{$desc}}</div>
+
+<form action="{{$basedir}}/removeme" autocomplete="off" method="post" >
+<input type="hidden" name="verify" value="{{$hash}}" />
+
+<div id="remove-account-pass-wrapper">
+<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
+<input type="password" id="remove-account-pass" name="qxz_password" />
+</div>
+<div id="remove-account-pass-end"></div>
+
+<input type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+</div>
+
diff --git a/view/templates/saved_searches_aside.tpl b/view/templates/saved_searches_aside.tpl
new file mode 100644
index 0000000000..0685eda7ed
--- /dev/null
+++ b/view/templates/saved_searches_aside.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	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}}
+	
+	<ul id="saved-search-ul">
+		{{foreach $saved as $search}}
+		<li class="saved-search-li clear">
+			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"></a>
+			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.term}}</a>
+		</li>
+		{{/foreach}}
+	</ul>
+	<div class="clear"></div>
+</div>
diff --git a/view/templates/search_item.tpl b/view/templates/search_item.tpl
new file mode 100644
index 0000000000..c6b9cc7dc5
--- /dev/null
+++ b/view/templates/search_item.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	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}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
+				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			</div>
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			<div class="wall-item-delete-end"></div>
+		</div>
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+
+
+	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
+	</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+
+</div>
+
+
diff --git a/view/templates/settings-end.tpl b/view/templates/settings-end.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/settings-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/settings-head.tpl b/view/templates/settings-head.tpl
new file mode 100644
index 0000000000..2182408392
--- /dev/null
+++ b/view/templates/settings-head.tpl
@@ -0,0 +1,30 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	var ispublic = "{{$ispublic}}";
+
+
+	$(document).ready(function() {
+
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+
+	});
+
+</script>
+
diff --git a/view/templates/settings.tpl b/view/templates/settings.tpl
new file mode 100644
index 0000000000..2ab4bd466c
--- /dev/null
+++ b/view/templates/settings.tpl
@@ -0,0 +1,152 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$ptitle}}</h1>
+
+{{$nickname_block}}
+
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<h3 class="settings-heading">{{$h_pass}}</h3>
+
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
+{{include file="field_password.tpl" field=$password3}}
+
+{{if $oid_enable}}
+{{include file="field_input.tpl" field=$openid}}
+{{/if}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_basic}}</h3>
+
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_input.tpl" field=$email}}
+{{include file="field_password.tpl" field=$password4}}
+{{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_input.tpl" field=$defloc}}
+{{include file="field_checkbox.tpl" field=$allowloc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_prv}}</h3>
+
+
+<input type="hidden" name="visibility" value="{{$visibility}}" />
+
+{{include file="field_input.tpl" field=$maxreq}}
+
+{{$profile_in_dir}}
+
+{{$profile_in_net_dir}}
+
+{{$hide_friends}}
+
+{{$hide_wall}}
+
+{{$blockwall}}
+
+{{$blocktags}}
+
+{{$suggestme}}
+
+{{$unkmail}}
+
+
+{{include file="field_input.tpl" field=$cntunkmail}}
+
+{{include file="field_input.tpl" field=$expire.days}}
+
+
+<div class="field input">
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="{{$expire.advanced}}">{{$expire.label}}</a></span>
+	<div style="display: none;">
+		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+			<h3>{{$expire.advanced}}</h3>
+			{{include file="field_yesno.tpl" field=$expire.items}}
+			{{include file="field_yesno.tpl" field=$expire.notes}}
+			{{include file="field_yesno.tpl" field=$expire.starred}}
+			{{include file="field_yesno.tpl" field=$expire.network_only}}
+		</div>
+	</div>
+
+</div>
+
+
+<div id="settings-default-perms" class="settings-default-perms" >
+	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
+	
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$aclselect}}
+		</div>
+	</div>
+
+	</div>
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+{{$group_select}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+
+<h3 class="settings-heading">{{$h_not}}</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">{{$activity_options}}</div>
+
+{{include file="field_checkbox.tpl" field=$post_newfriend}}
+{{include file="field_checkbox.tpl" field=$post_joingroup}}
+{{include file="field_checkbox.tpl" field=$post_profilechange}}
+
+
+<div id="settings-notify-desc">{{$lbl_not}}</div>
+
+<div class="group">
+{{include file="field_intcheckbox.tpl" field=$notify1}}
+{{include file="field_intcheckbox.tpl" field=$notify2}}
+{{include file="field_intcheckbox.tpl" field=$notify3}}
+{{include file="field_intcheckbox.tpl" field=$notify4}}
+{{include file="field_intcheckbox.tpl" field=$notify5}}
+{{include file="field_intcheckbox.tpl" field=$notify6}}
+{{include file="field_intcheckbox.tpl" field=$notify7}}
+{{include file="field_intcheckbox.tpl" field=$notify8}}
+</div>
+
+</div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_advn}}</h3>
+<div id="settings-pagetype-desc">{{$h_descadvn}}</div>
+
+{{$pagetype}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
diff --git a/view/templates/settings_addons.tpl b/view/templates/settings_addons.tpl
new file mode 100644
index 0000000000..52b71f1dbd
--- /dev/null
+++ b/view/templates/settings_addons.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+
+
+<form action="settings/addon" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+{{$settings_addons}}
+
+</form>
+
diff --git a/view/templates/settings_connectors.tpl b/view/templates/settings_connectors.tpl
new file mode 100644
index 0000000000..0b0d78299b
--- /dev/null
+++ b/view/templates/settings_connectors.tpl
@@ -0,0 +1,40 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+
+<div class="connector_statusmsg">{{$diasp_enabled}}</div>
+<div class="connector_statusmsg">{{$ostat_enabled}}</div>
+
+<form action="settings/connectors" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+{{$settings_connectors}}
+
+{{if $mail_disabled}}
+
+{{else}}
+	<div class="settings-block">
+	<h3 class="settings-heading">{{$h_imap}}</h3>
+	<p>{{$imap_desc}}</p>
+	{{include file="field_custom.tpl" field=$imap_lastcheck}}
+	{{include file="field_input.tpl" field=$mail_server}}
+	{{include file="field_input.tpl" field=$mail_port}}
+	{{include file="field_select.tpl" field=$mail_ssl}}
+	{{include file="field_input.tpl" field=$mail_user}}
+	{{include file="field_password.tpl" field=$mail_pass}}
+	{{include file="field_input.tpl" field=$mail_replyto}}
+	{{include file="field_checkbox.tpl" field=$mail_pubmail}}
+	{{include file="field_select.tpl" field=$mail_action}}
+	{{include file="field_input.tpl" field=$mail_movetofolder}}
+
+	<div class="settings-submit-wrapper" >
+		<input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" />
+	</div>
+	</div>
+{{/if}}
+
+</form>
+
diff --git a/view/templates/settings_display.tpl b/view/templates/settings_display.tpl
new file mode 100644
index 0000000000..a8826aada1
--- /dev/null
+++ b/view/templates/settings_display.tpl
@@ -0,0 +1,27 @@
+{{*
+ *	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" >
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+{{include file="field_themeselect.tpl" field=$theme}}
+{{include file="field_themeselect.tpl" field=$mobile_theme}}
+{{include file="field_input.tpl" field=$ajaxint}}
+{{include file="field_input.tpl" field=$itemspage_network}}
+{{include file="field_checkbox.tpl" field=$nosmile}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+{{if $theme_config}}
+<h2>Theme settings</h2>
+{{$theme_config}}
+{{/if}}
+
+</form>
diff --git a/view/templates/settings_display_end.tpl b/view/templates/settings_display_end.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/settings_display_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/settings_features.tpl b/view/templates/settings_features.tpl
new file mode 100644
index 0000000000..f5c5c50963
--- /dev/null
+++ b/view/templates/settings_features.tpl
@@ -0,0 +1,25 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+
+
+<form action="settings/features" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+{{foreach $features as $f}}
+<h3 class="settings-heading">{{$f.0}}</h3>
+
+{{foreach $f.1 as $fcat}}
+	{{include file="field_yesno.tpl" field=$fcat}}
+{{/foreach}}
+{{/foreach}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
+</div>
+
+</form>
+
diff --git a/view/templates/settings_nick_set.tpl b/view/templates/settings_nick_set.tpl
new file mode 100644
index 0000000000..fb886695ea
--- /dev/null
+++ b/view/templates/settings_nick_set.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	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>
+</div>
+<div id="settings-nick-end" ></div>
diff --git a/view/templates/settings_nick_subdir.tpl b/view/templates/settings_nick_subdir.tpl
new file mode 100644
index 0000000000..874185db5c
--- /dev/null
+++ b/view/templates/settings_nick_subdir.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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 />
+</p>
+<p>If you have any issues, you may have better results using the profile<br /> address '<strong>{{$baseurl}}/profile/{{$nickname}}</strong>'.
+</p>
\ No newline at end of file
diff --git a/view/templates/settings_oauth.tpl b/view/templates/settings_oauth.tpl
new file mode 100644
index 0000000000..feab78210b
--- /dev/null
+++ b/view/templates/settings_oauth.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+
+
+<form action="settings/oauth" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	<div id="profile-edit-links">
+		<ul>
+			<li>
+				<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a>
+			</li>
+		</ul>
+	</div>
+
+	{{foreach $apps as $app}}
+	<div class='oauthapp'>
+		<img src='{{$app.icon}}' class="{{if $app.icon}} {{else}}noicon{{/if}}">
+		{{if $app.name}}<h4>{{$app.name}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}}
+		{{if $app.my}}
+			{{if $app.oauth_token}}
+			<div class="settings-submit-wrapper" ><button class="settings-submit"  type="submit" name="remove" value="{{$app.oauth_token}}">{{$remove}}</button></div>
+			{{/if}}
+		{{/if}}
+		{{if $app.my}}
+		<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="icon s22 edit" title="{{$edit}}">&nbsp;</a>
+		<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="icon s22 delete" title="{{$delete}}">&nbsp;</a>
+		{{/if}}		
+	</div>
+	{{/foreach}}
+
+</form>
diff --git a/view/templates/settings_oauth_edit.tpl b/view/templates/settings_oauth_edit.tpl
new file mode 100644
index 0000000000..e3960bf75f
--- /dev/null
+++ b/view/templates/settings_oauth_edit.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+
+<form method="POST">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$key}}
+{{include file="field_input.tpl" field=$secret}}
+{{include file="field_input.tpl" field=$redirect}}
+{{include file="field_input.tpl" field=$icon}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+<input type="submit" name="cancel" class="settings-submit" value="{{$cancel}}" />
+</div>
+
+</form>
diff --git a/view/templates/suggest_friends.tpl b/view/templates/suggest_friends.tpl
new file mode 100644
index 0000000000..060db00050
--- /dev/null
+++ b/view/templates/suggest_friends.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	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">
+		<a href="{{$url}}">
+			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
+</div>
\ No newline at end of file
diff --git a/view/templates/suggestions.tpl b/view/templates/suggestions.tpl
new file mode 100644
index 0000000000..b4f0cbbe52
--- /dev/null
+++ b/view/templates/suggestions.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="intro-wrapper" >
+
+<p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
+<div class="intro-madeby">{{$madeby}}</div>
+<div class="intro-fullname" >{{$fullname}}</div>
+<a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" /></a>
+<div class="intro-note" >{{$note}}</div>
+<div class="intro-wrapper-end"></div>
+<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
+<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
+<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
+</form>
+<div class="intro-form-end"></div>
+
+<form class="intro-approve-form" action="{{$request}}" method="get">
+{{include file="field_checkbox.tpl" field=$hidden}}
+<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
+</form>
+</div>
+<div class="intro-end"></div>
diff --git a/view/templates/tag_slap.tpl b/view/templates/tag_slap.tpl
new file mode 100644
index 0000000000..6d1bd01d61
--- /dev/null
+++ b/view/templates/tag_slap.tpl
@@ -0,0 +1,35 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	<entry>
+		<author>
+			<name>{{$name}}</name>
+			<uri>{{$profile_page}}</uri>
+			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
+			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
+		</author>
+
+		<id>{{$item_id}}</id>
+		<title>{{$title}}</title>
+		<published>{{$published}}</published>
+		<content type="{{$type}}" >{{$content}}</content>
+		<link rel="mentioned" href="{{$accturi}}" />
+		<as:actor>
+		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
+		<id>{{$profile_page}}</id>
+		<title></title>
+ 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="{{$photo}}"/>
+		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}"/>
+		<poco:preferredUsername>{{$nick}}</poco:preferredUsername>
+		<poco:displayName>{{$name}}</poco:displayName>
+		</as:actor>
+ 		<as:verb>{{$verb}}</as:verb>
+		<as:object>
+		<as:object-type></as:object-type>
+		</as:object>
+		<as:target>
+		<as:object-type></as:object-type>
+		</as:target>
+	</entry>
diff --git a/view/templates/threaded_conversation.tpl b/view/templates/threaded_conversation.tpl
new file mode 100644
index 0000000000..bcdcf6e7be
--- /dev/null
+++ b/view/templates/threaded_conversation.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+</div>
+<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+<div id="item-delete-selected-end"></div>
+{{/if}}
diff --git a/view/templates/toggle_mobile_footer.tpl b/view/templates/toggle_mobile_footer.tpl
new file mode 100644
index 0000000000..008d69663b
--- /dev/null
+++ b/view/templates/toggle_mobile_footer.tpl
@@ -0,0 +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/templates/uexport.tpl b/view/templates/uexport.tpl
new file mode 100644
index 0000000000..1d9362d724
--- /dev/null
+++ b/view/templates/uexport.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+
+
+{{foreach $options as $o}}
+<dl>
+    <dt><a href="{{$baseurl}}/{{$o.0}}">{{$o.1}}</a></dt>
+    <dd>{{$o.2}}</dd>
+</dl>
+{{/foreach}}
\ No newline at end of file
diff --git a/view/templates/uimport.tpl b/view/templates/uimport.tpl
new file mode 100644
index 0000000000..cc137514a7
--- /dev/null
+++ b/view/templates/uimport.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	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>
+    <p>{{$import.instruct}}</p>
+    <p><b>{{$import.warn}}</b></p>
+     {{include file="field_custom.tpl" field=$import.field}}
+     
+     
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
+	</div>
+	<div id="register-submit-end" ></div>    
+</form>
diff --git a/view/templates/vcard-widget.tpl b/view/templates/vcard-widget.tpl
new file mode 100644
index 0000000000..6ccd2ae1d0
--- /dev/null
+++ b/view/templates/vcard-widget.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	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>
+	</div>
+
diff --git a/view/templates/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl
new file mode 100644
index 0000000000..a9837c7f9b
--- /dev/null
+++ b/view/templates/viewcontact_template.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+
+<div id="view-contact-end"></div>
+
+{{$paginate}}
diff --git a/view/templates/voting_fakelink.tpl b/view/templates/voting_fakelink.tpl
new file mode 100644
index 0000000000..3d14ba48bb
--- /dev/null
+++ b/view/templates/voting_fakelink.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$phrase}}
diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl
new file mode 100644
index 0000000000..c0e30c4cbf
--- /dev/null
+++ b/view/templates/wall_thread.tpl
@@ -0,0 +1,125 @@
+{{*
+ *	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>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                    <ul>
+                        {{$item.item_photo_menu}}
+                    </ul>
+                </div>
+
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+					<div class="body-tag">
+						{{foreach $item.tags as $tag}}
+							<span class='tag'>{{$tag}}</span>
+						{{/foreach}}
+					</div>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+				{{if $item.vote.dislike}}<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
+				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				<div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link{{$item.sparkle}}"></a></div>
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}			
+			
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			</div>
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			<div class="wall-item-delete-end"></div>
+		</div>
+	</div>	
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+
+			{{if $item.threaded}}
+			{{if $item.comment}}
+			<div class="wall-item-comment-wrapper {{$item.indent}}" >
+				{{$item.comment}}
+			</div>
+			{{/if}}
+			{{/if}}
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+</div>
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" >
+	{{$item.comment}}
+</div>
+{{/if}}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/templates/wallmessage.tpl b/view/templates/wallmessage.tpl
new file mode 100644
index 0000000000..6eeabe9ed4
--- /dev/null
+++ b/view/templates/wallmessage.tpl
@@ -0,0 +1,37 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h3>{{$header}}</h3>
+
+<h4>{{$subheader}}</h4>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="wallmessage/{{$nickname}}" method="post" >
+
+{{$parent}}
+
+<div id="prvmail-to-label">{{$to}}</div>
+{{$recipname}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/templates/wallmsg-end.tpl b/view/templates/wallmsg-end.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/templates/wallmsg-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/wallmsg-header.tpl b/view/templates/wallmsg-header.tpl
new file mode 100644
index 0000000000..8a8ccf00cb
--- /dev/null
+++ b/view/templates/wallmsg-header.tpl
@@ -0,0 +1,87 @@
+{{*
+ *	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">
+
+var plaintext = '{{$editselect}}';
+
+if(plaintext != 'none') {
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: /(profile-jot-text|prvmail-text)/,
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		gecko_spellcheck : true,
+		paste_text_sticky : true,
+		entity_encoding : "raw",
+		add_unload_trigger : false,
+		remove_linebreaks : false,
+		//force_p_newlines : false,
+		//force_br_newlines : true,
+		forced_root_block : 'div',
+		convert_urls: false,
+		content_css: "{{$baseurl}}/view/custom_tinymce.css",
+		     //Character count
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+				var editorId = ed.editorId;
+				var textarea = $('#'+editorId);
+				if (typeof(textarea.attr('tabindex')) != "undefined") {
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					textarea.attr('tabindex', null);
+				}
+			});
+		}
+	});
+}
+else
+	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+
+
+</script>
+<script>
+
+	function jotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+</script>
+
diff --git a/view/templates/xrd_diaspora.tpl b/view/templates/xrd_diaspora.tpl
new file mode 100644
index 0000000000..143980bcc6
--- /dev/null
+++ b/view/templates/xrd_diaspora.tpl
@@ -0,0 +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/templates/xrd_host.tpl b/view/templates/xrd_host.tpl
new file mode 100644
index 0000000000..1f273e010a
--- /dev/null
+++ b/view/templates/xrd_host.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	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'>
+ 
+    <hm:Host>{{$zhost}}</hm:Host>
+ 
+    <Link rel='lrdd' template='{{$domain}}/xrd/?uri={uri}' />
+    <Link rel='acct-mgmt' href='{{$domain}}/amcd' />
+    <Link rel='http://services.mozilla.com/amcd/0.1' href='{{$domain}}/amcd' />
+	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
+        href="{{$domain}}/oexchange/xrd" />
+
+    <Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
+        type="http://salmon-protocol.org/ns/magic-key"
+        mk:key_id="1">{{$bigkey}}</Property>
+
+
+</XRD>
diff --git a/view/templates/xrd_person.tpl b/view/templates/xrd_person.tpl
new file mode 100644
index 0000000000..3f12eff515
--- /dev/null
+++ b/view/templates/xrd_person.tpl
@@ -0,0 +1,43 @@
+{{*
+ *	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">
+ 
+    <Subject>{{$accturi}}</Subject>
+	<Alias>{{$accturi}}</Alias>
+    <Alias>{{$profile_url}}</Alias>
+ 
+    <Link rel="http://purl.org/macgirvin/dfrn/1.0"
+          href="{{$profile_url}}" />
+    <Link rel="http://schemas.google.com/g/2010#updates-from" 
+          type="application/atom+xml" 
+          href="{{$atom}}" />
+    <Link rel="http://webfinger.net/rel/profile-page"
+          type="text/html"
+          href="{{$profile_url}}" />
+    <Link rel="http://microformats.org/profile/hcard"
+          type="text/html"
+          href="{{$hcard_url}}" />
+    <Link rel="http://portablecontacts.net/spec/1.0"
+          href="{{$poco_url}}" />
+    <Link rel="http://webfinger.net/rel/avatar"
+          type="image/jpeg"
+          href="{{$photo}}" />
+	{{$dspr}}
+    <Link rel="salmon" 
+          href="{{$salmon}}" />
+    <Link rel="http://salmon-protocol.org/ns/salmon-replies" 
+          href="{{$salmon}}" />
+    <Link rel="http://salmon-protocol.org/ns/salmon-mention" 
+          href="{{$salmen}}" />
+    <Link rel="magic-public-key" 
+          href="{{$modexp}}" />
+ 
+	<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
+          type="http://salmon-protocol.org/ns/magic-key"
+          mk:key_id="1">{{$bigkey}}</Property>
+
+</XRD>
diff --git a/view/theme/cleanzero/templates/nav.tpl b/view/theme/cleanzero/templates/nav.tpl
new file mode 100644
index 0000000000..437c7e5959
--- /dev/null
+++ b/view/theme/cleanzero/templates/nav.tpl
@@ -0,0 +1,90 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+ <nav>
+	{{$langselector}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+
+
+	<span id="nav-commlink-wrapper">
+
+	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+		
+
+
+	{{if $nav.network}}
+	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.home}}
+	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.community}}
+	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+	{{/if}}
+	{{if $nav.introductions}}
+	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.messages}}
+	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{/if}}
+		{{if $nav.notifications}}
+			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
+				<span id="notify-update" class="nav-ajax-left"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+		{{/if}}	
+	</span>
+       <span id="banner">{{$banner}}</span>
+	<span id="nav-link-wrapper">
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
+		
+	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+
+	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+
+	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+
+
+
+	
+
+	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
+	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+
+	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
+
+
+	{{if $nav.manage}}<a id="nav-manage-link" class="nav-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
+	</span>
+	<span id="nav-end"></span>
+	
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+<script>
+var pagetitle = null;
+$("nav").bind('nav-update', function(e,data){
+if (pagetitle==null) pagetitle = document.title;
+var count = $(data).find('notif').attr('count');
+if (count>0) {
+document.title = "("+count+") "+pagetitle;
+} else {
+document.title = pagetitle;
+}
+});
+</script>
diff --git a/view/theme/cleanzero/templates/theme_settings.tpl b/view/theme/cleanzero/templates/theme_settings.tpl
new file mode 100644
index 0000000000..0743b25947
--- /dev/null
+++ b/view/theme/cleanzero/templates/theme_settings.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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}}
+{{include file="field_select.tpl" field=$theme_width}}
+
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="cleanzero-settings-submit" />
+</div>
+
diff --git a/view/theme/comix-plain/templates/comment_item.tpl b/view/theme/comix-plain/templates/comment_item.tpl
new file mode 100644
index 0000000000..6e1bdd7747
--- /dev/null
+++ b/view/theme/comix-plain/templates/comment_item.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+				{{foreach $qcomment as $qc}}				
+					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
+					&nbsp;
+				{{/foreach}}
+				{{/if}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/comix-plain/templates/search_item.tpl b/view/theme/comix-plain/templates/search_item.tpl
new file mode 100644
index 0000000000..e07731246c
--- /dev/null
+++ b/view/theme/comix-plain/templates/search_item.tpl
@@ -0,0 +1,59 @@
+{{*
+ *	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}}">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			</div>
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			<div class="wall-item-delete-end"></div>
+		</div>
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+
+
+	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
+	</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+
+</div>
+
+
diff --git a/view/theme/comix/templates/comment_item.tpl b/view/theme/comix/templates/comment_item.tpl
new file mode 100644
index 0000000000..6e1bdd7747
--- /dev/null
+++ b/view/theme/comix/templates/comment_item.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+				{{foreach $qcomment as $qc}}				
+					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
+					&nbsp;
+				{{/foreach}}
+				{{/if}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/comix/templates/search_item.tpl b/view/theme/comix/templates/search_item.tpl
new file mode 100644
index 0000000000..a52d93f5cd
--- /dev/null
+++ b/view/theme/comix/templates/search_item.tpl
@@ -0,0 +1,59 @@
+{{*
+ *	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}}">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			</div>
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			<div class="wall-item-delete-end"></div>
+		</div>
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+
+
+	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
+	</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
+
+</div>
+
+
diff --git a/view/theme/decaf-mobile/templates/acl_html_selector.tpl b/view/theme/decaf-mobile/templates/acl_html_selector.tpl
new file mode 100644
index 0000000000..05e82f2d05
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/acl_html_selector.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<a name="acl-wrapper-target"></a>
+<div id="acl-wrapper">
+	<div id="acl-public-switch">
+		<a href="{{$return_path}}#acl-wrapper-target" {{if $is_private == 1}}class="acl-public-switch-selected"{{/if}} >{{$private}}</a>
+		<a href="{{$return_path}}{{$public_link}}#acl-wrapper-target" {{if $is_private == 0}}class="acl-public-switch-selected"{{/if}} >{{$public}}</a>
+	</div>
+	<div id="acl-list">
+		<div id="acl-list-content">
+			<div id="acl-html-groups" class="acl-html-select-wrapper">
+			{{$group_perms}}<br />
+			<select name="group_allow[]" multiple {{if $is_private == 0}}disabled{{/if}} id="acl-html-group-select" class="acl-html-select" size=7>
+				{{foreach $acl_data.groups as $group}}
+				<option value="{{$group.id}}" {{if $is_private == 1}}{{if $group.selected}}selected{{/if}}{{/if}}>{{$group.name}}</option>
+				{{/foreach}}
+			</select>
+			</div>
+			<div id="acl-html-contacts" class="acl-html-select-wrapper">
+			{{$contact_perms}}<br />
+			<select name="contact_allow[]" multiple {{if $is_private == 0}}disabled{{/if}} id="acl-html-contact-select" class="acl-html-select" size=7>
+				{{foreach $acl_data.contacts as $contact}}
+				<option value="{{$contact.id}}" {{if $is_private == 1}}{{if $contact.selected}}selected{{/if}}{{/if}}>{{$contact.name}} ({{$contact.networkName}})</option>
+				{{/foreach}}
+			</select>
+			</div>
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</div>
+
diff --git a/view/theme/decaf-mobile/templates/acl_selector.tpl b/view/theme/decaf-mobile/templates/acl_selector.tpl
new file mode 100644
index 0000000000..b5e8307268
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/acl_selector.tpl
@@ -0,0 +1,28 @@
+{{*
+ *	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>
+	<div id="acl-list">
+		<div id="acl-list-content">
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</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>
+
+{{*<!--<script>
+	window.allowCID = {{$allowcid}};
+	window.allowGID = {{$allowgid}};
+	window.denyCID = {{$denycid}};
+	window.denyGID = {{$denygid}};
+	window.aclInit = "true";
+</script>-->*}}
diff --git a/view/theme/decaf-mobile/templates/admin_aside.tpl b/view/theme/decaf-mobile/templates/admin_aside.tpl
new file mode 100644
index 0000000000..024d6195b5
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/admin_aside.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
+	<li class='admin button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
+	<li class='admin button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
+	<li class='admin button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
+	<li class='admin button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
+</ul>
+
+{{if $admin.update}}
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+	<li class='admin button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{/if}}
+
+
+{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
+<ul class='admin linklist'>
+	{{foreach $admin.plugins_admin as $l}}
+	<li class='admin button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
+	{{/foreach}}
+</ul>
+	
+	
+<h4>{{$logtxt}}</h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
+</ul>
+
diff --git a/view/theme/decaf-mobile/templates/admin_site.tpl b/view/theme/decaf-mobile/templates/admin_site.tpl
new file mode 100644
index 0000000000..035024e689
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/admin_site.tpl
@@ -0,0 +1,72 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+	{{include file="field_select.tpl" field=$theme_mobile}}
+	{{include file="field_select.tpl" field=$ssl_policy}}
+	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$hide_help}} 
+	{{include file="field_select.tpl" field=$singleuser}} 
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$registration}}</h3>
+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	
+	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+	{{include file="field_checkbox.tpl" field=$no_openid}}
+	{{include file="field_checkbox.tpl" field=$no_regfullname}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+
+	<h3>{{$upload}}</h3>
+	{{include file="field_input.tpl" field=$maximagesize}}
+	{{include file="field_input.tpl" field=$maximagelength}}
+	{{include file="field_input.tpl" field=$jpegimagequality}}
+	
+	<h3>{{$corporate}}</h3>
+	{{include file="field_input.tpl" field=$allowed_sites}}
+	{{include file="field_input.tpl" field=$allowed_email}}
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$no_community_page}}
+	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
+	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+	{{include file="field_checkbox.tpl" field=$dfrn_only}}
+	{{include file="field_input.tpl" field=$global_directory}}
+	{{include file="field_checkbox.tpl" field=$thread_allow}}
+	{{include file="field_checkbox.tpl" field=$newuser_private}}
+	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
+	{{include file="field_checkbox.tpl" field=$private_addons}}	
+	{{include file="field_checkbox.tpl" field=$disable_embedded}}	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$advanced}}</h3>
+	{{include file="field_checkbox.tpl" field=$no_utf}}
+	{{include file="field_checkbox.tpl" field=$verifyssl}}
+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	</form>
+</div>
diff --git a/view/theme/decaf-mobile/templates/admin_users.tpl b/view/theme/decaf-mobile/templates/admin_users.tpl
new file mode 100644
index 0000000000..df795a1f4f
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/admin_users.tpl
@@ -0,0 +1,103 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	{{*/*function selectall(cls){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}*/*}}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.created}}</td>
+					<td class="name">{{$u.name}}</td>
+					<td class="email">{{$u.email}}</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			{{*<!--<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>-->*}}
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			{{*<!--<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>-->*}}
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/theme/decaf-mobile/templates/album_edit.tpl b/view/theme/decaf-mobile/templates/album_edit.tpl
new file mode 100644
index 0000000000..094da70a93
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/album_edit.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	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" >
+	<input id="photo-album-edit-form-confirm" type="hidden" name="confirm" value="1" />
+
+	<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
+	<input type="text" size="64" name="albumname" value="{{$album}}" >
+
+	<div id="photo-album-edit-name-end"></div>
+
+	<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete(function(){remove('photo-album-edit-form-confirm');});" />
+
+</form>
+</div>
+<div id="photo-album-edit-end" ></div>
diff --git a/view/theme/decaf-mobile/templates/categories_widget.tpl b/view/theme/decaf-mobile/templates/categories_widget.tpl
new file mode 100644
index 0000000000..1749fced3f
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/categories_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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>
+	
+	<ul class="categories-ul">
+		<li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+			<li class="tool"><a href="{{$base}}?f=&category={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>-->*}}
diff --git a/view/theme/decaf-mobile/templates/comment_item.tpl b/view/theme/decaf-mobile/templates/comment_item.tpl
new file mode 100644
index 0000000000..63c70aa5be
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/comment_item.tpl
@@ -0,0 +1,84 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--		<script>
+		$(document).ready( function () {
+			$(document).mouseup(function(e) {
+				var container = $("#comment-edit-wrapper-{{$id}}");
+				if( container.has(e.target).length === 0) {
+					commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
+					cmtBbClose({{$id}});
+				}
+			});
+		});
+		</script>-->*}}
+
+		<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;" >
+			<a name="comment-wwedit-wrapper-pos"></a>
+			<form class="comment-edit-form {{$indent}}" id="comment-edit-form-{{$id}}" action="item" method="post" >
+{{*<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
+			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="source" value="{{$sourceapp}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}#comment-wwedit-wrapper-pos" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				{{*<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
+					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				{{*<!--</div>-->*}}
+				{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
+				{{*<!--<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>-->*}}
+{{*<!--					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>-->*}}
+				{{*<!--</ul>	-->*}}
+				{{*<!--<div class="comment-edit-bb-end"></div>-->*}}
+{{*<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-full" name="body" ></textarea>
+				{{*<!--{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
+					</select>
+				{{/if}}-->*}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" >
+					<input type="submit" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					{{*<!--<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="preview-link fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>-->*}}
+				</div>
+
+				{{*<!--<div class="comment-edit-end"></div>-->*}}
+			</form>
+
+		</div>
diff --git a/view/theme/decaf-mobile/templates/common_tabs.tpl b/view/theme/decaf-mobile/templates/common_tabs.tpl
new file mode 100644
index 0000000000..9fa4ed41d9
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/common_tabs.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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>
+	{{/foreach}}
+	<div id="tabs-end"></div>
+</ul>
diff --git a/view/theme/decaf-mobile/templates/contact_block.tpl b/view/theme/decaf-mobile/templates/contact_block.tpl
new file mode 100644
index 0000000000..5a0a26b87e
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contact_block.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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}}
+		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
+		<div class='contact-block-content'>
+		{{foreach $micropro as $m}}
+			{{$m}}
+		{{/foreach}}
+		</div>
+{{/if}}
+</div>
+<div class="clear"></div>-->*}}
diff --git a/view/theme/decaf-mobile/templates/contact_edit.tpl b/view/theme/decaf-mobile/templates/contact_edit.tpl
new file mode 100644
index 0000000000..0f028d5904
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contact_edit.tpl
@@ -0,0 +1,98 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h2>{{$header}}</h2>
+
+<div id="contact-edit-wrapper" >
+
+	{{$tab_str}}
+
+	<div id="contact-edit-drop-link-wrapper" >
+		<a href="contacts/{{$contact_id}}/drop?confirm=1" class="icon drophide" id="contact-edit-drop-link" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'contacts/{{$contact_id}}/drop')});"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
+	</div>
+
+	<div id="contact-edit-drop-link-end"></div>
+
+	<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>
+	</div>
+
+
+	<div id="contact-edit-nav-wrapper" >
+		<div id="contact-edit-links">
+			<ul>
+				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
+				{{if $lost_contact}}
+					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
+				{{/if}}
+				{{if $insecure}}
+					<li><div id="insecure-message">{{$insecure}}</div></li>
+				{{/if}}
+				{{if $blocked}}
+					<li><div id="block-message">{{$blocked}}</div></li>
+				{{/if}}
+				{{if $ignored}}
+					<li><div id="ignore-message">{{$ignored}}</div></li>
+				{{/if}}
+				{{if $archived}}
+					<li><div id="archive-message">{{$archived}}</div></li>
+				{{/if}}
+
+				<li>&nbsp;</li>
+
+				{{if $common_text}}
+					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
+				{{/if}}
+				{{if $all_friends}}
+					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
+				{{/if}}
+
+
+				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+				{{if $lblsuggest}}
+					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
+				{{/if}}
+
+			</ul>
+		</div>
+	</div>
+	<div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/{{$contact_id}}" method="post" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}">
+
+	{{if $poll_enabled}}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
+			<span id="contact-edit-poll-text">{{$updpub}} {{$poll_interval}}</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
+		</div>
+	{{/if}}
+	<div id="contact-edit-end" ></div>
+
+	{{include file="field_checkbox.tpl" field=$hidden}}
+
+<div id="contact-edit-info-wrapper">
+<h4>{{$lbl_info1}}</h4>
+	<textarea id="contact-edit-info" rows="8"{{* cols="35"*}} name="info">{{$info}}</textarea>
+	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>{{$lbl_vis1}}</h4>
+<p>{{$lbl_vis2}}</p> 
+</div>
+{{$profile_select}}
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+</div>
diff --git a/view/theme/decaf-mobile/templates/contact_head.tpl b/view/theme/decaf-mobile/templates/contact_head.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contact_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/decaf-mobile/templates/contact_template.tpl b/view/theme/decaf-mobile/templates/contact_template.tpl
new file mode 100644
index 0000000000..f017744f7e
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contact_template.tpl
@@ -0,0 +1,43 @@
+{{*
+ *	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" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		{{*onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}});" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)"*}} >
+
+{{*<!--			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>-->*}}
+			{{*<!--<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">-->*}}
+			<a href="{{$contact.photo_menu.edit.1}}" title="{{$contact.photo_menu.edit.0}}">
+			<img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
+			</a>
+			{{*<!--</span>-->*}}
+
+{{*<!--			{{if $contact.photo_menu}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                    <ul>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}-->*}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
+{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/decaf-mobile/templates/contacts-end.tpl b/view/theme/decaf-mobile/templates/contacts-end.tpl
new file mode 100644
index 0000000000..adeea280c7
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contacts-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/decaf-mobile/templates/contacts-head.tpl b/view/theme/decaf-mobile/templates/contacts-head.tpl
new file mode 100644
index 0000000000..7fa1411649
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contacts-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script>
+	window.autocompleteType = 'contacts-head';
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/contacts-template.tpl b/view/theme/decaf-mobile/templates/contacts-template.tpl
new file mode 100644
index 0000000000..b9162c2e9e
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contacts-template.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	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}}
+
+<div id="contacts-search-wrapper">
+<form id="contacts-search-form" action="{{$cmd}}" method="get" >
+<span class="contacts-search-desc">{{$desc}}</span>
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
+<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
+</form>
+</div>
+<div id="contacts-search-end"></div>
+
+{{$tabs}}
+
+
+<div id="contacts-display-wrapper">
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+</div>
+<div id="contact-edit-end"></div>
+
+{{$paginate}}
+
+
+
+
diff --git a/view/theme/decaf-mobile/templates/contacts-widget-sidebar.tpl b/view/theme/decaf-mobile/templates/contacts-widget-sidebar.tpl
new file mode 100644
index 0000000000..bda321896e
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contacts-widget-sidebar.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$follow_widget}}
+
diff --git a/view/theme/decaf-mobile/templates/conversation.tpl b/view/theme/decaf-mobile/templates/conversation.tpl
new file mode 100644
index 0000000000..f6810bb100
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/conversation.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
+	{{foreach $thread.items as $item}}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
+			</div>
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
+		
+		{{include file="{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+</div>
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{*<!--{{if $dropping}}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{/if}}-->*}}
diff --git a/view/theme/decaf-mobile/templates/cropbody.tpl b/view/theme/decaf-mobile/templates/cropbody.tpl
new file mode 100644
index 0000000000..5ace9a1aaf
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/cropbody.tpl
@@ -0,0 +1,32 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+<p id="cropimage-desc">
+{{$desc}}
+</p>
+<div id="cropimage-wrapper">
+<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="{{$done}}" />
+</div>
+
+</form>
diff --git a/view/theme/decaf-mobile/templates/cropend.tpl b/view/theme/decaf-mobile/templates/cropend.tpl
new file mode 100644
index 0000000000..e75083f512
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/cropend.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+      <script type="text/javascript" language="javascript">initCrop();</script>-->*}}
diff --git a/view/theme/decaf-mobile/templates/crophead.tpl b/view/theme/decaf-mobile/templates/crophead.tpl
new file mode 100644
index 0000000000..6438cfb354
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/crophead.tpl
@@ -0,0 +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/decaf-mobile/templates/display-head.tpl b/view/theme/decaf-mobile/templates/display-head.tpl
new file mode 100644
index 0000000000..2943201923
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/display-head.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<script>
+	window.autoCompleteType = 'display-head';
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/end.tpl b/view/theme/decaf-mobile/templates/end.tpl
new file mode 100644
index 0000000000..6914cfd246
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/end.tpl
@@ -0,0 +1,30 @@
+{{*
+ *	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]-->
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+<script type="text/javascript">
+  tinyMCE.init({ mode : "none"});
+</script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/fk.autocomplete.js" ></script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/acl.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/main.js" ></script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/theme.js"></script>
+
+<!--<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.package.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/decaf-mobile.package.js" ></script>-->
+
diff --git a/view/theme/decaf-mobile/templates/event_end.tpl b/view/theme/decaf-mobile/templates/event_end.tpl
new file mode 100644
index 0000000000..63dbec4426
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/event_end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/decaf-mobile/templates/event_head.tpl b/view/theme/decaf-mobile/templates/event_head.tpl
new file mode 100644
index 0000000000..bd72758e6f
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/event_head.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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">
+window.aclType = 'event_head';
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/field_checkbox.tpl b/view/theme/decaf-mobile/templates/field_checkbox.tpl
new file mode 100644
index 0000000000..f7f857f592
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/field_checkbox.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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>
+		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><br />
+		<span class='field_help' id='help_id_{{$field.0}}'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/decaf-mobile/templates/field_input.tpl b/view/theme/decaf-mobile/templates/field_input.tpl
new file mode 100644
index 0000000000..240bed249f
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/field_input.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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 />
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/decaf-mobile/templates/field_openid.tpl b/view/theme/decaf-mobile/templates/field_openid.tpl
new file mode 100644
index 0000000000..d5ebd9a3b6
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/field_openid.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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 />
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/decaf-mobile/templates/field_password.tpl b/view/theme/decaf-mobile/templates/field_password.tpl
new file mode 100644
index 0000000000..f1352f27b2
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/field_password.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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 />
+		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/decaf-mobile/templates/field_themeselect.tpl b/view/theme/decaf-mobile/templates/field_themeselect.tpl
new file mode 100644
index 0000000000..95cfd6bcdb
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/field_themeselect.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+	<div class='field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select name='{{$field.0}}' id='id_{{$field.0}}' {{*{{if $field.5}}onchange="previewTheme(this);"{{/if}}*}} >
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<span class='field_help'>{{$field.3}}</span>
+		<div id="theme-preview"></div>
+	</div>
diff --git a/view/theme/decaf-mobile/templates/field_yesno.tpl b/view/theme/decaf-mobile/templates/field_yesno.tpl
new file mode 100644
index 0000000000..9cdb95e01c
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/field_yesno.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	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">
+			<input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+			<a href="#" class='off'>
+				{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
+			</a>
+			<a href="#" class='on'>
+				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
+			</a>
+		</div>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>-->*}}
+{{include file="field_checkbox.tpl"}}
diff --git a/view/theme/decaf-mobile/templates/generic_links_widget.tpl b/view/theme/decaf-mobile/templates/generic_links_widget.tpl
new file mode 100644
index 0000000000..705ddb57cb
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/generic_links_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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}}
+	
+	<ul class="tabs links-widget">
+		{{foreach $items as $item}}
+			<li class="tool"><a href="{{$item.url}}" class="tab {{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
+		{{/foreach}}
+		<div id="tabs-end"></div>
+	</ul>
+	
+</div>
diff --git a/view/theme/decaf-mobile/templates/group_drop.tpl b/view/theme/decaf-mobile/templates/group_drop.tpl
new file mode 100644
index 0000000000..2693228154
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/group_drop.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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();" 
+		id="group-delete-icon-{{$id}}" 
+		class="icon drophide group-delete-icon" 
+		{{*onmouseover="imgbright(this);" 
+		onmouseout="imgdull(this);"*}} ></a>
+</div>
+<div class="group-delete-end"></div>
diff --git a/view/theme/decaf-mobile/templates/group_side.tpl b/view/theme/decaf-mobile/templates/group_side.tpl
new file mode 100644
index 0000000000..7d9d23ebe1
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/group_side.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="widget" id="group-sidebar">
+<h3>{{$title}}</h3>
+
+<div id="sidebar-group-list">
+	<ul id="sidebar-group-ul">
+		{{foreach $groups as $group}}
+			<li class="sidebar-group-li">
+				{{if $group.cid}}
+					<input type="checkbox" 
+						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
+						{{*onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"*}}
+						{{if $group.ismember}}checked="checked"{{/if}}
+					/>
+				{{/if}}			
+				{{if $group.edit}}
+					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"></span></a>
+				{{/if}}
+				<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
+			</li>
+		{{/foreach}}
+	</ul>
+	</div>
+  <div id="sidebar-new-group">
+  <a href="group/new">{{$createtext}}</a>
+  </div>
+  {{if $ungrouped}}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">{{$ungrouped}}</a>
+  </div>
+  {{/if}}
+</div>
+
+
diff --git a/view/theme/decaf-mobile/templates/head.tpl b/view/theme/decaf-mobile/templates/head.tpl
new file mode 100644
index 0000000000..07398391f1
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/head.tpl
@@ -0,0 +1,35 @@
+{{*
+ *	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'>
+<meta content='320' name='MobileOptimized'>-->*}}
+<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
+{{*<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->*}}
+
+<base href="{{$baseurl}}/" />
+<meta name="generator" content="{{$generator}}" />
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />-->*}}
+
+<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
+
+<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
+<link rel="search"
+         href="{{$baseurl}}/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<script>
+	window.delItem = "{{$delitem}}";
+{{*/*	window.commentEmptyText = "{{$comment}}";
+	window.showMore = "{{$showmore}}";
+	window.showFewer = "{{$showfewer}}";
+	var updateInterval = {{$update_interval}};
+	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};*/*}}
+</script>
diff --git a/view/theme/decaf-mobile/templates/jot-end.tpl b/view/theme/decaf-mobile/templates/jot-end.tpl
new file mode 100644
index 0000000000..88c8e59c62
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/jot-end.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+{{*<!--
+<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/jot-header.tpl b/view/theme/decaf-mobile/templates/jot-header.tpl
new file mode 100644
index 0000000000..b0bf78916b
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/jot-header.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	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
+	window.editSelect = {{$editselect}};
+	window.isPublic = "{{$ispublic}}";
+	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	window.vidURL = "{{$vidurl}}";
+	window.audURL = "{{$audurl}}";
+	window.whereAreU = "{{$whereareu}}";
+	window.term = "{{$term}}";
+	window.baseURL = "{{$baseurl}}";
+	window.geoTag = function () { {{$geotag}} }*/*}}
+	window.jotId = "#profile-jot-text";
+	window.imageUploadButton = 'wall-image-upload';
+</script>
+
diff --git a/view/theme/decaf-mobile/templates/jot.tpl b/view/theme/decaf-mobile/templates/jot.tpl
new file mode 100644
index 0000000000..61a72154c0
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/jot.tpl
@@ -0,0 +1,104 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="source" value="{{$sourceapp}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" ></div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" /></div>
+		{{/if}}
+		<div id="jot-text-wrap">
+		{{*<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />-->*}}
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder={{$share}} >{{if $content}}{{$content}}{{/if}}</textarea>
+		</div>
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-image-upload-div" style="display: none;" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-file-upload-div" style="display: none;" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
+	</div> 
+
+	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->*}}
+	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
+	</div> -->*}}
+
+	{{*<!--<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>-->*}}
+
+	<div id="profile-jot-perms-end"></div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	{{*<!--<div style="display: none;">-->*}}
+		<div id="profile-jot-acl-wrapper">
+			{{*<!--{{$acl}}
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			{{$jotnets}}
+			<div id="profile-jot-networks-end"></div>-->*}}
+			{{if $acl_data}}
+			{{include file="acl_html_selector.tpl"}}
+			{{/if}}
+			{{$jotnets}}
+		</div>
+	{{*<!--</div>-->*}}
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{*<!--{{if $content}}<script>window.jotInit = true;</script>{{/if}}-->*}}
+<script>
+document.getElementById('wall-image-upload-div').style.display = "inherit";
+document.getElementById('wall-file-upload-div').style.display = "inherit";
+</script>
diff --git a/view/theme/decaf-mobile/templates/jot_geotag.tpl b/view/theme/decaf-mobile/templates/jot_geotag.tpl
new file mode 100644
index 0000000000..d828980e58
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/jot_geotag.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			var lat = position.coords.latitude.toFixed(4);
+			var lon = position.coords.longitude.toFixed(4);
+
+			$j('#jot-coord').val(lat + ', ' + lon);
+			$j('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/theme/decaf-mobile/templates/lang_selector.tpl b/view/theme/decaf-mobile/templates/lang_selector.tpl
new file mode 100644
index 0000000000..a1aee8277f
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{foreach $langs.0 as $v=>$l}}
+				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
+			{{/foreach}}
+		</select>
+	</form>
+</div>
diff --git a/view/theme/decaf-mobile/templates/like_noshare.tpl b/view/theme/decaf-mobile/templates/like_noshare.tpl
new file mode 100644
index 0000000000..9d6a58ea20
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/like_noshare.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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="like/{{$id}}?verb=like&return={{$return_path}}#{{$item.id}}" class="icon like" title="{{$likethis}}" ></a>
+	{{if $nolike}}
+	<a href="like/{{$id}}?verb=dislike&return={{$return_path}}#{{$item.id}}" class="icon dislike" title="{{$nolike}}" ></a>
+	{{/if}}
+	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+</div>
diff --git a/view/theme/decaf-mobile/templates/login.tpl b/view/theme/decaf-mobile/templates/login.tpl
new file mode 100644
index 0000000000..69d0531815
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/login.tpl
@@ -0,0 +1,50 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="login-form">
+<form action="{{$dest_url}}" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{include file="field_input.tpl" field=$lname}}
+	{{include file="field_password.tpl" field=$lpassword}}
+	</div>
+	
+	{{if $openid}}
+			<div id="login_openid">
+			{{include file="field_openid.tpl" field=$lopenid}}
+			</div>
+	{{/if}}
+
+	<br />
+	<div id='login-footer'>
+	{{*<!--<div class="login-extra-links">
+	By signing in you agree to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>-->*}}
+
+	<br />
+	{{include file="field_checkbox.tpl" field=$lremember}}
+
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
+	</div>
+
+	<br /><br />
+	<div class="login-extra-links">
+		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
+        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+	</div>
+	</div>
+	
+	{{foreach $hiddens as $k=>$v}}
+		<input type="hidden" name="{{$k}}" value="{{$v}}" />
+	{{/foreach}}
+	
+	
+</form>
+</div>
+
+{{*<!--<script type="text/javascript">window.loginName = "{{$lname.0}}";</script>-->*}}
diff --git a/view/theme/decaf-mobile/templates/login_head.tpl b/view/theme/decaf-mobile/templates/login_head.tpl
new file mode 100644
index 0000000000..c2d9504ad3
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/login_head.tpl
@@ -0,0 +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/decaf-mobile/templates/lostpass.tpl b/view/theme/decaf-mobile/templates/lostpass.tpl
new file mode 100644
index 0000000000..5a22c245bf
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/lostpass.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="lostpass-form">
+<h2>{{$title}}</h2>
+<br /><br /><br />
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper" class="field input">
+        <label for="login-name" id="label-login-name">{{$name}}</label><br />
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+</div>
+<div id="login-extra-end"></div>
+<p id="lostpass-desc">
+{{$desc}}
+</p>
+<br />
+
+<div id="login-submit-wrapper" >
+        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+</div>
diff --git a/view/theme/decaf-mobile/templates/mail_conv.tpl b/view/theme/decaf-mobile/templates/mail_conv.tpl
new file mode 100644
index 0000000000..c2b43c538d
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/mail_conv.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	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>
+	</div>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<div class="mail-conv-date">{{$mail.date}}</div>
+		<div class="mail-conv-subject">{{$mail.subject}}</div>
+	</div>
+	<div class="mail-conv-body">{{$mail.body}}</div>
+</div>
+<div class="mail-conv-outside-wrapper-end"></div>
+
+
+<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}?confirm=1" class="icon drophide delete-icon mail-list-delete-icon" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/drop/{{$mail.id}}')});" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);*}}" ></a></div>
+<div class="mail-conv-delete-end"></div>
+
+<hr class="mail-conv-break" />
diff --git a/view/theme/decaf-mobile/templates/mail_list.tpl b/view/theme/decaf-mobile/templates/mail_list.tpl
new file mode 100644
index 0000000000..538f6affbd
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/mail_list.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	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>
+	</div>
+	<div class="mail-list-detail">
+		<div class="mail-list-sender-name" >{{$from_name}}</div>
+		<div class="mail-list-date">{{$date}}</div>
+		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
+		<a href="message/dropconv/{{$id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/dropconv/{{$id}}')});"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" id="mail-list-delete-{{$id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
+	</div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/decaf-mobile/templates/manage.tpl b/view/theme/decaf-mobile/templates/manage.tpl
new file mode 100644
index 0000000000..f7d72f653b
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/manage.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+<div id="identity-manage-desc">{{$desc}}</div>
+<div id="identity-manage-choose">{{$choose}}</div>
+<div id="identity-selector-wrapper">
+	<form action="manage" method="post" >
+	<select name="identity" size="4" onchange="this.form.submit();" >
+
+	{{foreach $identities as $id}}
+		<option {{$id.selected}} value="{{$id.uid}}">{{$id.username}} ({{$id.nickname}})</option>
+	{{/foreach}}
+
+	</select>
+	<div id="identity-select-break"></div>
+
+	{{* name="submit" interferes with this.form.submit() *}}
+	<input id="identity-submit" type="submit" {{*name="submit"*}} value="{{$submit}}" />
+</div></form>
+
diff --git a/view/theme/decaf-mobile/templates/message-end.tpl b/view/theme/decaf-mobile/templates/message-end.tpl
new file mode 100644
index 0000000000..adeea280c7
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/message-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/decaf-mobile/templates/message-head.tpl b/view/theme/decaf-mobile/templates/message-head.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/message-head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/decaf-mobile/templates/moderated_comment.tpl b/view/theme/decaf-mobile/templates/moderated_comment.tpl
new file mode 100644
index 0000000000..b2401ca483
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/moderated_comment.tpl
@@ -0,0 +1,66 @@
+{{*
+ *	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}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
+					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
+					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
+					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
+					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
+					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
+				</div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>			
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/decaf-mobile/templates/msg-end.tpl b/view/theme/decaf-mobile/templates/msg-end.tpl
new file mode 100644
index 0000000000..594f3f79b9
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/msg-end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	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/decaf-mobile/templates/msg-header.tpl b/view/theme/decaf-mobile/templates/msg-header.tpl
new file mode 100644
index 0000000000..8447bb3006
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/msg-header.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+{{*/*	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	var plaintext = "none";
+	window.autocompleteType = 'msg-header';*/*}}
+	window.jotId = "#prvmail-text";
+	window.imageUploadButton = 'prvmail-upload';
+</script>
+
diff --git a/view/theme/decaf-mobile/templates/nav.tpl b/view/theme/decaf-mobile/templates/nav.tpl
new file mode 100644
index 0000000000..87d0bdec7e
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/nav.tpl
@@ -0,0 +1,160 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+{{*<!--	{{$langselector}} -->*}}
+
+{{*<!--	<div id="site-location">{{$sitelocation}}</div> -->*}}
+
+	<span id="nav-link-wrapper" >
+
+{{*<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->*}}
+	<a href="{{$nav.navigation.0}}" title="{{$nav.navigation.3}}" >
+	<img rel="#system-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/menu.png">
+	</a>
+{{*<!--	</a>-->*}}
+	{{*<!--<ul id="system-menu-list" class="nav-menu-list">
+		{{if $nav.login}}
+		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
+		{{/if}}
+
+		{{if $nav.register}}
+		<a id="nav-register-link" class="nav-load-page-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>
+		{{/if}}
+
+		{{if $nav.settings}}
+		<li><a id="nav-settings-link" class="{{$nav.settings.2}} nav-load-page-link" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.manage}}
+		<li>
+		<a id="nav-manage-link" class="nav-load-page-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.profiles}}
+		<li><a id="nav-profiles-link" class="{{$nav.profiles.2}} nav-load-page-link" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.admin}}
+		<li><a id="nav-admin-link" class="{{$nav.admin.2}} nav-load-page-link" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>
+		{{/if}}
+
+		<li><a id="nav-search-link" class="{{$nav.search.2}} nav-load-page-link" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a></li>
+
+		{{if $nav.apps}}
+		<li><a id="nav-apps-link" class="{{$nav.apps.2}} nav-load-page-link" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.help}}
+		<li><a id="nav-help-link" class="{{$nav.help.2}} nav-load-page-link" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>
+		{{/if}}
+		
+		{{if $nav.logout}}
+		<li><a id="nav-logout-link" class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
+		{{/if}}
+	</ul>-->*}}
+	</div>
+
+	{{if $nav.notifications}}
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">-->*}}
+	<a href="{{$nav.notifications.all.0}}">
+	<img rel="#nav-notifications-menu" class="nav-link" src="view/theme/decaf-mobile/images/notifications.png">
+	</a>
+{{*<!--	</a>-->*}}
+	{{*<!--<span id="notify-update" class="nav-ajax-left"></span>
+	<ul id="nav-notifications-menu" class="notifications-menu-popup">
+		<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+		<li class="empty">{{$emptynotifications}}</li>
+	</ul>-->*}}
+	</div>
+	{{/if}}		
+
+{{*<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->*}}
+	{{if $nav.contacts}}
+	<div class="nav-button-container">
+{{*<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->*}}
+	<a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >
+	<img rel="#contacts-menu-list"  class="nav-link" src="view/theme/decaf-mobile/images/contacts.png">
+	</a>
+	{{*<!--</a>-->*}}
+	{{if $nav.introductions}}
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{*<!--<ul id="contacts-menu-list" class="nav-menu-list">
+		{{if $nav.contacts}}
+		<li><a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><li>
+		{{/if}}
+
+		<li><a id="nav-directory-link" class="{{$nav.directory.2}} nav-load-page-link" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><li>
+
+		{{if $nav.introductions}}
+		<li>
+		<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+		</li>
+		{{/if}}
+	</ul>-->*}}
+	</div>
+	{{/if}}
+
+	{{if $nav.messages}}
+{{*<!--	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->*}}
+	<div class="nav-button-container">
+	<a id="nav-messages-link" class="{{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
+	<img src="view/theme/decaf-mobile/images/message.png" class="nav-link">
+	</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	</div>
+	{{/if}}
+
+{{*<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->*}}
+	{{if $nav.network}}
+	<div class="nav-button-container">
+{{*<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->*}}
+	<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="/" >
+	<img rel="#network-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/network.png">
+	</a>
+{{*<!--	</a>-->*}}
+	<span id="net-update" class="nav-ajax-left"></span>
+	</div>
+	{{/if}}
+<!--	<ul id="network-menu-list" class="nav-menu-list">
+		{{if $nav.network}}
+		<li>
+		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.network}}
+		<li>
+		<a class="nav-menu-icon network-reset-link nav-link" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">{{$nav.net_reset.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.home}}
+		<li><a id="nav-home-link" class="{{$nav.home.2}} {{$sel.home}} nav-load-page-link" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.community}}
+		<li>
+		<a id="nav-community-link" class="{{$nav.community.2}} {{$sel.community}} nav-load-page-link" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+	</div>-->
+
+	</span>
+	{{*<!--<span id="nav-end"></span>-->*}}
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+{{*<!--<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>-->*}}
diff --git a/view/theme/decaf-mobile/templates/photo_drop.tpl b/view/theme/decaf-mobile/templates/photo_drop.tpl
new file mode 100644
index 0000000000..57f26cf52b
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/photo_drop.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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}}?confirm=1" onclick="return confirmDelete(function(){this.href='item/drop/{{$id}}'});" class="icon drophide" title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
+</div>
+<div class="wall-item-delete-end"></div>
diff --git a/view/theme/decaf-mobile/templates/photo_edit.tpl b/view/theme/decaf-mobile/templates/photo_edit.tpl
new file mode 100644
index 0000000000..1cff8f0448
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/photo_edit.tpl
@@ -0,0 +1,65 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
+
+	<input type="hidden" name="item_id" value="{{$item_id}}" />
+	<input id="photo-edit-form-confirm" type="hidden" name="confirm" value="1" />
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
+	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
+	</div>
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
+	<input id="photo-edit-caption" type="text" size="32" name="desc" value="{{$caption}}" />
+	</div>
+
+	<div id="photo-edit-caption-end"></div>
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
+	<input name="newtag" id="photo-edit-newtag" size="32" title="{{$help_tags}}" type="text" />
+	</div>
+
+	<div id="photo-edit-tags-end"></div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">{{$rotatecw}}</label>
+	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+	</div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">{{$rotateccw}}</label>
+	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		{{*<!--<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="{{$permissions}}"/>
+			<span id="jot-perms-icon" class="icon {{$lockstate}} photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
+		</a>
+		<div id="photo-edit-perms-menu-end"></div>
+		
+		<div style="display: none;">-->*}}
+			<div id="photo-edit-perms-select" >
+				{{*<!--{{$aclselect}}-->*}}
+				{{include file="acl_html_selector.tpl"}}
+			</div>
+		{{*<!--</div>-->*}}
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete(function(){remove('photo-edit-form-confirm');});" />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+
diff --git a/view/theme/decaf-mobile/templates/photo_edit_head.tpl b/view/theme/decaf-mobile/templates/photo_edit_head.tpl
new file mode 100644
index 0000000000..740c3b425a
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/photo_edit_head.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script>
+	window.prevLink = "{{$prevlink}}";
+	window.nextLink = "{{$nextlink}}";
+	window.photoEdit = true;
+
+</script>-->*}}
diff --git a/view/theme/decaf-mobile/templates/photo_view.tpl b/view/theme/decaf-mobile/templates/photo_view.tpl
new file mode 100644
index 0000000000..5ccb5fb163
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/photo_view.tpl
@@ -0,0 +1,47 @@
+{{*
+ *	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>
+
+<div id="photo-edit-link-wrap">
+{{if $tools}}
+<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
+|
+<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
+{{/if}}
+{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" {{*onclick="lockview(event,'photo/{{$id}}');"*}} /> {{/if}}
+</div>
+
+<div id="photo-nav">
+	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><img src="view/theme/decaf-mobile/images/arrow-left.png"></a></div>{{/if}}
+	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><img src="view/theme/decaf-mobile/images/arrow-right.png"></a></div>{{/if}}
+</div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo-end"></div>
+<div id="photo-caption">{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
+
+{{if $edit}}
+{{$edit}}
+{{else}}
+
+{{if $likebuttons}}
+<div id="photo-like-div">
+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
+</div>
+{{/if}}
+
+{{$comments}}
+
+{{$paginate}}
+{{/if}}
+
diff --git a/view/theme/decaf-mobile/templates/photos_head.tpl b/view/theme/decaf-mobile/templates/photos_head.tpl
new file mode 100644
index 0000000000..c8bfa62c1d
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/photos_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/photos_upload.tpl b/view/theme/decaf-mobile/templates/photos_upload.tpl
new file mode 100644
index 0000000000..9c22448dda
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/photos_upload.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$pagename}}</h3>
+
+<div id="photos-usage-message">{{$usage}}</div>
+
+<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
+		<select id="photos-upload-album-select" name="album">
+		{{$albumselect}}
+		</select>
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	{{$default_upload_box}}
+
+	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+	</div>
+
+
+	{{*<!--<div id="photos-upload-perms" class="photos-upload-perms" >
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
+		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
+		</a>
+	</div>
+	<div id="photos-upload-perms-end"></div>
+
+	<div style="display: none;">-->*}}
+		<div id="photos-upload-permissions-wrapper">
+			{{*<!--{{$aclselect}}-->*}}
+			{{include file="acl_html_selector.tpl"}}
+		</div>
+	{{*<!--</div>-->*}}
+
+	<div id="photos-upload-spacer"></div>
+
+	{{$alt_uploader}}
+
+	{{$default_upload_submit}}
+
+	<div class="photos-upload-end" ></div>
+</form>
+
diff --git a/view/theme/decaf-mobile/templates/profed_end.tpl b/view/theme/decaf-mobile/templates/profed_end.tpl
new file mode 100644
index 0000000000..e9c03543b1
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/profed_end.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script type="text/javascript" src="js/country.min.js" ></script>
+
+<script language="javascript" type="text/javascript">
+	Fill_Country('{{$country_name}}');
+	Fill_States('{{$region}}');
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/profed_head.tpl b/view/theme/decaf-mobile/templates/profed_head.tpl
new file mode 100644
index 0000000000..c8ce27bb83
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/profed_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script language="javascript" type="text/javascript">
+	window.editSelect = "none";
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/profile_edit.tpl b/view/theme/decaf-mobile/templates/profile_edit.tpl
new file mode 100644
index 0000000000..7583784fbf
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/profile_edit.tpl
@@ -0,0 +1,329 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$default}}
+
+<h1>{{$banner}}</h1>
+
+<div id="profile-edit-links">
+<ul>
+<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
+<li></li>
+<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+
+<div id="profile-edit-wrapper" >
+<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<div id="profile-edit-profile-name-wrapper" >
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
+<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
+</div>
+<div id="profile-edit-profile-name-end"></div>
+
+<div id="profile-edit-name-wrapper" >
+<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
+<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-pdesc-wrapper" >
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
+<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
+</div>
+<div id="profile-edit-pdesc-end"></div>
+
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
+{{$gender}}
+</div>
+<div id="profile-edit-gender-end"></div>
+
+<div id="profile-edit-dob-wrapper" >
+<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
+<div id="profile-edit-dob" >
+{{$dob}} {{$age}}
+</div>
+</div>
+<div id="profile-edit-dob-end"></div>
+
+{{$hide_friends}}
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
+<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" />
+</div>
+<div id="profile-edit-address-end"></div>
+
+<div id="profile-edit-locality-wrapper" >
+<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
+<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
+<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
+</div>
+<div id="profile-edit-postal-code-end"></div>
+
+<div id="profile-edit-country-name-wrapper" >
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
+<input type="text" size="28" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" />
+{{*<!--<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
+<option selected="selected" >{{$country_name}}</option>
+<option>temp</option>
+</select>-->*}}
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
+<input type="text" size="28" name="region" id="profile-edit-region" value="{{$region}}" />
+{{*<!--<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >{{$region}}</option>
+<option>temp</option>
+</select>-->*}}
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
+<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
+{{$marital}}
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
+<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
+<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
+
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
+{{$sexual}}
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
+<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+<div id="profile-edit-politic-wrapper" >
+<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
+<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
+<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
+<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
+</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
+<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
+</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
+<div id="profile-edit-prvkeywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" class="profile-jot-box">
+<p id="about-jot-desc" >
+{{$lbl_about}}
+</p>
+
+<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+
+
+<div id="interest-jot-wrapper" class="profile-jot-box" >
+<p id="interest-jot-desc" >
+{{$lbl_hobbies}}
+</p>
+
+<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+
+
+<div id="likes-jot-wrapper" class="profile-jot-box" >
+<p id="likes-jot-desc" >
+{{$lbl_likes}}
+</p>
+
+<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+
+
+<div id="dislikes-jot-wrapper" class="profile-jot-box" >
+<p id="dislikes-jot-desc" >
+{{$lbl_dislikes}}
+</p>
+
+<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+
+
+<div id="contact-jot-wrapper" class="profile-jot-box" >
+<p id="contact-jot-desc" >
+{{$lbl_social}}
+</p>
+
+<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" class="profile-jot-box" >
+<p id="music-jot-desc" >
+{{$lbl_music}}
+</p>
+
+<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+
+<div id="book-jot-wrapper" class="profile-jot-box" >
+<p id="book-jot-desc" >
+{{$lbl_book}}
+</p>
+
+<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+
+
+
+<div id="tv-jot-wrapper" class="profile-jot-box" >
+<p id="tv-jot-desc" >
+{{$lbl_tv}} 
+</p>
+
+<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+
+
+
+<div id="film-jot-wrapper" class="profile-jot-box" >
+<p id="film-jot-desc" >
+{{$lbl_film}}
+</p>
+
+<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" class="profile-jot-box" >
+<p id="romance-jot-desc" >
+{{$lbl_love}}
+</p>
+
+<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+
+
+
+<div id="work-jot-wrapper" class="profile-jot-box" >
+<p id="work-jot-desc" >
+{{$lbl_work}}
+</p>
+
+<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+
+
+
+<div id="education-jot-wrapper" class="profile-jot-box" >
+<p id="education-jot-desc" >
+{{$lbl_school}} 
+</p>
+
+<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+
diff --git a/view/theme/decaf-mobile/templates/profile_photo.tpl b/view/theme/decaf-mobile/templates/profile_photo.tpl
new file mode 100644
index 0000000000..6bcb3cf850
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/profile_photo.tpl
@@ -0,0 +1,24 @@
+{{*
+ *	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">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<div id="profile-photo-upload-wrapper">
+<label id="profile-photo-upload-label" for="profile-photo-upload">{{$lbl_upfile}} </label>
+<input name="userfile" type="file" id="profile-photo-upload" size="25" />
+</div>
+
+<div id="profile-photo-submit-wrapper">
+<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+</div>
+
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+{{$select}}
+</div>
diff --git a/view/theme/decaf-mobile/templates/profile_vcard.tpl b/view/theme/decaf-mobile/templates/profile_vcard.tpl
new file mode 100644
index 0000000000..85c6345d6d
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/profile_vcard.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="fn label">{{$profile.name}}</div>
+	
+				
+	
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+
+
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-vcard-break"></div>	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/decaf-mobile/templates/prv_message.tpl b/view/theme/decaf-mobile/templates/prv_message.tpl
new file mode 100644
index 0000000000..6372d306ae
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/prv_message.tpl
@@ -0,0 +1,48 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h3>{{$header}}</h3>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="message" method="post" >
+
+{{$parent}}
+
+<div id="prvmail-to-label">{{$to}}</div>
+
+{{if $showinputs}}
+<input type="text" id="recip" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+{{else}}
+{{$select}}
+{{/if}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
+	<div id="prvmail-upload-wrapper"  style="display: none;">
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	</div> 
+	{{*<!--<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div>-->*}} 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
+
+<script>
+document.getElementById('prvmail-upload-wrapper').style.display = "inherit";
+</script>
diff --git a/view/theme/decaf-mobile/templates/register.tpl b/view/theme/decaf-mobile/templates/register.tpl
new file mode 100644
index 0000000000..3f64bb6725
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/register.tpl
@@ -0,0 +1,85 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class='register-form'>
+<h2>{{$regtitle}}</h2>
+<br />
+
+<form action="register" method="post" id="register-form">
+
+	<input type="hidden" name="photo" value="{{$photo}}" />
+
+	{{$registertext}}
+
+	<p id="register-realpeople">{{$realpeople}}</p>
+
+	<br />
+{{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>
+	</div>
+
+	<br /><br />
+
+{{if $invitations}}
+
+	<p id="register-invite-desc">{{$invite_desc}}</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{/if}}
+
+
+	<div id="register-name-wrapper" class="field input" >
+		<label for="register-name" id="label-register-name" >{{$namelabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+
+	<div id="register-email-wrapper"  class="field input" >
+		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
+	</div>
+	<div id="register-email-end" ></div>
+
+	<div id="register-nickname-wrapper" class="field input" >
+		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" >
+	</div>
+	<div id="register-nickname-end" ></div>
+
+	<div class="register-explain-wrapper">
+	<p id="register-nickname-desc" >{{$nickdesc}}</p>
+	</div>
+
+	{{$publish}}
+
+	<div id="register-footer">
+	{{*<!--<div class="agreement">
+	By clicking '{{$regbutt}}' you are agreeing to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>-->*}}
+	<br />
+
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
+	</div>
+	<div id="register-submit-end" ></div>
+	</div>
+</form>
+<br /><br /><br />
+
+{{$license}}
+
+</div>
diff --git a/view/theme/decaf-mobile/templates/search_item.tpl b/view/theme/decaf-mobile/templates/search_item.tpl
new file mode 100644
index 0000000000..a6da44d3d6
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/search_item.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	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}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			{{*<!--<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>-->*}}
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" {{*onclick="lockview(event,{{$item.id}});" *}}/>{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		{{*<!--<div class="wall-item-author">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
+				
+		{{*<!--</div>-->*}}
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/{{$item.id}}')});" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>{{/if}}
+			{{*<!--</div>-->*}}
+				{{*<!--{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}-->*}}
+			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
+		</div>
+	</div>
+	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
+
+
+	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
+	</div>
+
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
+
+{{*<!--</div>-->*}}
+
+
diff --git a/view/theme/decaf-mobile/templates/settings-head.tpl b/view/theme/decaf-mobile/templates/settings-head.tpl
new file mode 100644
index 0000000000..c8bfa62c1d
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/settings-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/settings.tpl b/view/theme/decaf-mobile/templates/settings.tpl
new file mode 100644
index 0000000000..587b96e28e
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/settings.tpl
@@ -0,0 +1,156 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$ptitle}}</h1>
+
+{{$nickname_block}}
+
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<h3 class="settings-heading">{{$h_pass}}</h3>
+
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
+{{include file="field_password.tpl" field=$password3}}
+
+{{if $oid_enable}}
+{{include file="field_input.tpl" field=$openid}}
+{{/if}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_basic}}</h3>
+
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_input.tpl" field=$email}}
+{{include file="field_password.tpl" field=$password4}}
+{{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_input.tpl" field=$defloc}}
+{{include file="field_checkbox.tpl" field=$allowloc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_prv}}</h3>
+
+
+<input type="hidden" name="visibility" value="{{$visibility}}" />
+
+{{include file="field_input.tpl" field=$maxreq}}
+
+{{$profile_in_dir}}
+
+{{$profile_in_net_dir}}
+
+{{$hide_friends}}
+
+{{$hide_wall}}
+
+{{$blockwall}}
+
+{{$blocktags}}
+
+{{$suggestme}}
+
+{{$unkmail}}
+
+
+{{include file="field_input.tpl" field=$cntunkmail}}
+
+{{include file="field_input.tpl" field=$expire.days}}
+
+
+<div class="field input">
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="{{$expire.advanced}}">{{$expire.label}}</a></span>
+	<div style="display: none;">
+		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+			<h3>{{$expire.advanced}}</h3>
+			{{include file="field_yesno.tpl" field=$expire.items}}
+			{{include file="field_yesno.tpl" field=$expire.notes}}
+			{{include file="field_yesno.tpl" field=$expire.starred}}
+			{{include file="field_yesno.tpl" field=$expire.network_only}}
+		</div>
+	</div>
+
+</div>
+
+
+<div id="settings-perms-wrapper" class="field">
+<label for="settings-default-perms">{{$settings_perms}}</label><br/>
+<div id="settings-default-perms" class="settings-default-perms" >
+{{*<!--	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
+	
+	<div style="display: none;">-->*}}
+		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
+			{{*<!--{{$aclselect}}-->*}}
+			{{include file="acl_html_selector.tpl"}}
+		</div>
+{{*<!--	</div>
+
+	</div>-->*}}
+</div>
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+{{$group_select}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+
+<h3 class="settings-heading">{{$h_not}}</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">{{$activity_options}}</div>
+
+{{include file="field_checkbox.tpl" field=$post_newfriend}}
+{{include file="field_checkbox.tpl" field=$post_joingroup}}
+{{include file="field_checkbox.tpl" field=$post_profilechange}}
+
+
+<div id="settings-notify-desc">{{$lbl_not}}</div>
+
+<div class="group">
+{{include file="field_intcheckbox.tpl" field=$notify1}}
+{{include file="field_intcheckbox.tpl" field=$notify2}}
+{{include file="field_intcheckbox.tpl" field=$notify3}}
+{{include file="field_intcheckbox.tpl" field=$notify4}}
+{{include file="field_intcheckbox.tpl" field=$notify5}}
+{{include file="field_intcheckbox.tpl" field=$notify6}}
+{{include file="field_intcheckbox.tpl" field=$notify7}}
+{{include file="field_intcheckbox.tpl" field=$notify8}}
+</div>
+
+</div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_advn}}</h3>
+<div id="settings-pagetype-desc">{{$h_descadvn}}</div>
+
+{{$pagetype}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
diff --git a/view/theme/decaf-mobile/templates/settings_display_end.tpl b/view/theme/decaf-mobile/templates/settings_display_end.tpl
new file mode 100644
index 0000000000..4b3db00f5a
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/settings_display_end.tpl
@@ -0,0 +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/decaf-mobile/templates/suggest_friends.tpl b/view/theme/decaf-mobile/templates/suggest_friends.tpl
new file mode 100644
index 0000000000..7221dc6898
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/suggest_friends.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	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}}">
+			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
+	<a href="{{$ignlnk}}&confirm=1" title="{{$ignore}}" class="icon drophide profile-match-ignore" id="profile-match-drop-{{$ignid}}" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);"*}} onclick="id=this.id;return confirmDelete(function(){changeHref(id, '{{$ignlnk}}')});" ></a>
+</div>
diff --git a/view/theme/decaf-mobile/templates/threaded_conversation.tpl b/view/theme/decaf-mobile/templates/threaded_conversation.tpl
new file mode 100644
index 0000000000..e90caf5a70
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/threaded_conversation.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{if $mode == display}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{else}}
+{{include file="wall_thread_toponly.tpl" item=$thread}}
+{{/if}}
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
diff --git a/view/theme/decaf-mobile/templates/voting_fakelink.tpl b/view/theme/decaf-mobile/templates/voting_fakelink.tpl
new file mode 100644
index 0000000000..1e073916e1
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/voting_fakelink.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	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/decaf-mobile/templates/wall_thread.tpl b/view/theme/decaf-mobile/templates/wall_thread.tpl
new file mode 100644
index 0000000000..058ae43cc5
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/wall_thread.tpl
@@ -0,0 +1,124 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			{{*<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
+			{{*<!--<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                        {{$item.item_photo_menu}}
+                    </ul>
+                </div>-->*}}
+
+			{{*<!--</div>-->*}}
+			{{*<!--<div class="wall-item-photo-end"></div>-->*}}
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" {{*onclick="lockview(event,{{$item.id}});"*}} />{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		{{*<!--<div class="wall-item-author">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>				
+		{{*<!--</div>-->*}}
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+					{{*<!--<div class="body-tag">-->*}}
+						{{foreach $item.tags as $tag}}
+							<span class='body-tag tag'>{{$tag}}</span>
+						{{/foreach}}
+					{{*<!--</div>-->*}}
+			{{if $item.has_cats}}
+			<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="like/{{$item.id}}?verb=like&return={{$return_path}}#{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" ></a>
+				{{if $item.vote.dislike}}
+				<a href="like/{{$item.id}}?verb=dislike&return={{$return_path}}#{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" ></a>
+				{{/if}}
+				{{*<!--{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}-->*}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				{{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="starred/{{$item.id}}?return={{$return_path}}#{{$item.id}}" id="starred-{{$item.id}}" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{*<!--{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}-->*}}
+			{{*<!--{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}			-->*}}
+			
+			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/{{$item.id}}')});" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>{{/if}}
+			{{*<!--</div>-->*}}
+				{{*<!--{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}-->*}}
+			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
+		</div>
+	</div>	
+	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
+	<div class="wall-item-like wall-item-like-full {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike wall-item-dislike-full {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+
+	{{if $item.threaded}}
+	{{if $item.comment}}
+	{{*<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->*}}
+		{{$item.comment}}
+	{{*<!--</div>-->*}}
+	{{/if}}
+	{{/if}}
+
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
+{{*<!--</div>-->*}}
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+{{*<!--<div class="wall-item-comment-wrapper" >-->*}}
+	{{$item.comment}}
+{{*<!--</div>-->*}}
+{{/if}}
+</div>
+
diff --git a/view/theme/decaf-mobile/templates/wall_thread_toponly.tpl b/view/theme/decaf-mobile/templates/wall_thread_toponly.tpl
new file mode 100644
index 0000000000..af8626a844
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/wall_thread_toponly.tpl
@@ -0,0 +1,106 @@
+{{*
+ *	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>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}-->
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" {{*onclick="lockview(event,{{$item.id}});"*}} />
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>				
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+						{{foreach $item.tags as $tag}}
+							<span class='body-tag tag'>{{$tag}}</span>
+						{{/foreach}}
+			{{if $item.has_cats}}
+			<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="like/{{$item.id}}?verb=like&return={{$return_path}}#{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" ></a>
+				{{if $item.vote.dislike}}
+				<a href="like/{{$item.id}}?verb=dislike&return={{$return_path}}#{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" ></a>
+				{{/if}}
+				{{*<!--{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}-->*}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="starred/{{$item.id}}?return={{$return_path}}#{{$item.id}}" id="starred-{{$item.id}}" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{*<!--{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}			-->*}}
+			
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/{{$item.id}}')});" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>{{/if}}
+				{{*<!--{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}-->*}}
+		</div>
+	</div>	
+	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+
+	<div class="hide-comments-outer">
+	<a href="display/{{$user.nickname}}/{{$item.id}}"><span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.total_comments_num}} {{$item.total_comments_text}}</span></a>
+	</div>
+<!--	{{if $item.threaded}}
+	{{if $item.comment}}
+		{{$item.comment}}
+	{{/if}}
+	{{/if}}
+
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+	{{$item.comment}}
+{{/if}}-->
+</div>
+<!--{{if $item.comment_lastcollapsed}}</div>{{/if}}-->
+
diff --git a/view/theme/decaf-mobile/templates/wallmessage.tpl b/view/theme/decaf-mobile/templates/wallmessage.tpl
new file mode 100644
index 0000000000..4cba900917
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/wallmessage.tpl
@@ -0,0 +1,37 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h3>{{$header}}</h3>
+
+<h4>{{$subheader}}</h4>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="wallmessage/{{$nickname}}" method="post" >
+
+{{$parent}}
+
+<div id="prvmail-to-label">{{$to}}</div>
+{{$recipname}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
+	{{*<!--<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> -->*}}
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/theme/decaf-mobile/templates/wallmsg-end.tpl b/view/theme/decaf-mobile/templates/wallmsg-end.tpl
new file mode 100644
index 0000000000..594f3f79b9
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/wallmsg-end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	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/decaf-mobile/templates/wallmsg-header.tpl b/view/theme/decaf-mobile/templates/wallmsg-header.tpl
new file mode 100644
index 0000000000..e6f1c6737e
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/wallmsg-header.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+{{*//window.editSelect = "none";*}}
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
+</script>
+
diff --git a/view/theme/diabook/templates/admin_users.tpl b/view/theme/diabook/templates/admin_users.tpl
new file mode 100644
index 0000000000..8127944a33
--- /dev/null
+++ b/view/theme/diabook/templates/admin_users.tpl
@@ -0,0 +1,93 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+		        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.created}}</td>
+					<td class="name">{{$u.name}}</td>
+					<td class="email">{{$u.email}}</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='icon like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+						<td class="tools" style="width:60px;">
+							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+							<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon ad_drop'></span></a>
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/theme/diabook/templates/bottom.tpl b/view/theme/diabook/templates/bottom.tpl
new file mode 100644
index 0000000000..7d8f63d169
--- /dev/null
+++ b/view/theme/diabook/templates/bottom.tpl
@@ -0,0 +1,160 @@
+{{*
+ *	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">
+
+$(document).ready(function() {
+    $("iframe").each(function(){
+        var ifr_source = $(this).attr("src");
+        var wmode = "wmode=transparent";
+        if(ifr_source.indexOf("?") != -1) {
+            var getQString = ifr_source.split("?");
+            var oldString = getQString[1];
+            var newString = getQString[0];
+            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
+        }
+        else $(this).attr("src",ifr_source+"?"+wmode);
+       
+    });
+    
+    $("div#pause").attr("style", "position: fixed;bottom: 43px;left: 5px;");
+    $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
+    $(document).keydown(function(event) {
+    if (!$("div#pause").html()){
+    $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
+		}});  
+    $(".autocomplete").attr("style", "width: 350px;color: black;border: 1px solid #D2D2D2;background: white;cursor: pointer;text-align: left;max-height: 350px;overflow: auto;");
+	 
+	});
+	
+	$(document).ready(function(){
+		$("#sortable_boxes").sortable({
+			update: function(event, ui) {
+				var BoxOrder = $(this).sortable("toArray").toString();
+				$.cookie("Boxorder", BoxOrder , { expires: 365, path: "/" });
+			}
+		});
+
+    	var cookie = $.cookie("Boxorder");		
+    	if (!cookie) return;
+    	var SavedID = cookie.split(",");
+	   for (var Sitem=0, m = SavedID.length; Sitem < m; Sitem++) {
+           $("#sortable_boxes").append($("#sortable_boxes").children("#" + SavedID[Sitem]));
+	       }
+	     
+	});
+	
+	
+	function tautogrow(id){
+		$("textarea#comment-edit-text-" +id).autogrow(); 	
+ 	};
+ 	
+ 	function open_boxsettings() {
+		$("div#boxsettings").attr("style","display: block;height:500px;width:300px;");
+		$("label").attr("style","width: 150px;");
+		};
+ 	
+	function yt_iframe() {
+	$("iframe").load(function() { 
+	var ifr_src = $(this).contents().find("body iframe").attr("src");
+	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
+    });
+
+	};
+
+	function scrolldown(){
+			$("html, body").animate({scrollTop:$(document).height()}, "slow");
+			return false;
+		};
+		
+	function scrolltop(){
+			$("html, body").animate({scrollTop:0}, "slow");
+			return false;
+		};
+	 	
+	$(window).scroll(function () { 
+		
+		var footer_top = $(document).height() - 30;
+		$("div#footerbox").css("top", footer_top);
+	
+		var scrollInfo = $(window).scrollTop();      
+		
+		if (scrollInfo <= "900"){
+      $("a#top").attr("id","down");
+      $("a#down").attr("onclick","scrolldown()");
+	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
+	 	$("img#scroll_top_bottom").attr("title","Scroll to bottom");
+	 	} 
+	 	    
+      if (scrollInfo > "900"){
+      $("a#down").attr("id","top");
+      $("a#top").attr("onclick","scrolltop()");
+	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
+	 	$("img#scroll_top_bottom").attr("title","Back to top");
+	 	}
+		
+    });
+  
+
+	function insertFormatting(comment,BBcode,id) {
+	
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == comment) {
+			tmpStr = "";
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+								}
+
+	textarea = document.getElementById("comment-edit-text-" +id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		if (BBcode == "url"){
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+			} else			
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		if (BBcode == "url"){
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+			} else
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+	}
+	return true;
+	}
+
+	function cmtBbOpen(id) {
+	$(".comment-edit-bb-" + id).show();
+	}
+	function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+	}
+	
+	/*$(document).ready(function(){
+	var doctitle = document.title;
+	function checkNotify() {
+	if(document.getElementById("notify-update").innerHTML != "")
+	document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
+	else
+	document.title = doctitle;
+	};
+	setInterval(function () {checkNotify();}, 10 * 1000);
+	})*/
+</script>
+<script>
+var pagetitle = null;
+$("nav").bind('nav-update',  function(e,data){
+  if (pagetitle==null) pagetitle = document.title;
+  var count = $(data).find('notif').attr('count');
+  if (count>0) {
+    document.title = "("+count+") "+pagetitle;
+  } else {
+    document.title = pagetitle;
+  }
+});
+</script>
diff --git a/view/theme/diabook/templates/ch_directory_item.tpl b/view/theme/diabook/templates/ch_directory_item.tpl
new file mode 100644
index 0000000000..2d2d968ca4
--- /dev/null
+++ b/view/theme/diabook/templates/ch_directory_item.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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>
+		</div>
+	</div>
+</div>
diff --git a/view/theme/diabook/templates/comment_item.tpl b/view/theme/diabook/templates/comment_item.tpl
new file mode 100644
index 0000000000..a03d0f2a64
--- /dev/null
+++ b/view/theme/diabook/templates/comment_item.tpl
@@ -0,0 +1,48 @@
+{{*
+ *	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}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});tautogrow({{$id}});cmtBbOpen({{$id}});"  >{{$comment}}</textarea>
+				<div class="comment-edit-bb-{{$id}}" style="display:none;">				
+				<a class="icon bb-image" style="cursor: pointer;" title="{{$edimg}}" onclick="insertFormatting('{{$comment}}','img',{{$id}});">img</a>	
+				<a class="icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});">url</a>
+				<a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});">video</a>														
+				<a class="icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});">u</a>
+				<a class="icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});">i</a>
+				<a class="icon bold" style="cursor: pointer;"  title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});">b</a>
+				<a class="icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});">quote</a>																			
+				</div>				
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
+					</select>
+				{{/if}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/diabook/templates/communityhome.tpl b/view/theme/diabook/templates/communityhome.tpl
new file mode 100644
index 0000000000..197577f309
--- /dev/null
+++ b/view/theme/diabook/templates/communityhome.tpl
@@ -0,0 +1,177 @@
+{{*
+ *	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" >
+{{include file="field_input.tpl" field=$TSearchTerm}}
+<div class="settings-submit-wrapper">
+<input id="twittersub" type="submit" value="{{$sub}}" class="settings-submit" name="diabook-settings-sub"></input>
+</div>
+</form>
+</div>
+
+<div id="mapcontrol" style="display:none;">
+<form id="mapform" action="network" method="post" >
+<div id="layermanager" style="width: 350px;position: relative;float: right;right:20px;height: 300px;"></div>
+<div id="map2" style="height:350px;width:350px;"></div>
+<div id="mouseposition" style="width: 350px;"></div>
+{{include file="field_input.tpl" field=$ELZoom}}
+{{include file="field_input.tpl" field=$ELPosX}}
+{{include file="field_input.tpl" field=$ELPosY}}
+<div class="settings-submit-wrapper">
+<input id="mapsub" type="submit" value="{{$sub}}" class="settings-submit" name="diabook-settings-map-sub"></input>
+</div>
+<span style="width: 500px;"><p>this ist still under development. 
+the idea is to provide a map with different layers(e.g. earth population, atomic power plants, wheat growing acreages, sunrise or what you want) 
+and markers(events, demos, friends, anything, that is intersting for you). 
+These layer and markers should be importable and deletable by the user.</p>
+<p>help on this feature is very appreciated. i am not that good in js so it's a start, but needs tweaks and further dev.
+just contact me, if you are intesrested in joining</p>
+<p>https://toktan.org/profile/thomas</p>
+<p>this is build with <b>mapquery</b> http://mapquery.org/ and 
+<b>openlayers</b>http://openlayers.org/</p>
+</span>
+</form>
+</div>
+
+<div id="boxsettings" style="display:none">
+<form id="boxsettingsform" action="network" method="post" >
+<fieldset><legend>{{$boxsettings.title.1}}</legend>
+{{include file="field_select.tpl" field=$close_pages}}
+{{include file="field_select.tpl" field=$close_profiles}}
+{{include file="field_select.tpl" field=$close_helpers}}
+{{include file="field_select.tpl" field=$close_services}}
+{{include file="field_select.tpl" field=$close_friends}}
+{{include file="field_select.tpl" field=$close_lastusers}}
+{{include file="field_select.tpl" field=$close_lastphotos}}
+{{include file="field_select.tpl" field=$close_lastlikes}}
+{{include file="field_select.tpl" field=$close_twitter}}
+{{include file="field_select.tpl" field=$close_mapquery}}
+<div class="settings-submit-wrapper">
+<input id="boxsub" type="submit" value="{{$sub}}" class="settings-submit" name="diabook-settings-box-sub"></input>
+</div>
+</fieldset>
+</form>
+</div>
+
+<div id="pos_null" style="margin-bottom:-30px;">
+</div>
+
+<div id="sortable_boxes">
+
+<div id="close_pages" style="margin-top:30px;">
+{{if $page}}
+<div>{{$page}}</div>
+{{/if}}
+</div>
+
+<div id="close_profiles">
+{{if $comunity_profiles_title}}
+<h3>{{$comunity_profiles_title}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<div id='lastusers-wrapper' class='items-wrapper'>
+{{foreach $comunity_profiles_items as $i}}
+	{{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+</div>
+
+<div id="close_helpers">
+{{if $helpers}}
+<h3>{{$helpers.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<a href="http://friendica.com/resources" title="How-to's" style="margin-left: 10px; " target="blank">How-To Guides</a><br>
+<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
+<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
+{{/if}}
+</div>
+
+<div id="close_services">
+{{if $con_services}}
+<h3>{{$con_services.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
+<a href="{{$url}}/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
+<a href="{{$url}}/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
+<a href="{{$url}}/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>
+<a href="{{$url}}/settings/connectors"><img alt="Posterous" src="view/theme/diabook/icons/posterous.png?" title="Posterous"></a>
+<a href="{{$url}}/settings/connectors"><img alt="Tumblr" src="view/theme/diabook/icons/tumblr.png?" title="Tumblr"></a>
+<a href="{{$url}}/settings/connectors"><img alt="Twitter" src="view/theme/diabook/icons/twitter.png?" title="Twitter"></a>
+<a href="{{$url}}/settings/connectors"><img alt="WordPress" src="view/theme/diabook/icons/wordpress.png?" title="WordPress"></a>
+<a href="{{$url}}/settings/connectors"><img alt="E-Mail" src="view/theme/diabook/icons/email.png?" title="E-Mail"></a>
+</div>
+{{/if}}
+</div>
+
+<div id="close_friends" style="margin-bottom:53px;">
+{{if $nv}}
+<h3>{{$nv.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<a class="{{$nv.directory.2}}" href="{{$nv.directory.0}}" style="margin-left: 10px; " title="{{$nv.directory.3}}" >{{$nv.directory.1}}</a><br>
+<a class="{{$nv.global_directory.2}}" href="{{$nv.global_directory.0}}" target="blank" style="margin-left: 10px; " title="{{$nv.global_directory.3}}" >{{$nv.global_directory.1}}</a><br>
+<a class="{{$nv.match.2}}" href="{{$nv.match.0}}" style="margin-left: 10px; " title="{{$nv.match.3}}" >{{$nv.match.1}}</a><br>
+<a class="{{$nv.suggest.2}}" href="{{$nv.suggest.0}}" style="margin-left: 10px; " title="{{$nv.suggest.3}}" >{{$nv.suggest.1}}</a><br>
+<a class="{{$nv.invite.2}}" href="{{$nv.invite.0}}" style="margin-left: 10px; " title="{{$nv.invite.3}}" >{{$nv.invite.1}}</a>
+{{$nv.search}}
+{{/if}}
+</div>
+
+<div id="close_lastusers">
+{{if $lastusers_title}}
+<h3>{{$lastusers_title}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<div id='lastusers-wrapper' class='items-wrapper'>
+{{foreach $lastusers_items as $i}}
+	{{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+</div>
+
+{{if $activeusers_title}}
+<h3>{{$activeusers_title}}</h3>
+<div class='items-wrapper'>
+{{foreach $activeusers_items as $i}}
+	{{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+
+<div id="close_lastphotos">
+{{if $photos_title}}
+<h3>{{$photos_title}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<div id='ra-photos-wrapper' class='items-wrapper'>
+{{foreach $photos_items as $i}}
+	{{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+</div>
+
+<div id="close_lastlikes">
+{{if $like_title}}
+<h3>{{$like_title}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<ul id='likes'>
+{{foreach $like_items as $i}}
+	<li id='ra-photos-wrapper'>{{$i}}</li>
+{{/foreach}}
+</ul>
+{{/if}}
+</div>
+
+<div id="close_twitter">
+<h3 style="height:1.17em">{{$twitter.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<div id="twitter">
+</div>
+</div>
+
+<div id="close_mapquery">
+{{if $mapquery}}
+<h3>{{$mapquery.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<div id="map" style="height:165px;width:165px;margin-left:3px;margin-top:3px;margin-bottom:1px;">
+</div>
+<div style="font-size:9px;margin-left:3px;">Data CC-By-SA by <a href="http://openstreetmap.org/">OpenStreetMap</a></div>
+{{/if}}
+</div>
+</div>
diff --git a/view/theme/diabook/templates/contact_template.tpl b/view/theme/diabook/templates/contact_template.tpl
new file mode 100644
index 0000000000..8e0e1acc7f
--- /dev/null
+++ b/view/theme/diabook/templates/contact_template.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	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" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
+
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
+
+			{{if $contact.photo_menu}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                    <ul>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/diabook/templates/directory_item.tpl b/view/theme/diabook/templates/directory_item.tpl
new file mode 100644
index 0000000000..5394287642
--- /dev/null
+++ b/view/theme/diabook/templates/directory_item.tpl
@@ -0,0 +1,47 @@
+{{*
+ *	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 photo" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" />
+			</a>
+		</div>
+	</div>
+	<div class="directory-profile-wrapper" id="directory-profile-wrapper-{{$id}}" >
+		<div class="contact-name" id="directory-name-{{$id}}">{{$name}}</div>
+		<div class="page-type">{{$page_type}}</div>
+		{{if $pdesc}}<div class="directory-profile-title">{{$profile.pdesc}}</div>{{/if}}
+    	<div class="directory-detailcolumns-wrapper" id="directory-detailcolumns-wrapper-{{$id}}">
+        	<div class="directory-detailscolumn-wrapper" id="directory-detailscolumn1-wrapper-{{$id}}">	
+			{{if $location}}
+			    <dl class="location"><dt class="location-label">{{$location}}</dt>
+				<dd class="adr">
+					{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+					<span class="city-state-zip">
+						<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+						<span class="region">{{$profile.region}}</span>
+						<span class="postal-code">{{$profile.postal_code}}</span>
+					</span>
+					{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+				</dd>
+				</dl>
+			{{/if}}
+
+			{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+			</div>	
+			<div class="directory-detailscolumn-wrapper" id="directory-detailscolumn2-wrapper-{{$id}}">	
+				{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+				{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+			</div>
+		</div>
+	  	<div class="directory-copy-wrapper" id="directory-copy-wrapper-{{$id}}" >
+			{{if $about}}<dl class="directory-copy"><dt class="directory-copy-label">{{$about}}</dt><dd class="directory-copy-data">{{$profile.about}}</dd></dl>{{/if}}
+  		</div>
+	</div>
+</div>
diff --git a/view/theme/diabook/templates/footer.tpl b/view/theme/diabook/templates/footer.tpl
new file mode 100644
index 0000000000..459a229fa9
--- /dev/null
+++ b/view/theme/diabook/templates/footer.tpl
@@ -0,0 +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/templates/generic_links_widget.tpl b/view/theme/diabook/templates/generic_links_widget.tpl
new file mode 100644
index 0000000000..1e0805acaa
--- /dev/null
+++ b/view/theme/diabook/templates/generic_links_widget.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	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}}
+	
+	<ul  class="rs_tabs">
+		{{foreach $items as $item}}
+			<li><a href="{{$item.url}}" class="rs_tab button {{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/diabook/templates/group_side.tpl b/view/theme/diabook/templates/group_side.tpl
new file mode 100644
index 0000000000..45f2e171f1
--- /dev/null
+++ b/view/theme/diabook/templates/group_side.tpl
@@ -0,0 +1,39 @@
+{{*
+ *	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>
+	</div>
+
+	<div id="sidebar-group-list">
+		<ul class="menu-profile-side">
+			{{foreach $groups as $group}}
+			<li class="menu-profile-list">
+				<a href="{{$group.href}}" class="menu-profile-list-item">
+					<span class="menu-profile-icon {{if $group.selected}}group_selected{{else}}group_unselected{{/if}}"></span>
+					{{$group.text}}
+				</a>
+				{{if $group.edit}}
+					<a href="{{$group.edit.href}}" class="action"><span class="icon text_edit" ></span></a>
+				{{/if}}
+				{{if $group.cid}}
+					<input type="checkbox" 
+						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
+						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
+						{{if $group.ismember}}checked="checked"{{/if}}
+					/>
+				{{/if}}
+			</li>
+			{{/foreach}}
+		</ul>
+	</div>
+  {{if $ungrouped}}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">{{$ungrouped}}</a>
+  </div>
+  {{/if}}
+</div>	
+
diff --git a/view/theme/diabook/templates/jot.tpl b/view/theme/diabook/templates/jot.tpl
new file mode 100644
index 0000000000..aa57d17570
--- /dev/null
+++ b/view/theme/diabook/templates/jot.tpl
@@ -0,0 +1,92 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none">
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
+		{{/if}}
+		<div id="character-counter" class="grey"></div>		
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="{{$upload}}"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="{{$attach}}"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="weblink" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-video" class="video2" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-audio" class="audio2" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-location" class="globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
+		<a id="profile-nolocation" class="noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="{{$share}}" />
+  
+   <span onclick="preview_post();" id="jot-preview-link" class="tab button">{{$preview}}</span>
+   
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	</div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+	
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
+	</div>
+   <div id="profile-jot-perms-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$acl}}
+			<hr style="clear:both;"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			<div id="profile-jot-email-end"></div>
+			{{$jotnets}}
+		</div>
+	</div>
+
+
+
+
+</form>
+</div>
+		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/diabook/templates/login.tpl b/view/theme/diabook/templates/login.tpl
new file mode 100644
index 0000000000..797c33ff94
--- /dev/null
+++ b/view/theme/diabook/templates/login.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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" />
+
+	<div id="login_standard">
+	{{include file="field_input.tpl" field=$lname}}
+	{{include file="field_password.tpl" field=$lpassword}}
+	</div>
+	
+	{{if $openid}}
+			<div id="login_openid">
+			{{include file="field_openid.tpl" field=$lopenid}}
+			</div>
+	{{/if}}
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
+	</div>
+	
+   <div id="login-extra-links">
+		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
+        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+	</div>	
+	
+	{{foreach $hiddens as $k=>$v}}
+		<input type="hidden" name="{{$k}}" value="{{$v}}" />
+	{{/foreach}}
+	
+	
+</form>
+
+
+<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
diff --git a/view/theme/diabook/templates/mail_conv.tpl b/view/theme/diabook/templates/mail_conv.tpl
new file mode 100644
index 0000000000..915d4c13a7
--- /dev/null
+++ b/view/theme/diabook/templates/mail_conv.tpl
@@ -0,0 +1,65 @@
+{{*
+ *	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">
+			<div class="contact-photo-wrapper"
+				<a href="{{$mail.profile_url}}" target="redir" title="{{$mail.from_name}}" class="contact-photo-link" id="wall-item-photo-link-{{$mail.id}}">
+					<img src="{{$mail.from_photo}}" class="contact-photo{{$mail.sparkle}}" id="wall-item-photo-{{$mail.id}}" alt="{{$mail.from_name}}" />
+				</a>
+			</div>
+		</div>
+		<div class="wall-item-content">
+			{{$mail.body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-actions-author">
+				<a href="{{$mail.from_url}}" target="redir" class="wall-item-name-link"><span class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name}}</span></a> <span class="wall-item-ago">{{$mail.date}}</span>
+			</div>
+			
+			<div class="wall-item-actions-social">
+			</div>
+			
+			<div class="wall-item-actions-tools">
+				<a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$mail.delete}}">{{$mail.delete}}</a>
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+	</div>
+</div>
+
+
+{{*
+
+
+<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>
+	</div>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<div class="mail-conv-date">{{$mail.date}}</div>
+		<div class="mail-conv-subject">{{$mail.subject}}</div>
+		<div class="mail-conv-body">{{$mail.body}}</div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-outside-wrapper-end"></div>
+</div>
+</div>
+<hr class="mail-conv-break" />
+
+*}}
diff --git a/view/theme/diabook/templates/mail_display.tpl b/view/theme/diabook/templates/mail_display.tpl
new file mode 100644
index 0000000000..dc1fbbc6f5
--- /dev/null
+++ b/view/theme/diabook/templates/mail_display.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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}}
+	<div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
+		{{include file="mail_conv.tpl"}}
+	</div>
+{{/foreach}}
+
+{{include file="prv_message.tpl"}}
diff --git a/view/theme/diabook/templates/mail_list.tpl b/view/theme/diabook/templates/mail_list.tpl
new file mode 100644
index 0000000000..9dde46bc80
--- /dev/null
+++ b/view/theme/diabook/templates/mail_list.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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>
+	<span class="mail-date">{{$date}}</span>
+	<span class="mail-count">{{$count}}</span>
+	
+	<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
+</div>
diff --git a/view/theme/diabook/templates/message_side.tpl b/view/theme/diabook/templates/message_side.tpl
new file mode 100644
index 0000000000..723b0b710c
--- /dev/null
+++ b/view/theme/diabook/templates/message_side.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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>
+	
+	<ul class="message-ul">
+		{{foreach $tabs as $t}}
+			<li class="tool {{if $t.sel}}selected{{/if}}"><a href="{{$t.url}}" class="message-link">{{$t.label}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/diabook/templates/nav.tpl b/view/theme/diabook/templates/nav.tpl
new file mode 100644
index 0000000000..45dc476141
--- /dev/null
+++ b/view/theme/diabook/templates/nav.tpl
@@ -0,0 +1,193 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<header>
+	<div id="site-location">{{$sitelocation}}</div>
+	<div id="banner">{{$banner}}</div>
+</header>
+<nav>
+			
+			
+	<ul>
+			
+			
+			{{if $nav.network}}
+			<li id="nav-network-link" class="nav-menu-icon">
+				<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >
+				<span class="icon notifications">Benachrichtigungen</span>
+				<span id="net-update" class="nav-notify"></span></a>
+			</li>
+		    {{/if}}
+	
+			{{if $nav.contacts}}
+			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
+				<a href="{{$nav.contacts.0}}" rel="#nav-contacts-menu" title="{{$nav.contacts.1}}">
+				<span class="icon contacts">{{$nav.contacts.1}}</span>
+				<span id="intro-update" class="nav-notify"></span></a>
+				<ul id="nav-contacts-menu" class="menu-popup">
+					<li id="nav-contacts-see-intro"><a href="{{$nav.notifications.0}}">{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notify"></span></li>
+					<li id="nav-contacts-all"><a href="contacts">{{$nav.contacts.1}}</a></li> 
+				</ul>
+			</li>	
+
+			{{/if}}
+			
+			{{if $nav.messages}}
+			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
+			  <a href="{{$nav.messages.0}}" rel="#nav-messages-menu" title="{{$nav.messages.1}}">
+			  <span class="icon messages">{{$nav.messages.1}}</span>
+				<span id="mail-update" class="nav-notify"></span></a>
+				<ul id="nav-messages-menu" class="menu-popup">
+					<li id="nav-messages-see-all"><a href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>
+					<li id="nav-messages-see-all"><a href="{{$nav.messages.new.0}}">{{$nav.messages.new.1}}</a></li>
+				</ul>
+			</li>		
+			{{/if}}
+		
+      {{if $nav.notifications}}
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
+			<a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">
+			<span class="icon notify">{{$nav.notifications.1}}</span>
+				<span id="notify-update" class="nav-notify"></span></a>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+			</li>		
+		{{/if}}	
+			
+		{{if $nav.search}}
+		<li id="search-box">
+			<form method="get" action="{{$nav.search.0}}">
+				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
+			</form>
+		</li>		
+		{{/if}}	
+		
+		<li  style="width: 1%; height: 1px;float: right;"></li>	
+		
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+			<ul id="nav-site-menu" class="menu-popup">
+				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}				
+					
+				{{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}									
+										
+										 <li><a class="{{$nav.search.2}}" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
+										
+				{{if $nav.settings}}<li><a class="menu-sep {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
+				{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
+
+				{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
+
+				
+			</ul>		
+		</li>
+		
+		
+		{{if $nav.directory}}
+		<li id="nav-directory-link" class="nav-menu {{$sel.directory}}">
+			<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+		</li>
+		{{/if}}
+		
+		{{if $nav.apps}}
+			<li id="nav-apps-link" class="nav-menu {{$sel.apps}}">
+				<a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>
+				<ul id="nav-apps-menu" class="menu-popup">
+					{{foreach $apps as $ap}}
+					<li>{{$ap}}</li>
+					{{/foreach}}
+				</ul>
+			</li>	
+		{{/if}}		
+		
+      {{if $nav.home}}
+			<li id="nav-home-link" class="nav-menu {{$sel.home}}">
+				<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}
+				<span id="home-update" class="nav-notify"></span></a>
+			</li>
+		{{/if}}		
+		
+		{{if $userinfo}}
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
+				<ul id="nav-user-menu" class="menu-popup">
+					{{foreach $nav.usermenu as $usermenu}}
+						<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
+					{{/foreach}}
+					
+					{{if $nav.profiles}}<li><a class="menu-sep {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.3}}</a></li>{{/if}}
+					{{if $nav.notifications}}<li><a class="{{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a></li>{{/if}}
+					{{if $nav.messages}}<li><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a></li>{{/if}}
+					{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}	
+				</ul>
+			</li>
+		{{/if}}
+		
+					{{if $nav.login}}
+					<li id="nav-home-link" class="nav-menu {{$sel.home}}">
+						<a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
+					<li>
+					{{/if}}
+		
+		
+		
+	</ul>	
+
+
+	
+</nav>
+
+
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Scroll to bottom"></a></div>
+<div style="position: fixed; bottom: 61px; left: 6px;">{{$langselector}}</div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
+
+
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+
+
+{{*
+
+{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+
+<span id="nav-link-wrapper" >
+
+{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+	
+<a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
+	
+{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+
+<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+
+{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+
+{{if $nav.notifications}}
+<a id="nav-notify-link" class="nav-commlink {{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a>
+<span id="notify-update" class="nav-ajax-left"></span>
+{{/if}}
+{{if $nav.messages}}
+<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+<span id="mail-update" class="nav-ajax-left"></span>
+{{/if}}
+
+{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
+
+{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
+{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+
+
+</span>
+<span id="nav-end"></span>
+<span id="banner">{{$banner}}</span>
+*}}
diff --git a/view/theme/diabook/templates/nets.tpl b/view/theme/diabook/templates/nets.tpl
new file mode 100644
index 0000000000..b9c6b828ff
--- /dev/null
+++ b/view/theme/diabook/templates/nets.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	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>
+   
+	<ul class="menu-profile-side">
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{if $sel_all}}group_selected{{else}}group_unselected{{/if}}"></span>	
+	<a style="text-decoration: none;" href="{{$base}}?nets=all" class="menu-profile-list-item">{{$all}}</a></li>
+	{{foreach $nets as $net}}
+	<li class="menu-profile-list">
+	<a href="{{$base}}?nets={{$net.ref}}" class="menu-profile-list-item">
+	<span class="menu-profile-icon {{if $net.selected}}group_selected{{else}}group_unselected{{/if}}"></span>		
+	{{$net.name}}	
+	</a></li>
+	{{/foreach}}
+	</ul>
+</div>
diff --git a/view/theme/diabook/templates/oembed_video.tpl b/view/theme/diabook/templates/oembed_video.tpl
new file mode 100644
index 0000000000..993b410e0b
--- /dev/null
+++ b/view/theme/diabook/templates/oembed_video.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+</a>
diff --git a/view/theme/diabook/templates/photo_item.tpl b/view/theme/diabook/templates/photo_item.tpl
new file mode 100644
index 0000000000..344c58a0b6
--- /dev/null
+++ b/view/theme/diabook/templates/photo_item.tpl
@@ -0,0 +1,70 @@
+{{*
+ *	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;" />
+</div>
+{{/if}}
+
+<div class="wall-item-photo-container {{$indent}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper" >
+				<a href="{{$profile_url}}" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-{{$id}}">
+					<img src="{{$thumb}}" class="contact-photo{{$sparkle}}" id="wall-item-photo-{{$id}}" alt="{{$name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$id}}">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$id}}">
+				{{$photo_menu}}
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="{{$profile_url}}" target="redir" title="{{$name}}" class="wall-item-name-link"><span class="wall-item-name{{$sparkle}}">{{$name}}</span></a> 
+			<span class="wall-item-ago">-
+			{{if $plink}}<a class="link" title="{{$plink.title}}" href="{{$plink.href}}" style="color: #999">{{$ago}}</a>{{else}} {{$ago}} {{/if}}
+			{{if $lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$id}});">{{$lock}}</span> {{/if}}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{if $title}}<h2><a href="{{$plink.href}}">{{$title}}</a></h2>{{/if}}
+			{{$body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $tags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+		</div>
+	</div>
+	
+	<div class="wall-item-bottom" style="display: table-row;">
+		<div class="wall-item-actions">
+	   </div>
+		<div class="wall-item-actions">
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $drop.dropping}}
+					<input type="checkbox" title="{{$drop.select}}" name="itemselected[]" class="item-select" value="{{$id}}" />
+					<a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon drop" title="{{$drop.delete}}">{{$drop.delete}}</a>
+				{{/if}}
+				{{if $edpost}}
+					<a class="icon pencil" href="{{$edpost.0}}" title="{{$edpost.1}}"></a>
+				{{/if}}
+			</div>
+
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+			
+	</div>
+</div>
+
diff --git a/view/theme/diabook/templates/photo_view.tpl b/view/theme/diabook/templates/photo_view.tpl
new file mode 100644
index 0000000000..e3908be006
--- /dev/null
+++ b/view/theme/diabook/templates/photo_view.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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>
+
+<div id="photo-edit-link-wrap">
+{{if $tools}}
+<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
+|
+<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
+{{/if}}
+{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
+</div>
+
+{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
+<div id="photo-photo"><a href="{{$photo.href}}" class="lightbox" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
+<div id="photo-photo-end"></div>
+<div id="photo-caption">{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
+
+{{if $edit}}{{$edit}}{{/if}}
+
+<div style="margin-top:20px">
+</div>
+<div id="wall-photo-container">
+{{$comments}}
+</div>
+
+{{$paginate}}
+
diff --git a/view/theme/diabook/templates/profile_side.tpl b/view/theme/diabook/templates/profile_side.tpl
new file mode 100644
index 0000000000..267afc76a0
--- /dev/null
+++ b/view/theme/diabook/templates/profile_side.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	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}}">
+			<img src="{{$userinfo.icon}}" id="ps-usericon" alt="{{$userinfo.name}}">
+		</a>
+		<a href="{{$ps.usermenu.status.0}}" id="ps-username" title="{{$userinfo.name}}">{{$userinfo.name}}</a>
+	</div>
+	
+<ul id="profile-side-menu" class="menu-profile-side">
+	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="{{$ps.usermenu.status.0}}">{{$ps.usermenu.status.1}}<span class="menu-profile-icon home"></span></a></li>
+	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="{{$ps.usermenu.photos.0}}">{{$ps.usermenu.photos.1}}<span class="menu-profile-icon photos"></span></a></li>
+	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="{{$ps.usermenu.contacts.0}}">{{$ps.usermenu.contacts.1}}<span class="menu-profile-icon pscontacts"></span></a></li>		
+	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="{{$ps.usermenu.events.0}}">{{$ps.usermenu.events.1}}<span class="menu-profile-icon events"></span></a></li>
+	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="{{$ps.usermenu.notes.0}}">{{$ps.usermenu.notes.1}}<span class="menu-profile-icon notes"></span></a></li>
+	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="{{$ps.usermenu.pgroups.0}}" target="blanc">{{$ps.usermenu.pgroups.1}}<span class="menu-profile-icon foren"></span></a></li>
+	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="{{$ps.usermenu.community.0}}">{{$ps.usermenu.community.1}}<span class="menu-profile-icon com_side"></span></a></li>
+</ul>
+
+</div>
+
+				
diff --git a/view/theme/diabook/templates/profile_vcard.tpl b/view/theme/diabook/templates/profile_vcard.tpl
new file mode 100644
index 0000000000..f2eda1b2d0
--- /dev/null
+++ b/view/theme/diabook/templates/profile_vcard.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="tool">
+		<div class="fn label">{{$profile.name}}</div>
+		{{if $profile.edit}}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{foreach $profile.menu.entries as $e}}
+				<li>
+					<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
+				</li>
+				{{/foreach}}
+				<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
+				<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
+				<li><a href="profiles" >{{$profile.edit.3}}</a></li>
+								
+			</ul>
+			</div>
+		{{/if}}
+	</div>
+				
+	
+
+	<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt><br> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/diabook/templates/prv_message.tpl b/view/theme/diabook/templates/prv_message.tpl
new file mode 100644
index 0000000000..2daf54ecd6
--- /dev/null
+++ b/view/theme/diabook/templates/prv_message.tpl
@@ -0,0 +1,45 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h3>{{$header}}</h3>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="message" method="post" >
+
+{{$parent}}
+
+<div id="prvmail-to-label">{{$to}}</div>
+
+{{if $showinputs}}
+<input type="text" id="recip" style="background: none repeat scroll 0 0 white;border: 1px solid #CCC;border-radius: 5px 5px 5px 5px;height: 20px;margin: 0 0 5px;
+vertical-align: middle;" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+{{else}}
+{{$select}}
+{{/if}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
+	<div id="prvmail-upload-wrapper" >
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	</div> 
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/theme/diabook/templates/right_aside.tpl b/view/theme/diabook/templates/right_aside.tpl
new file mode 100644
index 0000000000..d361840262
--- /dev/null
+++ b/view/theme/diabook/templates/right_aside.tpl
@@ -0,0 +1,25 @@
+{{*
+ *	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}}">
+			<img src="{{$userinfo.icon}}" id="ps-usericon" alt="{{$userinfo.name}}">
+		</a>
+		<a href="{{$ps.usermenu.status.0}}" id="ps-username" title="{{$userinfo.name}}">{{$userinfo.name}}</a>
+	</div>
+	
+<ul id="profile-side-menu" class="menu-profile-side">
+	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="{{$ps.usermenu.status.0}}">{{$ps.usermenu.status.1}}</a></li>
+	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="{{$ps.usermenu.photos.0}}">{{$ps.usermenu.photos.1}}</a></li>
+	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="{{$ps.usermenu.events.0}}">{{$ps.usermenu.events.1}}</a></li>
+	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="{{$ps.usermenu.notes.0}}">{{$ps.usermenu.notes.1}}</a></li>
+	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendica.com/directory/forum" target="blanc">Public Groups</a></li>
+	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="{{$ps.usermenu.community.0}}">{{$ps.usermenu.community.1}}</a></li>
+</ul>
+
+</div>
+
+				
\ No newline at end of file
diff --git a/view/theme/diabook/templates/search_item.tpl b/view/theme/diabook/templates/search_item.tpl
new file mode 100644
index 0000000000..d48103298c
--- /dev/null
+++ b/view/theme/diabook/templates/search_item.tpl
@@ -0,0 +1,116 @@
+{{*
+ *	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;" />
+</div>
+{{/if}}
+<div class="wall-item-container {{$item.indent}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> 
+			<span class="wall-item-ago">-
+			{{if $item.plink}}<a class="link" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+			{{if $item.lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
+			{{$item.body}}
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $item.tags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-actions-social">
+			
+			
+			{{if $item.vote}}
+				<a href="#" id="like-{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+				<a href="#" id="dislike-{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+			{{/if}}
+						
+			{{if $item.vote.share}}
+				<a href="#" id="share-{{$item.id}}" class="icon recycle" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>
+			{{/if}}	
+
+
+			{{if $item.star}}
+				<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}">
+				<img src="images/star_dummy.png" class="icon star" alt="{{$item.star.do}}" /> </a>
+				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.star.tagger}}"></a>					  
+			{{/if}}	
+			
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon file-as" title="{{$item.star.filer}}"></a>
+			{{/if}}				
+			
+			{{if $item.plink}}<a class="icon link" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drop" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+				{{/if}}
+				{{if $item.edpost}}
+					<a class="icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+				{{/if}}
+			</div>
+			<div class="wall-item-location">{{$item.location}}&nbsp;</div>
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
+	</div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+	{{$item.comment}}
+</div>
diff --git a/view/theme/diabook/templates/theme_settings.tpl b/view/theme/diabook/templates/theme_settings.tpl
new file mode 100644
index 0000000000..5532d402cf
--- /dev/null
+++ b/view/theme/diabook/templates/theme_settings.tpl
@@ -0,0 +1,46 @@
+{{*
+ *	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=$line_height}}
+
+{{include file="field_select.tpl" field=$resolution}}
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="diabook-settings-submit" />
+</div>
+<br>
+<h3>Show/hide boxes at right-hand column</h3>
+{{include file="field_select.tpl" field=$close_pages}}
+{{include file="field_select.tpl" field=$close_profiles}}
+{{include file="field_select.tpl" field=$close_helpers}}
+{{include file="field_select.tpl" field=$close_services}}
+{{include file="field_select.tpl" field=$close_friends}}
+{{include file="field_select.tpl" field=$close_lastusers}}
+{{include file="field_select.tpl" field=$close_lastphotos}}
+{{include file="field_select.tpl" field=$close_lastlikes}}
+{{include file="field_select.tpl" field=$close_twitter}}
+{{include file="field_input.tpl" field=$TSearchTerm}}
+{{include file="field_select.tpl" field=$close_mapquery}}
+
+{{include file="field_input.tpl" field=$ELPosX}}
+
+{{include file="field_input.tpl" field=$ELPosY}}
+
+{{include file="field_input.tpl" field=$ELZoom}}
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="diabook-settings-submit" />
+</div>
+
+<br>
+
+<div class="field select">
+<a onClick="restore_boxes()" title="Restore boxorder at right-hand column" style="cursor: pointer;">Restore boxorder at right-hand column</a>
+</div>
+
diff --git a/view/theme/diabook/templates/wall_thread.tpl b/view/theme/diabook/templates/wall_thread.tpl
new file mode 100644
index 0000000000..be143cfbaa
--- /dev/null
+++ b/view/theme/diabook/templates/wall_thread.tpl
@@ -0,0 +1,146 @@
+{{*
+ *	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>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+{{if $item.indent}}{{else}}
+<div class="wall-item-decor">
+	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+</div>
+{{/if}}
+<div class="wall-item-container {{$item.indent}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> 
+			<span class="wall-item-ago">-
+			{{if $item.plink}}<a class="link{{$item.sparkle}}" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+			{{if $item.lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
+			{{$item.body}}
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $item.tags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-actions-social">
+			
+			
+			{{if $item.vote}}
+				<a href="#" id="like-{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+				{{if $item.vote.dislike}}
+				<a href="#" id="dislike-{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+				{{/if}}
+			{{/if}}
+						
+			{{if $item.vote.share}}
+				<a href="#" id="share-{{$item.id}}" class="icon recycle" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>
+			{{/if}}	
+
+
+			{{if $item.star}}
+				<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}">
+				<img src="images/star_dummy.png" class="icon star" alt="{{$item.star.do}}" /> </a>
+			{{/if}}
+
+			{{if $item.tagger}}
+				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>					  
+			{{/if}}	
+			
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon file-as" title="{{$item.star.filer}}"></a>
+			{{/if}}				
+			
+			{{if $item.plink}}<a class="icon link" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drop" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+				{{/if}}
+				{{if $item.edpost}}
+					<a class="icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+				{{/if}}
+			</div>
+			<div class="wall-item-location">{{$item.location}}&nbsp;</div>
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
+	</div>
+</div>
+
+{{if $item.threaded}}
+{{if $item.comment}}
+<div class="wall-item-comment-wrapper {{$item.indent}}" >
+	{{$item.comment}}
+</div>
+{{/if}}
+{{/if}}
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" >
+	{{$item.comment}}
+</div>
+{{/if}}
+
+
+{{foreach $item.children as $child_item}}
+	{{include file="{{$child_item.template}}" item=$child_item}}
+{{/foreach}}
+
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/dispy/templates/bottom.tpl b/view/theme/dispy/templates/bottom.tpl
new file mode 100644
index 0000000000..49487240dc
--- /dev/null
+++ b/view/theme/dispy/templates/bottom.tpl
@@ -0,0 +1,76 @@
+{{*
+ *	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() {
+
+});
+function tautogrow(id) {
+	$("textarea#comment-edit-text-" + id).autogrow();
+};
+
+function insertFormatting(comment, BBcode, id) {
+	var tmpStr = $("#comment-edit-text-" + id).val();
+	if(tmpStr == comment) {
+		tmpStr = "";
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		openMenu("comment-edit-submit-wrapper-" + id);
+	}
+	textarea = document.getElementById("comment-edit-text-" + id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		if (BBcode == "url") {
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+		} else {
+			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+		}
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		if (BBcode == "url") {
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
+			+ "http://" + textarea.value.substring(start, end)
+			+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+		} else {
+			textarea.value = textarea.value.substring(0, start)
+			+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
+			+ textarea.value.substring(end, textarea.value.length);
+		}
+	}
+	return true;
+}
+
+function cmtBbOpen(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+    $(".comment-edit-bb-" + id).hide();
+}
+
+var doctitle = document.title;
+function checkNotify() {
+	if(document.getElementById("notify-update").innerHTML != "") {
+		document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
+	} else {
+		document.title = doctitle;
+    };
+    setInterval(function () {checkNotify();}, 10 * 1000);
+}
+
+$(document).ready(function(){
+var doctitle = document.title;
+function checkNotify() {
+if(document.getElementById("notify-update").innerHTML != "")
+document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
+else
+document.title = doctitle;
+};
+setInterval(function () {checkNotify();}, 10 * 1000);
+})
+
+</script>
diff --git a/view/theme/dispy/templates/comment_item.tpl b/view/theme/dispy/templates/comment_item.tpl
new file mode 100644
index 0000000000..b30aede3da
--- /dev/null
+++ b/view/theme/dispy/templates/comment_item.tpl
@@ -0,0 +1,75 @@
+{{*
+ *	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}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}"
+					class="comment-edit-text-empty"
+					name="body"
+					onfocus="commentOpen(this,{{$id}});tautogrow({{$id}});cmtBbOpen({{$id}});"
+					onblur="commentClose(this,{{$id}});"
+					placeholder="Comment">{{$comment}}</textarea>
+				{{if $qcomment}}
+                <div class="qcomment-wrapper">
+					<select id="qcomment-select-{{$id}}"
+						name="qcomment-{{$id}}"
+						class="qcomment"
+						onchange="qCommentInsert(this,{{$id}});">
+					<option value=""></option>
+					{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>
+					{{/foreach}}
+					</select>
+				</div>
+				{{/if}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+				<div class="comment-edit-end"></div>
+			</form>
+		</div>
diff --git a/view/theme/dispy/templates/communityhome.tpl b/view/theme/dispy/templates/communityhome.tpl
new file mode 100644
index 0000000000..83749ae366
--- /dev/null
+++ b/view/theme/dispy/templates/communityhome.tpl
@@ -0,0 +1,40 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $page}}
+<div>{{$page}}</div>
+{{/if}}
+
+<h3 id="extra-help-header">Help or '@NewHere'?</h3>
+<div id="extra-help">
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
+	title="Friendica Support" target="_blank">Friendica Support</a><br />
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
+	title="Let's talk" target="_blank">Let's talk</a><br />
+<a href="http://newzot.hydra.uberspace.de/profile/newzot"
+	title="Local Friendica" target="_blank">Local Friendica</a><br />
+<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
+</div>
+
+<h3 id="connect-services-header">Connectable Services</h3>
+<ul id="connect-services">
+<li><a href="{{$url}}/facebook"><img alt="Facebook"
+	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png" title="StatusNet" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png" title="LiveJournal" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="Posterous" src="view/theme/dispy/icons/posterous.png" title="Posterous" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png" title="Tumblr" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="Twitter" src="view/theme/dispy/icons/twitter.png" title="Twitter" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="WordPress" src="view/theme/dispy/icons/wordpress.png" title="WordPress" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="E-Mail" src="view/theme/dispy/icons/email.png" title="E-Mail" /></a></li>
+</ul>
+
diff --git a/view/theme/dispy/templates/contact_template.tpl b/view/theme/dispy/templates/contact_template.tpl
new file mode 100644
index 0000000000..d22acd5a6b
--- /dev/null
+++ b/view/theme/dispy/templates/contact_template.tpl
@@ -0,0 +1,41 @@
+{{*
+ *	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">
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)">
+
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
+
+			{{if $contact.photo_menu}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                    <ul>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	<div class="contact-entry-details" id="contact-entry-url-{{$contact.id}}" >
+		<a href="{{$contact.itemurl}}" title="{{$contact.itemurl}}">Profile URL</a></div>
+	<div class="contact-entry-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
+
diff --git a/view/theme/dispy/templates/conversation.tpl b/view/theme/dispy/templates/conversation.tpl
new file mode 100644
index 0000000000..e8cf720717
--- /dev/null
+++ b/view/theme/dispy/templates/conversation.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
+	{{foreach $thread.items as $item}}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
+			</div>
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
+		
+		{{include file="{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+</div>
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems(); return false;">
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{/if}}
diff --git a/view/theme/dispy/templates/group_side.tpl b/view/theme/dispy/templates/group_side.tpl
new file mode 100644
index 0000000000..33250b694b
--- /dev/null
+++ b/view/theme/dispy/templates/group_side.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="group-sidebar" class="widget">
+<h3 class="label">{{$title}}</h3>
+
+<div id="sidebar-group-list">
+	<ul id="sidebar-group-ul">
+		{{foreach $groups as $group}}
+			<li class="sidebar-group-li">
+				<a href="{{$group.href}}" class="sidebar-group-element {{if $group.selected}}group-selected{{else}}group-other{{/if}}">{{$group.text}}</a>
+				{{if $group.edit}}
+					<a class="groupsideedit"
+                        href="{{$group.edit.href}}" title="{{$group.edit.title}}"><span class="icon small-pencil"></span></a>
+				{{/if}}
+				{{if $group.cid}}
+					<input type="checkbox" 
+						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
+						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
+						{{if $group.ismember}}checked="checked"{{/if}}
+					/>
+				{{/if}}
+			</li>
+		{{/foreach}}
+	</ul>
+	</div>
+  <div id="sidebar-new-group">
+  <a href="group/new" title="{{$createtext}}"><span class="action text add">{{$createtext}}</span></a>
+  </div>
+</div>
+
+
diff --git a/view/theme/dispy/templates/header.tpl b/view/theme/dispy/templates/header.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/theme/dispy/templates/header.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/dispy/templates/jot-header.tpl b/view/theme/dispy/templates/jot-header.tpl
new file mode 100644
index 0000000000..4aafc2175d
--- /dev/null
+++ b/view/theme/dispy/templates/jot-header.tpl
@@ -0,0 +1,350 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript">
+var editor=false;
+var textlen = 0;
+var plaintext = '{{$editselect}}';
+
+function initEditor(cb) {
+	if (editor==false) {
+		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+			editor = true;
+			$("a#jot-perms-icon").colorbox({
+				'inline' : true,
+				'transition' : 'elastic'
+			});
+			$(".jothidden").show();
+			if (typeof cb!="undefined") cb();
+			return;
+		}
+		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: {{$editselect}},
+			auto_focus: "profile-jot-text",
+			plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups,contextmenu,style",
+			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen,charmap",
+			theme_advanced_buttons2 : "",
+			theme_advanced_buttons3 : "",
+			theme_advanced_toolbar_location : "top",
+			theme_advanced_toolbar_align : "center",
+			theme_advanced_blockformats : "blockquote,code",
+			gecko_spellcheck : true,
+			paste_text_sticky : true,
+			entity_encoding : "raw",
+			add_unload_trigger : false,
+			remove_linebreaks : false,
+			//force_p_newlines : false,
+			//force_br_newlines : true,
+			forced_root_block : 'div',
+			convert_urls: false,
+			content_css: "{{$baseurl}}/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			file_browser_callback : "fcFileBrowser",
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null)
+						cPopup.onkey(e);
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) cPopup = null;
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+
+					textlen = txt.length;
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$('#profile-jot-desc').html('&#160;');
+					}	 
+
+				 //Character count
+
+					if(textlen <= 140) {
+						$('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('grey');
+					}
+					if((textlen > 140) && (textlen <= 420)) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('red');
+						$('#character-counter').addClass('orange');
+					}
+					if(textlen > 420) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('red');
+					}
+					$('#character-counter').text(textlen);
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$("#profile-jot-text-loading").hide();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+			}
+		});
+		editor = true;
+		// setup acl popup
+		$("a#jot-perms-icon").colorbox({
+			'inline' : true,
+			'transition' : 'elastic'
+		}); 
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
+</script>
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js"></script>
+<script type="text/javascript">
+	var ispublic = '{{$ispublic}}';
+	var addtitle = '{{$addtitle}}';
+
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+		/* enable character counter */
+		$("#profile-jot-text").focus(charCounter);
+		$("#profile-jot-text").click(charCounter);
+
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+	});
+
+	function deleteCheckedItems() {
+		var checkedstr = '';
+
+		$('.item-select').each( function() {
+			if($(this).is(':checked')) {
+				if(checkedstr.length != 0) {
+					checkedstr = checkedstr + ',' + $(this).val();
+				}
+				else {
+					checkedstr = $(this).val();
+				}
+			}	
+		});
+		$.post('item', { dropitems: checkedstr }, function(data) {
+			window.location.reload();
+		});
+	}
+
+	function jotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				addeditortext(data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("{{$vidurl}}");
+		if(reply && reply.length) {
+			addeditortext('[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("{{$audurl}}");
+		if(reply && reply.length) {
+			addeditortext('[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("{{$whereareu}}", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+			if (!editor) $("#profile-jot-text").val("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).hide();
+				$(window).scrollTop(0);
+			});
+
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}
+
+	function itemTag(id) {
+		reply = prompt("{{$term}}");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.colorbox({html:data});
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.colorbox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#profile-jot-text").val();
+			$("#profile-jot-text").val(currentText + data);
+		}
+		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+	}	
+
+	{{$geotag}}
+
+	function charCounter() {
+		// character count part deux
+		//$(this).val().length is not a function Line 282(3)
+		$('#profile-jot-text').keyup(function() {
+			var textlen = 0;
+			var maxLen1 = 140;
+			var maxLen2 = 420;
+
+			$('#character-counter').removeClass('jothidden');
+
+			textLen = $(this).val().length;
+			if(textLen <= maxLen1) {
+				$('#character-counter').removeClass('red');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('grey');
+			}
+			if((textLen > maxLen1) && (textlen <= maxLen2)) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('red');
+				$('#character-counter').addClass('orange');
+			}
+			if(textLen > maxLen2) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('red');
+			}
+			$('#character-counter').text( textLen );
+		});
+		$('#profile-jot-text').keyup();
+	}
+</script>
diff --git a/view/theme/dispy/templates/jot.tpl b/view/theme/dispy/templates/jot.tpl
new file mode 100644
index 0000000000..24dc68462a
--- /dev/null
+++ b/view/theme/dispy/templates/jot.tpl
@@ -0,0 +1,84 @@
+{{*
+ *	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>
+
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none" /></div>
+		<div id="character-counter" class="grey jothidden"></div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
+		{{/if}}
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}
+		</textarea>
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+<div id="jot-tools" class="jothidden" style="display:none">
+	<div id="profile-jot-submit-wrapper" class="jothidden">
+
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};">
+		<div id="wall-image-upload-div"><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
+	</div>
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};">
+		<div id="wall-file-upload-div"><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
+	</div>
+
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
+		<a id="profile-link" class="icon link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="{{$weblink}}"></a>
+	</div>
+	<div id="profile-video-wrapper" style="display: {{$visitor}};">
+		<a id="profile-video" class="icon video" onclick="jotVideoURL();return false;" title="{{$video}}"></a>
+	</div>
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};">
+		<a id="profile-audio" class="icon audio" onclick="jotAudioURL();return false;" title="{{$audio}}"></a>
+	</div>
+	<div id="profile-location-wrapper" style="display: {{$visitor}};">
+		<a id="profile-location" class="icon globe" onclick="jotGetLocation();return false;" title="{{$setloc}}"></a>
+	</div>
+	<div id="profile-nolocation-wrapper" style="display: none;">
+		<a id="profile-nolocation" class="icon noglobe" onclick="jotClearLocation();return false;" title="{{$noloc}}"></a>
+	</div>
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+
+	<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="{{$preview}}">{{$preview}}</a>
+	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+	<div id="profile-jot-perms" class="profile-jot-perms">
+		<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon {{$lockstate}} {{$bang}}" title="{{$permset}}"></a>
+	</div>
+	<span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" /></span>
+	</div>
+
+	</div> <!-- /#profile-jot-submit-wrapper -->
+</div> <!-- /#jot-tools -->
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$acl}}
+			<hr style="clear:both" />
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			<div id="profile-jot-email-end"></div>
+			{{$jotnets}}
+		</div>
+	</div>
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/dispy/templates/lang_selector.tpl b/view/theme/dispy/templates/lang_selector.tpl
new file mode 100644
index 0000000000..a1aee8277f
--- /dev/null
+++ b/view/theme/dispy/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{foreach $langs.0 as $v=>$l}}
+				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
+			{{/foreach}}
+		</select>
+	</form>
+</div>
diff --git a/view/theme/dispy/templates/mail_head.tpl b/view/theme/dispy/templates/mail_head.tpl
new file mode 100644
index 0000000000..54a0cd471e
--- /dev/null
+++ b/view/theme/dispy/templates/mail_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$messages}}</h3>
+
+<div class="tabs-wrapper">
+{{$tab_content}}
+</div>
diff --git a/view/theme/dispy/templates/nav.tpl b/view/theme/dispy/templates/nav.tpl
new file mode 100644
index 0000000000..e240821057
--- /dev/null
+++ b/view/theme/dispy/templates/nav.tpl
@@ -0,0 +1,150 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav id="pagenav">
+
+<div id="banner">{{$banner}}</div>
+<div id="site-location">{{$sitelocation}}</div>
+
+<a name="top" id="top"></a>
+<div id="nav-floater">
+    <ul id="nav-buttons">
+    {{if $nav.login}}
+    <li><a id="nav-login-link" class="nav-login-link {{$nav.login.2}}"
+            href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a></li>
+    {{/if}}
+    {{if $nav.home}}
+    <li><a id="nav-home-link" class="nav-link {{$nav.home.2}}"
+            href="{{$nav.home.0}}" title="{{$nav.home.1}}">{{$nav.home.1}}</a></li>
+    {{/if}}
+    {{if $nav.network}}
+    <li><a id="nav-network-link" class="nav-link {{$nav.network.2}}"
+            href="{{$nav.network.0}}" title="{{$nav.network.1}}">{{$nav.network.1}}</a></li>
+    {{/if}}
+    {{if $nav.notifications}}
+    <li><a id="nav-notifications-linkmenu" class="nav-link {{$nav.notifications.2}}"
+            href="{{$nav.notifications.0}}"
+            rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a></li>
+        <ul id="nav-notifications-menu" class="menu-popup">
+            <li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+            <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+            <li class="empty">{{$emptynotifications}}</li>
+        </ul>
+    {{/if}}
+    {{if $nav.messages}}
+    <li><a id="nav-messages-link" class="nav-link {{$nav.messages.2}}"
+            href="{{$nav.messages.0}}" title="{{$nav.messages.1}}">{{$nav.messages.1}}</a></li>
+    {{/if}}
+    {{if $nav.community}}
+    <li><a id="nav-community-link" class="nav-link {{$nav.community.2}}"
+            href="{{$nav.community.0}}" title="{{$nav.community.1}}">{{$nav.community.1}}</a></li>
+    {{/if}}
+    <li><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}"
+            href="{{$nav.directory.0}}" title="{{$nav.directory.1}}">{{$nav.directory.1}}</a></li>
+    <li><a id="nav-search-link" class="nav-link {{$nav.search.2}}"
+            href="{{$nav.search.0}}" title="{{$nav.search.1}}">{{$nav.search.1}}</a></li>
+    {{if $nav.apps}}
+    <li><a id="nav-apps-link" class="nav-link {{$nav.apps.2}}"
+        href="{{$nav.apps.0}}" title="{{$nav.apps.1}}">{{$nav.apps.1}}</a></li>
+    {{/if}}
+    </ul>
+
+    <div id="user-menu">
+        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="{{$nav.home.0}}"><span class="">User Menu</span></a>
+        <ul id="user-menu-popup"
+            onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
+            onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
+
+        {{if $nav.register}}
+        <li>
+        <a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}" title="{{$nav.register.1}}"></a>
+        </li>
+        {{/if}}
+        {{if $nav.contacts}}
+        <li><a id="nav-contacts-link" class="nav-commlink {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.1}}">{{$nav.contacts.1}}</a></li>
+        {{/if}}
+        {{if $nav.profiles}}
+        <li><a id="nav-profiles-link" class="nav-commlink {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.1}}">{{$nav.profiles.1}}</a></li>
+        {{/if}}
+        {{if $nav.settings}}
+        <li><a id="nav-settings-link" class="nav-commlink {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.1}}">{{$nav.settings.1}}</a></li>
+        {{/if}}
+        {{if $nav.login}}
+        <li><a id="nav-login-link" class="nav-commlink {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.1}}">{{$nav.login.1}}</a></li>
+        {{/if}}
+        {{if $nav.logout}}
+        <li><a id="nav-logout-link" class="nav-commlink {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
+        {{/if}}
+        </ul>
+    </div>
+
+    <ul id="nav-buttons-2">
+    {{if $nav.introductions}}
+    <li><a id="nav-intro-link" class="nav-link {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a></li>
+    {{/if}}
+    {{if $nav.admin}}
+    <li><a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.1}}">{{$nav.admin.1}}</a></li>
+    {{/if}}
+    {{if $nav.manage}}
+    <li><a id="nav-manage-link" class="nav-link {{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.1}}">{{$nav.manage.1}}</a></li>
+    {{/if}}
+    {{if $nav.help}}
+    <li><a id="nav-help-link" class="nav-link {{$nav.help.2}}"
+            href="{{$nav.help.0}}" title="{{$nav.help.1}}">{{$nav.help.1}}</a></li>
+    {{/if}}
+    </ul>
+
+{{if $userinfo}}
+        <ul id="nav-user-menu" class="menu-popup">
+            {{foreach $nav.usermenu as $usermenu}}
+                <li>
+                    <a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a>
+                </li>
+            {{/foreach}}
+        </ul>
+{{/if}}
+
+    <div id="notifications">
+        {{if $nav.home}}
+        <a id="home-update" class="nav-ajax-left" href="{{$nav.home.0}}" title="{{$nav.home.1}}"></a>
+        {{/if}}
+        {{if $nav.network}}
+        <a id="net-update" class="nav-ajax-left" href="{{$nav.network.0}}" title="{{$nav.network.1}}"></a>
+        {{/if}}
+        {{if $nav.notifications}}
+        <a id="notify-update" class="nav-ajax-left" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>
+        {{/if}}
+        {{if $nav.messages}}
+        <a id="mail-update" class="nav-ajax-left" href="{{$nav.messages.0}}" title="{{$nav.messages.1}}"></a>
+        {{/if}}
+        {{if $nav.introductions}}
+        <a id="intro-update" class="nav-ajax-left" href="{{$nav.introductions.0}}"></a>
+        {{/if}}
+    </div>
+</div>
+    <a href="#" class="floaterflip"></a>
+</nav>
+
+<div id="lang-sel-wrap">
+{{$langselector}}
+</div>
+
+<div id="scrollup">
+<a href="#top"><img src="view/theme/dispy/icons/scroll_top.png"
+    alt="back to top" title="Back to top" /></a>
+</div>
+
+<div class="search-box">
+    <form method="get" action="{{$nav.search.0}}">
+        <input id="mini-search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
+    </form>
+</div>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+    <li class="{4}">
+    <a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a>
+    </li>
+</ul>
+
diff --git a/view/theme/dispy/templates/photo_edit.tpl b/view/theme/dispy/templates/photo_edit.tpl
new file mode 100644
index 0000000000..b9a92fda81
--- /dev/null
+++ b/view/theme/dispy/templates/photo_edit.tpl
@@ -0,0 +1,58 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
+
+	<input type="hidden" name="item_id" value="{{$item_id}}" />
+
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
+	<input id="photo-edit-albumname" type="text" name="albname" value="{{$album}}" />
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
+	<input id="photo-edit-caption" type="text" name="desc" value="{{$caption}}" />
+
+	<div id="photo-edit-caption-end"></div>
+
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
+	<input name="newtag" id="photo-edit-newtag" title="{{$help_tags}}" type="text" />
+
+	<div id="photo-edit-tags-end"></div>
+	<div id="photo-edit-rotate-wrapper">
+		<div id="photo-edit-rotate-label">{{$rotate}}</div>
+		<input type="checkbox" name="rotate" value="1" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		<a href="#photo-edit-perms-select"
+			id="photo-edit-perms-menu"
+			class="button"
+			title="{{$permissions}}"/><span id="jot-perms-icon"
+			class="icon {{$lockstate}}" ></span>{{$permissions}}</a>
+		<div id="photo-edit-perms-menu-end"></div>
+
+		<div style="display: none;">
+			<div id="photo-edit-perms-select" >
+				{{$aclselect}}
+			</div>
+		</div>
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+<script type="text/javascript">
+	$("a#photo-edit-perms-menu").colorbox({
+		'inline' : true,
+		'transition' : 'none'
+	}); 
+</script>
diff --git a/view/theme/dispy/templates/photo_view.tpl b/view/theme/dispy/templates/photo_view.tpl
new file mode 100644
index 0000000000..cfc8868edf
--- /dev/null
+++ b/view/theme/dispy/templates/photo_view.tpl
@@ -0,0 +1,41 @@
+{{*
+ *	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>
+
+<div id="photo-edit-link-wrap">
+{{if $tools}}
+<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
+|
+<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
+{{/if}}
+{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
+</div>
+
+{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
+<div id="photo-photo"><a href="{{$photo.href}}" class="lightbox" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
+<div id="photo-photo-end"></div>
+<div id="photo-caption">{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
+
+{{if $edit}}{{$edit}}{{/if}}
+
+{{if $likebuttons}}
+<div id="photo-like-div">
+	{{$likebuttons}} {{$like}} {{$dislike}}
+</div>
+{{/if}}
+<div id="wall-photo-container">
+{{$comments}}
+</div>
+
+{{$paginate}}
+
diff --git a/view/theme/dispy/templates/profile_vcard.tpl b/view/theme/dispy/templates/profile_vcard.tpl
new file mode 100644
index 0000000000..01633716d2
--- /dev/null
+++ b/view/theme/dispy/templates/profile_vcard.tpl
@@ -0,0 +1,87 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	{{if $profile.edit}}
+	<div class="action">
+	<span class="icon-profile-edit" rel="#profiles-menu"></span>
+	<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="{{$profile.edit.3}}">{{$profile.edit.1}}</a>
+	<ul id="profiles-menu" class="menu-popup">
+		{{foreach $profile.menu.entries as $e}}
+		<li>
+			<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
+		</li>
+		{{/foreach}}
+		<li><a href="profile_photo">{{$profile.menu.chg_photo}}</a></li>
+		<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
+	</ul>
+	</div>
+	{{/if}}
+
+	<div class="fn label">{{$profile.name}}</div>
+
+	{{if $pdesc}}
+    <div class="title">{{$profile.pdesc}}</div>
+    {{/if}}
+	<div id="profile-photo-wrapper">
+		<img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" />
+    </div>
+
+	{{if $location}}
+		<div class="location">
+        <span class="location-label">{{$location}}</span>
+		<div class="adr">
+			{{if $profile.address}}
+            <div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</div>
+		</div>
+	{{/if}}
+
+	{{if $gender}}
+    <div class="mf">
+        <span class="gender-label">{{$gender}}</span>
+        <span class="x-gender">{{$profile.gender}}</span>
+    </div>
+    {{/if}}
+	
+	{{if $profile.pubkey}}
+    <div class="key" style="display:none;">{{$profile.pubkey}}</div>
+    {{/if}}
+
+	{{if $marital}}
+    <div class="marital">
+    <span class="marital-label">
+    <span class="heart">&hearts;</span>{{$marital}}</span>
+    <span class="marital-text">{{$profile.marital}}</span>
+    </div>
+    {{/if}}
+
+	{{if $homepage}}
+    <div class="homepage">
+    <span class="homepage-label">{{$homepage}}</span>
+    <span class="homepage-url"><a href="{{$profile.homepage}}"
+    target="external-link">{{$profile.homepage}}</a></span>
+    </div>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
diff --git a/view/theme/dispy/templates/saved_searches_aside.tpl b/view/theme/dispy/templates/saved_searches_aside.tpl
new file mode 100644
index 0000000000..0d9c0747ff
--- /dev/null
+++ b/view/theme/dispy/templates/saved_searches_aside.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	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}}
+	
+	<ul id="saved-search-ul">
+		{{foreach $saved as $search}}
+		<li class="saved-search-li clear">
+			<a title="{{$search.delete}}" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-{{$search.id}}" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"></a>
+			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.term}}</a>
+		</li>
+		{{/foreach}}
+	</ul>
+	<div class="clear"></div>
+</div>
diff --git a/view/theme/dispy/templates/search_item.tpl b/view/theme/dispy/templates/search_item.tpl
new file mode 100644
index 0000000000..8d406514c3
--- /dev/null
+++ b/view/theme/dispy/templates/search_item.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	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}}">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			</div>
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			<div class="wall-item-delete-end"></div>
+		</div>
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+
+
+	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
+	</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
+
+</div>
+
+
diff --git a/view/theme/dispy/templates/theme_settings.tpl b/view/theme/dispy/templates/theme_settings.tpl
new file mode 100644
index 0000000000..7475db28ba
--- /dev/null
+++ b/view/theme/dispy/templates/theme_settings.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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}}
+
+{{include file="field_select.tpl" field=$line_height}}
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="dispy-settings-submit" />
+</div>
+
diff --git a/view/theme/dispy/templates/threaded_conversation.tpl b/view/theme/dispy/templates/threaded_conversation.tpl
new file mode 100644
index 0000000000..9718d0e85d
--- /dev/null
+++ b/view/theme/dispy/templates/threaded_conversation.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems(); return false;">
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{/if}}
diff --git a/view/theme/dispy/templates/wall_thread.tpl b/view/theme/dispy/templates/wall_thread.tpl
new file mode 100644
index 0000000000..94620ad530
--- /dev/null
+++ b/view/theme/dispy/templates/wall_thread.tpl
@@ -0,0 +1,144 @@
+{{*
+ *	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>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                    <ul>
+                        {{$item.item_photo_menu}}
+                    </ul>
+                </div>
+
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">
+				{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}
+			</div>
+			<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}">{{$item.name}}</span></a>
+			</div>
+			<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
+				{{$item.ago}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			<div class="wall-item-lock-wrapper">
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}
+			</div>
+			<ul class="wall-item-subtools1">
+				{{if $item.star}}
+				<li>
+					<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+				</li>
+				{{/if}}
+				{{if $item.tagger}}
+				<li>
+					<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+				</li>
+				{{/if}}
+				{{if $item.vote}}
+				<li class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+					<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+					{{if $item.vote.dislike}}
+					<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+					{{/if}}
+					{{if $item.vote.share}}
+					<a href="#" id="share-{{$item.id}}"
+class="icon recycle wall-item-share-buttons"  title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
+					<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+				</li>
+				{{/if}}
+			</ul><br style="clear:left;" />
+			<ul class="wall-item-subtools2">
+			{{if $item.filer}}
+				<li class="wall-item-filer-wrapper"><a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon file-as" title="{{$item.star.filer}}"></a></li>
+			{{/if}}
+			{{if $item.plink}}
+				<li class="wall-item-links-wrapper{{$item.sparkle}}"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link"></a></li>
+			{{/if}}
+			{{if $item.edpost}}
+				<li><a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a></li>
+			{{/if}}
+
+			<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			</li>
+			</ul>
+			<div class="wall-item-delete-end"></div>
+		</div>
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}">
+				{{$item.body}}
+				<div class="body-tag">
+					{{foreach $item.tags as $tag}}
+						<span class="tag">{{$tag}}</span>
+					{{/foreach}}
+				</div>			
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			</div>
+		</div>
+	</div>	
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like {{$item.indent}} {{$item.shiny}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike {{$item.indent}} {{$item.shiny}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+	<div class="wall-item-comment-separator"></div>
+
+	{{if $item.threaded}}
+	{{if $item.comment}}
+	<div class="wall-item-comment-wrapper {{$item.indent}} {{$item.shiny}}" >
+		{{$item.comment}}
+	</div>
+	{{/if}}
+	{{/if}}
+
+	{{if $item.flatten}}
+	<div class="wall-item-comment-wrapper" >
+		{{$item.comment}}
+	</div>
+	{{/if}}
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
+</div>
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/duepuntozero/templates/comment_item.tpl b/view/theme/duepuntozero/templates/comment_item.tpl
new file mode 100644
index 0000000000..f4655078dd
--- /dev/null
+++ b/view/theme/duepuntozero/templates/comment_item.tpl
@@ -0,0 +1,71 @@
+{{*
+ *	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}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+		{{/if}}
+			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea>			
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
+					</select>
+				{{/if}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/duepuntozero/templates/lang_selector.tpl b/view/theme/duepuntozero/templates/lang_selector.tpl
new file mode 100644
index 0000000000..a1aee8277f
--- /dev/null
+++ b/view/theme/duepuntozero/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{foreach $langs.0 as $v=>$l}}
+				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
+			{{/foreach}}
+		</select>
+	</form>
+</div>
diff --git a/view/theme/duepuntozero/templates/moderated_comment.tpl b/view/theme/duepuntozero/templates/moderated_comment.tpl
new file mode 100644
index 0000000000..b2401ca483
--- /dev/null
+++ b/view/theme/duepuntozero/templates/moderated_comment.tpl
@@ -0,0 +1,66 @@
+{{*
+ *	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}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
+					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
+					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
+					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
+					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
+					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
+				</div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>			
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/duepuntozero/templates/nav.tpl b/view/theme/duepuntozero/templates/nav.tpl
new file mode 100644
index 0000000000..24c48403fe
--- /dev/null
+++ b/view/theme/duepuntozero/templates/nav.tpl
@@ -0,0 +1,75 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+	{{$langselector}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+
+	<span id="nav-link-wrapper" >
+
+	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+		
+	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
+		
+	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+
+	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+
+	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+
+	{{if $nav.network}}
+	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.home}}
+	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.community}}
+	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+	{{/if}}
+	{{if $nav.introductions}}
+	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.messages}}
+	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{/if}}
+
+
+
+
+
+		{{if $nav.notifications}}
+			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
+				<span id="notify-update" class="nav-ajax-left"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+		{{/if}}		
+
+	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
+	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+
+	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
+
+
+	{{if $nav.manage}}<a id="nav-manage-link" class="nav-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
new file mode 100644
index 0000000000..85c6345d6d
--- /dev/null
+++ b/view/theme/duepuntozero/templates/profile_vcard.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="fn label">{{$profile.name}}</div>
+	
+				
+	
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+
+
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-vcard-break"></div>	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/duepuntozero/templates/prv_message.tpl b/view/theme/duepuntozero/templates/prv_message.tpl
new file mode 100644
index 0000000000..1f41d26628
--- /dev/null
+++ b/view/theme/duepuntozero/templates/prv_message.tpl
@@ -0,0 +1,44 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h3>{{$header}}</h3>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="message" method="post" >
+
+{{$parent}}
+
+<div id="prvmail-to-label">{{$to}}</div>
+
+{{if $showinputs}}
+<input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+{{else}}
+{{$select}}
+{{/if}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
+	<div id="prvmail-upload-wrapper" >
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	</div> 
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/theme/facepark/templates/comment_item.tpl b/view/theme/facepark/templates/comment_item.tpl
new file mode 100644
index 0000000000..50bbd89e49
--- /dev/null
+++ b/view/theme/facepark/templates/comment_item.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+				{{foreach $qcomment as $qc}}				
+					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
+					&nbsp;
+				{{/foreach}}
+				{{/if}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/facepark/templates/group_side.tpl b/view/theme/facepark/templates/group_side.tpl
new file mode 100644
index 0000000000..139798beee
--- /dev/null
+++ b/view/theme/facepark/templates/group_side.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="widget" id="group-sidebar">
+<h3>{{$title}}</h3>
+
+<div id="sidebar-group-list">
+	<ul id="sidebar-group-ul">
+		{{foreach $groups as $group}}
+			<li class="sidebar-group-li">
+				{{if $group.cid}}
+					<input type="checkbox" 
+						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
+						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
+						{{if $group.ismember}}checked="checked"{{/if}}
+					/>
+				{{/if}}			
+				{{if $group.edit}}
+					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"></span></a>
+				{{/if}}
+				<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
+			</li>
+		{{/foreach}}
+	</ul>
+	</div>
+  <div id="sidebar-new-group">
+  <a href="group/new">{{$createtext}}</a>
+  </div>
+</div>
+
+
diff --git a/view/theme/facepark/templates/jot.tpl b/view/theme/facepark/templates/jot.tpl
new file mode 100644
index 0000000000..16cc822bdd
--- /dev/null
+++ b/view/theme/facepark/templates/jot.tpl
@@ -0,0 +1,90 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		<div id="jot-text-wrap">
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+		</div>
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>
+
+	<div id="profile-jot-perms-end"></div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$acl}}
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			<div id="profile-jot-email-end"></div>
+			{{$jotnets}}
+		</div>
+	</div>
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/facepark/templates/nav.tpl b/view/theme/facepark/templates/nav.tpl
new file mode 100644
index 0000000000..6119a1a93d
--- /dev/null
+++ b/view/theme/facepark/templates/nav.tpl
@@ -0,0 +1,73 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+	{{$langselector}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+
+	<span id="nav-link-wrapper" >
+
+	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+		
+	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
+		
+	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+
+	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+
+	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+
+	{{if $nav.network}}
+	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.home}}
+	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.community}}
+	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+	{{/if}}
+	{{if $nav.introductions}}
+	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.messages}}
+	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{/if}}
+
+
+
+	{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
+
+
+		{{if $nav.notifications}}
+			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
+				<span id="notify-update" class="nav-ajax-left"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+		{{/if}}		
+
+	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
+	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+
+	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/theme/facepark/templates/profile_vcard.tpl b/view/theme/facepark/templates/profile_vcard.tpl
new file mode 100644
index 0000000000..343a0aafa8
--- /dev/null
+++ b/view/theme/facepark/templates/profile_vcard.tpl
@@ -0,0 +1,52 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="fn label">{{$profile.name}}</div>
+	
+				
+	
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+
+
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/facepark/templates/search_item.tpl b/view/theme/facepark/templates/search_item.tpl
new file mode 100644
index 0000000000..d6bf550074
--- /dev/null
+++ b/view/theme/facepark/templates/search_item.tpl
@@ -0,0 +1,59 @@
+{{*
+ *	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}}">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			</div>
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			<div class="wall-item-delete-end"></div>
+		</div>
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+
+
+	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
+	</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+
+</div>
+
+
diff --git a/view/theme/frost-mobile/settings.tpl.BASE.8446.tpl b/view/theme/frost-mobile/settings.tpl.BASE.8446.tpl
new file mode 100644
index 0000000000..3e8b33d7f0
--- /dev/null
+++ b/view/theme/frost-mobile/settings.tpl.BASE.8446.tpl
@@ -0,0 +1,144 @@
+<h1>$ptitle</h1>
+
+$nickname_block
+
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+<h3 class="settings-heading">$h_pass</h3>
+
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
+
+{{ if $oid_enable }}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
+{{ endif }}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_basic</h3>
+
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_prv</h3>
+
+
+<input type="hidden" name="visibility" value="$visibility" />
+
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
+
+$profile_in_dir
+
+$profile_in_net_dir
+
+$hide_friends
+
+$hide_wall
+
+$blockwall
+
+$blocktags
+
+$suggestme
+
+$unkmail
+
+
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
+
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+
+
+<div class="field input">
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
+	<div style="display: none;">
+		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+			<h3>$expire.advanced</h3>
+			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
+		</div>
+	</div>
+
+</div>
+
+
+<div id="settings-default-perms" class="settings-default-perms" >
+	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+{#<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->#}
+	
+	<div style="display: none;">
+		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
+			$aclselect
+		</div>
+	</div>
+
+{#<!--	</div>-->#}
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+$group_select
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+
+<h3 class="settings-heading">$h_not</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">$activity_options</div>
+
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
+
+
+<div id="settings-notify-desc">$lbl_not</div>
+
+<div class="group">
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+</div>
+
+</div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
+
+$pagetype
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
diff --git a/view/theme/frost-mobile/settings.tpl.LOCAL.8446.tpl b/view/theme/frost-mobile/settings.tpl.LOCAL.8446.tpl
new file mode 100644
index 0000000000..8e5aff019b
--- /dev/null
+++ b/view/theme/frost-mobile/settings.tpl.LOCAL.8446.tpl
@@ -0,0 +1,147 @@
+<h1>$ptitle</h1>
+
+$nickname_block
+
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+<h3 class="settings-heading">$h_pass</h3>
+
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
+{{inc field_password.tpl with $field=$password3 }}{{endinc}}
+
+{{ if $oid_enable }}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
+{{ endif }}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_basic</h3>
+
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_password.tpl with $field=$password4 }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_prv</h3>
+
+
+<input type="hidden" name="visibility" value="$visibility" />
+
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
+
+$profile_in_dir
+
+$profile_in_net_dir
+
+$hide_friends
+
+$hide_wall
+
+$blockwall
+
+$blocktags
+
+$suggestme
+
+$unkmail
+
+
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
+
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+
+
+<div class="field input">
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
+	<div style="display: none;">
+		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+			<h3>$expire.advanced</h3>
+			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
+		</div>
+	</div>
+
+</div>
+
+
+<div id="settings-default-perms" class="settings-default-perms" >
+	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+{#<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->#}
+	
+	<div style="display: none;">
+		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
+			$aclselect
+		</div>
+	</div>
+
+{#<!--	</div>-->#}
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+$group_select
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+
+<h3 class="settings-heading">$h_not</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">$activity_options</div>
+
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
+
+
+<div id="settings-notify-desc">$lbl_not</div>
+
+<div class="group">
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
+</div>
+
+</div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
+
+$pagetype
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
diff --git a/view/theme/frost-mobile/templates/acl_selector.tpl b/view/theme/frost-mobile/templates/acl_selector.tpl
new file mode 100644
index 0000000000..d18776e367
--- /dev/null
+++ b/view/theme/frost-mobile/templates/acl_selector.tpl
@@ -0,0 +1,28 @@
+{{*
+ *	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>
+	<div id="acl-list">
+		<div id="acl-list-content">
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</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>
+
+<script>
+	window.allowCID = {{$allowcid}};
+	window.allowGID = {{$allowgid}};
+	window.denyCID = {{$denycid}};
+	window.denyGID = {{$denygid}};
+	window.aclInit = "true";
+</script>
diff --git a/view/theme/frost-mobile/templates/admin_aside.tpl b/view/theme/frost-mobile/templates/admin_aside.tpl
new file mode 100644
index 0000000000..024d6195b5
--- /dev/null
+++ b/view/theme/frost-mobile/templates/admin_aside.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
+	<li class='admin button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
+	<li class='admin button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
+	<li class='admin button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
+	<li class='admin button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
+</ul>
+
+{{if $admin.update}}
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+	<li class='admin button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{/if}}
+
+
+{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
+<ul class='admin linklist'>
+	{{foreach $admin.plugins_admin as $l}}
+	<li class='admin button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
+	{{/foreach}}
+</ul>
+	
+	
+<h4>{{$logtxt}}</h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
+</ul>
+
diff --git a/view/theme/frost-mobile/templates/admin_site.tpl b/view/theme/frost-mobile/templates/admin_site.tpl
new file mode 100644
index 0000000000..035024e689
--- /dev/null
+++ b/view/theme/frost-mobile/templates/admin_site.tpl
@@ -0,0 +1,72 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+	{{include file="field_select.tpl" field=$theme_mobile}}
+	{{include file="field_select.tpl" field=$ssl_policy}}
+	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$hide_help}} 
+	{{include file="field_select.tpl" field=$singleuser}} 
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$registration}}</h3>
+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	
+	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+	{{include file="field_checkbox.tpl" field=$no_openid}}
+	{{include file="field_checkbox.tpl" field=$no_regfullname}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+
+	<h3>{{$upload}}</h3>
+	{{include file="field_input.tpl" field=$maximagesize}}
+	{{include file="field_input.tpl" field=$maximagelength}}
+	{{include file="field_input.tpl" field=$jpegimagequality}}
+	
+	<h3>{{$corporate}}</h3>
+	{{include file="field_input.tpl" field=$allowed_sites}}
+	{{include file="field_input.tpl" field=$allowed_email}}
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$no_community_page}}
+	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
+	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+	{{include file="field_checkbox.tpl" field=$dfrn_only}}
+	{{include file="field_input.tpl" field=$global_directory}}
+	{{include file="field_checkbox.tpl" field=$thread_allow}}
+	{{include file="field_checkbox.tpl" field=$newuser_private}}
+	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
+	{{include file="field_checkbox.tpl" field=$private_addons}}	
+	{{include file="field_checkbox.tpl" field=$disable_embedded}}	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$advanced}}</h3>
+	{{include file="field_checkbox.tpl" field=$no_utf}}
+	{{include file="field_checkbox.tpl" field=$verifyssl}}
+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	</form>
+</div>
diff --git a/view/theme/frost-mobile/templates/admin_users.tpl b/view/theme/frost-mobile/templates/admin_users.tpl
new file mode 100644
index 0000000000..4d88670c17
--- /dev/null
+++ b/view/theme/frost-mobile/templates/admin_users.tpl
@@ -0,0 +1,103 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function selectall(cls){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.created}}</td>
+					<td class="name">{{$u.name}}</td>
+					<td class="email">{{$u.email}}</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/theme/frost-mobile/templates/categories_widget.tpl b/view/theme/frost-mobile/templates/categories_widget.tpl
new file mode 100644
index 0000000000..1749fced3f
--- /dev/null
+++ b/view/theme/frost-mobile/templates/categories_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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>
+	
+	<ul class="categories-ul">
+		<li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+			<li class="tool"><a href="{{$base}}?f=&category={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>-->*}}
diff --git a/view/theme/frost-mobile/templates/comment_item.tpl b/view/theme/frost-mobile/templates/comment_item.tpl
new file mode 100644
index 0000000000..1b22ea9c6e
--- /dev/null
+++ b/view/theme/frost-mobile/templates/comment_item.tpl
@@ -0,0 +1,83 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--		<script>
+		$(document).ready( function () {
+			$(document).mouseup(function(e) {
+				var container = $("#comment-edit-wrapper-{{$id}}");
+				if( container.has(e.target).length === 0) {
+					commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
+					cmtBbClose({{$id}});
+				}
+			});
+		});
+		</script>-->*}}
+
+		<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;" >
+			<form class="comment-edit-form {{$indent}}" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;" >
+{{*<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
+			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="source" value="{{$sourceapp}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				{{*<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
+					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				{{*<!--</div>-->*}}
+				{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+{{*<!--					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>-->*}}
+				</ul>	
+				{{*<!--<div class="comment-edit-bb-end"></div>-->*}}
+{{*<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
+					</select>
+				{{/if}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					{{*<!--<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="preview-link fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>-->*}}
+				</div>
+
+				{{*<!--<div class="comment-edit-end"></div>-->*}}
+			</form>
+
+		</div>
diff --git a/view/theme/frost-mobile/templates/common_tabs.tpl b/view/theme/frost-mobile/templates/common_tabs.tpl
new file mode 100644
index 0000000000..9fa4ed41d9
--- /dev/null
+++ b/view/theme/frost-mobile/templates/common_tabs.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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>
+	{{/foreach}}
+	<div id="tabs-end"></div>
+</ul>
diff --git a/view/theme/frost-mobile/templates/contact_block.tpl b/view/theme/frost-mobile/templates/contact_block.tpl
new file mode 100644
index 0000000000..5a0a26b87e
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contact_block.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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}}
+		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
+		<div class='contact-block-content'>
+		{{foreach $micropro as $m}}
+			{{$m}}
+		{{/foreach}}
+		</div>
+{{/if}}
+</div>
+<div class="clear"></div>-->*}}
diff --git a/view/theme/frost-mobile/templates/contact_edit.tpl b/view/theme/frost-mobile/templates/contact_edit.tpl
new file mode 100644
index 0000000000..924acb0c1a
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contact_edit.tpl
@@ -0,0 +1,98 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h2>{{$header}}</h2>
+
+<div id="contact-edit-wrapper" >
+
+	{{$tab_str}}
+
+	<div id="contact-edit-drop-link" >
+		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
+	</div>
+
+	<div id="contact-edit-drop-link-end"></div>
+
+	<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>
+	</div>
+
+
+	<div id="contact-edit-nav-wrapper" >
+		<div id="contact-edit-links">
+			<ul>
+				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
+				{{if $lost_contact}}
+					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
+				{{/if}}
+				{{if $insecure}}
+					<li><div id="insecure-message">{{$insecure}}</div></li>
+				{{/if}}
+				{{if $blocked}}
+					<li><div id="block-message">{{$blocked}}</div></li>
+				{{/if}}
+				{{if $ignored}}
+					<li><div id="ignore-message">{{$ignored}}</div></li>
+				{{/if}}
+				{{if $archived}}
+					<li><div id="archive-message">{{$archived}}</div></li>
+				{{/if}}
+
+				<li>&nbsp;</li>
+
+				{{if $common_text}}
+					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
+				{{/if}}
+				{{if $all_friends}}
+					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
+				{{/if}}
+
+
+				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+				{{if $lblsuggest}}
+					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
+				{{/if}}
+
+			</ul>
+		</div>
+	</div>
+	<div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/{{$contact_id}}" method="post" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}">
+
+	{{if $poll_enabled}}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
+			<span id="contact-edit-poll-text">{{$updpub}} {{$poll_interval}}</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
+		</div>
+	{{/if}}
+	<div id="contact-edit-end" ></div>
+
+	{{include file="field_checkbox.tpl" field=$hidden}}
+
+<div id="contact-edit-info-wrapper">
+<h4>{{$lbl_info1}}</h4>
+	<textarea id="contact-edit-info" rows="8"{{* cols="35"*}} name="info">{{$info}}</textarea>
+	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>{{$lbl_vis1}}</h4>
+<p>{{$lbl_vis2}}</p> 
+</div>
+{{$profile_select}}
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+</div>
diff --git a/view/theme/frost-mobile/templates/contact_head.tpl b/view/theme/frost-mobile/templates/contact_head.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/theme/frost-mobile/templates/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/templates/contact_template.tpl b/view/theme/frost-mobile/templates/contact_template.tpl
new file mode 100644
index 0000000000..7d257dabcc
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contact_template.tpl
@@ -0,0 +1,41 @@
+{{*
+ *	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" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}});" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
+
+{{*<!--			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>-->*}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">
+			<img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
+			</span>
+
+			{{if $contact.photo_menu}}
+{{*<!--			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>-->*}}
+                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                    <ul>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
+{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/frost-mobile/templates/contacts-end.tpl b/view/theme/frost-mobile/templates/contacts-end.tpl
new file mode 100644
index 0000000000..9298a4245c
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contacts-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/templates/contacts-head.tpl b/view/theme/frost-mobile/templates/contacts-head.tpl
new file mode 100644
index 0000000000..dd66b71d3e
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contacts-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.autocompleteType = 'contacts-head';
+</script>
+
diff --git a/view/theme/frost-mobile/templates/contacts-template.tpl b/view/theme/frost-mobile/templates/contacts-template.tpl
new file mode 100644
index 0000000000..b9162c2e9e
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contacts-template.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	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}}
+
+<div id="contacts-search-wrapper">
+<form id="contacts-search-form" action="{{$cmd}}" method="get" >
+<span class="contacts-search-desc">{{$desc}}</span>
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
+<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
+</form>
+</div>
+<div id="contacts-search-end"></div>
+
+{{$tabs}}
+
+
+<div id="contacts-display-wrapper">
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+</div>
+<div id="contact-edit-end"></div>
+
+{{$paginate}}
+
+
+
+
diff --git a/view/theme/frost-mobile/templates/contacts-widget-sidebar.tpl b/view/theme/frost-mobile/templates/contacts-widget-sidebar.tpl
new file mode 100644
index 0000000000..bda321896e
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contacts-widget-sidebar.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$follow_widget}}
+
diff --git a/view/theme/frost-mobile/templates/conversation.tpl b/view/theme/frost-mobile/templates/conversation.tpl
new file mode 100644
index 0000000000..f6810bb100
--- /dev/null
+++ b/view/theme/frost-mobile/templates/conversation.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
+	{{foreach $thread.items as $item}}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
+			</div>
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
+		
+		{{include file="{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+</div>
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{*<!--{{if $dropping}}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{/if}}-->*}}
diff --git a/view/theme/frost-mobile/templates/cropbody.tpl b/view/theme/frost-mobile/templates/cropbody.tpl
new file mode 100644
index 0000000000..5ace9a1aaf
--- /dev/null
+++ b/view/theme/frost-mobile/templates/cropbody.tpl
@@ -0,0 +1,32 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+<p id="cropimage-desc">
+{{$desc}}
+</p>
+<div id="cropimage-wrapper">
+<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="{{$done}}" />
+</div>
+
+</form>
diff --git a/view/theme/frost-mobile/templates/cropend.tpl b/view/theme/frost-mobile/templates/cropend.tpl
new file mode 100644
index 0000000000..7a828815b9
--- /dev/null
+++ b/view/theme/frost-mobile/templates/cropend.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+      <script type="text/javascript" language="javascript">initCrop();</script>
diff --git a/view/theme/frost-mobile/templates/crophead.tpl b/view/theme/frost-mobile/templates/crophead.tpl
new file mode 100644
index 0000000000..6438cfb354
--- /dev/null
+++ b/view/theme/frost-mobile/templates/crophead.tpl
@@ -0,0 +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/templates/display-head.tpl b/view/theme/frost-mobile/templates/display-head.tpl
new file mode 100644
index 0000000000..17d17dd7db
--- /dev/null
+++ b/view/theme/frost-mobile/templates/display-head.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/templates/end.tpl b/view/theme/frost-mobile/templates/end.tpl
new file mode 100644
index 0000000000..435c190fb9
--- /dev/null
+++ b/view/theme/frost-mobile/templates/end.tpl
@@ -0,0 +1,27 @@
+{{*
+ *	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]-->
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+<script type="text/javascript">
+  tinyMCE.init({ mode : "none"});
+</script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/acl.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/theme.min.js"></script>
+
diff --git a/view/theme/frost-mobile/templates/event.tpl b/view/theme/frost-mobile/templates/event.tpl
new file mode 100644
index 0000000000..15c4e2b937
--- /dev/null
+++ b/view/theme/frost-mobile/templates/event.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{foreach $events as $event}}
+	<div class="event">
+	
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
+	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link tool s22 pencil"></a>{{/if}}
+	</div>
+	<div class="clear"></div>
+{{/foreach}}
diff --git a/view/theme/frost-mobile/templates/event_end.tpl b/view/theme/frost-mobile/templates/event_end.tpl
new file mode 100644
index 0000000000..c275be9236
--- /dev/null
+++ b/view/theme/frost-mobile/templates/event_end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/templates/event_head.tpl b/view/theme/frost-mobile/templates/event_head.tpl
new file mode 100644
index 0000000000..9d1c4b5f94
--- /dev/null
+++ b/view/theme/frost-mobile/templates/event_head.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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">
+window.aclType = 'event_head';
+</script>
+
diff --git a/view/theme/frost-mobile/templates/field_checkbox.tpl b/view/theme/frost-mobile/templates/field_checkbox.tpl
new file mode 100644
index 0000000000..f7f857f592
--- /dev/null
+++ b/view/theme/frost-mobile/templates/field_checkbox.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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>
+		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><br />
+		<span class='field_help' id='help_id_{{$field.0}}'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost-mobile/templates/field_input.tpl b/view/theme/frost-mobile/templates/field_input.tpl
new file mode 100644
index 0000000000..240bed249f
--- /dev/null
+++ b/view/theme/frost-mobile/templates/field_input.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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 />
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost-mobile/templates/field_openid.tpl b/view/theme/frost-mobile/templates/field_openid.tpl
new file mode 100644
index 0000000000..d5ebd9a3b6
--- /dev/null
+++ b/view/theme/frost-mobile/templates/field_openid.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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 />
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost-mobile/templates/field_password.tpl b/view/theme/frost-mobile/templates/field_password.tpl
new file mode 100644
index 0000000000..f1352f27b2
--- /dev/null
+++ b/view/theme/frost-mobile/templates/field_password.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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 />
+		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost-mobile/templates/field_themeselect.tpl b/view/theme/frost-mobile/templates/field_themeselect.tpl
new file mode 100644
index 0000000000..0d4552c3bf
--- /dev/null
+++ b/view/theme/frost-mobile/templates/field_themeselect.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+	<div class='field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5}}onchange="previewTheme(this);"{{/if}} >
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<span class='field_help'>{{$field.3}}</span>
+		<div id="theme-preview"></div>
+	</div>
diff --git a/view/theme/frost-mobile/templates/generic_links_widget.tpl b/view/theme/frost-mobile/templates/generic_links_widget.tpl
new file mode 100644
index 0000000000..705ddb57cb
--- /dev/null
+++ b/view/theme/frost-mobile/templates/generic_links_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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}}
+	
+	<ul class="tabs links-widget">
+		{{foreach $items as $item}}
+			<li class="tool"><a href="{{$item.url}}" class="tab {{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
+		{{/foreach}}
+		<div id="tabs-end"></div>
+	</ul>
+	
+</div>
diff --git a/view/theme/frost-mobile/templates/group_drop.tpl b/view/theme/frost-mobile/templates/group_drop.tpl
new file mode 100644
index 0000000000..2693228154
--- /dev/null
+++ b/view/theme/frost-mobile/templates/group_drop.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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();" 
+		id="group-delete-icon-{{$id}}" 
+		class="icon drophide group-delete-icon" 
+		{{*onmouseover="imgbright(this);" 
+		onmouseout="imgdull(this);"*}} ></a>
+</div>
+<div class="group-delete-end"></div>
diff --git a/view/theme/frost-mobile/templates/head.tpl b/view/theme/frost-mobile/templates/head.tpl
new file mode 100644
index 0000000000..d11d072f26
--- /dev/null
+++ b/view/theme/frost-mobile/templates/head.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	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'>
+<meta content='320' name='MobileOptimized'>-->*}}
+<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
+{{*<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->*}}
+
+<base href="{{$baseurl}}/" />
+<meta name="generator" content="{{$generator}}" />
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->*}}
+<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
+
+<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
+<link rel="search"
+         href="{{$baseurl}}/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<script>
+	window.delItem = "{{$delitem}}";
+	window.commentEmptyText = "{{$comment}}";
+	window.showMore = "{{$showmore}}";
+	window.showFewer = "{{$showfewer}}";
+	var updateInterval = {{$update_interval}};
+	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
+</script>
+
diff --git a/view/theme/frost-mobile/templates/jot-end.tpl b/view/theme/frost-mobile/templates/jot-end.tpl
new file mode 100644
index 0000000000..055ecc5e61
--- /dev/null
+++ b/view/theme/frost-mobile/templates/jot-end.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+
+<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
+
diff --git a/view/theme/frost-mobile/templates/jot-header.tpl b/view/theme/frost-mobile/templates/jot-header.tpl
new file mode 100644
index 0000000000..bfaf3d5e06
--- /dev/null
+++ b/view/theme/frost-mobile/templates/jot-header.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	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
+	window.editSelect = {{$editselect}};
+	window.isPublic = "{{$ispublic}}";
+	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	window.vidURL = "{{$vidurl}}";
+	window.audURL = "{{$audurl}}";
+	window.whereAreU = "{{$whereareu}}";
+	window.term = "{{$term}}";
+	window.baseURL = "{{$baseurl}}";
+	window.geoTag = function () { {{$geotag}} }
+	window.jotId = "#profile-jot-text";
+	window.imageUploadButton = 'wall-image-upload';
+</script>
+
+
diff --git a/view/theme/frost-mobile/templates/jot.tpl b/view/theme/frost-mobile/templates/jot.tpl
new file mode 100644
index 0000000000..1dcfc0b21c
--- /dev/null
+++ b/view/theme/frost-mobile/templates/jot.tpl
@@ -0,0 +1,96 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="source" value="{{$sourceapp}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
+		{{/if}}
+		<div id="jot-text-wrap">
+		{{*<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />-->*}}
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+		</div>
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
+	</div> 
+
+	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->*}}
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>
+
+	<div id="profile-jot-perms-end"></div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper">
+			{{$acl}}
+			<hr/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			{{$jotnets}}
+			<div id="profile-jot-networks-end"></div>
+		</div>
+	</div>
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{if $content}}<script>window.jotInit = true;</script>{{/if}}
diff --git a/view/theme/frost-mobile/templates/jot_geotag.tpl b/view/theme/frost-mobile/templates/jot_geotag.tpl
new file mode 100644
index 0000000000..d828980e58
--- /dev/null
+++ b/view/theme/frost-mobile/templates/jot_geotag.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			var lat = position.coords.latitude.toFixed(4);
+			var lon = position.coords.longitude.toFixed(4);
+
+			$j('#jot-coord').val(lat + ', ' + lon);
+			$j('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/theme/frost-mobile/templates/lang_selector.tpl b/view/theme/frost-mobile/templates/lang_selector.tpl
new file mode 100644
index 0000000000..a1aee8277f
--- /dev/null
+++ b/view/theme/frost-mobile/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{foreach $langs.0 as $v=>$l}}
+				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
+			{{/foreach}}
+		</select>
+	</form>
+</div>
diff --git a/view/theme/frost-mobile/templates/like_noshare.tpl b/view/theme/frost-mobile/templates/like_noshare.tpl
new file mode 100644
index 0000000000..1ad1eeaeec
--- /dev/null
+++ b/view/theme/frost-mobile/templates/like_noshare.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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="tool like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
+	{{if $nolike}}
+	<a href="#" class="tool dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
+	{{/if}}
+	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+</div>
diff --git a/view/theme/frost-mobile/templates/login.tpl b/view/theme/frost-mobile/templates/login.tpl
new file mode 100644
index 0000000000..a361f3e271
--- /dev/null
+++ b/view/theme/frost-mobile/templates/login.tpl
@@ -0,0 +1,50 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="login-form">
+<form action="{{$dest_url}}" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{include file="field_input.tpl" field=$lname}}
+	{{include file="field_password.tpl" field=$lpassword}}
+	</div>
+	
+	{{if $openid}}
+			<div id="login_openid">
+			{{include file="field_openid.tpl" field=$lopenid}}
+			</div>
+	{{/if}}
+
+	<br />
+	<div id='login-footer'>
+<!--	<div class="login-extra-links">
+	By signing in you agree to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>-->
+
+	<br />
+	{{include file="field_checkbox.tpl" field=$lremember}}
+
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
+	</div>
+
+	<br /><br />
+	<div class="login-extra-links">
+		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
+        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+	</div>
+	</div>
+	
+	{{foreach $hiddens as $k=>$v}}
+		<input type="hidden" name="{{$k}}" value="{{$v}}" />
+	{{/foreach}}
+	
+	
+</form>
+</div>
+
+<script type="text/javascript">window.loginName = "{{$lname.0}}";</script>
diff --git a/view/theme/frost-mobile/templates/login_head.tpl b/view/theme/frost-mobile/templates/login_head.tpl
new file mode 100644
index 0000000000..c2d9504ad3
--- /dev/null
+++ b/view/theme/frost-mobile/templates/login_head.tpl
@@ -0,0 +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/templates/lostpass.tpl b/view/theme/frost-mobile/templates/lostpass.tpl
new file mode 100644
index 0000000000..5a22c245bf
--- /dev/null
+++ b/view/theme/frost-mobile/templates/lostpass.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="lostpass-form">
+<h2>{{$title}}</h2>
+<br /><br /><br />
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper" class="field input">
+        <label for="login-name" id="label-login-name">{{$name}}</label><br />
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+</div>
+<div id="login-extra-end"></div>
+<p id="lostpass-desc">
+{{$desc}}
+</p>
+<br />
+
+<div id="login-submit-wrapper" >
+        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+</div>
diff --git a/view/theme/frost-mobile/templates/mail_conv.tpl b/view/theme/frost-mobile/templates/mail_conv.tpl
new file mode 100644
index 0000000000..c6d9aa03af
--- /dev/null
+++ b/view/theme/frost-mobile/templates/mail_conv.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	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>
+	</div>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<div class="mail-conv-date">{{$mail.date}}</div>
+		<div class="mail-conv-subject">{{$mail.subject}}</div>
+	</div>
+	<div class="mail-conv-body">{{$mail.body}}</div>
+</div>
+<div class="mail-conv-outside-wrapper-end"></div>
+
+
+<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a></div>
+<div class="mail-conv-delete-end"></div>
+
+<hr class="mail-conv-break" />
diff --git a/view/theme/frost-mobile/templates/mail_list.tpl b/view/theme/frost-mobile/templates/mail_list.tpl
new file mode 100644
index 0000000000..0607c15c73
--- /dev/null
+++ b/view/theme/frost-mobile/templates/mail_list.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	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>
+	</div>
+	<div class="mail-list-detail">
+		<div class="mail-list-sender-name" >{{$from_name}}</div>
+		<div class="mail-list-date">{{$date}}</div>
+		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
+		<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
+	</div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/frost-mobile/templates/message-end.tpl b/view/theme/frost-mobile/templates/message-end.tpl
new file mode 100644
index 0000000000..9298a4245c
--- /dev/null
+++ b/view/theme/frost-mobile/templates/message-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/templates/message-head.tpl b/view/theme/frost-mobile/templates/message-head.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/theme/frost-mobile/templates/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/templates/moderated_comment.tpl b/view/theme/frost-mobile/templates/moderated_comment.tpl
new file mode 100644
index 0000000000..b2401ca483
--- /dev/null
+++ b/view/theme/frost-mobile/templates/moderated_comment.tpl
@@ -0,0 +1,66 @@
+{{*
+ *	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}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
+					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
+					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
+					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
+					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
+					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
+				</div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>			
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/frost-mobile/templates/msg-end.tpl b/view/theme/frost-mobile/templates/msg-end.tpl
new file mode 100644
index 0000000000..594f3f79b9
--- /dev/null
+++ b/view/theme/frost-mobile/templates/msg-end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	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/templates/msg-header.tpl b/view/theme/frost-mobile/templates/msg-header.tpl
new file mode 100644
index 0000000000..b0a0f79457
--- /dev/null
+++ b/view/theme/frost-mobile/templates/msg-header.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	var plaintext = "none";
+	window.jotId = "#prvmail-text";
+	window.imageUploadButton = 'prvmail-upload';
+	window.autocompleteType = 'msg-header';
+</script>
+
diff --git a/view/theme/frost-mobile/templates/nav.tpl b/view/theme/frost-mobile/templates/nav.tpl
new file mode 100644
index 0000000000..2c9f29d503
--- /dev/null
+++ b/view/theme/frost-mobile/templates/nav.tpl
@@ -0,0 +1,151 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+{{*<!--	{{$langselector}} -->*}}
+
+{{*<!--	<div id="site-location">{{$sitelocation}}</div> -->*}}
+
+	<span id="nav-link-wrapper" >
+
+{{*<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->*}}
+	<img rel="#system-menu-list" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/menu.png">
+{{*<!--	</a>-->*}}
+	<ul id="system-menu-list" class="nav-menu-list">
+		{{if $nav.login}}
+		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
+		{{/if}}
+
+		{{if $nav.register}}
+		<a id="nav-register-link" class="nav-load-page-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>
+		{{/if}}
+
+		{{if $nav.settings}}
+		<li><a id="nav-settings-link" class="{{$nav.settings.2}} nav-load-page-link" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.manage}}
+		<li>
+		<a id="nav-manage-link" class="nav-load-page-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.profiles}}
+		<li><a id="nav-profiles-link" class="{{$nav.profiles.2}} nav-load-page-link" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.admin}}
+		<li><a id="nav-admin-link" class="{{$nav.admin.2}} nav-load-page-link" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>
+		{{/if}}
+
+		<li><a id="nav-search-link" class="{{$nav.search.2}} nav-load-page-link" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a></li>
+
+		{{if $nav.apps}}
+		<li><a id="nav-apps-link" class="{{$nav.apps.2}} nav-load-page-link" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.help}}
+		<li><a id="nav-help-link" class="{{$nav.help.2}} nav-load-page-link" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>
+		{{/if}}
+		
+		{{if $nav.logout}}
+		<li><a id="nav-logout-link" class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
+		{{/if}}
+	</ul>
+	</div>
+
+	{{if $nav.notifications}}
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">-->*}}
+	<img rel="#nav-notifications-menu" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/notifications.png">
+{{*<!--	</a>-->*}}
+	<span id="notify-update" class="nav-ajax-left"></span>
+	<ul id="nav-notifications-menu" class="notifications-menu-popup">
+		<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+		<li class="empty">{{$emptynotifications}}</li>
+	</ul>
+	</div>
+	{{/if}}		
+
+{{*<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->*}}
+	<img rel="#contacts-menu-list"  class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/contacts.png">
+	{{*<!--</a>-->*}}
+	{{if $nav.introductions}}
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	<ul id="contacts-menu-list" class="nav-menu-list">
+		{{if $nav.contacts}}
+		<li><a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><li>
+		{{/if}}
+
+		<li><a id="nav-directory-link" class="{{$nav.directory.2}} nav-load-page-link" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><li>
+
+		{{if $nav.introductions}}
+		<li>
+		<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+	</div>
+
+	{{if $nav.messages}}
+{{*<!--	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->*}}
+	<div class="nav-button-container">
+	<a id="nav-messages-link" class="{{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
+	<img src="{{$baseurl}}/view/theme/frost-mobile/images/message.png" class="nav-link">
+	</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	</div>
+	{{/if}}
+
+{{*<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->*}}
+	<img rel="#network-menu-list" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/network.png">
+{{*<!--	</a>-->*}}
+	{{if $nav.network}}
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{/if}}
+	<ul id="network-menu-list" class="nav-menu-list">
+		{{if $nav.network}}
+		<li>
+		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+		</li>
+		{{*<!--<span id="net-update" class="nav-ajax-left"></span>-->*}}
+		{{/if}}
+
+		{{if $nav.network}}
+		<li>
+		<a class="nav-menu-icon network-reset-link nav-link" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">{{$nav.net_reset.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.home}}
+		<li><a id="nav-home-link" class="{{$nav.home.2}} {{$sel.home}} nav-load-page-link" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a></li>
+		{{*<!--<span id="home-update" class="nav-ajax-left"></span>-->*}}
+		{{/if}}
+
+		{{if $nav.community}}
+		<li>
+		<a id="nav-community-link" class="{{$nav.community.2}} {{$sel.community}} nav-load-page-link" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+	</div>
+
+	</span>
+	{{*<!--<span id="nav-end"></span>-->*}}
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/theme/frost-mobile/templates/photo_drop.tpl b/view/theme/frost-mobile/templates/photo_drop.tpl
new file mode 100644
index 0000000000..96fa27880c
--- /dev/null
+++ b/view/theme/frost-mobile/templates/photo_drop.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+<div class="wall-item-delete-end"></div>
diff --git a/view/theme/frost-mobile/templates/photo_edit.tpl b/view/theme/frost-mobile/templates/photo_edit.tpl
new file mode 100644
index 0000000000..87df97b4bf
--- /dev/null
+++ b/view/theme/frost-mobile/templates/photo_edit.tpl
@@ -0,0 +1,63 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
+
+	<input type="hidden" name="item_id" value="{{$item_id}}" />
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
+	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
+	</div>
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
+	<input id="photo-edit-caption" type="text" size="32" name="desc" value="{{$caption}}" />
+	</div>
+
+	<div id="photo-edit-caption-end"></div>
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
+	<input name="newtag" id="photo-edit-newtag" size="32" title="{{$help_tags}}" type="text" />
+	</div>
+
+	<div id="photo-edit-tags-end"></div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">{{$rotatecw}}</label>
+	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+	</div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">{{$rotateccw}}</label>
+	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="{{$permissions}}"/>
+			<span id="jot-perms-icon" class="icon {{$lockstate}} photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
+		</a>
+		<div id="photo-edit-perms-menu-end"></div>
+		
+		<div style="display: none;">
+			<div id="photo-edit-perms-select" >
+				{{$aclselect}}
+			</div>
+		</div>
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+
diff --git a/view/theme/frost-mobile/templates/photo_edit_head.tpl b/view/theme/frost-mobile/templates/photo_edit_head.tpl
new file mode 100644
index 0000000000..857e6e63ac
--- /dev/null
+++ b/view/theme/frost-mobile/templates/photo_edit_head.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.prevLink = "{{$prevlink}}";
+	window.nextLink = "{{$nextlink}}";
+	window.photoEdit = true;
+
+</script>
diff --git a/view/theme/frost-mobile/templates/photo_view.tpl b/view/theme/frost-mobile/templates/photo_view.tpl
new file mode 100644
index 0000000000..354fb9c28b
--- /dev/null
+++ b/view/theme/frost-mobile/templates/photo_view.tpl
@@ -0,0 +1,47 @@
+{{*
+ *	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>
+
+<div id="photo-edit-link-wrap">
+{{if $tools}}
+<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
+|
+<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
+{{/if}}
+{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
+</div>
+
+<div id="photo-nav">
+	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><img src="view/theme/frost-mobile/images/arrow-left.png"></a></div>{{/if}}
+	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><img src="view/theme/frost-mobile/images/arrow-right.png"></a></div>{{/if}}
+</div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo-end"></div>
+<div id="photo-caption">{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
+
+{{if $edit}}
+{{$edit}}
+{{else}}
+
+{{if $likebuttons}}
+<div id="photo-like-div">
+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
+</div>
+{{/if}}
+
+{{$comments}}
+
+{{$paginate}}
+{{/if}}
+
diff --git a/view/theme/frost-mobile/templates/photos_head.tpl b/view/theme/frost-mobile/templates/photos_head.tpl
new file mode 100644
index 0000000000..5d7e0152da
--- /dev/null
+++ b/view/theme/frost-mobile/templates/photos_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+
diff --git a/view/theme/frost-mobile/templates/photos_upload.tpl b/view/theme/frost-mobile/templates/photos_upload.tpl
new file mode 100644
index 0000000000..d0b5135cb7
--- /dev/null
+++ b/view/theme/frost-mobile/templates/photos_upload.tpl
@@ -0,0 +1,55 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$pagename}}</h3>
+
+<div id="photos-usage-message">{{$usage}}</div>
+
+<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
+		<select id="photos-upload-album-select" name="album">
+		{{$albumselect}}
+		</select>
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	{{$default_upload_box}}
+
+	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+	</div>
+
+
+	<div id="photos-upload-perms" class="photos-upload-perms" >
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
+		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
+		</a>
+	</div>
+	<div id="photos-upload-perms-end"></div>
+
+	<div style="display: none;">
+		<div id="photos-upload-permissions-wrapper">
+			{{$aclselect}}
+		</div>
+	</div>
+
+	<div id="photos-upload-spacer"></div>
+
+	{{$alt_uploader}}
+
+	{{$default_upload_submit}}
+
+	<div class="photos-upload-end" ></div>
+</form>
+
diff --git a/view/theme/frost-mobile/templates/profed_end.tpl b/view/theme/frost-mobile/templates/profed_end.tpl
new file mode 100644
index 0000000000..048c52c44d
--- /dev/null
+++ b/view/theme/frost-mobile/templates/profed_end.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script type="text/javascript" src="js/country.min.js" ></script>
+
+<script language="javascript" type="text/javascript">
+	Fill_Country('{{$country_name}}');
+	Fill_States('{{$region}}');
+</script>
+
diff --git a/view/theme/frost-mobile/templates/profed_head.tpl b/view/theme/frost-mobile/templates/profed_head.tpl
new file mode 100644
index 0000000000..e4fef64d63
--- /dev/null
+++ b/view/theme/frost-mobile/templates/profed_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+	window.editSelect = "none";
+</script>
+
diff --git a/view/theme/frost-mobile/templates/profile_edit.tpl b/view/theme/frost-mobile/templates/profile_edit.tpl
new file mode 100644
index 0000000000..2a38795d66
--- /dev/null
+++ b/view/theme/frost-mobile/templates/profile_edit.tpl
@@ -0,0 +1,327 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$default}}
+
+<h1>{{$banner}}</h1>
+
+<div id="profile-edit-links">
+<ul>
+<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
+<li></li>
+<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+
+<div id="profile-edit-wrapper" >
+<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<div id="profile-edit-profile-name-wrapper" >
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
+<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
+</div>
+<div id="profile-edit-profile-name-end"></div>
+
+<div id="profile-edit-name-wrapper" >
+<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
+<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-pdesc-wrapper" >
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
+<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
+</div>
+<div id="profile-edit-pdesc-end"></div>
+
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
+{{$gender}}
+</div>
+<div id="profile-edit-gender-end"></div>
+
+<div id="profile-edit-dob-wrapper" >
+<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
+<div id="profile-edit-dob" >
+{{$dob}} {{$age}}
+</div>
+</div>
+<div id="profile-edit-dob-end"></div>
+
+{{$hide_friends}}
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
+<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" />
+</div>
+<div id="profile-edit-address-end"></div>
+
+<div id="profile-edit-locality-wrapper" >
+<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
+<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
+<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
+</div>
+<div id="profile-edit-postal-code-end"></div>
+
+<div id="profile-edit-country-name-wrapper" >
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
+<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
+<option selected="selected" >{{$country_name}}</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
+<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >{{$region}}</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
+<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
+{{$marital}}
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
+<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
+<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
+
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
+{{$sexual}}
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
+<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+<div id="profile-edit-politic-wrapper" >
+<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
+<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
+<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
+<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
+</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
+<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
+</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
+<div id="profile-edit-prvkeywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" class="profile-jot-box">
+<p id="about-jot-desc" >
+{{$lbl_about}}
+</p>
+
+<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+
+
+<div id="interest-jot-wrapper" class="profile-jot-box" >
+<p id="interest-jot-desc" >
+{{$lbl_hobbies}}
+</p>
+
+<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+
+
+<div id="likes-jot-wrapper" class="profile-jot-box" >
+<p id="likes-jot-desc" >
+{{$lbl_likes}}
+</p>
+
+<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+
+
+<div id="dislikes-jot-wrapper" class="profile-jot-box" >
+<p id="dislikes-jot-desc" >
+{{$lbl_dislikes}}
+</p>
+
+<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+
+
+<div id="contact-jot-wrapper" class="profile-jot-box" >
+<p id="contact-jot-desc" >
+{{$lbl_social}}
+</p>
+
+<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" class="profile-jot-box" >
+<p id="music-jot-desc" >
+{{$lbl_music}}
+</p>
+
+<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+
+<div id="book-jot-wrapper" class="profile-jot-box" >
+<p id="book-jot-desc" >
+{{$lbl_book}}
+</p>
+
+<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+
+
+
+<div id="tv-jot-wrapper" class="profile-jot-box" >
+<p id="tv-jot-desc" >
+{{$lbl_tv}} 
+</p>
+
+<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+
+
+
+<div id="film-jot-wrapper" class="profile-jot-box" >
+<p id="film-jot-desc" >
+{{$lbl_film}}
+</p>
+
+<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" class="profile-jot-box" >
+<p id="romance-jot-desc" >
+{{$lbl_love}}
+</p>
+
+<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+
+
+
+<div id="work-jot-wrapper" class="profile-jot-box" >
+<p id="work-jot-desc" >
+{{$lbl_work}}
+</p>
+
+<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+
+
+
+<div id="education-jot-wrapper" class="profile-jot-box" >
+<p id="education-jot-desc" >
+{{$lbl_school}} 
+</p>
+
+<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+
diff --git a/view/theme/frost-mobile/templates/profile_photo.tpl b/view/theme/frost-mobile/templates/profile_photo.tpl
new file mode 100644
index 0000000000..6bcb3cf850
--- /dev/null
+++ b/view/theme/frost-mobile/templates/profile_photo.tpl
@@ -0,0 +1,24 @@
+{{*
+ *	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">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<div id="profile-photo-upload-wrapper">
+<label id="profile-photo-upload-label" for="profile-photo-upload">{{$lbl_upfile}} </label>
+<input name="userfile" type="file" id="profile-photo-upload" size="25" />
+</div>
+
+<div id="profile-photo-submit-wrapper">
+<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+</div>
+
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+{{$select}}
+</div>
diff --git a/view/theme/frost-mobile/templates/profile_vcard.tpl b/view/theme/frost-mobile/templates/profile_vcard.tpl
new file mode 100644
index 0000000000..85c6345d6d
--- /dev/null
+++ b/view/theme/frost-mobile/templates/profile_vcard.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="fn label">{{$profile.name}}</div>
+	
+				
+	
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+
+
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-vcard-break"></div>	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/frost-mobile/templates/prv_message.tpl b/view/theme/frost-mobile/templates/prv_message.tpl
new file mode 100644
index 0000000000..17699414e7
--- /dev/null
+++ b/view/theme/frost-mobile/templates/prv_message.tpl
@@ -0,0 +1,44 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h3>{{$header}}</h3>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="message" method="post" >
+
+{{$parent}}
+
+<div id="prvmail-to-label">{{$to}}</div>
+
+{{if $showinputs}}
+<input type="text" id="recip" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+{{else}}
+{{$select}}
+{{/if}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
+	<div id="prvmail-upload-wrapper" >
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	</div> 
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/theme/frost-mobile/templates/register.tpl b/view/theme/frost-mobile/templates/register.tpl
new file mode 100644
index 0000000000..3cd6dbda13
--- /dev/null
+++ b/view/theme/frost-mobile/templates/register.tpl
@@ -0,0 +1,85 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class='register-form'>
+<h2>{{$regtitle}}</h2>
+<br />
+
+<form action="register" method="post" id="register-form">
+
+	<input type="hidden" name="photo" value="{{$photo}}" />
+
+	{{$registertext}}
+
+	<p id="register-realpeople">{{$realpeople}}</p>
+
+	<br />
+{{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>
+	</div>
+
+	<br /><br />
+
+{{if $invitations}}
+
+	<p id="register-invite-desc">{{$invite_desc}}</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{/if}}
+
+
+	<div id="register-name-wrapper" class="field input" >
+		<label for="register-name" id="label-register-name" >{{$namelabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+
+	<div id="register-email-wrapper"  class="field input" >
+		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
+	</div>
+	<div id="register-email-end" ></div>
+
+	<div id="register-nickname-wrapper" class="field input" >
+		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" >
+	</div>
+	<div id="register-nickname-end" ></div>
+
+	<div class="register-explain-wrapper">
+	<p id="register-nickname-desc" >{{$nickdesc}}</p>
+	</div>
+
+	{{$publish}}
+
+	<div id="register-footer">
+<!--	<div class="agreement">
+	By clicking '{{$regbutt}}' you are agreeing to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>-->
+	<br />
+
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
+	</div>
+	<div id="register-submit-end" ></div>
+	</div>
+</form>
+<br /><br /><br />
+
+{{$license}}
+
+</div>
diff --git a/view/theme/frost-mobile/templates/search_item.tpl b/view/theme/frost-mobile/templates/search_item.tpl
new file mode 100644
index 0000000000..21f4c1adce
--- /dev/null
+++ b/view/theme/frost-mobile/templates/search_item.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	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}}{{$item.previewing}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			{{*<!--<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>-->*}}
+			{{*<!--<div class="wall-item-photo-end"></div>	-->*}}
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		{{*<!--<div class="wall-item-author">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
+				
+		{{*<!--</div>			-->*}}
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			{{*<!--</div>-->*}}
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
+		</div>
+	</div>
+	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
+
+
+	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
+	</div>
+
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+
+</div>
+
+-->*}}
diff --git a/view/theme/frost-mobile/templates/settings-head.tpl b/view/theme/frost-mobile/templates/settings-head.tpl
new file mode 100644
index 0000000000..5d7e0152da
--- /dev/null
+++ b/view/theme/frost-mobile/templates/settings-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+
diff --git a/view/theme/frost-mobile/templates/settings.tpl b/view/theme/frost-mobile/templates/settings.tpl
new file mode 100644
index 0000000000..16a67039b2
--- /dev/null
+++ b/view/theme/frost-mobile/templates/settings.tpl
@@ -0,0 +1,152 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$ptitle}}</h1>
+
+{{$nickname_block}}
+
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<h3 class="settings-heading">{{$h_pass}}</h3>
+
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
+{{include file="field_password.tpl" field=$password3}}
+
+{{if $oid_enable}}
+{{include file="field_input.tpl" field=$openid}}
+{{/if}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_basic}}</h3>
+
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_input.tpl" field=$email}}
+{{include file="field_password.tpl" field=$password4}}
+{{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_input.tpl" field=$defloc}}
+{{include file="field_checkbox.tpl" field=$allowloc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_prv}}</h3>
+
+
+<input type="hidden" name="visibility" value="{{$visibility}}" />
+
+{{include file="field_input.tpl" field=$maxreq}}
+
+{{$profile_in_dir}}
+
+{{$profile_in_net_dir}}
+
+{{$hide_friends}}
+
+{{$hide_wall}}
+
+{{$blockwall}}
+
+{{$blocktags}}
+
+{{$suggestme}}
+
+{{$unkmail}}
+
+
+{{include file="field_input.tpl" field=$cntunkmail}}
+
+{{include file="field_input.tpl" field=$expire.days}}
+
+
+<div class="field input">
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="{{$expire.advanced}}">{{$expire.label}}</a></span>
+	<div style="display: none;">
+		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+			<h3>{{$expire.advanced}}</h3>
+			{{include file="field_yesno.tpl" field=$expire.items}}
+			{{include file="field_yesno.tpl" field=$expire.notes}}
+			{{include file="field_yesno.tpl" field=$expire.starred}}
+			{{include file="field_yesno.tpl" field=$expire.network_only}}
+		</div>
+	</div>
+
+</div>
+
+
+<div id="settings-default-perms" class="settings-default-perms" >
+	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+{{*<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->*}}
+	
+	<div style="display: none;">
+		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
+			{{$aclselect}}
+		</div>
+	</div>
+
+{{*<!--	</div>-->*}}
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+{{$group_select}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+
+<h3 class="settings-heading">{{$h_not}}</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">{{$activity_options}}</div>
+
+{{include file="field_checkbox.tpl" field=$post_newfriend}}
+{{include file="field_checkbox.tpl" field=$post_joingroup}}
+{{include file="field_checkbox.tpl" field=$post_profilechange}}
+
+
+<div id="settings-notify-desc">{{$lbl_not}}</div>
+
+<div class="group">
+{{include file="field_intcheckbox.tpl" field=$notify1}}
+{{include file="field_intcheckbox.tpl" field=$notify2}}
+{{include file="field_intcheckbox.tpl" field=$notify3}}
+{{include file="field_intcheckbox.tpl" field=$notify4}}
+{{include file="field_intcheckbox.tpl" field=$notify5}}
+{{include file="field_intcheckbox.tpl" field=$notify6}}
+{{include file="field_intcheckbox.tpl" field=$notify7}}
+{{include file="field_intcheckbox.tpl" field=$notify8}}
+</div>
+
+</div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_advn}}</h3>
+<div id="settings-pagetype-desc">{{$h_descadvn}}</div>
+
+{{$pagetype}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
diff --git a/view/theme/frost-mobile/templates/settings_display_end.tpl b/view/theme/frost-mobile/templates/settings_display_end.tpl
new file mode 100644
index 0000000000..4b3db00f5a
--- /dev/null
+++ b/view/theme/frost-mobile/templates/settings_display_end.tpl
@@ -0,0 +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/templates/suggest_friends.tpl b/view/theme/frost-mobile/templates/suggest_friends.tpl
new file mode 100644
index 0000000000..8843d51284
--- /dev/null
+++ b/view/theme/frost-mobile/templates/suggest_friends.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	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}}">
+			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
+	<a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
+</div>
diff --git a/view/theme/frost-mobile/templates/threaded_conversation.tpl b/view/theme/frost-mobile/templates/threaded_conversation.tpl
new file mode 100644
index 0000000000..bf6eab47af
--- /dev/null
+++ b/view/theme/frost-mobile/templates/threaded_conversation.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{*<!--{{if $dropping}}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{/if}}-->*}}
diff --git a/view/theme/frost-mobile/templates/voting_fakelink.tpl b/view/theme/frost-mobile/templates/voting_fakelink.tpl
new file mode 100644
index 0000000000..1e073916e1
--- /dev/null
+++ b/view/theme/frost-mobile/templates/voting_fakelink.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	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/templates/wall_thread.tpl b/view/theme/frost-mobile/templates/wall_thread.tpl
new file mode 100644
index 0000000000..18246114da
--- /dev/null
+++ b/view/theme/frost-mobile/templates/wall_thread.tpl
@@ -0,0 +1,131 @@
+{{*
+ *	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>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			{{*<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
+			{{*<!--<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                        {{$item.item_photo_menu}}
+                    </ul>
+                </div>-->*}}
+
+			{{*<!--</div>-->*}}
+			{{*<!--<div class="wall-item-photo-end"></div>-->*}}
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		{{*<!--<div class="wall-item-author">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>				
+		{{*<!--</div>-->*}}
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+					{{*<!--<div class="body-tag">-->*}}
+						{{foreach $item.tags as $tag}}
+							<span class='body-tag tag'>{{$tag}}</span>
+						{{/foreach}}
+					{{*<!--</div>-->*}}
+			{{if $item.has_cats}}
+			<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+				{{if $item.vote.dislike}}
+				<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+				{{/if}}
+				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				{{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}			
+			
+			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></a>{{/if}}
+			{{*<!--</div>-->*}}
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
+		</div>
+	</div>	
+	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
+	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+
+	{{if $item.threaded}}
+	{{if $item.comment}}
+	{{*<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->*}}
+		{{$item.comment}}
+	{{*<!--</div>-->*}}
+	{{/if}}
+	{{/if}}
+
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
+{{*<!--</div>-->*}}
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+{{*<!--<div class="wall-item-comment-wrapper" >-->*}}
+	{{$item.comment}}
+{{*<!--</div>-->*}}
+{{/if}}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
+
diff --git a/view/theme/frost-mobile/templates/wallmsg-end.tpl b/view/theme/frost-mobile/templates/wallmsg-end.tpl
new file mode 100644
index 0000000000..594f3f79b9
--- /dev/null
+++ b/view/theme/frost-mobile/templates/wallmsg-end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	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/templates/wallmsg-header.tpl b/view/theme/frost-mobile/templates/wallmsg-header.tpl
new file mode 100644
index 0000000000..5f65cc0014
--- /dev/null
+++ b/view/theme/frost-mobile/templates/wallmsg-header.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+window.editSelect = "none";
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
+</script>
+
diff --git a/view/theme/frost/templates/acl_selector.tpl b/view/theme/frost/templates/acl_selector.tpl
new file mode 100644
index 0000000000..d18776e367
--- /dev/null
+++ b/view/theme/frost/templates/acl_selector.tpl
@@ -0,0 +1,28 @@
+{{*
+ *	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>
+	<div id="acl-list">
+		<div id="acl-list-content">
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</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>
+
+<script>
+	window.allowCID = {{$allowcid}};
+	window.allowGID = {{$allowgid}};
+	window.denyCID = {{$denycid}};
+	window.denyGID = {{$denygid}};
+	window.aclInit = "true";
+</script>
diff --git a/view/theme/frost/templates/admin_aside.tpl b/view/theme/frost/templates/admin_aside.tpl
new file mode 100644
index 0000000000..024d6195b5
--- /dev/null
+++ b/view/theme/frost/templates/admin_aside.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
+	<li class='admin button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
+	<li class='admin button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
+	<li class='admin button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
+	<li class='admin button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
+</ul>
+
+{{if $admin.update}}
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+	<li class='admin button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{/if}}
+
+
+{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
+<ul class='admin linklist'>
+	{{foreach $admin.plugins_admin as $l}}
+	<li class='admin button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
+	{{/foreach}}
+</ul>
+	
+	
+<h4>{{$logtxt}}</h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
+</ul>
+
diff --git a/view/theme/frost/templates/admin_site.tpl b/view/theme/frost/templates/admin_site.tpl
new file mode 100644
index 0000000000..af0eebacc6
--- /dev/null
+++ b/view/theme/frost/templates/admin_site.tpl
@@ -0,0 +1,81 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+	{{include file="field_select.tpl" field=$theme_mobile}}
+	{{include file="field_select.tpl" field=$ssl_policy}}
+	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$hide_help}} 
+	{{include file="field_select.tpl" field=$singleuser}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$registration}}</h3>
+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	{{include file="field_input.tpl" field=$daily_registrations}}
+	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+	{{include file="field_checkbox.tpl" field=$no_openid}}
+	{{include file="field_checkbox.tpl" field=$no_regfullname}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+
+	<h3>{{$upload}}</h3>
+	{{include file="field_input.tpl" field=$maximagesize}}
+	{{include file="field_input.tpl" field=$maximagelength}}
+	{{include file="field_input.tpl" field=$jpegimagequality}}
+	
+	<h3>{{$corporate}}</h3>
+	{{include file="field_input.tpl" field=$allowed_sites}}
+	{{include file="field_input.tpl" field=$allowed_email}}
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$no_community_page}}
+	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
+	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+	{{include file="field_checkbox.tpl" field=$dfrn_only}}
+	{{include file="field_input.tpl" field=$global_directory}}
+	{{include file="field_checkbox.tpl" field=$thread_allow}}
+	{{include file="field_checkbox.tpl" field=$newuser_private}}
+	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
+	{{include file="field_checkbox.tpl" field=$private_addons}}	
+	{{include file="field_checkbox.tpl" field=$disable_embedded}}	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$advanced}}</h3>
+	{{include file="field_checkbox.tpl" field=$no_utf}}
+	{{include file="field_checkbox.tpl" field=$verifyssl}}
+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	{{include file="field_input.tpl" field=$lockpath}}
+	{{include file="field_input.tpl" field=$temppath}}
+	{{include file="field_input.tpl" field=$basepath}}
+
+	<h3>{{$performance}}</h3>
+	{{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
+	{{include file="field_input.tpl" field=$itemcache}}
+	{{include file="field_input.tpl" field=$itemcache_duration}}
+
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	</form>
+</div>
diff --git a/view/theme/frost/templates/admin_users.tpl b/view/theme/frost/templates/admin_users.tpl
new file mode 100644
index 0000000000..4d88670c17
--- /dev/null
+++ b/view/theme/frost/templates/admin_users.tpl
@@ -0,0 +1,103 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function selectall(cls){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.created}}</td>
+					<td class="name">{{$u.name}}</td>
+					<td class="email">{{$u.email}}</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/theme/frost/templates/comment_item.tpl b/view/theme/frost/templates/comment_item.tpl
new file mode 100644
index 0000000000..4b18abce2e
--- /dev/null
+++ b/view/theme/frost/templates/comment_item.tpl
@@ -0,0 +1,82 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--		<script>
+		$(document).ready( function () {
+			$(document).mouseup(function(e) {
+				var container = $("#comment-edit-wrapper-{{$id}}");
+				if( container.has(e.target).length === 0) {
+					commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
+					cmtBbClose({{$id}});
+				}
+			});
+		});
+		</script>-->*}}
+
+		<div class="comment-wwedit-wrapper {{$indent}}" 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;">
+{{*<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
+			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+{{*<!--				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
+					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+{{*<!--				</div>-->*}}
+				{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
+				<ul class="comment-edit-bb" id="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+{{*<!--				<div class="comment-edit-bb-end"></div>-->*}}
+{{*<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
+					</select>
+				{{/if}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				{{*<!--<div class="comment-edit-end"></div>-->*}}
+			</form>
+
+		</div>
diff --git a/view/theme/frost/templates/contact_edit.tpl b/view/theme/frost/templates/contact_edit.tpl
new file mode 100644
index 0000000000..7105d0057e
--- /dev/null
+++ b/view/theme/frost/templates/contact_edit.tpl
@@ -0,0 +1,93 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h2>{{$header}}</h2>
+
+<div id="contact-edit-wrapper" >
+
+	{{$tab_str}}
+
+	<div id="contact-edit-drop-link" >
+		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
+	</div>
+
+	<div id="contact-edit-drop-link-end"></div>
+
+
+	<div id="contact-edit-nav-wrapper" >
+		<div id="contact-edit-links">
+			<ul>
+				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
+				{{if $lost_contact}}
+					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
+				{{/if}}
+				{{if $insecure}}
+					<li><div id="insecure-message">{{$insecure}}</div></li>
+				{{/if}}
+				{{if $blocked}}
+					<li><div id="block-message">{{$blocked}}</div></li>
+				{{/if}}
+				{{if $ignored}}
+					<li><div id="ignore-message">{{$ignored}}</div></li>
+				{{/if}}
+				{{if $archived}}
+					<li><div id="archive-message">{{$archived}}</div></li>
+				{{/if}}
+
+				<li>&nbsp;</li>
+
+				{{if $common_text}}
+					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
+				{{/if}}
+				{{if $all_friends}}
+					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
+				{{/if}}
+
+
+				<li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+				{{if $lblsuggest}}
+					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
+				{{/if}}
+
+			</ul>
+		</div>
+	</div>
+	<div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/{{$contact_id}}" method="post" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}">
+
+	{{if $poll_enabled}}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
+			<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}} <span id="contact-edit-update-now" class="button"><a href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
+		</div>
+	{{/if}}
+	<div id="contact-edit-end" ></div>
+
+	{{include file="field_checkbox.tpl" field=$hidden}}
+
+<div id="contact-edit-info-wrapper">
+<h4>{{$lbl_info1}}</h4>
+	<textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea>
+	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>{{$lbl_vis1}}</h4>
+<p>{{$lbl_vis2}}</p> 
+</div>
+{{$profile_select}}
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+</div>
diff --git a/view/theme/frost/templates/contact_end.tpl b/view/theme/frost/templates/contact_end.tpl
new file mode 100644
index 0000000000..962f0c346e
--- /dev/null
+++ b/view/theme/frost/templates/contact_end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script language="javascript" type="text/javascript">contactInitEditor();</script>
+
diff --git a/view/theme/frost/templates/contact_head.tpl b/view/theme/frost/templates/contact_head.tpl
new file mode 100644
index 0000000000..959c4e2b41
--- /dev/null
+++ b/view/theme/frost/templates/contact_head.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script language="javascript" type="text/javascript">
+window.editSelect = "{{$editselect}}";
+</script>
+
diff --git a/view/theme/frost/templates/contact_template.tpl b/view/theme/frost/templates/contact_template.tpl
new file mode 100644
index 0000000000..7eba7efeee
--- /dev/null
+++ b/view/theme/frost/templates/contact_template.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
+
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
+
+			{{if $contact.photo_menu}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                    <ul>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
+{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/frost/templates/contacts-end.tpl b/view/theme/frost/templates/contacts-end.tpl
new file mode 100644
index 0000000000..9298a4245c
--- /dev/null
+++ b/view/theme/frost/templates/contacts-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/templates/contacts-head.tpl b/view/theme/frost/templates/contacts-head.tpl
new file mode 100644
index 0000000000..dd66b71d3e
--- /dev/null
+++ b/view/theme/frost/templates/contacts-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.autocompleteType = 'contacts-head';
+</script>
+
diff --git a/view/theme/frost/templates/contacts-template.tpl b/view/theme/frost/templates/contacts-template.tpl
new file mode 100644
index 0000000000..de33d141bb
--- /dev/null
+++ b/view/theme/frost/templates/contacts-template.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	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}}
+
+{{$tabs}}
+
+<div id="contacts-search-wrapper">
+<form id="contacts-search-form" action="{{$cmd}}" method="get" >
+<span class="contacts-search-desc">{{$desc}}</span>
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
+<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
+</form>
+</div>
+<div id="contacts-search-end"></div>
+
+
+<div id="contacts-display-wrapper">
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+</div>
+<div id="contact-edit-end"></div>
+
+{{$paginate}}
+
+
+
+
diff --git a/view/theme/frost/templates/cropbody.tpl b/view/theme/frost/templates/cropbody.tpl
new file mode 100644
index 0000000000..5ace9a1aaf
--- /dev/null
+++ b/view/theme/frost/templates/cropbody.tpl
@@ -0,0 +1,32 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+<p id="cropimage-desc">
+{{$desc}}
+</p>
+<div id="cropimage-wrapper">
+<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="{{$done}}" />
+</div>
+
+</form>
diff --git a/view/theme/frost/templates/cropend.tpl b/view/theme/frost/templates/cropend.tpl
new file mode 100644
index 0000000000..7a828815b9
--- /dev/null
+++ b/view/theme/frost/templates/cropend.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+      <script type="text/javascript" language="javascript">initCrop();</script>
diff --git a/view/theme/frost/templates/crophead.tpl b/view/theme/frost/templates/crophead.tpl
new file mode 100644
index 0000000000..6438cfb354
--- /dev/null
+++ b/view/theme/frost/templates/crophead.tpl
@@ -0,0 +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/templates/display-head.tpl b/view/theme/frost/templates/display-head.tpl
new file mode 100644
index 0000000000..17d17dd7db
--- /dev/null
+++ b/view/theme/frost/templates/display-head.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+	window.autoCompleteType = 'display-head';
+</script>
+
diff --git a/view/theme/frost/templates/end.tpl b/view/theme/frost/templates/end.tpl
new file mode 100644
index 0000000000..7cdb2e3f7a
--- /dev/null
+++ b/view/theme/frost/templates/end.tpl
@@ -0,0 +1,30 @@
+{{*
+ *	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]-->
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>-->*}}
+{{*<!--<script type="text/javascript">
+  tinyMCE.init({ mode : "none"});
+</script>-->*}}
+
+<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/fk.autocomplete.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/main.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/theme.min.js"></script>
+
diff --git a/view/theme/frost/templates/event.tpl b/view/theme/frost/templates/event.tpl
new file mode 100644
index 0000000000..15c4e2b937
--- /dev/null
+++ b/view/theme/frost/templates/event.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{foreach $events as $event}}
+	<div class="event">
+	
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
+	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link tool s22 pencil"></a>{{/if}}
+	</div>
+	<div class="clear"></div>
+{{/foreach}}
diff --git a/view/theme/frost/templates/event_end.tpl b/view/theme/frost/templates/event_end.tpl
new file mode 100644
index 0000000000..813047e6ab
--- /dev/null
+++ b/view/theme/frost/templates/event_end.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	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>
+
+<script language="javascript" type="text/javascript">eventInitEditor();</script>
+
diff --git a/view/theme/frost/templates/event_form.tpl b/view/theme/frost/templates/event_form.tpl
new file mode 100644
index 0000000000..f4a9719ebb
--- /dev/null
+++ b/view/theme/frost/templates/event_form.tpl
@@ -0,0 +1,55 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+
+<p>
+{{$desc}}
+</p>
+
+<form action="{{$post}}" method="post" >
+
+<input type="hidden" name="event_id" value="{{$eid}}" />
+<input type="hidden" name="cid" value="{{$cid}}" />
+<input type="hidden" name="uri" value="{{$uri}}" />
+
+<div id="event-start-text">{{$s_text}}</div>
+{{$s_dsel}} {{$s_tsel}}
+
+<div id="event-finish-text">{{$f_text}}</div>
+{{$f_dsel}} {{$f_tsel}}
+
+<div id="event-datetime-break"></div>
+
+<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
+
+<div id="event-nofinish-break"></div>
+
+<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div>
+
+<div id="event-adjust-break"></div>
+
+<div id="event-summary-text">{{$t_text}}</div>
+<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" />
+
+
+<div id="event-desc-text">{{$d_text}}</div>
+<textarea id="event-desc-textarea" rows="10" cols="70" name="desc">{{$d_orig}}</textarea>
+
+
+<div id="event-location-text">{{$l_text}}</div>
+<textarea id="event-location-textarea" rows="10" cols="70" name="location">{{$l_orig}}</textarea>
+<br />
+
+<input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
+<div id="event-share-break"></div>
+
+{{$acl}}
+
+<div class="clear"></div>
+<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
+</form>
+
+
diff --git a/view/theme/frost/templates/event_head.tpl b/view/theme/frost/templates/event_head.tpl
new file mode 100644
index 0000000000..ee23e43056
--- /dev/null
+++ b/view/theme/frost/templates/event_head.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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">
+window.aclType = 'event_head';
+window.editSelect = "{{$editselect}}";
+</script>
+
diff --git a/view/theme/frost/templates/field_combobox.tpl b/view/theme/frost/templates/field_combobox.tpl
new file mode 100644
index 0000000000..8f0e17619f
--- /dev/null
+++ b/view/theme/frost/templates/field_combobox.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	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>
+		{{* html5 don't work on Chrome, Safari and IE9
+		<input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" >
+		<datalist id="data_{{$field.0}}" >
+		   {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}}
+		</datalist> *}}
+		
+		<input id="id_{{$field.0}}" type="text" value="{{$field.2}}">
+		<select id="select_{{$field.0}}" onChange="$j('#id_{{$field.0}}').val($j(this).val())">
+			<option value="">{{$field.5}}</option>
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
+		</select>
+		
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
+
diff --git a/view/theme/frost/templates/field_input.tpl b/view/theme/frost/templates/field_input.tpl
new file mode 100644
index 0000000000..0847961887
--- /dev/null
+++ b/view/theme/frost/templates/field_input.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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>
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost/templates/field_openid.tpl b/view/theme/frost/templates/field_openid.tpl
new file mode 100644
index 0000000000..ed94fad7a5
--- /dev/null
+++ b/view/theme/frost/templates/field_openid.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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>
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost/templates/field_password.tpl b/view/theme/frost/templates/field_password.tpl
new file mode 100644
index 0000000000..c88d3ef58a
--- /dev/null
+++ b/view/theme/frost/templates/field_password.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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>
+		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost/templates/field_themeselect.tpl b/view/theme/frost/templates/field_themeselect.tpl
new file mode 100644
index 0000000000..0d4552c3bf
--- /dev/null
+++ b/view/theme/frost/templates/field_themeselect.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+	<div class='field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5}}onchange="previewTheme(this);"{{/if}} >
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<span class='field_help'>{{$field.3}}</span>
+		<div id="theme-preview"></div>
+	</div>
diff --git a/view/theme/frost/templates/filebrowser.tpl b/view/theme/frost/templates/filebrowser.tpl
new file mode 100644
index 0000000000..c9e1df9749
--- /dev/null
+++ b/view/theme/frost/templates/filebrowser.tpl
@@ -0,0 +1,89 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<!DOCTYPE html>
+<html>
+	<head>
+	<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
+	<style>
+		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
+		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
+		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
+		.filebrowser ul{ list-style-type: none; padding:0px; }
+		.filebrowser.folders a { display: block; padding: 0.3em }
+		.filebrowser.folders a:hover { background-color: #f0f0ee; }
+		.filebrowser.files.image { overflow: auto; height: auto; }
+		.filebrowser.files.image img { height:100px;}
+		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
+		.filebrowser.files.image span { display: none;}
+		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
+		.filebrowser.files a { display: block;  padding: 0.3em}
+		.filebrowser.files a:hover { background-color: #f0f0ee; }
+		.filebrowser a { text-decoration: none; }
+	</style>
+	<script>
+		var FileBrowserDialogue = {
+			init : function () {
+				// Here goes your code for setting your custom things onLoad.
+			},
+			mySubmit : function (URL) {
+				//var URL = document.my_form.my_field.value;
+				var win = tinyMCEPopup.getWindowArg("window");
+
+				// insert information now
+				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
+
+				// are we an image browser
+				if (typeof(win.ImageDialog) != "undefined") {
+					// we are, so update image dimensions...
+					if (win.ImageDialog.getImageData)
+						win.ImageDialog.getImageData();
+
+					// ... and preview if necessary
+					if (win.ImageDialog.showPreviewImage)
+						win.ImageDialog.showPreviewImage(URL);
+				}
+
+				// close popup window
+				tinyMCEPopup.close();
+			}
+		}
+
+		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
+	</script>
+	</head>
+	<body>
+	
+	<div class="tabs">
+		<ul >
+			<li class="current"><span>FileBrowser</span></li>
+		</ul>
+	</div>
+	<div class="panel_wrapper">
+
+		<div id="general_panel" class="panel current">
+			<div class="filebrowser path">
+				{{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
+			</div>
+			<div class="filebrowser folders">
+				<ul>
+					{{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
+				</ul>
+			</div>
+			<div class="filebrowser files {{$type}}">
+				<ul>
+				{{foreach $files as $f}}
+					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
+				{{/foreach}}
+				</ul>
+			</div>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
+	</div>	
+	</body>
+	
+</html>
diff --git a/view/theme/frost/templates/group_drop.tpl b/view/theme/frost/templates/group_drop.tpl
new file mode 100644
index 0000000000..2693228154
--- /dev/null
+++ b/view/theme/frost/templates/group_drop.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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();" 
+		id="group-delete-icon-{{$id}}" 
+		class="icon drophide group-delete-icon" 
+		{{*onmouseover="imgbright(this);" 
+		onmouseout="imgdull(this);"*}} ></a>
+</div>
+<div class="group-delete-end"></div>
diff --git a/view/theme/frost/templates/head.tpl b/view/theme/frost/templates/head.tpl
new file mode 100644
index 0000000000..095743e9b2
--- /dev/null
+++ b/view/theme/frost/templates/head.tpl
@@ -0,0 +1,28 @@
+{{*
+ *	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}}" />
+<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->*}}
+<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
+
+<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
+<link rel="search"
+         href="{{$baseurl}}/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<script>
+	window.delItem = "{{$delitem}}";
+	window.commentEmptyText = "{{$comment}}";
+	window.showMore = "{{$showmore}}";
+	window.showFewer = "{{$showfewer}}";
+	var updateInterval = {{$update_interval}};
+	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
+</script>
diff --git a/view/theme/frost/templates/jot-end.tpl b/view/theme/frost/templates/jot-end.tpl
new file mode 100644
index 0000000000..ebbef166db
--- /dev/null
+++ b/view/theme/frost/templates/jot-end.tpl
@@ -0,0 +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>
+
+<script language="javascript" type="text/javascript">if(typeof window.jotInit != 'undefined') initEditor();</script>
diff --git a/view/theme/frost/templates/jot-header.tpl b/view/theme/frost/templates/jot-header.tpl
new file mode 100644
index 0000000000..92a6aed1d8
--- /dev/null
+++ b/view/theme/frost/templates/jot-header.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.editSelect = "{{$editselect}}";
+	window.isPublic = "{{$ispublic}}";
+	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	window.vidURL = "{{$vidurl}}";
+	window.audURL = "{{$audurl}}";
+	window.whereAreU = "{{$whereareu}}";
+	window.term = "{{$term}}";
+	window.baseURL = "{{$baseurl}}";
+	window.geoTag = function () { {{$geotag}} }
+	window.jotId = "#profile-jot-text";
+	window.imageUploadButton = 'wall-image-upload';
+	window.delItems = '{{$delitems}}';
+</script>
+
diff --git a/view/theme/frost/templates/jot.tpl b/view/theme/frost/templates/jot.tpl
new file mode 100644
index 0000000000..dc4f2cfe17
--- /dev/null
+++ b/view/theme/frost/templates/jot.tpl
@@ -0,0 +1,96 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
+		{{/if}}
+		<div id="jot-text-wrap">
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+		</div>
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
+	</div> 
+
+	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >-->*}}
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>
+
+	<div id="profile-jot-perms-end"></div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+
+{{*<!--	<span id="jot-display-location" style="display: none;"></span>-->*}}
+
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$acl}}
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			<div id="profile-jot-email-end"></div>
+			{{$jotnets}}
+		</div>
+	</div>
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{if $content}}<script>window.jotInit = true;</script>{{/if}}
diff --git a/view/theme/frost/templates/jot_geotag.tpl b/view/theme/frost/templates/jot_geotag.tpl
new file mode 100644
index 0000000000..d828980e58
--- /dev/null
+++ b/view/theme/frost/templates/jot_geotag.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			var lat = position.coords.latitude.toFixed(4);
+			var lon = position.coords.longitude.toFixed(4);
+
+			$j('#jot-coord').val(lat + ', ' + lon);
+			$j('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/theme/frost/templates/lang_selector.tpl b/view/theme/frost/templates/lang_selector.tpl
new file mode 100644
index 0000000000..a1aee8277f
--- /dev/null
+++ b/view/theme/frost/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{foreach $langs.0 as $v=>$l}}
+				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
+			{{/foreach}}
+		</select>
+	</form>
+</div>
diff --git a/view/theme/frost/templates/like_noshare.tpl b/view/theme/frost/templates/like_noshare.tpl
new file mode 100644
index 0000000000..1ad1eeaeec
--- /dev/null
+++ b/view/theme/frost/templates/like_noshare.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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="tool like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
+	{{if $nolike}}
+	<a href="#" class="tool dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
+	{{/if}}
+	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+</div>
diff --git a/view/theme/frost/templates/login.tpl b/view/theme/frost/templates/login.tpl
new file mode 100644
index 0000000000..872f1455e7
--- /dev/null
+++ b/view/theme/frost/templates/login.tpl
@@ -0,0 +1,50 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="login-form">
+<form action="{{$dest_url}}" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{include file="field_input.tpl" field=$lname}}
+	{{include file="field_password.tpl" field=$lpassword}}
+	</div>
+	
+	{{if $openid}}
+			<br /><br />
+			<div id="login_openid">
+			{{include file="field_openid.tpl" field=$lopenid}}
+			</div>
+	{{/if}}
+
+<!--	<br /><br />
+	<div class="login-extra-links">
+	By signing in you agree to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>-->
+
+	<br /><br />
+	{{include file="field_checkbox.tpl" field=$lremember}}
+
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
+	</div>
+
+	<br /><br />
+
+	<div class="login-extra-links">
+		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
+        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+	</div>
+	
+	{{foreach $hiddens as $k=>$v}}
+		<input type="hidden" name="{{$k}}" value="{{$v}}" />
+	{{/foreach}}
+	
+	
+</form>
+</div>
+
+<script type="text/javascript">window.loginName = "{{$lname.0}}";</script>
diff --git a/view/theme/frost/templates/login_head.tpl b/view/theme/frost/templates/login_head.tpl
new file mode 100644
index 0000000000..5cac7bd1d7
--- /dev/null
+++ b/view/theme/frost/templates/login_head.tpl
@@ -0,0 +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/templates/lostpass.tpl b/view/theme/frost/templates/lostpass.tpl
new file mode 100644
index 0000000000..bbcdbdb53a
--- /dev/null
+++ b/view/theme/frost/templates/lostpass.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="lostpass-form">
+<h2>{{$title}}</h2>
+<br /><br /><br />
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper" class="field input">
+        <label for="login-name" id="label-login-name">{{$name}}</label>
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+</div>
+<div id="login-extra-end"></div>
+<p id="lostpass-desc">
+{{$desc}}
+</p>
+<br />
+
+<div id="login-submit-wrapper" >
+        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+</div>
diff --git a/view/theme/frost/templates/mail_conv.tpl b/view/theme/frost/templates/mail_conv.tpl
new file mode 100644
index 0000000000..effaa73c2a
--- /dev/null
+++ b/view/theme/frost/templates/mail_conv.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	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>
+	</div>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<div class="mail-conv-date">{{$mail.date}}</div>
+		<div class="mail-conv-subject">{{$mail.subject}}</div>
+		<div class="mail-conv-body">{{$mail.body}}</div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-outside-wrapper-end"></div>
+</div>
+</div>
+<hr class="mail-conv-break" />
diff --git a/view/theme/frost/templates/mail_list.tpl b/view/theme/frost/templates/mail_list.tpl
new file mode 100644
index 0000000000..0607c15c73
--- /dev/null
+++ b/view/theme/frost/templates/mail_list.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	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>
+	</div>
+	<div class="mail-list-detail">
+		<div class="mail-list-sender-name" >{{$from_name}}</div>
+		<div class="mail-list-date">{{$date}}</div>
+		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
+		<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
+	</div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/frost/templates/message-end.tpl b/view/theme/frost/templates/message-end.tpl
new file mode 100644
index 0000000000..9298a4245c
--- /dev/null
+++ b/view/theme/frost/templates/message-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/templates/message-head.tpl b/view/theme/frost/templates/message-head.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/theme/frost/templates/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/templates/moderated_comment.tpl b/view/theme/frost/templates/moderated_comment.tpl
new file mode 100644
index 0000000000..b2401ca483
--- /dev/null
+++ b/view/theme/frost/templates/moderated_comment.tpl
@@ -0,0 +1,66 @@
+{{*
+ *	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}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
+					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
+					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
+					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
+					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
+					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
+				</div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>			
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/frost/templates/msg-end.tpl b/view/theme/frost/templates/msg-end.tpl
new file mode 100644
index 0000000000..0115bfad40
--- /dev/null
+++ b/view/theme/frost/templates/msg-end.tpl
@@ -0,0 +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>
+
+<script language="javascript" type="text/javascript">msgInitEditor();</script>
diff --git a/view/theme/frost/templates/msg-header.tpl b/view/theme/frost/templates/msg-header.tpl
new file mode 100644
index 0000000000..bb7cac0e43
--- /dev/null
+++ b/view/theme/frost/templates/msg-header.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	window.editSelect = "{{$editselect}}";
+	window.jotId = "#prvmail-text";
+	window.imageUploadButton = 'prvmail-upload';
+	window.autocompleteType = 'msg-header';
+</script>
+
diff --git a/view/theme/frost/templates/nav.tpl b/view/theme/frost/templates/nav.tpl
new file mode 100644
index 0000000000..db5f696baf
--- /dev/null
+++ b/view/theme/frost/templates/nav.tpl
@@ -0,0 +1,155 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+	{{$langselector}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+
+	<span id="nav-link-wrapper" >
+
+{{*<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->*}}
+	<div class="nav-button-container nav-menu-link" rel="#system-menu-list">
+	<a class="system-menu-link nav-link nav-menu-icon" href="{{$nav.settings.0}}" title="Main Menu" point="#system-menu-list">
+	<img class="system-menu-link" src="{{$baseurl}}/view/theme/frost/images/menu.png">
+	</a>
+	<ul id="system-menu-list" class="nav-menu-list" point="#system-menu-list">
+		{{if $nav.login}}
+		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
+		{{/if}}
+
+		{{if $nav.register}}
+		<a id="nav-register-link" class="nav-load-page-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>
+		{{/if}}
+
+		{{if $nav.settings}}
+		<li><a id="nav-settings-link" class="{{$nav.settings.2}} nav-load-page-link" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.manage}}
+		<li>
+		<a id="nav-manage-link" class="nav-load-page-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.profiles}}
+		<li><a id="nav-profiles-link" class="{{$nav.profiles.2}} nav-load-page-link" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.admin}}
+		<li><a id="nav-admin-link" class="{{$nav.admin.2}} nav-load-page-link" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>
+		{{/if}}
+
+		<li><a id="nav-search-link" class="{{$nav.search.2}} nav-load-page-link" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a></li>
+
+		{{if $nav.apps}}
+		<li><a id="nav-apps-link" class="{{$nav.apps.2}} nav-load-page-link" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.help}}
+		<li><a id="nav-help-link" class="{{$nav.help.2}} nav-load-page-link" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>
+		{{/if}}
+		
+		{{if $nav.logout}}
+		<li><a id="nav-logout-link" class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
+		{{/if}}
+	</ul>
+	</div>
+
+	{{if $nav.notifications}}
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->*}}
+	<div class="nav-button-container">
+	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">
+	<img rel="#nav-notifications-menu" src="{{$baseurl}}/view/theme/frost/images/notifications.png">
+	</a>
+	<span id="notify-update" class="nav-ajax-left" rel="#nav-network-notifications-popup"></span>
+	<ul id="nav-notifications-menu" class="notifications-menu-popup">
+		<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+		<li class="empty">{{$emptynotifications}}</li>
+	</ul>
+	</div>
+	{{/if}}		
+
+{{*<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->*}}
+	<div class="nav-button-container nav-menu-link" rel="#contacts-menu-list">
+	<a class="contacts-menu-link nav-link nav-menu-icon" href="{{$nav.contacts.0}}" title="Contacts" point="#contacts-menu-list">
+	<img class="contacts-menu-link" src="{{$baseurl}}/view/theme/frost/images/contacts.png">
+	</a>
+	{{if $nav.introductions}}
+	<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >
+	<span id="intro-update" class="nav-ajax-left"></span>
+	</a>
+	{{/if}}
+	<ul id="contacts-menu-list" class="nav-menu-list" point="#contacts-menu-list">
+		{{if $nav.contacts}}
+		<li><a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><li>
+		{{/if}}
+
+		<li><a id="nav-directory-link" class="{{$nav.directory.2}} nav-load-page-link" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><li>
+
+		{{if $nav.introductions}}
+		<li>
+		<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+	</div>
+
+	{{if $nav.messages}}
+{{*<!--	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->*}}
+	<div class="nav-button-container">
+	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
+	<img src="{{$baseurl}}/view/theme/frost/images/message.png">
+	</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	</div>
+	{{/if}}
+
+{{*<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->*}}
+	<div class="nav-button-container nav-menu-link" rel="#network-menu-list">
+	<a class="nav-menu-icon network-menu-link nav-link" href="{{$nav.network.0}}" title="Network" point="#network-menu-list">
+	<img class="network-menu-link" src="{{$baseurl}}/view/theme/frost/images/network.png">
+	</a>
+	{{if $nav.network}}
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{/if}}
+	<ul id="network-menu-list" class="nav-menu-list" point="#network-menu-list">
+		{{if $nav.network}}
+		<li>
+		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+		</li>
+		{{*<!--<span id="net-update" class="nav-ajax-left"></span>-->*}}
+		{{/if}}
+
+		{{if $nav.home}}
+		<li><a id="nav-home-link" class="{{$nav.home.2}} {{$sel.home}} nav-load-page-link" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a></li>
+		{{*<!--<span id="home-update" class="nav-ajax-left"></span>-->*}}
+		{{/if}}
+
+		{{if $nav.community}}
+		<li>
+		<a id="nav-community-link" class="{{$nav.community.2}} {{$sel.community}} nav-load-page-link" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+	</div>
+
+	{{if $nav.network}}
+	<div class="nav-button-container nav-menu-link" rel="#network-reset-button">
+	<a class="nav-menu-icon network-reset-link nav-link" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">
+	<img class="network-reset-link" src="{{$baseurl}}/view/theme/frost/images/net-reset.png">
+	</a>
+	</div>
+	{{/if}}
+		
+	</span>
+	{{*<!--<span id="nav-end"></span>-->*}}
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/theme/frost/templates/photo_drop.tpl b/view/theme/frost/templates/photo_drop.tpl
new file mode 100644
index 0000000000..9b037d4cd9
--- /dev/null
+++ b/view/theme/frost/templates/photo_drop.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+<div class="wall-item-delete-end"></div>
diff --git a/view/theme/frost/templates/photo_edit.tpl b/view/theme/frost/templates/photo_edit.tpl
new file mode 100644
index 0000000000..890c829fa0
--- /dev/null
+++ b/view/theme/frost/templates/photo_edit.tpl
@@ -0,0 +1,63 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
+
+	<input type="hidden" name="item_id" value="{{$item_id}}" />
+
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
+	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
+	<input id="photo-edit-caption" type="text" size="32" name="desc" value="{{$caption}}" />
+
+	<div id="photo-edit-caption-end"></div>
+
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
+	<input name="newtag" id="photo-edit-newtag" size="32" title="{{$help_tags}}" type="text" />
+
+	<div id="photo-edit-tags-end"></div>
+	<div id="photo-edit-rotate-wrapper">
+		<div class="photo-edit-rotate-label">
+			{{$rotatecw}}
+		</div>
+		<input class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+
+		<div class="photo-edit-rotate-label">
+			{{$rotateccw}}
+		</div>
+		<input class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="{{$permissions}}"/>
+			<span id="jot-perms-icon" class="icon {{$lockstate}} photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
+		</a>
+		<div id="photo-edit-perms-menu-end"></div>
+		
+		<div style="display: none;">
+			<div id="photo-edit-perms-select" >
+				{{$aclselect}}
+			</div>
+		</div>
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+{{*<!--<script>
+	$("a#photo-edit-perms-menu").colorbox({
+		'inline' : true,
+		'transition' : 'none'
+	}); 
+</script>-->*}}
diff --git a/view/theme/frost/templates/photo_edit_head.tpl b/view/theme/frost/templates/photo_edit_head.tpl
new file mode 100644
index 0000000000..857e6e63ac
--- /dev/null
+++ b/view/theme/frost/templates/photo_edit_head.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.prevLink = "{{$prevlink}}";
+	window.nextLink = "{{$nextlink}}";
+	window.photoEdit = true;
+
+</script>
diff --git a/view/theme/frost/templates/photo_view.tpl b/view/theme/frost/templates/photo_view.tpl
new file mode 100644
index 0000000000..354fb9c28b
--- /dev/null
+++ b/view/theme/frost/templates/photo_view.tpl
@@ -0,0 +1,47 @@
+{{*
+ *	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>
+
+<div id="photo-edit-link-wrap">
+{{if $tools}}
+<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
+|
+<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
+{{/if}}
+{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
+</div>
+
+<div id="photo-nav">
+	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><img src="view/theme/frost-mobile/images/arrow-left.png"></a></div>{{/if}}
+	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><img src="view/theme/frost-mobile/images/arrow-right.png"></a></div>{{/if}}
+</div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo-end"></div>
+<div id="photo-caption">{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
+
+{{if $edit}}
+{{$edit}}
+{{else}}
+
+{{if $likebuttons}}
+<div id="photo-like-div">
+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
+</div>
+{{/if}}
+
+{{$comments}}
+
+{{$paginate}}
+{{/if}}
+
diff --git a/view/theme/frost/templates/photos_head.tpl b/view/theme/frost/templates/photos_head.tpl
new file mode 100644
index 0000000000..5d7e0152da
--- /dev/null
+++ b/view/theme/frost/templates/photos_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+
diff --git a/view/theme/frost/templates/photos_upload.tpl b/view/theme/frost/templates/photos_upload.tpl
new file mode 100644
index 0000000000..4c829a2962
--- /dev/null
+++ b/view/theme/frost/templates/photos_upload.tpl
@@ -0,0 +1,57 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$pagename}}</h3>
+
+<div id="photos-usage-message">{{$usage}}</div>
+
+<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
+		<select id="photos-upload-album-select" name="album" size="4">
+		{{$albumselect}}
+		</select>
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	<div id="photos-upload-choosefile-outer-wrapper">
+	{{$default_upload_box}}
+	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
+		<div id="photos-upload-noshare-label">
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+		</div>
+	</div>
+
+	<div id="photos-upload-perms" class="photos-upload-perms" >
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="popupbox button" />
+		<span id="jot-perms-icon" class="icon {{$lockstate}}  photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
+		</a>
+	</div>
+	<div id="photos-upload-perms-end"></div>
+
+	<div style="display: none;">
+		<div id="photos-upload-permissions-wrapper">
+			{{$aclselect}}
+		</div>
+	</div>
+
+	<div id="photos-upload-spacer"></div>
+
+	{{$alt_uploader}}
+
+	{{$default_upload_submit}}
+
+	<div class="photos-upload-end" ></div>
+	</div>
+</form>
+
diff --git a/view/theme/frost/templates/posted_date_widget.tpl b/view/theme/frost/templates/posted_date_widget.tpl
new file mode 100644
index 0000000000..6482f66559
--- /dev/null
+++ b/view/theme/frost/templates/posted_date_widget.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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>
+<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($j(this).val());" size="{{$size}}">
+{{foreach $dates as $d}}
+<option value="{{$url}}/{{$d.1}}/{{$d.2}}" >{{$d.0}}</option>
+{{/foreach}}
+</select>
+</div>
diff --git a/view/theme/frost/templates/profed_end.tpl b/view/theme/frost/templates/profed_end.tpl
new file mode 100644
index 0000000000..dac8db42d5
--- /dev/null
+++ b/view/theme/frost/templates/profed_end.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="js/country.min.js" ></script>
+
+<script language="javascript" type="text/javascript">
+profInitEditor();
+Fill_Country('{{$country_name}}');
+Fill_States('{{$region}}');
+</script>
+
diff --git a/view/theme/frost/templates/profed_head.tpl b/view/theme/frost/templates/profed_head.tpl
new file mode 100644
index 0000000000..c8dbe562f9
--- /dev/null
+++ b/view/theme/frost/templates/profed_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+	window.editSelect = "{{$editselect}}";
+</script>
+
diff --git a/view/theme/frost/templates/profile_edit.tpl b/view/theme/frost/templates/profile_edit.tpl
new file mode 100644
index 0000000000..1d25a0d9d0
--- /dev/null
+++ b/view/theme/frost/templates/profile_edit.tpl
@@ -0,0 +1,327 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$default}}
+
+<h1>{{$banner}}</h1>
+
+<div id="profile-edit-links">
+<ul>
+<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
+<li></li>
+<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+
+<div id="profile-edit-wrapper" >
+<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<div id="profile-edit-profile-name-wrapper" >
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
+<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
+</div>
+<div id="profile-edit-profile-name-end"></div>
+
+<div id="profile-edit-name-wrapper" >
+<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
+<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-pdesc-wrapper" >
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
+<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
+</div>
+<div id="profile-edit-pdesc-end"></div>
+
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
+{{$gender}}
+</div>
+<div id="profile-edit-gender-end"></div>
+
+<div id="profile-edit-dob-wrapper" >
+<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
+<div id="profile-edit-dob" >
+{{$dob}} {{$age}}
+</div>
+</div>
+<div id="profile-edit-dob-end"></div>
+
+{{$hide_friends}}
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
+<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" />
+</div>
+<div id="profile-edit-address-end"></div>
+
+<div id="profile-edit-locality-wrapper" >
+<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
+<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
+<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
+</div>
+<div id="profile-edit-postal-code-end"></div>
+
+<div id="profile-edit-country-name-wrapper" >
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
+<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
+<option selected="selected" >{{$country_name}}</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
+<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >{{$region}}</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
+<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
+{{$marital}}
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
+<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
+<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
+
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
+{{$sexual}}
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
+<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+<div id="profile-edit-politic-wrapper" >
+<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
+<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
+<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
+<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
+</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
+<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
+</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
+<div id="profile-edit-prvkeywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" class="profile-jot-box">
+<p id="about-jot-desc" >
+{{$lbl_about}}
+</p>
+
+<textarea rows="10" cols="70" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+
+
+<div id="interest-jot-wrapper" class="profile-jot-box" >
+<p id="interest-jot-desc" >
+{{$lbl_hobbies}}
+</p>
+
+<textarea rows="10" cols="70" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+
+
+<div id="likes-jot-wrapper" class="profile-jot-box" >
+<p id="likes-jot-desc" >
+{{$lbl_likes}}
+</p>
+
+<textarea rows="10" cols="70" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+
+
+<div id="dislikes-jot-wrapper" class="profile-jot-box" >
+<p id="dislikes-jot-desc" >
+{{$lbl_dislikes}}
+</p>
+
+<textarea rows="10" cols="70" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+
+
+<div id="contact-jot-wrapper" class="profile-jot-box" >
+<p id="contact-jot-desc" >
+{{$lbl_social}}
+</p>
+
+<textarea rows="10" cols="70" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" class="profile-jot-box" >
+<p id="music-jot-desc" >
+{{$lbl_music}}
+</p>
+
+<textarea rows="10" cols="70" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+
+<div id="book-jot-wrapper" class="profile-jot-box" >
+<p id="book-jot-desc" >
+{{$lbl_book}}
+</p>
+
+<textarea rows="10" cols="70" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+
+
+
+<div id="tv-jot-wrapper" class="profile-jot-box" >
+<p id="tv-jot-desc" >
+{{$lbl_tv}} 
+</p>
+
+<textarea rows="10" cols="70" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+
+
+
+<div id="film-jot-wrapper" class="profile-jot-box" >
+<p id="film-jot-desc" >
+{{$lbl_film}}
+</p>
+
+<textarea rows="10" cols="70" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" class="profile-jot-box" >
+<p id="romance-jot-desc" >
+{{$lbl_love}}
+</p>
+
+<textarea rows="10" cols="70" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+
+
+
+<div id="work-jot-wrapper" class="profile-jot-box" >
+<p id="work-jot-desc" >
+{{$lbl_work}}
+</p>
+
+<textarea rows="10" cols="70" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+
+
+
+<div id="education-jot-wrapper" class="profile-jot-box" >
+<p id="education-jot-desc" >
+{{$lbl_school}} 
+</p>
+
+<textarea rows="10" cols="70" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+
diff --git a/view/theme/frost/templates/profile_vcard.tpl b/view/theme/frost/templates/profile_vcard.tpl
new file mode 100644
index 0000000000..85c6345d6d
--- /dev/null
+++ b/view/theme/frost/templates/profile_vcard.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="fn label">{{$profile.name}}</div>
+	
+				
+	
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+
+
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-vcard-break"></div>	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/frost/templates/prv_message.tpl b/view/theme/frost/templates/prv_message.tpl
new file mode 100644
index 0000000000..363ca4e26c
--- /dev/null
+++ b/view/theme/frost/templates/prv_message.tpl
@@ -0,0 +1,44 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h3>{{$header}}</h3>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="message" method="post" >
+
+{{$parent}}
+
+<div id="prvmail-to-label">{{$to}}</div>
+
+{{if $showinputs}}
+<input type="text" id="recip" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+{{else}}
+{{$select}}
+{{/if}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
+	<div id="prvmail-upload-wrapper" >
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	</div> 
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/theme/frost/templates/register.tpl b/view/theme/frost/templates/register.tpl
new file mode 100644
index 0000000000..6cb4c6d859
--- /dev/null
+++ b/view/theme/frost/templates/register.tpl
@@ -0,0 +1,85 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class='register-form'>
+<h2>{{$regtitle}}</h2>
+<br /><br />
+
+<form action="register" method="post" id="register-form">
+
+	<input type="hidden" name="photo" value="{{$photo}}" />
+
+	{{$registertext}}
+
+	<p id="register-realpeople">{{$realpeople}}</p>
+
+	<br />
+{{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>
+	</div>
+
+	<br /><br />
+
+{{if $invitations}}
+
+	<p id="register-invite-desc">{{$invite_desc}}</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{/if}}
+
+
+	<div id="register-name-wrapper" class="field input" >
+		<label for="register-name" id="label-register-name" >{{$namelabel}}</label>
+		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+
+	<div id="register-email-wrapper"  class="field input" >
+		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
+		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
+	</div>
+	<div id="register-email-end" ></div>
+	<br /><br />
+
+	<div id="register-nickname-wrapper" class="field input" >
+		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
+		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" >
+	</div>
+	<div id="register-nickname-end" ></div>
+
+	<div class="register-explain-wrapper">
+	<p id="register-nickname-desc" >{{$nickdesc}}</p>
+	</div>
+
+	{{$publish}}
+
+	<br />
+<!--	<br><br>
+	<div class="agreement">
+	By clicking '{{$regbutt}}' you are agreeing to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>-->
+	<br><br>
+
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
+	</div>
+	<div id="register-submit-end" ></div>
+</form>
+
+{{$license}}
+
+</div>
diff --git a/view/theme/frost/templates/search_item.tpl b/view/theme/frost/templates/search_item.tpl
new file mode 100644
index 0000000000..2b37b24583
--- /dev/null
+++ b/view/theme/frost/templates/search_item.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	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}}{{$item.previewing}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				{{*<!--<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">-->*}}
+					<ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+						{{$item.item_photo_menu}}
+					</ul>
+				{{*<!--</div>-->*}}
+			</div>
+			{{*<!--<div class="wall-item-photo-end"></div>	-->*}}
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		{{*<!--<div class="wall-item-author">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
+				
+		{{*<!--</div>			-->*}}
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			{{*<!--</div>-->*}}
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
+		</div>
+	</div>
+	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
+
+
+	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
+	</div>
+
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+
+</div>
+
+-->*}}
diff --git a/view/theme/frost/templates/settings-head.tpl b/view/theme/frost/templates/settings-head.tpl
new file mode 100644
index 0000000000..5d7e0152da
--- /dev/null
+++ b/view/theme/frost/templates/settings-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+
diff --git a/view/theme/frost/templates/settings_display_end.tpl b/view/theme/frost/templates/settings_display_end.tpl
new file mode 100644
index 0000000000..4b3db00f5a
--- /dev/null
+++ b/view/theme/frost/templates/settings_display_end.tpl
@@ -0,0 +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/templates/suggest_friends.tpl b/view/theme/frost/templates/suggest_friends.tpl
new file mode 100644
index 0000000000..8843d51284
--- /dev/null
+++ b/view/theme/frost/templates/suggest_friends.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	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}}">
+			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
+	<a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
+</div>
diff --git a/view/theme/frost/templates/threaded_conversation.tpl b/view/theme/frost/templates/threaded_conversation.tpl
new file mode 100644
index 0000000000..fbaafa2674
--- /dev/null
+++ b/view/theme/frost/templates/threaded_conversation.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	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>
+  <div id="item-delete-selected-top-desc" >{{$dropping}}</div>
+</div>
+<img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+{{else}}
+{{if $mode==display}}
+<div id="display-top-padding"></div>
+{{/if}}
+{{/if}}
+
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected');">
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></div>
+  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+</div>
+<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+<div id="item-delete-selected-end"></div>
+{{/if}}
diff --git a/view/theme/frost/templates/voting_fakelink.tpl b/view/theme/frost/templates/voting_fakelink.tpl
new file mode 100644
index 0000000000..1e073916e1
--- /dev/null
+++ b/view/theme/frost/templates/voting_fakelink.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	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/templates/wall_thread.tpl b/view/theme/frost/templates/wall_thread.tpl
new file mode 100644
index 0000000000..d6fbb3cf06
--- /dev/null
+++ b/view/theme/frost/templates/wall_thread.tpl
@@ -0,0 +1,130 @@
+{{*
+ *	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>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
+	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+{{*<!--                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">-->*}}
+                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                        {{$item.item_photo_menu}}
+                    </ul>
+{{*<!--                </div>-->*}}
+
+			</div>
+			{{*<!--<div class="wall-item-photo-end"></div>-->*}}
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		{{*<!--<div class="wall-item-author">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}" ><a href="display/{{$user.nickname}}/{{$item.id}}">{{$item.ago}}</a></div>
+		{{*<!--</div>-->*}}
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+					{{*<!--<div class="body-tag">-->*}}
+						{{foreach $item.tags as $tag}}
+							<span class='body-tag tag'>{{$tag}}</span>
+						{{/foreach}}
+					{{*<!--</div>-->*}}
+			{{if $item.has_cats}}
+			<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="#" class="tool like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+				{{if $item.vote.dislike}}
+				<a href="#" class="tool dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+				{{/if}}
+				{{if $item.vote.share}}<a href="#" class="tool recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				{{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost tool pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item tool {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item tool tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}			
+			
+			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></a>{{/if}}
+			{{*<!--</div>-->*}}
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
+		</div>
+	</div>	
+	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
+	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+
+	{{if $item.threaded}}
+	{{if $item.comment}}
+	{{*<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->*}}
+		{{$item.comment}}
+	{{*<!--</div>-->*}}
+	{{/if}}
+	{{/if}}
+
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
+{{*<!--</div>-->*}}
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+{{*<!--<div class="wall-item-comment-wrapper" >-->*}}
+	{{$item.comment}}
+{{*<!--</div>-->*}}
+{{/if}}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
+
diff --git a/view/theme/frost/templates/wallmsg-end.tpl b/view/theme/frost/templates/wallmsg-end.tpl
new file mode 100644
index 0000000000..c7ad27401f
--- /dev/null
+++ b/view/theme/frost/templates/wallmsg-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+
+<script language="javascript" type="text/javascript">msgInitEditor();</script>
+
diff --git a/view/theme/frost/templates/wallmsg-header.tpl b/view/theme/frost/templates/wallmsg-header.tpl
new file mode 100644
index 0000000000..6107a8a087
--- /dev/null
+++ b/view/theme/frost/templates/wallmsg-header.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+window.editSelect = "{{$editselect}}";
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
+</script>
+
diff --git a/view/theme/oldtest/app/app.js b/view/theme/oldtest/app/app.js
new file mode 100644
index 0000000000..eae90c57b5
--- /dev/null
+++ b/view/theme/oldtest/app/app.js
@@ -0,0 +1,85 @@
+
+function menuItem (data){
+	if (!data) data = ['','','','']
+	this.url = ko.observable(data[0]);
+	this.text = ko.observable(data[1]);
+	this.style = ko.observable(data[2]);
+	this.title = ko.observable(data[3]);
+}
+
+
+function navModel(data) {
+	this.nav = ko.observableArray([]);
+	
+	if (data) {
+		for (k in data.nav) {
+			var n = new menuItem(data.nav[k]);
+			console.log(k, data.nav[k], n);
+			this.nav.push(n);
+		}
+	}
+	
+}
+
+function App() {
+	var self = this;
+	this.nav = ko.observable();
+	
+	$.getJSON(window.location, function(data) {
+		for(k in data){
+			//console.log(k);
+			switch(k) {
+				case 'nav':
+					var n = new navModel(data[k][0]);
+					self.nav(n);
+					break;
+			}
+			
+		}
+	});
+	
+}
+
+ko.applyBindings(new App());
+
+
+/*var App = {
+
+	menuItem : function(data){
+		if (!data) data = ['','','','']
+		this.url = ko.observable(data[0]);
+		this.text = ko.observable(data[1]);
+		this.style = ko.observable(data[2]);
+		this.title = ko.observable(data[3]);
+	},
+	
+	navModel : function() {
+		
+		
+	},
+
+}*/
+
+
+
+
+// Activates knockout.js
+//ko.applyBindings(new navModel());
+
+/*
+$(document).ready(function(){
+	$.getJSON(window.location, function(data) {
+		for(k in data){
+			var model = k+"Model";
+			if (model in App) {
+				for (kk in data[k][0]) {
+					console.log(kk);
+				}
+				
+				
+			} 				
+		}
+		
+	}); 
+})
+*/
\ No newline at end of file
diff --git a/view/theme/oldtest/bootstrap.zip b/view/theme/oldtest/bootstrap.zip
new file mode 100644
index 0000000000000000000000000000000000000000..e4f27746a3bc9aa7d98f44ea10217c92b5fc7062
GIT binary patch
literal 85566
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

literal 0
HcmV?d00001

diff --git a/view/theme/oldtest/css/bootstrap-responsive.css b/view/theme/oldtest/css/bootstrap-responsive.css
new file mode 100644
index 0000000000..fcd72f7a77
--- /dev/null
+++ b/view/theme/oldtest/css/bootstrap-responsive.css
@@ -0,0 +1,1109 @@
+/*!
+ * Bootstrap Responsive v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+@-ms-viewport {
+  width: device-width;
+}
+
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+
+.visible-phone {
+  display: none !important;
+}
+
+.visible-tablet {
+  display: none !important;
+}
+
+.hidden-desktop {
+  display: none !important;
+}
+
+.visible-desktop {
+  display: inherit !important;
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important ;
+  }
+  .visible-tablet {
+    display: inherit !important;
+  }
+  .hidden-tablet {
+    display: none !important;
+  }
+}
+
+@media (max-width: 767px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important;
+  }
+  .visible-phone {
+    display: inherit !important;
+  }
+  .hidden-phone {
+    display: none !important;
+  }
+}
+
+.visible-print {
+  display: none !important;
+}
+
+@media print {
+  .visible-print {
+    display: inherit !important;
+  }
+  .hidden-print {
+    display: none !important;
+  }
+}
+
+@media (min-width: 1200px) {
+  .row {
+    margin-left: -30px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 30px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 1170px;
+  }
+  .span12 {
+    width: 1170px;
+  }
+  .span11 {
+    width: 1070px;
+  }
+  .span10 {
+    width: 970px;
+  }
+  .span9 {
+    width: 870px;
+  }
+  .span8 {
+    width: 770px;
+  }
+  .span7 {
+    width: 670px;
+  }
+  .span6 {
+    width: 570px;
+  }
+  .span5 {
+    width: 470px;
+  }
+  .span4 {
+    width: 370px;
+  }
+  .span3 {
+    width: 270px;
+  }
+  .span2 {
+    width: 170px;
+  }
+  .span1 {
+    width: 70px;
+  }
+  .offset12 {
+    margin-left: 1230px;
+  }
+  .offset11 {
+    margin-left: 1130px;
+  }
+  .offset10 {
+    margin-left: 1030px;
+  }
+  .offset9 {
+    margin-left: 930px;
+  }
+  .offset8 {
+    margin-left: 830px;
+  }
+  .offset7 {
+    margin-left: 730px;
+  }
+  .offset6 {
+    margin-left: 630px;
+  }
+  .offset5 {
+    margin-left: 530px;
+  }
+  .offset4 {
+    margin-left: 430px;
+  }
+  .offset3 {
+    margin-left: 330px;
+  }
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset1 {
+    margin-left: 130px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.564102564102564%;
+    *margin-left: 2.5109110747408616%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.564102564102564%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.45299145299145%;
+    *width: 91.39979996362975%;
+  }
+  .row-fluid .span10 {
+    width: 82.90598290598291%;
+    *width: 82.8527914166212%;
+  }
+  .row-fluid .span9 {
+    width: 74.35897435897436%;
+    *width: 74.30578286961266%;
+  }
+  .row-fluid .span8 {
+    width: 65.81196581196582%;
+    *width: 65.75877432260411%;
+  }
+  .row-fluid .span7 {
+    width: 57.26495726495726%;
+    *width: 57.21176577559556%;
+  }
+  .row-fluid .span6 {
+    width: 48.717948717948715%;
+    *width: 48.664757228587014%;
+  }
+  .row-fluid .span5 {
+    width: 40.17094017094017%;
+    *width: 40.11774868157847%;
+  }
+  .row-fluid .span4 {
+    width: 31.623931623931625%;
+    *width: 31.570740134569924%;
+  }
+  .row-fluid .span3 {
+    width: 23.076923076923077%;
+    *width: 23.023731587561375%;
+  }
+  .row-fluid .span2 {
+    width: 14.52991452991453%;
+    *width: 14.476723040552828%;
+  }
+  .row-fluid .span1 {
+    width: 5.982905982905983%;
+    *width: 5.929714493544281%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.12820512820512%;
+    *margin-left: 105.02182214948171%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.56410256410257%;
+    *margin-left: 102.45771958537915%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.58119658119658%;
+    *margin-left: 96.47481360247316%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.01709401709402%;
+    *margin-left: 93.91071103837061%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.03418803418803%;
+    *margin-left: 87.92780505546462%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.47008547008548%;
+    *margin-left: 85.36370249136206%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.48717948717949%;
+    *margin-left: 79.38079650845607%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 76.92307692307693%;
+    *margin-left: 76.81669394435352%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 70.94017094017094%;
+    *margin-left: 70.83378796144753%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.37606837606839%;
+    *margin-left: 68.26968539734497%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.393162393162385%;
+    *margin-left: 62.28677941443899%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.82905982905982%;
+    *margin-left: 59.72267685033642%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 53.84615384615384%;
+    *margin-left: 53.739770867430444%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.28205128205128%;
+    *margin-left: 51.175668303327875%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.299145299145295%;
+    *margin-left: 45.1927623204219%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.73504273504273%;
+    *margin-left: 42.62865975631933%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 36.75213675213675%;
+    *margin-left: 36.645753773413354%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.18803418803419%;
+    *margin-left: 34.081651209310785%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.205128205128204%;
+    *margin-left: 28.0987452264048%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.641025641025642%;
+    *margin-left: 25.53464266230224%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.65811965811966%;
+    *margin-left: 19.551736679396257%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.094017094017094%;
+    *margin-left: 16.98763411529369%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.11111111111111%;
+    *margin-left: 11.004728132387708%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.547008547008547%;
+    *margin-left: 8.440625568285142%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 30px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 1156px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 1056px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 956px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 856px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 756px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 656px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 556px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 456px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 356px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 256px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 156px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 56px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .row {
+    margin-left: -20px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 20px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 724px;
+  }
+  .span12 {
+    width: 724px;
+  }
+  .span11 {
+    width: 662px;
+  }
+  .span10 {
+    width: 600px;
+  }
+  .span9 {
+    width: 538px;
+  }
+  .span8 {
+    width: 476px;
+  }
+  .span7 {
+    width: 414px;
+  }
+  .span6 {
+    width: 352px;
+  }
+  .span5 {
+    width: 290px;
+  }
+  .span4 {
+    width: 228px;
+  }
+  .span3 {
+    width: 166px;
+  }
+  .span2 {
+    width: 104px;
+  }
+  .span1 {
+    width: 42px;
+  }
+  .offset12 {
+    margin-left: 764px;
+  }
+  .offset11 {
+    margin-left: 702px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .offset9 {
+    margin-left: 578px;
+  }
+  .offset8 {
+    margin-left: 516px;
+  }
+  .offset7 {
+    margin-left: 454px;
+  }
+  .offset6 {
+    margin-left: 392px;
+  }
+  .offset5 {
+    margin-left: 330px;
+  }
+  .offset4 {
+    margin-left: 268px;
+  }
+  .offset3 {
+    margin-left: 206px;
+  }
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset1 {
+    margin-left: 82px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.7624309392265194%;
+    *margin-left: 2.709239449864817%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.7624309392265194%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.43646408839778%;
+    *width: 91.38327259903608%;
+  }
+  .row-fluid .span10 {
+    width: 82.87292817679558%;
+    *width: 82.81973668743387%;
+  }
+  .row-fluid .span9 {
+    width: 74.30939226519337%;
+    *width: 74.25620077583166%;
+  }
+  .row-fluid .span8 {
+    width: 65.74585635359117%;
+    *width: 65.69266486422946%;
+  }
+  .row-fluid .span7 {
+    width: 57.18232044198895%;
+    *width: 57.12912895262725%;
+  }
+  .row-fluid .span6 {
+    width: 48.61878453038674%;
+    *width: 48.56559304102504%;
+  }
+  .row-fluid .span5 {
+    width: 40.05524861878453%;
+    *width: 40.00205712942283%;
+  }
+  .row-fluid .span4 {
+    width: 31.491712707182323%;
+    *width: 31.43852121782062%;
+  }
+  .row-fluid .span3 {
+    width: 22.92817679558011%;
+    *width: 22.87498530621841%;
+  }
+  .row-fluid .span2 {
+    width: 14.3646408839779%;
+    *width: 14.311449394616199%;
+  }
+  .row-fluid .span1 {
+    width: 5.801104972375691%;
+    *width: 5.747913483013988%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.52486187845304%;
+    *margin-left: 105.41847889972962%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.76243093922652%;
+    *margin-left: 102.6560479605031%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.96132596685082%;
+    *margin-left: 96.8549429881274%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.1988950276243%;
+    *margin-left: 94.09251204890089%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.39779005524862%;
+    *margin-left: 88.2914070765252%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.6353591160221%;
+    *margin-left: 85.52897613729868%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.8342541436464%;
+    *margin-left: 79.72787116492299%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 77.07182320441989%;
+    *margin-left: 76.96544022569647%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 71.2707182320442%;
+    *margin-left: 71.16433525332079%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.50828729281768%;
+    *margin-left: 68.40190431409427%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.70718232044199%;
+    *margin-left: 62.600799341718584%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.94475138121547%;
+    *margin-left: 59.838368402492065%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 54.14364640883978%;
+    *margin-left: 54.037263430116376%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.38121546961326%;
+    *margin-left: 51.27483249088986%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.58011049723757%;
+    *margin-left: 45.47372751851417%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.81767955801105%;
+    *margin-left: 42.71129657928765%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 37.01657458563536%;
+    *margin-left: 36.91019160691196%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.25414364640884%;
+    *margin-left: 34.14776066768544%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.45303867403315%;
+    *margin-left: 28.346655695309746%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.69060773480663%;
+    *margin-left: 25.584224756083227%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.88950276243094%;
+    *margin-left: 19.783119783707537%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.12707182320442%;
+    *margin-left: 17.02068884448102%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.32596685082873%;
+    *margin-left: 11.219583872105325%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.56353591160221%;
+    *margin-left: 8.457152932878806%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 20px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 710px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 648px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 586px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 524px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 462px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 400px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 338px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 276px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 214px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 152px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 90px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 28px;
+  }
+}
+
+@media (max-width: 767px) {
+  body {
+    padding-right: 20px;
+    padding-left: 20px;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom,
+  .navbar-static-top {
+    margin-right: -20px;
+    margin-left: -20px;
+  }
+  .container-fluid {
+    padding: 0;
+  }
+  .dl-horizontal dt {
+    float: none;
+    width: auto;
+    clear: none;
+    text-align: left;
+  }
+  .dl-horizontal dd {
+    margin-left: 0;
+  }
+  .container {
+    width: auto;
+  }
+  .row-fluid {
+    width: 100%;
+  }
+  .row,
+  .thumbnails {
+    margin-left: 0;
+  }
+  .thumbnails > li {
+    float: none;
+    margin-left: 0;
+  }
+  [class*="span"],
+  .uneditable-input[class*="span"],
+  .row-fluid [class*="span"] {
+    display: block;
+    float: none;
+    width: 100%;
+    margin-left: 0;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .span12,
+  .row-fluid .span12 {
+    width: 100%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="offset"]:first-child {
+    margin-left: 0;
+  }
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    min-height: 30px;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block;
+    width: auto;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 0;
+  }
+  .modal {
+    position: fixed;
+    top: 20px;
+    right: 20px;
+    left: 20px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade {
+    top: -100px;
+  }
+  .modal.fade.in {
+    top: 20px;
+  }
+}
+
+@media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  .page-header h1 small {
+    display: block;
+    line-height: 20px;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+  .media .pull-left,
+  .media .pull-right {
+    display: block;
+    float: none;
+    margin-bottom: 10px;
+  }
+  .media-object {
+    margin-right: 0;
+    margin-left: 0;
+  }
+  .modal {
+    top: 10px;
+    right: 10px;
+    left: 10px;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+
+@media (max-width: 979px) {
+  body {
+    padding-top: 0;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: static;
+  }
+  .navbar-fixed-top {
+    margin-bottom: 20px;
+  }
+  .navbar-fixed-bottom {
+    margin-top: 20px;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  .navbar .brand {
+    padding-right: 10px;
+    padding-left: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .nav-collapse {
+    clear: both;
+  }
+  .nav-collapse .nav {
+    float: none;
+    margin: 0 0 10px;
+  }
+  .nav-collapse .nav > li {
+    float: none;
+  }
+  .nav-collapse .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > .divider-vertical {
+    display: none;
+  }
+  .nav-collapse .nav .nav-header {
+    color: #777777;
+    text-shadow: none;
+  }
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 9px 15px;
+    font-weight: bold;
+    color: #777777;
+    -webkit-border-radius: 3px;
+       -moz-border-radius: 3px;
+            border-radius: 3px;
+  }
+  .nav-collapse .btn {
+    padding: 4px 10px 4px;
+    font-weight: normal;
+    -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+            border-radius: 4px;
+  }
+  .nav-collapse .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .nav > li > a:focus,
+  .nav-collapse .dropdown-menu a:hover,
+  .nav-collapse .dropdown-menu a:focus {
+    background-color: #f2f2f2;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a,
+  .navbar-inverse .nav-collapse .dropdown-menu a {
+    color: #999999;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a:hover,
+  .navbar-inverse .nav-collapse .nav > li > a:focus,
+  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
+    background-color: #111111;
+  }
+  .nav-collapse.in .btn-group {
+    padding: 0;
+    margin-top: 5px;
+  }
+  .nav-collapse .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    display: none;
+    float: none;
+    max-width: none;
+    padding: 0;
+    margin: 0 15px;
+    background-color: transparent;
+    border: none;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+  }
+  .nav-collapse .open > .dropdown-menu {
+    display: block;
+  }
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .dropdown-menu .divider {
+    display: none;
+  }
+  .nav-collapse .nav > li > .dropdown-menu:before,
+  .nav-collapse .nav > li > .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    float: none;
+    padding: 10px 15px;
+    margin: 10px 0;
+    border-top: 1px solid #f2f2f2;
+    border-bottom: 1px solid #f2f2f2;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  }
+  .navbar-inverse .nav-collapse .navbar-form,
+  .navbar-inverse .nav-collapse .navbar-search {
+    border-top-color: #111111;
+    border-bottom-color: #111111;
+  }
+  .navbar .nav-collapse .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  .nav-collapse,
+  .nav-collapse.collapse {
+    height: 0;
+    overflow: hidden;
+  }
+  .navbar .btn-navbar {
+    display: block;
+  }
+  .navbar-static .navbar-inner {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+}
+
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
diff --git a/view/theme/oldtest/css/bootstrap-responsive.min.css b/view/theme/oldtest/css/bootstrap-responsive.min.css
new file mode 100644
index 0000000000..d1b7f4b0b8
--- /dev/null
+++ b/view/theme/oldtest/css/bootstrap-responsive.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap Responsive v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/view/theme/oldtest/css/bootstrap.css b/view/theme/oldtest/css/bootstrap.css
new file mode 100644
index 0000000000..2f56af33f3
--- /dev/null
+++ b/view/theme/oldtest/css/bootstrap.css
@@ -0,0 +1,6158 @@
+/*!
+ * Bootstrap v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+
+audio:not([controls]) {
+  display: none;
+}
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+
+a:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+a:hover,
+a:active {
+  outline: 0;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+img {
+  width: auto\9;
+  height: auto;
+  max-width: 100%;
+  vertical-align: middle;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+#map_canvas img,
+.google-maps img {
+  max-width: none;
+}
+
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+
+button,
+input {
+  *overflow: visible;
+  line-height: normal;
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+  cursor: pointer;
+}
+
+input[type="search"] {
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+  -webkit-appearance: textfield;
+}
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+
+@media print {
+  * {
+    color: #000 !important;
+    text-shadow: none !important;
+    background: transparent !important;
+    box-shadow: none !important;
+  }
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+  .ir a:after,
+  a[href^="javascript:"]:after,
+  a[href^="#"]:after {
+    content: "";
+  }
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+  thead {
+    display: table-header-group;
+  }
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+  img {
+    max-width: 100% !important;
+  }
+  @page  {
+    margin: 0.5cm;
+  }
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+}
+
+body {
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  background-color: #ffffff;
+}
+
+a {
+  color: #0088cc;
+  text-decoration: none;
+}
+
+a:hover,
+a:focus {
+  color: #005580;
+  text-decoration: underline;
+}
+
+.img-rounded {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.img-polaroid {
+  padding: 4px;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.img-circle {
+  -webkit-border-radius: 500px;
+     -moz-border-radius: 500px;
+          border-radius: 500px;
+}
+
+.row {
+  margin-left: -20px;
+  *zoom: 1;
+}
+
+.row:before,
+.row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row:after {
+  clear: both;
+}
+
+[class*="span"] {
+  float: left;
+  min-height: 1px;
+  margin-left: 20px;
+}
+
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.span12 {
+  width: 940px;
+}
+
+.span11 {
+  width: 860px;
+}
+
+.span10 {
+  width: 780px;
+}
+
+.span9 {
+  width: 700px;
+}
+
+.span8 {
+  width: 620px;
+}
+
+.span7 {
+  width: 540px;
+}
+
+.span6 {
+  width: 460px;
+}
+
+.span5 {
+  width: 380px;
+}
+
+.span4 {
+  width: 300px;
+}
+
+.span3 {
+  width: 220px;
+}
+
+.span2 {
+  width: 140px;
+}
+
+.span1 {
+  width: 60px;
+}
+
+.offset12 {
+  margin-left: 980px;
+}
+
+.offset11 {
+  margin-left: 900px;
+}
+
+.offset10 {
+  margin-left: 820px;
+}
+
+.offset9 {
+  margin-left: 740px;
+}
+
+.offset8 {
+  margin-left: 660px;
+}
+
+.offset7 {
+  margin-left: 580px;
+}
+
+.offset6 {
+  margin-left: 500px;
+}
+
+.offset5 {
+  margin-left: 420px;
+}
+
+.offset4 {
+  margin-left: 340px;
+}
+
+.offset3 {
+  margin-left: 260px;
+}
+
+.offset2 {
+  margin-left: 180px;
+}
+
+.offset1 {
+  margin-left: 100px;
+}
+
+.row-fluid {
+  width: 100%;
+  *zoom: 1;
+}
+
+.row-fluid:before,
+.row-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row-fluid:after {
+  clear: both;
+}
+
+.row-fluid [class*="span"] {
+  display: block;
+  float: left;
+  width: 100%;
+  min-height: 30px;
+  margin-left: 2.127659574468085%;
+  *margin-left: 2.074468085106383%;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.row-fluid [class*="span"]:first-child {
+  margin-left: 0;
+}
+
+.row-fluid .controls-row [class*="span"] + [class*="span"] {
+  margin-left: 2.127659574468085%;
+}
+
+.row-fluid .span12 {
+  width: 100%;
+  *width: 99.94680851063829%;
+}
+
+.row-fluid .span11 {
+  width: 91.48936170212765%;
+  *width: 91.43617021276594%;
+}
+
+.row-fluid .span10 {
+  width: 82.97872340425532%;
+  *width: 82.92553191489361%;
+}
+
+.row-fluid .span9 {
+  width: 74.46808510638297%;
+  *width: 74.41489361702126%;
+}
+
+.row-fluid .span8 {
+  width: 65.95744680851064%;
+  *width: 65.90425531914893%;
+}
+
+.row-fluid .span7 {
+  width: 57.44680851063829%;
+  *width: 57.39361702127659%;
+}
+
+.row-fluid .span6 {
+  width: 48.93617021276595%;
+  *width: 48.88297872340425%;
+}
+
+.row-fluid .span5 {
+  width: 40.42553191489362%;
+  *width: 40.37234042553192%;
+}
+
+.row-fluid .span4 {
+  width: 31.914893617021278%;
+  *width: 31.861702127659576%;
+}
+
+.row-fluid .span3 {
+  width: 23.404255319148934%;
+  *width: 23.351063829787233%;
+}
+
+.row-fluid .span2 {
+  width: 14.893617021276595%;
+  *width: 14.840425531914894%;
+}
+
+.row-fluid .span1 {
+  width: 6.382978723404255%;
+  *width: 6.329787234042553%;
+}
+
+.row-fluid .offset12 {
+  margin-left: 104.25531914893617%;
+  *margin-left: 104.14893617021275%;
+}
+
+.row-fluid .offset12:first-child {
+  margin-left: 102.12765957446808%;
+  *margin-left: 102.02127659574467%;
+}
+
+.row-fluid .offset11 {
+  margin-left: 95.74468085106382%;
+  *margin-left: 95.6382978723404%;
+}
+
+.row-fluid .offset11:first-child {
+  margin-left: 93.61702127659574%;
+  *margin-left: 93.51063829787232%;
+}
+
+.row-fluid .offset10 {
+  margin-left: 87.23404255319149%;
+  *margin-left: 87.12765957446807%;
+}
+
+.row-fluid .offset10:first-child {
+  margin-left: 85.1063829787234%;
+  *margin-left: 84.99999999999999%;
+}
+
+.row-fluid .offset9 {
+  margin-left: 78.72340425531914%;
+  *margin-left: 78.61702127659572%;
+}
+
+.row-fluid .offset9:first-child {
+  margin-left: 76.59574468085106%;
+  *margin-left: 76.48936170212764%;
+}
+
+.row-fluid .offset8 {
+  margin-left: 70.2127659574468%;
+  *margin-left: 70.10638297872339%;
+}
+
+.row-fluid .offset8:first-child {
+  margin-left: 68.08510638297872%;
+  *margin-left: 67.9787234042553%;
+}
+
+.row-fluid .offset7 {
+  margin-left: 61.70212765957446%;
+  *margin-left: 61.59574468085106%;
+}
+
+.row-fluid .offset7:first-child {
+  margin-left: 59.574468085106375%;
+  *margin-left: 59.46808510638297%;
+}
+
+.row-fluid .offset6 {
+  margin-left: 53.191489361702125%;
+  *margin-left: 53.085106382978715%;
+}
+
+.row-fluid .offset6:first-child {
+  margin-left: 51.063829787234035%;
+  *margin-left: 50.95744680851063%;
+}
+
+.row-fluid .offset5 {
+  margin-left: 44.68085106382979%;
+  *margin-left: 44.57446808510638%;
+}
+
+.row-fluid .offset5:first-child {
+  margin-left: 42.5531914893617%;
+  *margin-left: 42.4468085106383%;
+}
+
+.row-fluid .offset4 {
+  margin-left: 36.170212765957444%;
+  *margin-left: 36.06382978723405%;
+}
+
+.row-fluid .offset4:first-child {
+  margin-left: 34.04255319148936%;
+  *margin-left: 33.93617021276596%;
+}
+
+.row-fluid .offset3 {
+  margin-left: 27.659574468085104%;
+  *margin-left: 27.5531914893617%;
+}
+
+.row-fluid .offset3:first-child {
+  margin-left: 25.53191489361702%;
+  *margin-left: 25.425531914893618%;
+}
+
+.row-fluid .offset2 {
+  margin-left: 19.148936170212764%;
+  *margin-left: 19.04255319148936%;
+}
+
+.row-fluid .offset2:first-child {
+  margin-left: 17.02127659574468%;
+  *margin-left: 16.914893617021278%;
+}
+
+.row-fluid .offset1 {
+  margin-left: 10.638297872340425%;
+  *margin-left: 10.53191489361702%;
+}
+
+.row-fluid .offset1:first-child {
+  margin-left: 8.51063829787234%;
+  *margin-left: 8.404255319148938%;
+}
+
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+  display: none;
+}
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+  float: right;
+}
+
+.container {
+  margin-right: auto;
+  margin-left: auto;
+  *zoom: 1;
+}
+
+.container:before,
+.container:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container:after {
+  clear: both;
+}
+
+.container-fluid {
+  padding-right: 20px;
+  padding-left: 20px;
+  *zoom: 1;
+}
+
+.container-fluid:before,
+.container-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container-fluid:after {
+  clear: both;
+}
+
+p {
+  margin: 0 0 10px;
+}
+
+.lead {
+  margin-bottom: 20px;
+  font-size: 21px;
+  font-weight: 200;
+  line-height: 30px;
+}
+
+small {
+  font-size: 85%;
+}
+
+strong {
+  font-weight: bold;
+}
+
+em {
+  font-style: italic;
+}
+
+cite {
+  font-style: normal;
+}
+
+.muted {
+  color: #999999;
+}
+
+a.muted:hover,
+a.muted:focus {
+  color: #808080;
+}
+
+.text-warning {
+  color: #c09853;
+}
+
+a.text-warning:hover,
+a.text-warning:focus {
+  color: #a47e3c;
+}
+
+.text-error {
+  color: #b94a48;
+}
+
+a.text-error:hover,
+a.text-error:focus {
+  color: #953b39;
+}
+
+.text-info {
+  color: #3a87ad;
+}
+
+a.text-info:hover,
+a.text-info:focus {
+  color: #2d6987;
+}
+
+.text-success {
+  color: #468847;
+}
+
+a.text-success:hover,
+a.text-success:focus {
+  color: #356635;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 10px 0;
+  font-family: inherit;
+  font-weight: bold;
+  line-height: 20px;
+  color: inherit;
+  text-rendering: optimizelegibility;
+}
+
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+  font-weight: normal;
+  line-height: 1;
+  color: #999999;
+}
+
+h1,
+h2,
+h3 {
+  line-height: 40px;
+}
+
+h1 {
+  font-size: 38.5px;
+}
+
+h2 {
+  font-size: 31.5px;
+}
+
+h3 {
+  font-size: 24.5px;
+}
+
+h4 {
+  font-size: 17.5px;
+}
+
+h5 {
+  font-size: 14px;
+}
+
+h6 {
+  font-size: 11.9px;
+}
+
+h1 small {
+  font-size: 24.5px;
+}
+
+h2 small {
+  font-size: 17.5px;
+}
+
+h3 small {
+  font-size: 14px;
+}
+
+h4 small {
+  font-size: 14px;
+}
+
+.page-header {
+  padding-bottom: 9px;
+  margin: 20px 0 30px;
+  border-bottom: 1px solid #eeeeee;
+}
+
+ul,
+ol {
+  padding: 0;
+  margin: 0 0 10px 25px;
+}
+
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+
+li {
+  line-height: 20px;
+}
+
+ul.unstyled,
+ol.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+
+ul.inline,
+ol.inline {
+  margin-left: 0;
+  list-style: none;
+}
+
+ul.inline > li,
+ol.inline > li {
+  display: inline-block;
+  *display: inline;
+  padding-right: 5px;
+  padding-left: 5px;
+  *zoom: 1;
+}
+
+dl {
+  margin-bottom: 20px;
+}
+
+dt,
+dd {
+  line-height: 20px;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin-left: 10px;
+}
+
+.dl-horizontal {
+  *zoom: 1;
+}
+
+.dl-horizontal:before,
+.dl-horizontal:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.dl-horizontal:after {
+  clear: both;
+}
+
+.dl-horizontal dt {
+  float: left;
+  width: 160px;
+  overflow: hidden;
+  clear: left;
+  text-align: right;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.dl-horizontal dd {
+  margin-left: 180px;
+}
+
+hr {
+  margin: 20px 0;
+  border: 0;
+  border-top: 1px solid #eeeeee;
+  border-bottom: 1px solid #ffffff;
+}
+
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+  border-bottom: 1px dotted #999999;
+}
+
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 20px;
+  border-left: 5px solid #eeeeee;
+}
+
+blockquote p {
+  margin-bottom: 0;
+  font-size: 17.5px;
+  font-weight: 300;
+  line-height: 1.25;
+}
+
+blockquote small {
+  display: block;
+  line-height: 20px;
+  color: #999999;
+}
+
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+
+blockquote.pull-right {
+  float: right;
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid #eeeeee;
+  border-left: 0;
+}
+
+blockquote.pull-right p,
+blockquote.pull-right small {
+  text-align: right;
+}
+
+blockquote.pull-right small:before {
+  content: '';
+}
+
+blockquote.pull-right small:after {
+  content: '\00A0 \2014';
+}
+
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+
+address {
+  display: block;
+  margin-bottom: 20px;
+  font-style: normal;
+  line-height: 20px;
+}
+
+code,
+pre {
+  padding: 0 3px 2px;
+  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-size: 12px;
+  color: #333333;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+code {
+  padding: 2px 4px;
+  color: #d14;
+  white-space: nowrap;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+
+pre {
+  display: block;
+  padding: 9.5px;
+  margin: 0 0 10px;
+  font-size: 13px;
+  line-height: 20px;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+pre.prettyprint {
+  margin-bottom: 20px;
+}
+
+pre code {
+  padding: 0;
+  color: inherit;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: transparent;
+  border: 0;
+}
+
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
+
+form {
+  margin: 0 0 20px;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 20px;
+  font-size: 21px;
+  line-height: 40px;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+}
+
+legend small {
+  font-size: 15px;
+  color: #999999;
+}
+
+label,
+input,
+button,
+select,
+textarea {
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+}
+
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  display: inline-block;
+  height: 20px;
+  padding: 4px 6px;
+  margin-bottom: 10px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #555555;
+  vertical-align: middle;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+input,
+textarea,
+.uneditable-input {
+  width: 206px;
+}
+
+textarea {
+  height: auto;
+}
+
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+          transition: border linear 0.2s, box-shadow linear 0.2s;
+}
+
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+  border-color: rgba(82, 168, 236, 0.8);
+  outline: 0;
+  outline: thin dotted \9;
+  /* IE6-9 */
+
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
+  margin-top: 1px \9;
+  *margin-top: 0;
+  line-height: normal;
+}
+
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+  width: auto;
+}
+
+select,
+input[type="file"] {
+  height: 30px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
+  line-height: 30px;
+}
+
+select {
+  width: 220px;
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+}
+
+select[multiple],
+select[size] {
+  height: auto;
+}
+
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.uneditable-input,
+.uneditable-textarea {
+  color: #999999;
+  cursor: not-allowed;
+  background-color: #fcfcfc;
+  border-color: #cccccc;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+}
+
+.uneditable-input {
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+  color: #999999;
+}
+
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+  color: #999999;
+}
+
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #999999;
+}
+
+.radio,
+.checkbox {
+  min-height: 20px;
+  padding-left: 20px;
+}
+
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -20px;
+}
+
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+  padding-top: 5px;
+}
+
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  padding-top: 5px;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
+
+.input-mini {
+  width: 60px;
+}
+
+.input-small {
+  width: 90px;
+}
+
+.input-medium {
+  width: 150px;
+}
+
+.input-large {
+  width: 210px;
+}
+
+.input-xlarge {
+  width: 270px;
+}
+
+.input-xxlarge {
+  width: 530px;
+}
+
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+  float: none;
+  margin-left: 0;
+}
+
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+  display: inline-block;
+}
+
+input,
+textarea,
+.uneditable-input {
+  margin-left: 0;
+}
+
+.controls-row [class*="span"] + [class*="span"] {
+  margin-left: 20px;
+}
+
+input.span12,
+textarea.span12,
+.uneditable-input.span12 {
+  width: 926px;
+}
+
+input.span11,
+textarea.span11,
+.uneditable-input.span11 {
+  width: 846px;
+}
+
+input.span10,
+textarea.span10,
+.uneditable-input.span10 {
+  width: 766px;
+}
+
+input.span9,
+textarea.span9,
+.uneditable-input.span9 {
+  width: 686px;
+}
+
+input.span8,
+textarea.span8,
+.uneditable-input.span8 {
+  width: 606px;
+}
+
+input.span7,
+textarea.span7,
+.uneditable-input.span7 {
+  width: 526px;
+}
+
+input.span6,
+textarea.span6,
+.uneditable-input.span6 {
+  width: 446px;
+}
+
+input.span5,
+textarea.span5,
+.uneditable-input.span5 {
+  width: 366px;
+}
+
+input.span4,
+textarea.span4,
+.uneditable-input.span4 {
+  width: 286px;
+}
+
+input.span3,
+textarea.span3,
+.uneditable-input.span3 {
+  width: 206px;
+}
+
+input.span2,
+textarea.span2,
+.uneditable-input.span2 {
+  width: 126px;
+}
+
+input.span1,
+textarea.span1,
+.uneditable-input.span1 {
+  width: 46px;
+}
+
+.controls-row {
+  *zoom: 1;
+}
+
+.controls-row:before,
+.controls-row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.controls-row:after {
+  clear: both;
+}
+
+.controls-row [class*="span"],
+.row-fluid .controls-row [class*="span"] {
+  float: left;
+}
+
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+  padding-top: 5px;
+}
+
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  cursor: not-allowed;
+  background-color: #eeeeee;
+}
+
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+  background-color: transparent;
+}
+
+.control-group.warning .control-label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+  color: #c09853;
+}
+
+.control-group.warning .checkbox,
+.control-group.warning .radio,
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  color: #c09853;
+}
+
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  border-color: #c09853;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+  border-color: #a47e3c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+}
+
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #fcf8e3;
+  border-color: #c09853;
+}
+
+.control-group.error .control-label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+  color: #b94a48;
+}
+
+.control-group.error .checkbox,
+.control-group.error .radio,
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  color: #b94a48;
+}
+
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  border-color: #b94a48;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+  border-color: #953b39;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+}
+
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #b94a48;
+}
+
+.control-group.success .control-label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+  color: #468847;
+}
+
+.control-group.success .checkbox,
+.control-group.success .radio,
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  color: #468847;
+}
+
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #468847;
+}
+
+.control-group.info .control-label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+  color: #3a87ad;
+}
+
+.control-group.info .checkbox,
+.control-group.info .radio,
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  color: #3a87ad;
+}
+
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  border-color: #3a87ad;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.info input:focus,
+.control-group.info select:focus,
+.control-group.info textarea:focus {
+  border-color: #2d6987;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+}
+
+.control-group.info .input-prepend .add-on,
+.control-group.info .input-append .add-on {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #3a87ad;
+}
+
+input:focus:invalid,
+textarea:focus:invalid,
+select:focus:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+
+input:focus:invalid:focus,
+textarea:focus:invalid:focus,
+select:focus:invalid:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+     -moz-box-shadow: 0 0 6px #f8b9b7;
+          box-shadow: 0 0 6px #f8b9b7;
+}
+
+.form-actions {
+  padding: 19px 20px 20px;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #e5e5e5;
+  *zoom: 1;
+}
+
+.form-actions:before,
+.form-actions:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.form-actions:after {
+  clear: both;
+}
+
+.help-block,
+.help-inline {
+  color: #595959;
+}
+
+.help-block {
+  display: block;
+  margin-bottom: 10px;
+}
+
+.help-inline {
+  display: inline-block;
+  *display: inline;
+  padding-left: 5px;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.input-append,
+.input-prepend {
+  display: inline-block;
+  margin-bottom: 10px;
+  font-size: 0;
+  white-space: nowrap;
+  vertical-align: middle;
+}
+
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input,
+.input-append .dropdown-menu,
+.input-prepend .dropdown-menu,
+.input-append .popover,
+.input-prepend .popover {
+  font-size: 14px;
+}
+
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input {
+  position: relative;
+  margin-bottom: 0;
+  *margin-left: 0;
+  vertical-align: top;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-append input:focus,
+.input-prepend input:focus,
+.input-append select:focus,
+.input-prepend select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend .uneditable-input:focus {
+  z-index: 2;
+}
+
+.input-append .add-on,
+.input-prepend .add-on {
+  display: inline-block;
+  width: auto;
+  height: 20px;
+  min-width: 16px;
+  padding: 4px 5px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+}
+
+.input-append .add-on,
+.input-prepend .add-on,
+.input-append .btn,
+.input-prepend .btn,
+.input-append .btn-group > .dropdown-toggle,
+.input-prepend .btn-group > .dropdown-toggle {
+  vertical-align: top;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-append .active,
+.input-prepend .active {
+  background-color: #a9dba9;
+  border-color: #46a546;
+}
+
+.input-prepend .add-on,
+.input-prepend .btn {
+  margin-right: -1px;
+}
+
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-append input + .btn-group .btn:last-child,
+.input-append select + .btn-group .btn:last-child,
+.input-append .uneditable-input + .btn-group .btn:last-child {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group {
+  margin-left: -1px;
+}
+
+.input-append .add-on:last-child,
+.input-append .btn:last-child,
+.input-append .btn-group:last-child > .dropdown-toggle {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-prepend.input-append input + .btn-group .btn,
+.input-prepend.input-append select + .btn-group .btn,
+.input-prepend.input-append .uneditable-input + .btn-group .btn {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append .btn-group:first-child {
+  margin-left: 0;
+}
+
+input.search-query {
+  padding-right: 14px;
+  padding-right: 4px \9;
+  padding-left: 14px;
+  padding-left: 4px \9;
+  /* IE7-8 doesn't have border-radius, so don't indent the padding */
+
+  margin-bottom: 0;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+/* Allow for input prepend/append in search forms */
+
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.form-search .input-append .search-query {
+  -webkit-border-radius: 14px 0 0 14px;
+     -moz-border-radius: 14px 0 0 14px;
+          border-radius: 14px 0 0 14px;
+}
+
+.form-search .input-append .btn {
+  -webkit-border-radius: 0 14px 14px 0;
+     -moz-border-radius: 0 14px 14px 0;
+          border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0 14px 14px 0;
+     -moz-border-radius: 0 14px 14px 0;
+          border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .btn {
+  -webkit-border-radius: 14px 0 0 14px;
+     -moz-border-radius: 14px 0 0 14px;
+          border-radius: 14px 0 0 14px;
+}
+
+.form-search input,
+.form-inline input,
+.form-horizontal input,
+.form-search textarea,
+.form-inline textarea,
+.form-horizontal textarea,
+.form-search select,
+.form-inline select,
+.form-horizontal select,
+.form-search .help-inline,
+.form-inline .help-inline,
+.form-horizontal .help-inline,
+.form-search .uneditable-input,
+.form-inline .uneditable-input,
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+  display: none;
+}
+
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
+  display: inline-block;
+}
+
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
+}
+
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+  padding-left: 0;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+  float: left;
+  margin-right: 3px;
+  margin-left: 0;
+}
+
+.control-group {
+  margin-bottom: 10px;
+}
+
+legend + .control-group {
+  margin-top: 20px;
+  -webkit-margin-top-collapse: separate;
+}
+
+.form-horizontal .control-group {
+  margin-bottom: 20px;
+  *zoom: 1;
+}
+
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.form-horizontal .control-group:after {
+  clear: both;
+}
+
+.form-horizontal .control-label {
+  float: left;
+  width: 160px;
+  padding-top: 5px;
+  text-align: right;
+}
+
+.form-horizontal .controls {
+  *display: inline-block;
+  *padding-left: 20px;
+  margin-left: 180px;
+  *margin-left: 0;
+}
+
+.form-horizontal .controls:first-child {
+  *padding-left: 180px;
+}
+
+.form-horizontal .help-block {
+  margin-bottom: 0;
+}
+
+.form-horizontal input + .help-block,
+.form-horizontal select + .help-block,
+.form-horizontal textarea + .help-block,
+.form-horizontal .uneditable-input + .help-block,
+.form-horizontal .input-prepend + .help-block,
+.form-horizontal .input-append + .help-block {
+  margin-top: 10px;
+}
+
+.form-horizontal .form-actions {
+  padding-left: 180px;
+}
+
+table {
+  max-width: 100%;
+  background-color: transparent;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+.table {
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+.table th,
+.table td {
+  padding: 8px;
+  line-height: 20px;
+  text-align: left;
+  vertical-align: top;
+  border-top: 1px solid #dddddd;
+}
+
+.table th {
+  font-weight: bold;
+}
+
+.table thead th {
+  vertical-align: bottom;
+}
+
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table tbody + tbody {
+  border-top: 2px solid #dddddd;
+}
+
+.table .table {
+  background-color: #ffffff;
+}
+
+.table-condensed th,
+.table-condensed td {
+  padding: 4px 5px;
+}
+
+.table-bordered {
+  border: 1px solid #dddddd;
+  border-collapse: separate;
+  *border-collapse: collapse;
+  border-left: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.table-bordered th,
+.table-bordered td {
+  border-left: 1px solid #dddddd;
+}
+
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table-bordered thead:first-child tr:first-child > th:first-child,
+.table-bordered tbody:first-child tr:first-child > td:first-child,
+.table-bordered tbody:first-child tr:first-child > th:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered thead:first-child tr:first-child > th:last-child,
+.table-bordered tbody:first-child tr:first-child > td:last-child,
+.table-bordered tbody:first-child tr:first-child > th:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child > th:first-child,
+.table-bordered tbody:last-child tr:last-child > td:first-child,
+.table-bordered tbody:last-child tr:last-child > th:first-child,
+.table-bordered tfoot:last-child tr:last-child > td:first-child,
+.table-bordered tfoot:last-child tr:last-child > th:first-child {
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child > th:last-child,
+.table-bordered tbody:last-child tr:last-child > td:last-child,
+.table-bordered tbody:last-child tr:last-child > th:last-child,
+.table-bordered tfoot:last-child tr:last-child > td:last-child,
+.table-bordered tfoot:last-child tr:last-child > th:last-child {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
+  -webkit-border-bottom-left-radius: 0;
+          border-bottom-left-radius: 0;
+  -moz-border-radius-bottomleft: 0;
+}
+
+.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
+  -webkit-border-bottom-right-radius: 0;
+          border-bottom-right-radius: 0;
+  -moz-border-radius-bottomright: 0;
+}
+
+.table-bordered caption + thead tr:first-child th:first-child,
+.table-bordered caption + tbody tr:first-child td:first-child,
+.table-bordered colgroup + thead tr:first-child th:first-child,
+.table-bordered colgroup + tbody tr:first-child td:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered caption + thead tr:first-child th:last-child,
+.table-bordered caption + tbody tr:first-child td:last-child,
+.table-bordered colgroup + thead tr:first-child th:last-child,
+.table-bordered colgroup + tbody tr:first-child td:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+}
+
+.table-striped tbody > tr:nth-child(odd) > td,
+.table-striped tbody > tr:nth-child(odd) > th {
+  background-color: #f9f9f9;
+}
+
+.table-hover tbody tr:hover > td,
+.table-hover tbody tr:hover > th {
+  background-color: #f5f5f5;
+}
+
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
+  display: table-cell;
+  float: none;
+  margin-left: 0;
+}
+
+.table td.span1,
+.table th.span1 {
+  float: none;
+  width: 44px;
+  margin-left: 0;
+}
+
+.table td.span2,
+.table th.span2 {
+  float: none;
+  width: 124px;
+  margin-left: 0;
+}
+
+.table td.span3,
+.table th.span3 {
+  float: none;
+  width: 204px;
+  margin-left: 0;
+}
+
+.table td.span4,
+.table th.span4 {
+  float: none;
+  width: 284px;
+  margin-left: 0;
+}
+
+.table td.span5,
+.table th.span5 {
+  float: none;
+  width: 364px;
+  margin-left: 0;
+}
+
+.table td.span6,
+.table th.span6 {
+  float: none;
+  width: 444px;
+  margin-left: 0;
+}
+
+.table td.span7,
+.table th.span7 {
+  float: none;
+  width: 524px;
+  margin-left: 0;
+}
+
+.table td.span8,
+.table th.span8 {
+  float: none;
+  width: 604px;
+  margin-left: 0;
+}
+
+.table td.span9,
+.table th.span9 {
+  float: none;
+  width: 684px;
+  margin-left: 0;
+}
+
+.table td.span10,
+.table th.span10 {
+  float: none;
+  width: 764px;
+  margin-left: 0;
+}
+
+.table td.span11,
+.table th.span11 {
+  float: none;
+  width: 844px;
+  margin-left: 0;
+}
+
+.table td.span12,
+.table th.span12 {
+  float: none;
+  width: 924px;
+  margin-left: 0;
+}
+
+.table tbody tr.success > td {
+  background-color: #dff0d8;
+}
+
+.table tbody tr.error > td {
+  background-color: #f2dede;
+}
+
+.table tbody tr.warning > td {
+  background-color: #fcf8e3;
+}
+
+.table tbody tr.info > td {
+  background-color: #d9edf7;
+}
+
+.table-hover tbody tr.success:hover > td {
+  background-color: #d0e9c6;
+}
+
+.table-hover tbody tr.error:hover > td {
+  background-color: #ebcccc;
+}
+
+.table-hover tbody tr.warning:hover > td {
+  background-color: #faf2cc;
+}
+
+.table-hover tbody tr.info:hover > td {
+  background-color: #c4e3f3;
+}
+
+[class^="icon-"],
+[class*=" icon-"] {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  margin-top: 1px;
+  *margin-right: .3em;
+  line-height: 14px;
+  vertical-align: text-top;
+  background-image: url("../img/glyphicons-halflings.png");
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
+}
+
+/* White icons with optional class, or on hover/focus/active states of certain elements */
+
+.icon-white,
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
+.dropdown-menu > li > a:hover > [class^="icon-"],
+.dropdown-menu > li > a:focus > [class^="icon-"],
+.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > li > a:focus > [class*=" icon-"],
+.dropdown-menu > .active > a > [class^="icon-"],
+.dropdown-menu > .active > a > [class*=" icon-"],
+.dropdown-submenu:hover > a > [class^="icon-"],
+.dropdown-submenu:focus > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"],
+.dropdown-submenu:focus > a > [class*=" icon-"] {
+  background-image: url("../img/glyphicons-halflings-white.png");
+}
+
+.icon-glass {
+  background-position: 0      0;
+}
+
+.icon-music {
+  background-position: -24px 0;
+}
+
+.icon-search {
+  background-position: -48px 0;
+}
+
+.icon-envelope {
+  background-position: -72px 0;
+}
+
+.icon-heart {
+  background-position: -96px 0;
+}
+
+.icon-star {
+  background-position: -120px 0;
+}
+
+.icon-star-empty {
+  background-position: -144px 0;
+}
+
+.icon-user {
+  background-position: -168px 0;
+}
+
+.icon-film {
+  background-position: -192px 0;
+}
+
+.icon-th-large {
+  background-position: -216px 0;
+}
+
+.icon-th {
+  background-position: -240px 0;
+}
+
+.icon-th-list {
+  background-position: -264px 0;
+}
+
+.icon-ok {
+  background-position: -288px 0;
+}
+
+.icon-remove {
+  background-position: -312px 0;
+}
+
+.icon-zoom-in {
+  background-position: -336px 0;
+}
+
+.icon-zoom-out {
+  background-position: -360px 0;
+}
+
+.icon-off {
+  background-position: -384px 0;
+}
+
+.icon-signal {
+  background-position: -408px 0;
+}
+
+.icon-cog {
+  background-position: -432px 0;
+}
+
+.icon-trash {
+  background-position: -456px 0;
+}
+
+.icon-home {
+  background-position: 0 -24px;
+}
+
+.icon-file {
+  background-position: -24px -24px;
+}
+
+.icon-time {
+  background-position: -48px -24px;
+}
+
+.icon-road {
+  background-position: -72px -24px;
+}
+
+.icon-download-alt {
+  background-position: -96px -24px;
+}
+
+.icon-download {
+  background-position: -120px -24px;
+}
+
+.icon-upload {
+  background-position: -144px -24px;
+}
+
+.icon-inbox {
+  background-position: -168px -24px;
+}
+
+.icon-play-circle {
+  background-position: -192px -24px;
+}
+
+.icon-repeat {
+  background-position: -216px -24px;
+}
+
+.icon-refresh {
+  background-position: -240px -24px;
+}
+
+.icon-list-alt {
+  background-position: -264px -24px;
+}
+
+.icon-lock {
+  background-position: -287px -24px;
+}
+
+.icon-flag {
+  background-position: -312px -24px;
+}
+
+.icon-headphones {
+  background-position: -336px -24px;
+}
+
+.icon-volume-off {
+  background-position: -360px -24px;
+}
+
+.icon-volume-down {
+  background-position: -384px -24px;
+}
+
+.icon-volume-up {
+  background-position: -408px -24px;
+}
+
+.icon-qrcode {
+  background-position: -432px -24px;
+}
+
+.icon-barcode {
+  background-position: -456px -24px;
+}
+
+.icon-tag {
+  background-position: 0 -48px;
+}
+
+.icon-tags {
+  background-position: -25px -48px;
+}
+
+.icon-book {
+  background-position: -48px -48px;
+}
+
+.icon-bookmark {
+  background-position: -72px -48px;
+}
+
+.icon-print {
+  background-position: -96px -48px;
+}
+
+.icon-camera {
+  background-position: -120px -48px;
+}
+
+.icon-font {
+  background-position: -144px -48px;
+}
+
+.icon-bold {
+  background-position: -167px -48px;
+}
+
+.icon-italic {
+  background-position: -192px -48px;
+}
+
+.icon-text-height {
+  background-position: -216px -48px;
+}
+
+.icon-text-width {
+  background-position: -240px -48px;
+}
+
+.icon-align-left {
+  background-position: -264px -48px;
+}
+
+.icon-align-center {
+  background-position: -288px -48px;
+}
+
+.icon-align-right {
+  background-position: -312px -48px;
+}
+
+.icon-align-justify {
+  background-position: -336px -48px;
+}
+
+.icon-list {
+  background-position: -360px -48px;
+}
+
+.icon-indent-left {
+  background-position: -384px -48px;
+}
+
+.icon-indent-right {
+  background-position: -408px -48px;
+}
+
+.icon-facetime-video {
+  background-position: -432px -48px;
+}
+
+.icon-picture {
+  background-position: -456px -48px;
+}
+
+.icon-pencil {
+  background-position: 0 -72px;
+}
+
+.icon-map-marker {
+  background-position: -24px -72px;
+}
+
+.icon-adjust {
+  background-position: -48px -72px;
+}
+
+.icon-tint {
+  background-position: -72px -72px;
+}
+
+.icon-edit {
+  background-position: -96px -72px;
+}
+
+.icon-share {
+  background-position: -120px -72px;
+}
+
+.icon-check {
+  background-position: -144px -72px;
+}
+
+.icon-move {
+  background-position: -168px -72px;
+}
+
+.icon-step-backward {
+  background-position: -192px -72px;
+}
+
+.icon-fast-backward {
+  background-position: -216px -72px;
+}
+
+.icon-backward {
+  background-position: -240px -72px;
+}
+
+.icon-play {
+  background-position: -264px -72px;
+}
+
+.icon-pause {
+  background-position: -288px -72px;
+}
+
+.icon-stop {
+  background-position: -312px -72px;
+}
+
+.icon-forward {
+  background-position: -336px -72px;
+}
+
+.icon-fast-forward {
+  background-position: -360px -72px;
+}
+
+.icon-step-forward {
+  background-position: -384px -72px;
+}
+
+.icon-eject {
+  background-position: -408px -72px;
+}
+
+.icon-chevron-left {
+  background-position: -432px -72px;
+}
+
+.icon-chevron-right {
+  background-position: -456px -72px;
+}
+
+.icon-plus-sign {
+  background-position: 0 -96px;
+}
+
+.icon-minus-sign {
+  background-position: -24px -96px;
+}
+
+.icon-remove-sign {
+  background-position: -48px -96px;
+}
+
+.icon-ok-sign {
+  background-position: -72px -96px;
+}
+
+.icon-question-sign {
+  background-position: -96px -96px;
+}
+
+.icon-info-sign {
+  background-position: -120px -96px;
+}
+
+.icon-screenshot {
+  background-position: -144px -96px;
+}
+
+.icon-remove-circle {
+  background-position: -168px -96px;
+}
+
+.icon-ok-circle {
+  background-position: -192px -96px;
+}
+
+.icon-ban-circle {
+  background-position: -216px -96px;
+}
+
+.icon-arrow-left {
+  background-position: -240px -96px;
+}
+
+.icon-arrow-right {
+  background-position: -264px -96px;
+}
+
+.icon-arrow-up {
+  background-position: -289px -96px;
+}
+
+.icon-arrow-down {
+  background-position: -312px -96px;
+}
+
+.icon-share-alt {
+  background-position: -336px -96px;
+}
+
+.icon-resize-full {
+  background-position: -360px -96px;
+}
+
+.icon-resize-small {
+  background-position: -384px -96px;
+}
+
+.icon-plus {
+  background-position: -408px -96px;
+}
+
+.icon-minus {
+  background-position: -433px -96px;
+}
+
+.icon-asterisk {
+  background-position: -456px -96px;
+}
+
+.icon-exclamation-sign {
+  background-position: 0 -120px;
+}
+
+.icon-gift {
+  background-position: -24px -120px;
+}
+
+.icon-leaf {
+  background-position: -48px -120px;
+}
+
+.icon-fire {
+  background-position: -72px -120px;
+}
+
+.icon-eye-open {
+  background-position: -96px -120px;
+}
+
+.icon-eye-close {
+  background-position: -120px -120px;
+}
+
+.icon-warning-sign {
+  background-position: -144px -120px;
+}
+
+.icon-plane {
+  background-position: -168px -120px;
+}
+
+.icon-calendar {
+  background-position: -192px -120px;
+}
+
+.icon-random {
+  width: 16px;
+  background-position: -216px -120px;
+}
+
+.icon-comment {
+  background-position: -240px -120px;
+}
+
+.icon-magnet {
+  background-position: -264px -120px;
+}
+
+.icon-chevron-up {
+  background-position: -288px -120px;
+}
+
+.icon-chevron-down {
+  background-position: -313px -119px;
+}
+
+.icon-retweet {
+  background-position: -336px -120px;
+}
+
+.icon-shopping-cart {
+  background-position: -360px -120px;
+}
+
+.icon-folder-close {
+  width: 16px;
+  background-position: -384px -120px;
+}
+
+.icon-folder-open {
+  width: 16px;
+  background-position: -408px -120px;
+}
+
+.icon-resize-vertical {
+  background-position: -432px -119px;
+}
+
+.icon-resize-horizontal {
+  background-position: -456px -118px;
+}
+
+.icon-hdd {
+  background-position: 0 -144px;
+}
+
+.icon-bullhorn {
+  background-position: -24px -144px;
+}
+
+.icon-bell {
+  background-position: -48px -144px;
+}
+
+.icon-certificate {
+  background-position: -72px -144px;
+}
+
+.icon-thumbs-up {
+  background-position: -96px -144px;
+}
+
+.icon-thumbs-down {
+  background-position: -120px -144px;
+}
+
+.icon-hand-right {
+  background-position: -144px -144px;
+}
+
+.icon-hand-left {
+  background-position: -168px -144px;
+}
+
+.icon-hand-up {
+  background-position: -192px -144px;
+}
+
+.icon-hand-down {
+  background-position: -216px -144px;
+}
+
+.icon-circle-arrow-right {
+  background-position: -240px -144px;
+}
+
+.icon-circle-arrow-left {
+  background-position: -264px -144px;
+}
+
+.icon-circle-arrow-up {
+  background-position: -288px -144px;
+}
+
+.icon-circle-arrow-down {
+  background-position: -312px -144px;
+}
+
+.icon-globe {
+  background-position: -336px -144px;
+}
+
+.icon-wrench {
+  background-position: -360px -144px;
+}
+
+.icon-tasks {
+  background-position: -384px -144px;
+}
+
+.icon-filter {
+  background-position: -408px -144px;
+}
+
+.icon-briefcase {
+  background-position: -432px -144px;
+}
+
+.icon-fullscreen {
+  background-position: -456px -144px;
+}
+
+.dropup,
+.dropdown {
+  position: relative;
+}
+
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+}
+
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  outline: 0;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
+}
+
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+  background-image: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.open {
+  *z-index: 1000;
+}
+
+.open > .dropdown-menu {
+  display: block;
+}
+
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+  border-top: 0;
+  border-bottom: 4px solid #000000;
+  content: "";
+}
+
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 1px;
+}
+
+.dropdown-submenu {
+  position: relative;
+}
+
+.dropdown-submenu > .dropdown-menu {
+  top: 0;
+  left: 100%;
+  margin-top: -6px;
+  margin-left: -1px;
+  -webkit-border-radius: 0 6px 6px 6px;
+     -moz-border-radius: 0 6px 6px 6px;
+          border-radius: 0 6px 6px 6px;
+}
+
+.dropdown-submenu:hover > .dropdown-menu {
+  display: block;
+}
+
+.dropup .dropdown-submenu > .dropdown-menu {
+  top: auto;
+  bottom: 0;
+  margin-top: 0;
+  margin-bottom: -2px;
+  -webkit-border-radius: 5px 5px 5px 0;
+     -moz-border-radius: 5px 5px 5px 0;
+          border-radius: 5px 5px 5px 0;
+}
+
+.dropdown-submenu > a:after {
+  display: block;
+  float: right;
+  width: 0;
+  height: 0;
+  margin-top: 5px;
+  margin-right: -10px;
+  border-color: transparent;
+  border-left-color: #cccccc;
+  border-style: solid;
+  border-width: 5px 0 5px 5px;
+  content: " ";
+}
+
+.dropdown-submenu:hover > a:after {
+  border-left-color: #ffffff;
+}
+
+.dropdown-submenu.pull-left {
+  float: none;
+}
+
+.dropdown-submenu.pull-left > .dropdown-menu {
+  left: -100%;
+  margin-left: 10px;
+  -webkit-border-radius: 6px 0 6px 6px;
+     -moz-border-radius: 6px 0 6px 6px;
+          border-radius: 6px 0 6px 6px;
+}
+
+.dropdown .dropdown-menu .nav-header {
+  padding-right: 20px;
+  padding-left: 20px;
+}
+
+.typeahead {
+  z-index: 1051;
+  margin-top: 2px;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+
+.well-large {
+  padding: 24px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.well-small {
+  padding: 9px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.fade {
+  opacity: 0;
+  -webkit-transition: opacity 0.15s linear;
+     -moz-transition: opacity 0.15s linear;
+       -o-transition: opacity 0.15s linear;
+          transition: opacity 0.15s linear;
+}
+
+.fade.in {
+  opacity: 1;
+}
+
+.collapse {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  -webkit-transition: height 0.35s ease;
+     -moz-transition: height 0.35s ease;
+       -o-transition: height 0.35s ease;
+          transition: height 0.35s ease;
+}
+
+.collapse.in {
+  height: auto;
+}
+
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+
+.close:hover,
+.close:focus {
+  color: #000000;
+  text-decoration: none;
+  cursor: pointer;
+  opacity: 0.4;
+  filter: alpha(opacity=40);
+}
+
+button.close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
+
+.btn {
+  display: inline-block;
+  *display: inline;
+  padding: 4px 12px;
+  margin-bottom: 0;
+  *margin-left: .3em;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  vertical-align: middle;
+  cursor: pointer;
+  background-color: #f5f5f5;
+  *background-color: #e6e6e6;
+  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+  background-repeat: repeat-x;
+  border: 1px solid #cccccc;
+  *border: 0;
+  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-bottom-color: #b3b3b3;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn:hover,
+.btn:focus,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+  color: #333333;
+  background-color: #e6e6e6;
+  *background-color: #d9d9d9;
+}
+
+.btn:active,
+.btn.active {
+  background-color: #cccccc \9;
+}
+
+.btn:first-child {
+  *margin-left: 0;
+}
+
+.btn:hover,
+.btn:focus {
+  color: #333333;
+  text-decoration: none;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+     -moz-transition: background-position 0.1s linear;
+       -o-transition: background-position 0.1s linear;
+          transition: background-position 0.1s linear;
+}
+
+.btn:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.btn.active,
+.btn:active {
+  background-image: none;
+  outline: 0;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn.disabled,
+.btn[disabled] {
+  cursor: default;
+  background-image: none;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-large {
+  padding: 11px 19px;
+  font-size: 17.5px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
+  margin-top: 4px;
+}
+
+.btn-small {
+  padding: 2px 10px;
+  font-size: 11.9px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+  margin-top: 0;
+}
+
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+  margin-top: -1px;
+}
+
+.btn-mini {
+  padding: 0 6px;
+  font-size: 10.5px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+  width: 100%;
+}
+
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+  color: rgba(255, 255, 255, 0.75);
+}
+
+.btn-primary {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #006dcc;
+  *background-color: #0044cc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled] {
+  color: #ffffff;
+  background-color: #0044cc;
+  *background-color: #003bb3;
+}
+
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #003399 \9;
+}
+
+.btn-warning {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #faa732;
+  *background-color: #f89406;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  border-color: #f89406 #f89406 #ad6704;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
+  color: #ffffff;
+  background-color: #f89406;
+  *background-color: #df8505;
+}
+
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #c67605 \9;
+}
+
+.btn-danger {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #da4f49;
+  *background-color: #bd362f;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
+  background-repeat: repeat-x;
+  border-color: #bd362f #bd362f #802420;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
+  color: #ffffff;
+  background-color: #bd362f;
+  *background-color: #a9302a;
+}
+
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #942a25 \9;
+}
+
+.btn-success {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #5bb75b;
+  *background-color: #51a351;
+  background-image: -moz-linear-gradient(top, #62c462, #51a351);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
+  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
+  background-image: -o-linear-gradient(top, #62c462, #51a351);
+  background-image: linear-gradient(to bottom, #62c462, #51a351);
+  background-repeat: repeat-x;
+  border-color: #51a351 #51a351 #387038;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+  color: #ffffff;
+  background-color: #51a351;
+  *background-color: #499249;
+}
+
+.btn-success:active,
+.btn-success.active {
+  background-color: #408140 \9;
+}
+
+.btn-info {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #49afcd;
+  *background-color: #2f96b4;
+  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
+  background-repeat: repeat-x;
+  border-color: #2f96b4 #2f96b4 #1f6377;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
+  color: #ffffff;
+  background-color: #2f96b4;
+  *background-color: #2a85a0;
+}
+
+.btn-info:active,
+.btn-info.active {
+  background-color: #24748c \9;
+}
+
+.btn-inverse {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #363636;
+  *background-color: #222222;
+  background-image: -moz-linear-gradient(top, #444444, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
+  background-image: -webkit-linear-gradient(top, #444444, #222222);
+  background-image: -o-linear-gradient(top, #444444, #222222);
+  background-image: linear-gradient(to bottom, #444444, #222222);
+  background-repeat: repeat-x;
+  border-color: #222222 #222222 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-inverse:hover,
+.btn-inverse:focus,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+  color: #ffffff;
+  background-color: #222222;
+  *background-color: #151515;
+}
+
+.btn-inverse:active,
+.btn-inverse.active {
+  background-color: #080808 \9;
+}
+
+button.btn,
+input[type="submit"].btn {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+  *padding-top: 1px;
+  *padding-bottom: 1px;
+}
+
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+  background-color: transparent;
+  background-image: none;
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-link {
+  color: #0088cc;
+  cursor: pointer;
+  border-color: transparent;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-link:hover,
+.btn-link:focus {
+  color: #005580;
+  text-decoration: underline;
+  background-color: transparent;
+}
+
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus {
+  color: #333333;
+  text-decoration: none;
+}
+
+.btn-group {
+  position: relative;
+  display: inline-block;
+  *display: inline;
+  *margin-left: .3em;
+  font-size: 0;
+  white-space: nowrap;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.btn-group:first-child {
+  *margin-left: 0;
+}
+
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-toolbar {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  font-size: 0;
+}
+
+.btn-toolbar > .btn + .btn,
+.btn-toolbar > .btn-group + .btn,
+.btn-toolbar > .btn + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-group > .btn {
+  position: relative;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group > .btn + .btn {
+  margin-left: -1px;
+}
+
+.btn-group > .btn,
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
+  font-size: 14px;
+}
+
+.btn-group > .btn-mini {
+  font-size: 10.5px;
+}
+
+.btn-group > .btn-small {
+  font-size: 11.9px;
+}
+
+.btn-group > .btn-large {
+  font-size: 17.5px;
+}
+
+.btn-group > .btn:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.btn-group > .btn.large:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+          border-top-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -moz-border-radius-topleft: 6px;
+}
+
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+  -webkit-border-top-right-radius: 6px;
+          border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -moz-border-radius-bottomright: 6px;
+}
+
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+  z-index: 2;
+}
+
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+.btn-group > .btn + .dropdown-toggle {
+  *padding-top: 5px;
+  padding-right: 8px;
+  *padding-bottom: 5px;
+  padding-left: 8px;
+  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group > .btn-mini + .dropdown-toggle {
+  *padding-top: 2px;
+  padding-right: 5px;
+  *padding-bottom: 2px;
+  padding-left: 5px;
+}
+
+.btn-group > .btn-small + .dropdown-toggle {
+  *padding-top: 5px;
+  *padding-bottom: 4px;
+}
+
+.btn-group > .btn-large + .dropdown-toggle {
+  *padding-top: 7px;
+  padding-right: 12px;
+  *padding-bottom: 7px;
+  padding-left: 12px;
+}
+
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group.open .btn.dropdown-toggle {
+  background-color: #e6e6e6;
+}
+
+.btn-group.open .btn-primary.dropdown-toggle {
+  background-color: #0044cc;
+}
+
+.btn-group.open .btn-warning.dropdown-toggle {
+  background-color: #f89406;
+}
+
+.btn-group.open .btn-danger.dropdown-toggle {
+  background-color: #bd362f;
+}
+
+.btn-group.open .btn-success.dropdown-toggle {
+  background-color: #51a351;
+}
+
+.btn-group.open .btn-info.dropdown-toggle {
+  background-color: #2f96b4;
+}
+
+.btn-group.open .btn-inverse.dropdown-toggle {
+  background-color: #222222;
+}
+
+.btn .caret {
+  margin-top: 8px;
+  margin-left: 0;
+}
+
+.btn-large .caret {
+  margin-top: 6px;
+}
+
+.btn-large .caret {
+  border-top-width: 5px;
+  border-right-width: 5px;
+  border-left-width: 5px;
+}
+
+.btn-mini .caret,
+.btn-small .caret {
+  margin-top: 8px;
+}
+
+.dropup .btn-large .caret {
+  border-bottom-width: 5px;
+}
+
+.btn-primary .caret,
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret,
+.btn-inverse .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.btn-group-vertical {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+}
+
+.btn-group-vertical > .btn {
+  display: block;
+  float: none;
+  max-width: 100%;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group-vertical > .btn + .btn {
+  margin-top: -1px;
+  margin-left: 0;
+}
+
+.btn-group-vertical > .btn:first-child {
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.btn-group-vertical > .btn:last-child {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.btn-group-vertical > .btn-large:first-child {
+  -webkit-border-radius: 6px 6px 0 0;
+     -moz-border-radius: 6px 6px 0 0;
+          border-radius: 6px 6px 0 0;
+}
+
+.btn-group-vertical > .btn-large:last-child {
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+}
+
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: 20px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color: #fcf8e3;
+  border: 1px solid #fbeed5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.alert,
+.alert h4 {
+  color: #c09853;
+}
+
+.alert h4 {
+  margin: 0;
+}
+
+.alert .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  line-height: 20px;
+}
+
+.alert-success {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+
+.alert-success h4 {
+  color: #468847;
+}
+
+.alert-danger,
+.alert-error {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #eed3d7;
+}
+
+.alert-danger h4,
+.alert-error h4 {
+  color: #b94a48;
+}
+
+.alert-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+
+.alert-info h4 {
+  color: #3a87ad;
+}
+
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+
+.alert-block > p,
+.alert-block > ul {
+  margin-bottom: 0;
+}
+
+.alert-block p + p {
+  margin-top: 5px;
+}
+
+.nav {
+  margin-bottom: 20px;
+  margin-left: 0;
+  list-style: none;
+}
+
+.nav > li > a {
+  display: block;
+}
+
+.nav > li > a:hover,
+.nav > li > a:focus {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+
+.nav > li > a > img {
+  max-width: none;
+}
+
+.nav > .pull-right {
+  float: right;
+}
+
+.nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #999999;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-transform: uppercase;
+}
+
+.nav li + .nav-header {
+  margin-top: 9px;
+}
+
+.nav-list {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-bottom: 0;
+}
+
+.nav-list > li > a,
+.nav-list .nav-header {
+  margin-right: -15px;
+  margin-left: -15px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+
+.nav-list > li > a {
+  padding: 3px 15px;
+}
+
+.nav-list > .active > a,
+.nav-list > .active > a:hover,
+.nav-list > .active > a:focus {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  background-color: #0088cc;
+}
+
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+  margin-right: 2px;
+}
+
+.nav-list .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.nav-tabs,
+.nav-pills {
+  *zoom: 1;
+}
+
+.nav-tabs:before,
+.nav-pills:before,
+.nav-tabs:after,
+.nav-pills:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.nav-tabs:after,
+.nav-pills:after {
+  clear: both;
+}
+
+.nav-tabs > li,
+.nav-pills > li {
+  float: left;
+}
+
+.nav-tabs > li > a,
+.nav-pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px;
+}
+
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+
+.nav-tabs > li {
+  margin-bottom: -1px;
+}
+
+.nav-tabs > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  line-height: 20px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.nav-tabs > li > a:hover,
+.nav-tabs > li > a:focus {
+  border-color: #eeeeee #eeeeee #dddddd;
+}
+
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-tabs > .active > a:focus {
+  color: #555555;
+  cursor: default;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+}
+
+.nav-pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover,
+.nav-pills > .active > a:focus {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+
+.nav-stacked > li {
+  float: none;
+}
+
+.nav-stacked > li > a {
+  margin-right: 0;
+}
+
+.nav-tabs.nav-stacked {
+  border-bottom: 0;
+}
+
+.nav-tabs.nav-stacked > li > a {
+  border: 1px solid #ddd;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.nav-tabs.nav-stacked > li:first-child > a {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.nav-tabs.nav-stacked > li:last-child > a {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.nav-tabs.nav-stacked > li > a:hover,
+.nav-tabs.nav-stacked > li > a:focus {
+  z-index: 2;
+  border-color: #ddd;
+}
+
+.nav-pills.nav-stacked > li > a {
+  margin-bottom: 3px;
+}
+
+.nav-pills.nav-stacked > li:last-child > a {
+  margin-bottom: 1px;
+}
+
+.nav-tabs .dropdown-menu {
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+}
+
+.nav-pills .dropdown-menu {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.nav .dropdown-toggle .caret {
+  margin-top: 6px;
+  border-top-color: #0088cc;
+  border-bottom-color: #0088cc;
+}
+
+.nav .dropdown-toggle:hover .caret,
+.nav .dropdown-toggle:focus .caret {
+  border-top-color: #005580;
+  border-bottom-color: #005580;
+}
+
+/* move down carets for tabs */
+
+.nav-tabs .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+.nav .active .dropdown-toggle .caret {
+  border-top-color: #fff;
+  border-bottom-color: #fff;
+}
+
+.nav-tabs .active .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.nav > .dropdown.active > a:hover,
+.nav > .dropdown.active > a:focus {
+  cursor: pointer;
+}
+
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover,
+.nav > li.dropdown.open.active > a:focus {
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #999999;
+}
+
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret,
+.nav li.dropdown.open a:focus .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+
+.tabs-stacked .open > a:hover,
+.tabs-stacked .open > a:focus {
+  border-color: #999999;
+}
+
+.tabbable {
+  *zoom: 1;
+}
+
+.tabbable:before,
+.tabbable:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.tabbable:after {
+  clear: both;
+}
+
+.tab-content {
+  overflow: auto;
+}
+
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+  border-bottom: 0;
+}
+
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+.tabs-below > .nav-tabs {
+  border-top: 1px solid #ddd;
+}
+
+.tabs-below > .nav-tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+
+.tabs-below > .nav-tabs > li > a {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.tabs-below > .nav-tabs > li > a:hover,
+.tabs-below > .nav-tabs > li > a:focus {
+  border-top-color: #ddd;
+  border-bottom-color: transparent;
+}
+
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover,
+.tabs-below > .nav-tabs > .active > a:focus {
+  border-color: transparent #ddd #ddd #ddd;
+}
+
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+  float: none;
+}
+
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+
+.tabs-left > .nav-tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+
+.tabs-left > .nav-tabs > li > a {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.tabs-left > .nav-tabs > li > a:hover,
+.tabs-left > .nav-tabs > li > a:focus {
+  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
+}
+
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover,
+.tabs-left > .nav-tabs .active > a:focus {
+  border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: #ffffff;
+}
+
+.tabs-right > .nav-tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+
+.tabs-right > .nav-tabs > li > a {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.tabs-right > .nav-tabs > li > a:hover,
+.tabs-right > .nav-tabs > li > a:focus {
+  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
+}
+
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover,
+.tabs-right > .nav-tabs .active > a:focus {
+  border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: #ffffff;
+}
+
+.nav > .disabled > a {
+  color: #999999;
+}
+
+.nav > .disabled > a:hover,
+.nav > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+}
+
+.navbar {
+  *position: relative;
+  *z-index: 2;
+  margin-bottom: 20px;
+  overflow: visible;
+}
+
+.navbar-inner {
+  min-height: 40px;
+  padding-right: 20px;
+  padding-left: 20px;
+  background-color: #fafafa;
+  background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
+  background-repeat: repeat-x;
+  border: 1px solid #d4d4d4;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+  *zoom: 1;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+}
+
+.navbar-inner:before,
+.navbar-inner:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.navbar-inner:after {
+  clear: both;
+}
+
+.navbar .container {
+  width: auto;
+}
+
+.nav-collapse.collapse {
+  height: auto;
+  overflow: visible;
+}
+
+.navbar .brand {
+  display: block;
+  float: left;
+  padding: 10px 20px 10px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  color: #777777;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .brand:hover,
+.navbar .brand:focus {
+  text-decoration: none;
+}
+
+.navbar-text {
+  margin-bottom: 0;
+  line-height: 40px;
+  color: #777777;
+}
+
+.navbar-link {
+  color: #777777;
+}
+
+.navbar-link:hover,
+.navbar-link:focus {
+  color: #333333;
+}
+
+.navbar .divider-vertical {
+  height: 40px;
+  margin: 0 9px;
+  border-right: 1px solid #ffffff;
+  border-left: 1px solid #f2f2f2;
+}
+
+.navbar .btn,
+.navbar .btn-group {
+  margin-top: 5px;
+}
+
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn,
+.navbar .input-prepend .btn-group,
+.navbar .input-append .btn-group {
+  margin-top: 0;
+}
+
+.navbar-form {
+  margin-bottom: 0;
+  *zoom: 1;
+}
+
+.navbar-form:before,
+.navbar-form:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.navbar-form:after {
+  clear: both;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
+  margin-top: 5px;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .btn {
+  display: inline-block;
+  margin-bottom: 0;
+}
+
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
+  margin-top: 3px;
+}
+
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+  margin-top: 5px;
+  white-space: nowrap;
+}
+
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+  margin-top: 0;
+}
+
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 5px;
+  margin-bottom: 0;
+}
+
+.navbar-search .search-query {
+  padding: 4px 14px;
+  margin-bottom: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.navbar-static-top {
+  position: static;
+  margin-bottom: 0;
+}
+
+.navbar-static-top .navbar-inner {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+  margin-bottom: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  border-width: 0 0 1px;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+  border-width: 1px 0 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.navbar-fixed-top {
+  top: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar-fixed-bottom {
+  bottom: 0;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+  -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+
+.navbar .nav.pull-right {
+  float: right;
+  margin-right: 0;
+}
+
+.navbar .nav > li {
+  float: left;
+}
+
+.navbar .nav > li > a {
+  float: none;
+  padding: 10px 15px 10px;
+  color: #777777;
+  text-decoration: none;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .nav .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+.navbar .nav > li > a:focus,
+.navbar .nav > li > a:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: transparent;
+}
+
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+  color: #555555;
+  text-decoration: none;
+  background-color: #e5e5e5;
+  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+     -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+}
+
+.navbar .btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-right: 5px;
+  margin-left: 5px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #ededed;
+  *background-color: #e5e5e5;
+  background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
+  background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
+  background-repeat: repeat-x;
+  border-color: #e5e5e5 #e5e5e5 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+}
+
+.navbar .btn-navbar:hover,
+.navbar .btn-navbar:focus,
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active,
+.navbar .btn-navbar.disabled,
+.navbar .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #e5e5e5;
+  *background-color: #d9d9d9;
+}
+
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active {
+  background-color: #cccccc \9;
+}
+
+.navbar .btn-navbar .icon-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 1px;
+     -moz-border-radius: 1px;
+          border-radius: 1px;
+  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+     -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+          box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-navbar .icon-bar + .icon-bar {
+  margin-top: 3px;
+}
+
+.navbar .nav > li > .dropdown-menu:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.navbar .nav > li > .dropdown-menu:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+  top: auto;
+  bottom: -7px;
+  border-top: 7px solid #ccc;
+  border-bottom: 0;
+  border-top-color: rgba(0, 0, 0, 0.2);
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+  top: auto;
+  bottom: -6px;
+  border-top: 6px solid #ffffff;
+  border-bottom: 0;
+}
+
+.navbar .nav li.dropdown > a:hover .caret,
+.navbar .nav li.dropdown > a:focus .caret {
+  border-top-color: #333333;
+  border-bottom-color: #333333;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+  color: #555555;
+  background-color: #e5e5e5;
+}
+
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #777777;
+  border-bottom-color: #777777;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:before,
+.navbar .nav > li > .dropdown-menu.pull-right:before {
+  right: 12px;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:after,
+.navbar .nav > li > .dropdown-menu.pull-right:after {
+  right: 13px;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+  right: 100%;
+  left: auto;
+  margin-right: -1px;
+  margin-left: 0;
+  -webkit-border-radius: 6px 0 6px 6px;
+     -moz-border-radius: 6px 0 6px 6px;
+          border-radius: 6px 0 6px 6px;
+}
+
+.navbar-inverse .navbar-inner {
+  background-color: #1b1b1b;
+  background-image: -moz-linear-gradient(top, #222222, #111111);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
+  background-image: -webkit-linear-gradient(top, #222222, #111111);
+  background-image: -o-linear-gradient(top, #222222, #111111);
+  background-image: linear-gradient(to bottom, #222222, #111111);
+  background-repeat: repeat-x;
+  border-color: #252525;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+}
+
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+  color: #999999;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar-inverse .brand:hover,
+.navbar-inverse .nav > li > a:hover,
+.navbar-inverse .brand:focus,
+.navbar-inverse .nav > li > a:focus {
+  color: #ffffff;
+}
+
+.navbar-inverse .brand {
+  color: #999999;
+}
+
+.navbar-inverse .navbar-text {
+  color: #999999;
+}
+
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+  color: #ffffff;
+  background-color: transparent;
+}
+
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+  color: #ffffff;
+  background-color: #111111;
+}
+
+.navbar-inverse .navbar-link {
+  color: #999999;
+}
+
+.navbar-inverse .navbar-link:hover,
+.navbar-inverse .navbar-link:focus {
+  color: #ffffff;
+}
+
+.navbar-inverse .divider-vertical {
+  border-right-color: #222222;
+  border-left-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+  color: #ffffff;
+  background-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown > a:hover .caret,
+.navbar-inverse .nav li.dropdown > a:focus .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #999999;
+  border-bottom-color: #999999;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.navbar-inverse .navbar-search .search-query {
+  color: #ffffff;
+  background-color: #515151;
+  border-color: #111111;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+  -webkit-transition: none;
+     -moz-transition: none;
+       -o-transition: none;
+          transition: none;
+}
+
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+  padding: 5px 15px;
+  color: #333333;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #ffffff;
+  border: 0;
+  outline: 0;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+          box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+}
+
+.navbar-inverse .btn-navbar {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e0e0e;
+  *background-color: #040404;
+  background-image: -moz-linear-gradient(top, #151515, #040404);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
+  background-image: -webkit-linear-gradient(top, #151515, #040404);
+  background-image: -o-linear-gradient(top, #151515, #040404);
+  background-image: linear-gradient(to bottom, #151515, #040404);
+  background-repeat: repeat-x;
+  border-color: #040404 #040404 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.navbar-inverse .btn-navbar:hover,
+.navbar-inverse .btn-navbar:focus,
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active,
+.navbar-inverse .btn-navbar.disabled,
+.navbar-inverse .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #040404;
+  *background-color: #000000;
+}
+
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active {
+  background-color: #000000 \9;
+}
+
+.breadcrumb {
+  padding: 8px 15px;
+  margin: 0 0 20px;
+  list-style: none;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.breadcrumb > li {
+  display: inline-block;
+  *display: inline;
+  text-shadow: 0 1px 0 #ffffff;
+  *zoom: 1;
+}
+
+.breadcrumb > li > .divider {
+  padding: 0 5px;
+  color: #ccc;
+}
+
+.breadcrumb > .active {
+  color: #999999;
+}
+
+.pagination {
+  margin: 20px 0;
+}
+
+.pagination ul {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  margin-left: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  *zoom: 1;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.pagination ul > li {
+  display: inline;
+}
+
+.pagination ul > li > a,
+.pagination ul > li > span {
+  float: left;
+  padding: 4px 12px;
+  line-height: 20px;
+  text-decoration: none;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-left-width: 0;
+}
+
+.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  background-color: #f5f5f5;
+}
+
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  color: #999999;
+  cursor: default;
+}
+
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
+  color: #999999;
+  cursor: default;
+  background-color: transparent;
+}
+
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
+  border-left-width: 1px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.pagination-centered {
+  text-align: center;
+}
+
+.pagination-right {
+  text-align: right;
+}
+
+.pagination-large ul > li > a,
+.pagination-large ul > li > span {
+  padding: 11px 19px;
+  font-size: 17.5px;
+}
+
+.pagination-large ul > li:first-child > a,
+.pagination-large ul > li:first-child > span {
+  -webkit-border-bottom-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+          border-top-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -moz-border-radius-topleft: 6px;
+}
+
+.pagination-large ul > li:last-child > a,
+.pagination-large ul > li:last-child > span {
+  -webkit-border-top-right-radius: 6px;
+          border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -moz-border-radius-bottomright: 6px;
+}
+
+.pagination-mini ul > li:first-child > a,
+.pagination-small ul > li:first-child > a,
+.pagination-mini ul > li:first-child > span,
+.pagination-small ul > li:first-child > span {
+  -webkit-border-bottom-left-radius: 3px;
+          border-bottom-left-radius: 3px;
+  -webkit-border-top-left-radius: 3px;
+          border-top-left-radius: 3px;
+  -moz-border-radius-bottomleft: 3px;
+  -moz-border-radius-topleft: 3px;
+}
+
+.pagination-mini ul > li:last-child > a,
+.pagination-small ul > li:last-child > a,
+.pagination-mini ul > li:last-child > span,
+.pagination-small ul > li:last-child > span {
+  -webkit-border-top-right-radius: 3px;
+          border-top-right-radius: 3px;
+  -webkit-border-bottom-right-radius: 3px;
+          border-bottom-right-radius: 3px;
+  -moz-border-radius-topright: 3px;
+  -moz-border-radius-bottomright: 3px;
+}
+
+.pagination-small ul > li > a,
+.pagination-small ul > li > span {
+  padding: 2px 10px;
+  font-size: 11.9px;
+}
+
+.pagination-mini ul > li > a,
+.pagination-mini ul > li > span {
+  padding: 0 6px;
+  font-size: 10.5px;
+}
+
+.pager {
+  margin: 20px 0;
+  text-align: center;
+  list-style: none;
+  *zoom: 1;
+}
+
+.pager:before,
+.pager:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.pager:after {
+  clear: both;
+}
+
+.pager li {
+  display: inline;
+}
+
+.pager li > a,
+.pager li > span {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.pager li > a:hover,
+.pager li > a:focus {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+
+.pager .next > a,
+.pager .next > span {
+  float: right;
+}
+
+.pager .previous > a,
+.pager .previous > span {
+  float: left;
+}
+
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+  color: #999999;
+  cursor: default;
+  background-color: #fff;
+}
+
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: #000000;
+}
+
+.modal-backdrop.fade {
+  opacity: 0;
+}
+
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.modal {
+  position: fixed;
+  top: 10%;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin-left: -280px;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  *border: 1px solid #999;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  outline: none;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding-box;
+          background-clip: padding-box;
+}
+
+.modal.fade {
+  top: -25%;
+  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
+     -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
+       -o-transition: opacity 0.3s linear, top 0.3s ease-out;
+          transition: opacity 0.3s linear, top 0.3s ease-out;
+}
+
+.modal.fade.in {
+  top: 10%;
+}
+
+.modal-header {
+  padding: 9px 15px;
+  border-bottom: 1px solid #eee;
+}
+
+.modal-header .close {
+  margin-top: 2px;
+}
+
+.modal-header h3 {
+  margin: 0;
+  line-height: 30px;
+}
+
+.modal-body {
+  position: relative;
+  max-height: 400px;
+  padding: 15px;
+  overflow-y: auto;
+}
+
+.modal-form {
+  margin-bottom: 0;
+}
+
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  text-align: right;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+     -moz-box-shadow: inset 0 1px 0 #ffffff;
+          box-shadow: inset 0 1px 0 #ffffff;
+}
+
+.modal-footer:before,
+.modal-footer:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.modal-footer:after {
+  clear: both;
+}
+
+.modal-footer .btn + .btn {
+  margin-bottom: 0;
+  margin-left: 5px;
+}
+
+.modal-footer .btn-group .btn + .btn {
+  margin-left: -1px;
+}
+
+.modal-footer .btn-block + .btn-block {
+  margin-left: 0;
+}
+
+.tooltip {
+  position: absolute;
+  z-index: 1030;
+  display: block;
+  font-size: 11px;
+  line-height: 1.4;
+  opacity: 0;
+  filter: alpha(opacity=0);
+  visibility: visible;
+}
+
+.tooltip.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.tooltip.top {
+  padding: 5px 0;
+  margin-top: -3px;
+}
+
+.tooltip.right {
+  padding: 0 5px;
+  margin-left: 3px;
+}
+
+.tooltip.bottom {
+  padding: 5px 0;
+  margin-top: 3px;
+}
+
+.tooltip.left {
+  padding: 0 5px;
+  margin-left: -3px;
+}
+
+.tooltip-inner {
+  max-width: 200px;
+  padding: 8px;
+  color: #ffffff;
+  text-align: center;
+  text-decoration: none;
+  background-color: #000000;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-top-color: #000000;
+  border-width: 5px 5px 0;
+}
+
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-right-color: #000000;
+  border-width: 5px 5px 5px 0;
+}
+
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-left-color: #000000;
+  border-width: 5px 0 5px 5px;
+}
+
+.tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-bottom-color: #000000;
+  border-width: 0 5px 5px;
+}
+
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1010;
+  display: none;
+  max-width: 276px;
+  padding: 1px;
+  text-align: left;
+  white-space: normal;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.popover.top {
+  margin-top: -10px;
+}
+
+.popover.right {
+  margin-left: 10px;
+}
+
+.popover.bottom {
+  margin-top: 10px;
+}
+
+.popover.left {
+  margin-left: -10px;
+}
+
+.popover-title {
+  padding: 8px 14px;
+  margin: 0;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 18px;
+  background-color: #f7f7f7;
+  border-bottom: 1px solid #ebebeb;
+  -webkit-border-radius: 5px 5px 0 0;
+     -moz-border-radius: 5px 5px 0 0;
+          border-radius: 5px 5px 0 0;
+}
+
+.popover-title:empty {
+  display: none;
+}
+
+.popover-content {
+  padding: 9px 14px;
+}
+
+.popover .arrow,
+.popover .arrow:after {
+  position: absolute;
+  display: block;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.popover .arrow {
+  border-width: 11px;
+}
+
+.popover .arrow:after {
+  border-width: 10px;
+  content: "";
+}
+
+.popover.top .arrow {
+  bottom: -11px;
+  left: 50%;
+  margin-left: -11px;
+  border-top-color: #999;
+  border-top-color: rgba(0, 0, 0, 0.25);
+  border-bottom-width: 0;
+}
+
+.popover.top .arrow:after {
+  bottom: 1px;
+  margin-left: -10px;
+  border-top-color: #ffffff;
+  border-bottom-width: 0;
+}
+
+.popover.right .arrow {
+  top: 50%;
+  left: -11px;
+  margin-top: -11px;
+  border-right-color: #999;
+  border-right-color: rgba(0, 0, 0, 0.25);
+  border-left-width: 0;
+}
+
+.popover.right .arrow:after {
+  bottom: -10px;
+  left: 1px;
+  border-right-color: #ffffff;
+  border-left-width: 0;
+}
+
+.popover.bottom .arrow {
+  top: -11px;
+  left: 50%;
+  margin-left: -11px;
+  border-bottom-color: #999;
+  border-bottom-color: rgba(0, 0, 0, 0.25);
+  border-top-width: 0;
+}
+
+.popover.bottom .arrow:after {
+  top: 1px;
+  margin-left: -10px;
+  border-bottom-color: #ffffff;
+  border-top-width: 0;
+}
+
+.popover.left .arrow {
+  top: 50%;
+  right: -11px;
+  margin-top: -11px;
+  border-left-color: #999;
+  border-left-color: rgba(0, 0, 0, 0.25);
+  border-right-width: 0;
+}
+
+.popover.left .arrow:after {
+  right: 1px;
+  bottom: -10px;
+  border-left-color: #ffffff;
+  border-right-width: 0;
+}
+
+.thumbnails {
+  margin-left: -20px;
+  list-style: none;
+  *zoom: 1;
+}
+
+.thumbnails:before,
+.thumbnails:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.thumbnails:after {
+  clear: both;
+}
+
+.row-fluid .thumbnails {
+  margin-left: 0;
+}
+
+.thumbnails > li {
+  float: left;
+  margin-bottom: 20px;
+  margin-left: 20px;
+}
+
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 20px;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+  -webkit-transition: all 0.2s ease-in-out;
+     -moz-transition: all 0.2s ease-in-out;
+       -o-transition: all 0.2s ease-in-out;
+          transition: all 0.2s ease-in-out;
+}
+
+a.thumbnail:hover,
+a.thumbnail:focus {
+  border-color: #0088cc;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+     -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+          box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
+
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.thumbnail .caption {
+  padding: 9px;
+  color: #555555;
+}
+
+.media,
+.media-body {
+  overflow: hidden;
+  *overflow: visible;
+  zoom: 1;
+}
+
+.media,
+.media .media {
+  margin-top: 15px;
+}
+
+.media:first-child {
+  margin-top: 0;
+}
+
+.media-object {
+  display: block;
+}
+
+.media-heading {
+  margin: 0 0 5px;
+}
+
+.media > .pull-left {
+  margin-right: 10px;
+}
+
+.media > .pull-right {
+  margin-left: 10px;
+}
+
+.media-list {
+  margin-left: 0;
+  list-style: none;
+}
+
+.label,
+.badge {
+  display: inline-block;
+  padding: 2px 4px;
+  font-size: 11.844px;
+  font-weight: bold;
+  line-height: 14px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  white-space: nowrap;
+  vertical-align: baseline;
+  background-color: #999999;
+}
+
+.label {
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.badge {
+  padding-right: 9px;
+  padding-left: 9px;
+  -webkit-border-radius: 9px;
+     -moz-border-radius: 9px;
+          border-radius: 9px;
+}
+
+.label:empty,
+.badge:empty {
+  display: none;
+}
+
+a.label:hover,
+a.label:focus,
+a.badge:hover,
+a.badge:focus {
+  color: #ffffff;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+.label-important,
+.badge-important {
+  background-color: #b94a48;
+}
+
+.label-important[href],
+.badge-important[href] {
+  background-color: #953b39;
+}
+
+.label-warning,
+.badge-warning {
+  background-color: #f89406;
+}
+
+.label-warning[href],
+.badge-warning[href] {
+  background-color: #c67605;
+}
+
+.label-success,
+.badge-success {
+  background-color: #468847;
+}
+
+.label-success[href],
+.badge-success[href] {
+  background-color: #356635;
+}
+
+.label-info,
+.badge-info {
+  background-color: #3a87ad;
+}
+
+.label-info[href],
+.badge-info[href] {
+  background-color: #2d6987;
+}
+
+.label-inverse,
+.badge-inverse {
+  background-color: #333333;
+}
+
+.label-inverse[href],
+.badge-inverse[href] {
+  background-color: #1a1a1a;
+}
+
+.btn .label,
+.btn .badge {
+  position: relative;
+  top: -1px;
+}
+
+.btn-mini .label,
+.btn-mini .badge {
+  top: 0;
+}
+
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-moz-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-ms-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-o-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+.progress {
+  height: 20px;
+  margin-bottom: 20px;
+  overflow: hidden;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.progress .bar {
+  float: left;
+  width: 0;
+  height: 100%;
+  font-size: 12px;
+  color: #ffffff;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e90d2;
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(to bottom, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+  -webkit-transition: width 0.6s ease;
+     -moz-transition: width 0.6s ease;
+       -o-transition: width 0.6s ease;
+          transition: width 0.6s ease;
+}
+
+.progress .bar + .bar {
+  -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+}
+
+.progress-striped .bar {
+  background-color: #149bdf;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+     -moz-background-size: 40px 40px;
+       -o-background-size: 40px 40px;
+          background-size: 40px 40px;
+}
+
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+     -moz-animation: progress-bar-stripes 2s linear infinite;
+      -ms-animation: progress-bar-stripes 2s linear infinite;
+       -o-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
+}
+
+.progress-danger .bar,
+.progress .bar-danger {
+  background-color: #dd514c;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+}
+
+.progress-danger.progress-striped .bar,
+.progress-striped .bar-danger {
+  background-color: #ee5f5b;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-success .bar,
+.progress .bar-success {
+  background-color: #5eb95e;
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(to bottom, #62c462, #57a957);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+}
+
+.progress-success.progress-striped .bar,
+.progress-striped .bar-success {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-info .bar,
+.progress .bar-info {
+  background-color: #4bb1cf;
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+}
+
+.progress-info.progress-striped .bar,
+.progress-striped .bar-info {
+  background-color: #5bc0de;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-warning .bar,
+.progress .bar-warning {
+  background-color: #faa732;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+}
+
+.progress-warning.progress-striped .bar,
+.progress-striped .bar-warning {
+  background-color: #fbb450;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.accordion {
+  margin-bottom: 20px;
+}
+
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.accordion-heading {
+  border-bottom: 0;
+}
+
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+
+.accordion-toggle {
+  cursor: pointer;
+}
+
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
+
+.carousel {
+  position: relative;
+  margin-bottom: 20px;
+  line-height: 1;
+}
+
+.carousel-inner {
+  position: relative;
+  width: 100%;
+  overflow: hidden;
+}
+
+.carousel-inner > .item {
+  position: relative;
+  display: none;
+  -webkit-transition: 0.6s ease-in-out left;
+     -moz-transition: 0.6s ease-in-out left;
+       -o-transition: 0.6s ease-in-out left;
+          transition: 0.6s ease-in-out left;
+}
+
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+  display: block;
+  line-height: 1;
+}
+
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  display: block;
+}
+
+.carousel-inner > .active {
+  left: 0;
+}
+
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.carousel-inner > .next {
+  left: 100%;
+}
+
+.carousel-inner > .prev {
+  left: -100%;
+}
+
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
+  left: 0;
+}
+
+.carousel-inner > .active.left {
+  left: -100%;
+}
+
+.carousel-inner > .active.right {
+  left: 100%;
+}
+
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: #ffffff;
+  text-align: center;
+  background: #222222;
+  border: 3px solid #ffffff;
+  -webkit-border-radius: 23px;
+     -moz-border-radius: 23px;
+          border-radius: 23px;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+
+.carousel-control.right {
+  right: 15px;
+  left: auto;
+}
+
+.carousel-control:hover,
+.carousel-control:focus {
+  color: #ffffff;
+  text-decoration: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+
+.carousel-indicators {
+  position: absolute;
+  top: 15px;
+  right: 15px;
+  z-index: 5;
+  margin: 0;
+  list-style: none;
+}
+
+.carousel-indicators li {
+  display: block;
+  float: left;
+  width: 10px;
+  height: 10px;
+  margin-left: 5px;
+  text-indent: -999px;
+  background-color: #ccc;
+  background-color: rgba(255, 255, 255, 0.25);
+  border-radius: 5px;
+}
+
+.carousel-indicators .active {
+  background-color: #fff;
+}
+
+.carousel-caption {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  padding: 15px;
+  background: #333333;
+  background: rgba(0, 0, 0, 0.75);
+}
+
+.carousel-caption h4,
+.carousel-caption p {
+  line-height: 20px;
+  color: #ffffff;
+}
+
+.carousel-caption h4 {
+  margin: 0 0 5px;
+}
+
+.carousel-caption p {
+  margin-bottom: 0;
+}
+
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 30px;
+  color: inherit;
+  background-color: #eeeeee;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+  color: inherit;
+}
+
+.hero-unit li {
+  line-height: 30px;
+}
+
+.pull-right {
+  float: right;
+}
+
+.pull-left {
+  float: left;
+}
+
+.hide {
+  display: none;
+}
+
+.show {
+  display: block;
+}
+
+.invisible {
+  visibility: hidden;
+}
+
+.affix {
+  position: fixed;
+}
diff --git a/view/theme/oldtest/css/bootstrap.min.css b/view/theme/oldtest/css/bootstrap.min.css
new file mode 100644
index 0000000000..c10c7f417f
--- /dev/null
+++ b/view/theme/oldtest/css/bootstrap.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover,a:focus{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;line-height:0;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;line-height:0;content:""}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}a.muted:hover,a.muted:focus{color:#808080}.text-warning{color:#c09853}a.text-warning:hover,a.text-warning:focus{color:#a47e3c}.text-error{color:#b94a48}a.text-error:hover,a.text-error:focus{color:#953b39}.text-info{color:#3a87ad}a.text-info:hover,a.text-info:focus{color:#2d6987}.text-success{color:#468847}a.text-success:hover,a.text-success:focus{color:#356635}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{line-height:40px}h1{font-size:38.5px}h2{font-size:31.5px}h3{font-size:24.5px}h4{font-size:17.5px}h5{font-size:14px}h6{font-size:11.9px}h1 small{font-size:24.5px}h2 small{font-size:17.5px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}ul.inline,ol.inline{margin-left:0;list-style:none}ul.inline>li,ol.inline>li{display:inline-block;*display:inline;padding-right:5px;padding-left:5px;*zoom:1}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;line-height:0;content:""}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:17.5px;font-weight:300;line-height:1.25}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;white-space:nowrap;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555;vertical-align:middle;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;*margin-top:0;line-height:normal}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;background-color:#fff;border:1px solid #ccc}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;cursor:not-allowed;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:20px;padding-left:20px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;line-height:0;content:""}.controls-row:after{clear:both}.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left}.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;line-height:0;content:""}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-append,.input-prepend{display:inline-block;margin-bottom:10px;font-size:0;white-space:nowrap;vertical-align:middle}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu,.input-append .popover,.input-prepend .popover{font-size:14px}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .btn-group:first-child{margin-left:0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;vertical-align:middle;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;line-height:0;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child,.table-bordered tbody:first-child tr:first-child>th:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child,.table-bordered tbody:first-child tr:first-child>th:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tbody:last-child tr:last-child>th:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>th:first-child{-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tbody:last-child tr:last-child>th:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>th:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-moz-border-radius-bottomleft:0}.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-moz-border-radius-bottomright:0}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover tbody tr:hover>td,.table-hover tbody tr:hover>th{background-color:#f5f5f5}table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0}.table td.span1,.table th.span1{float:none;width:44px;margin-left:0}.table td.span2,.table th.span2{float:none;width:124px;margin-left:0}.table td.span3,.table th.span3{float:none;width:204px;margin-left:0}.table td.span4,.table th.span4{float:none;width:284px;margin-left:0}.table td.span5,.table th.span5{float:none;width:364px;margin-left:0}.table td.span6,.table th.span6{float:none;width:444px;margin-left:0}.table td.span7,.table th.span7{float:none;width:524px;margin-left:0}.table td.span8,.table th.span8{float:none;width:604px;margin-left:0}.table td.span9,.table th.span9{float:none;width:684px;margin-left:0}.table td.span10,.table th.span10{float:none;width:764px;margin-left:0}.table td.span11,.table th.span11{float:none;width:844px;margin-left:0}.table td.span12,.table th.span12{float:none;width:924px;margin-left:0}.table tbody tr.success>td{background-color:#dff0d8}.table tbody tr.error>td{background-color:#f2dede}.table tbody tr.warning>td{background-color:#fcf8e3}.table tbody tr.info>td{background-color:#d9edf7}.table-hover tbody tr.success:hover>td{background-color:#d0e9c6}.table-hover tbody tr.error:hover>td{background-color:#ebcccc}.table-hover tbody tr.warning:hover>td{background-color:#faf2cc}.table-hover tbody tr.info:hover>td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{width:16px;background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{width:16px;background-position:-384px -120px}.icon-folder-open{width:16px;background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-submenu:hover>a,.dropdown-submenu:focus>a{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open{*z-index:1000}.open>.dropdown-menu{display:block}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;border-color:transparent;border-left-color:#ccc;border-style:solid;border-width:5px 0 5px 5px;content:" "}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.dropdown .dropdown-menu .nav-header{padding-right:20px;padding-left:20px}.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #ccc;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#04c;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{color:#08c;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:10px;margin-bottom:10px;font-size:0}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px}.btn-group>.btn-mini{font-size:10.5px}.btn-group>.btn-small{font-size:11.9px}.btn-group>.btn-large{font-size:17.5px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{*padding-top:5px;padding-right:8px;*padding-bottom:5px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini+.dropdown-toggle{*padding-top:2px;padding-right:5px;*padding-bottom:2px;padding-left:5px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-large .caret{margin-top:6px}.btn-large .caret{border-top-width:5px;border-right-width:5px;border-left-width:5px}.btn-mini .caret,.btn-small .caret{margin-top:8px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical>.btn+.btn{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert,.alert h4{color:#c09853}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success h4{color:#468847}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger h4,.alert-error h4{color:#b94a48}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info h4{color:#3a87ad}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:20px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li>a>img{max-width:none}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover,.nav-list>.active>a:focus{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;line-height:0;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover,.nav-tabs>li>a:focus{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover,.nav-tabs>.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover,.nav-pills>.active>a:focus{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px}.nav-tabs.nav-stacked>li>a:hover,.nav-tabs.nav-stacked>li>a:focus{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav .dropdown-toggle:hover .caret,.nav .dropdown-toggle:focus .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover,.nav>.dropdown.active>a:focus{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover,.nav>li.dropdown.open.active>a:focus{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret,.nav li.dropdown.open a:focus .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover,.tabs-stacked .open>a:focus{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;line-height:0;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover,.tabs-below>.nav-tabs>li>a:focus{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover,.tabs-below>.nav-tabs>.active>a:focus{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover,.tabs-left>.nav-tabs>li>a:focus{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover,.tabs-left>.nav-tabs .active>a:focus{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover,.tabs-right>.nav-tabs>li>a:focus{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover,.tabs-right>.nav-tabs .active>a:focus{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent}.navbar{*position:relative;*z-index:2;margin-bottom:20px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);*zoom:1;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.navbar-inner:before,.navbar-inner:after{display:table;line-height:0;content:""}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto;overflow:visible}.navbar .brand{display:block;float:left;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover,.navbar .brand:focus{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px;color:#777}.navbar-link{color:#777}.navbar-link:hover,.navbar-link:focus{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-right:1px solid #fff;border-left:1px solid #f2f2f2}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn,.navbar .input-prepend .btn-group,.navbar .input-append .btn-group{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;line-height:0;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{padding:4px 14px;margin-bottom:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,0.1);box-shadow:0 1px 10px rgba(0,0,0,0.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{color:#333;text-decoration:none;background-color:transparent}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;*background-color:#e5e5e5;background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-repeat:repeat-x;border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:focus,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .nav>li>.dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown>a:hover .caret,.navbar .nav li.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#555;background-color:#e5e5e5}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{right:13px;left:auto}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top,#222,#111);background-image:-webkit-gradient(linear,0 0,0 100%,from(#222),to(#111));background-image:-webkit-linear-gradient(top,#222,#111);background-image:-o-linear-gradient(top,#222,#111);background-image:linear-gradient(to bottom,#222,#111);background-repeat:repeat-x;border-color:#252525;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover,.navbar-inverse .brand:focus,.navbar-inverse .nav>li>a:focus{color:#fff}.navbar-inverse .brand{color:#999}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#111}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover,.navbar-inverse .navbar-link:focus{color:#fff}.navbar-inverse .divider-vertical{border-right-color:#222;border-left-color:#111}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{color:#fff;background-color:#111}.navbar-inverse .nav li.dropdown>a:hover .caret,.navbar-inverse .nav li.dropdown>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;*background-color:#040404;background-image:-moz-linear-gradient(top,#151515,#040404);background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-repeat:repeat-x;border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:focus,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb>li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb>li>.divider{padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{margin:20px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>li>a:focus,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>a:focus{color:#999;cursor:default;background-color:transparent}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px}.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-moz-border-radius-topleft:3px}.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px}.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px}.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:10.5px}.pager{margin:20px 0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;line-height:0;content:""}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:default;background-color:#fff}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;outline:0;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:10%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{position:relative;max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;line-height:0;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.tooltip{position:absolute;z-index:1030;display:block;font-size:11px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-title:empty{display:none}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;line-height:0;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover,a.thumbnail:focus{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#555}.media,.media-body{overflow:hidden;*overflow:visible;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{margin-left:0;list-style:none}.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding-right:9px;padding-left:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}.label:empty,.badge:empty{display:none}a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-indicators{position:absolute;top:15px;right:15px;z-index:5;margin:0;list-style:none}.carousel-indicators li{display:block;float:left;width:10px;height:10px;margin-left:5px;text-indent:-999px;background-color:#ccc;background-color:rgba(255,255,255,0.25);border-radius:5px}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{line-height:20px;color:#fff}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit li{line-height:30px}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}
diff --git a/view/theme/oldtest/default.php b/view/theme/oldtest/default.php
new file mode 100644
index 0000000000..1fc070df18
--- /dev/null
+++ b/view/theme/oldtest/default.php
@@ -0,0 +1,52 @@
+<?php
+	if (is_ajax()) {
+	 	$t = $a->template_engine('jsonificator');
+		//echo "<hr><pre>"; var_dump($t->data); killme();
+		echo json_encode($t->data);
+		killme();
+	} 
+?>
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <!-- Bootstrap -->
+    <link href="<?php echo  $a->get_baseurl() ?>/view/theme/test/css/bootstrap.min.css" rel="stylesheet" media="screen">
+    <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  </head>
+  <body>
+    
+    	
+		<div class="navbar navbar-fixed-top">
+		  <div class="navbar-inner">
+		    <div class="container">
+		 
+		      <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
+		      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+		        <span class="icon-bar"></span>
+		        <span class="icon-bar"></span>
+		        <span class="icon-bar"></span>
+		      </a>
+		 
+		      <!-- Be sure to leave the brand out there if you want it shown -->
+		      <a class="brand" href="#"><span data-bind="text: nav()"></span></a>
+		 
+		      <!-- Everything you want hidden at 940px or less, place within here -->
+		      <div class="nav-collapse navbar-responsive-collapse collapse">
+		        <ul class="nav"  data-bind="foreach: nav().nav">
+		        	<li><a data-bind="href: url, text: text"></a></li>
+		        </ul>
+		      </div>
+		 
+		    </div>
+		  </div>
+		</div>    	
+    	
+    
+    <script src="http://code.jquery.com/jquery.js"></script>
+    <script src="<?php echo  $a->get_baseurl() ?>/view/theme/test/js/bootstrap.min.js"></script>
+    <script src="<?php echo  $a->get_baseurl() ?>/view/theme/test/js/knockout-2.2.1.js"></script>
+    <script src="<?php echo  $a->get_baseurl() ?>/view/theme/test/app/app.js"></script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/view/theme/oldtest/img/glyphicons-halflings-white.png b/view/theme/oldtest/img/glyphicons-halflings-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bf6484a29d8da269f9bc874b25493a45fae3bae
GIT binary patch
literal 8777
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
B7G?kd

literal 0
HcmV?d00001

diff --git a/view/theme/oldtest/img/glyphicons-halflings.png b/view/theme/oldtest/img/glyphicons-halflings.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9969993201f9cee63cf9f49217646347297b643
GIT binary patch
literal 12799
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

literal 0
HcmV?d00001

diff --git a/view/theme/oldtest/js/bootstrap.js b/view/theme/oldtest/js/bootstrap.js
new file mode 100644
index 0000000000..c298ee42e3
--- /dev/null
+++ b/view/theme/oldtest/js/bootstrap.js
@@ -0,0 +1,2276 @@
+/* ===================================================
+ * bootstrap-transition.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#transitions
+ * ===================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+  /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
+   * ======================================================= */
+
+  $(function () {
+
+    $.support.transition = (function () {
+
+      var transitionEnd = (function () {
+
+        var el = document.createElement('bootstrap')
+          , transEndEventNames = {
+               'WebkitTransition' : 'webkitTransitionEnd'
+            ,  'MozTransition'    : 'transitionend'
+            ,  'OTransition'      : 'oTransitionEnd otransitionend'
+            ,  'transition'       : 'transitionend'
+            }
+          , name
+
+        for (name in transEndEventNames){
+          if (el.style[name] !== undefined) {
+            return transEndEventNames[name]
+          }
+        }
+
+      }())
+
+      return transitionEnd && {
+        end: transitionEnd
+      }
+
+    })()
+
+  })
+
+}(window.jQuery);/* ==========================================================
+ * bootstrap-alert.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* ALERT CLASS DEFINITION
+  * ====================== */
+
+  var dismiss = '[data-dismiss="alert"]'
+    , Alert = function (el) {
+        $(el).on('click', dismiss, this.close)
+      }
+
+  Alert.prototype.close = function (e) {
+    var $this = $(this)
+      , selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = $(selector)
+
+    e && e.preventDefault()
+
+    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+
+    $parent.trigger(e = $.Event('close'))
+
+    if (e.isDefaultPrevented()) return
+
+    $parent.removeClass('in')
+
+    function removeElement() {
+      $parent
+        .trigger('closed')
+        .remove()
+    }
+
+    $.support.transition && $parent.hasClass('fade') ?
+      $parent.on($.support.transition.end, removeElement) :
+      removeElement()
+  }
+
+
+ /* ALERT PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.alert
+
+  $.fn.alert = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('alert')
+      if (!data) $this.data('alert', (data = new Alert(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.alert.Constructor = Alert
+
+
+ /* ALERT NO CONFLICT
+  * ================= */
+
+  $.fn.alert.noConflict = function () {
+    $.fn.alert = old
+    return this
+  }
+
+
+ /* ALERT DATA-API
+  * ============== */
+
+  $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
+
+}(window.jQuery);/* ============================================================
+ * bootstrap-button.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* BUTTON PUBLIC CLASS DEFINITION
+  * ============================== */
+
+  var Button = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.button.defaults, options)
+  }
+
+  Button.prototype.setState = function (state) {
+    var d = 'disabled'
+      , $el = this.$element
+      , data = $el.data()
+      , val = $el.is('input') ? 'val' : 'html'
+
+    state = state + 'Text'
+    data.resetText || $el.data('resetText', $el[val]())
+
+    $el[val](data[state] || this.options[state])
+
+    // push to event loop to allow forms to submit
+    setTimeout(function () {
+      state == 'loadingText' ?
+        $el.addClass(d).attr(d, d) :
+        $el.removeClass(d).removeAttr(d)
+    }, 0)
+  }
+
+  Button.prototype.toggle = function () {
+    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
+
+    $parent && $parent
+      .find('.active')
+      .removeClass('active')
+
+    this.$element.toggleClass('active')
+  }
+
+
+ /* BUTTON PLUGIN DEFINITION
+  * ======================== */
+
+  var old = $.fn.button
+
+  $.fn.button = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('button')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('button', (data = new Button(this, options)))
+      if (option == 'toggle') data.toggle()
+      else if (option) data.setState(option)
+    })
+  }
+
+  $.fn.button.defaults = {
+    loadingText: 'loading...'
+  }
+
+  $.fn.button.Constructor = Button
+
+
+ /* BUTTON NO CONFLICT
+  * ================== */
+
+  $.fn.button.noConflict = function () {
+    $.fn.button = old
+    return this
+  }
+
+
+ /* BUTTON DATA-API
+  * =============== */
+
+  $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
+    var $btn = $(e.target)
+    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+    $btn.button('toggle')
+  })
+
+}(window.jQuery);/* ==========================================================
+ * bootstrap-carousel.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#carousel
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* CAROUSEL CLASS DEFINITION
+  * ========================= */
+
+  var Carousel = function (element, options) {
+    this.$element = $(element)
+    this.$indicators = this.$element.find('.carousel-indicators')
+    this.options = options
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter', $.proxy(this.pause, this))
+      .on('mouseleave', $.proxy(this.cycle, this))
+  }
+
+  Carousel.prototype = {
+
+    cycle: function (e) {
+      if (!e) this.paused = false
+      if (this.interval) clearInterval(this.interval);
+      this.options.interval
+        && !this.paused
+        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+      return this
+    }
+
+  , getActiveIndex: function () {
+      this.$active = this.$element.find('.item.active')
+      this.$items = this.$active.parent().children()
+      return this.$items.index(this.$active)
+    }
+
+  , to: function (pos) {
+      var activeIndex = this.getActiveIndex()
+        , that = this
+
+      if (pos > (this.$items.length - 1) || pos < 0) return
+
+      if (this.sliding) {
+        return this.$element.one('slid', function () {
+          that.to(pos)
+        })
+      }
+
+      if (activeIndex == pos) {
+        return this.pause().cycle()
+      }
+
+      return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
+    }
+
+  , pause: function (e) {
+      if (!e) this.paused = true
+      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
+        this.$element.trigger($.support.transition.end)
+        this.cycle(true)
+      }
+      clearInterval(this.interval)
+      this.interval = null
+      return this
+    }
+
+  , next: function () {
+      if (this.sliding) return
+      return this.slide('next')
+    }
+
+  , prev: function () {
+      if (this.sliding) return
+      return this.slide('prev')
+    }
+
+  , slide: function (type, next) {
+      var $active = this.$element.find('.item.active')
+        , $next = next || $active[type]()
+        , isCycling = this.interval
+        , direction = type == 'next' ? 'left' : 'right'
+        , fallback  = type == 'next' ? 'first' : 'last'
+        , that = this
+        , e
+
+      this.sliding = true
+
+      isCycling && this.pause()
+
+      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
+
+      e = $.Event('slide', {
+        relatedTarget: $next[0]
+      , direction: direction
+      })
+
+      if ($next.hasClass('active')) return
+
+      if (this.$indicators.length) {
+        this.$indicators.find('.active').removeClass('active')
+        this.$element.one('slid', function () {
+          var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
+          $nextIndicator && $nextIndicator.addClass('active')
+        })
+      }
+
+      if ($.support.transition && this.$element.hasClass('slide')) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $next.addClass(type)
+        $next[0].offsetWidth // force reflow
+        $active.addClass(direction)
+        $next.addClass(direction)
+        this.$element.one($.support.transition.end, function () {
+          $next.removeClass([type, direction].join(' ')).addClass('active')
+          $active.removeClass(['active', direction].join(' '))
+          that.sliding = false
+          setTimeout(function () { that.$element.trigger('slid') }, 0)
+        })
+      } else {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $active.removeClass('active')
+        $next.addClass('active')
+        this.sliding = false
+        this.$element.trigger('slid')
+      }
+
+      isCycling && this.cycle()
+
+      return this
+    }
+
+  }
+
+
+ /* CAROUSEL PLUGIN DEFINITION
+  * ========================== */
+
+  var old = $.fn.carousel
+
+  $.fn.carousel = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('carousel')
+        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
+        , action = typeof option == 'string' ? option : options.slide
+      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
+      if (typeof option == 'number') data.to(option)
+      else if (action) data[action]()
+      else if (options.interval) data.pause().cycle()
+    })
+  }
+
+  $.fn.carousel.defaults = {
+    interval: 5000
+  , pause: 'hover'
+  }
+
+  $.fn.carousel.Constructor = Carousel
+
+
+ /* CAROUSEL NO CONFLICT
+  * ==================== */
+
+  $.fn.carousel.noConflict = function () {
+    $.fn.carousel = old
+    return this
+  }
+
+ /* CAROUSEL DATA-API
+  * ================= */
+
+  $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+    var $this = $(this), href
+      , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      , options = $.extend({}, $target.data(), $this.data())
+      , slideIndex
+
+    $target.carousel(options)
+
+    if (slideIndex = $this.attr('data-slide-to')) {
+      $target.data('carousel').pause().to(slideIndex).cycle()
+    }
+
+    e.preventDefault()
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-collapse.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* COLLAPSE PUBLIC CLASS DEFINITION
+  * ================================ */
+
+  var Collapse = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.collapse.defaults, options)
+
+    if (this.options.parent) {
+      this.$parent = $(this.options.parent)
+    }
+
+    this.options.toggle && this.toggle()
+  }
+
+  Collapse.prototype = {
+
+    constructor: Collapse
+
+  , dimension: function () {
+      var hasWidth = this.$element.hasClass('width')
+      return hasWidth ? 'width' : 'height'
+    }
+
+  , show: function () {
+      var dimension
+        , scroll
+        , actives
+        , hasData
+
+      if (this.transitioning || this.$element.hasClass('in')) return
+
+      dimension = this.dimension()
+      scroll = $.camelCase(['scroll', dimension].join('-'))
+      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+
+      if (actives && actives.length) {
+        hasData = actives.data('collapse')
+        if (hasData && hasData.transitioning) return
+        actives.collapse('hide')
+        hasData || actives.data('collapse', null)
+      }
+
+      this.$element[dimension](0)
+      this.transition('addClass', $.Event('show'), 'shown')
+      $.support.transition && this.$element[dimension](this.$element[0][scroll])
+    }
+
+  , hide: function () {
+      var dimension
+      if (this.transitioning || !this.$element.hasClass('in')) return
+      dimension = this.dimension()
+      this.reset(this.$element[dimension]())
+      this.transition('removeClass', $.Event('hide'), 'hidden')
+      this.$element[dimension](0)
+    }
+
+  , reset: function (size) {
+      var dimension = this.dimension()
+
+      this.$element
+        .removeClass('collapse')
+        [dimension](size || 'auto')
+        [0].offsetWidth
+
+      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+
+      return this
+    }
+
+  , transition: function (method, startEvent, completeEvent) {
+      var that = this
+        , complete = function () {
+            if (startEvent.type == 'show') that.reset()
+            that.transitioning = 0
+            that.$element.trigger(completeEvent)
+          }
+
+      this.$element.trigger(startEvent)
+
+      if (startEvent.isDefaultPrevented()) return
+
+      this.transitioning = 1
+
+      this.$element[method]('in')
+
+      $.support.transition && this.$element.hasClass('collapse') ?
+        this.$element.one($.support.transition.end, complete) :
+        complete()
+    }
+
+  , toggle: function () {
+      this[this.$element.hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* COLLAPSE PLUGIN DEFINITION
+  * ========================== */
+
+  var old = $.fn.collapse
+
+  $.fn.collapse = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('collapse')
+        , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.collapse.defaults = {
+    toggle: true
+  }
+
+  $.fn.collapse.Constructor = Collapse
+
+
+ /* COLLAPSE NO CONFLICT
+  * ==================== */
+
+  $.fn.collapse.noConflict = function () {
+    $.fn.collapse = old
+    return this
+  }
+
+
+ /* COLLAPSE DATA-API
+  * ================= */
+
+  $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
+    var $this = $(this), href
+      , target = $this.attr('data-target')
+        || e.preventDefault()
+        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+      , option = $(target).data('collapse') ? 'toggle' : $this.data()
+    $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+    $(target).collapse(option)
+  })
+
+}(window.jQuery);/* ============================================================
+ * bootstrap-dropdown.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* DROPDOWN CLASS DEFINITION
+  * ========================= */
+
+  var toggle = '[data-toggle=dropdown]'
+    , Dropdown = function (element) {
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        $('html').on('click.dropdown.data-api', function () {
+          $el.parent().removeClass('open')
+        })
+      }
+
+  Dropdown.prototype = {
+
+    constructor: Dropdown
+
+  , toggle: function (e) {
+      var $this = $(this)
+        , $parent
+        , isActive
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
+
+      isActive = $parent.hasClass('open')
+
+      clearMenus()
+
+      if (!isActive) {
+        $parent.toggleClass('open')
+      }
+
+      $this.focus()
+
+      return false
+    }
+
+  , keydown: function (e) {
+      var $this
+        , $items
+        , $active
+        , $parent
+        , isActive
+        , index
+
+      if (!/(38|40|27)/.test(e.keyCode)) return
+
+      $this = $(this)
+
+      e.preventDefault()
+      e.stopPropagation()
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
+
+      isActive = $parent.hasClass('open')
+
+      if (!isActive || (isActive && e.keyCode == 27)) {
+        if (e.which == 27) $parent.find(toggle).focus()
+        return $this.click()
+      }
+
+      $items = $('[role=menu] li:not(.divider):visible a', $parent)
+
+      if (!$items.length) return
+
+      index = $items.index($items.filter(':focus'))
+
+      if (e.keyCode == 38 && index > 0) index--                                        // up
+      if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
+      if (!~index) index = 0
+
+      $items
+        .eq(index)
+        .focus()
+    }
+
+  }
+
+  function clearMenus() {
+    $(toggle).each(function () {
+      getParent($(this)).removeClass('open')
+    })
+  }
+
+  function getParent($this) {
+    var selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = selector && $(selector)
+
+    if (!$parent || !$parent.length) $parent = $this.parent()
+
+    return $parent
+  }
+
+
+  /* DROPDOWN PLUGIN DEFINITION
+   * ========================== */
+
+  var old = $.fn.dropdown
+
+  $.fn.dropdown = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('dropdown')
+      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.dropdown.Constructor = Dropdown
+
+
+ /* DROPDOWN NO CONFLICT
+  * ==================== */
+
+  $.fn.dropdown.noConflict = function () {
+    $.fn.dropdown = old
+    return this
+  }
+
+
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  $(document)
+    .on('click.dropdown.data-api', clearMenus)
+    .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
+    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
+    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+
+}(window.jQuery);
+/* =========================================================
+ * bootstrap-modal.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#modals
+ * =========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* MODAL CLASS DEFINITION
+  * ====================== */
+
+  var Modal = function (element, options) {
+    this.options = options
+    this.$element = $(element)
+      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
+  }
+
+  Modal.prototype = {
+
+      constructor: Modal
+
+    , toggle: function () {
+        return this[!this.isShown ? 'show' : 'hide']()
+      }
+
+    , show: function () {
+        var that = this
+          , e = $.Event('show')
+
+        this.$element.trigger(e)
+
+        if (this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = true
+
+        this.escape()
+
+        this.backdrop(function () {
+          var transition = $.support.transition && that.$element.hasClass('fade')
+
+          if (!that.$element.parent().length) {
+            that.$element.appendTo(document.body) //don't move modals dom position
+          }
+
+          that.$element.show()
+
+          if (transition) {
+            that.$element[0].offsetWidth // force reflow
+          }
+
+          that.$element
+            .addClass('in')
+            .attr('aria-hidden', false)
+
+          that.enforceFocus()
+
+          transition ?
+            that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
+            that.$element.focus().trigger('shown')
+
+        })
+      }
+
+    , hide: function (e) {
+        e && e.preventDefault()
+
+        var that = this
+
+        e = $.Event('hide')
+
+        this.$element.trigger(e)
+
+        if (!this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = false
+
+        this.escape()
+
+        $(document).off('focusin.modal')
+
+        this.$element
+          .removeClass('in')
+          .attr('aria-hidden', true)
+
+        $.support.transition && this.$element.hasClass('fade') ?
+          this.hideWithTransition() :
+          this.hideModal()
+      }
+
+    , enforceFocus: function () {
+        var that = this
+        $(document).on('focusin.modal', function (e) {
+          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
+            that.$element.focus()
+          }
+        })
+      }
+
+    , escape: function () {
+        var that = this
+        if (this.isShown && this.options.keyboard) {
+          this.$element.on('keyup.dismiss.modal', function ( e ) {
+            e.which == 27 && that.hide()
+          })
+        } else if (!this.isShown) {
+          this.$element.off('keyup.dismiss.modal')
+        }
+      }
+
+    , hideWithTransition: function () {
+        var that = this
+          , timeout = setTimeout(function () {
+              that.$element.off($.support.transition.end)
+              that.hideModal()
+            }, 500)
+
+        this.$element.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          that.hideModal()
+        })
+      }
+
+    , hideModal: function () {
+        var that = this
+        this.$element.hide()
+        this.backdrop(function () {
+          that.removeBackdrop()
+          that.$element.trigger('hidden')
+        })
+      }
+
+    , removeBackdrop: function () {
+        this.$backdrop && this.$backdrop.remove()
+        this.$backdrop = null
+      }
+
+    , backdrop: function (callback) {
+        var that = this
+          , animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+        if (this.isShown && this.options.backdrop) {
+          var doAnimate = $.support.transition && animate
+
+          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+            .appendTo(document.body)
+
+          this.$backdrop.click(
+            this.options.backdrop == 'static' ?
+              $.proxy(this.$element[0].focus, this.$element[0])
+            : $.proxy(this.hide, this)
+          )
+
+          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+          this.$backdrop.addClass('in')
+
+          if (!callback) return
+
+          doAnimate ?
+            this.$backdrop.one($.support.transition.end, callback) :
+            callback()
+
+        } else if (!this.isShown && this.$backdrop) {
+          this.$backdrop.removeClass('in')
+
+          $.support.transition && this.$element.hasClass('fade')?
+            this.$backdrop.one($.support.transition.end, callback) :
+            callback()
+
+        } else if (callback) {
+          callback()
+        }
+      }
+  }
+
+
+ /* MODAL PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.modal
+
+  $.fn.modal = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('modal')
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option]()
+      else if (options.show) data.show()
+    })
+  }
+
+  $.fn.modal.defaults = {
+      backdrop: true
+    , keyboard: true
+    , show: true
+  }
+
+  $.fn.modal.Constructor = Modal
+
+
+ /* MODAL NO CONFLICT
+  * ================= */
+
+  $.fn.modal.noConflict = function () {
+    $.fn.modal = old
+    return this
+  }
+
+
+ /* MODAL DATA-API
+  * ============== */
+
+  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
+    var $this = $(this)
+      , href = $this.attr('href')
+      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
+      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
+
+    e.preventDefault()
+
+    $target
+      .modal(option)
+      .one('hide', function () {
+        $this.focus()
+      })
+  })
+
+}(window.jQuery);
+/* ===========================================================
+ * bootstrap-tooltip.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TOOLTIP PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Tooltip = function (element, options) {
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.prototype = {
+
+    constructor: Tooltip
+
+  , init: function (type, element, options) {
+      var eventIn
+        , eventOut
+        , triggers
+        , trigger
+        , i
+
+      this.type = type
+      this.$element = $(element)
+      this.options = this.getOptions(options)
+      this.enabled = true
+
+      triggers = this.options.trigger.split(' ')
+
+      for (i = triggers.length; i--;) {
+        trigger = triggers[i]
+        if (trigger == 'click') {
+          this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+        } else if (trigger != 'manual') {
+          eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
+          eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
+          this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+          this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+        }
+      }
+
+      this.options.selector ?
+        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+        this.fixTitle()
+    }
+
+  , getOptions: function (options) {
+      options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
+
+      if (options.delay && typeof options.delay == 'number') {
+        options.delay = {
+          show: options.delay
+        , hide: options.delay
+        }
+      }
+
+      return options
+    }
+
+  , enter: function (e) {
+      var defaults = $.fn[this.type].defaults
+        , options = {}
+        , self
+
+      this._options && $.each(this._options, function (key, value) {
+        if (defaults[key] != value) options[key] = value
+      }, this)
+
+      self = $(e.currentTarget)[this.type](options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.show) return self.show()
+
+      clearTimeout(this.timeout)
+      self.hoverState = 'in'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'in') self.show()
+      }, self.options.delay.show)
+    }
+
+  , leave: function (e) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (this.timeout) clearTimeout(this.timeout)
+      if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+      self.hoverState = 'out'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'out') self.hide()
+      }, self.options.delay.hide)
+    }
+
+  , show: function () {
+      var $tip
+        , pos
+        , actualWidth
+        , actualHeight
+        , placement
+        , tp
+        , e = $.Event('show')
+
+      if (this.hasContent() && this.enabled) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $tip = this.tip()
+        this.setContent()
+
+        if (this.options.animation) {
+          $tip.addClass('fade')
+        }
+
+        placement = typeof this.options.placement == 'function' ?
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
+          this.options.placement
+
+        $tip
+          .detach()
+          .css({ top: 0, left: 0, display: 'block' })
+
+        this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+
+        pos = this.getPosition()
+
+        actualWidth = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+
+        switch (placement) {
+          case 'bottom':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'top':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'left':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
+            break
+          case 'right':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
+            break
+        }
+
+        this.applyPlacement(tp, placement)
+        this.$element.trigger('shown')
+      }
+    }
+
+  , applyPlacement: function(offset, placement){
+      var $tip = this.tip()
+        , width = $tip[0].offsetWidth
+        , height = $tip[0].offsetHeight
+        , actualWidth
+        , actualHeight
+        , delta
+        , replace
+
+      $tip
+        .offset(offset)
+        .addClass(placement)
+        .addClass('in')
+
+      actualWidth = $tip[0].offsetWidth
+      actualHeight = $tip[0].offsetHeight
+
+      if (placement == 'top' && actualHeight != height) {
+        offset.top = offset.top + height - actualHeight
+        replace = true
+      }
+
+      if (placement == 'bottom' || placement == 'top') {
+        delta = 0
+
+        if (offset.left < 0){
+          delta = offset.left * -2
+          offset.left = 0
+          $tip.offset(offset)
+          actualWidth = $tip[0].offsetWidth
+          actualHeight = $tip[0].offsetHeight
+        }
+
+        this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
+      } else {
+        this.replaceArrow(actualHeight - height, actualHeight, 'top')
+      }
+
+      if (replace) $tip.offset(offset)
+    }
+
+  , replaceArrow: function(delta, dimension, position){
+      this
+        .arrow()
+        .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
+    }
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+
+      $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+      $tip.removeClass('fade in top bottom left right')
+    }
+
+  , hide: function () {
+      var that = this
+        , $tip = this.tip()
+        , e = $.Event('hide')
+
+      this.$element.trigger(e)
+      if (e.isDefaultPrevented()) return
+
+      $tip.removeClass('in')
+
+      function removeWithAnimation() {
+        var timeout = setTimeout(function () {
+          $tip.off($.support.transition.end).detach()
+        }, 500)
+
+        $tip.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          $tip.detach()
+        })
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        removeWithAnimation() :
+        $tip.detach()
+
+      this.$element.trigger('hidden')
+
+      return this
+    }
+
+  , fixTitle: function () {
+      var $e = this.$element
+      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+        $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
+      }
+    }
+
+  , hasContent: function () {
+      return this.getTitle()
+    }
+
+  , getPosition: function () {
+      var el = this.$element[0]
+      return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
+        width: el.offsetWidth
+      , height: el.offsetHeight
+      }, this.$element.offset())
+    }
+
+  , getTitle: function () {
+      var title
+        , $e = this.$element
+        , o = this.options
+
+      title = $e.attr('data-original-title')
+        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+      return title
+    }
+
+  , tip: function () {
+      return this.$tip = this.$tip || $(this.options.template)
+    }
+
+  , arrow: function(){
+      return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
+    }
+
+  , validate: function () {
+      if (!this.$element[0].parentNode) {
+        this.hide()
+        this.$element = null
+        this.options = null
+      }
+    }
+
+  , enable: function () {
+      this.enabled = true
+    }
+
+  , disable: function () {
+      this.enabled = false
+    }
+
+  , toggleEnabled: function () {
+      this.enabled = !this.enabled
+    }
+
+  , toggle: function (e) {
+      var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
+      self.tip().hasClass('in') ? self.hide() : self.show()
+    }
+
+  , destroy: function () {
+      this.hide().$element.off('.' + this.type).removeData(this.type)
+    }
+
+  }
+
+
+ /* TOOLTIP PLUGIN DEFINITION
+  * ========================= */
+
+  var old = $.fn.tooltip
+
+  $.fn.tooltip = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tooltip')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tooltip.Constructor = Tooltip
+
+  $.fn.tooltip.defaults = {
+    animation: true
+  , placement: 'top'
+  , selector: false
+  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+  , trigger: 'hover focus'
+  , title: ''
+  , delay: 0
+  , html: false
+  , container: false
+  }
+
+
+ /* TOOLTIP NO CONFLICT
+  * =================== */
+
+  $.fn.tooltip.noConflict = function () {
+    $.fn.tooltip = old
+    return this
+  }
+
+}(window.jQuery);
+/* ===========================================================
+ * bootstrap-popover.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#popovers
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* POPOVER PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Popover = function (element, options) {
+    this.init('popover', element, options)
+  }
+
+
+  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
+     ========================================== */
+
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
+
+    constructor: Popover
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+        , content = this.getContent()
+
+      $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+      $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
+
+      $tip.removeClass('fade top bottom left right in')
+    }
+
+  , hasContent: function () {
+      return this.getTitle() || this.getContent()
+    }
+
+  , getContent: function () {
+      var content
+        , $e = this.$element
+        , o = this.options
+
+      content = (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
+        || $e.attr('data-content')
+
+      return content
+    }
+
+  , tip: function () {
+      if (!this.$tip) {
+        this.$tip = $(this.options.template)
+      }
+      return this.$tip
+    }
+
+  , destroy: function () {
+      this.hide().$element.off('.' + this.type).removeData(this.type)
+    }
+
+  })
+
+
+ /* POPOVER PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.popover
+
+  $.fn.popover = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('popover')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.popover.Constructor = Popover
+
+  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
+    placement: 'right'
+  , trigger: 'click'
+  , content: ''
+  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+  })
+
+
+ /* POPOVER NO CONFLICT
+  * =================== */
+
+  $.fn.popover.noConflict = function () {
+    $.fn.popover = old
+    return this
+  }
+
+}(window.jQuery);
+/* =============================================================
+ * bootstrap-scrollspy.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#scrollspy
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* SCROLLSPY CLASS DEFINITION
+  * ========================== */
+
+  function ScrollSpy(element, options) {
+    var process = $.proxy(this.process, this)
+      , $element = $(element).is('body') ? $(window) : $(element)
+      , href
+    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
+    this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
+    this.selector = (this.options.target
+      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      || '') + ' .nav li > a'
+    this.$body = $('body')
+    this.refresh()
+    this.process()
+  }
+
+  ScrollSpy.prototype = {
+
+      constructor: ScrollSpy
+
+    , refresh: function () {
+        var self = this
+          , $targets
+
+        this.offsets = $([])
+        this.targets = $([])
+
+        $targets = this.$body
+          .find(this.selector)
+          .map(function () {
+            var $el = $(this)
+              , href = $el.data('target') || $el.attr('href')
+              , $href = /^#\w/.test(href) && $(href)
+            return ( $href
+              && $href.length
+              && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
+          })
+          .sort(function (a, b) { return a[0] - b[0] })
+          .each(function () {
+            self.offsets.push(this[0])
+            self.targets.push(this[1])
+          })
+      }
+
+    , process: function () {
+        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
+          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
+          , maxScroll = scrollHeight - this.$scrollElement.height()
+          , offsets = this.offsets
+          , targets = this.targets
+          , activeTarget = this.activeTarget
+          , i
+
+        if (scrollTop >= maxScroll) {
+          return activeTarget != (i = targets.last()[0])
+            && this.activate ( i )
+        }
+
+        for (i = offsets.length; i--;) {
+          activeTarget != targets[i]
+            && scrollTop >= offsets[i]
+            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+            && this.activate( targets[i] )
+        }
+      }
+
+    , activate: function (target) {
+        var active
+          , selector
+
+        this.activeTarget = target
+
+        $(this.selector)
+          .parent('.active')
+          .removeClass('active')
+
+        selector = this.selector
+          + '[data-target="' + target + '"],'
+          + this.selector + '[href="' + target + '"]'
+
+        active = $(selector)
+          .parent('li')
+          .addClass('active')
+
+        if (active.parent('.dropdown-menu').length)  {
+          active = active.closest('li.dropdown').addClass('active')
+        }
+
+        active.trigger('activate')
+      }
+
+  }
+
+
+ /* SCROLLSPY PLUGIN DEFINITION
+  * =========================== */
+
+  var old = $.fn.scrollspy
+
+  $.fn.scrollspy = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('scrollspy')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.scrollspy.Constructor = ScrollSpy
+
+  $.fn.scrollspy.defaults = {
+    offset: 10
+  }
+
+
+ /* SCROLLSPY NO CONFLICT
+  * ===================== */
+
+  $.fn.scrollspy.noConflict = function () {
+    $.fn.scrollspy = old
+    return this
+  }
+
+
+ /* SCROLLSPY DATA-API
+  * ================== */
+
+  $(window).on('load', function () {
+    $('[data-spy="scroll"]').each(function () {
+      var $spy = $(this)
+      $spy.scrollspy($spy.data())
+    })
+  })
+
+}(window.jQuery);/* ========================================================
+ * bootstrap-tab.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#tabs
+ * ========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ======================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TAB CLASS DEFINITION
+  * ==================== */
+
+  var Tab = function (element) {
+    this.element = $(element)
+  }
+
+  Tab.prototype = {
+
+    constructor: Tab
+
+  , show: function () {
+      var $this = this.element
+        , $ul = $this.closest('ul:not(.dropdown-menu)')
+        , selector = $this.attr('data-target')
+        , previous
+        , $target
+        , e
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      if ( $this.parent('li').hasClass('active') ) return
+
+      previous = $ul.find('.active:last a')[0]
+
+      e = $.Event('show', {
+        relatedTarget: previous
+      })
+
+      $this.trigger(e)
+
+      if (e.isDefaultPrevented()) return
+
+      $target = $(selector)
+
+      this.activate($this.parent('li'), $ul)
+      this.activate($target, $target.parent(), function () {
+        $this.trigger({
+          type: 'shown'
+        , relatedTarget: previous
+        })
+      })
+    }
+
+  , activate: function ( element, container, callback) {
+      var $active = container.find('> .active')
+        , transition = callback
+            && $.support.transition
+            && $active.hasClass('fade')
+
+      function next() {
+        $active
+          .removeClass('active')
+          .find('> .dropdown-menu > .active')
+          .removeClass('active')
+
+        element.addClass('active')
+
+        if (transition) {
+          element[0].offsetWidth // reflow for transition
+          element.addClass('in')
+        } else {
+          element.removeClass('fade')
+        }
+
+        if ( element.parent('.dropdown-menu') ) {
+          element.closest('li.dropdown').addClass('active')
+        }
+
+        callback && callback()
+      }
+
+      transition ?
+        $active.one($.support.transition.end, next) :
+        next()
+
+      $active.removeClass('in')
+    }
+  }
+
+
+ /* TAB PLUGIN DEFINITION
+  * ===================== */
+
+  var old = $.fn.tab
+
+  $.fn.tab = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tab')
+      if (!data) $this.data('tab', (data = new Tab(this)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tab.Constructor = Tab
+
+
+ /* TAB NO CONFLICT
+  * =============== */
+
+  $.fn.tab.noConflict = function () {
+    $.fn.tab = old
+    return this
+  }
+
+
+ /* TAB DATA-API
+  * ============ */
+
+  $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+    e.preventDefault()
+    $(this).tab('show')
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-typeahead.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function($){
+
+  "use strict"; // jshint ;_;
+
+
+ /* TYPEAHEAD PUBLIC CLASS DEFINITION
+  * ================================= */
+
+  var Typeahead = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.typeahead.defaults, options)
+    this.matcher = this.options.matcher || this.matcher
+    this.sorter = this.options.sorter || this.sorter
+    this.highlighter = this.options.highlighter || this.highlighter
+    this.updater = this.options.updater || this.updater
+    this.source = this.options.source
+    this.$menu = $(this.options.menu)
+    this.shown = false
+    this.listen()
+  }
+
+  Typeahead.prototype = {
+
+    constructor: Typeahead
+
+  , select: function () {
+      var val = this.$menu.find('.active').attr('data-value')
+      this.$element
+        .val(this.updater(val))
+        .change()
+      return this.hide()
+    }
+
+  , updater: function (item) {
+      return item
+    }
+
+  , show: function () {
+      var pos = $.extend({}, this.$element.position(), {
+        height: this.$element[0].offsetHeight
+      })
+
+      this.$menu
+        .insertAfter(this.$element)
+        .css({
+          top: pos.top + pos.height
+        , left: pos.left
+        })
+        .show()
+
+      this.shown = true
+      return this
+    }
+
+  , hide: function () {
+      this.$menu.hide()
+      this.shown = false
+      return this
+    }
+
+  , lookup: function (event) {
+      var items
+
+      this.query = this.$element.val()
+
+      if (!this.query || this.query.length < this.options.minLength) {
+        return this.shown ? this.hide() : this
+      }
+
+      items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
+
+      return items ? this.process(items) : this
+    }
+
+  , process: function (items) {
+      var that = this
+
+      items = $.grep(items, function (item) {
+        return that.matcher(item)
+      })
+
+      items = this.sorter(items)
+
+      if (!items.length) {
+        return this.shown ? this.hide() : this
+      }
+
+      return this.render(items.slice(0, this.options.items)).show()
+    }
+
+  , matcher: function (item) {
+      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
+    }
+
+  , sorter: function (items) {
+      var beginswith = []
+        , caseSensitive = []
+        , caseInsensitive = []
+        , item
+
+      while (item = items.shift()) {
+        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
+        else if (~item.indexOf(this.query)) caseSensitive.push(item)
+        else caseInsensitive.push(item)
+      }
+
+      return beginswith.concat(caseSensitive, caseInsensitive)
+    }
+
+  , highlighter: function (item) {
+      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
+      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
+        return '<strong>' + match + '</strong>'
+      })
+    }
+
+  , render: function (items) {
+      var that = this
+
+      items = $(items).map(function (i, item) {
+        i = $(that.options.item).attr('data-value', item)
+        i.find('a').html(that.highlighter(item))
+        return i[0]
+      })
+
+      items.first().addClass('active')
+      this.$menu.html(items)
+      return this
+    }
+
+  , next: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.next()
+
+      if (!next.length) {
+        next = $(this.$menu.find('li')[0])
+      }
+
+      next.addClass('active')
+    }
+
+  , prev: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , prev = active.prev()
+
+      if (!prev.length) {
+        prev = this.$menu.find('li').last()
+      }
+
+      prev.addClass('active')
+    }
+
+  , listen: function () {
+      this.$element
+        .on('focus',    $.proxy(this.focus, this))
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      if (this.eventSupported('keydown')) {
+        this.$element.on('keydown', $.proxy(this.keydown, this))
+      }
+
+      this.$menu
+        .on('click', $.proxy(this.click, this))
+        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
+        .on('mouseleave', 'li', $.proxy(this.mouseleave, this))
+    }
+
+  , eventSupported: function(eventName) {
+      var isSupported = eventName in this.$element
+      if (!isSupported) {
+        this.$element.setAttribute(eventName, 'return;')
+        isSupported = typeof this.$element[eventName] === 'function'
+      }
+      return isSupported
+    }
+
+  , move: function (e) {
+      if (!this.shown) return
+
+      switch(e.keyCode) {
+        case 9: // tab
+        case 13: // enter
+        case 27: // escape
+          e.preventDefault()
+          break
+
+        case 38: // up arrow
+          e.preventDefault()
+          this.prev()
+          break
+
+        case 40: // down arrow
+          e.preventDefault()
+          this.next()
+          break
+      }
+
+      e.stopPropagation()
+    }
+
+  , keydown: function (e) {
+      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
+      this.move(e)
+    }
+
+  , keypress: function (e) {
+      if (this.suppressKeyPressRepeat) return
+      this.move(e)
+    }
+
+  , keyup: function (e) {
+      switch(e.keyCode) {
+        case 40: // down arrow
+        case 38: // up arrow
+        case 16: // shift
+        case 17: // ctrl
+        case 18: // alt
+          break
+
+        case 9: // tab
+        case 13: // enter
+          if (!this.shown) return
+          this.select()
+          break
+
+        case 27: // escape
+          if (!this.shown) return
+          this.hide()
+          break
+
+        default:
+          this.lookup()
+      }
+
+      e.stopPropagation()
+      e.preventDefault()
+  }
+
+  , focus: function (e) {
+      this.focused = true
+    }
+
+  , blur: function (e) {
+      this.focused = false
+      if (!this.mousedover && this.shown) this.hide()
+    }
+
+  , click: function (e) {
+      e.stopPropagation()
+      e.preventDefault()
+      this.select()
+      this.$element.focus()
+    }
+
+  , mouseenter: function (e) {
+      this.mousedover = true
+      this.$menu.find('.active').removeClass('active')
+      $(e.currentTarget).addClass('active')
+    }
+
+  , mouseleave: function (e) {
+      this.mousedover = false
+      if (!this.focused && this.shown) this.hide()
+    }
+
+  }
+
+
+  /* TYPEAHEAD PLUGIN DEFINITION
+   * =========================== */
+
+  var old = $.fn.typeahead
+
+  $.fn.typeahead = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('typeahead')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.typeahead.defaults = {
+    source: []
+  , items: 8
+  , menu: '<ul class="typeahead dropdown-menu"></ul>'
+  , item: '<li><a href="#"></a></li>'
+  , minLength: 1
+  }
+
+  $.fn.typeahead.Constructor = Typeahead
+
+
+ /* TYPEAHEAD NO CONFLICT
+  * =================== */
+
+  $.fn.typeahead.noConflict = function () {
+    $.fn.typeahead = old
+    return this
+  }
+
+
+ /* TYPEAHEAD DATA-API
+  * ================== */
+
+  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
+    var $this = $(this)
+    if ($this.data('typeahead')) return
+    $this.typeahead($this.data())
+  })
+
+}(window.jQuery);
+/* ==========================================================
+ * bootstrap-affix.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#affix
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* AFFIX CLASS DEFINITION
+  * ====================== */
+
+  var Affix = function (element, options) {
+    this.options = $.extend({}, $.fn.affix.defaults, options)
+    this.$window = $(window)
+      .on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
+      .on('click.affix.data-api',  $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
+    this.$element = $(element)
+    this.checkPosition()
+  }
+
+  Affix.prototype.checkPosition = function () {
+    if (!this.$element.is(':visible')) return
+
+    var scrollHeight = $(document).height()
+      , scrollTop = this.$window.scrollTop()
+      , position = this.$element.offset()
+      , offset = this.options.offset
+      , offsetBottom = offset.bottom
+      , offsetTop = offset.top
+      , reset = 'affix affix-top affix-bottom'
+      , affix
+
+    if (typeof offset != 'object') offsetBottom = offsetTop = offset
+    if (typeof offsetTop == 'function') offsetTop = offset.top()
+    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
+
+    affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
+      false    : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
+      'bottom' : offsetTop != null && scrollTop <= offsetTop ?
+      'top'    : false
+
+    if (this.affixed === affix) return
+
+    this.affixed = affix
+    this.unpin = affix == 'bottom' ? position.top - scrollTop : null
+
+    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
+  }
+
+
+ /* AFFIX PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.affix
+
+  $.fn.affix = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('affix')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('affix', (data = new Affix(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.affix.Constructor = Affix
+
+  $.fn.affix.defaults = {
+    offset: 0
+  }
+
+
+ /* AFFIX NO CONFLICT
+  * ================= */
+
+  $.fn.affix.noConflict = function () {
+    $.fn.affix = old
+    return this
+  }
+
+
+ /* AFFIX DATA-API
+  * ============== */
+
+  $(window).on('load', function () {
+    $('[data-spy="affix"]').each(function () {
+      var $spy = $(this)
+        , data = $spy.data()
+
+      data.offset = data.offset || {}
+
+      data.offsetBottom && (data.offset.bottom = data.offsetBottom)
+      data.offsetTop && (data.offset.top = data.offsetTop)
+
+      $spy.affix(data)
+    })
+  })
+
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/view/theme/oldtest/js/bootstrap.min.js b/view/theme/oldtest/js/bootstrap.min.js
new file mode 100644
index 0000000000..95c5ac5ee6
--- /dev/null
+++ b/view/theme/oldtest/js/bootstrap.min.js
@@ -0,0 +1,6 @@
+/*!
+* Bootstrap.js by @fat & @mdo
+* Copyright 2012 Twitter, Inc.
+* http://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},getActiveIndex:function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},to:function(t){var n=this.getActiveIndex(),r=this;if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){r.to(t)}):n==t?this.pause().cycle():this.slide(t>n?"next":"prev",e(this.$items[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("carousel").pause().to(o).cycle(),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning||this.$element.hasClass("in"))return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning||!this.$element.hasClass("in"))return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},e.fn.collapse.defaults,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=n&&e(n);if(!r||!r.length)r=t.parent();return r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||s.toggleClass("open"),n.focus(),!1},keydown:function(n){var r,s,o,u,a,f;if(!/(38|40|27)/.test(n.keyCode))return;r=e(this),n.preventDefault(),n.stopPropagation();if(r.is(".disabled, :disabled"))return;u=i(r),a=u.hasClass("open");if(!a||a&&n.keyCode==27)return n.which==27&&u.find(t).focus(),r.click();s=e("[role=menu] li:not(.divider):visible a",u);if(!s.length)return;f=s.index(s.filter(":focus")),n.keyCode==38&&f>0&&f--,n.keyCode==40&&f<s.length-1&&f++,~f||(f=0),s.eq(f).focus()}};var s=e.fn.dropdown;e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e.fn.dropdown.noConflict=function(){return e.fn.dropdown=s,this},e(document).on("click.dropdown.data-api",r).on("click.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("click.dropdown-menu",function(e){e.stopPropagation()}).on("click.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.focus().trigger("shown")}):t.$element.focus().trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(){var e=this;this.$element.hide(),this.backdrop(function(){e.removeBackdrop(),e.$element.trigger("hidden")})},removeBackdrop:function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()}};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s,o,u,a;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,o=this.options.trigger.split(" ");for(a=o.length;a--;)u=o[a],u=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):u!="manual"&&(i=u=="hover"?"mouseenter":"focus",s=u=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this)));this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e.fn[this.type].defaults,r={},i;this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)},this),i=e(t.currentTarget)[this.type](r).data(this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var t,n,r,i,s,o,u=e.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(u);if(u.isDefaultPrevented())return;t=this.tip(),this.setContent(),this.options.animation&&t.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,t[0],this.$element[0]):this.options.placement,t.detach().css({top:0,left:0,display:"block"}),this.options.container?t.appendTo(this.options.container):t.insertAfter(this.$element),n=this.getPosition(),r=t[0].offsetWidth,i=t[0].offsetHeight;switch(s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}this.applyPlacement(o,s),this.$element.trigger("shown")}},applyPlacement:function(e,t){var n=this.tip(),r=n[0].offsetWidth,i=n[0].offsetHeight,s,o,u,a;n.offset(e).addClass(t).addClass("in"),s=n[0].offsetWidth,o=n[0].offsetHeight,t=="top"&&o!=i&&(e.top=e.top+i-o,a=!0),t=="bottom"||t=="top"?(u=0,e.left<0&&(u=e.left*-2,e.left=0,n.offset(e),s=n[0].offsetWidth,o=n[0].offsetHeight),this.replaceArrow(u-r+s,s,"left")):this.replaceArrow(o-i,o,"top"),a&&n.offset(e)},replaceArrow:function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide");this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},hasContent:function(){return this.getTitle()},getPosition:function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=t?e(t.currentTarget)[this.type](this._options).data(this.type):this;n.tip().hasClass("in")?n.hide():n.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=(typeof n.content=="function"?n.content.call(t[0]):n.content)||t.attr("data-content"),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=e(this.options.menu),this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:t.top+t.height,left:t.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("focus",e.proxy(this.focus,this)).on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this)).on("mouseleave","li",e.proxy(this.mouseleave,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},focus:function(e){this.focused=!0},blur:function(e){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(e){e.stopPropagation(),e.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(t){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")},mouseleave:function(e){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var n=e.fn.typeahead;e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e.fn.typeahead.noConflict=function(){return e.fn.typeahead=n,this},e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery);
\ No newline at end of file
diff --git a/view/theme/oldtest/js/knockout-2.2.1.js b/view/theme/oldtest/js/knockout-2.2.1.js
new file mode 100644
index 0000000000..d93e4977ce
--- /dev/null
+++ b/view/theme/oldtest/js/knockout-2.2.1.js
@@ -0,0 +1,85 @@
+// Knockout JavaScript library v2.2.1
+// (c) Steven Sanderson - http://knockoutjs.com/
+// License: MIT (http://www.opensource.org/licenses/mit-license.php)
+
+(function() {function j(w){throw w;}var m=!0,p=null,r=!1;function u(w){return function(){return w}};var x=window,y=document,ga=navigator,F=window.jQuery,I=void 0;
+function L(w){function ha(a,d,c,e,f){var g=[];a=b.j(function(){var a=d(c,f)||[];0<g.length&&(b.a.Ya(M(g),a),e&&b.r.K(e,p,[c,a,f]));g.splice(0,g.length);b.a.P(g,a)},p,{W:a,Ka:function(){return 0==g.length||!b.a.X(g[0])}});return{M:g,j:a.pa()?a:I}}function M(a){for(;a.length&&!b.a.X(a[0]);)a.splice(0,1);if(1<a.length){for(var d=a[0],c=a[a.length-1],e=[d];d!==c;){d=d.nextSibling;if(!d)return;e.push(d)}Array.prototype.splice.apply(a,[0,a.length].concat(e))}return a}function S(a,b,c,e,f){var g=Math.min,
+h=Math.max,k=[],l,n=a.length,q,s=b.length,v=s-n||1,G=n+s+1,J,A,z;for(l=0;l<=n;l++){A=J;k.push(J=[]);z=g(s,l+v);for(q=h(0,l-1);q<=z;q++)J[q]=q?l?a[l-1]===b[q-1]?A[q-1]:g(A[q]||G,J[q-1]||G)+1:q+1:l+1}g=[];h=[];v=[];l=n;for(q=s;l||q;)s=k[l][q]-1,q&&s===k[l][q-1]?h.push(g[g.length]={status:c,value:b[--q],index:q}):l&&s===k[l-1][q]?v.push(g[g.length]={status:e,value:a[--l],index:l}):(g.push({status:"retained",value:b[--q]}),--l);if(h.length&&v.length){a=10*n;var t;for(b=c=0;(f||b<a)&&(t=h[c]);c++){for(e=
+0;k=v[e];e++)if(t.value===k.value){t.moved=k.index;k.moved=t.index;v.splice(e,1);b=e=0;break}b+=e}}return g.reverse()}function T(a,d,c,e,f){f=f||{};var g=a&&N(a),g=g&&g.ownerDocument,h=f.templateEngine||O;b.za.vb(c,h,g);c=h.renderTemplate(c,e,f,g);("number"!=typeof c.length||0<c.length&&"number"!=typeof c[0].nodeType)&&j(Error("Template engine must return an array of DOM nodes"));g=r;switch(d){case "replaceChildren":b.e.N(a,c);g=m;break;case "replaceNode":b.a.Ya(a,c);g=m;break;case "ignoreTargetNode":break;
+default:j(Error("Unknown renderMode: "+d))}g&&(U(c,e),f.afterRender&&b.r.K(f.afterRender,p,[c,e.$data]));return c}function N(a){return a.nodeType?a:0<a.length?a[0]:p}function U(a,d){if(a.length){var c=a[0],e=a[a.length-1];V(c,e,function(a){b.Da(d,a)});V(c,e,function(a){b.s.ib(a,[d])})}}function V(a,d,c){var e;for(d=b.e.nextSibling(d);a&&(e=a)!==d;)a=b.e.nextSibling(e),(1===e.nodeType||8===e.nodeType)&&c(e)}function W(a,d,c){a=b.g.aa(a);for(var e=b.g.Q,f=0;f<a.length;f++){var g=a[f].key;if(e.hasOwnProperty(g)){var h=
+e[g];"function"===typeof h?(g=h(a[f].value))&&j(Error(g)):h||j(Error("This template engine does not support the '"+g+"' binding within its templates"))}}a="ko.__tr_ambtns(function($context,$element){return(function(){return{ "+b.g.ba(a)+" } })()})";return c.createJavaScriptEvaluatorBlock(a)+d}function X(a,d,c,e){function f(a){return function(){return k[a]}}function g(){return k}var h=0,k,l;b.j(function(){var n=c&&c instanceof b.z?c:new b.z(b.a.d(c)),q=n.$data;e&&b.eb(a,n);if(k=("function"==typeof d?
+d(n,a):d)||b.J.instance.getBindings(a,n)){if(0===h){h=1;for(var s in k){var v=b.c[s];v&&8===a.nodeType&&!b.e.I[s]&&j(Error("The binding '"+s+"' cannot be used with virtual elements"));if(v&&"function"==typeof v.init&&(v=(0,v.init)(a,f(s),g,q,n))&&v.controlsDescendantBindings)l!==I&&j(Error("Multiple bindings ("+l+" and "+s+") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.")),l=s}h=2}if(2===h)for(s in k)(v=b.c[s])&&"function"==
+typeof v.update&&(0,v.update)(a,f(s),g,q,n)}},p,{W:a});return{Nb:l===I}}function Y(a,d,c){var e=m,f=1===d.nodeType;f&&b.e.Ta(d);if(f&&c||b.J.instance.nodeHasBindings(d))e=X(d,p,a,c).Nb;e&&Z(a,d,!f)}function Z(a,d,c){for(var e=b.e.firstChild(d);d=e;)e=b.e.nextSibling(d),Y(a,d,c)}function $(a,b){var c=aa(a,b);return c?0<c.length?c[c.length-1].nextSibling:a.nextSibling:p}function aa(a,b){for(var c=a,e=1,f=[];c=c.nextSibling;){if(H(c)&&(e--,0===e))return f;f.push(c);B(c)&&e++}b||j(Error("Cannot find closing comment tag to match: "+
+a.nodeValue));return p}function H(a){return 8==a.nodeType&&(K?a.text:a.nodeValue).match(ia)}function B(a){return 8==a.nodeType&&(K?a.text:a.nodeValue).match(ja)}function P(a,b){for(var c=p;a!=c;)c=a,a=a.replace(ka,function(a,c){return b[c]});return a}function la(){var a=[],d=[];this.save=function(c,e){var f=b.a.i(a,c);0<=f?d[f]=e:(a.push(c),d.push(e))};this.get=function(c){c=b.a.i(a,c);return 0<=c?d[c]:I}}function ba(a,b,c){function e(e){var g=b(a[e]);switch(typeof g){case "boolean":case "number":case "string":case "function":f[e]=
+g;break;case "object":case "undefined":var h=c.get(g);f[e]=h!==I?h:ba(g,b,c)}}c=c||new la;a=b(a);if(!("object"==typeof a&&a!==p&&a!==I&&!(a instanceof Date)))return a;var f=a instanceof Array?[]:{};c.save(a,f);var g=a;if(g instanceof Array){for(var h=0;h<g.length;h++)e(h);"function"==typeof g.toJSON&&e("toJSON")}else for(h in g)e(h);return f}function ca(a,d){if(a)if(8==a.nodeType){var c=b.s.Ua(a.nodeValue);c!=p&&d.push({sb:a,Fb:c})}else if(1==a.nodeType)for(var c=0,e=a.childNodes,f=e.length;c<f;c++)ca(e[c],
+d)}function Q(a,d,c,e){b.c[a]={init:function(a){b.a.f.set(a,da,{});return{controlsDescendantBindings:m}},update:function(a,g,h,k,l){h=b.a.f.get(a,da);g=b.a.d(g());k=!c!==!g;var n=!h.Za;if(n||d||k!==h.qb)n&&(h.Za=b.a.Ia(b.e.childNodes(a),m)),k?(n||b.e.N(a,b.a.Ia(h.Za)),b.Ea(e?e(l,g):l,a)):b.e.Y(a),h.qb=k}};b.g.Q[a]=r;b.e.I[a]=m}function ea(a,d,c){c&&d!==b.k.q(a)&&b.k.T(a,d);d!==b.k.q(a)&&b.r.K(b.a.Ba,p,[a,"change"])}var b="undefined"!==typeof w?w:{};b.b=function(a,d){for(var c=a.split("."),e=b,f=0;f<
+c.length-1;f++)e=e[c[f]];e[c[c.length-1]]=d};b.p=function(a,b,c){a[b]=c};b.version="2.2.1";b.b("version",b.version);b.a=new function(){function a(a,d){if("input"!==b.a.u(a)||!a.type||"click"!=d.toLowerCase())return r;var c=a.type;return"checkbox"==c||"radio"==c}var d=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,c={},e={};c[/Firefox\/2/i.test(ga.userAgent)?"KeyboardEvent":"UIEvents"]=["keyup","keydown","keypress"];c.MouseEvents="click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave".split(" ");
+for(var f in c){var g=c[f];if(g.length)for(var h=0,k=g.length;h<k;h++)e[g[h]]=f}var l={propertychange:m},n,c=3;f=y.createElement("div");for(g=f.getElementsByTagName("i");f.innerHTML="\x3c!--[if gt IE "+ ++c+"]><i></i><![endif]--\x3e",g[0];);n=4<c?c:I;return{Na:["authenticity_token",/^__RequestVerificationToken(_.*)?$/],o:function(a,b){for(var d=0,c=a.length;d<c;d++)b(a[d])},i:function(a,b){if("function"==typeof Array.prototype.indexOf)return Array.prototype.indexOf.call(a,b);for(var d=0,c=a.length;d<
+c;d++)if(a[d]===b)return d;return-1},lb:function(a,b,d){for(var c=0,e=a.length;c<e;c++)if(b.call(d,a[c]))return a[c];return p},ga:function(a,d){var c=b.a.i(a,d);0<=c&&a.splice(c,1)},Ga:function(a){a=a||[];for(var d=[],c=0,e=a.length;c<e;c++)0>b.a.i(d,a[c])&&d.push(a[c]);return d},V:function(a,b){a=a||[];for(var d=[],c=0,e=a.length;c<e;c++)d.push(b(a[c]));return d},fa:function(a,b){a=a||[];for(var d=[],c=0,e=a.length;c<e;c++)b(a[c])&&d.push(a[c]);return d},P:function(a,b){if(b instanceof Array)a.push.apply(a,
+b);else for(var d=0,c=b.length;d<c;d++)a.push(b[d]);return a},extend:function(a,b){if(b)for(var d in b)b.hasOwnProperty(d)&&(a[d]=b[d]);return a},ka:function(a){for(;a.firstChild;)b.removeNode(a.firstChild)},Hb:function(a){a=b.a.L(a);for(var d=y.createElement("div"),c=0,e=a.length;c<e;c++)d.appendChild(b.A(a[c]));return d},Ia:function(a,d){for(var c=0,e=a.length,g=[];c<e;c++){var f=a[c].cloneNode(m);g.push(d?b.A(f):f)}return g},N:function(a,d){b.a.ka(a);if(d)for(var c=0,e=d.length;c<e;c++)a.appendChild(d[c])},
+Ya:function(a,d){var c=a.nodeType?[a]:a;if(0<c.length){for(var e=c[0],g=e.parentNode,f=0,h=d.length;f<h;f++)g.insertBefore(d[f],e);f=0;for(h=c.length;f<h;f++)b.removeNode(c[f])}},bb:function(a,b){7>n?a.setAttribute("selected",b):a.selected=b},D:function(a){return(a||"").replace(d,"")},Rb:function(a,d){for(var c=[],e=(a||"").split(d),f=0,g=e.length;f<g;f++){var h=b.a.D(e[f]);""!==h&&c.push(h)}return c},Ob:function(a,b){a=a||"";return b.length>a.length?r:a.substring(0,b.length)===b},tb:function(a,b){if(b.compareDocumentPosition)return 16==
+(b.compareDocumentPosition(a)&16);for(;a!=p;){if(a==b)return m;a=a.parentNode}return r},X:function(a){return b.a.tb(a,a.ownerDocument)},u:function(a){return a&&a.tagName&&a.tagName.toLowerCase()},n:function(b,d,c){var e=n&&l[d];if(!e&&"undefined"!=typeof F){if(a(b,d)){var f=c;c=function(a,b){var d=this.checked;b&&(this.checked=b.nb!==m);f.call(this,a);this.checked=d}}F(b).bind(d,c)}else!e&&"function"==typeof b.addEventListener?b.addEventListener(d,c,r):"undefined"!=typeof b.attachEvent?b.attachEvent("on"+
+d,function(a){c.call(b,a)}):j(Error("Browser doesn't support addEventListener or attachEvent"))},Ba:function(b,d){(!b||!b.nodeType)&&j(Error("element must be a DOM node when calling triggerEvent"));if("undefined"!=typeof F){var c=[];a(b,d)&&c.push({nb:b.checked});F(b).trigger(d,c)}else"function"==typeof y.createEvent?"function"==typeof b.dispatchEvent?(c=y.createEvent(e[d]||"HTMLEvents"),c.initEvent(d,m,m,x,0,0,0,0,0,r,r,r,r,0,b),b.dispatchEvent(c)):j(Error("The supplied element doesn't support dispatchEvent")):
+"undefined"!=typeof b.fireEvent?(a(b,d)&&(b.checked=b.checked!==m),b.fireEvent("on"+d)):j(Error("Browser doesn't support triggering events"))},d:function(a){return b.$(a)?a():a},ua:function(a){return b.$(a)?a.t():a},da:function(a,d,c){if(d){var e=/[\w-]+/g,f=a.className.match(e)||[];b.a.o(d.match(e),function(a){var d=b.a.i(f,a);0<=d?c||f.splice(d,1):c&&f.push(a)});a.className=f.join(" ")}},cb:function(a,d){var c=b.a.d(d);if(c===p||c===I)c="";if(3===a.nodeType)a.data=c;else{var e=b.e.firstChild(a);
+!e||3!=e.nodeType||b.e.nextSibling(e)?b.e.N(a,[y.createTextNode(c)]):e.data=c;b.a.wb(a)}},ab:function(a,b){a.name=b;if(7>=n)try{a.mergeAttributes(y.createElement("<input name='"+a.name+"'/>"),r)}catch(d){}},wb:function(a){9<=n&&(a=1==a.nodeType?a:a.parentNode,a.style&&(a.style.zoom=a.style.zoom))},ub:function(a){if(9<=n){var b=a.style.width;a.style.width=0;a.style.width=b}},Lb:function(a,d){a=b.a.d(a);d=b.a.d(d);for(var c=[],e=a;e<=d;e++)c.push(e);return c},L:function(a){for(var b=[],d=0,c=a.length;d<
+c;d++)b.push(a[d]);return b},Pb:6===n,Qb:7===n,Z:n,Oa:function(a,d){for(var c=b.a.L(a.getElementsByTagName("input")).concat(b.a.L(a.getElementsByTagName("textarea"))),e="string"==typeof d?function(a){return a.name===d}:function(a){return d.test(a.name)},f=[],g=c.length-1;0<=g;g--)e(c[g])&&f.push(c[g]);return f},Ib:function(a){return"string"==typeof a&&(a=b.a.D(a))?x.JSON&&x.JSON.parse?x.JSON.parse(a):(new Function("return "+a))():p},xa:function(a,d,c){("undefined"==typeof JSON||"undefined"==typeof JSON.stringify)&&
+j(Error("Cannot find JSON.stringify(). Some browsers (e.g., IE < 8) don't support it natively, but you can overcome this by adding a script reference to json2.js, downloadable from http://www.json.org/json2.js"));return JSON.stringify(b.a.d(a),d,c)},Jb:function(a,d,c){c=c||{};var e=c.params||{},f=c.includeFields||this.Na,g=a;if("object"==typeof a&&"form"===b.a.u(a))for(var g=a.action,h=f.length-1;0<=h;h--)for(var k=b.a.Oa(a,f[h]),l=k.length-1;0<=l;l--)e[k[l].name]=k[l].value;d=b.a.d(d);var n=y.createElement("form");
+n.style.display="none";n.action=g;n.method="post";for(var w in d)a=y.createElement("input"),a.name=w,a.value=b.a.xa(b.a.d(d[w])),n.appendChild(a);for(w in e)a=y.createElement("input"),a.name=w,a.value=e[w],n.appendChild(a);y.body.appendChild(n);c.submitter?c.submitter(n):n.submit();setTimeout(function(){n.parentNode.removeChild(n)},0)}}};b.b("utils",b.a);b.b("utils.arrayForEach",b.a.o);b.b("utils.arrayFirst",b.a.lb);b.b("utils.arrayFilter",b.a.fa);b.b("utils.arrayGetDistinctValues",b.a.Ga);b.b("utils.arrayIndexOf",
+b.a.i);b.b("utils.arrayMap",b.a.V);b.b("utils.arrayPushAll",b.a.P);b.b("utils.arrayRemoveItem",b.a.ga);b.b("utils.extend",b.a.extend);b.b("utils.fieldsIncludedWithJsonPost",b.a.Na);b.b("utils.getFormFields",b.a.Oa);b.b("utils.peekObservable",b.a.ua);b.b("utils.postJson",b.a.Jb);b.b("utils.parseJson",b.a.Ib);b.b("utils.registerEventHandler",b.a.n);b.b("utils.stringifyJson",b.a.xa);b.b("utils.range",b.a.Lb);b.b("utils.toggleDomNodeCssClass",b.a.da);b.b("utils.triggerEvent",b.a.Ba);b.b("utils.unwrapObservable",
+b.a.d);Function.prototype.bind||(Function.prototype.bind=function(a){var b=this,c=Array.prototype.slice.call(arguments);a=c.shift();return function(){return b.apply(a,c.concat(Array.prototype.slice.call(arguments)))}});b.a.f=new function(){var a=0,d="__ko__"+(new Date).getTime(),c={};return{get:function(a,d){var c=b.a.f.la(a,r);return c===I?I:c[d]},set:function(a,d,c){c===I&&b.a.f.la(a,r)===I||(b.a.f.la(a,m)[d]=c)},la:function(b,f){var g=b[d];if(!g||!("null"!==g&&c[g])){if(!f)return I;g=b[d]="ko"+
+a++;c[g]={}}return c[g]},clear:function(a){var b=a[d];return b?(delete c[b],a[d]=p,m):r}}};b.b("utils.domData",b.a.f);b.b("utils.domData.clear",b.a.f.clear);b.a.F=new function(){function a(a,d){var e=b.a.f.get(a,c);e===I&&d&&(e=[],b.a.f.set(a,c,e));return e}function d(c){var e=a(c,r);if(e)for(var e=e.slice(0),k=0;k<e.length;k++)e[k](c);b.a.f.clear(c);"function"==typeof F&&"function"==typeof F.cleanData&&F.cleanData([c]);if(f[c.nodeType])for(e=c.firstChild;c=e;)e=c.nextSibling,8===c.nodeType&&d(c)}
+var c="__ko_domNodeDisposal__"+(new Date).getTime(),e={1:m,8:m,9:m},f={1:m,9:m};return{Ca:function(b,d){"function"!=typeof d&&j(Error("Callback must be a function"));a(b,m).push(d)},Xa:function(d,e){var f=a(d,r);f&&(b.a.ga(f,e),0==f.length&&b.a.f.set(d,c,I))},A:function(a){if(e[a.nodeType]&&(d(a),f[a.nodeType])){var c=[];b.a.P(c,a.getElementsByTagName("*"));for(var k=0,l=c.length;k<l;k++)d(c[k])}return a},removeNode:function(a){b.A(a);a.parentNode&&a.parentNode.removeChild(a)}}};b.A=b.a.F.A;b.removeNode=
+b.a.F.removeNode;b.b("cleanNode",b.A);b.b("removeNode",b.removeNode);b.b("utils.domNodeDisposal",b.a.F);b.b("utils.domNodeDisposal.addDisposeCallback",b.a.F.Ca);b.b("utils.domNodeDisposal.removeDisposeCallback",b.a.F.Xa);b.a.ta=function(a){var d;if("undefined"!=typeof F)if(F.parseHTML)d=F.parseHTML(a);else{if((d=F.clean([a]))&&d[0]){for(a=d[0];a.parentNode&&11!==a.parentNode.nodeType;)a=a.parentNode;a.parentNode&&a.parentNode.removeChild(a)}}else{var c=b.a.D(a).toLowerCase();d=y.createElement("div");
+c=c.match(/^<(thead|tbody|tfoot)/)&&[1,"<table>","</table>"]||!c.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!c.indexOf("<td")||!c.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||[0,"",""];a="ignored<div>"+c[1]+a+c[2]+"</div>";for("function"==typeof x.innerShiv?d.appendChild(x.innerShiv(a)):d.innerHTML=a;c[0]--;)d=d.lastChild;d=b.a.L(d.lastChild.childNodes)}return d};b.a.ca=function(a,d){b.a.ka(a);d=b.a.d(d);if(d!==p&&d!==I)if("string"!=typeof d&&(d=d.toString()),
+"undefined"!=typeof F)F(a).html(d);else for(var c=b.a.ta(d),e=0;e<c.length;e++)a.appendChild(c[e])};b.b("utils.parseHtmlFragment",b.a.ta);b.b("utils.setHtml",b.a.ca);var R={};b.s={ra:function(a){"function"!=typeof a&&j(Error("You can only pass a function to ko.memoization.memoize()"));var b=(4294967296*(1+Math.random())|0).toString(16).substring(1)+(4294967296*(1+Math.random())|0).toString(16).substring(1);R[b]=a;return"\x3c!--[ko_memo:"+b+"]--\x3e"},hb:function(a,b){var c=R[a];c===I&&j(Error("Couldn't find any memo with ID "+
+a+". Perhaps it's already been unmemoized."));try{return c.apply(p,b||[]),m}finally{delete R[a]}},ib:function(a,d){var c=[];ca(a,c);for(var e=0,f=c.length;e<f;e++){var g=c[e].sb,h=[g];d&&b.a.P(h,d);b.s.hb(c[e].Fb,h);g.nodeValue="";g.parentNode&&g.parentNode.removeChild(g)}},Ua:function(a){return(a=a.match(/^\[ko_memo\:(.*?)\]$/))?a[1]:p}};b.b("memoization",b.s);b.b("memoization.memoize",b.s.ra);b.b("memoization.unmemoize",b.s.hb);b.b("memoization.parseMemoText",b.s.Ua);b.b("memoization.unmemoizeDomNodeAndDescendants",
+b.s.ib);b.Ma={throttle:function(a,d){a.throttleEvaluation=d;var c=p;return b.j({read:a,write:function(b){clearTimeout(c);c=setTimeout(function(){a(b)},d)}})},notify:function(a,d){a.equalityComparer="always"==d?u(r):b.m.fn.equalityComparer;return a}};b.b("extenders",b.Ma);b.fb=function(a,d,c){this.target=a;this.ha=d;this.rb=c;b.p(this,"dispose",this.B)};b.fb.prototype.B=function(){this.Cb=m;this.rb()};b.S=function(){this.w={};b.a.extend(this,b.S.fn);b.p(this,"subscribe",this.ya);b.p(this,"extend",
+this.extend);b.p(this,"getSubscriptionsCount",this.yb)};b.S.fn={ya:function(a,d,c){c=c||"change";var e=new b.fb(this,d?a.bind(d):a,function(){b.a.ga(this.w[c],e)}.bind(this));this.w[c]||(this.w[c]=[]);this.w[c].push(e);return e},notifySubscribers:function(a,d){d=d||"change";this.w[d]&&b.r.K(function(){b.a.o(this.w[d].slice(0),function(b){b&&b.Cb!==m&&b.ha(a)})},this)},yb:function(){var a=0,b;for(b in this.w)this.w.hasOwnProperty(b)&&(a+=this.w[b].length);return a},extend:function(a){var d=this;if(a)for(var c in a){var e=
+b.Ma[c];"function"==typeof e&&(d=e(d,a[c]))}return d}};b.Qa=function(a){return"function"==typeof a.ya&&"function"==typeof a.notifySubscribers};b.b("subscribable",b.S);b.b("isSubscribable",b.Qa);var C=[];b.r={mb:function(a){C.push({ha:a,La:[]})},end:function(){C.pop()},Wa:function(a){b.Qa(a)||j(Error("Only subscribable things can act as dependencies"));if(0<C.length){var d=C[C.length-1];d&&!(0<=b.a.i(d.La,a))&&(d.La.push(a),d.ha(a))}},K:function(a,b,c){try{return C.push(p),a.apply(b,c||[])}finally{C.pop()}}};
+var ma={undefined:m,"boolean":m,number:m,string:m};b.m=function(a){function d(){if(0<arguments.length){if(!d.equalityComparer||!d.equalityComparer(c,arguments[0]))d.H(),c=arguments[0],d.G();return this}b.r.Wa(d);return c}var c=a;b.S.call(d);d.t=function(){return c};d.G=function(){d.notifySubscribers(c)};d.H=function(){d.notifySubscribers(c,"beforeChange")};b.a.extend(d,b.m.fn);b.p(d,"peek",d.t);b.p(d,"valueHasMutated",d.G);b.p(d,"valueWillMutate",d.H);return d};b.m.fn={equalityComparer:function(a,
+b){return a===p||typeof a in ma?a===b:r}};var E=b.m.Kb="__ko_proto__";b.m.fn[E]=b.m;b.ma=function(a,d){return a===p||a===I||a[E]===I?r:a[E]===d?m:b.ma(a[E],d)};b.$=function(a){return b.ma(a,b.m)};b.Ra=function(a){return"function"==typeof a&&a[E]===b.m||"function"==typeof a&&a[E]===b.j&&a.zb?m:r};b.b("observable",b.m);b.b("isObservable",b.$);b.b("isWriteableObservable",b.Ra);b.R=function(a){0==arguments.length&&(a=[]);a!==p&&(a!==I&&!("length"in a))&&j(Error("The argument passed when initializing an observable array must be an array, or null, or undefined."));
+var d=b.m(a);b.a.extend(d,b.R.fn);return d};b.R.fn={remove:function(a){for(var b=this.t(),c=[],e="function"==typeof a?a:function(b){return b===a},f=0;f<b.length;f++){var g=b[f];e(g)&&(0===c.length&&this.H(),c.push(g),b.splice(f,1),f--)}c.length&&this.G();return c},removeAll:function(a){if(a===I){var d=this.t(),c=d.slice(0);this.H();d.splice(0,d.length);this.G();return c}return!a?[]:this.remove(function(d){return 0<=b.a.i(a,d)})},destroy:function(a){var b=this.t(),c="function"==typeof a?a:function(b){return b===
+a};this.H();for(var e=b.length-1;0<=e;e--)c(b[e])&&(b[e]._destroy=m);this.G()},destroyAll:function(a){return a===I?this.destroy(u(m)):!a?[]:this.destroy(function(d){return 0<=b.a.i(a,d)})},indexOf:function(a){var d=this();return b.a.i(d,a)},replace:function(a,b){var c=this.indexOf(a);0<=c&&(this.H(),this.t()[c]=b,this.G())}};b.a.o("pop push reverse shift sort splice unshift".split(" "),function(a){b.R.fn[a]=function(){var b=this.t();this.H();b=b[a].apply(b,arguments);this.G();return b}});b.a.o(["slice"],
+function(a){b.R.fn[a]=function(){var b=this();return b[a].apply(b,arguments)}});b.b("observableArray",b.R);b.j=function(a,d,c){function e(){b.a.o(z,function(a){a.B()});z=[]}function f(){var a=h.throttleEvaluation;a&&0<=a?(clearTimeout(t),t=setTimeout(g,a)):g()}function g(){if(!q)if(n&&w())A();else{q=m;try{var a=b.a.V(z,function(a){return a.target});b.r.mb(function(c){var d;0<=(d=b.a.i(a,c))?a[d]=I:z.push(c.ya(f))});for(var c=s.call(d),e=a.length-1;0<=e;e--)a[e]&&z.splice(e,1)[0].B();n=m;h.notifySubscribers(l,
+"beforeChange");l=c}finally{b.r.end()}h.notifySubscribers(l);q=r;z.length||A()}}function h(){if(0<arguments.length)return"function"===typeof v?v.apply(d,arguments):j(Error("Cannot write a value to a ko.computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters.")),this;n||g();b.r.Wa(h);return l}function k(){return!n||0<z.length}var l,n=r,q=r,s=a;s&&"object"==typeof s?(c=s,s=c.read):(c=c||{},s||(s=c.read));"function"!=typeof s&&j(Error("Pass a function that returns the value of the ko.computed"));
+var v=c.write,G=c.disposeWhenNodeIsRemoved||c.W||p,w=c.disposeWhen||c.Ka||u(r),A=e,z=[],t=p;d||(d=c.owner);h.t=function(){n||g();return l};h.xb=function(){return z.length};h.zb="function"===typeof c.write;h.B=function(){A()};h.pa=k;b.S.call(h);b.a.extend(h,b.j.fn);b.p(h,"peek",h.t);b.p(h,"dispose",h.B);b.p(h,"isActive",h.pa);b.p(h,"getDependenciesCount",h.xb);c.deferEvaluation!==m&&g();if(G&&k()){A=function(){b.a.F.Xa(G,arguments.callee);e()};b.a.F.Ca(G,A);var D=w,w=function(){return!b.a.X(G)||D()}}return h};
+b.Bb=function(a){return b.ma(a,b.j)};w=b.m.Kb;b.j[w]=b.m;b.j.fn={};b.j.fn[w]=b.j;b.b("dependentObservable",b.j);b.b("computed",b.j);b.b("isComputed",b.Bb);b.gb=function(a){0==arguments.length&&j(Error("When calling ko.toJS, pass the object you want to convert."));return ba(a,function(a){for(var c=0;b.$(a)&&10>c;c++)a=a();return a})};b.toJSON=function(a,d,c){a=b.gb(a);return b.a.xa(a,d,c)};b.b("toJS",b.gb);b.b("toJSON",b.toJSON);b.k={q:function(a){switch(b.a.u(a)){case "option":return a.__ko__hasDomDataOptionValue__===
+m?b.a.f.get(a,b.c.options.sa):7>=b.a.Z?a.getAttributeNode("value").specified?a.value:a.text:a.value;case "select":return 0<=a.selectedIndex?b.k.q(a.options[a.selectedIndex]):I;default:return a.value}},T:function(a,d){switch(b.a.u(a)){case "option":switch(typeof d){case "string":b.a.f.set(a,b.c.options.sa,I);"__ko__hasDomDataOptionValue__"in a&&delete a.__ko__hasDomDataOptionValue__;a.value=d;break;default:b.a.f.set(a,b.c.options.sa,d),a.__ko__hasDomDataOptionValue__=m,a.value="number"===typeof d?
+d:""}break;case "select":for(var c=a.options.length-1;0<=c;c--)if(b.k.q(a.options[c])==d){a.selectedIndex=c;break}break;default:if(d===p||d===I)d="";a.value=d}}};b.b("selectExtensions",b.k);b.b("selectExtensions.readValue",b.k.q);b.b("selectExtensions.writeValue",b.k.T);var ka=/\@ko_token_(\d+)\@/g,na=["true","false"],oa=/^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i;b.g={Q:[],aa:function(a){var d=b.a.D(a);if(3>d.length)return[];"{"===d.charAt(0)&&(d=d.substring(1,d.length-1));a=[];for(var c=
+p,e,f=0;f<d.length;f++){var g=d.charAt(f);if(c===p)switch(g){case '"':case "'":case "/":c=f,e=g}else if(g==e&&"\\"!==d.charAt(f-1)){g=d.substring(c,f+1);a.push(g);var h="@ko_token_"+(a.length-1)+"@",d=d.substring(0,c)+h+d.substring(f+1),f=f-(g.length-h.length),c=p}}e=c=p;for(var k=0,l=p,f=0;f<d.length;f++){g=d.charAt(f);if(c===p)switch(g){case "{":c=f;l=g;e="}";break;case "(":c=f;l=g;e=")";break;case "[":c=f,l=g,e="]"}g===l?k++:g===e&&(k--,0===k&&(g=d.substring(c,f+1),a.push(g),h="@ko_token_"+(a.length-
+1)+"@",d=d.substring(0,c)+h+d.substring(f+1),f-=g.length-h.length,c=p))}e=[];d=d.split(",");c=0;for(f=d.length;c<f;c++)k=d[c],l=k.indexOf(":"),0<l&&l<k.length-1?(g=k.substring(l+1),e.push({key:P(k.substring(0,l),a),value:P(g,a)})):e.push({unknown:P(k,a)});return e},ba:function(a){var d="string"===typeof a?b.g.aa(a):a,c=[];a=[];for(var e,f=0;e=d[f];f++)if(0<c.length&&c.push(","),e.key){var g;a:{g=e.key;var h=b.a.D(g);switch(h.length&&h.charAt(0)){case "'":case '"':break a;default:g="'"+h+"'"}}e=e.value;
+c.push(g);c.push(":");c.push(e);e=b.a.D(e);0<=b.a.i(na,b.a.D(e).toLowerCase())?e=r:(h=e.match(oa),e=h===p?r:h[1]?"Object("+h[1]+")"+h[2]:e);e&&(0<a.length&&a.push(", "),a.push(g+" : function(__ko_value) { "+e+" = __ko_value; }"))}else e.unknown&&c.push(e.unknown);d=c.join("");0<a.length&&(d=d+", '_ko_property_writers' : { "+a.join("")+" } ");return d},Eb:function(a,d){for(var c=0;c<a.length;c++)if(b.a.D(a[c].key)==d)return m;return r},ea:function(a,d,c,e,f){if(!a||!b.Ra(a)){if((a=d()._ko_property_writers)&&
+a[c])a[c](e)}else(!f||a.t()!==e)&&a(e)}};b.b("expressionRewriting",b.g);b.b("expressionRewriting.bindingRewriteValidators",b.g.Q);b.b("expressionRewriting.parseObjectLiteral",b.g.aa);b.b("expressionRewriting.preProcessBindings",b.g.ba);b.b("jsonExpressionRewriting",b.g);b.b("jsonExpressionRewriting.insertPropertyAccessorsIntoJson",b.g.ba);var K="\x3c!--test--\x3e"===y.createComment("test").text,ja=K?/^\x3c!--\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*--\x3e$/:/^\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*$/,ia=K?/^\x3c!--\s*\/ko\s*--\x3e$/:
+/^\s*\/ko\s*$/,pa={ul:m,ol:m};b.e={I:{},childNodes:function(a){return B(a)?aa(a):a.childNodes},Y:function(a){if(B(a)){a=b.e.childNodes(a);for(var d=0,c=a.length;d<c;d++)b.removeNode(a[d])}else b.a.ka(a)},N:function(a,d){if(B(a)){b.e.Y(a);for(var c=a.nextSibling,e=0,f=d.length;e<f;e++)c.parentNode.insertBefore(d[e],c)}else b.a.N(a,d)},Va:function(a,b){B(a)?a.parentNode.insertBefore(b,a.nextSibling):a.firstChild?a.insertBefore(b,a.firstChild):a.appendChild(b)},Pa:function(a,d,c){c?B(a)?a.parentNode.insertBefore(d,
+c.nextSibling):c.nextSibling?a.insertBefore(d,c.nextSibling):a.appendChild(d):b.e.Va(a,d)},firstChild:function(a){return!B(a)?a.firstChild:!a.nextSibling||H(a.nextSibling)?p:a.nextSibling},nextSibling:function(a){B(a)&&(a=$(a));return a.nextSibling&&H(a.nextSibling)?p:a.nextSibling},jb:function(a){return(a=B(a))?a[1]:p},Ta:function(a){if(pa[b.a.u(a)]){var d=a.firstChild;if(d){do if(1===d.nodeType){var c;c=d.firstChild;var e=p;if(c){do if(e)e.push(c);else if(B(c)){var f=$(c,m);f?c=f:e=[c]}else H(c)&&
+(e=[c]);while(c=c.nextSibling)}if(c=e){e=d.nextSibling;for(f=0;f<c.length;f++)e?a.insertBefore(c[f],e):a.appendChild(c[f])}}while(d=d.nextSibling)}}}};b.b("virtualElements",b.e);b.b("virtualElements.allowedBindings",b.e.I);b.b("virtualElements.emptyNode",b.e.Y);b.b("virtualElements.insertAfter",b.e.Pa);b.b("virtualElements.prepend",b.e.Va);b.b("virtualElements.setDomNodeChildren",b.e.N);b.J=function(){this.Ha={}};b.a.extend(b.J.prototype,{nodeHasBindings:function(a){switch(a.nodeType){case 1:return a.getAttribute("data-bind")!=
+p;case 8:return b.e.jb(a)!=p;default:return r}},getBindings:function(a,b){var c=this.getBindingsString(a,b);return c?this.parseBindingsString(c,b,a):p},getBindingsString:function(a){switch(a.nodeType){case 1:return a.getAttribute("data-bind");case 8:return b.e.jb(a);default:return p}},parseBindingsString:function(a,d,c){try{var e;if(!(e=this.Ha[a])){var f=this.Ha,g,h="with($context){with($data||{}){return{"+b.g.ba(a)+"}}}";g=new Function("$context","$element",h);e=f[a]=g}return e(d,c)}catch(k){j(Error("Unable to parse bindings.\nMessage: "+
+k+";\nBindings value: "+a))}}});b.J.instance=new b.J;b.b("bindingProvider",b.J);b.c={};b.z=function(a,d,c){d?(b.a.extend(this,d),this.$parentContext=d,this.$parent=d.$data,this.$parents=(d.$parents||[]).slice(0),this.$parents.unshift(this.$parent)):(this.$parents=[],this.$root=a,this.ko=b);this.$data=a;c&&(this[c]=a)};b.z.prototype.createChildContext=function(a,d){return new b.z(a,this,d)};b.z.prototype.extend=function(a){var d=b.a.extend(new b.z,this);return b.a.extend(d,a)};b.eb=function(a,d){if(2==
+arguments.length)b.a.f.set(a,"__ko_bindingContext__",d);else return b.a.f.get(a,"__ko_bindingContext__")};b.Fa=function(a,d,c){1===a.nodeType&&b.e.Ta(a);return X(a,d,c,m)};b.Ea=function(a,b){(1===b.nodeType||8===b.nodeType)&&Z(a,b,m)};b.Da=function(a,b){b&&(1!==b.nodeType&&8!==b.nodeType)&&j(Error("ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node"));b=b||x.document.body;Y(a,b,m)};b.ja=function(a){switch(a.nodeType){case 1:case 8:var d=b.eb(a);if(d)return d;
+if(a.parentNode)return b.ja(a.parentNode)}return I};b.pb=function(a){return(a=b.ja(a))?a.$data:I};b.b("bindingHandlers",b.c);b.b("applyBindings",b.Da);b.b("applyBindingsToDescendants",b.Ea);b.b("applyBindingsToNode",b.Fa);b.b("contextFor",b.ja);b.b("dataFor",b.pb);var fa={"class":"className","for":"htmlFor"};b.c.attr={update:function(a,d){var c=b.a.d(d())||{},e;for(e in c)if("string"==typeof e){var f=b.a.d(c[e]),g=f===r||f===p||f===I;g&&a.removeAttribute(e);8>=b.a.Z&&e in fa?(e=fa[e],g?a.removeAttribute(e):
+a[e]=f):g||a.setAttribute(e,f.toString());"name"===e&&b.a.ab(a,g?"":f.toString())}}};b.c.checked={init:function(a,d,c){b.a.n(a,"click",function(){var e;if("checkbox"==a.type)e=a.checked;else if("radio"==a.type&&a.checked)e=a.value;else return;var f=d(),g=b.a.d(f);"checkbox"==a.type&&g instanceof Array?(e=b.a.i(g,a.value),a.checked&&0>e?f.push(a.value):!a.checked&&0<=e&&f.splice(e,1)):b.g.ea(f,c,"checked",e,m)});"radio"==a.type&&!a.name&&b.c.uniqueName.init(a,u(m))},update:function(a,d){var c=b.a.d(d());
+"checkbox"==a.type?a.checked=c instanceof Array?0<=b.a.i(c,a.value):c:"radio"==a.type&&(a.checked=a.value==c)}};b.c.css={update:function(a,d){var c=b.a.d(d());if("object"==typeof c)for(var e in c){var f=b.a.d(c[e]);b.a.da(a,e,f)}else c=String(c||""),b.a.da(a,a.__ko__cssValue,r),a.__ko__cssValue=c,b.a.da(a,c,m)}};b.c.enable={update:function(a,d){var c=b.a.d(d());c&&a.disabled?a.removeAttribute("disabled"):!c&&!a.disabled&&(a.disabled=m)}};b.c.disable={update:function(a,d){b.c.enable.update(a,function(){return!b.a.d(d())})}};
+b.c.event={init:function(a,d,c,e){var f=d()||{},g;for(g in f)(function(){var f=g;"string"==typeof f&&b.a.n(a,f,function(a){var g,n=d()[f];if(n){var q=c();try{var s=b.a.L(arguments);s.unshift(e);g=n.apply(e,s)}finally{g!==m&&(a.preventDefault?a.preventDefault():a.returnValue=r)}q[f+"Bubble"]===r&&(a.cancelBubble=m,a.stopPropagation&&a.stopPropagation())}})})()}};b.c.foreach={Sa:function(a){return function(){var d=a(),c=b.a.ua(d);if(!c||"number"==typeof c.length)return{foreach:d,templateEngine:b.C.oa};
+b.a.d(d);return{foreach:c.data,as:c.as,includeDestroyed:c.includeDestroyed,afterAdd:c.afterAdd,beforeRemove:c.beforeRemove,afterRender:c.afterRender,beforeMove:c.beforeMove,afterMove:c.afterMove,templateEngine:b.C.oa}}},init:function(a,d){return b.c.template.init(a,b.c.foreach.Sa(d))},update:function(a,d,c,e,f){return b.c.template.update(a,b.c.foreach.Sa(d),c,e,f)}};b.g.Q.foreach=r;b.e.I.foreach=m;b.c.hasfocus={init:function(a,d,c){function e(e){a.__ko_hasfocusUpdating=m;var f=a.ownerDocument;"activeElement"in
+f&&(e=f.activeElement===a);f=d();b.g.ea(f,c,"hasfocus",e,m);a.__ko_hasfocusUpdating=r}var f=e.bind(p,m),g=e.bind(p,r);b.a.n(a,"focus",f);b.a.n(a,"focusin",f);b.a.n(a,"blur",g);b.a.n(a,"focusout",g)},update:function(a,d){var c=b.a.d(d());a.__ko_hasfocusUpdating||(c?a.focus():a.blur(),b.r.K(b.a.Ba,p,[a,c?"focusin":"focusout"]))}};b.c.html={init:function(){return{controlsDescendantBindings:m}},update:function(a,d){b.a.ca(a,d())}};var da="__ko_withIfBindingData";Q("if");Q("ifnot",r,m);Q("with",m,r,function(a,
+b){return a.createChildContext(b)});b.c.options={update:function(a,d,c){"select"!==b.a.u(a)&&j(Error("options binding applies only to SELECT elements"));for(var e=0==a.length,f=b.a.V(b.a.fa(a.childNodes,function(a){return a.tagName&&"option"===b.a.u(a)&&a.selected}),function(a){return b.k.q(a)||a.innerText||a.textContent}),g=a.scrollTop,h=b.a.d(d());0<a.length;)b.A(a.options[0]),a.remove(0);if(h){c=c();var k=c.optionsIncludeDestroyed;"number"!=typeof h.length&&(h=[h]);if(c.optionsCaption){var l=y.createElement("option");
+b.a.ca(l,c.optionsCaption);b.k.T(l,I);a.appendChild(l)}d=0;for(var n=h.length;d<n;d++){var q=h[d];if(!q||!q._destroy||k){var l=y.createElement("option"),s=function(a,b,c){var d=typeof b;return"function"==d?b(a):"string"==d?a[b]:c},v=s(q,c.optionsValue,q);b.k.T(l,b.a.d(v));q=s(q,c.optionsText,v);b.a.cb(l,q);a.appendChild(l)}}h=a.getElementsByTagName("option");d=k=0;for(n=h.length;d<n;d++)0<=b.a.i(f,b.k.q(h[d]))&&(b.a.bb(h[d],m),k++);a.scrollTop=g;e&&"value"in c&&ea(a,b.a.ua(c.value),m);b.a.ub(a)}}};
+b.c.options.sa="__ko.optionValueDomData__";b.c.selectedOptions={init:function(a,d,c){b.a.n(a,"change",function(){var e=d(),f=[];b.a.o(a.getElementsByTagName("option"),function(a){a.selected&&f.push(b.k.q(a))});b.g.ea(e,c,"value",f)})},update:function(a,d){"select"!=b.a.u(a)&&j(Error("values binding applies only to SELECT elements"));var c=b.a.d(d());c&&"number"==typeof c.length&&b.a.o(a.getElementsByTagName("option"),function(a){var d=0<=b.a.i(c,b.k.q(a));b.a.bb(a,d)})}};b.c.style={update:function(a,
+d){var c=b.a.d(d()||{}),e;for(e in c)if("string"==typeof e){var f=b.a.d(c[e]);a.style[e]=f||""}}};b.c.submit={init:function(a,d,c,e){"function"!=typeof d()&&j(Error("The value for a submit binding must be a function"));b.a.n(a,"submit",function(b){var c,h=d();try{c=h.call(e,a)}finally{c!==m&&(b.preventDefault?b.preventDefault():b.returnValue=r)}})}};b.c.text={update:function(a,d){b.a.cb(a,d())}};b.e.I.text=m;b.c.uniqueName={init:function(a,d){if(d()){var c="ko_unique_"+ ++b.c.uniqueName.ob;b.a.ab(a,
+c)}}};b.c.uniqueName.ob=0;b.c.value={init:function(a,d,c){function e(){h=r;var e=d(),f=b.k.q(a);b.g.ea(e,c,"value",f)}var f=["change"],g=c().valueUpdate,h=r;g&&("string"==typeof g&&(g=[g]),b.a.P(f,g),f=b.a.Ga(f));if(b.a.Z&&("input"==a.tagName.toLowerCase()&&"text"==a.type&&"off"!=a.autocomplete&&(!a.form||"off"!=a.form.autocomplete))&&-1==b.a.i(f,"propertychange"))b.a.n(a,"propertychange",function(){h=m}),b.a.n(a,"blur",function(){h&&e()});b.a.o(f,function(c){var d=e;b.a.Ob(c,"after")&&(d=function(){setTimeout(e,
+0)},c=c.substring(5));b.a.n(a,c,d)})},update:function(a,d){var c="select"===b.a.u(a),e=b.a.d(d()),f=b.k.q(a),g=e!=f;0===e&&(0!==f&&"0"!==f)&&(g=m);g&&(f=function(){b.k.T(a,e)},f(),c&&setTimeout(f,0));c&&0<a.length&&ea(a,e,r)}};b.c.visible={update:function(a,d){var c=b.a.d(d()),e="none"!=a.style.display;c&&!e?a.style.display="":!c&&e&&(a.style.display="none")}};b.c.click={init:function(a,d,c,e){return b.c.event.init.call(this,a,function(){var a={};a.click=d();return a},c,e)}};b.v=function(){};b.v.prototype.renderTemplateSource=
+function(){j(Error("Override renderTemplateSource"))};b.v.prototype.createJavaScriptEvaluatorBlock=function(){j(Error("Override createJavaScriptEvaluatorBlock"))};b.v.prototype.makeTemplateSource=function(a,d){if("string"==typeof a){d=d||y;var c=d.getElementById(a);c||j(Error("Cannot find template with ID "+a));return new b.l.h(c)}if(1==a.nodeType||8==a.nodeType)return new b.l.O(a);j(Error("Unknown template type: "+a))};b.v.prototype.renderTemplate=function(a,b,c,e){a=this.makeTemplateSource(a,e);
+return this.renderTemplateSource(a,b,c)};b.v.prototype.isTemplateRewritten=function(a,b){return this.allowTemplateRewriting===r?m:this.makeTemplateSource(a,b).data("isRewritten")};b.v.prototype.rewriteTemplate=function(a,b,c){a=this.makeTemplateSource(a,c);b=b(a.text());a.text(b);a.data("isRewritten",m)};b.b("templateEngine",b.v);var qa=/(<[a-z]+\d*(\s+(?!data-bind=)[a-z0-9\-]+(=(\"[^\"]*\"|\'[^\']*\'))?)*\s+)data-bind=(["'])([\s\S]*?)\5/gi,ra=/\x3c!--\s*ko\b\s*([\s\S]*?)\s*--\x3e/g;b.za={vb:function(a,
+d,c){d.isTemplateRewritten(a,c)||d.rewriteTemplate(a,function(a){return b.za.Gb(a,d)},c)},Gb:function(a,b){return a.replace(qa,function(a,e,f,g,h,k,l){return W(l,e,b)}).replace(ra,function(a,e){return W(e,"\x3c!-- ko --\x3e",b)})},kb:function(a){return b.s.ra(function(d,c){d.nextSibling&&b.Fa(d.nextSibling,a,c)})}};b.b("__tr_ambtns",b.za.kb);b.l={};b.l.h=function(a){this.h=a};b.l.h.prototype.text=function(){var a=b.a.u(this.h),a="script"===a?"text":"textarea"===a?"value":"innerHTML";if(0==arguments.length)return this.h[a];
+var d=arguments[0];"innerHTML"===a?b.a.ca(this.h,d):this.h[a]=d};b.l.h.prototype.data=function(a){if(1===arguments.length)return b.a.f.get(this.h,"templateSourceData_"+a);b.a.f.set(this.h,"templateSourceData_"+a,arguments[1])};b.l.O=function(a){this.h=a};b.l.O.prototype=new b.l.h;b.l.O.prototype.text=function(){if(0==arguments.length){var a=b.a.f.get(this.h,"__ko_anon_template__")||{};a.Aa===I&&a.ia&&(a.Aa=a.ia.innerHTML);return a.Aa}b.a.f.set(this.h,"__ko_anon_template__",{Aa:arguments[0]})};b.l.h.prototype.nodes=
+function(){if(0==arguments.length)return(b.a.f.get(this.h,"__ko_anon_template__")||{}).ia;b.a.f.set(this.h,"__ko_anon_template__",{ia:arguments[0]})};b.b("templateSources",b.l);b.b("templateSources.domElement",b.l.h);b.b("templateSources.anonymousTemplate",b.l.O);var O;b.wa=function(a){a!=I&&!(a instanceof b.v)&&j(Error("templateEngine must inherit from ko.templateEngine"));O=a};b.va=function(a,d,c,e,f){c=c||{};(c.templateEngine||O)==I&&j(Error("Set a template engine before calling renderTemplate"));
+f=f||"replaceChildren";if(e){var g=N(e);return b.j(function(){var h=d&&d instanceof b.z?d:new b.z(b.a.d(d)),k="function"==typeof a?a(h.$data,h):a,h=T(e,f,k,h,c);"replaceNode"==f&&(e=h,g=N(e))},p,{Ka:function(){return!g||!b.a.X(g)},W:g&&"replaceNode"==f?g.parentNode:g})}return b.s.ra(function(e){b.va(a,d,c,e,"replaceNode")})};b.Mb=function(a,d,c,e,f){function g(a,b){U(b,k);c.afterRender&&c.afterRender(b,a)}function h(d,e){k=f.createChildContext(b.a.d(d),c.as);k.$index=e;var g="function"==typeof a?
+a(d,k):a;return T(p,"ignoreTargetNode",g,k,c)}var k;return b.j(function(){var a=b.a.d(d)||[];"undefined"==typeof a.length&&(a=[a]);a=b.a.fa(a,function(a){return c.includeDestroyed||a===I||a===p||!b.a.d(a._destroy)});b.r.K(b.a.$a,p,[e,a,h,c,g])},p,{W:e})};b.c.template={init:function(a,d){var c=b.a.d(d());if("string"!=typeof c&&!c.name&&(1==a.nodeType||8==a.nodeType))c=1==a.nodeType?a.childNodes:b.e.childNodes(a),c=b.a.Hb(c),(new b.l.O(a)).nodes(c);return{controlsDescendantBindings:m}},update:function(a,
+d,c,e,f){d=b.a.d(d());c={};e=m;var g,h=p;"string"!=typeof d&&(c=d,d=c.name,"if"in c&&(e=b.a.d(c["if"])),e&&"ifnot"in c&&(e=!b.a.d(c.ifnot)),g=b.a.d(c.data));"foreach"in c?h=b.Mb(d||a,e&&c.foreach||[],c,a,f):e?(f="data"in c?f.createChildContext(g,c.as):f,h=b.va(d||a,f,c,a)):b.e.Y(a);f=h;(g=b.a.f.get(a,"__ko__templateComputedDomDataKey__"))&&"function"==typeof g.B&&g.B();b.a.f.set(a,"__ko__templateComputedDomDataKey__",f&&f.pa()?f:I)}};b.g.Q.template=function(a){a=b.g.aa(a);return 1==a.length&&a[0].unknown||
+b.g.Eb(a,"name")?p:"This template engine does not support anonymous templates nested within its templates"};b.e.I.template=m;b.b("setTemplateEngine",b.wa);b.b("renderTemplate",b.va);b.a.Ja=function(a,b,c){a=a||[];b=b||[];return a.length<=b.length?S(a,b,"added","deleted",c):S(b,a,"deleted","added",c)};b.b("utils.compareArrays",b.a.Ja);b.a.$a=function(a,d,c,e,f){function g(a,b){t=l[b];w!==b&&(z[a]=t);t.na(w++);M(t.M);s.push(t);A.push(t)}function h(a,c){if(a)for(var d=0,e=c.length;d<e;d++)c[d]&&b.a.o(c[d].M,
+function(b){a(b,d,c[d].U)})}d=d||[];e=e||{};var k=b.a.f.get(a,"setDomNodeChildrenFromArrayMapping_lastMappingResult")===I,l=b.a.f.get(a,"setDomNodeChildrenFromArrayMapping_lastMappingResult")||[],n=b.a.V(l,function(a){return a.U}),q=b.a.Ja(n,d),s=[],v=0,w=0,B=[],A=[];d=[];for(var z=[],n=[],t,D=0,C,E;C=q[D];D++)switch(E=C.moved,C.status){case "deleted":E===I&&(t=l[v],t.j&&t.j.B(),B.push.apply(B,M(t.M)),e.beforeRemove&&(d[D]=t,A.push(t)));v++;break;case "retained":g(D,v++);break;case "added":E!==I?
+g(D,E):(t={U:C.value,na:b.m(w++)},s.push(t),A.push(t),k||(n[D]=t))}h(e.beforeMove,z);b.a.o(B,e.beforeRemove?b.A:b.removeNode);for(var D=0,k=b.e.firstChild(a),H;t=A[D];D++){t.M||b.a.extend(t,ha(a,c,t.U,f,t.na));for(v=0;q=t.M[v];k=q.nextSibling,H=q,v++)q!==k&&b.e.Pa(a,q,H);!t.Ab&&f&&(f(t.U,t.M,t.na),t.Ab=m)}h(e.beforeRemove,d);h(e.afterMove,z);h(e.afterAdd,n);b.a.f.set(a,"setDomNodeChildrenFromArrayMapping_lastMappingResult",s)};b.b("utils.setDomNodeChildrenFromArrayMapping",b.a.$a);b.C=function(){this.allowTemplateRewriting=
+r};b.C.prototype=new b.v;b.C.prototype.renderTemplateSource=function(a){var d=!(9>b.a.Z)&&a.nodes?a.nodes():p;if(d)return b.a.L(d.cloneNode(m).childNodes);a=a.text();return b.a.ta(a)};b.C.oa=new b.C;b.wa(b.C.oa);b.b("nativeTemplateEngine",b.C);b.qa=function(){var a=this.Db=function(){if("undefined"==typeof F||!F.tmpl)return 0;try{if(0<=F.tmpl.tag.tmpl.open.toString().indexOf("__"))return 2}catch(a){}return 1}();this.renderTemplateSource=function(b,c,e){e=e||{};2>a&&j(Error("Your version of jQuery.tmpl is too old. Please upgrade to jQuery.tmpl 1.0.0pre or later."));
+var f=b.data("precompiled");f||(f=b.text()||"",f=F.template(p,"{{ko_with $item.koBindingContext}}"+f+"{{/ko_with}}"),b.data("precompiled",f));b=[c.$data];c=F.extend({koBindingContext:c},e.templateOptions);c=F.tmpl(f,b,c);c.appendTo(y.createElement("div"));F.fragments={};return c};this.createJavaScriptEvaluatorBlock=function(a){return"{{ko_code ((function() { return "+a+" })()) }}"};this.addTemplate=function(a,b){y.write("<script type='text/html' id='"+a+"'>"+b+"\x3c/script>")};0<a&&(F.tmpl.tag.ko_code=
+{open:"__.push($1 || '');"},F.tmpl.tag.ko_with={open:"with($1) {",close:"} "})};b.qa.prototype=new b.v;w=new b.qa;0<w.Db&&b.wa(w);b.b("jqueryTmplTemplateEngine",b.qa)}"function"===typeof require&&"object"===typeof exports&&"object"===typeof module?L(module.exports||exports):"function"===typeof define&&define.amd?define(["exports"],L):L(x.ko={});m;
+})();
diff --git a/view/theme/oldtest/style.css b/view/theme/oldtest/style.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/view/theme/oldtest/theme.php b/view/theme/oldtest/theme.php
new file mode 100644
index 0000000000..1f1beab623
--- /dev/null
+++ b/view/theme/oldtest/theme.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Name: Test
+ * Description: Test theme
+ * 
+ */
+ 
+ require_once 'object/TemplateEngine.php';
+ 
+ 
+ function test_init(&$a){
+ 	#$a->theme_info = array();
+	$a->register_template_engine("JSONIficator");
+	$a->set_template_engine('jsonificator');
+ }
+
+
+ 
+ class JSONIficator implements ITemplateEngine {
+ 	static $name = 'jsonificator';
+	
+	public $data = array();
+	private $last_template;
+	
+	public function replace_macros($s,$v){
+		$dbg = debug_backtrace();
+		$cntx = $dbg[2]['function'];
+		if ($cntx=="") {
+			$cntx=basename($dbg[1]['file']);
+		}
+		if (!isset($this->data[$cntx])) {
+			$this->data[$cntx] = array();
+		}
+		$nv = array();
+		foreach ($v as $key => $value) {
+			$nkey = $key;
+			if ($key[0]==="$") $nkey = substr($key, 1);
+			$nv[$nkey] = $value;
+		}
+		$this->data[$cntx][] = $nv;
+	}
+	public function get_template_file($file, $root=''){
+		return  "";
+	}
+	
+ }
diff --git a/view/theme/quattro/templates/birthdays_reminder.tpl b/view/theme/quattro/templates/birthdays_reminder.tpl
new file mode 100644
index 0000000000..f951fc97a8
--- /dev/null
+++ b/view/theme/quattro/templates/birthdays_reminder.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
diff --git a/view/theme/quattro/templates/comment_item.tpl b/view/theme/quattro/templates/comment_item.tpl
new file mode 100644
index 0000000000..eca1f14f40
--- /dev/null
+++ b/view/theme/quattro/templates/comment_item.tpl
@@ -0,0 +1,68 @@
+{{*
+ *	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}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<ul id="comment-edit-bb-{{$id}}"
+					class="comment-edit-bb">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<textarea id="comment-edit-text-{{$id}}" 
+					class="comment-edit-text-empty" 
+					name="body" 
+					onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});" 
+					onBlur="commentClose(this,{{$id}}) && cmtBbClose({{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
+					</select>
+				{{/if}}
+
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+			</form>
+
+		</div>
diff --git a/view/theme/quattro/templates/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl
new file mode 100644
index 0000000000..c74a513b8f
--- /dev/null
+++ b/view/theme/quattro/templates/contact_template.tpl
@@ -0,0 +1,37 @@
+{{*
+ *	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" >
+		<div class="contact-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
+
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
+
+			{{if $contact.photo_menu}}
+			<a href="#" rel="#contact-photo-menu-{{$contact.id}}" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-{{$contact.id}}">menu</a>
+			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-{{$contact.id}}">
+				{{foreach $contact.photo_menu as $c}}
+				{{if $c.2}}
+				<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+				{{else}}
+				<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+				{{/if}}
+				{{/foreach}}
+			</ul>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+	{{if $contact.alt_text}}<div class="contact-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	<div class="contact-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>
+	<div class="contact-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+
+</div>
+
diff --git a/view/theme/quattro/templates/conversation.tpl b/view/theme/quattro/templates/conversation.tpl
new file mode 100644
index 0000000000..4e3553894b
--- /dev/null
+++ b/view/theme/quattro/templates/conversation.tpl
@@ -0,0 +1,54 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
+	{{foreach $thread.items as $item}}
+        {{if $mode == display}}
+        {{else}}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
+			</div>
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
+        {{/if}}
+        
+		{{if $item.type == tag}}
+			{{include file="wall_item_tag.tpl"}}
+		{{else}}
+			{{include file="{{$item.template}}"}}
+		{{/if}}
+		
+	{{/foreach}}
+</div>
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<a href="#" onclick="deleteCheckedItems();return false;">
+	<span class="icon s22 delete text">{{$dropping}}</span>
+</a>
+{{/if}}
+
+<script>
+// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
+    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
+    var colWhite = {backgroundColor:'#EFF0F1'};
+    var colShiny = {backgroundColor:'#FCE94F'};
+</script>
+
+{{if $mode == display}}
+<script>
+    var id = window.location.pathname.split("/").pop();
+    $(window).scrollTop($('#item-'+id).position().top);
+    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
+</script>
+{{/if}}
+
diff --git a/view/theme/quattro/templates/events_reminder.tpl b/view/theme/quattro/templates/events_reminder.tpl
new file mode 100644
index 0000000000..b188bd4a37
--- /dev/null
+++ b/view/theme/quattro/templates/events_reminder.tpl
@@ -0,0 +1,44 @@
+{{*
+ *	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>
+<script>
+	// start calendar from yesterday
+	var yesterday= new Date()
+	yesterday.setDate(yesterday.getDate()-1)
+	
+	function showEvent(eventid) {
+		$.get(
+			'{{$baseurl}}/events/?id='+eventid,
+			function(data){
+				$.colorbox({html:data});
+			}
+		);			
+	}
+	$(document).ready(function() {
+		$('#events-reminder').fullCalendar({
+			firstDay: yesterday.getDay(),
+			year: yesterday.getFullYear(),
+			month: yesterday.getMonth(),
+			date: yesterday.getDate(),
+			events: '{{$baseurl}}/events/json/',
+			header: {
+				left: '',
+				center: '',
+				right: ''
+			},			
+			timeFormat: 'H(:mm)',
+			defaultView: 'basicWeek',
+			height: 50,
+			eventClick: function(calEvent, jsEvent, view) {
+				showEvent(calEvent.id);
+			}
+		});
+	});
+</script>
+<div id="events-reminder"></div>
+<br>
diff --git a/view/theme/quattro/templates/fileas_widget.tpl b/view/theme/quattro/templates/fileas_widget.tpl
new file mode 100644
index 0000000000..555ac5feb3
--- /dev/null
+++ b/view/theme/quattro/templates/fileas_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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>
+	
+	<ul class="fileas-ul">
+		<li class="tool {{if $sel_all}}selected{{/if}}"><a href="{{$base}}" class="fileas-link fileas-all">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+			<li class="tool {{if $term.selected}}selected{{/if}}"><a href="{{$base}}?f=&file={{$term.name}}" class="fileas-link">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/quattro/templates/generic_links_widget.tpl b/view/theme/quattro/templates/generic_links_widget.tpl
new file mode 100644
index 0000000000..802563255c
--- /dev/null
+++ b/view/theme/quattro/templates/generic_links_widget.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	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}}
+	
+	<ul>
+		{{foreach $items as $item}}
+			<li class="tool {{if $item.selected}}selected{{/if}}"><a href="{{$item.url}}" class="link">{{$item.label}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/quattro/templates/group_side.tpl b/view/theme/quattro/templates/group_side.tpl
new file mode 100644
index 0000000000..b71f1f1e2f
--- /dev/null
+++ b/view/theme/quattro/templates/group_side.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	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>
+		<a href="group/new" title="{{$createtext}}" class="action"><span class="icon text s16 add"> {{$add}}</span></a>
+	</div>
+
+	<div id="sidebar-group-list">
+		<ul>
+			{{foreach $groups as $group}}
+			<li class="tool  {{if $group.selected}}selected{{/if}}">
+				<a href="{{$group.href}}" class="label">
+					{{$group.text}}
+				</a>
+				{{if $group.edit}}
+					<a href="{{$group.edit.href}}" class="action"><span class="icon text s10 edit">{{$group.edit.title}}</span></a>
+				{{/if}}
+				{{if $group.cid}}
+					<input type="checkbox" 
+						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
+						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
+						{{if $group.ismember}}checked="checked"{{/if}}
+					/>
+				{{/if}}
+			</li>
+			{{/foreach}}
+		</ul>
+	</div>
+</div>	
+
diff --git a/view/theme/quattro/templates/jot.tpl b/view/theme/quattro/templates/jot.tpl
new file mode 100644
index 0000000000..f9f36a37db
--- /dev/null
+++ b/view/theme/quattro/templates/jot.tpl
@@ -0,0 +1,61 @@
+{{*
+ *	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>
+		<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" title="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none" />
+		{{if $placeholdercategory}}
+		<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" title="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" />
+		{{/if}}
+		<div id="character-counter" class="grey jothidden"></div>
+		
+
+
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+
+		<ul id="jot-tools" class="jothidden" style="display:none">
+			<li><a href="#" onclick="return false;" id="wall-image-upload" title="{{$upload}}">{{$shortupload}}</a></a></li>
+			<li><a href="#" onclick="return false;" id="wall-file-upload"  title="{{$attach}}">{{$shortattach}}</a></li>
+			<li><a id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="{{$weblink}}">{{$shortweblink}}</a></li>
+			<li><a id="profile-video" onclick="jotVideoURL();return false;" title="{{$video}}">{{$shortvideo}}</a></li>
+			<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="{{$audio}}">{{$shortaudio}}</a></li>
+			<!-- TODO: waiting for a better placement 
+			<li><a id="profile-location" onclick="jotGetLocation();return false;" title="{{$setloc}}">{{$shortsetloc}}</a></li>
+			<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="{{$noloc}}">{{$shortnoloc}}</a></li>
+			-->
+			<li><a id="jot-preview-link" onclick="preview_post(); return false;" title="{{$preview}}">{{$preview}}</a></li>
+			{{$jotplugins}}
+
+			<li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 {{$lockstate}} {{$bang}}"  title="{{$permset}}" ></a></li>
+			<li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" /></li>
+			<li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}"  /></li>
+		</ul>
+	</div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$acl}}
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			<div id="profile-jot-email-end"></div>
+			{{$jotnets}}
+		</div>
+	</div>
+
+</form>
+
+{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/quattro/templates/mail_conv.tpl b/view/theme/quattro/templates/mail_conv.tpl
new file mode 100644
index 0000000000..3ddc8e99f8
--- /dev/null
+++ b/view/theme/quattro/templates/mail_conv.tpl
@@ -0,0 +1,68 @@
+{{*
+ *	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">
+			<div class="contact-photo-wrapper"
+				<a href="{{$mail.profile_url}}" target="redir" title="{{$mail.from_name}}" class="contact-photo-link" id="wall-item-photo-link-{{$mail.id}}">
+					<img src="{{$mail.from_photo}}" class="contact-photo{{$mail.sparkle}}" id="wall-item-photo-{{$mail.id}}" alt="{{$mail.from_name}}" />
+				</a>
+			</div>
+		</div>
+		<div class="wall-item-content">
+			{{$mail.body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-actions-author">
+				<a href="{{$mail.from_url}}" target="redir"
+                                class="wall-item-name-link"><span
+                                class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name}}</span></a>
+                                <span class="wall-item-ago" title="{{$mail.date}}">{{$mail.ago}}</span>
+			</div>
+			
+			<div class="wall-item-actions-social">
+			</div>
+			
+			<div class="wall-item-actions-tools">
+				<a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$mail.delete}}">{{$mail.delete}}</a>
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+	</div>
+</div>
+
+
+{{*
+
+
+<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>
+	</div>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<div class="mail-conv-date">{{$mail.date}}</div>
+		<div class="mail-conv-subject">{{$mail.subject}}</div>
+		<div class="mail-conv-body">{{$mail.body}}</div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-outside-wrapper-end"></div>
+</div>
+</div>
+<hr class="mail-conv-break" />
+
+*}}
diff --git a/view/theme/quattro/templates/mail_display.tpl b/view/theme/quattro/templates/mail_display.tpl
new file mode 100644
index 0000000000..dc1fbbc6f5
--- /dev/null
+++ b/view/theme/quattro/templates/mail_display.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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}}
+	<div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
+		{{include file="mail_conv.tpl"}}
+	</div>
+{{/foreach}}
+
+{{include file="prv_message.tpl"}}
diff --git a/view/theme/quattro/templates/mail_list.tpl b/view/theme/quattro/templates/mail_list.tpl
new file mode 100644
index 0000000000..0090668740
--- /dev/null
+++ b/view/theme/quattro/templates/mail_list.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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>
+	<span class="mail-date" title="{{$date}}">{{$ago}}</span>
+	<span class="mail-count">{{$count}}</span>
+	
+	<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
+</div>
diff --git a/view/theme/quattro/templates/message_side.tpl b/view/theme/quattro/templates/message_side.tpl
new file mode 100644
index 0000000000..723b0b710c
--- /dev/null
+++ b/view/theme/quattro/templates/message_side.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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>
+	
+	<ul class="message-ul">
+		{{foreach $tabs as $t}}
+			<li class="tool {{if $t.sel}}selected{{/if}}"><a href="{{$t.url}}" class="message-link">{{$t.label}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
new file mode 100644
index 0000000000..2118c1e348
--- /dev/null
+++ b/view/theme/quattro/templates/nav.tpl
@@ -0,0 +1,100 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<header>
+	{{* {{$langselector}} *}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+	<div id="banner">{{$banner}}</div>
+</header>
+<nav>
+	<ul>
+		{{if $userinfo}}
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
+				<ul id="nav-user-menu" class="menu-popup">
+					{{foreach $nav.usermenu as $usermenu}}
+						<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
+					{{/foreach}}
+					
+					{{if $nav.notifications}}<li><a class="{{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a></li>{{/if}}
+					{{if $nav.messages}}<li><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a></li>{{/if}}
+					{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}	
+				</ul>
+			</li>
+		{{/if}}
+		
+		{{if $nav.community}}
+			<li id="nav-community-link" class="nav-menu {{$sel.community}}">
+				<a class="{{$nav.community.2}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+			</li>
+		{{/if}}
+		
+		{{if $nav.network}}
+			<li id="nav-network-link" class="nav-menu {{$sel.network}}">
+				<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+				<span id="net-update" class="nav-notify"></span>
+			</li>
+		{{/if}}
+		{{if $nav.home}}
+			<li id="nav-home-link" class="nav-menu {{$sel.home}}">
+				<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+				<span id="home-update" class="nav-notify"></span>
+			</li>
+		{{/if}}
+		
+		{{if $nav.notifications}}
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a>
+				<span id="notify-update" class="nav-notify"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<!-- TODO: better icons! -->
+					<li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="{{$nav.notifications.mark.1}}"><span class="icon s10 edit"></span></a></a><a href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.all.1}}"><span class="icon s10 plugin"></span></a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+			</li>		
+		{{/if}}		
+		
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+			<ul id="nav-site-menu" class="menu-popup">
+				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}				
+
+				{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
+				{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
+
+				{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
+				{{if $nav.login}}<li><a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
+			</ul>		
+		</li>
+		
+		{{if $nav.help}} 
+		<li id="nav-help-link" class="nav-menu {{$sel.help}}">
+			<a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
+		</li>
+		{{/if}}
+
+		<li id="nav-search-link" class="nav-menu {{$sel.search}}">
+			<a class="{{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+		</li>
+		<li id="nav-directory-link" class="nav-menu {{$sel.directory}}">
+			<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+		</li>
+		
+		{{if $nav.apps}}
+			<li id="nav-apps-link" class="nav-menu {{$sel.apps}}">
+				<a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>
+				<ul id="nav-apps-menu" class="menu-popup">
+					{{foreach $apps as $ap}}
+					<li>{{$ap}}</li>
+					{{/foreach}}
+				</ul>
+			</li>
+		{{/if}}
+	</ul>
+
+</nav>
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+<div style="position: fixed; top: 3px; left: 5px; z-index:9999">{{$langselector}}</div>
diff --git a/view/theme/quattro/templates/nets.tpl b/view/theme/quattro/templates/nets.tpl
new file mode 100644
index 0000000000..dfe133251f
--- /dev/null
+++ b/view/theme/quattro/templates/nets.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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>
+	
+	<ul class="nets-ul">
+		<li class="tool {{if $sel_all}}selected{{/if}}"><a href="{{$base}}?nets=all" class="nets-link nets-all">{{$all}}</a>
+		{{foreach $nets as $net}}
+			<li class="tool {{if $net.selected}}selected{{/if}}"><a href="{{$base}}?f=&nets={{$net.ref}}" class="nets-link">{{$net.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/quattro/templates/photo_view.tpl b/view/theme/quattro/templates/photo_view.tpl
new file mode 100644
index 0000000000..38b3b5216e
--- /dev/null
+++ b/view/theme/quattro/templates/photo_view.tpl
@@ -0,0 +1,42 @@
+{{*
+ *	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>
+
+<div id="photo-edit-link-wrap">
+{{if $tools}}
+<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
+|
+<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
+{{/if}}
+{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
+</div>
+
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
+{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
+<div id="photo-caption">{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
+
+{{if $edit}}{{$edit}}{{/if}}
+
+{{if $likebuttons}}
+<div id="photo-like-div">
+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
+</div>
+{{/if}}
+<div class="wall-item-comment-wrapper">
+    {{$comments}}
+</div>
+
+{{$paginate}}
+
diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
new file mode 100644
index 0000000000..4b1ddb6e6e
--- /dev/null
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -0,0 +1,73 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="tool">
+		<div class="fn label">{{$profile.name}}</div>
+		{{if $profile.edit}}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{foreach $profile.menu.entries as $e}}
+				<li>
+					<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
+				</li>
+				{{/foreach}}
+				<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
+				<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
+				
+			</ul>
+			</div>
+		{{/if}}
+	</div>
+
+
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
+
+
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt
+        class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a
+        href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/quattro/templates/prv_message.tpl b/view/theme/quattro/templates/prv_message.tpl
new file mode 100644
index 0000000000..26b14d6e0e
--- /dev/null
+++ b/view/theme/quattro/templates/prv_message.tpl
@@ -0,0 +1,43 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h3>{{$header}}</h3>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="message" method="post" >
+
+{{$parent}}
+
+<div id="prvmail-to-label">{{$to}}</div>
+{{if $showinputs}}
+<input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+{{else}}
+{{$select}}
+{{/if}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="20" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
+	<div id="prvmail-upload-wrapper" >
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	</div> 
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/theme/quattro/templates/saved_searches_aside.tpl b/view/theme/quattro/templates/saved_searches_aside.tpl
new file mode 100644
index 0000000000..6ff59afae4
--- /dev/null
+++ b/view/theme/quattro/templates/saved_searches_aside.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="saved-search-list" class="widget">
+	<h3 class="title">{{$title}}</h3>
+
+	<ul id="saved-search-ul">
+		{{foreach $saved as $search}}
+			<li class="tool {{if $search.selected}}selected{{/if}}">
+					<a href="network/?f=&search={{$search.encodedterm}}" class="label" >{{$search.term}}</a>
+					<a href="network/?f=&remove=1&search={{$search.encodedterm}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a>
+			</li>
+		{{/foreach}}
+	</ul>
+	
+	{{$searchbox}}
+	
+</div>
diff --git a/view/theme/quattro/templates/search_item.tpl b/view/theme/quattro/templates/search_item.tpl
new file mode 100644
index 0000000000..a5dafa643c
--- /dev/null
+++ b/view/theme/quattro/templates/search_item.tpl
@@ -0,0 +1,98 @@
+{{*
+ *	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>
+	{{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}	
+	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+</div>
+
+<div class="wall-item-container {{$item.indent}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>
+			<div class="wall-item-location">{{$item.location}}</div>	
+		</div>
+		<div class="wall-item-content">
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
+			{{$item.body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $item.tags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+			{{if $item.plink}}<a class="icon s16 link" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-actions-author">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> <span class="wall-item-ago" title="{{$item.localtime}}">{{$item.ago}}</span>
+			</div>
+			
+			<div class="wall-item-actions-social">
+			{{if $item.star}}
+				<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
+				<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
+				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger}}">{{$item.star.tagger}}</a>
+			{{/if}}
+			
+			{{if $item.vote}}
+				<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+				<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
+			{{/if}}
+						
+			{{if $item.vote.share}}
+				<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
+			{{/if}}			
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+				{{/if}}
+				{{if $item.edpost}}
+					<a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+				{{/if}}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+		{{if $item.conv}}
+		<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+		{{/if}}
+		</div>
+	</div>
+	
+	
+</div>
+
diff --git a/view/theme/quattro/templates/theme_settings.tpl b/view/theme/quattro/templates/theme_settings.tpl
new file mode 100644
index 0000000000..5df1e99ede
--- /dev/null
+++ b/view/theme/quattro/templates/theme_settings.tpl
@@ -0,0 +1,37 @@
+{{*
+ *	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}}
+
+{{include file="field_select.tpl" field=$align}}
+
+
+<div class="field">
+    <label for="id_{{$pfs.0}}">{{$pfs.1}}</label>
+    <input type="range" class="inputRange" id="id_{{$pfs.0}}" name="{{$pfs.0}}" value="{{$pfs.2}}" min="10" max="22" step="1"  />
+    <span class="field_help"></span>
+</div>
+
+
+<div class="field">
+    <label for="id_{{$tfs.0}}">{{$tfs.1}}</label>
+    <input type="range" class="inputRange" id="id_{{$tfs.0}}" name="{{$tfs.0}}" value="{{$tfs.2}}" min="10" max="22" step="1"  />
+    <span class="field_help"></span>
+</div>
+
+
+
+
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="quattro-settings-submit" />
+</div>
+
+<script>
+    
+    $(".inputRange").rangeinput();
+</script>
diff --git a/view/theme/quattro/templates/threaded_conversation.tpl b/view/theme/quattro/templates/threaded_conversation.tpl
new file mode 100644
index 0000000000..dc3e918f61
--- /dev/null
+++ b/view/theme/quattro/templates/threaded_conversation.tpl
@@ -0,0 +1,45 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}}  {{$thread.toplevel}}">
+       
+       
+		{{if $thread.type == tag}}
+			{{include file="wall_item_tag.tpl" item=$thread}}
+		{{else}}
+			{{include file="{{$thread.template}}" item=$thread}}
+		{{/if}}
+		
+</div>
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;">
+	<span class="icon s22 delete text">{{$dropping}}</span>
+</a>
+<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+{{/if}}
+
+<script>
+// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
+    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
+    var colWhite = {backgroundColor:'#EFF0F1'};
+    var colShiny = {backgroundColor:'#FCE94F'};
+</script>
+
+{{if $mode == display}}
+<script>
+    var id = window.location.pathname.split("/").pop();
+    $(window).scrollTop($('#item-'+id).position().top);
+    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
+</script>
+{{/if}}
+
diff --git a/view/theme/quattro/templates/wall_item_tag.tpl b/view/theme/quattro/templates/wall_item_tag.tpl
new file mode 100644
index 0000000000..1e658883c7
--- /dev/null
+++ b/view/theme/quattro/templates/wall_item_tag.tpl
@@ -0,0 +1,72 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $mode == display}}
+{{else}}
+{{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>
+			{{if $item.thread_level==3}} - 
+			<span id="hide-thread-{{$item}}-id"
+				class="fakelink"
+				onclick="showThread({{$item.id}});">expand</span> /
+			<span id="hide-thread-{{$item}}-id"
+				class="fakelink"
+				onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}}
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+{{/if}}
+
+{{if $item.thread_level!=1}}<div class="children">{{/if}}
+
+
+<div class="wall-item-container item-tag {{$item.indent}} {{$item.shiny}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>
+			<div class="wall-item-location">{{$item.location}}</div>	
+		</div>
+		<div class="wall-item-content">
+			{{$item.ago}} {{$item.body}} 
+		</div>
+			<div class="wall-item-tools">
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+				{{/if}}
+			</div>
+	</div>
+</div>
+
+{{if $item.thread_level!=1}}</div>{{/if}}
+
+{{if $mode == display}}
+{{else}}
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
+{{/if}}
+
+{{* top thread comment box *}}
+{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+{{/if}}{{/if}}{{/if}}
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+{{/if}}
diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl
new file mode 100644
index 0000000000..805ddfaaa9
--- /dev/null
+++ b/view/theme/quattro/templates/wall_thread.tpl
@@ -0,0 +1,177 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $mode == display}}
+{{else}}
+{{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>
+			{{if $item.thread_level==3}} - 
+			<span id="hide-thread-{{$item}}-id"
+				class="fakelink"
+				onclick="showThread({{$item.id}});">expand</span> /
+			<span id="hide-thread-{{$item}}-id"
+				class="fakelink"
+				onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}}
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+{{/if}}
+
+{{if $item.thread_level!=1}}<div class="children">{{/if}}
+
+<div class="wall-item-decor">
+	<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
+	{{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}	
+	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+</div>
+
+<div class="wall-item-container {{$item.indent}} {{$item.shiny}}" id="item-{{$item.id}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}"
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>	
+			{{if $item.owner_url}}
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+					<img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
+				</a>
+			</div>
+			{{/if}}			
+			<div class="wall-item-location">{{$item.location}}</div>	
+		</div>
+		<div class="wall-item-content">
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h2>{{/if}}
+			{{$item.body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $item.hashtags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+  			{{foreach $item.mentions as $tag}}
+				<span class='mention'>{{$tag}}</span>
+			{{/foreach}}
+               {{foreach $item.folders as $cat}}
+                    <span class='folder'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+               {{/foreach}}
+                {{foreach $item.categories as $cat}}
+                    <span class='category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                {{/foreach}}
+		</div>
+	</div>	
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+			{{if $item.plink}}<a class="icon s16 link{{$item.sparkle}}" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-actions-author">
+				<a href="{{$item.profile_url}}" target="redir"
+                                title="{{$item.linktitle}}"
+                                class="wall-item-name-link"><span
+                                class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
+                                <span class="wall-item-ago" title="{{$item.localtime}}">{{$item.ago}}</span>
+				 {{if $item.owner_url}}<br/>{{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}
+				 {{/if}}
+			</div>
+			
+			<div class="wall-item-actions-social">
+			{{if $item.star}}
+				<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
+				<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
+			{{/if}}
+			{{if $item.tagger}}
+				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}">{{$item.tagger.add}}</a>
+			{{/if}}
+			{{if $item.filer}}
+                                <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}">{{$item.filer}}</a>
+			{{/if}}			
+			
+			{{if $item.vote}}
+				<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+				{{if $item.vote.dislike}}
+				<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
+				{{/if}}
+			{{/if}}
+						
+			{{if $item.vote.share}}
+				<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
+			{{/if}}			
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+				{{/if}}
+				{{if $item.edpost}}
+					<a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+				{{/if}}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
+	</div>
+	
+	{{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}}
+	<div class="wall-item-bottom commentbox">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-comment-wrapper">
+					{{$item.comment}}
+		</div>
+	</div>
+	{{/if}}{{/if}}{{/if}}
+</div>
+
+
+{{foreach $item.children as $child}}
+	{{if $child.type == tag}}
+		{{include file="wall_item_tag.tpl" item=$child}}
+	{{else}}
+		{{include file="{{$item.template}}" item=$child}}
+	{{/if}}
+{{/foreach}}
+
+{{if $item.thread_level!=1}}</div>{{/if}}
+
+
+{{if $mode == display}}
+{{else}}
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
+{{/if}}
+
+{{* top thread comment box *}}
+{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+{{/if}}{{/if}}{{/if}}
+
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+{{/if}}
diff --git a/view/theme/slackr/templates/birthdays_reminder.tpl b/view/theme/slackr/templates/birthdays_reminder.tpl
new file mode 100644
index 0000000000..8af03b33a8
--- /dev/null
+++ b/view/theme/slackr/templates/birthdays_reminder.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $classtoday}}
+<script>
+	$(document).ready(function() {{$lbr}}
+		$('#events-reminder').addClass($.trim('{{$classtoday}}'));
+	{{$rbr}});
+</script>
+{{/if}}
+
diff --git a/view/theme/slackr/templates/events_reminder.tpl b/view/theme/slackr/templates/events_reminder.tpl
new file mode 100644
index 0000000000..0f699a3022
--- /dev/null
+++ b/view/theme/slackr/templates/events_reminder.tpl
@@ -0,0 +1,44 @@
+{{*
+ *	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>
+<script>
+	// start calendar from yesterday
+	var yesterday= new Date()
+	yesterday.setDate(yesterday.getDate()-1)
+	
+	function showEvent(eventid) {
+		$.get(
+			'{{$baseurl}}/events/?id='+eventid,
+			function(data){
+				$.colorbox({html:data});
+			}
+		);			
+	}
+	$(document).ready(function() {
+		$('#events-reminder').fullCalendar({
+			firstDay: yesterday.getDay(),
+			year: yesterday.getFullYear(),
+			month: yesterday.getMonth(),
+			date: yesterday.getDate(),
+			events: '{{$baseurl}}/events/json/',
+			header: {
+				left: '',
+				center: '',
+				right: ''
+			},			
+			timeFormat: 'HH(:mm)',
+			defaultView: 'basicWeek',
+			height: 50,
+			eventClick: function(calEvent, jsEvent, view) {
+				showEvent(calEvent.id);
+			}
+		});
+	});
+</script>
+<div id="events-reminder" class="{{$classtoday}}"></div>
+<br>
diff --git a/view/theme/smoothly/templates/bottom.tpl b/view/theme/smoothly/templates/bottom.tpl
new file mode 100644
index 0000000000..0c6aa29040
--- /dev/null
+++ b/view/theme/smoothly/templates/bottom.tpl
@@ -0,0 +1,57 @@
+{{*
+ *	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() {
+
+});
+function tautogrow(id) {
+$("textarea#comment-edit-text-" + id).autogrow();
+};
+
+function insertFormatting(comment, BBcode, id) {
+var tmpStr = $("#comment-edit-text-" + id).val();
+if(tmpStr == comment) {
+tmpStr = "";
+$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+openMenu("comment-edit-submit-wrapper-" + id);
+}
+textarea = document.getElementById("comment-edit-text-" + id);
+if (document.selection) {
+textarea.focus();
+selected = document.selection.createRange();
+if (BBcode == "url") {
+selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
+} else {
+selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+}
+} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+var start = textarea.selectionStart;
+var end = textarea.selectionEnd;
+if (BBcode == "url") {
+textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
++ "http://" + textarea.value.substring(start, end)
++ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+} else {
+textarea.value = textarea.value.substring(0, start)
++ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
++ textarea.value.substring(end, textarea.value.length);
+}
+}
+return true;
+}
+
+function cmtBbOpen(id) {
+$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+    $(".comment-edit-bb-" + id).hide();
+}
+
+
+
+</script>
diff --git a/view/theme/smoothly/templates/follow.tpl b/view/theme/smoothly/templates/follow.tpl
new file mode 100644
index 0000000000..4d9e2a62b8
--- /dev/null
+++ b/view/theme/smoothly/templates/follow.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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>
+	<form action="follow" method="post" >
+		<input id="side-follow-url" type="text-sidebar" name="url" size="24" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
+	</form>
+</div>
+
diff --git a/view/theme/smoothly/templates/jot-header.tpl b/view/theme/smoothly/templates/jot-header.tpl
new file mode 100644
index 0000000000..0560969a6e
--- /dev/null
+++ b/view/theme/smoothly/templates/jot-header.tpl
@@ -0,0 +1,379 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+
+var editor=false;
+var textlen = 0;
+var plaintext = '{{$editselect}}';
+
+function initEditor(cb){
+	if (editor==false){
+		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
+            		$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+            		$(".jothidden").show();
+            		editor = true;
+            		$("a#jot-perms-icon").colorbox({
+						'inline' : true,
+						'transition' : 'elastic'
+            		});
+	                            $("#profile-jot-submit-wrapper").show();
+								{{if $newpost}}
+    	                            $("#profile-upload-wrapper").show();
+        	                        $("#profile-attach-wrapper").show();
+            	                    $("#profile-link-wrapper").show();
+                	                $("#profile-video-wrapper").show();
+                    	            $("#profile-audio-wrapper").show();
+                        	        $("#profile-location-wrapper").show();
+                            	    $("#profile-nolocation-wrapper").show();
+                                	$("#profile-title-wrapper").show();
+	                                $("#profile-jot-plugin-wrapper").show();
+	                                $("#jot-preview-link").show();
+								{{/if}}   
+
+
+			if (typeof cb!="undefined") cb();
+			return;
+        }
+        tinyMCE.init({
+                theme : "advanced",
+                mode : "specific_textareas",
+                editor_selector: /(profile-jot-text|prvmail-text)/,
+                plugins : "bbcode,paste,fullscreen,autoresize",
+                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
+                theme_advanced_buttons2 : "",
+                theme_advanced_buttons3 : "",
+                theme_advanced_toolbar_location : "top",
+                theme_advanced_toolbar_align : "center",
+                theme_advanced_blockformats : "blockquote,code",
+                //theme_advanced_resizing : true,
+                //theme_advanced_statusbar_location : "bottom",
+                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 : 'div',
+                convert_urls: false,
+                content_css: "{{$baseurl}}/view/custom_tinymce.css",
+                theme_advanced_path : false,
+                setup : function(ed) {
+					cPopup = null;
+					ed.onKeyDown.add(function(ed,e) {
+						if(cPopup !== null)
+							cPopup.onkey(e);
+					});
+
+
+
+					ed.onKeyUp.add(function(ed, e) {
+						var txt = tinyMCE.activeEditor.getContent();
+						match = txt.match(/@([^ \n]+)$/);
+						if(match!==null) {
+							if(cPopup === null) {
+								cPopup = new ACPopup(this,baseurl+"/acl");
+							}
+							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+							if(! cPopup.ready) cPopup = null;
+						}
+						else {
+							if(cPopup !== null) { cPopup.close(); cPopup = null; }
+						}
+
+						textlen = txt.length;
+						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+							$('#profile-jot-desc').html(ispublic);
+						}
+                        else {
+                            $('#profile-jot-desc').html('&nbsp;');
+                        }
+
+				//Character count
+
+                                if(textlen <= 140) {
+                                        $('#character-counter').removeClass('red');
+                                        $('#character-counter').removeClass('orange');
+                                        $('#character-counter').addClass('grey');
+                                }
+                                if((textlen > 140) && (textlen <= 420)) {
+                                        $('#character-counter').removeClass('grey');
+                                        $('#character-counter').removeClass('red');
+                                        $('#character-counter').addClass('orange');
+                                }
+                                if(textlen > 420) {
+                                        $('#character-counter').removeClass('grey');
+                                        $('#character-counter').removeClass('orange');
+                                        $('#character-counter').addClass('red');
+                                }
+                                $('#character-counter').text(textlen);
+                        });
+                        ed.onInit.add(function(ed) {
+                                ed.pasteAsPlainText = true;
+								$("#profile-jot-text-loading").hide();
+								$(".jothidden").show();
+	                            $("#profile-jot-submit-wrapper").show();
+								{{if $newpost}}
+    	                            $("#profile-upload-wrapper").show();
+        	                        $("#profile-attach-wrapper").show();
+            	                    $("#profile-link-wrapper").show();
+                	                $("#profile-video-wrapper").show();
+                    	            $("#profile-audio-wrapper").show();
+                        	        $("#profile-location-wrapper").show();
+                            	    $("#profile-nolocation-wrapper").show();
+                                	$("#profile-title-wrapper").show();
+	                                $("#profile-jot-plugin-wrapper").show();
+	                                $("#jot-preview-link").show();
+								{{/if}}   
+                             $("#character-counter").show();
+                                if (typeof cb!="undefined") cb();
+                        });
+                }
+        });
+        editor = true;
+        // setup acl popup
+        $("a#jot-perms-icon").colorbox({
+			'inline' : true,
+			'transition' : 'elastic'
+        }); 
+    } else {
+        if (typeof cb!="undefined") cb();
+    }
+} // initEditor
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
+</script>
+
+<script type="text/javascript" src="js/ajaxupload.js" >
+</script>
+
+<script>
+	var ispublic = '{{$ispublic}}';
+
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);		
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+				$('.profile-jot-net input').attr('disabled', 'disabled');
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+				$('.profile-jot-net input').attr('disabled', false);
+			}
+
+		}).trigger('change');
+
+	});
+
+	function deleteCheckedItems() {
+		if(confirm('{{$delitems}}')) {
+			var checkedstr = '';
+
+			$("#item-delete-selected").hide();
+			$('#item-delete-selected-rotator').show();
+
+			$('.item-select').each( function() {
+				if($(this).is(':checked')) {
+					if(checkedstr.length != 0) {
+						checkedstr = checkedstr + ',' + $(this).val();
+					}
+					else {
+						checkedstr = $(this).val();
+					}
+				}	
+			});
+			$.post('item', { dropitems: checkedstr }, function(data) {
+				window.location.reload();
+			});
+		}
+	}
+
+	function jotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				addeditortext(data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("{{$vidurl}}");
+		if(reply && reply.length) {
+			addeditortext('[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("{{$audurl}}");
+		if(reply && reply.length) {
+			addeditortext('[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("{{$whereareu}}", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotTitle() {
+		reply = prompt("{{$title}}", $('#jot-title').val());
+		if(reply && reply.length) {
+			$('#jot-title').val(reply);
+		}
+	}
+
+	function jotShare(id) {
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#like-rotator-' + id).hide();
+					$(window).scrollTop(0);
+				});
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}
+
+	function itemTag(id) {
+		reply = prompt("{{$term}}");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+	
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.colorbox({html:data});
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply, NavUpdate);
+//					if(timer) clearTimeout(timer);
+//					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.colorbox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+  function addeditortext(data) {
+        if(plaintext == 'none') {
+            var currentText = $("#profile-jot-text").val();
+            $("#profile-jot-text").val(currentText + data);
+        }
+        else
+            tinyMCE.execCommand('mceInsertRawHTML',false,data);
+    }
+
+
+	{{$geotag}}
+
+</script>
diff --git a/view/theme/smoothly/templates/jot.tpl b/view/theme/smoothly/templates/jot.tpl
new file mode 100644
index 0000000000..0fd09c1965
--- /dev/null
+++ b/view/theme/smoothly/templates/jot.tpl
@@ -0,0 +1,89 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" > 
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey" style="display: none;">0</div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap">
+			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none">
+		</div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap">
+			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" />
+		</div>
+		{{/if}}
+		<div id="jot-text-wrap">
+                	<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /><br>
+                	<textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" >
+			{{if $content}}{{$content}}{{else}}{{$share}}
+			{{/if}}
+			</textarea>
+		</div>
+
+	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
+		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="{{$upload}}"></a></div>
+	</div>
+	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="{{$attach}}"></a></div>
+	</div>  
+	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a href="#" id="profile-link" class="icon border  link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
+		<a href="#" id="profile-video" class="icon border  video" title="{{$video}}" onclick="jotVideoURL(); return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
+		<a href="#" id="profile-audio" class="icon border  audio" title="{{$audio}}" onclick="jotAudioURL(); return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
+		<a href="#" id="profile-location" class="icon border  globe" title="{{$setloc}}" onclick="jotGetLocation(); return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
+		<a href="#" id="profile-nolocation" class="icon border  noglobe" title="{{$noloc}}" onclick="jotClearLocation(); return false;"></a>
+	</div> 
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >{{$preview}}</span>
+
+	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
+		<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+		<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}} sharePerms" title="{{$permset}}"></a>{{$bang}}</div>
+	</div>
+
+	<div id="profile-jot-plugin-wrapper" style="display: none;">
+  	{{$jotplugins}}
+	</div>
+	<div id="profile-jot-tools-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+        <div style="display: none;">
+            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+                {{$acl}}
+                <hr style="clear:both"/>
+                <div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+                <div id="profile-jot-email-end"></div>
+                {{$jotnets}}
+            </div>
+        </div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+                {{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/smoothly/templates/lang_selector.tpl b/view/theme/smoothly/templates/lang_selector.tpl
new file mode 100644
index 0000000000..a1aee8277f
--- /dev/null
+++ b/view/theme/smoothly/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{foreach $langs.0 as $v=>$l}}
+				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
+			{{/foreach}}
+		</select>
+	</form>
+</div>
diff --git a/view/theme/smoothly/templates/nav.tpl b/view/theme/smoothly/templates/nav.tpl
new file mode 100644
index 0000000000..0bbca7e694
--- /dev/null
+++ b/view/theme/smoothly/templates/nav.tpl
@@ -0,0 +1,86 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+	<span id="banner">{{$banner}}</span>
+
+	<div id="notifications">	
+		{{if $nav.network}}<a id="net-update" class="nav-ajax-update" href="{{$nav.network.0}}" title="{{$nav.network.1}}"></a>{{/if}}
+		{{if $nav.home}}<a id="home-update" class="nav-ajax-update" href="{{$nav.home.0}}" title="{{$nav.home.1}}"></a>{{/if}}
+<!--		{{if $nav.notifications}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>{{/if}} -->
+		{{if $nav.introductions}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.introductions.0}}" title="{{$nav.introductions.1}}"></a>{{/if}}
+		{{if $nav.messages}}<a id="mail-update" class="nav-ajax-update" href="{{$nav.messages.0}}" title="{{$nav.messages.1}}"></a>{{/if}}
+		{{if $nav.notifications}}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="{{$nav.notifications.0}}"  title="{{$nav.notifications.1}}"></a>{{/if}}
+
+		<ul id="nav-notifications-menu" class="menu-popup">
+			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+			<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+			<li class="empty">{{$emptynotifications}}</li>
+		</ul>
+	</div>
+	
+	<div id="user-menu" >
+		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="{{$nav.home.0}}">{{$sitelocation}}</a>
+		
+		<ul id="user-menu-popup" 
+			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
+			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
+
+			{{if $nav.register}}<li><a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}">{{$nav.register.1}}</a></li>{{/if}}
+			
+			{{if $nav.home}}<li><a id="nav-home-link" class="nav-commlink {{$nav.home.2}}" href="{{$nav.home.0}}">{{$nav.home.1}}</a></li>{{/if}}
+		
+			{{if $nav.network}}<li><a id="nav-network-link" class="nav-commlink {{$nav.network.2}}" href="{{$nav.network.0}}">{{$nav.network.1}}</a></li>{{/if}}
+		
+				{{if $nav.community}}
+				<li><a id="nav-community-link" class="nav-commlink {{$nav.community.2}}" href="{{$nav.community.0}}">{{$nav.community.1}}</a></li>
+				{{/if}}
+
+			<li><a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}">{{$nav.search.1}}</a></li>
+			<li><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}">{{$nav.directory.1}}</a></li>
+			{{if $nav.apps}}<li><a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}">{{$nav.apps.1}}</a></li>{{/if}}
+			
+			{{if $nav.notifications}}<li><a id="nav-notify-link" class="nav-commlink nav-sep {{$nav.notifications.2}}" href="{{$nav.notifications.0}}">{{$nav.notifications.1}}</a></li>{{/if}}
+			{{if $nav.messages}}<li><a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>{{/if}}
+			{{if $nav.contacts}}<li><a id="nav-contacts-link" class="nav-commlink {{$nav.contacts.2}}" href="{{$nav.contacts.0}}">{{$nav.contacts.1}}</a></li>{{/if}}
+		
+			{{if $nav.profiles}}<li><a id="nav-profiles-link" class="nav-commlink nav-sep {{$nav.profiles.2}}" href="{{$nav.profiles.0}}">{{$nav.profiles.1}}</a></li>{{/if}}
+			{{if $nav.settings}}<li><a id="nav-settings-link" class="nav-commlink {{$nav.settings.2}}" href="{{$nav.settings.0}}">{{$nav.settings.1}}</a></li>{{/if}}
+			
+			{{if $nav.manage}}<li><a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}">{{$nav.manage.1}}</a></li>{{/if}}
+		
+			{{if $nav.admin}}<li><a id="nav-admin-link" class="nav-commlink {{$nav.admin.2}}" href="{{$nav.admin.0}}">{{$nav.admin.1}}</a></li>{{/if}}
+			
+			{{if $nav.help}}<li><a id="nav-help-link" class="nav-link {{$nav.help.2}}" href="{{$nav.help.0}}">{{$nav.help.1}}</a></li>{{/if}}
+
+			{{if $nav.login}}<li><a id="nav-login-link" class="nav-link {{$nav.login.2}}" href="{{$nav.login.0}}">{{$nav.login.1}}</a></li> {{/if}}
+			{{if $nav.logout}}<li><a id="nav-logout-link" class="nav-commlink nav-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}">{{$nav.logout.1}}</a></li> {{/if}}
+		</ul>
+	</div>
+</nav>
+
+<div id="scrollup" >
+<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a><br />
+<a href="javascript:ScrollToBottom()"><img src="view/theme/smoothly/images/tobottom.png" alt="to bottom" title="to bottom" /></a>
+</div>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+<div style="position: fixed; top: 3px; left: 5px; z-index:9999">{{$langselector}}</div>
+
+<script>
+var pagetitle = null;
+$("nav").bind('nav-update', function(e,data){
+if (pagetitle==null) pagetitle = document.title;
+var count = $(data).find('notif').attr('count');
+if (count>0) {
+document.title = "("+count+") "+pagetitle;
+} else {
+document.title = pagetitle;
+}
+});
+</script>
diff --git a/view/theme/smoothly/templates/search_item.tpl b/view/theme/smoothly/templates/search_item.tpl
new file mode 100644
index 0000000000..0d77d544af
--- /dev/null
+++ b/view/theme/smoothly/templates/search_item.tpl
@@ -0,0 +1,58 @@
+{{*
+ *	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}}">
+			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
+		</div>
+		<div class="wall-item-lock-wrapper">
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}			
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			</div>
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			<div class="wall-item-delete-end"></div>
+		</div>
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+				
+		</div>			
+		
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+
+
+	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl
new file mode 100644
index 0000000000..f652de90b8
--- /dev/null
+++ b/view/theme/smoothly/templates/wall_thread.tpl
@@ -0,0 +1,165 @@
+{{*
+ *	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>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}} wallwall" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="view/theme/smoothly/images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			<div class="wall-item-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                    <ul>
+                        {{$item.item_photo_menu}}
+                    </ul>
+                </div>
+
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
+		</div>
+		<div class="wall-item-lock-wrapper">
+			{{if $item.lock}}
+			<div class="wall-item-lock">
+			<img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />
+			</div>
+			{{else}}
+			<div class="wall-item-lock"></div>
+			{{/if}}
+		</div>
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+		<div class="wall-item-author">
+			<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link">
+			<span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span>
+			</a>
+			<div class="wall-item-ago">&bull;</div>
+			<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
+		</div>	
+
+		<div>
+		<hr class="line-dots">
+		</div>
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+				<div class="body-tag">
+					{{foreach $item.tags as $tag}}
+					<span class='tag'>{{$tag}}</span>
+					{{/foreach}}
+				</div>
+
+				{{if $item.has_cats}}
+				<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} 
+				<a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> 
+				{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+				</div>
+				{{/if}}
+
+				{{if $item.has_folders}}
+				<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} 
+				<a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> 
+				{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+				</div>
+				{{/if}}
+
+			</div>
+		</div>
+		<div class="wall-item-social" id="wall-item-social-{{$item.id}}">
+
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+				{{if $item.vote.dislike}}
+				<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+				{{/if}}
+				{{if $item.vote.share}}
+				<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>				{{/if}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+
+			{{if $item.plink}}
+			<div class="wall-item-links-wrapper">
+				<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link"></a>
+			</div>
+			{{/if}}
+		 
+			{{if $item.star}}
+			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}
+	
+		</div>
+
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.edpost}}
+			<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}
+				<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
+				{{/if}}
+			</div>
+
+			{{if $item.drop.pagedrop}}
+			<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />
+			{{/if}}
+
+			<div class="wall-item-delete-end"></div>
+		</div>
+
+	</div>	
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+
+	{{if $item.threaded}}
+	{{if $item.comment}}
+        <div class="wall-item-comment-wrapper {{$item.indent}} {{$item.shiny}}" >
+		{{$item.comment}}
+	</div>
+	{{/if}}
+	{{/if}}
+</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
+
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" >
+	{{$item.comment}}
+</div>
+{{/if}}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/testbubble/templates/comment_item.tpl b/view/theme/testbubble/templates/comment_item.tpl
new file mode 100644
index 0000000000..ef993e8f53
--- /dev/null
+++ b/view/theme/testbubble/templates/comment_item.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+				{{foreach $qcomment as $qc}}				
+					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
+					&nbsp;
+				{{/foreach}}
+				{{/if}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
+		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
diff --git a/view/theme/testbubble/templates/group_drop.tpl b/view/theme/testbubble/templates/group_drop.tpl
new file mode 100644
index 0000000000..f5039fd8fa
--- /dev/null
+++ b/view/theme/testbubble/templates/group_drop.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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();" 
+		title="{{$delete}}" 
+		id="group-delete-icon-{{$id}}" 
+		class="drophide group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >Delete Group</a>
+</div>
+<div class="group-delete-end"></div>
diff --git a/view/theme/testbubble/templates/group_edit.tpl b/view/theme/testbubble/templates/group_edit.tpl
new file mode 100644
index 0000000000..aaa0d5670e
--- /dev/null
+++ b/view/theme/testbubble/templates/group_edit.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h2>{{$title}}</h2>
+
+
+<div id="group-edit-wrapper" >
+	<form action="group/{{$gid}}" id="group-edit-form" method="post" >
+		<div id="group-edit-name-wrapper" >
+			<label id="group-edit-name-label" for="group-edit-name" >{{$gname}}</label>
+			<input type="text" id="group-edit-name" name="groupname" value="{{$name}}" />
+			<input type="submit" name="submit" value="{{$submit}}">
+			{{$drop}}
+		</div>
+		<div id="group-edit-name-end"></div>
+		<div id="group-edit-desc">{{$desc}}</div>
+		<div id="group-edit-select-end" ></div>
+	</form>
+</div>
diff --git a/view/theme/testbubble/templates/group_side.tpl b/view/theme/testbubble/templates/group_side.tpl
new file mode 100644
index 0000000000..db246b6de9
--- /dev/null
+++ b/view/theme/testbubble/templates/group_side.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="widget" id="group-sidebar">
+<h3>{{$title}}</h3>
+
+<div id="sidebar-group-list">
+	<ul id="sidebar-group-ul">
+		{{foreach $groups as $group}}
+			<li class="sidebar-group-li">
+				{{if $group.cid}}
+					<input type="checkbox" 
+						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
+						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
+						{{if $group.ismember}}checked="checked"{{/if}}
+					/>
+				{{/if}}			
+				{{if $group.edit}}
+					<a class="groupsideedit" href="{{$group.edit.href}}"><span class="icon small-pencil"></span></a>
+				{{/if}}
+				<a class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
+			</li>
+		{{/foreach}}
+	</ul>
+	</div>
+  <div id="sidebar-new-group">
+  <a href="group/new">{{$createtext}}</a>
+  </div>
+</div>
+
+
diff --git a/view/theme/testbubble/templates/jot-header.tpl b/view/theme/testbubble/templates/jot-header.tpl
new file mode 100644
index 0000000000..6b082738de
--- /dev/null
+++ b/view/theme/testbubble/templates/jot-header.tpl
@@ -0,0 +1,371 @@
+{{*
+ *	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">
+
+var editor=false;
+var textlen = 0;
+var plaintext = '{{$editselect}}';
+
+function initEditor(cb) {
+    if (editor==false) {
+        $("#profile-jot-text-loading").show();
+ if(plaintext == 'none') {
+            $("#profile-jot-text-loading").hide();
+            $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+            $(".jothidden").show();
+            editor = true;
+            $("a#jot-perms-icon").colorbox({
+				'inline' : true,
+				'transition' : 'elastic'
+            });
+	                            $("#profile-jot-submit-wrapper").show();
+								{{if $newpost}}
+    	                            $("#profile-upload-wrapper").show();
+        	                        $("#profile-attach-wrapper").show();
+            	                    $("#profile-link-wrapper").show();
+                	                $("#profile-video-wrapper").show();
+                    	            $("#profile-audio-wrapper").show();
+                        	        $("#profile-location-wrapper").show();
+                            	    $("#profile-nolocation-wrapper").show();
+                                	$("#profile-title-wrapper").show();
+	                                $("#profile-jot-plugin-wrapper").show();
+	                                $("#jot-preview-link").show();
+								{{/if}}   
+
+
+            if (typeof cb!="undefined") cb();
+            return;
+        }
+        tinyMCE.init({
+                theme : "advanced",
+                mode : "specific_textareas",
+                editor_selector: /(profile-jot-text|prvmail-text)/,
+                plugins : "bbcode,paste,fullscreen,autoresize",
+                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
+                theme_advanced_buttons2 : "",
+                theme_advanced_buttons3 : "",
+                theme_advanced_toolbar_location : "top",
+                theme_advanced_toolbar_align : "center",
+                theme_advanced_blockformats : "blockquote,code",
+                //theme_advanced_resizing : true,
+                //theme_advanced_statusbar_location : "bottom",
+                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 : 'div',
+                convert_urls: false,
+                content_css: "{{$baseurl}}/view/custom_tinymce.css",
+                theme_advanced_path : false,
+                setup : function(ed) {
+					cPopup = null;
+					ed.onKeyDown.add(function(ed,e) {
+						if(cPopup !== null)
+							cPopup.onkey(e);
+					});
+
+
+
+					ed.onKeyUp.add(function(ed, e) {
+						var txt = tinyMCE.activeEditor.getContent();
+						match = txt.match(/@([^ \n]+)$/);
+						if(match!==null) {
+							if(cPopup === null) {
+								cPopup = new ACPopup(this,baseurl+"/acl");
+							}
+							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+							if(! cPopup.ready) cPopup = null;
+						}
+						else {
+							if(cPopup !== null) { cPopup.close(); cPopup = null; }
+						}
+
+						textlen = txt.length;
+						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+							$('#profile-jot-desc').html(ispublic);
+						}
+                        else {
+                            $('#profile-jot-desc').html('&nbsp;');
+                        }
+
+								//Character count
+
+                                if(textlen <= 140) {
+                                        $('#character-counter').removeClass('red');
+                                        $('#character-counter').removeClass('orange');
+                                        $('#character-counter').addClass('grey');
+                                }
+                                if((textlen > 140) && (textlen <= 420)) {
+                                        $('#character-counter').removeClass('grey');
+                                        $('#character-counter').removeClass('red');
+                                        $('#character-counter').addClass('orange');
+                                }
+                                if(textlen > 420) {
+                                        $('#character-counter').removeClass('grey');
+                                        $('#character-counter').removeClass('orange');
+                                        $('#character-counter').addClass('red');
+                                }
+                                $('#character-counter').text(textlen);
+                        });
+                        ed.onInit.add(function(ed) {
+                                ed.pasteAsPlainText = true;
+								$("#profile-jot-text-loading").hide();
+								$(".jothidden").show();
+	                            $("#profile-jot-submit-wrapper").show();
+								{{if $newpost}}
+    	                            $("#profile-upload-wrapper").show();
+        	                        $("#profile-attach-wrapper").show();
+            	                    $("#profile-link-wrapper").show();
+                	                $("#profile-video-wrapper").show();
+                    	            $("#profile-audio-wrapper").show();
+                        	        $("#profile-location-wrapper").show();
+                            	    $("#profile-nolocation-wrapper").show();
+                                	$("#profile-title-wrapper").show();
+	                                $("#profile-jot-plugin-wrapper").show();
+	                                $("#jot-preview-link").show();
+								{{/if}}   
+                             $("#character-counter").show();
+                                if (typeof cb!="undefined") cb();
+                        });
+                }
+        });
+        editor = true;
+        // setup acl popup
+        $("a#jot-perms-icon").colorbox({
+			'inline' : true,
+			'transition' : 'elastic'
+        }); 
+    } else {
+        if (typeof cb!="undefined") cb();
+    }
+} // initEditor
+</script>
+<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script>
+    var ispublic = '{{$ispublic}}';
+	$(document).ready(function() {
+                /* enable tinymce on focus */
+                $("#profile-jot-text").focus(function(){
+                    if (editor) return;
+                    $(this).val("");
+                    initEditor();
+                }); 
+
+
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);		
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+				$('.profile-jot-net input').attr('disabled', 'disabled');
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+				$('.profile-jot-net input').attr('disabled', false);
+			}
+
+		}).trigger('change');
+
+	});
+
+	function deleteCheckedItems() {
+		if(confirm('{{$delitems}}')) {
+			var checkedstr = '';
+
+			$("#item-delete-selected").hide();
+			$('#item-delete-selected-rotator').show();
+
+			$('.item-select').each( function() {
+				if($(this).is(':checked')) {
+					if(checkedstr.length != 0) {
+						checkedstr = checkedstr + ',' + $(this).val();
+					}
+					else {
+						checkedstr = $(this).val();
+					}
+				}	
+			});
+			$.post('item', { dropitems: checkedstr }, function(data) {
+				window.location.reload();
+			});
+		}
+	}
+
+	function jotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				addeditortext(data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("{{$vidurl}}");
+		if(reply && reply.length) {
+			addeditortext('[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("{{$audurl}}");
+		if(reply && reply.length) {
+			addeditortext('[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("{{$whereareu}}", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotTitle() {
+		reply = prompt("{{$title}}", $('#jot-title').val());
+		if(reply && reply.length) {
+			$('#jot-title').val(reply);
+		}
+	}
+
+	function jotShare(id) {
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#like-rotator-' + id).hide();
+					$(window).scrollTop(0);
+				});
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}
+
+	function itemTag(id) {
+		reply = prompt("{{$term}}");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+	
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.colorbox({html:data});
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.colorbox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+  function addeditortext(data) {
+        if(plaintext == 'none') {
+            var currentText = $("#profile-jot-text").val();
+            $("#profile-jot-text").val(currentText + data);
+        }
+        else
+            tinyMCE.execCommand('mceInsertRawHTML',false,data);
+    }
+
+
+	{{$geotag}}
+
+</script>
+
diff --git a/view/theme/testbubble/templates/jot.tpl b/view/theme/testbubble/templates/jot.tpl
new file mode 100644
index 0000000000..8d281dbaaa
--- /dev/null
+++ b/view/theme/testbubble/templates/jot.tpl
@@ -0,0 +1,80 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" > 
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey" style="display: none;">0</div>
+		<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+			<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display:none;"  />
+		</div> 		
+	</div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		<div id="jot-text-wrap">
+                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+		</div>
+	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
+		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="{{$upload}}"></a></div>
+	</div>
+	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="{{$attach}}"></a></div>
+	</div>  
+	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon border  link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-video" class="icon border  video" title="{{$video}}" onclick="jotVideoURL(); return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-audio" class="icon border  audio" title="{{$audio}}" onclick="jotAudioURL(); return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-location" class="icon border  globe" title="{{$setloc}}" onclick="jotGetLocation(); return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-nolocation" class="icon border  noglobe" title="{{$noloc}}" onclick="jotClearLocation(); return false;"></a>
+	</div> 
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >{{$preview}}</span>
+
+	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
+		<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+		<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}} sharePerms" title="{{$permset}}"></a>{{$bang}}</div>
+	</div>
+
+	<div id="profile-jot-plugin-wrapper" style="display: none;">
+  	{{$jotplugins}}
+	</div>
+	<div id="profile-jot-tools-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+        <div style="display: none;">
+            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+                {{$acl}}
+                <hr style="clear:both"/>
+                <div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+                <div id="profile-jot-email-end"></div>
+                {{$jotnets}}
+            </div>
+        </div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+                {{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/testbubble/templates/match.tpl b/view/theme/testbubble/templates/match.tpl
new file mode 100644
index 0000000000..61a861c1cc
--- /dev/null
+++ b/view/theme/testbubble/templates/match.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	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}}">
+			<img src="{{$photo}}" alt="{{$name}}" />
+		</a>
+	</div>
+	<span><a href="{{$url}}">{{$name}}</a>{{$inttxt}}<br />{{$tags}}</span>
+	<div class="profile-match-break"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
+	<div class="profile-match-end"></div>
+</div>
\ No newline at end of file
diff --git a/view/theme/testbubble/templates/nav.tpl b/view/theme/testbubble/templates/nav.tpl
new file mode 100644
index 0000000000..be7c2e7b66
--- /dev/null
+++ b/view/theme/testbubble/templates/nav.tpl
@@ -0,0 +1,71 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+	{{$langselector}}
+
+	<span id="banner">{{$banner}}</span>
+
+	<div id="notifications">	
+		{{if $nav.network}}<a id="net-update" class="nav-ajax-update" href="{{$nav.network.0}}" title="{{$nav.network.1}}"></a>{{/if}}
+		{{if $nav.home}}<a id="home-update" class="nav-ajax-update" href="{{$nav.home.0}}" title="{{$nav.home.1}}"></a>{{/if}}
+<!--		{{if $nav.notifications}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>{{/if}} -->
+		{{if $nav.introductions}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.introductions.0}}" title="{{$nav.introductions.1}}"></a>{{/if}}
+		{{if $nav.messages}}<a id="mail-update" class="nav-ajax-update" href="{{$nav.messages.0}}" title="{{$nav.messages.1}}"></a>{{/if}}
+		{{if $nav.notifications}}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="{{$nav.notifications.0}}"  title="{{$nav.notifications.1}}"></a>{{/if}}
+
+		<ul id="nav-notifications-menu" class="menu-popup">
+			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+			<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+			<li class="empty">{{$emptynotifications}}</li>
+		</ul>
+	</div>
+	
+	<div id="user-menu" >
+		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="{{$nav.home.0}}">{{$sitelocation}}</a>
+		
+		<ul id="user-menu-popup" 
+			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
+			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
+
+			{{if $nav.register}}<li><a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}">{{$nav.register.1}}</a></li>{{/if}}
+			
+			{{if $nav.home}}<li><a id="nav-home-link" class="nav-commlink {{$nav.home.2}}" href="{{$nav.home.0}}">{{$nav.home.1}}</a></li>{{/if}}
+		
+			{{if $nav.network}}<li><a id="nav-network-link" class="nav-commlink {{$nav.network.2}}" href="{{$nav.network.0}}">{{$nav.network.1}}</a></li>{{/if}}
+		
+				{{if $nav.community}}
+				<li><a id="nav-community-link" class="nav-commlink {{$nav.community.2}}" href="{{$nav.community.0}}">{{$nav.community.1}}</a></li>
+				{{/if}}
+
+			<li><a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}">{{$nav.search.1}}</a></li>
+			<li><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}">{{$nav.directory.1}}</a></li>
+			{{if $nav.apps}}<li><a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}">{{$nav.apps.1}}</a></li>{{/if}}
+			
+			{{if $nav.notifications}}<li><a id="nav-notify-link" class="nav-commlink nav-sep {{$nav.notifications.2}}" href="{{$nav.notifications.0}}">{{$nav.notifications.1}}</a></li>{{/if}}
+			{{if $nav.messages}}<li><a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>{{/if}}
+			{{if $nav.contacts}}<li><a id="nav-contacts-link" class="nav-commlink {{$nav.contacts.2}}" href="{{$nav.contacts.0}}">{{$nav.contacts.1}}</a></li>{{/if}}
+		
+			{{if $nav.profiles}}<li><a id="nav-profiles-link" class="nav-commlink nav-sep {{$nav.profiles.2}}" href="{{$nav.profiles.0}}">{{$nav.profiles.1}}</a></li>{{/if}}
+			{{if $nav.settings}}<li><a id="nav-settings-link" class="nav-commlink {{$nav.settings.2}}" href="{{$nav.settings.0}}">{{$nav.settings.1}}</a></li>{{/if}}
+			
+			{{if $nav.manage}}<li><a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}">{{$nav.manage.1}}</a></li>{{/if}}
+		
+			{{if $nav.admin}}<li><a id="nav-admin-link" class="nav-commlink {{$nav.admin.2}}" href="{{$nav.admin.0}}">{{$nav.admin.1}}</a></li>{{/if}}
+			
+			{{if $nav.help}}<li><a id="nav-help-link" class="nav-link {{$nav.help.2}}" href="{{$nav.help.0}}">{{$nav.help.1}}</a></li>{{/if}}
+
+			{{if $nav.login}}<li><a id="nav-login-link" class="nav-link {{$nav.login.2}}" href="{{$nav.login.0}}">{{$nav.login.1}}</a></li> {{/if}}
+			{{if $nav.logout}}<li><a id="nav-logout-link" class="nav-commlink nav-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}">{{$nav.logout.1}}</a></li> {{/if}}
+		</ul>
+	</div>
+</nav>
+
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+
diff --git a/view/theme/testbubble/templates/photo_album.tpl b/view/theme/testbubble/templates/photo_album.tpl
new file mode 100644
index 0000000000..7ca7bd9d62
--- /dev/null
+++ b/view/theme/testbubble/templates/photo_album.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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}}" />
+	</div>
+		<p class='caption'>{{$desc}}</p>		
+	</a>
+	</div>
+<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/templates/photo_top.tpl b/view/theme/testbubble/templates/photo_top.tpl
new file mode 100644
index 0000000000..915609b7f0
--- /dev/null
+++ b/view/theme/testbubble/templates/photo_top.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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">
+	<a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$id}}" title="{{$photo.title}}"><img src="{{$photo.src}}" alt="{{$phoyo.alt}}" title="{{$photo.title}}" class="photo-top-photo" id="photo-top-photo-{{$id}}" /></a>
+	</div>
+	<div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div>
+</div>
+<div class="photo-top-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/templates/photo_view.tpl b/view/theme/testbubble/templates/photo_view.tpl
new file mode 100644
index 0000000000..fa5af03a1e
--- /dev/null
+++ b/view/theme/testbubble/templates/photo_view.tpl
@@ -0,0 +1,45 @@
+{{*
+ *	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>
+
+<div id="photo-edit-link-wrap">
+{{if $tools}}
+<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
+-
+<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
+{{/if}}
+{{if $lock}} - <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo{{$id}}');" /> {{/if}}
+</div>
+
+<div id="photo-photo" class="lframe">
+	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
+	<a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a>
+	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
+</div>
+
+<div id="photo-photo-end"></div>
+<div id="photo-caption" >{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
+
+{{if $edit}}{{$edit}}{{/if}}
+
+{{if $likebuttons}}
+<div id="photo-like-div">
+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
+</div>
+{{/if}}
+
+{{$comments}}
+
+{{$paginate}}
+
diff --git a/view/theme/testbubble/templates/profile_entry.tpl b/view/theme/testbubble/templates/profile_entry.tpl
new file mode 100644
index 0000000000..66997c3788
--- /dev/null
+++ b/view/theme/testbubble/templates/profile_entry.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="profile-listing" >
+<div class="profile-listing-photo-wrapper" >
+<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo mframe" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
+</div>
+<div class="profile-listing-photo-end"></div>
+<div class="profile-listing-name" id="profile-listing-name-{{$id}}"><a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a></div>
+<div class='profile-visible'>{{$visible}}</div>
+</div>
+<div class="profile-listing-end"></div>
+
diff --git a/view/theme/testbubble/templates/profile_vcard.tpl b/view/theme/testbubble/templates/profile_vcard.tpl
new file mode 100644
index 0000000000..96e37d5e44
--- /dev/null
+++ b/view/theme/testbubble/templates/profile_vcard.tpl
@@ -0,0 +1,50 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+	<div class="fn label">{{$profile.name}}</div>
+				
+	
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></div>
+
+
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/testbubble/templates/saved_searches_aside.tpl b/view/theme/testbubble/templates/saved_searches_aside.tpl
new file mode 100644
index 0000000000..6778dde36e
--- /dev/null
+++ b/view/theme/testbubble/templates/saved_searches_aside.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	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}}
+	
+	<ul id="saved-search-ul">
+		{{foreach $saved as $search}}
+		<li class="saved-search-li clear">
+			<a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"></a>
+			<a class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.term}}</a>
+		</li>
+		{{/foreach}}
+	</ul>
+	<div class="clear"></div>
+</div>
diff --git a/view/theme/testbubble/templates/search_item.tpl b/view/theme/testbubble/templates/search_item.tpl
new file mode 100644
index 0000000000..0d77d544af
--- /dev/null
+++ b/view/theme/testbubble/templates/search_item.tpl
@@ -0,0 +1,58 @@
+{{*
+ *	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}}">
+			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
+		</div>
+		<div class="wall-item-lock-wrapper">
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}			
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			</div>
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			<div class="wall-item-delete-end"></div>
+		</div>
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+				
+		</div>			
+		
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+
+
+	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
diff --git a/view/theme/testbubble/templates/wall_thread.tpl b/view/theme/testbubble/templates/wall_thread.tpl
new file mode 100644
index 0000000000..5c1a70f73d
--- /dev/null
+++ b/view/theme/testbubble/templates/wall_thread.tpl
@@ -0,0 +1,112 @@
+{{*
+ *	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>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}} wallwall" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			<div class="wall-item-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                    <ul>
+                        {{$item.item_photo_menu}}
+                    </ul>
+                </div>
+
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
+		</div>
+		<div class="wall-item-lock-wrapper">
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}
+		</div>
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+					<div class="body-tag">
+						{{foreach $item.tags as $tag}}
+							<span class='tag'>{{$tag}}</span>
+						{{/foreach}}
+					</div>
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+				{{if $item.vote.dislike}}<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
+				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				<div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link"></a></div>
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+			
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			</div>
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			<div class="wall-item-delete-end"></div>
+		</div>
+		<div class="wall-item-author">
+			<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+			<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+		</div>	
+	</div>	
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+	{{if $item.threaded}}
+	{{if $item.comment}}
+	<div class="wall-item-comment-wrapper {{$item.indent}} {{$item.shiny}}" >
+		{{$item.comment}}
+	</div>
+	{{/if}}
+	{{/if}}
+</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
+
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" >
+	{{$item.comment}}
+</div>
+{{/if}}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/vier/templates/comment_item.tpl b/view/theme/vier/templates/comment_item.tpl
new file mode 100644
index 0000000000..b683f12424
--- /dev/null
+++ b/view/theme/vier/templates/comment_item.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	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}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+		{{/if}}
+			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});">{{$comment}}</textarea>
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
+					</select>
+				{{/if}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+
+				<div class="comment-edit-bb">
+	                                <a title="{{$edimg}}" onclick="insertFormatting('{{$comment}}','img',{{$id}});"><i class="icon-picture"></i></a>      
+	                                <a title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});"><i class="icon-bookmark"></i></a>
+	                                <a title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});"><i class="icon-film"></i></a>
+                                                                                
+	                                <a title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});"><i class="icon-underline"></i></a>
+	                                <a title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});"><i class="icon-italic"></i></a>
+	                                <a title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});"><i class="icon-bold"></i></a>
+	                                <a title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});"><i class="icon-comments"></i></a>
+
+                                </div>
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/vier/templates/mail_list.tpl b/view/theme/vier/templates/mail_list.tpl
new file mode 100644
index 0000000000..c4d9d68070
--- /dev/null
+++ b/view/theme/vier/templates/mail_list.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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>
+	<span class="mail-date">{{$date}}</span>
+	<span class="mail-count">{{$count}}</span>
+	
+	<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete"><i class="icon-trash icon-large"></i></a>
+</div>
diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl
new file mode 100644
index 0000000000..f4754e2d6a
--- /dev/null
+++ b/view/theme/vier/templates/nav.tpl
@@ -0,0 +1,150 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<header>
+	{{* {{$langselector}} *}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+	<div id="banner">{{$banner}}</div>
+</header>
+<nav>
+	<ul>
+		{{if $nav.community}}
+			<li id="nav-community-link" class="nav-menu {{$sel.community}}">
+				<a class="{{$nav.community.2}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+			</li>
+		{{/if}}
+		
+		{{if $nav.network}}
+			<li id="nav-network-link" class="nav-menu {{$sel.network}}">
+				<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+				<span id="net-update" class="nav-notify"></span>
+			</li>
+		{{/if}}
+		{{if $nav.home}}
+			<li id="nav-home-link" class="nav-menu {{$sel.home}}">
+				<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+				<span id="home-update" class="nav-notify"></span>
+			</li>
+		{{/if}}
+		{{if $nav.messages}}
+			<li id="nav-messages-linkmenu" class="nav-menu">
+				<a href="{{$nav.messages.0}}" rel="#nav-messages-menu" title="{{$nav.messages.1}}">{{$nav.messages.1}}
+                        	<span id="mail-update" class="nav-notify"></span></a>
+                        	<ul id="nav-messages-menu" class="menu-popup">
+                                	<li id="nav-messages-see-all"><a href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>
+                                        <li id="nav-messages-see-all"><a href="{{$nav.messages.new.0}}">{{$nav.messages.new.1}}</a></li>
+                        	</ul>
+                        </li>           
+                {{/if}}
+
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear"></span></a>
+			<ul id="nav-site-menu" class="menu-popup">
+				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}				
+				{{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}
+				<li><a class="{{$nav.search.2}}" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
+				<li><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a></li>
+				{{if $nav.delegations}}<li><a class="{{$nav.delegations.2}}" href="{{$nav.delegations.0}}" title="{{$nav.delegations.3}}">{{$nav.delegations.1}}</a></li>{{/if}}
+				{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
+				{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
+
+				{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
+				{{if $nav.login}}<li><a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
+			</ul>		
+		</li>
+		{{if $nav.notifications}}
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify"></span></a>
+				<span id="notify-update" class="nav-notify"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+			</li>		
+		{{/if}}		
+		
+<!--		
+		{{if $nav.help}} 
+		<li id="nav-help-link" class="nav-menu {{$sel.help}}">
+			<a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
+		</li>
+		{{/if}}
+-->
+
+		{{if $userinfo}}
+			<li id="nav-user-linklabel" class="nav-menu"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}">{{$userinfo.name}}</a>
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
+				<ul id="nav-user-menu" class="menu-popup">
+					{{foreach $nav.usermenu as $usermenu}}
+						<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
+					{{/foreach}}
+					{{if $nav.notifications}}<li><a class="{{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a></li>{{/if}}
+					{{if $nav.messages}}<li><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a></li>{{/if}}
+					{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}	
+				</ul>
+			</li>
+		{{/if}}
+		
+		{{if $nav.search}}
+                <li id="search-box">
+                        <form method="get" action="{{$nav.search.0}}">
+                        	<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
+                        </form>
+                </li>
+		{{/if}}
+		
+		{{if $nav.apps}}
+			<li id="nav-apps-link" class="nav-menu {{$sel.apps}}">
+				<a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>
+				<ul id="nav-apps-menu" class="menu-popup">
+					{{foreach $apps as $ap}}
+					<li>{{$ap}}</li>
+					{{/foreach}}
+				</ul>
+			</li>
+		{{/if}}
+	</ul>
+
+</nav>
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+{{*
+
+{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+
+<span id="nav-link-wrapper" >
+
+{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+
+<a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
+	
+{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+
+<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+
+{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+
+{{if $nav.notifications}}
+<a id="nav-notify-link" class="nav-commlink {{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a>
+<span id="notify-update" class="nav-ajax-left"></span>
+{{/if}}
+{{if $nav.messages}}
+<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+<span id="mail-update" class="nav-ajax-left"></span>
+{{/if}}
+
+{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
+{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
+{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+
+
+</span>
+<span id="nav-end"></span>
+<span id="banner">{{$banner}}</span>
+*}}
diff --git a/view/theme/vier/templates/profile_edlink.tpl b/view/theme/vier/templates/profile_edlink.tpl
new file mode 100644
index 0000000000..97990f7bef
--- /dev/null
+++ b/view/theme/vier/templates/profile_edlink.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="clear"></div>
diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
new file mode 100644
index 0000000000..9e0da287cf
--- /dev/null
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@ -0,0 +1,70 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="tool">
+		<div class="fn label">{{$profile.name}}</div>
+		{{if $profile.edit}}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{foreach $profile.menu.entries as $e}}
+				<li>
+					<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
+				</li>
+				{{/foreach}}
+				<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
+				<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
+				<li><a href="profiles" >{{$profile.edit.3}}</a></li>
+								
+			</ul>
+			</div>
+		{{else}}
+			<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
+		{{/if}}
+	</div>
+
+
+	<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt><br> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal-code}}</span>
+			</span>
+			{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/vier/templates/search_item.tpl b/view/theme/vier/templates/search_item.tpl
new file mode 100644
index 0000000000..0a62fd5843
--- /dev/null
+++ b/view/theme/vier/templates/search_item.tpl
@@ -0,0 +1,97 @@
+{{*
+ *	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>
+	{{if $item.lock}}<span class="icon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}	
+	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+</div>
+
+<div class="wall-item-container {{$item.indent}} {{$item.shiny}} ">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>
+		</div>
+		<div class="wall-item-actions-author">
+			<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> 
+			<span class="wall-item-ago">
+				{{if $item.plink}}<a class="link" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+				{{if $item.lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
+			</span>
+		</div>
+		<div class="wall-item-content">
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
+			{{$item.body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $item.tags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+			<!-- {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
+			{{if $item.conv}}<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'><i class="icon-link icon-large"></i></a>{{/if}}
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-location">{{$item.location}}&nbsp;</div>	
+			
+			<div class="wall-item-actions-social">
+			{{if $item.star}}
+				<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
+				<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
+				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger}}">{{$item.star.tagger}}</a>
+			{{/if}}
+			
+			{{if $item.vote}}
+				<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+				<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
+			{{/if}}
+						
+			{{if $item.vote.share}}
+				<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
+			{{/if}}			
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+				{{/if}}
+				{{if $item.edpost}}
+					<a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+				{{/if}}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
+	</div>
+</div>
diff --git a/view/theme/vier/templates/threaded_conversation.tpl b/view/theme/vier/templates/threaded_conversation.tpl
new file mode 100644
index 0000000000..dc3e918f61
--- /dev/null
+++ b/view/theme/vier/templates/threaded_conversation.tpl
@@ -0,0 +1,45 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}}  {{$thread.toplevel}}">
+       
+       
+		{{if $thread.type == tag}}
+			{{include file="wall_item_tag.tpl" item=$thread}}
+		{{else}}
+			{{include file="{{$thread.template}}" item=$thread}}
+		{{/if}}
+		
+</div>
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;">
+	<span class="icon s22 delete text">{{$dropping}}</span>
+</a>
+<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+{{/if}}
+
+<script>
+// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
+    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
+    var colWhite = {backgroundColor:'#EFF0F1'};
+    var colShiny = {backgroundColor:'#FCE94F'};
+</script>
+
+{{if $mode == display}}
+<script>
+    var id = window.location.pathname.split("/").pop();
+    $(window).scrollTop($('#item-'+id).position().top);
+    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
+</script>
+{{/if}}
+
diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
new file mode 100644
index 0000000000..f2f6f186e8
--- /dev/null
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -0,0 +1,177 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $mode == display}}
+{{else}}
+{{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>
+			{{if $item.thread_level==3}} - 
+			<span id="hide-thread-{{$item}}-id"
+				class="fakelink"
+				onclick="showThread({{$item.id}});">expand</span> /
+			<span id="hide-thread-{{$item}}-id"
+				class="fakelink"
+				onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}}
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+{{/if}}
+
+{{if $item.thread_level!=1}}<div class="children">{{/if}}
+
+<div class="wall-item-decor">
+	<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
+	{{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}	
+	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+</div>
+
+<div class="wall-item-container {{$item.indent}} {{$item.shiny}} " id="item-{{$item.id}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}"
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>
+			{{if $item.owner_url}}
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+					<img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
+				</a>
+			</div>
+			{{/if}}			
+		</div>
+		<div class="wall-item-actions-author">
+			<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
+			 {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> <!-- {{$item.vwall}} -->{{/if}}
+			<span class="wall-item-ago">
+				{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+				{{if $item.lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
+			</span>
+		</div>
+
+		<div itemprop="description" class="wall-item-content">
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h2>{{/if}}
+			{{$item.body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $item.hashtags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+  			{{foreach $item.mentions as $tag}}
+				<span class='mention'>{{$tag}}</span>
+			{{/foreach}}
+               {{foreach $item.folders as $cat}}
+                    <span class='folder'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+               {{/foreach}}
+                {{foreach $item.categories as $cat}}
+                    <span class='category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                {{/foreach}}
+		</div>
+	</div>	
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+			{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}}
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-actions-social">
+			{{if $item.threaded}}{{if $item.comment}}
+				<span id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}');"><i class="icon-comment"></i></span>
+			{{/if}}{{/if}}
+			{{if $item.vote}}
+				<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"><i class="icon-thumbs-up icon-large"></i></a>
+				{{if $item.vote.dislike}}
+				<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"><i class="icon-thumbs-down icon-large"></i></a>
+				{{/if}}
+			{{/if}}
+			{{if $item.vote.share}}
+				<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet icon-large"></i></a>
+			{{/if}}
+			{{if $item.star}}
+				<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}"><i class="icon-star icon-large"></i></a>
+				<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}"><i class="icon-star-empty icon-large"></i></a>
+			{{/if}}
+			{{if $item.tagger}}
+				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="icon-tags icon-large"></i></a>
+			{{/if}}
+			{{if $item.filer}}
+                                <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="icon-folder-close icon-large"></i></a>
+			{{/if}}
+			</div>
+			<div class="wall-item-location">{{$item.location}} {{$item.postopts}}</div>				
+			<div class="wall-item-actions-tools">
+
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}"><i class="icon-trash icon-large"></i></a>
+				{{/if}}
+				{{if $item.edpost}}
+					<a href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="icon-edit icon-large"></i></a>
+				{{/if}}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
+	</div>
+	
+	{{if $item.threaded}}{{if $item.comment}}
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">
+					{{$item.comment}}
+		</div>
+	</div>
+	{{/if}}{{/if}}
+</div>
+
+
+{{foreach $item.children as $child}}
+	{{if $item.type == tag}}
+		{{include file="wall_item_tag.tpl" item=$child}}
+	{{else}}
+		{{include file="{{$item.template}}" item=$child}}
+	{{/if}}
+{{/foreach}}
+
+{{if $item.thread_level!=1}}</div>{{/if}}
+
+
+{{if $mode == display}}
+{{else}}
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
+{{/if}}
+
+{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+{{/if}}{{/if}}{{/if}}
+
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+{{/if}}

From 4dc72742aeda810e73cd8a3e4abe0ff4c958d09d Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 23 Apr 2013 07:50:32 -0400
Subject: [PATCH 26/67] remove unneeded files

---
 .../frost-mobile/settings.tpl.BASE.8446.tpl   |  144 -
 .../frost-mobile/settings.tpl.LOCAL.8446.tpl  |  147 -
 view/theme/oldtest/app/app.js                 |   85 -
 view/theme/oldtest/bootstrap.zip              |  Bin 85566 -> 0 bytes
 .../oldtest/css/bootstrap-responsive.css      | 1109 ---
 .../oldtest/css/bootstrap-responsive.min.css  |    9 -
 view/theme/oldtest/css/bootstrap.css          | 6158 -----------------
 view/theme/oldtest/css/bootstrap.min.css      |    9 -
 view/theme/oldtest/default.php                |   52 -
 .../img/glyphicons-halflings-white.png        |  Bin 8777 -> 0 bytes
 .../oldtest/img/glyphicons-halflings.png      |  Bin 12799 -> 0 bytes
 view/theme/oldtest/js/bootstrap.js            | 2276 ------
 view/theme/oldtest/js/bootstrap.min.js        |    6 -
 view/theme/oldtest/js/knockout-2.2.1.js       |   85 -
 view/theme/oldtest/style.css                  |    0
 view/theme/oldtest/theme.php                  |   46 -
 16 files changed, 10126 deletions(-)
 delete mode 100644 view/theme/frost-mobile/settings.tpl.BASE.8446.tpl
 delete mode 100644 view/theme/frost-mobile/settings.tpl.LOCAL.8446.tpl
 delete mode 100644 view/theme/oldtest/app/app.js
 delete mode 100644 view/theme/oldtest/bootstrap.zip
 delete mode 100644 view/theme/oldtest/css/bootstrap-responsive.css
 delete mode 100644 view/theme/oldtest/css/bootstrap-responsive.min.css
 delete mode 100644 view/theme/oldtest/css/bootstrap.css
 delete mode 100644 view/theme/oldtest/css/bootstrap.min.css
 delete mode 100644 view/theme/oldtest/default.php
 delete mode 100644 view/theme/oldtest/img/glyphicons-halflings-white.png
 delete mode 100644 view/theme/oldtest/img/glyphicons-halflings.png
 delete mode 100644 view/theme/oldtest/js/bootstrap.js
 delete mode 100644 view/theme/oldtest/js/bootstrap.min.js
 delete mode 100644 view/theme/oldtest/js/knockout-2.2.1.js
 delete mode 100644 view/theme/oldtest/style.css
 delete mode 100644 view/theme/oldtest/theme.php

diff --git a/view/theme/frost-mobile/settings.tpl.BASE.8446.tpl b/view/theme/frost-mobile/settings.tpl.BASE.8446.tpl
deleted file mode 100644
index 3e8b33d7f0..0000000000
--- a/view/theme/frost-mobile/settings.tpl.BASE.8446.tpl
+++ /dev/null
@@ -1,144 +0,0 @@
-<h1>$ptitle</h1>
-
-$nickname_block
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<h3 class="settings-heading">$h_pass</h3>
-
-{{inc field_password.tpl with $field=$password1 }}{{endinc}}
-{{inc field_password.tpl with $field=$password2 }}{{endinc}}
-
-{{ if $oid_enable }}
-{{inc field_input.tpl with $field=$openid }}{{endinc}}
-{{ endif }}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_basic</h3>
-
-{{inc field_input.tpl with $field=$username }}{{endinc}}
-{{inc field_input.tpl with $field=$email }}{{endinc}}
-{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
-{{inc field_input.tpl with $field=$defloc }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_prv</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-$hide_friends
-
-$hide_wall
-
-$blockwall
-
-$blocktags
-
-$suggestme
-
-$unkmail
-
-
-{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
-
-{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>$expire.advanced</h3>
-			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
-		</div>
-	</div>
-
-</div>
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
-	<div id="settings-default-perms-menu-end"></div>
-
-{#<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->#}
-	
-	<div style="display: none;">
-		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
-			$aclselect
-		</div>
-	</div>
-
-{#<!--	</div>-->#}
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-$group_select
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-
-<h3 class="settings-heading">$h_not</h3>
-<div id="settings-notifications">
-
-<div id="settings-activity-desc">$activity_options</div>
-
-{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
-
-
-<div id="settings-notify-desc">$lbl_not</div>
-
-<div class="group">
-{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
-</div>
-
-</div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_advn</h3>
-<div id="settings-pagetype-desc">$h_descadvn</div>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
diff --git a/view/theme/frost-mobile/settings.tpl.LOCAL.8446.tpl b/view/theme/frost-mobile/settings.tpl.LOCAL.8446.tpl
deleted file mode 100644
index 8e5aff019b..0000000000
--- a/view/theme/frost-mobile/settings.tpl.LOCAL.8446.tpl
+++ /dev/null
@@ -1,147 +0,0 @@
-<h1>$ptitle</h1>
-
-$nickname_block
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<h3 class="settings-heading">$h_pass</h3>
-
-{{inc field_password.tpl with $field=$password1 }}{{endinc}}
-{{inc field_password.tpl with $field=$password2 }}{{endinc}}
-{{inc field_password.tpl with $field=$password3 }}{{endinc}}
-
-{{ if $oid_enable }}
-{{inc field_input.tpl with $field=$openid }}{{endinc}}
-{{ endif }}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_basic</h3>
-
-{{inc field_input.tpl with $field=$username }}{{endinc}}
-{{inc field_input.tpl with $field=$email }}{{endinc}}
-{{inc field_password.tpl with $field=$password4 }}{{endinc}}
-{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
-{{inc field_input.tpl with $field=$defloc }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_prv</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-$hide_friends
-
-$hide_wall
-
-$blockwall
-
-$blocktags
-
-$suggestme
-
-$unkmail
-
-
-{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
-
-{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>$expire.advanced</h3>
-			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
-		</div>
-	</div>
-
-</div>
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
-	<div id="settings-default-perms-menu-end"></div>
-
-{#<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->#}
-	
-	<div style="display: none;">
-		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
-			$aclselect
-		</div>
-	</div>
-
-{#<!--	</div>-->#}
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-$group_select
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-
-<h3 class="settings-heading">$h_not</h3>
-<div id="settings-notifications">
-
-<div id="settings-activity-desc">$activity_options</div>
-
-{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
-
-
-<div id="settings-notify-desc">$lbl_not</div>
-
-<div class="group">
-{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
-</div>
-
-</div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_advn</h3>
-<div id="settings-pagetype-desc">$h_descadvn</div>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
diff --git a/view/theme/oldtest/app/app.js b/view/theme/oldtest/app/app.js
deleted file mode 100644
index eae90c57b5..0000000000
--- a/view/theme/oldtest/app/app.js
+++ /dev/null
@@ -1,85 +0,0 @@
-
-function menuItem (data){
-	if (!data) data = ['','','','']
-	this.url = ko.observable(data[0]);
-	this.text = ko.observable(data[1]);
-	this.style = ko.observable(data[2]);
-	this.title = ko.observable(data[3]);
-}
-
-
-function navModel(data) {
-	this.nav = ko.observableArray([]);
-	
-	if (data) {
-		for (k in data.nav) {
-			var n = new menuItem(data.nav[k]);
-			console.log(k, data.nav[k], n);
-			this.nav.push(n);
-		}
-	}
-	
-}
-
-function App() {
-	var self = this;
-	this.nav = ko.observable();
-	
-	$.getJSON(window.location, function(data) {
-		for(k in data){
-			//console.log(k);
-			switch(k) {
-				case 'nav':
-					var n = new navModel(data[k][0]);
-					self.nav(n);
-					break;
-			}
-			
-		}
-	});
-	
-}
-
-ko.applyBindings(new App());
-
-
-/*var App = {
-
-	menuItem : function(data){
-		if (!data) data = ['','','','']
-		this.url = ko.observable(data[0]);
-		this.text = ko.observable(data[1]);
-		this.style = ko.observable(data[2]);
-		this.title = ko.observable(data[3]);
-	},
-	
-	navModel : function() {
-		
-		
-	},
-
-}*/
-
-
-
-
-// Activates knockout.js
-//ko.applyBindings(new navModel());
-
-/*
-$(document).ready(function(){
-	$.getJSON(window.location, function(data) {
-		for(k in data){
-			var model = k+"Model";
-			if (model in App) {
-				for (kk in data[k][0]) {
-					console.log(kk);
-				}
-				
-				
-			} 				
-		}
-		
-	}); 
-})
-*/
\ No newline at end of file
diff --git a/view/theme/oldtest/bootstrap.zip b/view/theme/oldtest/bootstrap.zip
deleted file mode 100644
index e4f27746a3bc9aa7d98f44ea10217c92b5fc7062..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85566
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

diff --git a/view/theme/oldtest/css/bootstrap-responsive.css b/view/theme/oldtest/css/bootstrap-responsive.css
deleted file mode 100644
index fcd72f7a77..0000000000
--- a/view/theme/oldtest/css/bootstrap-responsive.css
+++ /dev/null
@@ -1,1109 +0,0 @@
-/*!
- * Bootstrap Responsive v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-@-ms-viewport {
-  width: device-width;
-}
-
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-.visible-phone {
-  display: none !important;
-}
-
-.visible-tablet {
-  display: none !important;
-}
-
-.hidden-desktop {
-  display: none !important;
-}
-
-.visible-desktop {
-  display: inherit !important;
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important ;
-  }
-  .visible-tablet {
-    display: inherit !important;
-  }
-  .hidden-tablet {
-    display: none !important;
-  }
-}
-
-@media (max-width: 767px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important;
-  }
-  .visible-phone {
-    display: inherit !important;
-  }
-  .hidden-phone {
-    display: none !important;
-  }
-}
-
-.visible-print {
-  display: none !important;
-}
-
-@media print {
-  .visible-print {
-    display: inherit !important;
-  }
-  .hidden-print {
-    display: none !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .row {
-    margin-left: -30px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 30px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 1170px;
-  }
-  .span12 {
-    width: 1170px;
-  }
-  .span11 {
-    width: 1070px;
-  }
-  .span10 {
-    width: 970px;
-  }
-  .span9 {
-    width: 870px;
-  }
-  .span8 {
-    width: 770px;
-  }
-  .span7 {
-    width: 670px;
-  }
-  .span6 {
-    width: 570px;
-  }
-  .span5 {
-    width: 470px;
-  }
-  .span4 {
-    width: 370px;
-  }
-  .span3 {
-    width: 270px;
-  }
-  .span2 {
-    width: 170px;
-  }
-  .span1 {
-    width: 70px;
-  }
-  .offset12 {
-    margin-left: 1230px;
-  }
-  .offset11 {
-    margin-left: 1130px;
-  }
-  .offset10 {
-    margin-left: 1030px;
-  }
-  .offset9 {
-    margin-left: 930px;
-  }
-  .offset8 {
-    margin-left: 830px;
-  }
-  .offset7 {
-    margin-left: 730px;
-  }
-  .offset6 {
-    margin-left: 630px;
-  }
-  .offset5 {
-    margin-left: 530px;
-  }
-  .offset4 {
-    margin-left: 430px;
-  }
-  .offset3 {
-    margin-left: 330px;
-  }
-  .offset2 {
-    margin-left: 230px;
-  }
-  .offset1 {
-    margin-left: 130px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 30px;
-    margin-left: 2.564102564102564%;
-    *margin-left: 2.5109110747408616%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 2.564102564102564%;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.45299145299145%;
-    *width: 91.39979996362975%;
-  }
-  .row-fluid .span10 {
-    width: 82.90598290598291%;
-    *width: 82.8527914166212%;
-  }
-  .row-fluid .span9 {
-    width: 74.35897435897436%;
-    *width: 74.30578286961266%;
-  }
-  .row-fluid .span8 {
-    width: 65.81196581196582%;
-    *width: 65.75877432260411%;
-  }
-  .row-fluid .span7 {
-    width: 57.26495726495726%;
-    *width: 57.21176577559556%;
-  }
-  .row-fluid .span6 {
-    width: 48.717948717948715%;
-    *width: 48.664757228587014%;
-  }
-  .row-fluid .span5 {
-    width: 40.17094017094017%;
-    *width: 40.11774868157847%;
-  }
-  .row-fluid .span4 {
-    width: 31.623931623931625%;
-    *width: 31.570740134569924%;
-  }
-  .row-fluid .span3 {
-    width: 23.076923076923077%;
-    *width: 23.023731587561375%;
-  }
-  .row-fluid .span2 {
-    width: 14.52991452991453%;
-    *width: 14.476723040552828%;
-  }
-  .row-fluid .span1 {
-    width: 5.982905982905983%;
-    *width: 5.929714493544281%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.12820512820512%;
-    *margin-left: 105.02182214948171%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.56410256410257%;
-    *margin-left: 102.45771958537915%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.58119658119658%;
-    *margin-left: 96.47481360247316%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.01709401709402%;
-    *margin-left: 93.91071103837061%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.03418803418803%;
-    *margin-left: 87.92780505546462%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.47008547008548%;
-    *margin-left: 85.36370249136206%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.48717948717949%;
-    *margin-left: 79.38079650845607%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 76.92307692307693%;
-    *margin-left: 76.81669394435352%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 70.94017094017094%;
-    *margin-left: 70.83378796144753%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.37606837606839%;
-    *margin-left: 68.26968539734497%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.393162393162385%;
-    *margin-left: 62.28677941443899%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.82905982905982%;
-    *margin-left: 59.72267685033642%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 53.84615384615384%;
-    *margin-left: 53.739770867430444%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.28205128205128%;
-    *margin-left: 51.175668303327875%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.299145299145295%;
-    *margin-left: 45.1927623204219%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.73504273504273%;
-    *margin-left: 42.62865975631933%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 36.75213675213675%;
-    *margin-left: 36.645753773413354%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.18803418803419%;
-    *margin-left: 34.081651209310785%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.205128205128204%;
-    *margin-left: 28.0987452264048%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.641025641025642%;
-    *margin-left: 25.53464266230224%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.65811965811966%;
-    *margin-left: 19.551736679396257%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.094017094017094%;
-    *margin-left: 16.98763411529369%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.11111111111111%;
-    *margin-left: 11.004728132387708%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.547008547008547%;
-    *margin-left: 8.440625568285142%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 30px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 1156px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 1056px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 956px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 856px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 756px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 656px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 556px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 456px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 356px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 256px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 156px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 56px;
-  }
-  .thumbnails {
-    margin-left: -30px;
-  }
-  .thumbnails > li {
-    margin-left: 30px;
-  }
-  .row-fluid .thumbnails {
-    margin-left: 0;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .row {
-    margin-left: -20px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 20px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 724px;
-  }
-  .span12 {
-    width: 724px;
-  }
-  .span11 {
-    width: 662px;
-  }
-  .span10 {
-    width: 600px;
-  }
-  .span9 {
-    width: 538px;
-  }
-  .span8 {
-    width: 476px;
-  }
-  .span7 {
-    width: 414px;
-  }
-  .span6 {
-    width: 352px;
-  }
-  .span5 {
-    width: 290px;
-  }
-  .span4 {
-    width: 228px;
-  }
-  .span3 {
-    width: 166px;
-  }
-  .span2 {
-    width: 104px;
-  }
-  .span1 {
-    width: 42px;
-  }
-  .offset12 {
-    margin-left: 764px;
-  }
-  .offset11 {
-    margin-left: 702px;
-  }
-  .offset10 {
-    margin-left: 640px;
-  }
-  .offset9 {
-    margin-left: 578px;
-  }
-  .offset8 {
-    margin-left: 516px;
-  }
-  .offset7 {
-    margin-left: 454px;
-  }
-  .offset6 {
-    margin-left: 392px;
-  }
-  .offset5 {
-    margin-left: 330px;
-  }
-  .offset4 {
-    margin-left: 268px;
-  }
-  .offset3 {
-    margin-left: 206px;
-  }
-  .offset2 {
-    margin-left: 144px;
-  }
-  .offset1 {
-    margin-left: 82px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 30px;
-    margin-left: 2.7624309392265194%;
-    *margin-left: 2.709239449864817%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 2.7624309392265194%;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.43646408839778%;
-    *width: 91.38327259903608%;
-  }
-  .row-fluid .span10 {
-    width: 82.87292817679558%;
-    *width: 82.81973668743387%;
-  }
-  .row-fluid .span9 {
-    width: 74.30939226519337%;
-    *width: 74.25620077583166%;
-  }
-  .row-fluid .span8 {
-    width: 65.74585635359117%;
-    *width: 65.69266486422946%;
-  }
-  .row-fluid .span7 {
-    width: 57.18232044198895%;
-    *width: 57.12912895262725%;
-  }
-  .row-fluid .span6 {
-    width: 48.61878453038674%;
-    *width: 48.56559304102504%;
-  }
-  .row-fluid .span5 {
-    width: 40.05524861878453%;
-    *width: 40.00205712942283%;
-  }
-  .row-fluid .span4 {
-    width: 31.491712707182323%;
-    *width: 31.43852121782062%;
-  }
-  .row-fluid .span3 {
-    width: 22.92817679558011%;
-    *width: 22.87498530621841%;
-  }
-  .row-fluid .span2 {
-    width: 14.3646408839779%;
-    *width: 14.311449394616199%;
-  }
-  .row-fluid .span1 {
-    width: 5.801104972375691%;
-    *width: 5.747913483013988%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.52486187845304%;
-    *margin-left: 105.41847889972962%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.76243093922652%;
-    *margin-left: 102.6560479605031%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.96132596685082%;
-    *margin-left: 96.8549429881274%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.1988950276243%;
-    *margin-left: 94.09251204890089%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.39779005524862%;
-    *margin-left: 88.2914070765252%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.6353591160221%;
-    *margin-left: 85.52897613729868%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.8342541436464%;
-    *margin-left: 79.72787116492299%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 77.07182320441989%;
-    *margin-left: 76.96544022569647%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 71.2707182320442%;
-    *margin-left: 71.16433525332079%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.50828729281768%;
-    *margin-left: 68.40190431409427%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.70718232044199%;
-    *margin-left: 62.600799341718584%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.94475138121547%;
-    *margin-left: 59.838368402492065%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 54.14364640883978%;
-    *margin-left: 54.037263430116376%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.38121546961326%;
-    *margin-left: 51.27483249088986%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.58011049723757%;
-    *margin-left: 45.47372751851417%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.81767955801105%;
-    *margin-left: 42.71129657928765%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 37.01657458563536%;
-    *margin-left: 36.91019160691196%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.25414364640884%;
-    *margin-left: 34.14776066768544%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.45303867403315%;
-    *margin-left: 28.346655695309746%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.69060773480663%;
-    *margin-left: 25.584224756083227%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.88950276243094%;
-    *margin-left: 19.783119783707537%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.12707182320442%;
-    *margin-left: 17.02068884448102%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.32596685082873%;
-    *margin-left: 11.219583872105325%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.56353591160221%;
-    *margin-left: 8.457152932878806%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 20px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 710px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 648px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 586px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 524px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 462px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 400px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 338px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 276px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 214px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 152px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 90px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 28px;
-  }
-}
-
-@media (max-width: 767px) {
-  body {
-    padding-right: 20px;
-    padding-left: 20px;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom,
-  .navbar-static-top {
-    margin-right: -20px;
-    margin-left: -20px;
-  }
-  .container-fluid {
-    padding: 0;
-  }
-  .dl-horizontal dt {
-    float: none;
-    width: auto;
-    clear: none;
-    text-align: left;
-  }
-  .dl-horizontal dd {
-    margin-left: 0;
-  }
-  .container {
-    width: auto;
-  }
-  .row-fluid {
-    width: 100%;
-  }
-  .row,
-  .thumbnails {
-    margin-left: 0;
-  }
-  .thumbnails > li {
-    float: none;
-    margin-left: 0;
-  }
-  [class*="span"],
-  .uneditable-input[class*="span"],
-  .row-fluid [class*="span"] {
-    display: block;
-    float: none;
-    width: 100%;
-    margin-left: 0;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .span12,
-  .row-fluid .span12 {
-    width: 100%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="offset"]:first-child {
-    margin-left: 0;
-  }
-  .input-large,
-  .input-xlarge,
-  .input-xxlarge,
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    display: block;
-    width: 100%;
-    min-height: 30px;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .input-prepend input,
-  .input-append input,
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    display: inline-block;
-    width: auto;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 0;
-  }
-  .modal {
-    position: fixed;
-    top: 20px;
-    right: 20px;
-    left: 20px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade {
-    top: -100px;
-  }
-  .modal.fade.in {
-    top: 20px;
-  }
-}
-
-@media (max-width: 480px) {
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-  .page-header h1 small {
-    display: block;
-    line-height: 20px;
-  }
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-  .form-horizontal .control-label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  .form-horizontal .control-list {
-    padding-top: 0;
-  }
-  .form-horizontal .form-actions {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-  .media .pull-left,
-  .media .pull-right {
-    display: block;
-    float: none;
-    margin-bottom: 10px;
-  }
-  .media-object {
-    margin-right: 0;
-    margin-left: 0;
-  }
-  .modal {
-    top: 10px;
-    right: 10px;
-    left: 10px;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-  .carousel-caption {
-    position: static;
-  }
-}
-
-@media (max-width: 979px) {
-  body {
-    padding-top: 0;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: static;
-  }
-  .navbar-fixed-top {
-    margin-bottom: 20px;
-  }
-  .navbar-fixed-bottom {
-    margin-top: 20px;
-  }
-  .navbar-fixed-top .navbar-inner,
-  .navbar-fixed-bottom .navbar-inner {
-    padding: 5px;
-  }
-  .navbar .container {
-    width: auto;
-    padding: 0;
-  }
-  .navbar .brand {
-    padding-right: 10px;
-    padding-left: 10px;
-    margin: 0 0 0 -5px;
-  }
-  .nav-collapse {
-    clear: both;
-  }
-  .nav-collapse .nav {
-    float: none;
-    margin: 0 0 10px;
-  }
-  .nav-collapse .nav > li {
-    float: none;
-  }
-  .nav-collapse .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > .divider-vertical {
-    display: none;
-  }
-  .nav-collapse .nav .nav-header {
-    color: #777777;
-    text-shadow: none;
-  }
-  .nav-collapse .nav > li > a,
-  .nav-collapse .dropdown-menu a {
-    padding: 9px 15px;
-    font-weight: bold;
-    color: #777777;
-    -webkit-border-radius: 3px;
-       -moz-border-radius: 3px;
-            border-radius: 3px;
-  }
-  .nav-collapse .btn {
-    padding: 4px 10px 4px;
-    font-weight: normal;
-    -webkit-border-radius: 4px;
-       -moz-border-radius: 4px;
-            border-radius: 4px;
-  }
-  .nav-collapse .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > li > a:hover,
-  .nav-collapse .nav > li > a:focus,
-  .nav-collapse .dropdown-menu a:hover,
-  .nav-collapse .dropdown-menu a:focus {
-    background-color: #f2f2f2;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a,
-  .navbar-inverse .nav-collapse .dropdown-menu a {
-    color: #999999;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a:hover,
-  .navbar-inverse .nav-collapse .nav > li > a:focus,
-  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
-  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
-    background-color: #111111;
-  }
-  .nav-collapse.in .btn-group {
-    padding: 0;
-    margin-top: 5px;
-  }
-  .nav-collapse .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    display: none;
-    float: none;
-    max-width: none;
-    padding: 0;
-    margin: 0 15px;
-    background-color: transparent;
-    border: none;
-    -webkit-border-radius: 0;
-       -moz-border-radius: 0;
-            border-radius: 0;
-    -webkit-box-shadow: none;
-       -moz-box-shadow: none;
-            box-shadow: none;
-  }
-  .nav-collapse .open > .dropdown-menu {
-    display: block;
-  }
-  .nav-collapse .dropdown-menu:before,
-  .nav-collapse .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .dropdown-menu .divider {
-    display: none;
-  }
-  .nav-collapse .nav > li > .dropdown-menu:before,
-  .nav-collapse .nav > li > .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .navbar-form,
-  .nav-collapse .navbar-search {
-    float: none;
-    padding: 10px 15px;
-    margin: 10px 0;
-    border-top: 1px solid #f2f2f2;
-    border-bottom: 1px solid #f2f2f2;
-    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-  }
-  .navbar-inverse .nav-collapse .navbar-form,
-  .navbar-inverse .nav-collapse .navbar-search {
-    border-top-color: #111111;
-    border-bottom-color: #111111;
-  }
-  .navbar .nav-collapse .nav.pull-right {
-    float: none;
-    margin-left: 0;
-  }
-  .nav-collapse,
-  .nav-collapse.collapse {
-    height: 0;
-    overflow: hidden;
-  }
-  .navbar .btn-navbar {
-    display: block;
-  }
-  .navbar-static .navbar-inner {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-}
-
-@media (min-width: 980px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-}
diff --git a/view/theme/oldtest/css/bootstrap-responsive.min.css b/view/theme/oldtest/css/bootstrap-responsive.min.css
deleted file mode 100644
index d1b7f4b0b8..0000000000
--- a/view/theme/oldtest/css/bootstrap-responsive.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap Responsive v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/view/theme/oldtest/css/bootstrap.css b/view/theme/oldtest/css/bootstrap.css
deleted file mode 100644
index 2f56af33f3..0000000000
--- a/view/theme/oldtest/css/bootstrap.css
+++ /dev/null
@@ -1,6158 +0,0 @@
-/*!
- * Bootstrap v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-  display: block;
-}
-
-audio,
-canvas,
-video {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-}
-
-audio:not([controls]) {
-  display: none;
-}
-
-html {
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-
-a:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-a:hover,
-a:active {
-  outline: 0;
-}
-
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-
-sup {
-  top: -0.5em;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-img {
-  width: auto\9;
-  height: auto;
-  max-width: 100%;
-  vertical-align: middle;
-  border: 0;
-  -ms-interpolation-mode: bicubic;
-}
-
-#map_canvas img,
-.google-maps img {
-  max-width: none;
-}
-
-button,
-input,
-select,
-textarea {
-  margin: 0;
-  font-size: 100%;
-  vertical-align: middle;
-}
-
-button,
-input {
-  *overflow: visible;
-  line-height: normal;
-}
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-
-button,
-html input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  cursor: pointer;
-  -webkit-appearance: button;
-}
-
-label,
-select,
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"],
-input[type="radio"],
-input[type="checkbox"] {
-  cursor: pointer;
-}
-
-input[type="search"] {
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
-  -webkit-appearance: textfield;
-}
-
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none;
-}
-
-textarea {
-  overflow: auto;
-  vertical-align: top;
-}
-
-@media print {
-  * {
-    color: #000 !important;
-    text-shadow: none !important;
-    background: transparent !important;
-    box-shadow: none !important;
-  }
-  a,
-  a:visited {
-    text-decoration: underline;
-  }
-  a[href]:after {
-    content: " (" attr(href) ")";
-  }
-  abbr[title]:after {
-    content: " (" attr(title) ")";
-  }
-  .ir a:after,
-  a[href^="javascript:"]:after,
-  a[href^="#"]:after {
-    content: "";
-  }
-  pre,
-  blockquote {
-    border: 1px solid #999;
-    page-break-inside: avoid;
-  }
-  thead {
-    display: table-header-group;
-  }
-  tr,
-  img {
-    page-break-inside: avoid;
-  }
-  img {
-    max-width: 100% !important;
-  }
-  @page  {
-    margin: 0.5cm;
-  }
-  p,
-  h2,
-  h3 {
-    orphans: 3;
-    widows: 3;
-  }
-  h2,
-  h3 {
-    page-break-after: avoid;
-  }
-}
-
-body {
-  margin: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  line-height: 20px;
-  color: #333333;
-  background-color: #ffffff;
-}
-
-a {
-  color: #0088cc;
-  text-decoration: none;
-}
-
-a:hover,
-a:focus {
-  color: #005580;
-  text-decoration: underline;
-}
-
-.img-rounded {
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.img-polaroid {
-  padding: 4px;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-}
-
-.img-circle {
-  -webkit-border-radius: 500px;
-     -moz-border-radius: 500px;
-          border-radius: 500px;
-}
-
-.row {
-  margin-left: -20px;
-  *zoom: 1;
-}
-
-.row:before,
-.row:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.row:after {
-  clear: both;
-}
-
-[class*="span"] {
-  float: left;
-  min-height: 1px;
-  margin-left: 20px;
-}
-
-.container,
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
-}
-
-.span12 {
-  width: 940px;
-}
-
-.span11 {
-  width: 860px;
-}
-
-.span10 {
-  width: 780px;
-}
-
-.span9 {
-  width: 700px;
-}
-
-.span8 {
-  width: 620px;
-}
-
-.span7 {
-  width: 540px;
-}
-
-.span6 {
-  width: 460px;
-}
-
-.span5 {
-  width: 380px;
-}
-
-.span4 {
-  width: 300px;
-}
-
-.span3 {
-  width: 220px;
-}
-
-.span2 {
-  width: 140px;
-}
-
-.span1 {
-  width: 60px;
-}
-
-.offset12 {
-  margin-left: 980px;
-}
-
-.offset11 {
-  margin-left: 900px;
-}
-
-.offset10 {
-  margin-left: 820px;
-}
-
-.offset9 {
-  margin-left: 740px;
-}
-
-.offset8 {
-  margin-left: 660px;
-}
-
-.offset7 {
-  margin-left: 580px;
-}
-
-.offset6 {
-  margin-left: 500px;
-}
-
-.offset5 {
-  margin-left: 420px;
-}
-
-.offset4 {
-  margin-left: 340px;
-}
-
-.offset3 {
-  margin-left: 260px;
-}
-
-.offset2 {
-  margin-left: 180px;
-}
-
-.offset1 {
-  margin-left: 100px;
-}
-
-.row-fluid {
-  width: 100%;
-  *zoom: 1;
-}
-
-.row-fluid:before,
-.row-fluid:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.row-fluid:after {
-  clear: both;
-}
-
-.row-fluid [class*="span"] {
-  display: block;
-  float: left;
-  width: 100%;
-  min-height: 30px;
-  margin-left: 2.127659574468085%;
-  *margin-left: 2.074468085106383%;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.row-fluid [class*="span"]:first-child {
-  margin-left: 0;
-}
-
-.row-fluid .controls-row [class*="span"] + [class*="span"] {
-  margin-left: 2.127659574468085%;
-}
-
-.row-fluid .span12 {
-  width: 100%;
-  *width: 99.94680851063829%;
-}
-
-.row-fluid .span11 {
-  width: 91.48936170212765%;
-  *width: 91.43617021276594%;
-}
-
-.row-fluid .span10 {
-  width: 82.97872340425532%;
-  *width: 82.92553191489361%;
-}
-
-.row-fluid .span9 {
-  width: 74.46808510638297%;
-  *width: 74.41489361702126%;
-}
-
-.row-fluid .span8 {
-  width: 65.95744680851064%;
-  *width: 65.90425531914893%;
-}
-
-.row-fluid .span7 {
-  width: 57.44680851063829%;
-  *width: 57.39361702127659%;
-}
-
-.row-fluid .span6 {
-  width: 48.93617021276595%;
-  *width: 48.88297872340425%;
-}
-
-.row-fluid .span5 {
-  width: 40.42553191489362%;
-  *width: 40.37234042553192%;
-}
-
-.row-fluid .span4 {
-  width: 31.914893617021278%;
-  *width: 31.861702127659576%;
-}
-
-.row-fluid .span3 {
-  width: 23.404255319148934%;
-  *width: 23.351063829787233%;
-}
-
-.row-fluid .span2 {
-  width: 14.893617021276595%;
-  *width: 14.840425531914894%;
-}
-
-.row-fluid .span1 {
-  width: 6.382978723404255%;
-  *width: 6.329787234042553%;
-}
-
-.row-fluid .offset12 {
-  margin-left: 104.25531914893617%;
-  *margin-left: 104.14893617021275%;
-}
-
-.row-fluid .offset12:first-child {
-  margin-left: 102.12765957446808%;
-  *margin-left: 102.02127659574467%;
-}
-
-.row-fluid .offset11 {
-  margin-left: 95.74468085106382%;
-  *margin-left: 95.6382978723404%;
-}
-
-.row-fluid .offset11:first-child {
-  margin-left: 93.61702127659574%;
-  *margin-left: 93.51063829787232%;
-}
-
-.row-fluid .offset10 {
-  margin-left: 87.23404255319149%;
-  *margin-left: 87.12765957446807%;
-}
-
-.row-fluid .offset10:first-child {
-  margin-left: 85.1063829787234%;
-  *margin-left: 84.99999999999999%;
-}
-
-.row-fluid .offset9 {
-  margin-left: 78.72340425531914%;
-  *margin-left: 78.61702127659572%;
-}
-
-.row-fluid .offset9:first-child {
-  margin-left: 76.59574468085106%;
-  *margin-left: 76.48936170212764%;
-}
-
-.row-fluid .offset8 {
-  margin-left: 70.2127659574468%;
-  *margin-left: 70.10638297872339%;
-}
-
-.row-fluid .offset8:first-child {
-  margin-left: 68.08510638297872%;
-  *margin-left: 67.9787234042553%;
-}
-
-.row-fluid .offset7 {
-  margin-left: 61.70212765957446%;
-  *margin-left: 61.59574468085106%;
-}
-
-.row-fluid .offset7:first-child {
-  margin-left: 59.574468085106375%;
-  *margin-left: 59.46808510638297%;
-}
-
-.row-fluid .offset6 {
-  margin-left: 53.191489361702125%;
-  *margin-left: 53.085106382978715%;
-}
-
-.row-fluid .offset6:first-child {
-  margin-left: 51.063829787234035%;
-  *margin-left: 50.95744680851063%;
-}
-
-.row-fluid .offset5 {
-  margin-left: 44.68085106382979%;
-  *margin-left: 44.57446808510638%;
-}
-
-.row-fluid .offset5:first-child {
-  margin-left: 42.5531914893617%;
-  *margin-left: 42.4468085106383%;
-}
-
-.row-fluid .offset4 {
-  margin-left: 36.170212765957444%;
-  *margin-left: 36.06382978723405%;
-}
-
-.row-fluid .offset4:first-child {
-  margin-left: 34.04255319148936%;
-  *margin-left: 33.93617021276596%;
-}
-
-.row-fluid .offset3 {
-  margin-left: 27.659574468085104%;
-  *margin-left: 27.5531914893617%;
-}
-
-.row-fluid .offset3:first-child {
-  margin-left: 25.53191489361702%;
-  *margin-left: 25.425531914893618%;
-}
-
-.row-fluid .offset2 {
-  margin-left: 19.148936170212764%;
-  *margin-left: 19.04255319148936%;
-}
-
-.row-fluid .offset2:first-child {
-  margin-left: 17.02127659574468%;
-  *margin-left: 16.914893617021278%;
-}
-
-.row-fluid .offset1 {
-  margin-left: 10.638297872340425%;
-  *margin-left: 10.53191489361702%;
-}
-
-.row-fluid .offset1:first-child {
-  margin-left: 8.51063829787234%;
-  *margin-left: 8.404255319148938%;
-}
-
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
-  display: none;
-}
-
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
-  float: right;
-}
-
-.container {
-  margin-right: auto;
-  margin-left: auto;
-  *zoom: 1;
-}
-
-.container:before,
-.container:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.container:after {
-  clear: both;
-}
-
-.container-fluid {
-  padding-right: 20px;
-  padding-left: 20px;
-  *zoom: 1;
-}
-
-.container-fluid:before,
-.container-fluid:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.container-fluid:after {
-  clear: both;
-}
-
-p {
-  margin: 0 0 10px;
-}
-
-.lead {
-  margin-bottom: 20px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 30px;
-}
-
-small {
-  font-size: 85%;
-}
-
-strong {
-  font-weight: bold;
-}
-
-em {
-  font-style: italic;
-}
-
-cite {
-  font-style: normal;
-}
-
-.muted {
-  color: #999999;
-}
-
-a.muted:hover,
-a.muted:focus {
-  color: #808080;
-}
-
-.text-warning {
-  color: #c09853;
-}
-
-a.text-warning:hover,
-a.text-warning:focus {
-  color: #a47e3c;
-}
-
-.text-error {
-  color: #b94a48;
-}
-
-a.text-error:hover,
-a.text-error:focus {
-  color: #953b39;
-}
-
-.text-info {
-  color: #3a87ad;
-}
-
-a.text-info:hover,
-a.text-info:focus {
-  color: #2d6987;
-}
-
-.text-success {
-  color: #468847;
-}
-
-a.text-success:hover,
-a.text-success:focus {
-  color: #356635;
-}
-
-.text-left {
-  text-align: left;
-}
-
-.text-right {
-  text-align: right;
-}
-
-.text-center {
-  text-align: center;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 10px 0;
-  font-family: inherit;
-  font-weight: bold;
-  line-height: 20px;
-  color: inherit;
-  text-rendering: optimizelegibility;
-}
-
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
-  font-weight: normal;
-  line-height: 1;
-  color: #999999;
-}
-
-h1,
-h2,
-h3 {
-  line-height: 40px;
-}
-
-h1 {
-  font-size: 38.5px;
-}
-
-h2 {
-  font-size: 31.5px;
-}
-
-h3 {
-  font-size: 24.5px;
-}
-
-h4 {
-  font-size: 17.5px;
-}
-
-h5 {
-  font-size: 14px;
-}
-
-h6 {
-  font-size: 11.9px;
-}
-
-h1 small {
-  font-size: 24.5px;
-}
-
-h2 small {
-  font-size: 17.5px;
-}
-
-h3 small {
-  font-size: 14px;
-}
-
-h4 small {
-  font-size: 14px;
-}
-
-.page-header {
-  padding-bottom: 9px;
-  margin: 20px 0 30px;
-  border-bottom: 1px solid #eeeeee;
-}
-
-ul,
-ol {
-  padding: 0;
-  margin: 0 0 10px 25px;
-}
-
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-
-li {
-  line-height: 20px;
-}
-
-ul.unstyled,
-ol.unstyled {
-  margin-left: 0;
-  list-style: none;
-}
-
-ul.inline,
-ol.inline {
-  margin-left: 0;
-  list-style: none;
-}
-
-ul.inline > li,
-ol.inline > li {
-  display: inline-block;
-  *display: inline;
-  padding-right: 5px;
-  padding-left: 5px;
-  *zoom: 1;
-}
-
-dl {
-  margin-bottom: 20px;
-}
-
-dt,
-dd {
-  line-height: 20px;
-}
-
-dt {
-  font-weight: bold;
-}
-
-dd {
-  margin-left: 10px;
-}
-
-.dl-horizontal {
-  *zoom: 1;
-}
-
-.dl-horizontal:before,
-.dl-horizontal:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.dl-horizontal:after {
-  clear: both;
-}
-
-.dl-horizontal dt {
-  float: left;
-  width: 160px;
-  overflow: hidden;
-  clear: left;
-  text-align: right;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.dl-horizontal dd {
-  margin-left: 180px;
-}
-
-hr {
-  margin: 20px 0;
-  border: 0;
-  border-top: 1px solid #eeeeee;
-  border-bottom: 1px solid #ffffff;
-}
-
-abbr[title],
-abbr[data-original-title] {
-  cursor: help;
-  border-bottom: 1px dotted #999999;
-}
-
-abbr.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
-
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 20px;
-  border-left: 5px solid #eeeeee;
-}
-
-blockquote p {
-  margin-bottom: 0;
-  font-size: 17.5px;
-  font-weight: 300;
-  line-height: 1.25;
-}
-
-blockquote small {
-  display: block;
-  line-height: 20px;
-  color: #999999;
-}
-
-blockquote small:before {
-  content: '\2014 \00A0';
-}
-
-blockquote.pull-right {
-  float: right;
-  padding-right: 15px;
-  padding-left: 0;
-  border-right: 5px solid #eeeeee;
-  border-left: 0;
-}
-
-blockquote.pull-right p,
-blockquote.pull-right small {
-  text-align: right;
-}
-
-blockquote.pull-right small:before {
-  content: '';
-}
-
-blockquote.pull-right small:after {
-  content: '\00A0 \2014';
-}
-
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-
-address {
-  display: block;
-  margin-bottom: 20px;
-  font-style: normal;
-  line-height: 20px;
-}
-
-code,
-pre {
-  padding: 0 3px 2px;
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
-  font-size: 12px;
-  color: #333333;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-code {
-  padding: 2px 4px;
-  color: #d14;
-  white-space: nowrap;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-}
-
-pre {
-  display: block;
-  padding: 9.5px;
-  margin: 0 0 10px;
-  font-size: 13px;
-  line-height: 20px;
-  word-break: break-all;
-  word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-pre.prettyprint {
-  margin-bottom: 20px;
-}
-
-pre code {
-  padding: 0;
-  color: inherit;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: transparent;
-  border: 0;
-}
-
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}
-
-form {
-  margin: 0 0 20px;
-}
-
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 20px;
-  font-size: 21px;
-  line-height: 40px;
-  color: #333333;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
-}
-
-legend small {
-  font-size: 15px;
-  color: #999999;
-}
-
-label,
-input,
-button,
-select,
-textarea {
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 20px;
-}
-
-input,
-button,
-select,
-textarea {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-label {
-  display: block;
-  margin-bottom: 5px;
-}
-
-select,
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  display: inline-block;
-  height: 20px;
-  padding: 4px 6px;
-  margin-bottom: 10px;
-  font-size: 14px;
-  line-height: 20px;
-  color: #555555;
-  vertical-align: middle;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-input,
-textarea,
-.uneditable-input {
-  width: 206px;
-}
-
-textarea {
-  height: auto;
-}
-
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
-          transition: border linear 0.2s, box-shadow linear 0.2s;
-}
-
-textarea:focus,
-input[type="text"]:focus,
-input[type="password"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="date"]:focus,
-input[type="month"]:focus,
-input[type="time"]:focus,
-input[type="week"]:focus,
-input[type="number"]:focus,
-input[type="email"]:focus,
-input[type="url"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="color"]:focus,
-.uneditable-input:focus {
-  border-color: rgba(82, 168, 236, 0.8);
-  outline: 0;
-  outline: thin dotted \9;
-  /* IE6-9 */
-
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-}
-
-input[type="radio"],
-input[type="checkbox"] {
-  margin: 4px 0 0;
-  margin-top: 1px \9;
-  *margin-top: 0;
-  line-height: normal;
-}
-
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto;
-}
-
-select,
-input[type="file"] {
-  height: 30px;
-  /* In IE7, the height of the select element cannot be changed by height, only font-size */
-
-  *margin-top: 4px;
-  /* For IE7, add top margin to align select with labels */
-
-  line-height: 30px;
-}
-
-select {
-  width: 220px;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-}
-
-select[multiple],
-select[size] {
-  height: auto;
-}
-
-select:focus,
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-.uneditable-input,
-.uneditable-textarea {
-  color: #999999;
-  cursor: not-allowed;
-  background-color: #fcfcfc;
-  border-color: #cccccc;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-}
-
-.uneditable-input {
-  overflow: hidden;
-  white-space: nowrap;
-}
-
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-
-input:-moz-placeholder,
-textarea:-moz-placeholder {
-  color: #999999;
-}
-
-input:-ms-input-placeholder,
-textarea:-ms-input-placeholder {
-  color: #999999;
-}
-
-input::-webkit-input-placeholder,
-textarea::-webkit-input-placeholder {
-  color: #999999;
-}
-
-.radio,
-.checkbox {
-  min-height: 20px;
-  padding-left: 20px;
-}
-
-.radio input[type="radio"],
-.checkbox input[type="checkbox"] {
-  float: left;
-  margin-left: -20px;
-}
-
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  padding-top: 5px;
-}
-
-.radio.inline,
-.checkbox.inline {
-  display: inline-block;
-  padding-top: 5px;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
-  margin-left: 10px;
-}
-
-.input-mini {
-  width: 60px;
-}
-
-.input-small {
-  width: 90px;
-}
-
-.input-medium {
-  width: 150px;
-}
-
-.input-large {
-  width: 210px;
-}
-
-.input-xlarge {
-  width: 270px;
-}
-
-.input-xxlarge {
-  width: 530px;
-}
-
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"] {
-  float: none;
-  margin-left: 0;
-}
-
-.input-append input[class*="span"],
-.input-append .uneditable-input[class*="span"],
-.input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
-  display: inline-block;
-}
-
-input,
-textarea,
-.uneditable-input {
-  margin-left: 0;
-}
-
-.controls-row [class*="span"] + [class*="span"] {
-  margin-left: 20px;
-}
-
-input.span12,
-textarea.span12,
-.uneditable-input.span12 {
-  width: 926px;
-}
-
-input.span11,
-textarea.span11,
-.uneditable-input.span11 {
-  width: 846px;
-}
-
-input.span10,
-textarea.span10,
-.uneditable-input.span10 {
-  width: 766px;
-}
-
-input.span9,
-textarea.span9,
-.uneditable-input.span9 {
-  width: 686px;
-}
-
-input.span8,
-textarea.span8,
-.uneditable-input.span8 {
-  width: 606px;
-}
-
-input.span7,
-textarea.span7,
-.uneditable-input.span7 {
-  width: 526px;
-}
-
-input.span6,
-textarea.span6,
-.uneditable-input.span6 {
-  width: 446px;
-}
-
-input.span5,
-textarea.span5,
-.uneditable-input.span5 {
-  width: 366px;
-}
-
-input.span4,
-textarea.span4,
-.uneditable-input.span4 {
-  width: 286px;
-}
-
-input.span3,
-textarea.span3,
-.uneditable-input.span3 {
-  width: 206px;
-}
-
-input.span2,
-textarea.span2,
-.uneditable-input.span2 {
-  width: 126px;
-}
-
-input.span1,
-textarea.span1,
-.uneditable-input.span1 {
-  width: 46px;
-}
-
-.controls-row {
-  *zoom: 1;
-}
-
-.controls-row:before,
-.controls-row:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.controls-row:after {
-  clear: both;
-}
-
-.controls-row [class*="span"],
-.row-fluid .controls-row [class*="span"] {
-  float: left;
-}
-
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
-  padding-top: 5px;
-}
-
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  cursor: not-allowed;
-  background-color: #eeeeee;
-}
-
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
-}
-
-.control-group.warning .control-label,
-.control-group.warning .help-block,
-.control-group.warning .help-inline {
-  color: #c09853;
-}
-
-.control-group.warning .checkbox,
-.control-group.warning .radio,
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
-  color: #c09853;
-}
-
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
-  border-color: #c09853;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.warning input:focus,
-.control-group.warning select:focus,
-.control-group.warning textarea:focus {
-  border-color: #a47e3c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-}
-
-.control-group.warning .input-prepend .add-on,
-.control-group.warning .input-append .add-on {
-  color: #c09853;
-  background-color: #fcf8e3;
-  border-color: #c09853;
-}
-
-.control-group.error .control-label,
-.control-group.error .help-block,
-.control-group.error .help-inline {
-  color: #b94a48;
-}
-
-.control-group.error .checkbox,
-.control-group.error .radio,
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
-  color: #b94a48;
-}
-
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
-  border-color: #b94a48;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.error input:focus,
-.control-group.error select:focus,
-.control-group.error textarea:focus {
-  border-color: #953b39;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-}
-
-.control-group.error .input-prepend .add-on,
-.control-group.error .input-append .add-on {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #b94a48;
-}
-
-.control-group.success .control-label,
-.control-group.success .help-block,
-.control-group.success .help-inline {
-  color: #468847;
-}
-
-.control-group.success .checkbox,
-.control-group.success .radio,
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
-  color: #468847;
-}
-
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.success input:focus,
-.control-group.success select:focus,
-.control-group.success textarea:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-
-.control-group.success .input-prepend .add-on,
-.control-group.success .input-append .add-on {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #468847;
-}
-
-.control-group.info .control-label,
-.control-group.info .help-block,
-.control-group.info .help-inline {
-  color: #3a87ad;
-}
-
-.control-group.info .checkbox,
-.control-group.info .radio,
-.control-group.info input,
-.control-group.info select,
-.control-group.info textarea {
-  color: #3a87ad;
-}
-
-.control-group.info input,
-.control-group.info select,
-.control-group.info textarea {
-  border-color: #3a87ad;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.info input:focus,
-.control-group.info select:focus,
-.control-group.info textarea:focus {
-  border-color: #2d6987;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-}
-
-.control-group.info .input-prepend .add-on,
-.control-group.info .input-append .add-on {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #3a87ad;
-}
-
-input:focus:invalid,
-textarea:focus:invalid,
-select:focus:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-}
-
-input:focus:invalid:focus,
-textarea:focus:invalid:focus,
-select:focus:invalid:focus {
-  border-color: #e9322d;
-  -webkit-box-shadow: 0 0 6px #f8b9b7;
-     -moz-box-shadow: 0 0 6px #f8b9b7;
-          box-shadow: 0 0 6px #f8b9b7;
-}
-
-.form-actions {
-  padding: 19px 20px 20px;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #e5e5e5;
-  *zoom: 1;
-}
-
-.form-actions:before,
-.form-actions:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.form-actions:after {
-  clear: both;
-}
-
-.help-block,
-.help-inline {
-  color: #595959;
-}
-
-.help-block {
-  display: block;
-  margin-bottom: 10px;
-}
-
-.help-inline {
-  display: inline-block;
-  *display: inline;
-  padding-left: 5px;
-  vertical-align: middle;
-  *zoom: 1;
-}
-
-.input-append,
-.input-prepend {
-  display: inline-block;
-  margin-bottom: 10px;
-  font-size: 0;
-  white-space: nowrap;
-  vertical-align: middle;
-}
-
-.input-append input,
-.input-prepend input,
-.input-append select,
-.input-prepend select,
-.input-append .uneditable-input,
-.input-prepend .uneditable-input,
-.input-append .dropdown-menu,
-.input-prepend .dropdown-menu,
-.input-append .popover,
-.input-prepend .popover {
-  font-size: 14px;
-}
-
-.input-append input,
-.input-prepend input,
-.input-append select,
-.input-prepend select,
-.input-append .uneditable-input,
-.input-prepend .uneditable-input {
-  position: relative;
-  margin-bottom: 0;
-  *margin-left: 0;
-  vertical-align: top;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-append input:focus,
-.input-prepend input:focus,
-.input-append select:focus,
-.input-prepend select:focus,
-.input-append .uneditable-input:focus,
-.input-prepend .uneditable-input:focus {
-  z-index: 2;
-}
-
-.input-append .add-on,
-.input-prepend .add-on {
-  display: inline-block;
-  width: auto;
-  height: 20px;
-  min-width: 16px;
-  padding: 4px 5px;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 20px;
-  text-align: center;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #eeeeee;
-  border: 1px solid #ccc;
-}
-
-.input-append .add-on,
-.input-prepend .add-on,
-.input-append .btn,
-.input-prepend .btn,
-.input-append .btn-group > .dropdown-toggle,
-.input-prepend .btn-group > .dropdown-toggle {
-  vertical-align: top;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.input-append .active,
-.input-prepend .active {
-  background-color: #a9dba9;
-  border-color: #46a546;
-}
-
-.input-prepend .add-on,
-.input-prepend .btn {
-  margin-right: -1px;
-}
-
-.input-prepend .add-on:first-child,
-.input-prepend .btn:first-child {
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.input-append input,
-.input-append select,
-.input-append .uneditable-input {
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.input-append input + .btn-group .btn:last-child,
-.input-append select + .btn-group .btn:last-child,
-.input-append .uneditable-input + .btn-group .btn:last-child {
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-append .add-on,
-.input-append .btn,
-.input-append .btn-group {
-  margin-left: -1px;
-}
-
-.input-append .add-on:last-child,
-.input-append .btn:last-child,
-.input-append .btn-group:last-child > .dropdown-toggle {
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-prepend.input-append input,
-.input-prepend.input-append select,
-.input-prepend.input-append .uneditable-input {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.input-prepend.input-append input + .btn-group .btn,
-.input-prepend.input-append select + .btn-group .btn,
-.input-prepend.input-append .uneditable-input + .btn-group .btn {
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-prepend.input-append .add-on:first-child,
-.input-prepend.input-append .btn:first-child {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.input-prepend.input-append .add-on:last-child,
-.input-prepend.input-append .btn:last-child {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-prepend.input-append .btn-group:first-child {
-  margin-left: 0;
-}
-
-input.search-query {
-  padding-right: 14px;
-  padding-right: 4px \9;
-  padding-left: 14px;
-  padding-left: 4px \9;
-  /* IE7-8 doesn't have border-radius, so don't indent the padding */
-
-  margin-bottom: 0;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-/* Allow for input prepend/append in search forms */
-
-.form-search .input-append .search-query,
-.form-search .input-prepend .search-query {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.form-search .input-append .search-query {
-  -webkit-border-radius: 14px 0 0 14px;
-     -moz-border-radius: 14px 0 0 14px;
-          border-radius: 14px 0 0 14px;
-}
-
-.form-search .input-append .btn {
-  -webkit-border-radius: 0 14px 14px 0;
-     -moz-border-radius: 0 14px 14px 0;
-          border-radius: 0 14px 14px 0;
-}
-
-.form-search .input-prepend .search-query {
-  -webkit-border-radius: 0 14px 14px 0;
-     -moz-border-radius: 0 14px 14px 0;
-          border-radius: 0 14px 14px 0;
-}
-
-.form-search .input-prepend .btn {
-  -webkit-border-radius: 14px 0 0 14px;
-     -moz-border-radius: 14px 0 0 14px;
-          border-radius: 14px 0 0 14px;
-}
-
-.form-search input,
-.form-inline input,
-.form-horizontal input,
-.form-search textarea,
-.form-inline textarea,
-.form-horizontal textarea,
-.form-search select,
-.form-inline select,
-.form-horizontal select,
-.form-search .help-inline,
-.form-inline .help-inline,
-.form-horizontal .help-inline,
-.form-search .uneditable-input,
-.form-inline .uneditable-input,
-.form-horizontal .uneditable-input,
-.form-search .input-prepend,
-.form-inline .input-prepend,
-.form-horizontal .input-prepend,
-.form-search .input-append,
-.form-inline .input-append,
-.form-horizontal .input-append {
-  display: inline-block;
-  *display: inline;
-  margin-bottom: 0;
-  vertical-align: middle;
-  *zoom: 1;
-}
-
-.form-search .hide,
-.form-inline .hide,
-.form-horizontal .hide {
-  display: none;
-}
-
-.form-search label,
-.form-inline label,
-.form-search .btn-group,
-.form-inline .btn-group {
-  display: inline-block;
-}
-
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
-  margin-bottom: 0;
-}
-
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
-  padding-left: 0;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
-  float: left;
-  margin-right: 3px;
-  margin-left: 0;
-}
-
-.control-group {
-  margin-bottom: 10px;
-}
-
-legend + .control-group {
-  margin-top: 20px;
-  -webkit-margin-top-collapse: separate;
-}
-
-.form-horizontal .control-group {
-  margin-bottom: 20px;
-  *zoom: 1;
-}
-
-.form-horizontal .control-group:before,
-.form-horizontal .control-group:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.form-horizontal .control-group:after {
-  clear: both;
-}
-
-.form-horizontal .control-label {
-  float: left;
-  width: 160px;
-  padding-top: 5px;
-  text-align: right;
-}
-
-.form-horizontal .controls {
-  *display: inline-block;
-  *padding-left: 20px;
-  margin-left: 180px;
-  *margin-left: 0;
-}
-
-.form-horizontal .controls:first-child {
-  *padding-left: 180px;
-}
-
-.form-horizontal .help-block {
-  margin-bottom: 0;
-}
-
-.form-horizontal input + .help-block,
-.form-horizontal select + .help-block,
-.form-horizontal textarea + .help-block,
-.form-horizontal .uneditable-input + .help-block,
-.form-horizontal .input-prepend + .help-block,
-.form-horizontal .input-append + .help-block {
-  margin-top: 10px;
-}
-
-.form-horizontal .form-actions {
-  padding-left: 180px;
-}
-
-table {
-  max-width: 100%;
-  background-color: transparent;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-.table {
-  width: 100%;
-  margin-bottom: 20px;
-}
-
-.table th,
-.table td {
-  padding: 8px;
-  line-height: 20px;
-  text-align: left;
-  vertical-align: top;
-  border-top: 1px solid #dddddd;
-}
-
-.table th {
-  font-weight: bold;
-}
-
-.table thead th {
-  vertical-align: bottom;
-}
-
-.table caption + thead tr:first-child th,
-.table caption + thead tr:first-child td,
-.table colgroup + thead tr:first-child th,
-.table colgroup + thead tr:first-child td,
-.table thead:first-child tr:first-child th,
-.table thead:first-child tr:first-child td {
-  border-top: 0;
-}
-
-.table tbody + tbody {
-  border-top: 2px solid #dddddd;
-}
-
-.table .table {
-  background-color: #ffffff;
-}
-
-.table-condensed th,
-.table-condensed td {
-  padding: 4px 5px;
-}
-
-.table-bordered {
-  border: 1px solid #dddddd;
-  border-collapse: separate;
-  *border-collapse: collapse;
-  border-left: 0;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.table-bordered th,
-.table-bordered td {
-  border-left: 1px solid #dddddd;
-}
-
-.table-bordered caption + thead tr:first-child th,
-.table-bordered caption + tbody tr:first-child th,
-.table-bordered caption + tbody tr:first-child td,
-.table-bordered colgroup + thead tr:first-child th,
-.table-bordered colgroup + tbody tr:first-child th,
-.table-bordered colgroup + tbody tr:first-child td,
-.table-bordered thead:first-child tr:first-child th,
-.table-bordered tbody:first-child tr:first-child th,
-.table-bordered tbody:first-child tr:first-child td {
-  border-top: 0;
-}
-
-.table-bordered thead:first-child tr:first-child > th:first-child,
-.table-bordered tbody:first-child tr:first-child > td:first-child,
-.table-bordered tbody:first-child tr:first-child > th:first-child {
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.table-bordered thead:first-child tr:first-child > th:last-child,
-.table-bordered tbody:first-child tr:first-child > td:last-child,
-.table-bordered tbody:first-child tr:first-child > th:last-child {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-}
-
-.table-bordered thead:last-child tr:last-child > th:first-child,
-.table-bordered tbody:last-child tr:last-child > td:first-child,
-.table-bordered tbody:last-child tr:last-child > th:first-child,
-.table-bordered tfoot:last-child tr:last-child > td:first-child,
-.table-bordered tfoot:last-child tr:last-child > th:first-child {
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-}
-
-.table-bordered thead:last-child tr:last-child > th:last-child,
-.table-bordered tbody:last-child tr:last-child > td:last-child,
-.table-bordered tbody:last-child tr:last-child > th:last-child,
-.table-bordered tfoot:last-child tr:last-child > td:last-child,
-.table-bordered tfoot:last-child tr:last-child > th:last-child {
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-}
-
-.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
-  -webkit-border-bottom-left-radius: 0;
-          border-bottom-left-radius: 0;
-  -moz-border-radius-bottomleft: 0;
-}
-
-.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
-  -webkit-border-bottom-right-radius: 0;
-          border-bottom-right-radius: 0;
-  -moz-border-radius-bottomright: 0;
-}
-
-.table-bordered caption + thead tr:first-child th:first-child,
-.table-bordered caption + tbody tr:first-child td:first-child,
-.table-bordered colgroup + thead tr:first-child th:first-child,
-.table-bordered colgroup + tbody tr:first-child td:first-child {
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.table-bordered caption + thead tr:first-child th:last-child,
-.table-bordered caption + tbody tr:first-child td:last-child,
-.table-bordered colgroup + thead tr:first-child th:last-child,
-.table-bordered colgroup + tbody tr:first-child td:last-child {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-}
-
-.table-striped tbody > tr:nth-child(odd) > td,
-.table-striped tbody > tr:nth-child(odd) > th {
-  background-color: #f9f9f9;
-}
-
-.table-hover tbody tr:hover > td,
-.table-hover tbody tr:hover > th {
-  background-color: #f5f5f5;
-}
-
-table td[class*="span"],
-table th[class*="span"],
-.row-fluid table td[class*="span"],
-.row-fluid table th[class*="span"] {
-  display: table-cell;
-  float: none;
-  margin-left: 0;
-}
-
-.table td.span1,
-.table th.span1 {
-  float: none;
-  width: 44px;
-  margin-left: 0;
-}
-
-.table td.span2,
-.table th.span2 {
-  float: none;
-  width: 124px;
-  margin-left: 0;
-}
-
-.table td.span3,
-.table th.span3 {
-  float: none;
-  width: 204px;
-  margin-left: 0;
-}
-
-.table td.span4,
-.table th.span4 {
-  float: none;
-  width: 284px;
-  margin-left: 0;
-}
-
-.table td.span5,
-.table th.span5 {
-  float: none;
-  width: 364px;
-  margin-left: 0;
-}
-
-.table td.span6,
-.table th.span6 {
-  float: none;
-  width: 444px;
-  margin-left: 0;
-}
-
-.table td.span7,
-.table th.span7 {
-  float: none;
-  width: 524px;
-  margin-left: 0;
-}
-
-.table td.span8,
-.table th.span8 {
-  float: none;
-  width: 604px;
-  margin-left: 0;
-}
-
-.table td.span9,
-.table th.span9 {
-  float: none;
-  width: 684px;
-  margin-left: 0;
-}
-
-.table td.span10,
-.table th.span10 {
-  float: none;
-  width: 764px;
-  margin-left: 0;
-}
-
-.table td.span11,
-.table th.span11 {
-  float: none;
-  width: 844px;
-  margin-left: 0;
-}
-
-.table td.span12,
-.table th.span12 {
-  float: none;
-  width: 924px;
-  margin-left: 0;
-}
-
-.table tbody tr.success > td {
-  background-color: #dff0d8;
-}
-
-.table tbody tr.error > td {
-  background-color: #f2dede;
-}
-
-.table tbody tr.warning > td {
-  background-color: #fcf8e3;
-}
-
-.table tbody tr.info > td {
-  background-color: #d9edf7;
-}
-
-.table-hover tbody tr.success:hover > td {
-  background-color: #d0e9c6;
-}
-
-.table-hover tbody tr.error:hover > td {
-  background-color: #ebcccc;
-}
-
-.table-hover tbody tr.warning:hover > td {
-  background-color: #faf2cc;
-}
-
-.table-hover tbody tr.info:hover > td {
-  background-color: #c4e3f3;
-}
-
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  margin-top: 1px;
-  *margin-right: .3em;
-  line-height: 14px;
-  vertical-align: text-top;
-  background-image: url("../img/glyphicons-halflings.png");
-  background-position: 14px 14px;
-  background-repeat: no-repeat;
-}
-
-/* White icons with optional class, or on hover/focus/active states of certain elements */
-
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:focus > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > li > a:focus > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:focus > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"],
-.dropdown-submenu:focus > a > [class*=" icon-"] {
-  background-image: url("../img/glyphicons-halflings-white.png");
-}
-
-.icon-glass {
-  background-position: 0      0;
-}
-
-.icon-music {
-  background-position: -24px 0;
-}
-
-.icon-search {
-  background-position: -48px 0;
-}
-
-.icon-envelope {
-  background-position: -72px 0;
-}
-
-.icon-heart {
-  background-position: -96px 0;
-}
-
-.icon-star {
-  background-position: -120px 0;
-}
-
-.icon-star-empty {
-  background-position: -144px 0;
-}
-
-.icon-user {
-  background-position: -168px 0;
-}
-
-.icon-film {
-  background-position: -192px 0;
-}
-
-.icon-th-large {
-  background-position: -216px 0;
-}
-
-.icon-th {
-  background-position: -240px 0;
-}
-
-.icon-th-list {
-  background-position: -264px 0;
-}
-
-.icon-ok {
-  background-position: -288px 0;
-}
-
-.icon-remove {
-  background-position: -312px 0;
-}
-
-.icon-zoom-in {
-  background-position: -336px 0;
-}
-
-.icon-zoom-out {
-  background-position: -360px 0;
-}
-
-.icon-off {
-  background-position: -384px 0;
-}
-
-.icon-signal {
-  background-position: -408px 0;
-}
-
-.icon-cog {
-  background-position: -432px 0;
-}
-
-.icon-trash {
-  background-position: -456px 0;
-}
-
-.icon-home {
-  background-position: 0 -24px;
-}
-
-.icon-file {
-  background-position: -24px -24px;
-}
-
-.icon-time {
-  background-position: -48px -24px;
-}
-
-.icon-road {
-  background-position: -72px -24px;
-}
-
-.icon-download-alt {
-  background-position: -96px -24px;
-}
-
-.icon-download {
-  background-position: -120px -24px;
-}
-
-.icon-upload {
-  background-position: -144px -24px;
-}
-
-.icon-inbox {
-  background-position: -168px -24px;
-}
-
-.icon-play-circle {
-  background-position: -192px -24px;
-}
-
-.icon-repeat {
-  background-position: -216px -24px;
-}
-
-.icon-refresh {
-  background-position: -240px -24px;
-}
-
-.icon-list-alt {
-  background-position: -264px -24px;
-}
-
-.icon-lock {
-  background-position: -287px -24px;
-}
-
-.icon-flag {
-  background-position: -312px -24px;
-}
-
-.icon-headphones {
-  background-position: -336px -24px;
-}
-
-.icon-volume-off {
-  background-position: -360px -24px;
-}
-
-.icon-volume-down {
-  background-position: -384px -24px;
-}
-
-.icon-volume-up {
-  background-position: -408px -24px;
-}
-
-.icon-qrcode {
-  background-position: -432px -24px;
-}
-
-.icon-barcode {
-  background-position: -456px -24px;
-}
-
-.icon-tag {
-  background-position: 0 -48px;
-}
-
-.icon-tags {
-  background-position: -25px -48px;
-}
-
-.icon-book {
-  background-position: -48px -48px;
-}
-
-.icon-bookmark {
-  background-position: -72px -48px;
-}
-
-.icon-print {
-  background-position: -96px -48px;
-}
-
-.icon-camera {
-  background-position: -120px -48px;
-}
-
-.icon-font {
-  background-position: -144px -48px;
-}
-
-.icon-bold {
-  background-position: -167px -48px;
-}
-
-.icon-italic {
-  background-position: -192px -48px;
-}
-
-.icon-text-height {
-  background-position: -216px -48px;
-}
-
-.icon-text-width {
-  background-position: -240px -48px;
-}
-
-.icon-align-left {
-  background-position: -264px -48px;
-}
-
-.icon-align-center {
-  background-position: -288px -48px;
-}
-
-.icon-align-right {
-  background-position: -312px -48px;
-}
-
-.icon-align-justify {
-  background-position: -336px -48px;
-}
-
-.icon-list {
-  background-position: -360px -48px;
-}
-
-.icon-indent-left {
-  background-position: -384px -48px;
-}
-
-.icon-indent-right {
-  background-position: -408px -48px;
-}
-
-.icon-facetime-video {
-  background-position: -432px -48px;
-}
-
-.icon-picture {
-  background-position: -456px -48px;
-}
-
-.icon-pencil {
-  background-position: 0 -72px;
-}
-
-.icon-map-marker {
-  background-position: -24px -72px;
-}
-
-.icon-adjust {
-  background-position: -48px -72px;
-}
-
-.icon-tint {
-  background-position: -72px -72px;
-}
-
-.icon-edit {
-  background-position: -96px -72px;
-}
-
-.icon-share {
-  background-position: -120px -72px;
-}
-
-.icon-check {
-  background-position: -144px -72px;
-}
-
-.icon-move {
-  background-position: -168px -72px;
-}
-
-.icon-step-backward {
-  background-position: -192px -72px;
-}
-
-.icon-fast-backward {
-  background-position: -216px -72px;
-}
-
-.icon-backward {
-  background-position: -240px -72px;
-}
-
-.icon-play {
-  background-position: -264px -72px;
-}
-
-.icon-pause {
-  background-position: -288px -72px;
-}
-
-.icon-stop {
-  background-position: -312px -72px;
-}
-
-.icon-forward {
-  background-position: -336px -72px;
-}
-
-.icon-fast-forward {
-  background-position: -360px -72px;
-}
-
-.icon-step-forward {
-  background-position: -384px -72px;
-}
-
-.icon-eject {
-  background-position: -408px -72px;
-}
-
-.icon-chevron-left {
-  background-position: -432px -72px;
-}
-
-.icon-chevron-right {
-  background-position: -456px -72px;
-}
-
-.icon-plus-sign {
-  background-position: 0 -96px;
-}
-
-.icon-minus-sign {
-  background-position: -24px -96px;
-}
-
-.icon-remove-sign {
-  background-position: -48px -96px;
-}
-
-.icon-ok-sign {
-  background-position: -72px -96px;
-}
-
-.icon-question-sign {
-  background-position: -96px -96px;
-}
-
-.icon-info-sign {
-  background-position: -120px -96px;
-}
-
-.icon-screenshot {
-  background-position: -144px -96px;
-}
-
-.icon-remove-circle {
-  background-position: -168px -96px;
-}
-
-.icon-ok-circle {
-  background-position: -192px -96px;
-}
-
-.icon-ban-circle {
-  background-position: -216px -96px;
-}
-
-.icon-arrow-left {
-  background-position: -240px -96px;
-}
-
-.icon-arrow-right {
-  background-position: -264px -96px;
-}
-
-.icon-arrow-up {
-  background-position: -289px -96px;
-}
-
-.icon-arrow-down {
-  background-position: -312px -96px;
-}
-
-.icon-share-alt {
-  background-position: -336px -96px;
-}
-
-.icon-resize-full {
-  background-position: -360px -96px;
-}
-
-.icon-resize-small {
-  background-position: -384px -96px;
-}
-
-.icon-plus {
-  background-position: -408px -96px;
-}
-
-.icon-minus {
-  background-position: -433px -96px;
-}
-
-.icon-asterisk {
-  background-position: -456px -96px;
-}
-
-.icon-exclamation-sign {
-  background-position: 0 -120px;
-}
-
-.icon-gift {
-  background-position: -24px -120px;
-}
-
-.icon-leaf {
-  background-position: -48px -120px;
-}
-
-.icon-fire {
-  background-position: -72px -120px;
-}
-
-.icon-eye-open {
-  background-position: -96px -120px;
-}
-
-.icon-eye-close {
-  background-position: -120px -120px;
-}
-
-.icon-warning-sign {
-  background-position: -144px -120px;
-}
-
-.icon-plane {
-  background-position: -168px -120px;
-}
-
-.icon-calendar {
-  background-position: -192px -120px;
-}
-
-.icon-random {
-  width: 16px;
-  background-position: -216px -120px;
-}
-
-.icon-comment {
-  background-position: -240px -120px;
-}
-
-.icon-magnet {
-  background-position: -264px -120px;
-}
-
-.icon-chevron-up {
-  background-position: -288px -120px;
-}
-
-.icon-chevron-down {
-  background-position: -313px -119px;
-}
-
-.icon-retweet {
-  background-position: -336px -120px;
-}
-
-.icon-shopping-cart {
-  background-position: -360px -120px;
-}
-
-.icon-folder-close {
-  width: 16px;
-  background-position: -384px -120px;
-}
-
-.icon-folder-open {
-  width: 16px;
-  background-position: -408px -120px;
-}
-
-.icon-resize-vertical {
-  background-position: -432px -119px;
-}
-
-.icon-resize-horizontal {
-  background-position: -456px -118px;
-}
-
-.icon-hdd {
-  background-position: 0 -144px;
-}
-
-.icon-bullhorn {
-  background-position: -24px -144px;
-}
-
-.icon-bell {
-  background-position: -48px -144px;
-}
-
-.icon-certificate {
-  background-position: -72px -144px;
-}
-
-.icon-thumbs-up {
-  background-position: -96px -144px;
-}
-
-.icon-thumbs-down {
-  background-position: -120px -144px;
-}
-
-.icon-hand-right {
-  background-position: -144px -144px;
-}
-
-.icon-hand-left {
-  background-position: -168px -144px;
-}
-
-.icon-hand-up {
-  background-position: -192px -144px;
-}
-
-.icon-hand-down {
-  background-position: -216px -144px;
-}
-
-.icon-circle-arrow-right {
-  background-position: -240px -144px;
-}
-
-.icon-circle-arrow-left {
-  background-position: -264px -144px;
-}
-
-.icon-circle-arrow-up {
-  background-position: -288px -144px;
-}
-
-.icon-circle-arrow-down {
-  background-position: -312px -144px;
-}
-
-.icon-globe {
-  background-position: -336px -144px;
-}
-
-.icon-wrench {
-  background-position: -360px -144px;
-}
-
-.icon-tasks {
-  background-position: -384px -144px;
-}
-
-.icon-filter {
-  background-position: -408px -144px;
-}
-
-.icon-briefcase {
-  background-position: -432px -144px;
-}
-
-.icon-fullscreen {
-  background-position: -456px -144px;
-}
-
-.dropup,
-.dropdown {
-  position: relative;
-}
-
-.dropdown-toggle {
-  *margin-bottom: -3px;
-}
-
-.dropdown-toggle:active,
-.open .dropdown-toggle {
-  outline: 0;
-}
-
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  vertical-align: top;
-  border-top: 4px solid #000000;
-  border-right: 4px solid transparent;
-  border-left: 4px solid transparent;
-  content: "";
-}
-
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
-}
-
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1000;
-  display: none;
-  float: left;
-  min-width: 160px;
-  padding: 5px 0;
-  margin: 2px 0 0;
-  list-style: none;
-  background-color: #ffffff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-}
-
-.dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-
-.dropdown-menu .divider {
-  *width: 100%;
-  height: 1px;
-  margin: 9px 1px;
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-}
-
-.dropdown-menu > li > a {
-  display: block;
-  padding: 3px 20px;
-  clear: both;
-  font-weight: normal;
-  line-height: 20px;
-  color: #333333;
-  white-space: nowrap;
-}
-
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus,
-.dropdown-submenu:hover > a,
-.dropdown-submenu:focus > a {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #0081c2;
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
-}
-
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #0081c2;
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  outline: 0;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
-}
-
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  color: #999999;
-}
-
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  text-decoration: none;
-  cursor: default;
-  background-color: transparent;
-  background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.open {
-  *z-index: 1000;
-}
-
-.open > .dropdown-menu {
-  display: block;
-}
-
-.pull-right > .dropdown-menu {
-  right: 0;
-  left: auto;
-}
-
-.dropup .caret,
-.navbar-fixed-bottom .dropdown .caret {
-  border-top: 0;
-  border-bottom: 4px solid #000000;
-  content: "";
-}
-
-.dropup .dropdown-menu,
-.navbar-fixed-bottom .dropdown .dropdown-menu {
-  top: auto;
-  bottom: 100%;
-  margin-bottom: 1px;
-}
-
-.dropdown-submenu {
-  position: relative;
-}
-
-.dropdown-submenu > .dropdown-menu {
-  top: 0;
-  left: 100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  -webkit-border-radius: 0 6px 6px 6px;
-     -moz-border-radius: 0 6px 6px 6px;
-          border-radius: 0 6px 6px 6px;
-}
-
-.dropdown-submenu:hover > .dropdown-menu {
-  display: block;
-}
-
-.dropup .dropdown-submenu > .dropdown-menu {
-  top: auto;
-  bottom: 0;
-  margin-top: 0;
-  margin-bottom: -2px;
-  -webkit-border-radius: 5px 5px 5px 0;
-     -moz-border-radius: 5px 5px 5px 0;
-          border-radius: 5px 5px 5px 0;
-}
-
-.dropdown-submenu > a:after {
-  display: block;
-  float: right;
-  width: 0;
-  height: 0;
-  margin-top: 5px;
-  margin-right: -10px;
-  border-color: transparent;
-  border-left-color: #cccccc;
-  border-style: solid;
-  border-width: 5px 0 5px 5px;
-  content: " ";
-}
-
-.dropdown-submenu:hover > a:after {
-  border-left-color: #ffffff;
-}
-
-.dropdown-submenu.pull-left {
-  float: none;
-}
-
-.dropdown-submenu.pull-left > .dropdown-menu {
-  left: -100%;
-  margin-left: 10px;
-  -webkit-border-radius: 6px 0 6px 6px;
-     -moz-border-radius: 6px 0 6px 6px;
-          border-radius: 6px 0 6px 6px;
-}
-
-.dropdown .dropdown-menu .nav-header {
-  padding-right: 20px;
-  padding-left: 20px;
-}
-
-.typeahead {
-  z-index: 1051;
-  margin-top: 2px;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #e3e3e3;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-}
-
-.well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 0, 0, 0.15);
-}
-
-.well-large {
-  padding: 24px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.well-small {
-  padding: 9px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.fade {
-  opacity: 0;
-  -webkit-transition: opacity 0.15s linear;
-     -moz-transition: opacity 0.15s linear;
-       -o-transition: opacity 0.15s linear;
-          transition: opacity 0.15s linear;
-}
-
-.fade.in {
-  opacity: 1;
-}
-
-.collapse {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  -webkit-transition: height 0.35s ease;
-     -moz-transition: height 0.35s ease;
-       -o-transition: height 0.35s ease;
-          transition: height 0.35s ease;
-}
-
-.collapse.in {
-  height: auto;
-}
-
-.close {
-  float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: 20px;
-  color: #000000;
-  text-shadow: 0 1px 0 #ffffff;
-  opacity: 0.2;
-  filter: alpha(opacity=20);
-}
-
-.close:hover,
-.close:focus {
-  color: #000000;
-  text-decoration: none;
-  cursor: pointer;
-  opacity: 0.4;
-  filter: alpha(opacity=40);
-}
-
-button.close {
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
-}
-
-.btn {
-  display: inline-block;
-  *display: inline;
-  padding: 4px 12px;
-  margin-bottom: 0;
-  *margin-left: .3em;
-  font-size: 14px;
-  line-height: 20px;
-  color: #333333;
-  text-align: center;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  vertical-align: middle;
-  cursor: pointer;
-  background-color: #f5f5f5;
-  *background-color: #e6e6e6;
-  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-  background-repeat: repeat-x;
-  border: 1px solid #cccccc;
-  *border: 0;
-  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  border-bottom-color: #b3b3b3;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  *zoom: 1;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn:hover,
-.btn:focus,
-.btn:active,
-.btn.active,
-.btn.disabled,
-.btn[disabled] {
-  color: #333333;
-  background-color: #e6e6e6;
-  *background-color: #d9d9d9;
-}
-
-.btn:active,
-.btn.active {
-  background-color: #cccccc \9;
-}
-
-.btn:first-child {
-  *margin-left: 0;
-}
-
-.btn:hover,
-.btn:focus {
-  color: #333333;
-  text-decoration: none;
-  background-position: 0 -15px;
-  -webkit-transition: background-position 0.1s linear;
-     -moz-transition: background-position 0.1s linear;
-       -o-transition: background-position 0.1s linear;
-          transition: background-position 0.1s linear;
-}
-
-.btn:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-.btn.active,
-.btn:active {
-  background-image: none;
-  outline: 0;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn.disabled,
-.btn[disabled] {
-  cursor: default;
-  background-image: none;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-     -moz-box-shadow: none;
-          box-shadow: none;
-}
-
-.btn-large {
-  padding: 11px 19px;
-  font-size: 17.5px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.btn-large [class^="icon-"],
-.btn-large [class*=" icon-"] {
-  margin-top: 4px;
-}
-
-.btn-small {
-  padding: 2px 10px;
-  font-size: 11.9px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.btn-small [class^="icon-"],
-.btn-small [class*=" icon-"] {
-  margin-top: 0;
-}
-
-.btn-mini [class^="icon-"],
-.btn-mini [class*=" icon-"] {
-  margin-top: -1px;
-}
-
-.btn-mini {
-  padding: 0 6px;
-  font-size: 10.5px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.btn-block {
-  display: block;
-  width: 100%;
-  padding-right: 0;
-  padding-left: 0;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.btn-block + .btn-block {
-  margin-top: 5px;
-}
-
-input[type="submit"].btn-block,
-input[type="reset"].btn-block,
-input[type="button"].btn-block {
-  width: 100%;
-}
-
-.btn-primary.active,
-.btn-warning.active,
-.btn-danger.active,
-.btn-success.active,
-.btn-info.active,
-.btn-inverse.active {
-  color: rgba(255, 255, 255, 0.75);
-}
-
-.btn-primary {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #006dcc;
-  *background-color: #0044cc;
-  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
-  background-repeat: repeat-x;
-  border-color: #0044cc #0044cc #002a80;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-primary:hover,
-.btn-primary:focus,
-.btn-primary:active,
-.btn-primary.active,
-.btn-primary.disabled,
-.btn-primary[disabled] {
-  color: #ffffff;
-  background-color: #0044cc;
-  *background-color: #003bb3;
-}
-
-.btn-primary:active,
-.btn-primary.active {
-  background-color: #003399 \9;
-}
-
-.btn-warning {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #faa732;
-  *background-color: #f89406;
-  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-  background-image: -o-linear-gradient(top, #fbb450, #f89406);
-  background-image: linear-gradient(to bottom, #fbb450, #f89406);
-  background-repeat: repeat-x;
-  border-color: #f89406 #f89406 #ad6704;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning:active,
-.btn-warning.active,
-.btn-warning.disabled,
-.btn-warning[disabled] {
-  color: #ffffff;
-  background-color: #f89406;
-  *background-color: #df8505;
-}
-
-.btn-warning:active,
-.btn-warning.active {
-  background-color: #c67605 \9;
-}
-
-.btn-danger {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #da4f49;
-  *background-color: #bd362f;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
-  background-repeat: repeat-x;
-  border-color: #bd362f #bd362f #802420;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger:active,
-.btn-danger.active,
-.btn-danger.disabled,
-.btn-danger[disabled] {
-  color: #ffffff;
-  background-color: #bd362f;
-  *background-color: #a9302a;
-}
-
-.btn-danger:active,
-.btn-danger.active {
-  background-color: #942a25 \9;
-}
-
-.btn-success {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #5bb75b;
-  *background-color: #51a351;
-  background-image: -moz-linear-gradient(top, #62c462, #51a351);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
-  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
-  background-image: -o-linear-gradient(top, #62c462, #51a351);
-  background-image: linear-gradient(to bottom, #62c462, #51a351);
-  background-repeat: repeat-x;
-  border-color: #51a351 #51a351 #387038;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active,
-.btn-success.active,
-.btn-success.disabled,
-.btn-success[disabled] {
-  color: #ffffff;
-  background-color: #51a351;
-  *background-color: #499249;
-}
-
-.btn-success:active,
-.btn-success.active {
-  background-color: #408140 \9;
-}
-
-.btn-info {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #49afcd;
-  *background-color: #2f96b4;
-  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
-  background-repeat: repeat-x;
-  border-color: #2f96b4 #2f96b4 #1f6377;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-info:hover,
-.btn-info:focus,
-.btn-info:active,
-.btn-info.active,
-.btn-info.disabled,
-.btn-info[disabled] {
-  color: #ffffff;
-  background-color: #2f96b4;
-  *background-color: #2a85a0;
-}
-
-.btn-info:active,
-.btn-info.active {
-  background-color: #24748c \9;
-}
-
-.btn-inverse {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #363636;
-  *background-color: #222222;
-  background-image: -moz-linear-gradient(top, #444444, #222222);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
-  background-image: -webkit-linear-gradient(top, #444444, #222222);
-  background-image: -o-linear-gradient(top, #444444, #222222);
-  background-image: linear-gradient(to bottom, #444444, #222222);
-  background-repeat: repeat-x;
-  border-color: #222222 #222222 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-inverse:hover,
-.btn-inverse:focus,
-.btn-inverse:active,
-.btn-inverse.active,
-.btn-inverse.disabled,
-.btn-inverse[disabled] {
-  color: #ffffff;
-  background-color: #222222;
-  *background-color: #151515;
-}
-
-.btn-inverse:active,
-.btn-inverse.active {
-  background-color: #080808 \9;
-}
-
-button.btn,
-input[type="submit"].btn {
-  *padding-top: 3px;
-  *padding-bottom: 3px;
-}
-
-button.btn::-moz-focus-inner,
-input[type="submit"].btn::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-
-button.btn.btn-large,
-input[type="submit"].btn.btn-large {
-  *padding-top: 7px;
-  *padding-bottom: 7px;
-}
-
-button.btn.btn-small,
-input[type="submit"].btn.btn-small {
-  *padding-top: 3px;
-  *padding-bottom: 3px;
-}
-
-button.btn.btn-mini,
-input[type="submit"].btn.btn-mini {
-  *padding-top: 1px;
-  *padding-bottom: 1px;
-}
-
-.btn-link,
-.btn-link:active,
-.btn-link[disabled] {
-  background-color: transparent;
-  background-image: none;
-  -webkit-box-shadow: none;
-     -moz-box-shadow: none;
-          box-shadow: none;
-}
-
-.btn-link {
-  color: #0088cc;
-  cursor: pointer;
-  border-color: transparent;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-link:hover,
-.btn-link:focus {
-  color: #005580;
-  text-decoration: underline;
-  background-color: transparent;
-}
-
-.btn-link[disabled]:hover,
-.btn-link[disabled]:focus {
-  color: #333333;
-  text-decoration: none;
-}
-
-.btn-group {
-  position: relative;
-  display: inline-block;
-  *display: inline;
-  *margin-left: .3em;
-  font-size: 0;
-  white-space: nowrap;
-  vertical-align: middle;
-  *zoom: 1;
-}
-
-.btn-group:first-child {
-  *margin-left: 0;
-}
-
-.btn-group + .btn-group {
-  margin-left: 5px;
-}
-
-.btn-toolbar {
-  margin-top: 10px;
-  margin-bottom: 10px;
-  font-size: 0;
-}
-
-.btn-toolbar > .btn + .btn,
-.btn-toolbar > .btn-group + .btn,
-.btn-toolbar > .btn + .btn-group {
-  margin-left: 5px;
-}
-
-.btn-group > .btn {
-  position: relative;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-group > .btn + .btn {
-  margin-left: -1px;
-}
-
-.btn-group > .btn,
-.btn-group > .dropdown-menu,
-.btn-group > .popover {
-  font-size: 14px;
-}
-
-.btn-group > .btn-mini {
-  font-size: 10.5px;
-}
-
-.btn-group > .btn-small {
-  font-size: 11.9px;
-}
-
-.btn-group > .btn-large {
-  font-size: 17.5px;
-}
-
-.btn-group > .btn:first-child {
-  margin-left: 0;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-bottomright: 4px;
-}
-
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  -webkit-border-bottom-left-radius: 6px;
-          border-bottom-left-radius: 6px;
-  -webkit-border-top-left-radius: 6px;
-          border-top-left-radius: 6px;
-  -moz-border-radius-bottomleft: 6px;
-  -moz-border-radius-topleft: 6px;
-}
-
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  -webkit-border-top-right-radius: 6px;
-          border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-          border-bottom-right-radius: 6px;
-  -moz-border-radius-topright: 6px;
-  -moz-border-radius-bottomright: 6px;
-}
-
-.btn-group > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group > .btn:active,
-.btn-group > .btn.active {
-  z-index: 2;
-}
-
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-
-.btn-group > .btn + .dropdown-toggle {
-  *padding-top: 5px;
-  padding-right: 8px;
-  *padding-bottom: 5px;
-  padding-left: 8px;
-  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn-group > .btn-mini + .dropdown-toggle {
-  *padding-top: 2px;
-  padding-right: 5px;
-  *padding-bottom: 2px;
-  padding-left: 5px;
-}
-
-.btn-group > .btn-small + .dropdown-toggle {
-  *padding-top: 5px;
-  *padding-bottom: 4px;
-}
-
-.btn-group > .btn-large + .dropdown-toggle {
-  *padding-top: 7px;
-  padding-right: 12px;
-  *padding-bottom: 7px;
-  padding-left: 12px;
-}
-
-.btn-group.open .dropdown-toggle {
-  background-image: none;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn-group.open .btn.dropdown-toggle {
-  background-color: #e6e6e6;
-}
-
-.btn-group.open .btn-primary.dropdown-toggle {
-  background-color: #0044cc;
-}
-
-.btn-group.open .btn-warning.dropdown-toggle {
-  background-color: #f89406;
-}
-
-.btn-group.open .btn-danger.dropdown-toggle {
-  background-color: #bd362f;
-}
-
-.btn-group.open .btn-success.dropdown-toggle {
-  background-color: #51a351;
-}
-
-.btn-group.open .btn-info.dropdown-toggle {
-  background-color: #2f96b4;
-}
-
-.btn-group.open .btn-inverse.dropdown-toggle {
-  background-color: #222222;
-}
-
-.btn .caret {
-  margin-top: 8px;
-  margin-left: 0;
-}
-
-.btn-large .caret {
-  margin-top: 6px;
-}
-
-.btn-large .caret {
-  border-top-width: 5px;
-  border-right-width: 5px;
-  border-left-width: 5px;
-}
-
-.btn-mini .caret,
-.btn-small .caret {
-  margin-top: 8px;
-}
-
-.dropup .btn-large .caret {
-  border-bottom-width: 5px;
-}
-
-.btn-primary .caret,
-.btn-warning .caret,
-.btn-danger .caret,
-.btn-info .caret,
-.btn-success .caret,
-.btn-inverse .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-
-.btn-group-vertical {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-}
-
-.btn-group-vertical > .btn {
-  display: block;
-  float: none;
-  max-width: 100%;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-group-vertical > .btn + .btn {
-  margin-top: -1px;
-  margin-left: 0;
-}
-
-.btn-group-vertical > .btn:first-child {
-  -webkit-border-radius: 4px 4px 0 0;
-     -moz-border-radius: 4px 4px 0 0;
-          border-radius: 4px 4px 0 0;
-}
-
-.btn-group-vertical > .btn:last-child {
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
-}
-
-.btn-group-vertical > .btn-large:first-child {
-  -webkit-border-radius: 6px 6px 0 0;
-     -moz-border-radius: 6px 6px 0 0;
-          border-radius: 6px 6px 0 0;
-}
-
-.btn-group-vertical > .btn-large:last-child {
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-}
-
-.alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: 20px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  background-color: #fcf8e3;
-  border: 1px solid #fbeed5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.alert,
-.alert h4 {
-  color: #c09853;
-}
-
-.alert h4 {
-  margin: 0;
-}
-
-.alert .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: 20px;
-}
-
-.alert-success {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
-}
-
-.alert-success h4 {
-  color: #468847;
-}
-
-.alert-danger,
-.alert-error {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #eed3d7;
-}
-
-.alert-danger h4,
-.alert-error h4 {
-  color: #b94a48;
-}
-
-.alert-info {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-
-.alert-info h4 {
-  color: #3a87ad;
-}
-
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-
-.alert-block p + p {
-  margin-top: 5px;
-}
-
-.nav {
-  margin-bottom: 20px;
-  margin-left: 0;
-  list-style: none;
-}
-
-.nav > li > a {
-  display: block;
-}
-
-.nav > li > a:hover,
-.nav > li > a:focus {
-  text-decoration: none;
-  background-color: #eeeeee;
-}
-
-.nav > li > a > img {
-  max-width: none;
-}
-
-.nav > .pull-right {
-  float: right;
-}
-
-.nav-header {
-  display: block;
-  padding: 3px 15px;
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 20px;
-  color: #999999;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  text-transform: uppercase;
-}
-
-.nav li + .nav-header {
-  margin-top: 9px;
-}
-
-.nav-list {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-bottom: 0;
-}
-
-.nav-list > li > a,
-.nav-list .nav-header {
-  margin-right: -15px;
-  margin-left: -15px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
-
-.nav-list > li > a {
-  padding: 3px 15px;
-}
-
-.nav-list > .active > a,
-.nav-list > .active > a:hover,
-.nav-list > .active > a:focus {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  background-color: #0088cc;
-}
-
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
-  margin-right: 2px;
-}
-
-.nav-list .divider {
-  *width: 100%;
-  height: 1px;
-  margin: 9px 1px;
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-}
-
-.nav-tabs,
-.nav-pills {
-  *zoom: 1;
-}
-
-.nav-tabs:before,
-.nav-pills:before,
-.nav-tabs:after,
-.nav-pills:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.nav-tabs:after,
-.nav-pills:after {
-  clear: both;
-}
-
-.nav-tabs > li,
-.nav-pills > li {
-  float: left;
-}
-
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px;
-}
-
-.nav-tabs {
-  border-bottom: 1px solid #ddd;
-}
-
-.nav-tabs > li {
-  margin-bottom: -1px;
-}
-
-.nav-tabs > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  line-height: 20px;
-  border: 1px solid transparent;
-  -webkit-border-radius: 4px 4px 0 0;
-     -moz-border-radius: 4px 4px 0 0;
-          border-radius: 4px 4px 0 0;
-}
-
-.nav-tabs > li > a:hover,
-.nav-tabs > li > a:focus {
-  border-color: #eeeeee #eeeeee #dddddd;
-}
-
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-tabs > .active > a:focus {
-  color: #555555;
-  cursor: default;
-  background-color: #ffffff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-}
-
-.nav-pills > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -webkit-border-radius: 5px;
-     -moz-border-radius: 5px;
-          border-radius: 5px;
-}
-
-.nav-pills > .active > a,
-.nav-pills > .active > a:hover,
-.nav-pills > .active > a:focus {
-  color: #ffffff;
-  background-color: #0088cc;
-}
-
-.nav-stacked > li {
-  float: none;
-}
-
-.nav-stacked > li > a {
-  margin-right: 0;
-}
-
-.nav-tabs.nav-stacked {
-  border-bottom: 0;
-}
-
-.nav-tabs.nav-stacked > li > a {
-  border: 1px solid #ddd;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.nav-tabs.nav-stacked > li:first-child > a {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.nav-tabs.nav-stacked > li:last-child > a {
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  -moz-border-radius-bottomleft: 4px;
-}
-
-.nav-tabs.nav-stacked > li > a:hover,
-.nav-tabs.nav-stacked > li > a:focus {
-  z-index: 2;
-  border-color: #ddd;
-}
-
-.nav-pills.nav-stacked > li > a {
-  margin-bottom: 3px;
-}
-
-.nav-pills.nav-stacked > li:last-child > a {
-  margin-bottom: 1px;
-}
-
-.nav-tabs .dropdown-menu {
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-}
-
-.nav-pills .dropdown-menu {
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.nav .dropdown-toggle .caret {
-  margin-top: 6px;
-  border-top-color: #0088cc;
-  border-bottom-color: #0088cc;
-}
-
-.nav .dropdown-toggle:hover .caret,
-.nav .dropdown-toggle:focus .caret {
-  border-top-color: #005580;
-  border-bottom-color: #005580;
-}
-
-/* move down carets for tabs */
-
-.nav-tabs .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-.nav .active .dropdown-toggle .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
-}
-
-.nav-tabs .active .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-
-.nav > .dropdown.active > a:hover,
-.nav > .dropdown.active > a:focus {
-  cursor: pointer;
-}
-
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover,
-.nav > li.dropdown.open.active > a:focus {
-  color: #ffffff;
-  background-color: #999999;
-  border-color: #999999;
-}
-
-.nav li.dropdown.open .caret,
-.nav li.dropdown.open.active .caret,
-.nav li.dropdown.open a:hover .caret,
-.nav li.dropdown.open a:focus .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-  opacity: 1;
-  filter: alpha(opacity=100);
-}
-
-.tabs-stacked .open > a:hover,
-.tabs-stacked .open > a:focus {
-  border-color: #999999;
-}
-
-.tabbable {
-  *zoom: 1;
-}
-
-.tabbable:before,
-.tabbable:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.tabbable:after {
-  clear: both;
-}
-
-.tab-content {
-  overflow: auto;
-}
-
-.tabs-below > .nav-tabs,
-.tabs-right > .nav-tabs,
-.tabs-left > .nav-tabs {
-  border-bottom: 0;
-}
-
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
-.tabs-below > .nav-tabs {
-  border-top: 1px solid #ddd;
-}
-
-.tabs-below > .nav-tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
-}
-
-.tabs-below > .nav-tabs > li > a {
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
-}
-
-.tabs-below > .nav-tabs > li > a:hover,
-.tabs-below > .nav-tabs > li > a:focus {
-  border-top-color: #ddd;
-  border-bottom-color: transparent;
-}
-
-.tabs-below > .nav-tabs > .active > a,
-.tabs-below > .nav-tabs > .active > a:hover,
-.tabs-below > .nav-tabs > .active > a:focus {
-  border-color: transparent #ddd #ddd #ddd;
-}
-
-.tabs-left > .nav-tabs > li,
-.tabs-right > .nav-tabs > li {
-  float: none;
-}
-
-.tabs-left > .nav-tabs > li > a,
-.tabs-right > .nav-tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-
-.tabs-left > .nav-tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid #ddd;
-}
-
-.tabs-left > .nav-tabs > li > a {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.tabs-left > .nav-tabs > li > a:hover,
-.tabs-left > .nav-tabs > li > a:focus {
-  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
-}
-
-.tabs-left > .nav-tabs .active > a,
-.tabs-left > .nav-tabs .active > a:hover,
-.tabs-left > .nav-tabs .active > a:focus {
-  border-color: #ddd transparent #ddd #ddd;
-  *border-right-color: #ffffff;
-}
-
-.tabs-right > .nav-tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid #ddd;
-}
-
-.tabs-right > .nav-tabs > li > a {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.tabs-right > .nav-tabs > li > a:hover,
-.tabs-right > .nav-tabs > li > a:focus {
-  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
-}
-
-.tabs-right > .nav-tabs .active > a,
-.tabs-right > .nav-tabs .active > a:hover,
-.tabs-right > .nav-tabs .active > a:focus {
-  border-color: #ddd #ddd #ddd transparent;
-  *border-left-color: #ffffff;
-}
-
-.nav > .disabled > a {
-  color: #999999;
-}
-
-.nav > .disabled > a:hover,
-.nav > .disabled > a:focus {
-  text-decoration: none;
-  cursor: default;
-  background-color: transparent;
-}
-
-.navbar {
-  *position: relative;
-  *z-index: 2;
-  margin-bottom: 20px;
-  overflow: visible;
-}
-
-.navbar-inner {
-  min-height: 40px;
-  padding-right: 20px;
-  padding-left: 20px;
-  background-color: #fafafa;
-  background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
-  background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
-  background-repeat: repeat-x;
-  border: 1px solid #d4d4d4;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
-  *zoom: 1;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-}
-
-.navbar-inner:before,
-.navbar-inner:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.navbar-inner:after {
-  clear: both;
-}
-
-.navbar .container {
-  width: auto;
-}
-
-.nav-collapse.collapse {
-  height: auto;
-  overflow: visible;
-}
-
-.navbar .brand {
-  display: block;
-  float: left;
-  padding: 10px 20px 10px;
-  margin-left: -20px;
-  font-size: 20px;
-  font-weight: 200;
-  color: #777777;
-  text-shadow: 0 1px 0 #ffffff;
-}
-
-.navbar .brand:hover,
-.navbar .brand:focus {
-  text-decoration: none;
-}
-
-.navbar-text {
-  margin-bottom: 0;
-  line-height: 40px;
-  color: #777777;
-}
-
-.navbar-link {
-  color: #777777;
-}
-
-.navbar-link:hover,
-.navbar-link:focus {
-  color: #333333;
-}
-
-.navbar .divider-vertical {
-  height: 40px;
-  margin: 0 9px;
-  border-right: 1px solid #ffffff;
-  border-left: 1px solid #f2f2f2;
-}
-
-.navbar .btn,
-.navbar .btn-group {
-  margin-top: 5px;
-}
-
-.navbar .btn-group .btn,
-.navbar .input-prepend .btn,
-.navbar .input-append .btn,
-.navbar .input-prepend .btn-group,
-.navbar .input-append .btn-group {
-  margin-top: 0;
-}
-
-.navbar-form {
-  margin-bottom: 0;
-  *zoom: 1;
-}
-
-.navbar-form:before,
-.navbar-form:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.navbar-form:after {
-  clear: both;
-}
-
-.navbar-form input,
-.navbar-form select,
-.navbar-form .radio,
-.navbar-form .checkbox {
-  margin-top: 5px;
-}
-
-.navbar-form input,
-.navbar-form select,
-.navbar-form .btn {
-  display: inline-block;
-  margin-bottom: 0;
-}
-
-.navbar-form input[type="image"],
-.navbar-form input[type="checkbox"],
-.navbar-form input[type="radio"] {
-  margin-top: 3px;
-}
-
-.navbar-form .input-append,
-.navbar-form .input-prepend {
-  margin-top: 5px;
-  white-space: nowrap;
-}
-
-.navbar-form .input-append input,
-.navbar-form .input-prepend input {
-  margin-top: 0;
-}
-
-.navbar-search {
-  position: relative;
-  float: left;
-  margin-top: 5px;
-  margin-bottom: 0;
-}
-
-.navbar-search .search-query {
-  padding: 4px 14px;
-  margin-bottom: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-.navbar-static-top {
-  position: static;
-  margin-bottom: 0;
-}
-
-.navbar-static-top .navbar-inner {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: 1030;
-  margin-bottom: 0;
-}
-
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
-  border-width: 0 0 1px;
-}
-
-.navbar-fixed-bottom .navbar-inner {
-  border-width: 1px 0 0;
-}
-
-.navbar-fixed-top .navbar-inner,
-.navbar-fixed-bottom .navbar-inner {
-  padding-right: 0;
-  padding-left: 0;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
-}
-
-.navbar-fixed-top {
-  top: 0;
-}
-
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
-  -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-}
-
-.navbar-fixed-bottom {
-  bottom: 0;
-}
-
-.navbar-fixed-bottom .navbar-inner {
-  -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
-}
-
-.navbar .nav {
-  position: relative;
-  left: 0;
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-
-.navbar .nav.pull-right {
-  float: right;
-  margin-right: 0;
-}
-
-.navbar .nav > li {
-  float: left;
-}
-
-.navbar .nav > li > a {
-  float: none;
-  padding: 10px 15px 10px;
-  color: #777777;
-  text-decoration: none;
-  text-shadow: 0 1px 0 #ffffff;
-}
-
-.navbar .nav .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-.navbar .nav > li > a:focus,
-.navbar .nav > li > a:hover {
-  color: #333333;
-  text-decoration: none;
-  background-color: transparent;
-}
-
-.navbar .nav > .active > a,
-.navbar .nav > .active > a:hover,
-.navbar .nav > .active > a:focus {
-  color: #555555;
-  text-decoration: none;
-  background-color: #e5e5e5;
-  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-     -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-          box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-}
-
-.navbar .btn-navbar {
-  display: none;
-  float: right;
-  padding: 7px 10px;
-  margin-right: 5px;
-  margin-left: 5px;
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #ededed;
-  *background-color: #e5e5e5;
-  background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
-  background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
-  background-repeat: repeat-x;
-  border-color: #e5e5e5 #e5e5e5 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-}
-
-.navbar .btn-navbar:hover,
-.navbar .btn-navbar:focus,
-.navbar .btn-navbar:active,
-.navbar .btn-navbar.active,
-.navbar .btn-navbar.disabled,
-.navbar .btn-navbar[disabled] {
-  color: #ffffff;
-  background-color: #e5e5e5;
-  *background-color: #d9d9d9;
-}
-
-.navbar .btn-navbar:active,
-.navbar .btn-navbar.active {
-  background-color: #cccccc \9;
-}
-
-.navbar .btn-navbar .icon-bar {
-  display: block;
-  width: 18px;
-  height: 2px;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 1px;
-     -moz-border-radius: 1px;
-          border-radius: 1px;
-  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-     -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-          box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.btn-navbar .icon-bar + .icon-bar {
-  margin-top: 3px;
-}
-
-.navbar .nav > li > .dropdown-menu:before {
-  position: absolute;
-  top: -7px;
-  left: 9px;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
-}
-
-.navbar .nav > li > .dropdown-menu:after {
-  position: absolute;
-  top: -6px;
-  left: 10px;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #ffffff;
-  border-left: 6px solid transparent;
-  content: '';
-}
-
-.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
-  top: auto;
-  bottom: -7px;
-  border-top: 7px solid #ccc;
-  border-bottom: 0;
-  border-top-color: rgba(0, 0, 0, 0.2);
-}
-
-.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
-  top: auto;
-  bottom: -6px;
-  border-top: 6px solid #ffffff;
-  border-bottom: 0;
-}
-
-.navbar .nav li.dropdown > a:hover .caret,
-.navbar .nav li.dropdown > a:focus .caret {
-  border-top-color: #333333;
-  border-bottom-color: #333333;
-}
-
-.navbar .nav li.dropdown.open > .dropdown-toggle,
-.navbar .nav li.dropdown.active > .dropdown-toggle,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle {
-  color: #555555;
-  background-color: #e5e5e5;
-}
-
-.navbar .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: #777777;
-  border-bottom-color: #777777;
-}
-
-.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-
-.navbar .pull-right > li > .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-
-.navbar .pull-right > li > .dropdown-menu:before,
-.navbar .nav > li > .dropdown-menu.pull-right:before {
-  right: 12px;
-  left: auto;
-}
-
-.navbar .pull-right > li > .dropdown-menu:after,
-.navbar .nav > li > .dropdown-menu.pull-right:after {
-  right: 13px;
-  left: auto;
-}
-
-.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
-  right: 100%;
-  left: auto;
-  margin-right: -1px;
-  margin-left: 0;
-  -webkit-border-radius: 6px 0 6px 6px;
-     -moz-border-radius: 6px 0 6px 6px;
-          border-radius: 6px 0 6px 6px;
-}
-
-.navbar-inverse .navbar-inner {
-  background-color: #1b1b1b;
-  background-image: -moz-linear-gradient(top, #222222, #111111);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
-  background-image: -webkit-linear-gradient(top, #222222, #111111);
-  background-image: -o-linear-gradient(top, #222222, #111111);
-  background-image: linear-gradient(to bottom, #222222, #111111);
-  background-repeat: repeat-x;
-  border-color: #252525;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
-}
-
-.navbar-inverse .brand,
-.navbar-inverse .nav > li > a {
-  color: #999999;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.navbar-inverse .brand:hover,
-.navbar-inverse .nav > li > a:hover,
-.navbar-inverse .brand:focus,
-.navbar-inverse .nav > li > a:focus {
-  color: #ffffff;
-}
-
-.navbar-inverse .brand {
-  color: #999999;
-}
-
-.navbar-inverse .navbar-text {
-  color: #999999;
-}
-
-.navbar-inverse .nav > li > a:focus,
-.navbar-inverse .nav > li > a:hover {
-  color: #ffffff;
-  background-color: transparent;
-}
-
-.navbar-inverse .nav .active > a,
-.navbar-inverse .nav .active > a:hover,
-.navbar-inverse .nav .active > a:focus {
-  color: #ffffff;
-  background-color: #111111;
-}
-
-.navbar-inverse .navbar-link {
-  color: #999999;
-}
-
-.navbar-inverse .navbar-link:hover,
-.navbar-inverse .navbar-link:focus {
-  color: #ffffff;
-}
-
-.navbar-inverse .divider-vertical {
-  border-right-color: #222222;
-  border-left-color: #111111;
-}
-
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
-.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
-.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
-  color: #ffffff;
-  background-color: #111111;
-}
-
-.navbar-inverse .nav li.dropdown > a:hover .caret,
-.navbar-inverse .nav li.dropdown > a:focus .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-
-.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: #999999;
-  border-bottom-color: #999999;
-}
-
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-
-.navbar-inverse .navbar-search .search-query {
-  color: #ffffff;
-  background-color: #515151;
-  border-color: #111111;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-  -webkit-transition: none;
-     -moz-transition: none;
-       -o-transition: none;
-          transition: none;
-}
-
-.navbar-inverse .navbar-search .search-query:-moz-placeholder {
-  color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
-  color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
-  color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query:focus,
-.navbar-inverse .navbar-search .search-query.focused {
-  padding: 5px 15px;
-  color: #333333;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #ffffff;
-  border: 0;
-  outline: 0;
-  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-          box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-}
-
-.navbar-inverse .btn-navbar {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e0e0e;
-  *background-color: #040404;
-  background-image: -moz-linear-gradient(top, #151515, #040404);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
-  background-image: -webkit-linear-gradient(top, #151515, #040404);
-  background-image: -o-linear-gradient(top, #151515, #040404);
-  background-image: linear-gradient(to bottom, #151515, #040404);
-  background-repeat: repeat-x;
-  border-color: #040404 #040404 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.navbar-inverse .btn-navbar:hover,
-.navbar-inverse .btn-navbar:focus,
-.navbar-inverse .btn-navbar:active,
-.navbar-inverse .btn-navbar.active,
-.navbar-inverse .btn-navbar.disabled,
-.navbar-inverse .btn-navbar[disabled] {
-  color: #ffffff;
-  background-color: #040404;
-  *background-color: #000000;
-}
-
-.navbar-inverse .btn-navbar:active,
-.navbar-inverse .btn-navbar.active {
-  background-color: #000000 \9;
-}
-
-.breadcrumb {
-  padding: 8px 15px;
-  margin: 0 0 20px;
-  list-style: none;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.breadcrumb > li {
-  display: inline-block;
-  *display: inline;
-  text-shadow: 0 1px 0 #ffffff;
-  *zoom: 1;
-}
-
-.breadcrumb > li > .divider {
-  padding: 0 5px;
-  color: #ccc;
-}
-
-.breadcrumb > .active {
-  color: #999999;
-}
-
-.pagination {
-  margin: 20px 0;
-}
-
-.pagination ul {
-  display: inline-block;
-  *display: inline;
-  margin-bottom: 0;
-  margin-left: 0;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  *zoom: 1;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.pagination ul > li {
-  display: inline;
-}
-
-.pagination ul > li > a,
-.pagination ul > li > span {
-  float: left;
-  padding: 4px 12px;
-  line-height: 20px;
-  text-decoration: none;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
-  border-left-width: 0;
-}
-
-.pagination ul > li > a:hover,
-.pagination ul > li > a:focus,
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  background-color: #f5f5f5;
-}
-
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  color: #999999;
-  cursor: default;
-}
-
-.pagination ul > .disabled > span,
-.pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover,
-.pagination ul > .disabled > a:focus {
-  color: #999999;
-  cursor: default;
-  background-color: transparent;
-}
-
-.pagination ul > li:first-child > a,
-.pagination ul > li:first-child > span {
-  border-left-width: 1px;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.pagination ul > li:last-child > a,
-.pagination ul > li:last-child > span {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-bottomright: 4px;
-}
-
-.pagination-centered {
-  text-align: center;
-}
-
-.pagination-right {
-  text-align: right;
-}
-
-.pagination-large ul > li > a,
-.pagination-large ul > li > span {
-  padding: 11px 19px;
-  font-size: 17.5px;
-}
-
-.pagination-large ul > li:first-child > a,
-.pagination-large ul > li:first-child > span {
-  -webkit-border-bottom-left-radius: 6px;
-          border-bottom-left-radius: 6px;
-  -webkit-border-top-left-radius: 6px;
-          border-top-left-radius: 6px;
-  -moz-border-radius-bottomleft: 6px;
-  -moz-border-radius-topleft: 6px;
-}
-
-.pagination-large ul > li:last-child > a,
-.pagination-large ul > li:last-child > span {
-  -webkit-border-top-right-radius: 6px;
-          border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-          border-bottom-right-radius: 6px;
-  -moz-border-radius-topright: 6px;
-  -moz-border-radius-bottomright: 6px;
-}
-
-.pagination-mini ul > li:first-child > a,
-.pagination-small ul > li:first-child > a,
-.pagination-mini ul > li:first-child > span,
-.pagination-small ul > li:first-child > span {
-  -webkit-border-bottom-left-radius: 3px;
-          border-bottom-left-radius: 3px;
-  -webkit-border-top-left-radius: 3px;
-          border-top-left-radius: 3px;
-  -moz-border-radius-bottomleft: 3px;
-  -moz-border-radius-topleft: 3px;
-}
-
-.pagination-mini ul > li:last-child > a,
-.pagination-small ul > li:last-child > a,
-.pagination-mini ul > li:last-child > span,
-.pagination-small ul > li:last-child > span {
-  -webkit-border-top-right-radius: 3px;
-          border-top-right-radius: 3px;
-  -webkit-border-bottom-right-radius: 3px;
-          border-bottom-right-radius: 3px;
-  -moz-border-radius-topright: 3px;
-  -moz-border-radius-bottomright: 3px;
-}
-
-.pagination-small ul > li > a,
-.pagination-small ul > li > span {
-  padding: 2px 10px;
-  font-size: 11.9px;
-}
-
-.pagination-mini ul > li > a,
-.pagination-mini ul > li > span {
-  padding: 0 6px;
-  font-size: 10.5px;
-}
-
-.pager {
-  margin: 20px 0;
-  text-align: center;
-  list-style: none;
-  *zoom: 1;
-}
-
-.pager:before,
-.pager:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.pager:after {
-  clear: both;
-}
-
-.pager li {
-  display: inline;
-}
-
-.pager li > a,
-.pager li > span {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-.pager li > a:hover,
-.pager li > a:focus {
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-
-.pager .next > a,
-.pager .next > span {
-  float: right;
-}
-
-.pager .previous > a,
-.pager .previous > span {
-  float: left;
-}
-
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
-  color: #999999;
-  cursor: default;
-  background-color: #fff;
-}
-
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1040;
-  background-color: #000000;
-}
-
-.modal-backdrop.fade {
-  opacity: 0;
-}
-
-.modal-backdrop,
-.modal-backdrop.fade.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
-}
-
-.modal {
-  position: fixed;
-  top: 10%;
-  left: 50%;
-  z-index: 1050;
-  width: 560px;
-  margin-left: -280px;
-  background-color: #ffffff;
-  border: 1px solid #999;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-  *border: 1px solid #999;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  outline: none;
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding-box;
-          background-clip: padding-box;
-}
-
-.modal.fade {
-  top: -25%;
-  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
-     -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
-       -o-transition: opacity 0.3s linear, top 0.3s ease-out;
-          transition: opacity 0.3s linear, top 0.3s ease-out;
-}
-
-.modal.fade.in {
-  top: 10%;
-}
-
-.modal-header {
-  padding: 9px 15px;
-  border-bottom: 1px solid #eee;
-}
-
-.modal-header .close {
-  margin-top: 2px;
-}
-
-.modal-header h3 {
-  margin: 0;
-  line-height: 30px;
-}
-
-.modal-body {
-  position: relative;
-  max-height: 400px;
-  padding: 15px;
-  overflow-y: auto;
-}
-
-.modal-form {
-  margin-bottom: 0;
-}
-
-.modal-footer {
-  padding: 14px 15px 15px;
-  margin-bottom: 0;
-  text-align: right;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-  *zoom: 1;
-  -webkit-box-shadow: inset 0 1px 0 #ffffff;
-     -moz-box-shadow: inset 0 1px 0 #ffffff;
-          box-shadow: inset 0 1px 0 #ffffff;
-}
-
-.modal-footer:before,
-.modal-footer:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.modal-footer:after {
-  clear: both;
-}
-
-.modal-footer .btn + .btn {
-  margin-bottom: 0;
-  margin-left: 5px;
-}
-
-.modal-footer .btn-group .btn + .btn {
-  margin-left: -1px;
-}
-
-.modal-footer .btn-block + .btn-block {
-  margin-left: 0;
-}
-
-.tooltip {
-  position: absolute;
-  z-index: 1030;
-  display: block;
-  font-size: 11px;
-  line-height: 1.4;
-  opacity: 0;
-  filter: alpha(opacity=0);
-  visibility: visible;
-}
-
-.tooltip.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
-}
-
-.tooltip.top {
-  padding: 5px 0;
-  margin-top: -3px;
-}
-
-.tooltip.right {
-  padding: 0 5px;
-  margin-left: 3px;
-}
-
-.tooltip.bottom {
-  padding: 5px 0;
-  margin-top: 3px;
-}
-
-.tooltip.left {
-  padding: 0 5px;
-  margin-left: -3px;
-}
-
-.tooltip-inner {
-  max-width: 200px;
-  padding: 8px;
-  color: #ffffff;
-  text-align: center;
-  text-decoration: none;
-  background-color: #000000;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-
-.tooltip.top .tooltip-arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-top-color: #000000;
-  border-width: 5px 5px 0;
-}
-
-.tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-right-color: #000000;
-  border-width: 5px 5px 5px 0;
-}
-
-.tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-left-color: #000000;
-  border-width: 5px 0 5px 5px;
-}
-
-.tooltip.bottom .tooltip-arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-bottom-color: #000000;
-  border-width: 0 5px 5px;
-}
-
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1010;
-  display: none;
-  max-width: 276px;
-  padding: 1px;
-  text-align: left;
-  white-space: normal;
-  background-color: #ffffff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-}
-
-.popover.top {
-  margin-top: -10px;
-}
-
-.popover.right {
-  margin-left: 10px;
-}
-
-.popover.bottom {
-  margin-top: 10px;
-}
-
-.popover.left {
-  margin-left: -10px;
-}
-
-.popover-title {
-  padding: 8px 14px;
-  margin: 0;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 18px;
-  background-color: #f7f7f7;
-  border-bottom: 1px solid #ebebeb;
-  -webkit-border-radius: 5px 5px 0 0;
-     -moz-border-radius: 5px 5px 0 0;
-          border-radius: 5px 5px 0 0;
-}
-
-.popover-title:empty {
-  display: none;
-}
-
-.popover-content {
-  padding: 9px 14px;
-}
-
-.popover .arrow,
-.popover .arrow:after {
-  position: absolute;
-  display: block;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-
-.popover .arrow {
-  border-width: 11px;
-}
-
-.popover .arrow:after {
-  border-width: 10px;
-  content: "";
-}
-
-.popover.top .arrow {
-  bottom: -11px;
-  left: 50%;
-  margin-left: -11px;
-  border-top-color: #999;
-  border-top-color: rgba(0, 0, 0, 0.25);
-  border-bottom-width: 0;
-}
-
-.popover.top .arrow:after {
-  bottom: 1px;
-  margin-left: -10px;
-  border-top-color: #ffffff;
-  border-bottom-width: 0;
-}
-
-.popover.right .arrow {
-  top: 50%;
-  left: -11px;
-  margin-top: -11px;
-  border-right-color: #999;
-  border-right-color: rgba(0, 0, 0, 0.25);
-  border-left-width: 0;
-}
-
-.popover.right .arrow:after {
-  bottom: -10px;
-  left: 1px;
-  border-right-color: #ffffff;
-  border-left-width: 0;
-}
-
-.popover.bottom .arrow {
-  top: -11px;
-  left: 50%;
-  margin-left: -11px;
-  border-bottom-color: #999;
-  border-bottom-color: rgba(0, 0, 0, 0.25);
-  border-top-width: 0;
-}
-
-.popover.bottom .arrow:after {
-  top: 1px;
-  margin-left: -10px;
-  border-bottom-color: #ffffff;
-  border-top-width: 0;
-}
-
-.popover.left .arrow {
-  top: 50%;
-  right: -11px;
-  margin-top: -11px;
-  border-left-color: #999;
-  border-left-color: rgba(0, 0, 0, 0.25);
-  border-right-width: 0;
-}
-
-.popover.left .arrow:after {
-  right: 1px;
-  bottom: -10px;
-  border-left-color: #ffffff;
-  border-right-width: 0;
-}
-
-.thumbnails {
-  margin-left: -20px;
-  list-style: none;
-  *zoom: 1;
-}
-
-.thumbnails:before,
-.thumbnails:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.thumbnails:after {
-  clear: both;
-}
-
-.row-fluid .thumbnails {
-  margin-left: 0;
-}
-
-.thumbnails > li {
-  float: left;
-  margin-bottom: 20px;
-  margin-left: 20px;
-}
-
-.thumbnail {
-  display: block;
-  padding: 4px;
-  line-height: 20px;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-  -webkit-transition: all 0.2s ease-in-out;
-     -moz-transition: all 0.2s ease-in-out;
-       -o-transition: all 0.2s ease-in-out;
-          transition: all 0.2s ease-in-out;
-}
-
-a.thumbnail:hover,
-a.thumbnail:focus {
-  border-color: #0088cc;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-     -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-          box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-}
-
-.thumbnail > img {
-  display: block;
-  max-width: 100%;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.thumbnail .caption {
-  padding: 9px;
-  color: #555555;
-}
-
-.media,
-.media-body {
-  overflow: hidden;
-  *overflow: visible;
-  zoom: 1;
-}
-
-.media,
-.media .media {
-  margin-top: 15px;
-}
-
-.media:first-child {
-  margin-top: 0;
-}
-
-.media-object {
-  display: block;
-}
-
-.media-heading {
-  margin: 0 0 5px;
-}
-
-.media > .pull-left {
-  margin-right: 10px;
-}
-
-.media > .pull-right {
-  margin-left: 10px;
-}
-
-.media-list {
-  margin-left: 0;
-  list-style: none;
-}
-
-.label,
-.badge {
-  display: inline-block;
-  padding: 2px 4px;
-  font-size: 11.844px;
-  font-weight: bold;
-  line-height: 14px;
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  white-space: nowrap;
-  vertical-align: baseline;
-  background-color: #999999;
-}
-
-.label {
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.badge {
-  padding-right: 9px;
-  padding-left: 9px;
-  -webkit-border-radius: 9px;
-     -moz-border-radius: 9px;
-          border-radius: 9px;
-}
-
-.label:empty,
-.badge:empty {
-  display: none;
-}
-
-a.label:hover,
-a.label:focus,
-a.badge:hover,
-a.badge:focus {
-  color: #ffffff;
-  text-decoration: none;
-  cursor: pointer;
-}
-
-.label-important,
-.badge-important {
-  background-color: #b94a48;
-}
-
-.label-important[href],
-.badge-important[href] {
-  background-color: #953b39;
-}
-
-.label-warning,
-.badge-warning {
-  background-color: #f89406;
-}
-
-.label-warning[href],
-.badge-warning[href] {
-  background-color: #c67605;
-}
-
-.label-success,
-.badge-success {
-  background-color: #468847;
-}
-
-.label-success[href],
-.badge-success[href] {
-  background-color: #356635;
-}
-
-.label-info,
-.badge-info {
-  background-color: #3a87ad;
-}
-
-.label-info[href],
-.badge-info[href] {
-  background-color: #2d6987;
-}
-
-.label-inverse,
-.badge-inverse {
-  background-color: #333333;
-}
-
-.label-inverse[href],
-.badge-inverse[href] {
-  background-color: #1a1a1a;
-}
-
-.btn .label,
-.btn .badge {
-  position: relative;
-  top: -1px;
-}
-
-.btn-mini .label,
-.btn-mini .badge {
-  top: 0;
-}
-
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-ms-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-o-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-.progress {
-  height: 20px;
-  margin-bottom: 20px;
-  overflow: hidden;
-  background-color: #f7f7f7;
-  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
-  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
-  background-repeat: repeat-x;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-}
-
-.progress .bar {
-  float: left;
-  width: 0;
-  height: 100%;
-  font-size: 12px;
-  color: #ffffff;
-  text-align: center;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e90d2;
-  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
-  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
-  background-image: -o-linear-gradient(top, #149bdf, #0480be);
-  background-image: linear-gradient(to bottom, #149bdf, #0480be);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-  -webkit-transition: width 0.6s ease;
-     -moz-transition: width 0.6s ease;
-       -o-transition: width 0.6s ease;
-          transition: width 0.6s ease;
-}
-
-.progress .bar + .bar {
-  -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-          box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-}
-
-.progress-striped .bar {
-  background-color: #149bdf;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  -webkit-background-size: 40px 40px;
-     -moz-background-size: 40px 40px;
-       -o-background-size: 40px 40px;
-          background-size: 40px 40px;
-}
-
-.progress.active .bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-     -moz-animation: progress-bar-stripes 2s linear infinite;
-      -ms-animation: progress-bar-stripes 2s linear infinite;
-       -o-animation: progress-bar-stripes 2s linear infinite;
-          animation: progress-bar-stripes 2s linear infinite;
-}
-
-.progress-danger .bar,
-.progress .bar-danger {
-  background-color: #dd514c;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
-}
-
-.progress-danger.progress-striped .bar,
-.progress-striped .bar-danger {
-  background-color: #ee5f5b;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-success .bar,
-.progress .bar-success {
-  background-color: #5eb95e;
-  background-image: -moz-linear-gradient(top, #62c462, #57a957);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
-  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
-  background-image: -o-linear-gradient(top, #62c462, #57a957);
-  background-image: linear-gradient(to bottom, #62c462, #57a957);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
-}
-
-.progress-success.progress-striped .bar,
-.progress-striped .bar-success {
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-info .bar,
-.progress .bar-info {
-  background-color: #4bb1cf;
-  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
-}
-
-.progress-info.progress-striped .bar,
-.progress-striped .bar-info {
-  background-color: #5bc0de;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-warning .bar,
-.progress .bar-warning {
-  background-color: #faa732;
-  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-  background-image: -o-linear-gradient(top, #fbb450, #f89406);
-  background-image: linear-gradient(to bottom, #fbb450, #f89406);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
-}
-
-.progress-warning.progress-striped .bar,
-.progress-striped .bar-warning {
-  background-color: #fbb450;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.accordion {
-  margin-bottom: 20px;
-}
-
-.accordion-group {
-  margin-bottom: 2px;
-  border: 1px solid #e5e5e5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.accordion-heading {
-  border-bottom: 0;
-}
-
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
-
-.accordion-toggle {
-  cursor: pointer;
-}
-
-.accordion-inner {
-  padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
-}
-
-.carousel {
-  position: relative;
-  margin-bottom: 20px;
-  line-height: 1;
-}
-
-.carousel-inner {
-  position: relative;
-  width: 100%;
-  overflow: hidden;
-}
-
-.carousel-inner > .item {
-  position: relative;
-  display: none;
-  -webkit-transition: 0.6s ease-in-out left;
-     -moz-transition: 0.6s ease-in-out left;
-       -o-transition: 0.6s ease-in-out left;
-          transition: 0.6s ease-in-out left;
-}
-
-.carousel-inner > .item > img,
-.carousel-inner > .item > a > img {
-  display: block;
-  line-height: 1;
-}
-
-.carousel-inner > .active,
-.carousel-inner > .next,
-.carousel-inner > .prev {
-  display: block;
-}
-
-.carousel-inner > .active {
-  left: 0;
-}
-
-.carousel-inner > .next,
-.carousel-inner > .prev {
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-
-.carousel-inner > .next {
-  left: 100%;
-}
-
-.carousel-inner > .prev {
-  left: -100%;
-}
-
-.carousel-inner > .next.left,
-.carousel-inner > .prev.right {
-  left: 0;
-}
-
-.carousel-inner > .active.left {
-  left: -100%;
-}
-
-.carousel-inner > .active.right {
-  left: 100%;
-}
-
-.carousel-control {
-  position: absolute;
-  top: 40%;
-  left: 15px;
-  width: 40px;
-  height: 40px;
-  margin-top: -20px;
-  font-size: 60px;
-  font-weight: 100;
-  line-height: 30px;
-  color: #ffffff;
-  text-align: center;
-  background: #222222;
-  border: 3px solid #ffffff;
-  -webkit-border-radius: 23px;
-     -moz-border-radius: 23px;
-          border-radius: 23px;
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-}
-
-.carousel-control.right {
-  right: 15px;
-  left: auto;
-}
-
-.carousel-control:hover,
-.carousel-control:focus {
-  color: #ffffff;
-  text-decoration: none;
-  opacity: 0.9;
-  filter: alpha(opacity=90);
-}
-
-.carousel-indicators {
-  position: absolute;
-  top: 15px;
-  right: 15px;
-  z-index: 5;
-  margin: 0;
-  list-style: none;
-}
-
-.carousel-indicators li {
-  display: block;
-  float: left;
-  width: 10px;
-  height: 10px;
-  margin-left: 5px;
-  text-indent: -999px;
-  background-color: #ccc;
-  background-color: rgba(255, 255, 255, 0.25);
-  border-radius: 5px;
-}
-
-.carousel-indicators .active {
-  background-color: #fff;
-}
-
-.carousel-caption {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  padding: 15px;
-  background: #333333;
-  background: rgba(0, 0, 0, 0.75);
-}
-
-.carousel-caption h4,
-.carousel-caption p {
-  line-height: 20px;
-  color: #ffffff;
-}
-
-.carousel-caption h4 {
-  margin: 0 0 5px;
-}
-
-.carousel-caption p {
-  margin-bottom: 0;
-}
-
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  font-size: 18px;
-  font-weight: 200;
-  line-height: 30px;
-  color: inherit;
-  background-color: #eeeeee;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.hero-unit h1 {
-  margin-bottom: 0;
-  font-size: 60px;
-  line-height: 1;
-  letter-spacing: -1px;
-  color: inherit;
-}
-
-.hero-unit li {
-  line-height: 30px;
-}
-
-.pull-right {
-  float: right;
-}
-
-.pull-left {
-  float: left;
-}
-
-.hide {
-  display: none;
-}
-
-.show {
-  display: block;
-}
-
-.invisible {
-  visibility: hidden;
-}
-
-.affix {
-  position: fixed;
-}
diff --git a/view/theme/oldtest/css/bootstrap.min.css b/view/theme/oldtest/css/bootstrap.min.css
deleted file mode 100644
index c10c7f417f..0000000000
--- a/view/theme/oldtest/css/bootstrap.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover,a:focus{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;line-height:0;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;line-height:0;content:""}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}a.muted:hover,a.muted:focus{color:#808080}.text-warning{color:#c09853}a.text-warning:hover,a.text-warning:focus{color:#a47e3c}.text-error{color:#b94a48}a.text-error:hover,a.text-error:focus{color:#953b39}.text-info{color:#3a87ad}a.text-info:hover,a.text-info:focus{color:#2d6987}.text-success{color:#468847}a.text-success:hover,a.text-success:focus{color:#356635}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{line-height:40px}h1{font-size:38.5px}h2{font-size:31.5px}h3{font-size:24.5px}h4{font-size:17.5px}h5{font-size:14px}h6{font-size:11.9px}h1 small{font-size:24.5px}h2 small{font-size:17.5px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}ul.inline,ol.inline{margin-left:0;list-style:none}ul.inline>li,ol.inline>li{display:inline-block;*display:inline;padding-right:5px;padding-left:5px;*zoom:1}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;line-height:0;content:""}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:17.5px;font-weight:300;line-height:1.25}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;white-space:nowrap;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555;vertical-align:middle;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;*margin-top:0;line-height:normal}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;background-color:#fff;border:1px solid #ccc}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;cursor:not-allowed;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:20px;padding-left:20px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;line-height:0;content:""}.controls-row:after{clear:both}.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left}.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;line-height:0;content:""}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-append,.input-prepend{display:inline-block;margin-bottom:10px;font-size:0;white-space:nowrap;vertical-align:middle}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu,.input-append .popover,.input-prepend .popover{font-size:14px}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .btn-group:first-child{margin-left:0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;vertical-align:middle;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;line-height:0;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child,.table-bordered tbody:first-child tr:first-child>th:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child,.table-bordered tbody:first-child tr:first-child>th:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tbody:last-child tr:last-child>th:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>th:first-child{-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tbody:last-child tr:last-child>th:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>th:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-moz-border-radius-bottomleft:0}.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-moz-border-radius-bottomright:0}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover tbody tr:hover>td,.table-hover tbody tr:hover>th{background-color:#f5f5f5}table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0}.table td.span1,.table th.span1{float:none;width:44px;margin-left:0}.table td.span2,.table th.span2{float:none;width:124px;margin-left:0}.table td.span3,.table th.span3{float:none;width:204px;margin-left:0}.table td.span4,.table th.span4{float:none;width:284px;margin-left:0}.table td.span5,.table th.span5{float:none;width:364px;margin-left:0}.table td.span6,.table th.span6{float:none;width:444px;margin-left:0}.table td.span7,.table th.span7{float:none;width:524px;margin-left:0}.table td.span8,.table th.span8{float:none;width:604px;margin-left:0}.table td.span9,.table th.span9{float:none;width:684px;margin-left:0}.table td.span10,.table th.span10{float:none;width:764px;margin-left:0}.table td.span11,.table th.span11{float:none;width:844px;margin-left:0}.table td.span12,.table th.span12{float:none;width:924px;margin-left:0}.table tbody tr.success>td{background-color:#dff0d8}.table tbody tr.error>td{background-color:#f2dede}.table tbody tr.warning>td{background-color:#fcf8e3}.table tbody tr.info>td{background-color:#d9edf7}.table-hover tbody tr.success:hover>td{background-color:#d0e9c6}.table-hover tbody tr.error:hover>td{background-color:#ebcccc}.table-hover tbody tr.warning:hover>td{background-color:#faf2cc}.table-hover tbody tr.info:hover>td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{width:16px;background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{width:16px;background-position:-384px -120px}.icon-folder-open{width:16px;background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-submenu:hover>a,.dropdown-submenu:focus>a{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open{*z-index:1000}.open>.dropdown-menu{display:block}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;border-color:transparent;border-left-color:#ccc;border-style:solid;border-width:5px 0 5px 5px;content:" "}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.dropdown .dropdown-menu .nav-header{padding-right:20px;padding-left:20px}.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #ccc;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#04c;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{color:#08c;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:10px;margin-bottom:10px;font-size:0}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px}.btn-group>.btn-mini{font-size:10.5px}.btn-group>.btn-small{font-size:11.9px}.btn-group>.btn-large{font-size:17.5px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{*padding-top:5px;padding-right:8px;*padding-bottom:5px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini+.dropdown-toggle{*padding-top:2px;padding-right:5px;*padding-bottom:2px;padding-left:5px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-large .caret{margin-top:6px}.btn-large .caret{border-top-width:5px;border-right-width:5px;border-left-width:5px}.btn-mini .caret,.btn-small .caret{margin-top:8px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical>.btn+.btn{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert,.alert h4{color:#c09853}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success h4{color:#468847}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger h4,.alert-error h4{color:#b94a48}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info h4{color:#3a87ad}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:20px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li>a>img{max-width:none}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover,.nav-list>.active>a:focus{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;line-height:0;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover,.nav-tabs>li>a:focus{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover,.nav-tabs>.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover,.nav-pills>.active>a:focus{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px}.nav-tabs.nav-stacked>li>a:hover,.nav-tabs.nav-stacked>li>a:focus{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav .dropdown-toggle:hover .caret,.nav .dropdown-toggle:focus .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover,.nav>.dropdown.active>a:focus{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover,.nav>li.dropdown.open.active>a:focus{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret,.nav li.dropdown.open a:focus .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover,.tabs-stacked .open>a:focus{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;line-height:0;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover,.tabs-below>.nav-tabs>li>a:focus{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover,.tabs-below>.nav-tabs>.active>a:focus{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover,.tabs-left>.nav-tabs>li>a:focus{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover,.tabs-left>.nav-tabs .active>a:focus{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover,.tabs-right>.nav-tabs>li>a:focus{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover,.tabs-right>.nav-tabs .active>a:focus{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent}.navbar{*position:relative;*z-index:2;margin-bottom:20px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);*zoom:1;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.navbar-inner:before,.navbar-inner:after{display:table;line-height:0;content:""}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto;overflow:visible}.navbar .brand{display:block;float:left;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover,.navbar .brand:focus{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px;color:#777}.navbar-link{color:#777}.navbar-link:hover,.navbar-link:focus{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-right:1px solid #fff;border-left:1px solid #f2f2f2}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn,.navbar .input-prepend .btn-group,.navbar .input-append .btn-group{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;line-height:0;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{padding:4px 14px;margin-bottom:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,0.1);box-shadow:0 1px 10px rgba(0,0,0,0.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{color:#333;text-decoration:none;background-color:transparent}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;*background-color:#e5e5e5;background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-repeat:repeat-x;border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:focus,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .nav>li>.dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown>a:hover .caret,.navbar .nav li.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#555;background-color:#e5e5e5}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{right:13px;left:auto}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top,#222,#111);background-image:-webkit-gradient(linear,0 0,0 100%,from(#222),to(#111));background-image:-webkit-linear-gradient(top,#222,#111);background-image:-o-linear-gradient(top,#222,#111);background-image:linear-gradient(to bottom,#222,#111);background-repeat:repeat-x;border-color:#252525;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover,.navbar-inverse .brand:focus,.navbar-inverse .nav>li>a:focus{color:#fff}.navbar-inverse .brand{color:#999}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#111}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover,.navbar-inverse .navbar-link:focus{color:#fff}.navbar-inverse .divider-vertical{border-right-color:#222;border-left-color:#111}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{color:#fff;background-color:#111}.navbar-inverse .nav li.dropdown>a:hover .caret,.navbar-inverse .nav li.dropdown>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;*background-color:#040404;background-image:-moz-linear-gradient(top,#151515,#040404);background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-repeat:repeat-x;border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:focus,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb>li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb>li>.divider{padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{margin:20px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>li>a:focus,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>a:focus{color:#999;cursor:default;background-color:transparent}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px}.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-moz-border-radius-topleft:3px}.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px}.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px}.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:10.5px}.pager{margin:20px 0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;line-height:0;content:""}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:default;background-color:#fff}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;outline:0;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:10%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{position:relative;max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;line-height:0;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.tooltip{position:absolute;z-index:1030;display:block;font-size:11px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-title:empty{display:none}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;line-height:0;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover,a.thumbnail:focus{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#555}.media,.media-body{overflow:hidden;*overflow:visible;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{margin-left:0;list-style:none}.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding-right:9px;padding-left:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}.label:empty,.badge:empty{display:none}a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-indicators{position:absolute;top:15px;right:15px;z-index:5;margin:0;list-style:none}.carousel-indicators li{display:block;float:left;width:10px;height:10px;margin-left:5px;text-indent:-999px;background-color:#ccc;background-color:rgba(255,255,255,0.25);border-radius:5px}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{line-height:20px;color:#fff}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit li{line-height:30px}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}
diff --git a/view/theme/oldtest/default.php b/view/theme/oldtest/default.php
deleted file mode 100644
index 1fc070df18..0000000000
--- a/view/theme/oldtest/default.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-	if (is_ajax()) {
-	 	$t = $a->template_engine('jsonificator');
-		//echo "<hr><pre>"; var_dump($t->data); killme();
-		echo json_encode($t->data);
-		killme();
-	} 
-?>
-<!DOCTYPE html>
-<html>
-  <head>
-    <title><?php if(x($page,'title')) echo $page['title'] ?></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <!-- Bootstrap -->
-    <link href="<?php echo  $a->get_baseurl() ?>/view/theme/test/css/bootstrap.min.css" rel="stylesheet" media="screen">
-    <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
-  </head>
-  <body>
-    
-    	
-		<div class="navbar navbar-fixed-top">
-		  <div class="navbar-inner">
-		    <div class="container">
-		 
-		      <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
-		      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-		        <span class="icon-bar"></span>
-		        <span class="icon-bar"></span>
-		        <span class="icon-bar"></span>
-		      </a>
-		 
-		      <!-- Be sure to leave the brand out there if you want it shown -->
-		      <a class="brand" href="#"><span data-bind="text: nav()"></span></a>
-		 
-		      <!-- Everything you want hidden at 940px or less, place within here -->
-		      <div class="nav-collapse navbar-responsive-collapse collapse">
-		        <ul class="nav"  data-bind="foreach: nav().nav">
-		        	<li><a data-bind="href: url, text: text"></a></li>
-		        </ul>
-		      </div>
-		 
-		    </div>
-		  </div>
-		</div>    	
-    	
-    
-    <script src="http://code.jquery.com/jquery.js"></script>
-    <script src="<?php echo  $a->get_baseurl() ?>/view/theme/test/js/bootstrap.min.js"></script>
-    <script src="<?php echo  $a->get_baseurl() ?>/view/theme/test/js/knockout-2.2.1.js"></script>
-    <script src="<?php echo  $a->get_baseurl() ?>/view/theme/test/app/app.js"></script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/view/theme/oldtest/img/glyphicons-halflings-white.png b/view/theme/oldtest/img/glyphicons-halflings-white.png
deleted file mode 100644
index 3bf6484a29d8da269f9bc874b25493a45fae3bae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8777
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
B7G?kd

diff --git a/view/theme/oldtest/img/glyphicons-halflings.png b/view/theme/oldtest/img/glyphicons-halflings.png
deleted file mode 100644
index a9969993201f9cee63cf9f49217646347297b643..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12799
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

diff --git a/view/theme/oldtest/js/bootstrap.js b/view/theme/oldtest/js/bootstrap.js
deleted file mode 100644
index c298ee42e3..0000000000
--- a/view/theme/oldtest/js/bootstrap.js
+++ /dev/null
@@ -1,2276 +0,0 @@
-/* ===================================================
- * bootstrap-transition.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#transitions
- * ===================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
-  /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
-   * ======================================================= */
-
-  $(function () {
-
-    $.support.transition = (function () {
-
-      var transitionEnd = (function () {
-
-        var el = document.createElement('bootstrap')
-          , transEndEventNames = {
-               'WebkitTransition' : 'webkitTransitionEnd'
-            ,  'MozTransition'    : 'transitionend'
-            ,  'OTransition'      : 'oTransitionEnd otransitionend'
-            ,  'transition'       : 'transitionend'
-            }
-          , name
-
-        for (name in transEndEventNames){
-          if (el.style[name] !== undefined) {
-            return transEndEventNames[name]
-          }
-        }
-
-      }())
-
-      return transitionEnd && {
-        end: transitionEnd
-      }
-
-    })()
-
-  })
-
-}(window.jQuery);/* ==========================================================
- * bootstrap-alert.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#alerts
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* ALERT CLASS DEFINITION
-  * ====================== */
-
-  var dismiss = '[data-dismiss="alert"]'
-    , Alert = function (el) {
-        $(el).on('click', dismiss, this.close)
-      }
-
-  Alert.prototype.close = function (e) {
-    var $this = $(this)
-      , selector = $this.attr('data-target')
-      , $parent
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
-
-    $parent = $(selector)
-
-    e && e.preventDefault()
-
-    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
-
-    $parent.trigger(e = $.Event('close'))
-
-    if (e.isDefaultPrevented()) return
-
-    $parent.removeClass('in')
-
-    function removeElement() {
-      $parent
-        .trigger('closed')
-        .remove()
-    }
-
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent.on($.support.transition.end, removeElement) :
-      removeElement()
-  }
-
-
- /* ALERT PLUGIN DEFINITION
-  * ======================= */
-
-  var old = $.fn.alert
-
-  $.fn.alert = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('alert')
-      if (!data) $this.data('alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.alert.Constructor = Alert
-
-
- /* ALERT NO CONFLICT
-  * ================= */
-
-  $.fn.alert.noConflict = function () {
-    $.fn.alert = old
-    return this
-  }
-
-
- /* ALERT DATA-API
-  * ============== */
-
-  $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
-
-}(window.jQuery);/* ============================================================
- * bootstrap-button.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#buttons
- * ============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* BUTTON PUBLIC CLASS DEFINITION
-  * ============================== */
-
-  var Button = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.button.defaults, options)
-  }
-
-  Button.prototype.setState = function (state) {
-    var d = 'disabled'
-      , $el = this.$element
-      , data = $el.data()
-      , val = $el.is('input') ? 'val' : 'html'
-
-    state = state + 'Text'
-    data.resetText || $el.data('resetText', $el[val]())
-
-    $el[val](data[state] || this.options[state])
-
-    // push to event loop to allow forms to submit
-    setTimeout(function () {
-      state == 'loadingText' ?
-        $el.addClass(d).attr(d, d) :
-        $el.removeClass(d).removeAttr(d)
-    }, 0)
-  }
-
-  Button.prototype.toggle = function () {
-    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
-
-    $parent && $parent
-      .find('.active')
-      .removeClass('active')
-
-    this.$element.toggleClass('active')
-  }
-
-
- /* BUTTON PLUGIN DEFINITION
-  * ======================== */
-
-  var old = $.fn.button
-
-  $.fn.button = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('button')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('button', (data = new Button(this, options)))
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
-  }
-
-  $.fn.button.defaults = {
-    loadingText: 'loading...'
-  }
-
-  $.fn.button.Constructor = Button
-
-
- /* BUTTON NO CONFLICT
-  * ================== */
-
-  $.fn.button.noConflict = function () {
-    $.fn.button = old
-    return this
-  }
-
-
- /* BUTTON DATA-API
-  * =============== */
-
-  $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
-    var $btn = $(e.target)
-    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-    $btn.button('toggle')
-  })
-
-}(window.jQuery);/* ==========================================================
- * bootstrap-carousel.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#carousel
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* CAROUSEL CLASS DEFINITION
-  * ========================= */
-
-  var Carousel = function (element, options) {
-    this.$element = $(element)
-    this.$indicators = this.$element.find('.carousel-indicators')
-    this.options = options
-    this.options.pause == 'hover' && this.$element
-      .on('mouseenter', $.proxy(this.pause, this))
-      .on('mouseleave', $.proxy(this.cycle, this))
-  }
-
-  Carousel.prototype = {
-
-    cycle: function (e) {
-      if (!e) this.paused = false
-      if (this.interval) clearInterval(this.interval);
-      this.options.interval
-        && !this.paused
-        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-      return this
-    }
-
-  , getActiveIndex: function () {
-      this.$active = this.$element.find('.item.active')
-      this.$items = this.$active.parent().children()
-      return this.$items.index(this.$active)
-    }
-
-  , to: function (pos) {
-      var activeIndex = this.getActiveIndex()
-        , that = this
-
-      if (pos > (this.$items.length - 1) || pos < 0) return
-
-      if (this.sliding) {
-        return this.$element.one('slid', function () {
-          that.to(pos)
-        })
-      }
-
-      if (activeIndex == pos) {
-        return this.pause().cycle()
-      }
-
-      return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
-    }
-
-  , pause: function (e) {
-      if (!e) this.paused = true
-      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
-        this.$element.trigger($.support.transition.end)
-        this.cycle(true)
-      }
-      clearInterval(this.interval)
-      this.interval = null
-      return this
-    }
-
-  , next: function () {
-      if (this.sliding) return
-      return this.slide('next')
-    }
-
-  , prev: function () {
-      if (this.sliding) return
-      return this.slide('prev')
-    }
-
-  , slide: function (type, next) {
-      var $active = this.$element.find('.item.active')
-        , $next = next || $active[type]()
-        , isCycling = this.interval
-        , direction = type == 'next' ? 'left' : 'right'
-        , fallback  = type == 'next' ? 'first' : 'last'
-        , that = this
-        , e
-
-      this.sliding = true
-
-      isCycling && this.pause()
-
-      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
-
-      e = $.Event('slide', {
-        relatedTarget: $next[0]
-      , direction: direction
-      })
-
-      if ($next.hasClass('active')) return
-
-      if (this.$indicators.length) {
-        this.$indicators.find('.active').removeClass('active')
-        this.$element.one('slid', function () {
-          var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
-          $nextIndicator && $nextIndicator.addClass('active')
-        })
-      }
-
-      if ($.support.transition && this.$element.hasClass('slide')) {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $next.addClass(type)
-        $next[0].offsetWidth // force reflow
-        $active.addClass(direction)
-        $next.addClass(direction)
-        this.$element.one($.support.transition.end, function () {
-          $next.removeClass([type, direction].join(' ')).addClass('active')
-          $active.removeClass(['active', direction].join(' '))
-          that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid') }, 0)
-        })
-      } else {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $active.removeClass('active')
-        $next.addClass('active')
-        this.sliding = false
-        this.$element.trigger('slid')
-      }
-
-      isCycling && this.cycle()
-
-      return this
-    }
-
-  }
-
-
- /* CAROUSEL PLUGIN DEFINITION
-  * ========================== */
-
-  var old = $.fn.carousel
-
-  $.fn.carousel = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('carousel')
-        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
-        , action = typeof option == 'string' ? option : options.slide
-      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'number') data.to(option)
-      else if (action) data[action]()
-      else if (options.interval) data.pause().cycle()
-    })
-  }
-
-  $.fn.carousel.defaults = {
-    interval: 5000
-  , pause: 'hover'
-  }
-
-  $.fn.carousel.Constructor = Carousel
-
-
- /* CAROUSEL NO CONFLICT
-  * ==================== */
-
-  $.fn.carousel.noConflict = function () {
-    $.fn.carousel = old
-    return this
-  }
-
- /* CAROUSEL DATA-API
-  * ================= */
-
-  $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
-    var $this = $(this), href
-      , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      , options = $.extend({}, $target.data(), $this.data())
-      , slideIndex
-
-    $target.carousel(options)
-
-    if (slideIndex = $this.attr('data-slide-to')) {
-      $target.data('carousel').pause().to(slideIndex).cycle()
-    }
-
-    e.preventDefault()
-  })
-
-}(window.jQuery);/* =============================================================
- * bootstrap-collapse.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#collapse
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* COLLAPSE PUBLIC CLASS DEFINITION
-  * ================================ */
-
-  var Collapse = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.collapse.defaults, options)
-
-    if (this.options.parent) {
-      this.$parent = $(this.options.parent)
-    }
-
-    this.options.toggle && this.toggle()
-  }
-
-  Collapse.prototype = {
-
-    constructor: Collapse
-
-  , dimension: function () {
-      var hasWidth = this.$element.hasClass('width')
-      return hasWidth ? 'width' : 'height'
-    }
-
-  , show: function () {
-      var dimension
-        , scroll
-        , actives
-        , hasData
-
-      if (this.transitioning || this.$element.hasClass('in')) return
-
-      dimension = this.dimension()
-      scroll = $.camelCase(['scroll', dimension].join('-'))
-      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
-
-      if (actives && actives.length) {
-        hasData = actives.data('collapse')
-        if (hasData && hasData.transitioning) return
-        actives.collapse('hide')
-        hasData || actives.data('collapse', null)
-      }
-
-      this.$element[dimension](0)
-      this.transition('addClass', $.Event('show'), 'shown')
-      $.support.transition && this.$element[dimension](this.$element[0][scroll])
-    }
-
-  , hide: function () {
-      var dimension
-      if (this.transitioning || !this.$element.hasClass('in')) return
-      dimension = this.dimension()
-      this.reset(this.$element[dimension]())
-      this.transition('removeClass', $.Event('hide'), 'hidden')
-      this.$element[dimension](0)
-    }
-
-  , reset: function (size) {
-      var dimension = this.dimension()
-
-      this.$element
-        .removeClass('collapse')
-        [dimension](size || 'auto')
-        [0].offsetWidth
-
-      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
-
-      return this
-    }
-
-  , transition: function (method, startEvent, completeEvent) {
-      var that = this
-        , complete = function () {
-            if (startEvent.type == 'show') that.reset()
-            that.transitioning = 0
-            that.$element.trigger(completeEvent)
-          }
-
-      this.$element.trigger(startEvent)
-
-      if (startEvent.isDefaultPrevented()) return
-
-      this.transitioning = 1
-
-      this.$element[method]('in')
-
-      $.support.transition && this.$element.hasClass('collapse') ?
-        this.$element.one($.support.transition.end, complete) :
-        complete()
-    }
-
-  , toggle: function () {
-      this[this.$element.hasClass('in') ? 'hide' : 'show']()
-    }
-
-  }
-
-
- /* COLLAPSE PLUGIN DEFINITION
-  * ========================== */
-
-  var old = $.fn.collapse
-
-  $.fn.collapse = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('collapse')
-        , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option)
-      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.collapse.defaults = {
-    toggle: true
-  }
-
-  $.fn.collapse.Constructor = Collapse
-
-
- /* COLLAPSE NO CONFLICT
-  * ==================== */
-
-  $.fn.collapse.noConflict = function () {
-    $.fn.collapse = old
-    return this
-  }
-
-
- /* COLLAPSE DATA-API
-  * ================= */
-
-  $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
-    var $this = $(this), href
-      , target = $this.attr('data-target')
-        || e.preventDefault()
-        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
-      , option = $(target).data('collapse') ? 'toggle' : $this.data()
-    $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
-    $(target).collapse(option)
-  })
-
-}(window.jQuery);/* ============================================================
- * bootstrap-dropdown.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#dropdowns
- * ============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* DROPDOWN CLASS DEFINITION
-  * ========================= */
-
-  var toggle = '[data-toggle=dropdown]'
-    , Dropdown = function (element) {
-        var $el = $(element).on('click.dropdown.data-api', this.toggle)
-        $('html').on('click.dropdown.data-api', function () {
-          $el.parent().removeClass('open')
-        })
-      }
-
-  Dropdown.prototype = {
-
-    constructor: Dropdown
-
-  , toggle: function (e) {
-      var $this = $(this)
-        , $parent
-        , isActive
-
-      if ($this.is('.disabled, :disabled')) return
-
-      $parent = getParent($this)
-
-      isActive = $parent.hasClass('open')
-
-      clearMenus()
-
-      if (!isActive) {
-        $parent.toggleClass('open')
-      }
-
-      $this.focus()
-
-      return false
-    }
-
-  , keydown: function (e) {
-      var $this
-        , $items
-        , $active
-        , $parent
-        , isActive
-        , index
-
-      if (!/(38|40|27)/.test(e.keyCode)) return
-
-      $this = $(this)
-
-      e.preventDefault()
-      e.stopPropagation()
-
-      if ($this.is('.disabled, :disabled')) return
-
-      $parent = getParent($this)
-
-      isActive = $parent.hasClass('open')
-
-      if (!isActive || (isActive && e.keyCode == 27)) {
-        if (e.which == 27) $parent.find(toggle).focus()
-        return $this.click()
-      }
-
-      $items = $('[role=menu] li:not(.divider):visible a', $parent)
-
-      if (!$items.length) return
-
-      index = $items.index($items.filter(':focus'))
-
-      if (e.keyCode == 38 && index > 0) index--                                        // up
-      if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
-      if (!~index) index = 0
-
-      $items
-        .eq(index)
-        .focus()
-    }
-
-  }
-
-  function clearMenus() {
-    $(toggle).each(function () {
-      getParent($(this)).removeClass('open')
-    })
-  }
-
-  function getParent($this) {
-    var selector = $this.attr('data-target')
-      , $parent
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
-
-    $parent = selector && $(selector)
-
-    if (!$parent || !$parent.length) $parent = $this.parent()
-
-    return $parent
-  }
-
-
-  /* DROPDOWN PLUGIN DEFINITION
-   * ========================== */
-
-  var old = $.fn.dropdown
-
-  $.fn.dropdown = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('dropdown')
-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.dropdown.Constructor = Dropdown
-
-
- /* DROPDOWN NO CONFLICT
-  * ==================== */
-
-  $.fn.dropdown.noConflict = function () {
-    $.fn.dropdown = old
-    return this
-  }
-
-
-  /* APPLY TO STANDARD DROPDOWN ELEMENTS
-   * =================================== */
-
-  $(document)
-    .on('click.dropdown.data-api', clearMenus)
-    .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
-    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
-    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
-
-}(window.jQuery);
-/* =========================================================
- * bootstrap-modal.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#modals
- * =========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================= */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* MODAL CLASS DEFINITION
-  * ====================== */
-
-  var Modal = function (element, options) {
-    this.options = options
-    this.$element = $(element)
-      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
-    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
-  }
-
-  Modal.prototype = {
-
-      constructor: Modal
-
-    , toggle: function () {
-        return this[!this.isShown ? 'show' : 'hide']()
-      }
-
-    , show: function () {
-        var that = this
-          , e = $.Event('show')
-
-        this.$element.trigger(e)
-
-        if (this.isShown || e.isDefaultPrevented()) return
-
-        this.isShown = true
-
-        this.escape()
-
-        this.backdrop(function () {
-          var transition = $.support.transition && that.$element.hasClass('fade')
-
-          if (!that.$element.parent().length) {
-            that.$element.appendTo(document.body) //don't move modals dom position
-          }
-
-          that.$element.show()
-
-          if (transition) {
-            that.$element[0].offsetWidth // force reflow
-          }
-
-          that.$element
-            .addClass('in')
-            .attr('aria-hidden', false)
-
-          that.enforceFocus()
-
-          transition ?
-            that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
-            that.$element.focus().trigger('shown')
-
-        })
-      }
-
-    , hide: function (e) {
-        e && e.preventDefault()
-
-        var that = this
-
-        e = $.Event('hide')
-
-        this.$element.trigger(e)
-
-        if (!this.isShown || e.isDefaultPrevented()) return
-
-        this.isShown = false
-
-        this.escape()
-
-        $(document).off('focusin.modal')
-
-        this.$element
-          .removeClass('in')
-          .attr('aria-hidden', true)
-
-        $.support.transition && this.$element.hasClass('fade') ?
-          this.hideWithTransition() :
-          this.hideModal()
-      }
-
-    , enforceFocus: function () {
-        var that = this
-        $(document).on('focusin.modal', function (e) {
-          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
-            that.$element.focus()
-          }
-        })
-      }
-
-    , escape: function () {
-        var that = this
-        if (this.isShown && this.options.keyboard) {
-          this.$element.on('keyup.dismiss.modal', function ( e ) {
-            e.which == 27 && that.hide()
-          })
-        } else if (!this.isShown) {
-          this.$element.off('keyup.dismiss.modal')
-        }
-      }
-
-    , hideWithTransition: function () {
-        var that = this
-          , timeout = setTimeout(function () {
-              that.$element.off($.support.transition.end)
-              that.hideModal()
-            }, 500)
-
-        this.$element.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          that.hideModal()
-        })
-      }
-
-    , hideModal: function () {
-        var that = this
-        this.$element.hide()
-        this.backdrop(function () {
-          that.removeBackdrop()
-          that.$element.trigger('hidden')
-        })
-      }
-
-    , removeBackdrop: function () {
-        this.$backdrop && this.$backdrop.remove()
-        this.$backdrop = null
-      }
-
-    , backdrop: function (callback) {
-        var that = this
-          , animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-        if (this.isShown && this.options.backdrop) {
-          var doAnimate = $.support.transition && animate
-
-          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-            .appendTo(document.body)
-
-          this.$backdrop.click(
-            this.options.backdrop == 'static' ?
-              $.proxy(this.$element[0].focus, this.$element[0])
-            : $.proxy(this.hide, this)
-          )
-
-          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-          this.$backdrop.addClass('in')
-
-          if (!callback) return
-
-          doAnimate ?
-            this.$backdrop.one($.support.transition.end, callback) :
-            callback()
-
-        } else if (!this.isShown && this.$backdrop) {
-          this.$backdrop.removeClass('in')
-
-          $.support.transition && this.$element.hasClass('fade')?
-            this.$backdrop.one($.support.transition.end, callback) :
-            callback()
-
-        } else if (callback) {
-          callback()
-        }
-      }
-  }
-
-
- /* MODAL PLUGIN DEFINITION
-  * ======================= */
-
-  var old = $.fn.modal
-
-  $.fn.modal = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('modal')
-        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
-      if (!data) $this.data('modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option]()
-      else if (options.show) data.show()
-    })
-  }
-
-  $.fn.modal.defaults = {
-      backdrop: true
-    , keyboard: true
-    , show: true
-  }
-
-  $.fn.modal.Constructor = Modal
-
-
- /* MODAL NO CONFLICT
-  * ================= */
-
-  $.fn.modal.noConflict = function () {
-    $.fn.modal = old
-    return this
-  }
-
-
- /* MODAL DATA-API
-  * ============== */
-
-  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this = $(this)
-      , href = $this.attr('href')
-      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
-
-    e.preventDefault()
-
-    $target
-      .modal(option)
-      .one('hide', function () {
-        $this.focus()
-      })
-  })
-
-}(window.jQuery);
-/* ===========================================================
- * bootstrap-tooltip.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#tooltips
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* TOOLTIP PUBLIC CLASS DEFINITION
-  * =============================== */
-
-  var Tooltip = function (element, options) {
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.prototype = {
-
-    constructor: Tooltip
-
-  , init: function (type, element, options) {
-      var eventIn
-        , eventOut
-        , triggers
-        , trigger
-        , i
-
-      this.type = type
-      this.$element = $(element)
-      this.options = this.getOptions(options)
-      this.enabled = true
-
-      triggers = this.options.trigger.split(' ')
-
-      for (i = triggers.length; i--;) {
-        trigger = triggers[i]
-        if (trigger == 'click') {
-          this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-        } else if (trigger != 'manual') {
-          eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
-          eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
-          this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-          this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-        }
-      }
-
-      this.options.selector ?
-        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-        this.fixTitle()
-    }
-
-  , getOptions: function (options) {
-      options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
-
-      if (options.delay && typeof options.delay == 'number') {
-        options.delay = {
-          show: options.delay
-        , hide: options.delay
-        }
-      }
-
-      return options
-    }
-
-  , enter: function (e) {
-      var defaults = $.fn[this.type].defaults
-        , options = {}
-        , self
-
-      this._options && $.each(this._options, function (key, value) {
-        if (defaults[key] != value) options[key] = value
-      }, this)
-
-      self = $(e.currentTarget)[this.type](options).data(this.type)
-
-      if (!self.options.delay || !self.options.delay.show) return self.show()
-
-      clearTimeout(this.timeout)
-      self.hoverState = 'in'
-      this.timeout = setTimeout(function() {
-        if (self.hoverState == 'in') self.show()
-      }, self.options.delay.show)
-    }
-
-  , leave: function (e) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
-
-      if (this.timeout) clearTimeout(this.timeout)
-      if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-      self.hoverState = 'out'
-      this.timeout = setTimeout(function() {
-        if (self.hoverState == 'out') self.hide()
-      }, self.options.delay.hide)
-    }
-
-  , show: function () {
-      var $tip
-        , pos
-        , actualWidth
-        , actualHeight
-        , placement
-        , tp
-        , e = $.Event('show')
-
-      if (this.hasContent() && this.enabled) {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $tip = this.tip()
-        this.setContent()
-
-        if (this.options.animation) {
-          $tip.addClass('fade')
-        }
-
-        placement = typeof this.options.placement == 'function' ?
-          this.options.placement.call(this, $tip[0], this.$element[0]) :
-          this.options.placement
-
-        $tip
-          .detach()
-          .css({ top: 0, left: 0, display: 'block' })
-
-        this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-
-        pos = this.getPosition()
-
-        actualWidth = $tip[0].offsetWidth
-        actualHeight = $tip[0].offsetHeight
-
-        switch (placement) {
-          case 'bottom':
-            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'top':
-            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'left':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
-            break
-          case 'right':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
-            break
-        }
-
-        this.applyPlacement(tp, placement)
-        this.$element.trigger('shown')
-      }
-    }
-
-  , applyPlacement: function(offset, placement){
-      var $tip = this.tip()
-        , width = $tip[0].offsetWidth
-        , height = $tip[0].offsetHeight
-        , actualWidth
-        , actualHeight
-        , delta
-        , replace
-
-      $tip
-        .offset(offset)
-        .addClass(placement)
-        .addClass('in')
-
-      actualWidth = $tip[0].offsetWidth
-      actualHeight = $tip[0].offsetHeight
-
-      if (placement == 'top' && actualHeight != height) {
-        offset.top = offset.top + height - actualHeight
-        replace = true
-      }
-
-      if (placement == 'bottom' || placement == 'top') {
-        delta = 0
-
-        if (offset.left < 0){
-          delta = offset.left * -2
-          offset.left = 0
-          $tip.offset(offset)
-          actualWidth = $tip[0].offsetWidth
-          actualHeight = $tip[0].offsetHeight
-        }
-
-        this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
-      } else {
-        this.replaceArrow(actualHeight - height, actualHeight, 'top')
-      }
-
-      if (replace) $tip.offset(offset)
-    }
-
-  , replaceArrow: function(delta, dimension, position){
-      this
-        .arrow()
-        .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
-    }
-
-  , setContent: function () {
-      var $tip = this.tip()
-        , title = this.getTitle()
-
-      $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-      $tip.removeClass('fade in top bottom left right')
-    }
-
-  , hide: function () {
-      var that = this
-        , $tip = this.tip()
-        , e = $.Event('hide')
-
-      this.$element.trigger(e)
-      if (e.isDefaultPrevented()) return
-
-      $tip.removeClass('in')
-
-      function removeWithAnimation() {
-        var timeout = setTimeout(function () {
-          $tip.off($.support.transition.end).detach()
-        }, 500)
-
-        $tip.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          $tip.detach()
-        })
-      }
-
-      $.support.transition && this.$tip.hasClass('fade') ?
-        removeWithAnimation() :
-        $tip.detach()
-
-      this.$element.trigger('hidden')
-
-      return this
-    }
-
-  , fixTitle: function () {
-      var $e = this.$element
-      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-        $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
-      }
-    }
-
-  , hasContent: function () {
-      return this.getTitle()
-    }
-
-  , getPosition: function () {
-      var el = this.$element[0]
-      return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-        width: el.offsetWidth
-      , height: el.offsetHeight
-      }, this.$element.offset())
-    }
-
-  , getTitle: function () {
-      var title
-        , $e = this.$element
-        , o = this.options
-
-      title = $e.attr('data-original-title')
-        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
-
-      return title
-    }
-
-  , tip: function () {
-      return this.$tip = this.$tip || $(this.options.template)
-    }
-
-  , arrow: function(){
-      return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
-    }
-
-  , validate: function () {
-      if (!this.$element[0].parentNode) {
-        this.hide()
-        this.$element = null
-        this.options = null
-      }
-    }
-
-  , enable: function () {
-      this.enabled = true
-    }
-
-  , disable: function () {
-      this.enabled = false
-    }
-
-  , toggleEnabled: function () {
-      this.enabled = !this.enabled
-    }
-
-  , toggle: function (e) {
-      var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
-      self.tip().hasClass('in') ? self.hide() : self.show()
-    }
-
-  , destroy: function () {
-      this.hide().$element.off('.' + this.type).removeData(this.type)
-    }
-
-  }
-
-
- /* TOOLTIP PLUGIN DEFINITION
-  * ========================= */
-
-  var old = $.fn.tooltip
-
-  $.fn.tooltip = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('tooltip')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tooltip.Constructor = Tooltip
-
-  $.fn.tooltip.defaults = {
-    animation: true
-  , placement: 'top'
-  , selector: false
-  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
-  , trigger: 'hover focus'
-  , title: ''
-  , delay: 0
-  , html: false
-  , container: false
-  }
-
-
- /* TOOLTIP NO CONFLICT
-  * =================== */
-
-  $.fn.tooltip.noConflict = function () {
-    $.fn.tooltip = old
-    return this
-  }
-
-}(window.jQuery);
-/* ===========================================================
- * bootstrap-popover.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#popovers
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* POPOVER PUBLIC CLASS DEFINITION
-  * =============================== */
-
-  var Popover = function (element, options) {
-    this.init('popover', element, options)
-  }
-
-
-  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
-     ========================================== */
-
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
-
-    constructor: Popover
-
-  , setContent: function () {
-      var $tip = this.tip()
-        , title = this.getTitle()
-        , content = this.getContent()
-
-      $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-      $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
-
-      $tip.removeClass('fade top bottom left right in')
-    }
-
-  , hasContent: function () {
-      return this.getTitle() || this.getContent()
-    }
-
-  , getContent: function () {
-      var content
-        , $e = this.$element
-        , o = this.options
-
-      content = (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
-        || $e.attr('data-content')
-
-      return content
-    }
-
-  , tip: function () {
-      if (!this.$tip) {
-        this.$tip = $(this.options.template)
-      }
-      return this.$tip
-    }
-
-  , destroy: function () {
-      this.hide().$element.off('.' + this.type).removeData(this.type)
-    }
-
-  })
-
-
- /* POPOVER PLUGIN DEFINITION
-  * ======================= */
-
-  var old = $.fn.popover
-
-  $.fn.popover = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('popover')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('popover', (data = new Popover(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.popover.Constructor = Popover
-
-  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
-    placement: 'right'
-  , trigger: 'click'
-  , content: ''
-  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
-  })
-
-
- /* POPOVER NO CONFLICT
-  * =================== */
-
-  $.fn.popover.noConflict = function () {
-    $.fn.popover = old
-    return this
-  }
-
-}(window.jQuery);
-/* =============================================================
- * bootstrap-scrollspy.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#scrollspy
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* SCROLLSPY CLASS DEFINITION
-  * ========================== */
-
-  function ScrollSpy(element, options) {
-    var process = $.proxy(this.process, this)
-      , $element = $(element).is('body') ? $(window) : $(element)
-      , href
-    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
-    this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
-    this.selector = (this.options.target
-      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      || '') + ' .nav li > a'
-    this.$body = $('body')
-    this.refresh()
-    this.process()
-  }
-
-  ScrollSpy.prototype = {
-
-      constructor: ScrollSpy
-
-    , refresh: function () {
-        var self = this
-          , $targets
-
-        this.offsets = $([])
-        this.targets = $([])
-
-        $targets = this.$body
-          .find(this.selector)
-          .map(function () {
-            var $el = $(this)
-              , href = $el.data('target') || $el.attr('href')
-              , $href = /^#\w/.test(href) && $(href)
-            return ( $href
-              && $href.length
-              && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
-          })
-          .sort(function (a, b) { return a[0] - b[0] })
-          .each(function () {
-            self.offsets.push(this[0])
-            self.targets.push(this[1])
-          })
-      }
-
-    , process: function () {
-        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
-          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
-          , maxScroll = scrollHeight - this.$scrollElement.height()
-          , offsets = this.offsets
-          , targets = this.targets
-          , activeTarget = this.activeTarget
-          , i
-
-        if (scrollTop >= maxScroll) {
-          return activeTarget != (i = targets.last()[0])
-            && this.activate ( i )
-        }
-
-        for (i = offsets.length; i--;) {
-          activeTarget != targets[i]
-            && scrollTop >= offsets[i]
-            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
-            && this.activate( targets[i] )
-        }
-      }
-
-    , activate: function (target) {
-        var active
-          , selector
-
-        this.activeTarget = target
-
-        $(this.selector)
-          .parent('.active')
-          .removeClass('active')
-
-        selector = this.selector
-          + '[data-target="' + target + '"],'
-          + this.selector + '[href="' + target + '"]'
-
-        active = $(selector)
-          .parent('li')
-          .addClass('active')
-
-        if (active.parent('.dropdown-menu').length)  {
-          active = active.closest('li.dropdown').addClass('active')
-        }
-
-        active.trigger('activate')
-      }
-
-  }
-
-
- /* SCROLLSPY PLUGIN DEFINITION
-  * =========================== */
-
-  var old = $.fn.scrollspy
-
-  $.fn.scrollspy = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('scrollspy')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.scrollspy.Constructor = ScrollSpy
-
-  $.fn.scrollspy.defaults = {
-    offset: 10
-  }
-
-
- /* SCROLLSPY NO CONFLICT
-  * ===================== */
-
-  $.fn.scrollspy.noConflict = function () {
-    $.fn.scrollspy = old
-    return this
-  }
-
-
- /* SCROLLSPY DATA-API
-  * ================== */
-
-  $(window).on('load', function () {
-    $('[data-spy="scroll"]').each(function () {
-      var $spy = $(this)
-      $spy.scrollspy($spy.data())
-    })
-  })
-
-}(window.jQuery);/* ========================================================
- * bootstrap-tab.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#tabs
- * ========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* TAB CLASS DEFINITION
-  * ==================== */
-
-  var Tab = function (element) {
-    this.element = $(element)
-  }
-
-  Tab.prototype = {
-
-    constructor: Tab
-
-  , show: function () {
-      var $this = this.element
-        , $ul = $this.closest('ul:not(.dropdown-menu)')
-        , selector = $this.attr('data-target')
-        , previous
-        , $target
-        , e
-
-      if (!selector) {
-        selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-      }
-
-      if ( $this.parent('li').hasClass('active') ) return
-
-      previous = $ul.find('.active:last a')[0]
-
-      e = $.Event('show', {
-        relatedTarget: previous
-      })
-
-      $this.trigger(e)
-
-      if (e.isDefaultPrevented()) return
-
-      $target = $(selector)
-
-      this.activate($this.parent('li'), $ul)
-      this.activate($target, $target.parent(), function () {
-        $this.trigger({
-          type: 'shown'
-        , relatedTarget: previous
-        })
-      })
-    }
-
-  , activate: function ( element, container, callback) {
-      var $active = container.find('> .active')
-        , transition = callback
-            && $.support.transition
-            && $active.hasClass('fade')
-
-      function next() {
-        $active
-          .removeClass('active')
-          .find('> .dropdown-menu > .active')
-          .removeClass('active')
-
-        element.addClass('active')
-
-        if (transition) {
-          element[0].offsetWidth // reflow for transition
-          element.addClass('in')
-        } else {
-          element.removeClass('fade')
-        }
-
-        if ( element.parent('.dropdown-menu') ) {
-          element.closest('li.dropdown').addClass('active')
-        }
-
-        callback && callback()
-      }
-
-      transition ?
-        $active.one($.support.transition.end, next) :
-        next()
-
-      $active.removeClass('in')
-    }
-  }
-
-
- /* TAB PLUGIN DEFINITION
-  * ===================== */
-
-  var old = $.fn.tab
-
-  $.fn.tab = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('tab')
-      if (!data) $this.data('tab', (data = new Tab(this)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tab.Constructor = Tab
-
-
- /* TAB NO CONFLICT
-  * =============== */
-
-  $.fn.tab.noConflict = function () {
-    $.fn.tab = old
-    return this
-  }
-
-
- /* TAB DATA-API
-  * ============ */
-
-  $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
-    e.preventDefault()
-    $(this).tab('show')
-  })
-
-}(window.jQuery);/* =============================================================
- * bootstrap-typeahead.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#typeahead
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function($){
-
-  "use strict"; // jshint ;_;
-
-
- /* TYPEAHEAD PUBLIC CLASS DEFINITION
-  * ================================= */
-
-  var Typeahead = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.typeahead.defaults, options)
-    this.matcher = this.options.matcher || this.matcher
-    this.sorter = this.options.sorter || this.sorter
-    this.highlighter = this.options.highlighter || this.highlighter
-    this.updater = this.options.updater || this.updater
-    this.source = this.options.source
-    this.$menu = $(this.options.menu)
-    this.shown = false
-    this.listen()
-  }
-
-  Typeahead.prototype = {
-
-    constructor: Typeahead
-
-  , select: function () {
-      var val = this.$menu.find('.active').attr('data-value')
-      this.$element
-        .val(this.updater(val))
-        .change()
-      return this.hide()
-    }
-
-  , updater: function (item) {
-      return item
-    }
-
-  , show: function () {
-      var pos = $.extend({}, this.$element.position(), {
-        height: this.$element[0].offsetHeight
-      })
-
-      this.$menu
-        .insertAfter(this.$element)
-        .css({
-          top: pos.top + pos.height
-        , left: pos.left
-        })
-        .show()
-
-      this.shown = true
-      return this
-    }
-
-  , hide: function () {
-      this.$menu.hide()
-      this.shown = false
-      return this
-    }
-
-  , lookup: function (event) {
-      var items
-
-      this.query = this.$element.val()
-
-      if (!this.query || this.query.length < this.options.minLength) {
-        return this.shown ? this.hide() : this
-      }
-
-      items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
-
-      return items ? this.process(items) : this
-    }
-
-  , process: function (items) {
-      var that = this
-
-      items = $.grep(items, function (item) {
-        return that.matcher(item)
-      })
-
-      items = this.sorter(items)
-
-      if (!items.length) {
-        return this.shown ? this.hide() : this
-      }
-
-      return this.render(items.slice(0, this.options.items)).show()
-    }
-
-  , matcher: function (item) {
-      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
-    }
-
-  , sorter: function (items) {
-      var beginswith = []
-        , caseSensitive = []
-        , caseInsensitive = []
-        , item
-
-      while (item = items.shift()) {
-        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
-        else if (~item.indexOf(this.query)) caseSensitive.push(item)
-        else caseInsensitive.push(item)
-      }
-
-      return beginswith.concat(caseSensitive, caseInsensitive)
-    }
-
-  , highlighter: function (item) {
-      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
-      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
-        return '<strong>' + match + '</strong>'
-      })
-    }
-
-  , render: function (items) {
-      var that = this
-
-      items = $(items).map(function (i, item) {
-        i = $(that.options.item).attr('data-value', item)
-        i.find('a').html(that.highlighter(item))
-        return i[0]
-      })
-
-      items.first().addClass('active')
-      this.$menu.html(items)
-      return this
-    }
-
-  , next: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , next = active.next()
-
-      if (!next.length) {
-        next = $(this.$menu.find('li')[0])
-      }
-
-      next.addClass('active')
-    }
-
-  , prev: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , prev = active.prev()
-
-      if (!prev.length) {
-        prev = this.$menu.find('li').last()
-      }
-
-      prev.addClass('active')
-    }
-
-  , listen: function () {
-      this.$element
-        .on('focus',    $.proxy(this.focus, this))
-        .on('blur',     $.proxy(this.blur, this))
-        .on('keypress', $.proxy(this.keypress, this))
-        .on('keyup',    $.proxy(this.keyup, this))
-
-      if (this.eventSupported('keydown')) {
-        this.$element.on('keydown', $.proxy(this.keydown, this))
-      }
-
-      this.$menu
-        .on('click', $.proxy(this.click, this))
-        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
-        .on('mouseleave', 'li', $.proxy(this.mouseleave, this))
-    }
-
-  , eventSupported: function(eventName) {
-      var isSupported = eventName in this.$element
-      if (!isSupported) {
-        this.$element.setAttribute(eventName, 'return;')
-        isSupported = typeof this.$element[eventName] === 'function'
-      }
-      return isSupported
-    }
-
-  , move: function (e) {
-      if (!this.shown) return
-
-      switch(e.keyCode) {
-        case 9: // tab
-        case 13: // enter
-        case 27: // escape
-          e.preventDefault()
-          break
-
-        case 38: // up arrow
-          e.preventDefault()
-          this.prev()
-          break
-
-        case 40: // down arrow
-          e.preventDefault()
-          this.next()
-          break
-      }
-
-      e.stopPropagation()
-    }
-
-  , keydown: function (e) {
-      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
-      this.move(e)
-    }
-
-  , keypress: function (e) {
-      if (this.suppressKeyPressRepeat) return
-      this.move(e)
-    }
-
-  , keyup: function (e) {
-      switch(e.keyCode) {
-        case 40: // down arrow
-        case 38: // up arrow
-        case 16: // shift
-        case 17: // ctrl
-        case 18: // alt
-          break
-
-        case 9: // tab
-        case 13: // enter
-          if (!this.shown) return
-          this.select()
-          break
-
-        case 27: // escape
-          if (!this.shown) return
-          this.hide()
-          break
-
-        default:
-          this.lookup()
-      }
-
-      e.stopPropagation()
-      e.preventDefault()
-  }
-
-  , focus: function (e) {
-      this.focused = true
-    }
-
-  , blur: function (e) {
-      this.focused = false
-      if (!this.mousedover && this.shown) this.hide()
-    }
-
-  , click: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-      this.select()
-      this.$element.focus()
-    }
-
-  , mouseenter: function (e) {
-      this.mousedover = true
-      this.$menu.find('.active').removeClass('active')
-      $(e.currentTarget).addClass('active')
-    }
-
-  , mouseleave: function (e) {
-      this.mousedover = false
-      if (!this.focused && this.shown) this.hide()
-    }
-
-  }
-
-
-  /* TYPEAHEAD PLUGIN DEFINITION
-   * =========================== */
-
-  var old = $.fn.typeahead
-
-  $.fn.typeahead = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('typeahead')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.typeahead.defaults = {
-    source: []
-  , items: 8
-  , menu: '<ul class="typeahead dropdown-menu"></ul>'
-  , item: '<li><a href="#"></a></li>'
-  , minLength: 1
-  }
-
-  $.fn.typeahead.Constructor = Typeahead
-
-
- /* TYPEAHEAD NO CONFLICT
-  * =================== */
-
-  $.fn.typeahead.noConflict = function () {
-    $.fn.typeahead = old
-    return this
-  }
-
-
- /* TYPEAHEAD DATA-API
-  * ================== */
-
-  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
-    var $this = $(this)
-    if ($this.data('typeahead')) return
-    $this.typeahead($this.data())
-  })
-
-}(window.jQuery);
-/* ==========================================================
- * bootstrap-affix.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#affix
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* AFFIX CLASS DEFINITION
-  * ====================== */
-
-  var Affix = function (element, options) {
-    this.options = $.extend({}, $.fn.affix.defaults, options)
-    this.$window = $(window)
-      .on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.affix.data-api',  $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
-    this.$element = $(element)
-    this.checkPosition()
-  }
-
-  Affix.prototype.checkPosition = function () {
-    if (!this.$element.is(':visible')) return
-
-    var scrollHeight = $(document).height()
-      , scrollTop = this.$window.scrollTop()
-      , position = this.$element.offset()
-      , offset = this.options.offset
-      , offsetBottom = offset.bottom
-      , offsetTop = offset.top
-      , reset = 'affix affix-top affix-bottom'
-      , affix
-
-    if (typeof offset != 'object') offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function') offsetTop = offset.top()
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
-
-    affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
-      false    : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
-      'bottom' : offsetTop != null && scrollTop <= offsetTop ?
-      'top'    : false
-
-    if (this.affixed === affix) return
-
-    this.affixed = affix
-    this.unpin = affix == 'bottom' ? position.top - scrollTop : null
-
-    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
-  }
-
-
- /* AFFIX PLUGIN DEFINITION
-  * ======================= */
-
-  var old = $.fn.affix
-
-  $.fn.affix = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('affix')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('affix', (data = new Affix(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.affix.Constructor = Affix
-
-  $.fn.affix.defaults = {
-    offset: 0
-  }
-
-
- /* AFFIX NO CONFLICT
-  * ================= */
-
-  $.fn.affix.noConflict = function () {
-    $.fn.affix = old
-    return this
-  }
-
-
- /* AFFIX DATA-API
-  * ============== */
-
-  $(window).on('load', function () {
-    $('[data-spy="affix"]').each(function () {
-      var $spy = $(this)
-        , data = $spy.data()
-
-      data.offset = data.offset || {}
-
-      data.offsetBottom && (data.offset.bottom = data.offsetBottom)
-      data.offsetTop && (data.offset.top = data.offsetTop)
-
-      $spy.affix(data)
-    })
-  })
-
-
-}(window.jQuery);
\ No newline at end of file
diff --git a/view/theme/oldtest/js/bootstrap.min.js b/view/theme/oldtest/js/bootstrap.min.js
deleted file mode 100644
index 95c5ac5ee6..0000000000
--- a/view/theme/oldtest/js/bootstrap.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
-* Bootstrap.js by @fat & @mdo
-* Copyright 2012 Twitter, Inc.
-* http://www.apache.org/licenses/LICENSE-2.0.txt
-*/
-!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},getActiveIndex:function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},to:function(t){var n=this.getActiveIndex(),r=this;if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){r.to(t)}):n==t?this.pause().cycle():this.slide(t>n?"next":"prev",e(this.$items[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("carousel").pause().to(o).cycle(),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning||this.$element.hasClass("in"))return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning||!this.$element.hasClass("in"))return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},e.fn.collapse.defaults,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=n&&e(n);if(!r||!r.length)r=t.parent();return r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||s.toggleClass("open"),n.focus(),!1},keydown:function(n){var r,s,o,u,a,f;if(!/(38|40|27)/.test(n.keyCode))return;r=e(this),n.preventDefault(),n.stopPropagation();if(r.is(".disabled, :disabled"))return;u=i(r),a=u.hasClass("open");if(!a||a&&n.keyCode==27)return n.which==27&&u.find(t).focus(),r.click();s=e("[role=menu] li:not(.divider):visible a",u);if(!s.length)return;f=s.index(s.filter(":focus")),n.keyCode==38&&f>0&&f--,n.keyCode==40&&f<s.length-1&&f++,~f||(f=0),s.eq(f).focus()}};var s=e.fn.dropdown;e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e.fn.dropdown.noConflict=function(){return e.fn.dropdown=s,this},e(document).on("click.dropdown.data-api",r).on("click.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("click.dropdown-menu",function(e){e.stopPropagation()}).on("click.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.focus().trigger("shown")}):t.$element.focus().trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(){var e=this;this.$element.hide(),this.backdrop(function(){e.removeBackdrop(),e.$element.trigger("hidden")})},removeBackdrop:function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()}};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s,o,u,a;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,o=this.options.trigger.split(" ");for(a=o.length;a--;)u=o[a],u=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):u!="manual"&&(i=u=="hover"?"mouseenter":"focus",s=u=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this)));this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e.fn[this.type].defaults,r={},i;this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)},this),i=e(t.currentTarget)[this.type](r).data(this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var t,n,r,i,s,o,u=e.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(u);if(u.isDefaultPrevented())return;t=this.tip(),this.setContent(),this.options.animation&&t.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,t[0],this.$element[0]):this.options.placement,t.detach().css({top:0,left:0,display:"block"}),this.options.container?t.appendTo(this.options.container):t.insertAfter(this.$element),n=this.getPosition(),r=t[0].offsetWidth,i=t[0].offsetHeight;switch(s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}this.applyPlacement(o,s),this.$element.trigger("shown")}},applyPlacement:function(e,t){var n=this.tip(),r=n[0].offsetWidth,i=n[0].offsetHeight,s,o,u,a;n.offset(e).addClass(t).addClass("in"),s=n[0].offsetWidth,o=n[0].offsetHeight,t=="top"&&o!=i&&(e.top=e.top+i-o,a=!0),t=="bottom"||t=="top"?(u=0,e.left<0&&(u=e.left*-2,e.left=0,n.offset(e),s=n[0].offsetWidth,o=n[0].offsetHeight),this.replaceArrow(u-r+s,s,"left")):this.replaceArrow(o-i,o,"top"),a&&n.offset(e)},replaceArrow:function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide");this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},hasContent:function(){return this.getTitle()},getPosition:function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=t?e(t.currentTarget)[this.type](this._options).data(this.type):this;n.tip().hasClass("in")?n.hide():n.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=(typeof n.content=="function"?n.content.call(t[0]):n.content)||t.attr("data-content"),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=e(this.options.menu),this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:t.top+t.height,left:t.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("focus",e.proxy(this.focus,this)).on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this)).on("mouseleave","li",e.proxy(this.mouseleave,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},focus:function(e){this.focused=!0},blur:function(e){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(e){e.stopPropagation(),e.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(t){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")},mouseleave:function(e){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var n=e.fn.typeahead;e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e.fn.typeahead.noConflict=function(){return e.fn.typeahead=n,this},e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery);
\ No newline at end of file
diff --git a/view/theme/oldtest/js/knockout-2.2.1.js b/view/theme/oldtest/js/knockout-2.2.1.js
deleted file mode 100644
index d93e4977ce..0000000000
--- a/view/theme/oldtest/js/knockout-2.2.1.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Knockout JavaScript library v2.2.1
-// (c) Steven Sanderson - http://knockoutjs.com/
-// License: MIT (http://www.opensource.org/licenses/mit-license.php)
-
-(function() {function j(w){throw w;}var m=!0,p=null,r=!1;function u(w){return function(){return w}};var x=window,y=document,ga=navigator,F=window.jQuery,I=void 0;
-function L(w){function ha(a,d,c,e,f){var g=[];a=b.j(function(){var a=d(c,f)||[];0<g.length&&(b.a.Ya(M(g),a),e&&b.r.K(e,p,[c,a,f]));g.splice(0,g.length);b.a.P(g,a)},p,{W:a,Ka:function(){return 0==g.length||!b.a.X(g[0])}});return{M:g,j:a.pa()?a:I}}function M(a){for(;a.length&&!b.a.X(a[0]);)a.splice(0,1);if(1<a.length){for(var d=a[0],c=a[a.length-1],e=[d];d!==c;){d=d.nextSibling;if(!d)return;e.push(d)}Array.prototype.splice.apply(a,[0,a.length].concat(e))}return a}function S(a,b,c,e,f){var g=Math.min,
-h=Math.max,k=[],l,n=a.length,q,s=b.length,v=s-n||1,G=n+s+1,J,A,z;for(l=0;l<=n;l++){A=J;k.push(J=[]);z=g(s,l+v);for(q=h(0,l-1);q<=z;q++)J[q]=q?l?a[l-1]===b[q-1]?A[q-1]:g(A[q]||G,J[q-1]||G)+1:q+1:l+1}g=[];h=[];v=[];l=n;for(q=s;l||q;)s=k[l][q]-1,q&&s===k[l][q-1]?h.push(g[g.length]={status:c,value:b[--q],index:q}):l&&s===k[l-1][q]?v.push(g[g.length]={status:e,value:a[--l],index:l}):(g.push({status:"retained",value:b[--q]}),--l);if(h.length&&v.length){a=10*n;var t;for(b=c=0;(f||b<a)&&(t=h[c]);c++){for(e=
-0;k=v[e];e++)if(t.value===k.value){t.moved=k.index;k.moved=t.index;v.splice(e,1);b=e=0;break}b+=e}}return g.reverse()}function T(a,d,c,e,f){f=f||{};var g=a&&N(a),g=g&&g.ownerDocument,h=f.templateEngine||O;b.za.vb(c,h,g);c=h.renderTemplate(c,e,f,g);("number"!=typeof c.length||0<c.length&&"number"!=typeof c[0].nodeType)&&j(Error("Template engine must return an array of DOM nodes"));g=r;switch(d){case "replaceChildren":b.e.N(a,c);g=m;break;case "replaceNode":b.a.Ya(a,c);g=m;break;case "ignoreTargetNode":break;
-default:j(Error("Unknown renderMode: "+d))}g&&(U(c,e),f.afterRender&&b.r.K(f.afterRender,p,[c,e.$data]));return c}function N(a){return a.nodeType?a:0<a.length?a[0]:p}function U(a,d){if(a.length){var c=a[0],e=a[a.length-1];V(c,e,function(a){b.Da(d,a)});V(c,e,function(a){b.s.ib(a,[d])})}}function V(a,d,c){var e;for(d=b.e.nextSibling(d);a&&(e=a)!==d;)a=b.e.nextSibling(e),(1===e.nodeType||8===e.nodeType)&&c(e)}function W(a,d,c){a=b.g.aa(a);for(var e=b.g.Q,f=0;f<a.length;f++){var g=a[f].key;if(e.hasOwnProperty(g)){var h=
-e[g];"function"===typeof h?(g=h(a[f].value))&&j(Error(g)):h||j(Error("This template engine does not support the '"+g+"' binding within its templates"))}}a="ko.__tr_ambtns(function($context,$element){return(function(){return{ "+b.g.ba(a)+" } })()})";return c.createJavaScriptEvaluatorBlock(a)+d}function X(a,d,c,e){function f(a){return function(){return k[a]}}function g(){return k}var h=0,k,l;b.j(function(){var n=c&&c instanceof b.z?c:new b.z(b.a.d(c)),q=n.$data;e&&b.eb(a,n);if(k=("function"==typeof d?
-d(n,a):d)||b.J.instance.getBindings(a,n)){if(0===h){h=1;for(var s in k){var v=b.c[s];v&&8===a.nodeType&&!b.e.I[s]&&j(Error("The binding '"+s+"' cannot be used with virtual elements"));if(v&&"function"==typeof v.init&&(v=(0,v.init)(a,f(s),g,q,n))&&v.controlsDescendantBindings)l!==I&&j(Error("Multiple bindings ("+l+" and "+s+") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.")),l=s}h=2}if(2===h)for(s in k)(v=b.c[s])&&"function"==
-typeof v.update&&(0,v.update)(a,f(s),g,q,n)}},p,{W:a});return{Nb:l===I}}function Y(a,d,c){var e=m,f=1===d.nodeType;f&&b.e.Ta(d);if(f&&c||b.J.instance.nodeHasBindings(d))e=X(d,p,a,c).Nb;e&&Z(a,d,!f)}function Z(a,d,c){for(var e=b.e.firstChild(d);d=e;)e=b.e.nextSibling(d),Y(a,d,c)}function $(a,b){var c=aa(a,b);return c?0<c.length?c[c.length-1].nextSibling:a.nextSibling:p}function aa(a,b){for(var c=a,e=1,f=[];c=c.nextSibling;){if(H(c)&&(e--,0===e))return f;f.push(c);B(c)&&e++}b||j(Error("Cannot find closing comment tag to match: "+
-a.nodeValue));return p}function H(a){return 8==a.nodeType&&(K?a.text:a.nodeValue).match(ia)}function B(a){return 8==a.nodeType&&(K?a.text:a.nodeValue).match(ja)}function P(a,b){for(var c=p;a!=c;)c=a,a=a.replace(ka,function(a,c){return b[c]});return a}function la(){var a=[],d=[];this.save=function(c,e){var f=b.a.i(a,c);0<=f?d[f]=e:(a.push(c),d.push(e))};this.get=function(c){c=b.a.i(a,c);return 0<=c?d[c]:I}}function ba(a,b,c){function e(e){var g=b(a[e]);switch(typeof g){case "boolean":case "number":case "string":case "function":f[e]=
-g;break;case "object":case "undefined":var h=c.get(g);f[e]=h!==I?h:ba(g,b,c)}}c=c||new la;a=b(a);if(!("object"==typeof a&&a!==p&&a!==I&&!(a instanceof Date)))return a;var f=a instanceof Array?[]:{};c.save(a,f);var g=a;if(g instanceof Array){for(var h=0;h<g.length;h++)e(h);"function"==typeof g.toJSON&&e("toJSON")}else for(h in g)e(h);return f}function ca(a,d){if(a)if(8==a.nodeType){var c=b.s.Ua(a.nodeValue);c!=p&&d.push({sb:a,Fb:c})}else if(1==a.nodeType)for(var c=0,e=a.childNodes,f=e.length;c<f;c++)ca(e[c],
-d)}function Q(a,d,c,e){b.c[a]={init:function(a){b.a.f.set(a,da,{});return{controlsDescendantBindings:m}},update:function(a,g,h,k,l){h=b.a.f.get(a,da);g=b.a.d(g());k=!c!==!g;var n=!h.Za;if(n||d||k!==h.qb)n&&(h.Za=b.a.Ia(b.e.childNodes(a),m)),k?(n||b.e.N(a,b.a.Ia(h.Za)),b.Ea(e?e(l,g):l,a)):b.e.Y(a),h.qb=k}};b.g.Q[a]=r;b.e.I[a]=m}function ea(a,d,c){c&&d!==b.k.q(a)&&b.k.T(a,d);d!==b.k.q(a)&&b.r.K(b.a.Ba,p,[a,"change"])}var b="undefined"!==typeof w?w:{};b.b=function(a,d){for(var c=a.split("."),e=b,f=0;f<
-c.length-1;f++)e=e[c[f]];e[c[c.length-1]]=d};b.p=function(a,b,c){a[b]=c};b.version="2.2.1";b.b("version",b.version);b.a=new function(){function a(a,d){if("input"!==b.a.u(a)||!a.type||"click"!=d.toLowerCase())return r;var c=a.type;return"checkbox"==c||"radio"==c}var d=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,c={},e={};c[/Firefox\/2/i.test(ga.userAgent)?"KeyboardEvent":"UIEvents"]=["keyup","keydown","keypress"];c.MouseEvents="click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave".split(" ");
-for(var f in c){var g=c[f];if(g.length)for(var h=0,k=g.length;h<k;h++)e[g[h]]=f}var l={propertychange:m},n,c=3;f=y.createElement("div");for(g=f.getElementsByTagName("i");f.innerHTML="\x3c!--[if gt IE "+ ++c+"]><i></i><![endif]--\x3e",g[0];);n=4<c?c:I;return{Na:["authenticity_token",/^__RequestVerificationToken(_.*)?$/],o:function(a,b){for(var d=0,c=a.length;d<c;d++)b(a[d])},i:function(a,b){if("function"==typeof Array.prototype.indexOf)return Array.prototype.indexOf.call(a,b);for(var d=0,c=a.length;d<
-c;d++)if(a[d]===b)return d;return-1},lb:function(a,b,d){for(var c=0,e=a.length;c<e;c++)if(b.call(d,a[c]))return a[c];return p},ga:function(a,d){var c=b.a.i(a,d);0<=c&&a.splice(c,1)},Ga:function(a){a=a||[];for(var d=[],c=0,e=a.length;c<e;c++)0>b.a.i(d,a[c])&&d.push(a[c]);return d},V:function(a,b){a=a||[];for(var d=[],c=0,e=a.length;c<e;c++)d.push(b(a[c]));return d},fa:function(a,b){a=a||[];for(var d=[],c=0,e=a.length;c<e;c++)b(a[c])&&d.push(a[c]);return d},P:function(a,b){if(b instanceof Array)a.push.apply(a,
-b);else for(var d=0,c=b.length;d<c;d++)a.push(b[d]);return a},extend:function(a,b){if(b)for(var d in b)b.hasOwnProperty(d)&&(a[d]=b[d]);return a},ka:function(a){for(;a.firstChild;)b.removeNode(a.firstChild)},Hb:function(a){a=b.a.L(a);for(var d=y.createElement("div"),c=0,e=a.length;c<e;c++)d.appendChild(b.A(a[c]));return d},Ia:function(a,d){for(var c=0,e=a.length,g=[];c<e;c++){var f=a[c].cloneNode(m);g.push(d?b.A(f):f)}return g},N:function(a,d){b.a.ka(a);if(d)for(var c=0,e=d.length;c<e;c++)a.appendChild(d[c])},
-Ya:function(a,d){var c=a.nodeType?[a]:a;if(0<c.length){for(var e=c[0],g=e.parentNode,f=0,h=d.length;f<h;f++)g.insertBefore(d[f],e);f=0;for(h=c.length;f<h;f++)b.removeNode(c[f])}},bb:function(a,b){7>n?a.setAttribute("selected",b):a.selected=b},D:function(a){return(a||"").replace(d,"")},Rb:function(a,d){for(var c=[],e=(a||"").split(d),f=0,g=e.length;f<g;f++){var h=b.a.D(e[f]);""!==h&&c.push(h)}return c},Ob:function(a,b){a=a||"";return b.length>a.length?r:a.substring(0,b.length)===b},tb:function(a,b){if(b.compareDocumentPosition)return 16==
-(b.compareDocumentPosition(a)&16);for(;a!=p;){if(a==b)return m;a=a.parentNode}return r},X:function(a){return b.a.tb(a,a.ownerDocument)},u:function(a){return a&&a.tagName&&a.tagName.toLowerCase()},n:function(b,d,c){var e=n&&l[d];if(!e&&"undefined"!=typeof F){if(a(b,d)){var f=c;c=function(a,b){var d=this.checked;b&&(this.checked=b.nb!==m);f.call(this,a);this.checked=d}}F(b).bind(d,c)}else!e&&"function"==typeof b.addEventListener?b.addEventListener(d,c,r):"undefined"!=typeof b.attachEvent?b.attachEvent("on"+
-d,function(a){c.call(b,a)}):j(Error("Browser doesn't support addEventListener or attachEvent"))},Ba:function(b,d){(!b||!b.nodeType)&&j(Error("element must be a DOM node when calling triggerEvent"));if("undefined"!=typeof F){var c=[];a(b,d)&&c.push({nb:b.checked});F(b).trigger(d,c)}else"function"==typeof y.createEvent?"function"==typeof b.dispatchEvent?(c=y.createEvent(e[d]||"HTMLEvents"),c.initEvent(d,m,m,x,0,0,0,0,0,r,r,r,r,0,b),b.dispatchEvent(c)):j(Error("The supplied element doesn't support dispatchEvent")):
-"undefined"!=typeof b.fireEvent?(a(b,d)&&(b.checked=b.checked!==m),b.fireEvent("on"+d)):j(Error("Browser doesn't support triggering events"))},d:function(a){return b.$(a)?a():a},ua:function(a){return b.$(a)?a.t():a},da:function(a,d,c){if(d){var e=/[\w-]+/g,f=a.className.match(e)||[];b.a.o(d.match(e),function(a){var d=b.a.i(f,a);0<=d?c||f.splice(d,1):c&&f.push(a)});a.className=f.join(" ")}},cb:function(a,d){var c=b.a.d(d);if(c===p||c===I)c="";if(3===a.nodeType)a.data=c;else{var e=b.e.firstChild(a);
-!e||3!=e.nodeType||b.e.nextSibling(e)?b.e.N(a,[y.createTextNode(c)]):e.data=c;b.a.wb(a)}},ab:function(a,b){a.name=b;if(7>=n)try{a.mergeAttributes(y.createElement("<input name='"+a.name+"'/>"),r)}catch(d){}},wb:function(a){9<=n&&(a=1==a.nodeType?a:a.parentNode,a.style&&(a.style.zoom=a.style.zoom))},ub:function(a){if(9<=n){var b=a.style.width;a.style.width=0;a.style.width=b}},Lb:function(a,d){a=b.a.d(a);d=b.a.d(d);for(var c=[],e=a;e<=d;e++)c.push(e);return c},L:function(a){for(var b=[],d=0,c=a.length;d<
-c;d++)b.push(a[d]);return b},Pb:6===n,Qb:7===n,Z:n,Oa:function(a,d){for(var c=b.a.L(a.getElementsByTagName("input")).concat(b.a.L(a.getElementsByTagName("textarea"))),e="string"==typeof d?function(a){return a.name===d}:function(a){return d.test(a.name)},f=[],g=c.length-1;0<=g;g--)e(c[g])&&f.push(c[g]);return f},Ib:function(a){return"string"==typeof a&&(a=b.a.D(a))?x.JSON&&x.JSON.parse?x.JSON.parse(a):(new Function("return "+a))():p},xa:function(a,d,c){("undefined"==typeof JSON||"undefined"==typeof JSON.stringify)&&
-j(Error("Cannot find JSON.stringify(). Some browsers (e.g., IE < 8) don't support it natively, but you can overcome this by adding a script reference to json2.js, downloadable from http://www.json.org/json2.js"));return JSON.stringify(b.a.d(a),d,c)},Jb:function(a,d,c){c=c||{};var e=c.params||{},f=c.includeFields||this.Na,g=a;if("object"==typeof a&&"form"===b.a.u(a))for(var g=a.action,h=f.length-1;0<=h;h--)for(var k=b.a.Oa(a,f[h]),l=k.length-1;0<=l;l--)e[k[l].name]=k[l].value;d=b.a.d(d);var n=y.createElement("form");
-n.style.display="none";n.action=g;n.method="post";for(var w in d)a=y.createElement("input"),a.name=w,a.value=b.a.xa(b.a.d(d[w])),n.appendChild(a);for(w in e)a=y.createElement("input"),a.name=w,a.value=e[w],n.appendChild(a);y.body.appendChild(n);c.submitter?c.submitter(n):n.submit();setTimeout(function(){n.parentNode.removeChild(n)},0)}}};b.b("utils",b.a);b.b("utils.arrayForEach",b.a.o);b.b("utils.arrayFirst",b.a.lb);b.b("utils.arrayFilter",b.a.fa);b.b("utils.arrayGetDistinctValues",b.a.Ga);b.b("utils.arrayIndexOf",
-b.a.i);b.b("utils.arrayMap",b.a.V);b.b("utils.arrayPushAll",b.a.P);b.b("utils.arrayRemoveItem",b.a.ga);b.b("utils.extend",b.a.extend);b.b("utils.fieldsIncludedWithJsonPost",b.a.Na);b.b("utils.getFormFields",b.a.Oa);b.b("utils.peekObservable",b.a.ua);b.b("utils.postJson",b.a.Jb);b.b("utils.parseJson",b.a.Ib);b.b("utils.registerEventHandler",b.a.n);b.b("utils.stringifyJson",b.a.xa);b.b("utils.range",b.a.Lb);b.b("utils.toggleDomNodeCssClass",b.a.da);b.b("utils.triggerEvent",b.a.Ba);b.b("utils.unwrapObservable",
-b.a.d);Function.prototype.bind||(Function.prototype.bind=function(a){var b=this,c=Array.prototype.slice.call(arguments);a=c.shift();return function(){return b.apply(a,c.concat(Array.prototype.slice.call(arguments)))}});b.a.f=new function(){var a=0,d="__ko__"+(new Date).getTime(),c={};return{get:function(a,d){var c=b.a.f.la(a,r);return c===I?I:c[d]},set:function(a,d,c){c===I&&b.a.f.la(a,r)===I||(b.a.f.la(a,m)[d]=c)},la:function(b,f){var g=b[d];if(!g||!("null"!==g&&c[g])){if(!f)return I;g=b[d]="ko"+
-a++;c[g]={}}return c[g]},clear:function(a){var b=a[d];return b?(delete c[b],a[d]=p,m):r}}};b.b("utils.domData",b.a.f);b.b("utils.domData.clear",b.a.f.clear);b.a.F=new function(){function a(a,d){var e=b.a.f.get(a,c);e===I&&d&&(e=[],b.a.f.set(a,c,e));return e}function d(c){var e=a(c,r);if(e)for(var e=e.slice(0),k=0;k<e.length;k++)e[k](c);b.a.f.clear(c);"function"==typeof F&&"function"==typeof F.cleanData&&F.cleanData([c]);if(f[c.nodeType])for(e=c.firstChild;c=e;)e=c.nextSibling,8===c.nodeType&&d(c)}
-var c="__ko_domNodeDisposal__"+(new Date).getTime(),e={1:m,8:m,9:m},f={1:m,9:m};return{Ca:function(b,d){"function"!=typeof d&&j(Error("Callback must be a function"));a(b,m).push(d)},Xa:function(d,e){var f=a(d,r);f&&(b.a.ga(f,e),0==f.length&&b.a.f.set(d,c,I))},A:function(a){if(e[a.nodeType]&&(d(a),f[a.nodeType])){var c=[];b.a.P(c,a.getElementsByTagName("*"));for(var k=0,l=c.length;k<l;k++)d(c[k])}return a},removeNode:function(a){b.A(a);a.parentNode&&a.parentNode.removeChild(a)}}};b.A=b.a.F.A;b.removeNode=
-b.a.F.removeNode;b.b("cleanNode",b.A);b.b("removeNode",b.removeNode);b.b("utils.domNodeDisposal",b.a.F);b.b("utils.domNodeDisposal.addDisposeCallback",b.a.F.Ca);b.b("utils.domNodeDisposal.removeDisposeCallback",b.a.F.Xa);b.a.ta=function(a){var d;if("undefined"!=typeof F)if(F.parseHTML)d=F.parseHTML(a);else{if((d=F.clean([a]))&&d[0]){for(a=d[0];a.parentNode&&11!==a.parentNode.nodeType;)a=a.parentNode;a.parentNode&&a.parentNode.removeChild(a)}}else{var c=b.a.D(a).toLowerCase();d=y.createElement("div");
-c=c.match(/^<(thead|tbody|tfoot)/)&&[1,"<table>","</table>"]||!c.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!c.indexOf("<td")||!c.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||[0,"",""];a="ignored<div>"+c[1]+a+c[2]+"</div>";for("function"==typeof x.innerShiv?d.appendChild(x.innerShiv(a)):d.innerHTML=a;c[0]--;)d=d.lastChild;d=b.a.L(d.lastChild.childNodes)}return d};b.a.ca=function(a,d){b.a.ka(a);d=b.a.d(d);if(d!==p&&d!==I)if("string"!=typeof d&&(d=d.toString()),
-"undefined"!=typeof F)F(a).html(d);else for(var c=b.a.ta(d),e=0;e<c.length;e++)a.appendChild(c[e])};b.b("utils.parseHtmlFragment",b.a.ta);b.b("utils.setHtml",b.a.ca);var R={};b.s={ra:function(a){"function"!=typeof a&&j(Error("You can only pass a function to ko.memoization.memoize()"));var b=(4294967296*(1+Math.random())|0).toString(16).substring(1)+(4294967296*(1+Math.random())|0).toString(16).substring(1);R[b]=a;return"\x3c!--[ko_memo:"+b+"]--\x3e"},hb:function(a,b){var c=R[a];c===I&&j(Error("Couldn't find any memo with ID "+
-a+". Perhaps it's already been unmemoized."));try{return c.apply(p,b||[]),m}finally{delete R[a]}},ib:function(a,d){var c=[];ca(a,c);for(var e=0,f=c.length;e<f;e++){var g=c[e].sb,h=[g];d&&b.a.P(h,d);b.s.hb(c[e].Fb,h);g.nodeValue="";g.parentNode&&g.parentNode.removeChild(g)}},Ua:function(a){return(a=a.match(/^\[ko_memo\:(.*?)\]$/))?a[1]:p}};b.b("memoization",b.s);b.b("memoization.memoize",b.s.ra);b.b("memoization.unmemoize",b.s.hb);b.b("memoization.parseMemoText",b.s.Ua);b.b("memoization.unmemoizeDomNodeAndDescendants",
-b.s.ib);b.Ma={throttle:function(a,d){a.throttleEvaluation=d;var c=p;return b.j({read:a,write:function(b){clearTimeout(c);c=setTimeout(function(){a(b)},d)}})},notify:function(a,d){a.equalityComparer="always"==d?u(r):b.m.fn.equalityComparer;return a}};b.b("extenders",b.Ma);b.fb=function(a,d,c){this.target=a;this.ha=d;this.rb=c;b.p(this,"dispose",this.B)};b.fb.prototype.B=function(){this.Cb=m;this.rb()};b.S=function(){this.w={};b.a.extend(this,b.S.fn);b.p(this,"subscribe",this.ya);b.p(this,"extend",
-this.extend);b.p(this,"getSubscriptionsCount",this.yb)};b.S.fn={ya:function(a,d,c){c=c||"change";var e=new b.fb(this,d?a.bind(d):a,function(){b.a.ga(this.w[c],e)}.bind(this));this.w[c]||(this.w[c]=[]);this.w[c].push(e);return e},notifySubscribers:function(a,d){d=d||"change";this.w[d]&&b.r.K(function(){b.a.o(this.w[d].slice(0),function(b){b&&b.Cb!==m&&b.ha(a)})},this)},yb:function(){var a=0,b;for(b in this.w)this.w.hasOwnProperty(b)&&(a+=this.w[b].length);return a},extend:function(a){var d=this;if(a)for(var c in a){var e=
-b.Ma[c];"function"==typeof e&&(d=e(d,a[c]))}return d}};b.Qa=function(a){return"function"==typeof a.ya&&"function"==typeof a.notifySubscribers};b.b("subscribable",b.S);b.b("isSubscribable",b.Qa);var C=[];b.r={mb:function(a){C.push({ha:a,La:[]})},end:function(){C.pop()},Wa:function(a){b.Qa(a)||j(Error("Only subscribable things can act as dependencies"));if(0<C.length){var d=C[C.length-1];d&&!(0<=b.a.i(d.La,a))&&(d.La.push(a),d.ha(a))}},K:function(a,b,c){try{return C.push(p),a.apply(b,c||[])}finally{C.pop()}}};
-var ma={undefined:m,"boolean":m,number:m,string:m};b.m=function(a){function d(){if(0<arguments.length){if(!d.equalityComparer||!d.equalityComparer(c,arguments[0]))d.H(),c=arguments[0],d.G();return this}b.r.Wa(d);return c}var c=a;b.S.call(d);d.t=function(){return c};d.G=function(){d.notifySubscribers(c)};d.H=function(){d.notifySubscribers(c,"beforeChange")};b.a.extend(d,b.m.fn);b.p(d,"peek",d.t);b.p(d,"valueHasMutated",d.G);b.p(d,"valueWillMutate",d.H);return d};b.m.fn={equalityComparer:function(a,
-b){return a===p||typeof a in ma?a===b:r}};var E=b.m.Kb="__ko_proto__";b.m.fn[E]=b.m;b.ma=function(a,d){return a===p||a===I||a[E]===I?r:a[E]===d?m:b.ma(a[E],d)};b.$=function(a){return b.ma(a,b.m)};b.Ra=function(a){return"function"==typeof a&&a[E]===b.m||"function"==typeof a&&a[E]===b.j&&a.zb?m:r};b.b("observable",b.m);b.b("isObservable",b.$);b.b("isWriteableObservable",b.Ra);b.R=function(a){0==arguments.length&&(a=[]);a!==p&&(a!==I&&!("length"in a))&&j(Error("The argument passed when initializing an observable array must be an array, or null, or undefined."));
-var d=b.m(a);b.a.extend(d,b.R.fn);return d};b.R.fn={remove:function(a){for(var b=this.t(),c=[],e="function"==typeof a?a:function(b){return b===a},f=0;f<b.length;f++){var g=b[f];e(g)&&(0===c.length&&this.H(),c.push(g),b.splice(f,1),f--)}c.length&&this.G();return c},removeAll:function(a){if(a===I){var d=this.t(),c=d.slice(0);this.H();d.splice(0,d.length);this.G();return c}return!a?[]:this.remove(function(d){return 0<=b.a.i(a,d)})},destroy:function(a){var b=this.t(),c="function"==typeof a?a:function(b){return b===
-a};this.H();for(var e=b.length-1;0<=e;e--)c(b[e])&&(b[e]._destroy=m);this.G()},destroyAll:function(a){return a===I?this.destroy(u(m)):!a?[]:this.destroy(function(d){return 0<=b.a.i(a,d)})},indexOf:function(a){var d=this();return b.a.i(d,a)},replace:function(a,b){var c=this.indexOf(a);0<=c&&(this.H(),this.t()[c]=b,this.G())}};b.a.o("pop push reverse shift sort splice unshift".split(" "),function(a){b.R.fn[a]=function(){var b=this.t();this.H();b=b[a].apply(b,arguments);this.G();return b}});b.a.o(["slice"],
-function(a){b.R.fn[a]=function(){var b=this();return b[a].apply(b,arguments)}});b.b("observableArray",b.R);b.j=function(a,d,c){function e(){b.a.o(z,function(a){a.B()});z=[]}function f(){var a=h.throttleEvaluation;a&&0<=a?(clearTimeout(t),t=setTimeout(g,a)):g()}function g(){if(!q)if(n&&w())A();else{q=m;try{var a=b.a.V(z,function(a){return a.target});b.r.mb(function(c){var d;0<=(d=b.a.i(a,c))?a[d]=I:z.push(c.ya(f))});for(var c=s.call(d),e=a.length-1;0<=e;e--)a[e]&&z.splice(e,1)[0].B();n=m;h.notifySubscribers(l,
-"beforeChange");l=c}finally{b.r.end()}h.notifySubscribers(l);q=r;z.length||A()}}function h(){if(0<arguments.length)return"function"===typeof v?v.apply(d,arguments):j(Error("Cannot write a value to a ko.computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters.")),this;n||g();b.r.Wa(h);return l}function k(){return!n||0<z.length}var l,n=r,q=r,s=a;s&&"object"==typeof s?(c=s,s=c.read):(c=c||{},s||(s=c.read));"function"!=typeof s&&j(Error("Pass a function that returns the value of the ko.computed"));
-var v=c.write,G=c.disposeWhenNodeIsRemoved||c.W||p,w=c.disposeWhen||c.Ka||u(r),A=e,z=[],t=p;d||(d=c.owner);h.t=function(){n||g();return l};h.xb=function(){return z.length};h.zb="function"===typeof c.write;h.B=function(){A()};h.pa=k;b.S.call(h);b.a.extend(h,b.j.fn);b.p(h,"peek",h.t);b.p(h,"dispose",h.B);b.p(h,"isActive",h.pa);b.p(h,"getDependenciesCount",h.xb);c.deferEvaluation!==m&&g();if(G&&k()){A=function(){b.a.F.Xa(G,arguments.callee);e()};b.a.F.Ca(G,A);var D=w,w=function(){return!b.a.X(G)||D()}}return h};
-b.Bb=function(a){return b.ma(a,b.j)};w=b.m.Kb;b.j[w]=b.m;b.j.fn={};b.j.fn[w]=b.j;b.b("dependentObservable",b.j);b.b("computed",b.j);b.b("isComputed",b.Bb);b.gb=function(a){0==arguments.length&&j(Error("When calling ko.toJS, pass the object you want to convert."));return ba(a,function(a){for(var c=0;b.$(a)&&10>c;c++)a=a();return a})};b.toJSON=function(a,d,c){a=b.gb(a);return b.a.xa(a,d,c)};b.b("toJS",b.gb);b.b("toJSON",b.toJSON);b.k={q:function(a){switch(b.a.u(a)){case "option":return a.__ko__hasDomDataOptionValue__===
-m?b.a.f.get(a,b.c.options.sa):7>=b.a.Z?a.getAttributeNode("value").specified?a.value:a.text:a.value;case "select":return 0<=a.selectedIndex?b.k.q(a.options[a.selectedIndex]):I;default:return a.value}},T:function(a,d){switch(b.a.u(a)){case "option":switch(typeof d){case "string":b.a.f.set(a,b.c.options.sa,I);"__ko__hasDomDataOptionValue__"in a&&delete a.__ko__hasDomDataOptionValue__;a.value=d;break;default:b.a.f.set(a,b.c.options.sa,d),a.__ko__hasDomDataOptionValue__=m,a.value="number"===typeof d?
-d:""}break;case "select":for(var c=a.options.length-1;0<=c;c--)if(b.k.q(a.options[c])==d){a.selectedIndex=c;break}break;default:if(d===p||d===I)d="";a.value=d}}};b.b("selectExtensions",b.k);b.b("selectExtensions.readValue",b.k.q);b.b("selectExtensions.writeValue",b.k.T);var ka=/\@ko_token_(\d+)\@/g,na=["true","false"],oa=/^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i;b.g={Q:[],aa:function(a){var d=b.a.D(a);if(3>d.length)return[];"{"===d.charAt(0)&&(d=d.substring(1,d.length-1));a=[];for(var c=
-p,e,f=0;f<d.length;f++){var g=d.charAt(f);if(c===p)switch(g){case '"':case "'":case "/":c=f,e=g}else if(g==e&&"\\"!==d.charAt(f-1)){g=d.substring(c,f+1);a.push(g);var h="@ko_token_"+(a.length-1)+"@",d=d.substring(0,c)+h+d.substring(f+1),f=f-(g.length-h.length),c=p}}e=c=p;for(var k=0,l=p,f=0;f<d.length;f++){g=d.charAt(f);if(c===p)switch(g){case "{":c=f;l=g;e="}";break;case "(":c=f;l=g;e=")";break;case "[":c=f,l=g,e="]"}g===l?k++:g===e&&(k--,0===k&&(g=d.substring(c,f+1),a.push(g),h="@ko_token_"+(a.length-
-1)+"@",d=d.substring(0,c)+h+d.substring(f+1),f-=g.length-h.length,c=p))}e=[];d=d.split(",");c=0;for(f=d.length;c<f;c++)k=d[c],l=k.indexOf(":"),0<l&&l<k.length-1?(g=k.substring(l+1),e.push({key:P(k.substring(0,l),a),value:P(g,a)})):e.push({unknown:P(k,a)});return e},ba:function(a){var d="string"===typeof a?b.g.aa(a):a,c=[];a=[];for(var e,f=0;e=d[f];f++)if(0<c.length&&c.push(","),e.key){var g;a:{g=e.key;var h=b.a.D(g);switch(h.length&&h.charAt(0)){case "'":case '"':break a;default:g="'"+h+"'"}}e=e.value;
-c.push(g);c.push(":");c.push(e);e=b.a.D(e);0<=b.a.i(na,b.a.D(e).toLowerCase())?e=r:(h=e.match(oa),e=h===p?r:h[1]?"Object("+h[1]+")"+h[2]:e);e&&(0<a.length&&a.push(", "),a.push(g+" : function(__ko_value) { "+e+" = __ko_value; }"))}else e.unknown&&c.push(e.unknown);d=c.join("");0<a.length&&(d=d+", '_ko_property_writers' : { "+a.join("")+" } ");return d},Eb:function(a,d){for(var c=0;c<a.length;c++)if(b.a.D(a[c].key)==d)return m;return r},ea:function(a,d,c,e,f){if(!a||!b.Ra(a)){if((a=d()._ko_property_writers)&&
-a[c])a[c](e)}else(!f||a.t()!==e)&&a(e)}};b.b("expressionRewriting",b.g);b.b("expressionRewriting.bindingRewriteValidators",b.g.Q);b.b("expressionRewriting.parseObjectLiteral",b.g.aa);b.b("expressionRewriting.preProcessBindings",b.g.ba);b.b("jsonExpressionRewriting",b.g);b.b("jsonExpressionRewriting.insertPropertyAccessorsIntoJson",b.g.ba);var K="\x3c!--test--\x3e"===y.createComment("test").text,ja=K?/^\x3c!--\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*--\x3e$/:/^\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*$/,ia=K?/^\x3c!--\s*\/ko\s*--\x3e$/:
-/^\s*\/ko\s*$/,pa={ul:m,ol:m};b.e={I:{},childNodes:function(a){return B(a)?aa(a):a.childNodes},Y:function(a){if(B(a)){a=b.e.childNodes(a);for(var d=0,c=a.length;d<c;d++)b.removeNode(a[d])}else b.a.ka(a)},N:function(a,d){if(B(a)){b.e.Y(a);for(var c=a.nextSibling,e=0,f=d.length;e<f;e++)c.parentNode.insertBefore(d[e],c)}else b.a.N(a,d)},Va:function(a,b){B(a)?a.parentNode.insertBefore(b,a.nextSibling):a.firstChild?a.insertBefore(b,a.firstChild):a.appendChild(b)},Pa:function(a,d,c){c?B(a)?a.parentNode.insertBefore(d,
-c.nextSibling):c.nextSibling?a.insertBefore(d,c.nextSibling):a.appendChild(d):b.e.Va(a,d)},firstChild:function(a){return!B(a)?a.firstChild:!a.nextSibling||H(a.nextSibling)?p:a.nextSibling},nextSibling:function(a){B(a)&&(a=$(a));return a.nextSibling&&H(a.nextSibling)?p:a.nextSibling},jb:function(a){return(a=B(a))?a[1]:p},Ta:function(a){if(pa[b.a.u(a)]){var d=a.firstChild;if(d){do if(1===d.nodeType){var c;c=d.firstChild;var e=p;if(c){do if(e)e.push(c);else if(B(c)){var f=$(c,m);f?c=f:e=[c]}else H(c)&&
-(e=[c]);while(c=c.nextSibling)}if(c=e){e=d.nextSibling;for(f=0;f<c.length;f++)e?a.insertBefore(c[f],e):a.appendChild(c[f])}}while(d=d.nextSibling)}}}};b.b("virtualElements",b.e);b.b("virtualElements.allowedBindings",b.e.I);b.b("virtualElements.emptyNode",b.e.Y);b.b("virtualElements.insertAfter",b.e.Pa);b.b("virtualElements.prepend",b.e.Va);b.b("virtualElements.setDomNodeChildren",b.e.N);b.J=function(){this.Ha={}};b.a.extend(b.J.prototype,{nodeHasBindings:function(a){switch(a.nodeType){case 1:return a.getAttribute("data-bind")!=
-p;case 8:return b.e.jb(a)!=p;default:return r}},getBindings:function(a,b){var c=this.getBindingsString(a,b);return c?this.parseBindingsString(c,b,a):p},getBindingsString:function(a){switch(a.nodeType){case 1:return a.getAttribute("data-bind");case 8:return b.e.jb(a);default:return p}},parseBindingsString:function(a,d,c){try{var e;if(!(e=this.Ha[a])){var f=this.Ha,g,h="with($context){with($data||{}){return{"+b.g.ba(a)+"}}}";g=new Function("$context","$element",h);e=f[a]=g}return e(d,c)}catch(k){j(Error("Unable to parse bindings.\nMessage: "+
-k+";\nBindings value: "+a))}}});b.J.instance=new b.J;b.b("bindingProvider",b.J);b.c={};b.z=function(a,d,c){d?(b.a.extend(this,d),this.$parentContext=d,this.$parent=d.$data,this.$parents=(d.$parents||[]).slice(0),this.$parents.unshift(this.$parent)):(this.$parents=[],this.$root=a,this.ko=b);this.$data=a;c&&(this[c]=a)};b.z.prototype.createChildContext=function(a,d){return new b.z(a,this,d)};b.z.prototype.extend=function(a){var d=b.a.extend(new b.z,this);return b.a.extend(d,a)};b.eb=function(a,d){if(2==
-arguments.length)b.a.f.set(a,"__ko_bindingContext__",d);else return b.a.f.get(a,"__ko_bindingContext__")};b.Fa=function(a,d,c){1===a.nodeType&&b.e.Ta(a);return X(a,d,c,m)};b.Ea=function(a,b){(1===b.nodeType||8===b.nodeType)&&Z(a,b,m)};b.Da=function(a,b){b&&(1!==b.nodeType&&8!==b.nodeType)&&j(Error("ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node"));b=b||x.document.body;Y(a,b,m)};b.ja=function(a){switch(a.nodeType){case 1:case 8:var d=b.eb(a);if(d)return d;
-if(a.parentNode)return b.ja(a.parentNode)}return I};b.pb=function(a){return(a=b.ja(a))?a.$data:I};b.b("bindingHandlers",b.c);b.b("applyBindings",b.Da);b.b("applyBindingsToDescendants",b.Ea);b.b("applyBindingsToNode",b.Fa);b.b("contextFor",b.ja);b.b("dataFor",b.pb);var fa={"class":"className","for":"htmlFor"};b.c.attr={update:function(a,d){var c=b.a.d(d())||{},e;for(e in c)if("string"==typeof e){var f=b.a.d(c[e]),g=f===r||f===p||f===I;g&&a.removeAttribute(e);8>=b.a.Z&&e in fa?(e=fa[e],g?a.removeAttribute(e):
-a[e]=f):g||a.setAttribute(e,f.toString());"name"===e&&b.a.ab(a,g?"":f.toString())}}};b.c.checked={init:function(a,d,c){b.a.n(a,"click",function(){var e;if("checkbox"==a.type)e=a.checked;else if("radio"==a.type&&a.checked)e=a.value;else return;var f=d(),g=b.a.d(f);"checkbox"==a.type&&g instanceof Array?(e=b.a.i(g,a.value),a.checked&&0>e?f.push(a.value):!a.checked&&0<=e&&f.splice(e,1)):b.g.ea(f,c,"checked",e,m)});"radio"==a.type&&!a.name&&b.c.uniqueName.init(a,u(m))},update:function(a,d){var c=b.a.d(d());
-"checkbox"==a.type?a.checked=c instanceof Array?0<=b.a.i(c,a.value):c:"radio"==a.type&&(a.checked=a.value==c)}};b.c.css={update:function(a,d){var c=b.a.d(d());if("object"==typeof c)for(var e in c){var f=b.a.d(c[e]);b.a.da(a,e,f)}else c=String(c||""),b.a.da(a,a.__ko__cssValue,r),a.__ko__cssValue=c,b.a.da(a,c,m)}};b.c.enable={update:function(a,d){var c=b.a.d(d());c&&a.disabled?a.removeAttribute("disabled"):!c&&!a.disabled&&(a.disabled=m)}};b.c.disable={update:function(a,d){b.c.enable.update(a,function(){return!b.a.d(d())})}};
-b.c.event={init:function(a,d,c,e){var f=d()||{},g;for(g in f)(function(){var f=g;"string"==typeof f&&b.a.n(a,f,function(a){var g,n=d()[f];if(n){var q=c();try{var s=b.a.L(arguments);s.unshift(e);g=n.apply(e,s)}finally{g!==m&&(a.preventDefault?a.preventDefault():a.returnValue=r)}q[f+"Bubble"]===r&&(a.cancelBubble=m,a.stopPropagation&&a.stopPropagation())}})})()}};b.c.foreach={Sa:function(a){return function(){var d=a(),c=b.a.ua(d);if(!c||"number"==typeof c.length)return{foreach:d,templateEngine:b.C.oa};
-b.a.d(d);return{foreach:c.data,as:c.as,includeDestroyed:c.includeDestroyed,afterAdd:c.afterAdd,beforeRemove:c.beforeRemove,afterRender:c.afterRender,beforeMove:c.beforeMove,afterMove:c.afterMove,templateEngine:b.C.oa}}},init:function(a,d){return b.c.template.init(a,b.c.foreach.Sa(d))},update:function(a,d,c,e,f){return b.c.template.update(a,b.c.foreach.Sa(d),c,e,f)}};b.g.Q.foreach=r;b.e.I.foreach=m;b.c.hasfocus={init:function(a,d,c){function e(e){a.__ko_hasfocusUpdating=m;var f=a.ownerDocument;"activeElement"in
-f&&(e=f.activeElement===a);f=d();b.g.ea(f,c,"hasfocus",e,m);a.__ko_hasfocusUpdating=r}var f=e.bind(p,m),g=e.bind(p,r);b.a.n(a,"focus",f);b.a.n(a,"focusin",f);b.a.n(a,"blur",g);b.a.n(a,"focusout",g)},update:function(a,d){var c=b.a.d(d());a.__ko_hasfocusUpdating||(c?a.focus():a.blur(),b.r.K(b.a.Ba,p,[a,c?"focusin":"focusout"]))}};b.c.html={init:function(){return{controlsDescendantBindings:m}},update:function(a,d){b.a.ca(a,d())}};var da="__ko_withIfBindingData";Q("if");Q("ifnot",r,m);Q("with",m,r,function(a,
-b){return a.createChildContext(b)});b.c.options={update:function(a,d,c){"select"!==b.a.u(a)&&j(Error("options binding applies only to SELECT elements"));for(var e=0==a.length,f=b.a.V(b.a.fa(a.childNodes,function(a){return a.tagName&&"option"===b.a.u(a)&&a.selected}),function(a){return b.k.q(a)||a.innerText||a.textContent}),g=a.scrollTop,h=b.a.d(d());0<a.length;)b.A(a.options[0]),a.remove(0);if(h){c=c();var k=c.optionsIncludeDestroyed;"number"!=typeof h.length&&(h=[h]);if(c.optionsCaption){var l=y.createElement("option");
-b.a.ca(l,c.optionsCaption);b.k.T(l,I);a.appendChild(l)}d=0;for(var n=h.length;d<n;d++){var q=h[d];if(!q||!q._destroy||k){var l=y.createElement("option"),s=function(a,b,c){var d=typeof b;return"function"==d?b(a):"string"==d?a[b]:c},v=s(q,c.optionsValue,q);b.k.T(l,b.a.d(v));q=s(q,c.optionsText,v);b.a.cb(l,q);a.appendChild(l)}}h=a.getElementsByTagName("option");d=k=0;for(n=h.length;d<n;d++)0<=b.a.i(f,b.k.q(h[d]))&&(b.a.bb(h[d],m),k++);a.scrollTop=g;e&&"value"in c&&ea(a,b.a.ua(c.value),m);b.a.ub(a)}}};
-b.c.options.sa="__ko.optionValueDomData__";b.c.selectedOptions={init:function(a,d,c){b.a.n(a,"change",function(){var e=d(),f=[];b.a.o(a.getElementsByTagName("option"),function(a){a.selected&&f.push(b.k.q(a))});b.g.ea(e,c,"value",f)})},update:function(a,d){"select"!=b.a.u(a)&&j(Error("values binding applies only to SELECT elements"));var c=b.a.d(d());c&&"number"==typeof c.length&&b.a.o(a.getElementsByTagName("option"),function(a){var d=0<=b.a.i(c,b.k.q(a));b.a.bb(a,d)})}};b.c.style={update:function(a,
-d){var c=b.a.d(d()||{}),e;for(e in c)if("string"==typeof e){var f=b.a.d(c[e]);a.style[e]=f||""}}};b.c.submit={init:function(a,d,c,e){"function"!=typeof d()&&j(Error("The value for a submit binding must be a function"));b.a.n(a,"submit",function(b){var c,h=d();try{c=h.call(e,a)}finally{c!==m&&(b.preventDefault?b.preventDefault():b.returnValue=r)}})}};b.c.text={update:function(a,d){b.a.cb(a,d())}};b.e.I.text=m;b.c.uniqueName={init:function(a,d){if(d()){var c="ko_unique_"+ ++b.c.uniqueName.ob;b.a.ab(a,
-c)}}};b.c.uniqueName.ob=0;b.c.value={init:function(a,d,c){function e(){h=r;var e=d(),f=b.k.q(a);b.g.ea(e,c,"value",f)}var f=["change"],g=c().valueUpdate,h=r;g&&("string"==typeof g&&(g=[g]),b.a.P(f,g),f=b.a.Ga(f));if(b.a.Z&&("input"==a.tagName.toLowerCase()&&"text"==a.type&&"off"!=a.autocomplete&&(!a.form||"off"!=a.form.autocomplete))&&-1==b.a.i(f,"propertychange"))b.a.n(a,"propertychange",function(){h=m}),b.a.n(a,"blur",function(){h&&e()});b.a.o(f,function(c){var d=e;b.a.Ob(c,"after")&&(d=function(){setTimeout(e,
-0)},c=c.substring(5));b.a.n(a,c,d)})},update:function(a,d){var c="select"===b.a.u(a),e=b.a.d(d()),f=b.k.q(a),g=e!=f;0===e&&(0!==f&&"0"!==f)&&(g=m);g&&(f=function(){b.k.T(a,e)},f(),c&&setTimeout(f,0));c&&0<a.length&&ea(a,e,r)}};b.c.visible={update:function(a,d){var c=b.a.d(d()),e="none"!=a.style.display;c&&!e?a.style.display="":!c&&e&&(a.style.display="none")}};b.c.click={init:function(a,d,c,e){return b.c.event.init.call(this,a,function(){var a={};a.click=d();return a},c,e)}};b.v=function(){};b.v.prototype.renderTemplateSource=
-function(){j(Error("Override renderTemplateSource"))};b.v.prototype.createJavaScriptEvaluatorBlock=function(){j(Error("Override createJavaScriptEvaluatorBlock"))};b.v.prototype.makeTemplateSource=function(a,d){if("string"==typeof a){d=d||y;var c=d.getElementById(a);c||j(Error("Cannot find template with ID "+a));return new b.l.h(c)}if(1==a.nodeType||8==a.nodeType)return new b.l.O(a);j(Error("Unknown template type: "+a))};b.v.prototype.renderTemplate=function(a,b,c,e){a=this.makeTemplateSource(a,e);
-return this.renderTemplateSource(a,b,c)};b.v.prototype.isTemplateRewritten=function(a,b){return this.allowTemplateRewriting===r?m:this.makeTemplateSource(a,b).data("isRewritten")};b.v.prototype.rewriteTemplate=function(a,b,c){a=this.makeTemplateSource(a,c);b=b(a.text());a.text(b);a.data("isRewritten",m)};b.b("templateEngine",b.v);var qa=/(<[a-z]+\d*(\s+(?!data-bind=)[a-z0-9\-]+(=(\"[^\"]*\"|\'[^\']*\'))?)*\s+)data-bind=(["'])([\s\S]*?)\5/gi,ra=/\x3c!--\s*ko\b\s*([\s\S]*?)\s*--\x3e/g;b.za={vb:function(a,
-d,c){d.isTemplateRewritten(a,c)||d.rewriteTemplate(a,function(a){return b.za.Gb(a,d)},c)},Gb:function(a,b){return a.replace(qa,function(a,e,f,g,h,k,l){return W(l,e,b)}).replace(ra,function(a,e){return W(e,"\x3c!-- ko --\x3e",b)})},kb:function(a){return b.s.ra(function(d,c){d.nextSibling&&b.Fa(d.nextSibling,a,c)})}};b.b("__tr_ambtns",b.za.kb);b.l={};b.l.h=function(a){this.h=a};b.l.h.prototype.text=function(){var a=b.a.u(this.h),a="script"===a?"text":"textarea"===a?"value":"innerHTML";if(0==arguments.length)return this.h[a];
-var d=arguments[0];"innerHTML"===a?b.a.ca(this.h,d):this.h[a]=d};b.l.h.prototype.data=function(a){if(1===arguments.length)return b.a.f.get(this.h,"templateSourceData_"+a);b.a.f.set(this.h,"templateSourceData_"+a,arguments[1])};b.l.O=function(a){this.h=a};b.l.O.prototype=new b.l.h;b.l.O.prototype.text=function(){if(0==arguments.length){var a=b.a.f.get(this.h,"__ko_anon_template__")||{};a.Aa===I&&a.ia&&(a.Aa=a.ia.innerHTML);return a.Aa}b.a.f.set(this.h,"__ko_anon_template__",{Aa:arguments[0]})};b.l.h.prototype.nodes=
-function(){if(0==arguments.length)return(b.a.f.get(this.h,"__ko_anon_template__")||{}).ia;b.a.f.set(this.h,"__ko_anon_template__",{ia:arguments[0]})};b.b("templateSources",b.l);b.b("templateSources.domElement",b.l.h);b.b("templateSources.anonymousTemplate",b.l.O);var O;b.wa=function(a){a!=I&&!(a instanceof b.v)&&j(Error("templateEngine must inherit from ko.templateEngine"));O=a};b.va=function(a,d,c,e,f){c=c||{};(c.templateEngine||O)==I&&j(Error("Set a template engine before calling renderTemplate"));
-f=f||"replaceChildren";if(e){var g=N(e);return b.j(function(){var h=d&&d instanceof b.z?d:new b.z(b.a.d(d)),k="function"==typeof a?a(h.$data,h):a,h=T(e,f,k,h,c);"replaceNode"==f&&(e=h,g=N(e))},p,{Ka:function(){return!g||!b.a.X(g)},W:g&&"replaceNode"==f?g.parentNode:g})}return b.s.ra(function(e){b.va(a,d,c,e,"replaceNode")})};b.Mb=function(a,d,c,e,f){function g(a,b){U(b,k);c.afterRender&&c.afterRender(b,a)}function h(d,e){k=f.createChildContext(b.a.d(d),c.as);k.$index=e;var g="function"==typeof a?
-a(d,k):a;return T(p,"ignoreTargetNode",g,k,c)}var k;return b.j(function(){var a=b.a.d(d)||[];"undefined"==typeof a.length&&(a=[a]);a=b.a.fa(a,function(a){return c.includeDestroyed||a===I||a===p||!b.a.d(a._destroy)});b.r.K(b.a.$a,p,[e,a,h,c,g])},p,{W:e})};b.c.template={init:function(a,d){var c=b.a.d(d());if("string"!=typeof c&&!c.name&&(1==a.nodeType||8==a.nodeType))c=1==a.nodeType?a.childNodes:b.e.childNodes(a),c=b.a.Hb(c),(new b.l.O(a)).nodes(c);return{controlsDescendantBindings:m}},update:function(a,
-d,c,e,f){d=b.a.d(d());c={};e=m;var g,h=p;"string"!=typeof d&&(c=d,d=c.name,"if"in c&&(e=b.a.d(c["if"])),e&&"ifnot"in c&&(e=!b.a.d(c.ifnot)),g=b.a.d(c.data));"foreach"in c?h=b.Mb(d||a,e&&c.foreach||[],c,a,f):e?(f="data"in c?f.createChildContext(g,c.as):f,h=b.va(d||a,f,c,a)):b.e.Y(a);f=h;(g=b.a.f.get(a,"__ko__templateComputedDomDataKey__"))&&"function"==typeof g.B&&g.B();b.a.f.set(a,"__ko__templateComputedDomDataKey__",f&&f.pa()?f:I)}};b.g.Q.template=function(a){a=b.g.aa(a);return 1==a.length&&a[0].unknown||
-b.g.Eb(a,"name")?p:"This template engine does not support anonymous templates nested within its templates"};b.e.I.template=m;b.b("setTemplateEngine",b.wa);b.b("renderTemplate",b.va);b.a.Ja=function(a,b,c){a=a||[];b=b||[];return a.length<=b.length?S(a,b,"added","deleted",c):S(b,a,"deleted","added",c)};b.b("utils.compareArrays",b.a.Ja);b.a.$a=function(a,d,c,e,f){function g(a,b){t=l[b];w!==b&&(z[a]=t);t.na(w++);M(t.M);s.push(t);A.push(t)}function h(a,c){if(a)for(var d=0,e=c.length;d<e;d++)c[d]&&b.a.o(c[d].M,
-function(b){a(b,d,c[d].U)})}d=d||[];e=e||{};var k=b.a.f.get(a,"setDomNodeChildrenFromArrayMapping_lastMappingResult")===I,l=b.a.f.get(a,"setDomNodeChildrenFromArrayMapping_lastMappingResult")||[],n=b.a.V(l,function(a){return a.U}),q=b.a.Ja(n,d),s=[],v=0,w=0,B=[],A=[];d=[];for(var z=[],n=[],t,D=0,C,E;C=q[D];D++)switch(E=C.moved,C.status){case "deleted":E===I&&(t=l[v],t.j&&t.j.B(),B.push.apply(B,M(t.M)),e.beforeRemove&&(d[D]=t,A.push(t)));v++;break;case "retained":g(D,v++);break;case "added":E!==I?
-g(D,E):(t={U:C.value,na:b.m(w++)},s.push(t),A.push(t),k||(n[D]=t))}h(e.beforeMove,z);b.a.o(B,e.beforeRemove?b.A:b.removeNode);for(var D=0,k=b.e.firstChild(a),H;t=A[D];D++){t.M||b.a.extend(t,ha(a,c,t.U,f,t.na));for(v=0;q=t.M[v];k=q.nextSibling,H=q,v++)q!==k&&b.e.Pa(a,q,H);!t.Ab&&f&&(f(t.U,t.M,t.na),t.Ab=m)}h(e.beforeRemove,d);h(e.afterMove,z);h(e.afterAdd,n);b.a.f.set(a,"setDomNodeChildrenFromArrayMapping_lastMappingResult",s)};b.b("utils.setDomNodeChildrenFromArrayMapping",b.a.$a);b.C=function(){this.allowTemplateRewriting=
-r};b.C.prototype=new b.v;b.C.prototype.renderTemplateSource=function(a){var d=!(9>b.a.Z)&&a.nodes?a.nodes():p;if(d)return b.a.L(d.cloneNode(m).childNodes);a=a.text();return b.a.ta(a)};b.C.oa=new b.C;b.wa(b.C.oa);b.b("nativeTemplateEngine",b.C);b.qa=function(){var a=this.Db=function(){if("undefined"==typeof F||!F.tmpl)return 0;try{if(0<=F.tmpl.tag.tmpl.open.toString().indexOf("__"))return 2}catch(a){}return 1}();this.renderTemplateSource=function(b,c,e){e=e||{};2>a&&j(Error("Your version of jQuery.tmpl is too old. Please upgrade to jQuery.tmpl 1.0.0pre or later."));
-var f=b.data("precompiled");f||(f=b.text()||"",f=F.template(p,"{{ko_with $item.koBindingContext}}"+f+"{{/ko_with}}"),b.data("precompiled",f));b=[c.$data];c=F.extend({koBindingContext:c},e.templateOptions);c=F.tmpl(f,b,c);c.appendTo(y.createElement("div"));F.fragments={};return c};this.createJavaScriptEvaluatorBlock=function(a){return"{{ko_code ((function() { return "+a+" })()) }}"};this.addTemplate=function(a,b){y.write("<script type='text/html' id='"+a+"'>"+b+"\x3c/script>")};0<a&&(F.tmpl.tag.ko_code=
-{open:"__.push($1 || '');"},F.tmpl.tag.ko_with={open:"with($1) {",close:"} "})};b.qa.prototype=new b.v;w=new b.qa;0<w.Db&&b.wa(w);b.b("jqueryTmplTemplateEngine",b.qa)}"function"===typeof require&&"object"===typeof exports&&"object"===typeof module?L(module.exports||exports):"function"===typeof define&&define.amd?define(["exports"],L):L(x.ko={});m;
-})();
diff --git a/view/theme/oldtest/style.css b/view/theme/oldtest/style.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/oldtest/theme.php b/view/theme/oldtest/theme.php
deleted file mode 100644
index 1f1beab623..0000000000
--- a/view/theme/oldtest/theme.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Name: Test
- * Description: Test theme
- * 
- */
- 
- require_once 'object/TemplateEngine.php';
- 
- 
- function test_init(&$a){
- 	#$a->theme_info = array();
-	$a->register_template_engine("JSONIficator");
-	$a->set_template_engine('jsonificator');
- }
-
-
- 
- class JSONIficator implements ITemplateEngine {
- 	static $name = 'jsonificator';
-	
-	public $data = array();
-	private $last_template;
-	
-	public function replace_macros($s,$v){
-		$dbg = debug_backtrace();
-		$cntx = $dbg[2]['function'];
-		if ($cntx=="") {
-			$cntx=basename($dbg[1]['file']);
-		}
-		if (!isset($this->data[$cntx])) {
-			$this->data[$cntx] = array();
-		}
-		$nv = array();
-		foreach ($v as $key => $value) {
-			$nkey = $key;
-			if ($key[0]==="$") $nkey = substr($key, 1);
-			$nv[$nkey] = $value;
-		}
-		$this->data[$cntx][] = $nv;
-	}
-	public function get_template_file($file, $root=''){
-		return  "";
-	}
-	
- }

From f4b3cf980d4963da182847fc1b9ddfdf1c53de0b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 23 Apr 2013 18:51:35 -0700
Subject: [PATCH 27/67] rev update

---
 boot.php         |   2 +-
 util/messages.po | 172 +++++++++++++++++++++++------------------------
 2 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/boot.php b/boot.php
index 0475f6ab39..fbac881abb 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1677' );
+define ( 'FRIENDICA_VERSION',      '3.1.1679' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/util/messages.po b/util/messages.po
index 0de2f4470d..9ba4ad9dc1 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1677\n"
+"Project-Id-Version: 3.1.1679\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-21 00:02-0700\n"
+"POT-Creation-Date: 2013-04-23 00:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1105,90 +1105,6 @@ msgstr ""
 msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/items.php:1791 ../../include/datetime.php:472
-#, php-format
-msgid "%s's birthday"
-msgstr ""
-
-#: ../../include/items.php:1792 ../../include/datetime.php:473
-#, php-format
-msgid "Happy Birthday %s"
-msgstr ""
-
-#: ../../include/items.php:3466 ../../mod/dfrn_request.php:716
-msgid "[Name Withheld]"
-msgstr ""
-
-#: ../../include/items.php:3473
-msgid "A new person is sharing with you at "
-msgstr ""
-
-#: ../../include/items.php:3473
-msgid "You have a new follower at "
-msgstr ""
-
-#: ../../include/items.php:3957 ../../mod/display.php:51
-#: ../../mod/display.php:246 ../../mod/admin.php:158 ../../mod/admin.php:809
-#: ../../mod/admin.php:1009 ../../mod/viewsrc.php:15 ../../mod/notice.php:15
-msgid "Item not found."
-msgstr ""
-
-#: ../../include/items.php:3996
-msgid "Do you really want to delete this item?"
-msgstr ""
-
-#: ../../include/items.php:3998 ../../mod/profiles.php:610
-#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
-#: ../../mod/settings.php:954 ../../mod/settings.php:960
-#: ../../mod/settings.php:968 ../../mod/settings.php:972
-#: ../../mod/settings.php:977 ../../mod/settings.php:983
-#: ../../mod/settings.php:989 ../../mod/settings.php:995
-#: ../../mod/settings.php:1025 ../../mod/settings.php:1026
-#: ../../mod/settings.php:1027 ../../mod/settings.php:1028
-#: ../../mod/settings.php:1029 ../../mod/dfrn_request.php:836
-#: ../../mod/suggest.php:29 ../../mod/message.php:209
-msgid "Yes"
-msgstr ""
-
-#: ../../include/items.php:4001 ../../include/conversation.php:1080
-#: ../../mod/contacts.php:249 ../../mod/settings.php:581
-#: ../../mod/settings.php:607 ../../mod/dfrn_request.php:848
-#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
-#: ../../mod/photos.php:202 ../../mod/photos.php:290
-msgid "Cancel"
-msgstr ""
-
-#: ../../include/items.php:4121 ../../mod/profiles.php:146
-#: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/display.php:242
-#: ../../mod/nogroup.php:25 ../../mod/item.php:140 ../../mod/item.php:156
-#: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
-#: ../../mod/contacts.php:147 ../../mod/settings.php:91
-#: ../../mod/settings.php:562 ../../mod/settings.php:567
-#: ../../mod/crepair.php:115 ../../mod/delegate.php:6 ../../mod/poke.php:135
-#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
-#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
-#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
-#: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
-#: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
-#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
-#: ../../mod/wallmessage.php:103 ../../mod/manage.php:96
-#: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
-#: ../../mod/network.php:6 ../../mod/notifications.php:66
-#: ../../mod/photos.php:133 ../../mod/photos.php:1044
-#: ../../mod/install.php:151 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:169 ../../mod/profile_photo.php:180
-#: ../../mod/profile_photo.php:193 ../../index.php:346
-msgid "Permission denied."
-msgstr ""
-
-#: ../../include/items.php:4191
-msgid "Archives"
-msgstr ""
-
 #: ../../include/network.php:875
 msgid "view full size"
 msgstr ""
@@ -1266,6 +1182,16 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
+#: ../../include/datetime.php:472 ../../include/items.php:1813
+#, php-format
+msgid "%s's birthday"
+msgstr ""
+
+#: ../../include/datetime.php:473 ../../include/items.php:1814
+#, php-format
+msgid "Happy Birthday %s"
+msgstr ""
+
 #: ../../include/plugin.php:439 ../../include/plugin.php:441
 msgid "Click here to upgrade."
 msgstr ""
@@ -1316,6 +1242,80 @@ msgstr ""
 msgid "Attachments:"
 msgstr ""
 
+#: ../../include/items.php:3488 ../../mod/dfrn_request.php:716
+msgid "[Name Withheld]"
+msgstr ""
+
+#: ../../include/items.php:3495
+msgid "A new person is sharing with you at "
+msgstr ""
+
+#: ../../include/items.php:3495
+msgid "You have a new follower at "
+msgstr ""
+
+#: ../../include/items.php:3979 ../../mod/display.php:51
+#: ../../mod/display.php:246 ../../mod/admin.php:158 ../../mod/admin.php:809
+#: ../../mod/admin.php:1009 ../../mod/viewsrc.php:15 ../../mod/notice.php:15
+msgid "Item not found."
+msgstr ""
+
+#: ../../include/items.php:4018
+msgid "Do you really want to delete this item?"
+msgstr ""
+
+#: ../../include/items.php:4020 ../../mod/profiles.php:610
+#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
+#: ../../mod/settings.php:954 ../../mod/settings.php:960
+#: ../../mod/settings.php:968 ../../mod/settings.php:972
+#: ../../mod/settings.php:977 ../../mod/settings.php:983
+#: ../../mod/settings.php:989 ../../mod/settings.php:995
+#: ../../mod/settings.php:1025 ../../mod/settings.php:1026
+#: ../../mod/settings.php:1027 ../../mod/settings.php:1028
+#: ../../mod/settings.php:1029 ../../mod/dfrn_request.php:836
+#: ../../mod/suggest.php:29 ../../mod/message.php:209
+msgid "Yes"
+msgstr ""
+
+#: ../../include/items.php:4023 ../../include/conversation.php:1080
+#: ../../mod/contacts.php:249 ../../mod/settings.php:581
+#: ../../mod/settings.php:607 ../../mod/dfrn_request.php:848
+#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
+#: ../../mod/photos.php:202 ../../mod/photos.php:290
+msgid "Cancel"
+msgstr ""
+
+#: ../../include/items.php:4143 ../../mod/profiles.php:146
+#: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/display.php:242
+#: ../../mod/nogroup.php:25 ../../mod/item.php:140 ../../mod/item.php:156
+#: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
+#: ../../mod/contacts.php:147 ../../mod/settings.php:91
+#: ../../mod/settings.php:562 ../../mod/settings.php:567
+#: ../../mod/crepair.php:115 ../../mod/delegate.php:6 ../../mod/poke.php:135
+#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
+#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
+#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
+#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
+#: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
+#: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/manage.php:96
+#: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
+#: ../../mod/network.php:6 ../../mod/notifications.php:66
+#: ../../mod/photos.php:133 ../../mod/photos.php:1044
+#: ../../mod/install.php:151 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:169 ../../mod/profile_photo.php:180
+#: ../../mod/profile_photo.php:193 ../../index.php:346
+msgid "Permission denied."
+msgstr ""
+
+#: ../../include/items.php:4213
+msgid "Archives"
+msgstr ""
+
 #: ../../include/features.php:23
 msgid "General Features"
 msgstr ""

From 115c8a53bf89d0a6531bb81d5608f3f9be30fb31 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 23 Apr 2013 18:58:52 -0700
Subject: [PATCH 28/67] issue546 via Tobias

---
 mod/network.php                     | 13 +++++++++++--
 mod/profile.php                     | 13 +++++++++++--
 mod/settings.php                    |  7 +++++++
 view/templates/settings_display.tpl |  5 +++--
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/mod/network.php b/mod/network.php
index 51f3d22327..624169511a 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -740,8 +740,17 @@ function network_content(&$a, $update = 0) {
 		        }
 		}
 
-		$itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
-		$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
+		//  check if we serve a mobile device and get the user settings 
+		//  accordingly
+		if ($a->is_mobile) { 
+		    $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network');
+		    $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
+		} else { 
+		    $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+		    $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
+		}
+		//  now that we have the user settings, see if the theme forces 
+		//  a maximum item number which is lower then the user choice
 		if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network))
 			$itemspage_network = $a->force_max_items;
 
diff --git a/mod/profile.php b/mod/profile.php
index eea5dc7e4b..a7b576488e 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -258,8 +258,17 @@ function profile_content(&$a, $update = 0) {
 			}
 		}
 
-		$itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
-		$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
+		//  check if we serve a mobile device and get the user settings 
+		//  accordingly
+		if ($a->is_mobile) { 
+		    $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network');
+		    $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
+		} else { 
+		    $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+		    $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
+		}
+		//  now that we have the user settings, see if the theme forces 
+		//  a maximum item number which is lower then the user choice
 		if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network))
 			$itemspage_network = $a->force_max_items;
 
diff --git a/mod/settings.php b/mod/settings.php
index ca688d1a9f..f9d5b712ca 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -263,6 +263,9 @@ function settings_post(&$a) {
 		$itemspage_network   = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40);
 		if($itemspage_network > 100)
 			$itemspage_network = 100;
+		$itemspage_mobile_network   = ((x($_POST,'itemspage_mobile_network')) ? intval($_POST['itemspage_mobile_network']) : 20);
+		if($itemspage_mobile_network > 100)
+			$itemspage_mobile_network = 100;
 
 
 		if($mobile_theme !== '') {
@@ -271,6 +274,7 @@ function settings_post(&$a) {
 
 		set_pconfig(local_user(),'system','update_interval', $browser_update);
 		set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
+		set_pconfig(local_user(),'system','itemspage_mobile_network', $itemspage_mobile_network);
 		set_pconfig(local_user(),'system','no_smilies',$nosmile);
 
 
@@ -813,6 +817,8 @@ function settings_content(&$a) {
 
 		$itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network'));
 		$itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
+		$itemspage_mobile_network = intval(get_pconfig(local_user(), 'system','itemspage_mobile_network'));
+		$itemspage_mobile_network = (($itemspage_mobile_network > 0 && $itemspage_mobile_network < 101) ? $itemspage_mobile_network : 20); // default if not set: 20 items
 		
 		$nosmile = get_pconfig(local_user(),'system','no_smilies');
 		$nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0
@@ -836,6 +842,7 @@ function settings_content(&$a) {
 			'$mobile_theme'	=> array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false),
 			'$ajaxint'   => array('browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
 			'$itemspage_network'   => array('itemspage_network',  t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')),
+			'$itemspage_mobile_network'   => array('itemspage_mobile_network',  t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, t('Maximum of 100 items')),
 			'$nosmile'	=> array('nosmile', t("Don't show emoticons"), $nosmile, ''),
 			
 			'$theme_config' => $theme_config,
diff --git a/view/templates/settings_display.tpl b/view/templates/settings_display.tpl
index a8826aada1..9107512965 100644
--- a/view/templates/settings_display.tpl
+++ b/view/templates/settings_display.tpl
@@ -9,9 +9,10 @@
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 {{include file="field_themeselect.tpl" field=$theme}}
-{{include file="field_themeselect.tpl" field=$mobile_theme}}
-{{include file="field_input.tpl" field=$ajaxint}}
 {{include file="field_input.tpl" field=$itemspage_network}}
+{{include file="field_themeselect.tpl" field=$mobile_theme}}
+{{include file="field_input.tpl" field=$itemspage_mobile_network}}
+{{include file="field_input.tpl" field=$ajaxint}}
 {{include file="field_checkbox.tpl" field=$nosmile}}
 
 

From 36f2930e523f966798b2e851e183d9507312e8bb Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 23 Apr 2013 20:12:49 -0700
Subject: [PATCH 29/67] http status for disallowed feeds

---
 mod/dfrn_poll.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index bcb3fb3d7c..90b3583b86 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -29,7 +29,7 @@ function dfrn_poll_init(&$a) {
 
 	if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) {
 		if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-			killme();
+			http_status_exit(403);
 		}
 
 		$user = '';
@@ -37,8 +37,10 @@ function dfrn_poll_init(&$a) {
 			$r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
 				dbesc($a->argv[1])
 			);
-			if((! count($r)) || (count($r) && $r[0]['hidewall']))
-				killme();
+			if(! $r)
+				http_status_exit(404);
+			if(($r[0]['hidewall']) && (! local_user()))
+				http_status_exit(403);
 			$user = $r[0]['nickname'];
 		}
  

From 92c7ec6c8bdb86f37f500b6c1e10ddc660b4fe54 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 24 Apr 2013 07:59:06 -0400
Subject: [PATCH 30/67] doc update add BBCode reference update 'Creating
 posts', change screenshot (use duepuntozero theme) update 'Install', add
 point on create view/smarty3 folder update 'Plugins', add section on
 templates

---
 doc/BBCode.md                     | 138 ++++++++++++++++++++++++++++++
 doc/Developers.md                 |   3 +-
 doc/Home.md                       |   1 +
 doc/Install.md                    |   7 ++
 doc/Plugins.md                    |  29 ++++++-
 doc/Text_editor.md                | 102 ++++++++++++++++++----
 doc/img/acl_win.png               | Bin 0 -> 55182 bytes
 doc/img/camera.png                | Bin 828 -> 895 bytes
 doc/img/chain.png                 | Bin 709 -> 356 bytes
 doc/img/friendica_editor.png      | Bin 14929 -> 8035 bytes
 doc/img/friendica_rich_editor.png | Bin 0 -> 9883 bytes
 doc/img/globe.png                 | Bin 1848 -> 806 bytes
 doc/img/lock.png                  | Bin 0 -> 451 bytes
 doc/img/mic.png                   | Bin 1017 -> 617 bytes
 doc/img/paper_clip.png            | Bin 1767 -> 670 bytes
 doc/img/video.png                 | Bin 547 -> 629 bytes
 16 files changed, 260 insertions(+), 20 deletions(-)
 create mode 100644 doc/BBCode.md
 create mode 100644 doc/img/acl_win.png
 create mode 100644 doc/img/friendica_rich_editor.png
 create mode 100644 doc/img/lock.png

diff --git a/doc/BBCode.md b/doc/BBCode.md
new file mode 100644
index 0000000000..c84308e5b7
--- /dev/null
+++ b/doc/BBCode.md
@@ -0,0 +1,138 @@
+Friendica BBCode tags reference
+========================
+
+* [Home](help)
+
+Inline
+-----
+
+
+<pre>[b]bold[/b]</pre> : <strong>bold</strong>
+
+<pre>[i]italic[/i]</pre> : <em>italic</em>
+
+<pre>[u]underlined[/u]</pre> : <u>underlined</u>
+
+<pre>[s]strike[/s]</pre> : <strike>strike</strike>
+
+<pre>[color=red]red[/color]</pre> : <span style="color:  red;">red</span>
+
+<pre>[url=http://www.friendica.com]Friendica[/url]</pre> : <a href="http://www.friendica.com" target="external-link">Friendica</a>
+
+<pre>[img]http://friendica.com/sites/default/files/friendika-32.png[/img]</pre> : <img src="http://friendica.com/sites/default/files/friendika-32.png" alt="Immagine/foto">
+
+<pre>[size=xx-small]small text[/size]</pre> : <span style="font-size: xx-small;">small text</span>
+
+<pre>[size=xx-large]big text[/size]</pre> : <span style="font-size: xx-large;">big text</span>
+
+<pre>[size=20]exact size[/size] (size can be any number, in pixel)</pre> :  <span style="font-size: 20px;">exact size</span>
+
+
+
+
+
+
+
+Block
+-----
+
+<pre>[code]code[/code]</pre>
+
+<code>code</code>
+
+<p style="clear:both;">&nbsp;</p>
+
+<pre>[quote]quote[/quote]</pre>
+
+<blockquote>quote</blockquote>
+
+<p style="clear:both;">&nbsp;</p>
+
+<pre>[quote=Author]Author? Me? No, no, no...[/quote]</pre>
+
+<strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote>
+
+<p style="clear:both;">&nbsp;</p>
+
+<pre>[center]centered text[/center]</pre>
+
+<div style="text-align:center;">centered text</div>
+
+<p style="clear:both;">&nbsp;</p>
+
+**Table**
+<pre>[table border=1]
+ [tr] 
+   [th]Tables now[/th]
+ [/tr]
+ [tr]
+   [td]Have headers[/td]
+ [/tr]
+[/table]</pre>
+
+<table border="1"><tbody><tr><th>Tables now</th></tr><tr><td>Have headers</td></tr></tbody></table>
+
+<p style="clear:both;">&nbsp;</p>
+
+**List**
+
+<pre>[list]
+ [*] First list element
+ [*] Second list element
+[/list]</pre>
+<ul class="listbullet" style="list-style-type: circle;">
+<li> First list element<br>
+</li>
+<li> Second list element</li>
+</ul>
+
+[list] is equivalent to [ul] (unordered list). 
+
+[ol] can be used instead of [list] to show an ordered list:
+
+<pre>[ol]
+ [*] First list element
+ [*] Second list element
+[/ol]</pre>
+<ul class="listdecimal" style="list-style-type: decimal;"><li> First list element<br></li><li> Second list element</li></ul>
+
+For more options on ordered lists, you can define the style of numeration on [list] argument:
+<pre>[list=1]</pre> : decimal
+
+<pre>[list=i]</pre> : lover case roman
+
+<pre>[list=I]</pre> : upper case roman
+
+<pre>[list=a]</pre> : lover case alphabetic
+
+<pre>[list=A] </pre> : upper case alphabetic
+
+
+
+
+Embed
+------
+
+You can embed video, audio and more in a message.
+
+<pre>[video]url[/video]</pre>
+<pre>[audio]url[/audio]</pre>
+
+Where *url* can be an url to youtube, vimeo, soundcloud, or other sites wich supports oembed or opengraph specifications.
+*url* can be also full url to an ogg  file. HTML5 tag will be used to show it.
+
+<pre>[url]*url*[/url]</pre>
+
+If *url* supports oembed or opengraph specifications the embedded object will be shown (eg, documents from scribd).
+Page title with a link to *url* will be shown.
+
+
+
+Special
+-------
+
+If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:
+
+<pre>[noparse][b]bold[/b][/noparse]</pre> : [b]bold[/b]
+
+
diff --git a/doc/Developers.md b/doc/Developers.md
index 17aff38697..b0fce47b52 100644
--- a/doc/Developers.md
+++ b/doc/Developers.md
@@ -1,6 +1,7 @@
 Friendica Developer Guide
+===================
 
-Here is how you can join us.
+**Here is how you can join us.**
 
 First, get yourself a working git package on the system where you will be
 doing development.
diff --git a/doc/Home.md b/doc/Home.md
index e986c89ac9..3f2c51bebf 100644
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -7,6 +7,7 @@ Friendica Documentation and Resources
 	* [Account Basics](help/Account-Basics)
 	* [New User Quick Start](help/Quick-Start-guide)
 	* [Creating posts](help/Text_editor)
+        * [BBCode tag reference](help/BBCode)
 	* [Comment, sort and delete posts](help/Text_comment)
 	* [Profiles](help/Profiles)
 * You and other user
diff --git a/doc/Install.md b/doc/Install.md
index 9455c62ba2..7f9330752e 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -1,4 +1,5 @@
 Friendica Installation
+===============
 
 We've tried very hard to ensure that Friendica will run on commodity hosting platforms - such as those used to host Wordpress blogs and Drupal websites. But be aware that Friendica is more than a simple web application. It is a complex communications system which more closely resembles an email server than a web server. For reliability and performance, messages are delivered in the background and are queued for later delivery when sites are down. This kind of functionality requires a bit more of the host system than the typical blog. Not every PHP/MySQL hosting provider will be able to support Friendica. Many will. But **please** review the requirements and confirm these with your hosting provider prior to installation.
 
@@ -41,6 +42,12 @@ you might have trouble getting everything to work.]
     - and then you can pick up the latest changes at any time with
 
         `git pull`
+        
+    - make sure folder *view/smarty3* exists and is writable by webserver
+        
+        `mkdir view/smarty3`
+        
+        `chown 777 view/smarty3`
     
     - For installing addons
     
diff --git a/doc/Plugins.md b/doc/Plugins.md
index df60044500..2ae942eae5 100644
--- a/doc/Plugins.md
+++ b/doc/Plugins.md
@@ -1,4 +1,5 @@
-**Friendica Addon/Plugin development**
+Friendica Addon/Plugin development
+==========================
 
 Please see the sample addon 'randplace' for a working example of using some of these features. The facebook addon provides an example of integrating both "addon" and "module" functionality. Addons work by intercepting event hooks - which must be registered. Modules work by intercepting specific page requests (by URL path). 
 
@@ -51,7 +52,8 @@ currently being processed, and generally contains information that is being imme
 processed or acted on that you can use, display, or alter. Remember to declare it with
 '&' if you wish to alter it.
 
-**Modules**
+Modules
+--------
 
 Plugins/addons may also act as "modules" and intercept all page requests for a given URL path. In order for a plugin to act as a module it needs to define a function "plugin_name_module()" which takes no arguments and need not do anything.
 
@@ -62,8 +64,29 @@ If this function exists, you will now receive all page requests for "http://my.w
 Your module functions will often contain the function plugin_name_content(&$a), which defines and returns the page body content. They may also contain plugin_name_post(&$a) which is called before the _content function and typically handles the results of POST forms. You may also have plugin_name_init(&$a) which is called very early on and often does module initialisation. 
 
 
+Templates
+----------
 
-**Current hooks:**
+If your plugin need some template, you can use Friendica template system. Friendica use [smarty3](http://www.smarty.net/) as template engine.
+
+Put your tpl files in *templates/* subfolder of your plugin.
+
+In your code, like in function plugin_name_content(), load template file and execute it passing needed values:
+
+    # load template file. first argument is the template name, 
+    # second is the plugin path relative to friendica top folder
+    $tpl = get_markup_template('mytemplate.tpl', 'addon/plugin_name/');
+
+    # apply template. first argument is the loaded template, 
+    # second an array of 'name'=>'values' to pass to template
+    $output = replace_macros($tpl,array(
+        'title' => 'My beautifull plugin',
+    ));
+
+See also wiki page [Quick Template Guide](https://github.com/friendica/friendica/wiki/Quick-Template-Guide)
+
+Current hooks:
+--------------
 
 **'authenticate'** - called when a user attempts to login.
     $b is an array
diff --git a/doc/Text_editor.md b/doc/Text_editor.md
index e2234825a9..aff0ce603b 100644
--- a/doc/Text_editor.md
+++ b/doc/Text_editor.md
@@ -1,40 +1,110 @@
+<style> 
+figure { border: 4px #eeeeee solid; }
+figure img { padding: 2px; }
+figure figcaption { background: #eeeeee; color: #444444; padding: 2px; font-style: italic;} 
+</style>
+
 Creating posts
-=================
+===========
 
 * [Home](help)
 
-Here you can find an overview of the different ways to create and edit your post. <span style="color: red;">Attention: we've used the <b>"diabook"</b> theme. If you're using another theme, some of the icons may be different.</span>
+Here you can find an overview of the different ways to create and edit your post. 
 
-<img src="doc/img/friendica_editor.png" width="538" height="218" alt="editor">
+One click on "Share" text box on top of your Home or Network page, and the post editor shows up:
 
-<i>The different icons</i>
+<figure>
+<img src="doc/img/friendica_editor.png" alt="default editor">
+<figcaption>Default post editor, with default Friendica theme (duepuntozero)</figcaption>
+</figure>
 
-<img src="doc/img/camera.png" width="44" height="33" alt="editor" align="left" style="padding-bottom: 20px;"> This symbol is used to upload a picture from your computer. If you only want to add an adress (url), you can also use the "tree" icon at the upper part of the editor. After selecting an image, you'll see a thumbnail in the editor.
+Post title is optional, you can set it clicking on "Set title".
+
+Posts can optionally be in one or more categories. Write categories name separated by a comma to file your new post.
+
+The Big Empty Textarea is where you write your new post.
+You can simply enter your text there and click "Share" button, and your new post will be public on your profile page and shared to your contact.
+
+If plain text is not so exciting to you, Friendica understands BBCode to spice up your posts: bold, italic, images, links, lists..
+See [BBCode tags reference](help/BBCode) page to see all what you can do.
+
+The icons under the text area are there to help you to write posts quickly:
+
+<img src="doc/img/camera.png" width="32" height="32" alt="editor" align="left" style="padding-bottom: 20px;"> Upload a picture from your computer. The image will be uploaded and correct bbcode tag will be added to your post.
 <p style="clear:both;"></p>
 
-<img src="doc/img/paper_clip.png" width="44" height="33" alt="paper_clip" align="left"> This symbol is used to add files from your computer. There'll be no preview of the content.
+<img src="doc/img/paper_clip.png" width="32" height="32" alt="paper_clip" align="left"> Add files from your computer. Same as picture, but for generic attachment to the post.
 <p style="clear:both;"></p>
 
-<img src="doc/img/chain.png" width="44" height="33" alt="chain" align="left"> This symbol is used to add a web address (url). You'll see a short preview of the website.
+<img src="doc/img/chain.png" width="32" height="32" alt="chain" align="left"> Add a web address (url). Enter an url and Friendica will add to your post a link to the url and an excerpt from the web site, if possible
 <p style="clear:both;"></p>
 
-<img src="doc/img/video.png" width="44" height="33" alt="video" align="left"> This symbol is used to add a web address (url) of a video file. You'll see a small preview of the video.
+<img src="doc/img/video.png" width="32" height="32" alt="video" align="left"> Add a video. Enter the url to a video (ogg) or to a video page on youtube or vimeo, and it will be embedded in your post
 <p style="clear:both;"></p>
 
-<img src="doc/img/mic.png" width="44" height="33" alt="mic" align="left"> This symbol is used to add a web address (url) of an audio file. You'll see a player in your completed post.
+<img src="doc/img/mic.png" width="32" height="32" alt="mic" align="left"> Add an audio. Same as video, but for audio
 <p style="clear:both;"></p>
 
-<img src="doc/img/globe.png" width="44" height="33" alt="globe" align="left"> This symbol is used to add your geographic location. This location will be added into a Google Maps search. That's why a note like "New York" or "10004" is already enough.
+<img src="doc/img/globe.png" width="32" height="32" alt="globe" align="left"> Set your geographic location. This location will be added into a Google Maps search. That's why a note like "New York" or "10004" is already enough.
 <p style="clear:both;"></p>
 
-**Symbols of other themes**
+Those icons can change with themes. Some examples:
 
-Cleanzero  <img src="doc/img/editor_zero.png" alt="cleanzero.png" style="padding-left: 20px; vertical-align:middle;"> 
+<table>
+<tr>
+    <td>Darkbubble: </td>
+    <td><img src="doc/img/editor_darkbubble.png" alt="darkbubble.png" style="vertical-align:middle;"></td>
+    <td><i>(inkl. smoothly, testbubble)</i></td>
+</tr>
+<tr>
+    <td>Frost: </td>
+    <td><img src="doc/img/editor_frost.png" alt="frost.png" style="vertical-align:middle;"> </td>
+    <td>&nbsp;</td>
+</tr>
+<tr>
+    <td>Vier: </td>
+    <td><img src="doc/img/editor_vier.png" alt="vier.png" style="vertical-align:middle;"></td>
+    <td><i>(inkl. dispy)</i></td>
+</tr>
+</table>
+<p style="clear:both;">&nbsp;</p>
+<p style="clear:both;">&nbsp;</p>
 
-<span style="padding-left: 10px; font-style:italic;">(incl. more "zero"-themes, comix, easterbunny, facepark, slackr </span>
+**<img src="doc/img/lock.png" width="32" height="32" alt="lock icon"  style="vertical-align:middle;"> The lock**
 
-Darkbubble  <img src="doc/img/editor_darkbubble.png" alt="darkbubble.png" style="padding-left: 14px; vertical-align:middle;"> <i>(inkl. smoothly, testbubble)</i>
+The last button, the Lock, is the most important feature in Friendica. If the lock is open, your post will be public, and will shows up on your profile page when strangers visit it.
 
-Frost  <img src="doc/img/editor_frost.png" alt="frost.png" style="padding-left: 42px; vertical-align:middle;"> 
+Click on it and the *Permission settings* window (aka "*Access Control Selector*" or "*ACL Selector*") pops up. There you can select who can see the post.
+
+<figure>
+<img src="doc/img/acl_win.png" alt="Permission settings window">
+<figcaption>Permission settings window with some contact selected</figcaption>
+</figure>
+
+Click on "show" under contact name to hide the post to everyone but selected.
+
+Click on "Visible to everybody" to make the post public again.
+
+If you have defined some groups, you can check "show" for groups also. All contact in that group will see the post. 
+If you want to hide the post to one contact of a group selected for "show", click "don't show" under contact name.
+
+Click again on "show" or "don't show" to switch it off.
+
+You can search for contacts or groups with the search box.
+
+See also [Group and Privacy](help/Groups-and-Privacy)
+
+
+
+WYSIAWYG (What You See Is About What You Get)
+--------------------------------------------------
+
+Friendica can use TinyMCE as rich text editor. This way you can write beatifull post without the need to know [BBCode](help/BBCode).
+
+By default, rich editor is disabled. You can enable it from Settings -> [Aditional features](settings/features) page, turn on Richtext Editor and click "Submit".
+
+<figure>
+<img src="doc/img/friendica_rich_editor.png" alt="default editor">
+<figcaption>Rich editor, with default Friendica theme (duepuntozero)</figcaption>
+</figure>
 
-Vier  <img src="doc/img/editor_vier.png" alt="vier.png" style="padding-left: 44px; vertical-align:middle;"> <i>(inkl. dispy)</i>
diff --git a/doc/img/acl_win.png b/doc/img/acl_win.png
new file mode 100644
index 0000000000000000000000000000000000000000..00ad766992396c4b9ad74b31889ac5c6abedd5f9
GIT binary patch
literal 55182
zcmZ^~1z1$w8$GHbA>9osNJ}W)N_VGpgLF5j<dD+cNDSSbLw9%A00Yup_xSmJzyH0@
z^S{IcY-Y~cXYY5v@7imv4N{O3M?)q?e)jAcnxuq?(z9nT=AS)#{u2oSXz@Jt$_IWR
z7)pzaJbU`{nc0#b1GK!dlhAa0_6!B*&-e3Z$*F`uBchX}tSI90OG0G0my{7Uhd>jV
zg^Grgu&uSViH#HR=d)+R4kiXpCdO}EEu75Xh)c>U7&Dn5K701&nWV^P6}N?h7I!yo
zb?>LAMpq8ToaG3r`DhcW+SooK8pU?aPl1?<2?*Ls#dDHyC5!&2_XB=y>;Vdi#Ok^2
za62#?Jz6G;*dJsSFR|WG$CT5`2FD;-&2LJaQp{J1)z*|%EpK1-rV)i3_s4JOJT|9`
z$2&tu8ldTS4bbLMsMiR$lz~AO=nc}3f4&INR6{;tzWn^>OT-xEZ{v?(tA84RwkXDb
zU-*A(JHx%3f=l7FjaS0@dj<cqa--ge`B1BG5fSJ;y}iG-{<gm~Ahv1Pj(7ACDCr}A
z{o2gUO+!ll-@C57xD1W^X)(|f_4nqTHK1%-bzNh5yeW!u_<#E0Z%H)CmXEh!tLn7~
z^*Gt{`L~~)UYHB4uV4)!)_2-WiTAvZG52-<KA5)UJCxn)CsoxnCo5|CD|paBVJFX{
z5n+$!53PT1T&kK?LObwIk&Ix`5pMyCH$V9bRw#I~`R^Fmm4qBzM}olx;E-WcxWsqW
zW`n6lm1vMpv(Dtc_x9vo$DiFP{_S$}dXV7#TfL{-S)3QVBU8swXIbg;D)P{NpRFiy
z5&eI=dlrG=y(`RjyPIR499Rki6@)irk6d<bDPTqRQp*233yBHEUux*zmdE%qHTKC}
z8p0ZxVo3iT2KP{l<QTsB{$6HqpB(-|Wpwc0r)61{)Lk>;dGHkA=PLq5_IE5paprS!
za#DGmLn<mhu*t^IIHl>=ElSGEn~i6S8XFr+eE&18jvM_n8L>i`rAS9^y}TM#ro*{L
zjior@VmJ(8b5^xoUA^->DTf5CG5PWtc|}Fie9N<Mlk+~Xv2`6EvjhYLY(b&YS^va`
z-89O9=kEq+bguWf$Yp!`GvFQg-@Vg}lBx6M(mMB?qEk{B;3<ID4uM8}E~}J~I!!2v
z!*wgGr$gh$+S}Wyh70TtGhsY_ett@r|BR}3oi<w(8FD}_8+--gKVeXc#OwNdtM%^p
zCK=FQRjf_laS<05!q|L<VE(_o(A?YIUHjd1w6pqnxQc|}R{$QElouRcT)E`%5?HNa
zuKYWYFV`K;)-ik&i;Lgy@9$qPANhzI8Bvb%ouU5v^~-CAHKV~W2bQ2?e06?qx7CMr
z?<0taLB7=&MR|UH9vtw`t^N#NzTg90hdyT6>|mPfN)ngPW;o|*O_?`Z5Tqla?SA`)
zu`*|z*4o<IA7T*Cq$4FN3V(BR^IoSh)|_o%9TH@+k^ArT(L|M45MQl$9%*JU>NY1X
zEor9%g9*HUadEMKbkwXrnu?1Qy?vp*%d|>SLqp>8=jUW(WQL6YMqe>^LJS8sNM=FB
zeg$-}vZ6aNG0`_Pl<Kr(Q%8f`bLbM2o-WWk7WJG5onst7(Sz@k*5qfN7i6S-a~<tr
zdXc^YpL#p|oMapgGp!rX%S2yPv)7!=*qVHc@FO_&{<{K02N4C1pIdQ|Ft?mfXl6J&
zJKNu$TdZ8QUJdI-@pEzYp>ZzR&Df_5b6CJG0#FD>?7g>1r5soZiP9(@UgU%sZz(Bh
zbPmK(Z4F&toOwN}<ytMC8|wUBiuKnNo*h5nz4nze3|CvdL7U={<l7a!<dlqz;WX)P
z8zEc6KHN;$AQ9}h6#ZOja)CiXKqw=&uiIgQM0VocvQonG6kmKY5HgDVxvp#A4sOyv
z8NhaUVa?_o*)?JprQR5gy^&$2d2_%mF<DXWET&7xAnlMxznjbUk+wiPs-C+2Q}5?S
z@lF;8Oeu9G?9`oPGrHSn*0Rg*lo$()MZYSw;y}YTO0_?)SGyyPx!B<n8gwOn?m?Pq
zP%GW#nu8B5Stbx)Og1N$Y*c%z#!UvJ9O8~J+loSr8Fc!(vZX`tCk?KDJUg`YO}T*0
zRvADLI@ei3vh}Ox`-X=_XPy5Hq@tdlyqX$5*yCpAzTQfG9|p^*t4sL){W$_6A`uxG
z6(K4%a=`A<QGQ!n1~AE}kVK<_fO=N3UHSS*xUdN0we;L;gx%f9pXy&EO-!ibel=jG
z?%SZ_*fT|Vrz3jv#|Tp*@Nmr?<yL=;7klm`52Ea+)09bPV9JB5cBav(YM0cTof?Y+
zqU3TjEW?OO>J1GFXAUZrjYVt}DrW$6K$z=?qdip|gIYNY^G8K;IN`7jY6e98mrEx{
zrYsY$QR4RYA({$F^;Z&gc=*`6dw$JIuzFr0J;FY^x3lx&^7>LMTV#KS0$D*@d#I?a
zbwKcOQ_ulcQdjA9;~?;O5?SSXr2D(|&gS;^7RX0v7=ri5Cd0EPC&s*Kavxb)?RnC^
z)g0EA!e07)o|v5M@9X=dh?_l53kT;ISwpLxDDFFp3Ago0TrjG+TUkU8UGq0n1es;_
zXq@=o0QO)GA4{xL1d6NL&~R!@z~Z#1@w3#ENI$I3b*u>X3o7sK{%10;Z9ZbY-EgR4
zc{BjR>bK&Lm=O%@S3yMFGa`CQ0;zCnK23oLZ)k$r&HbAL0x+#o-eSnLgIJ@yIdx7>
z35mOtnxaWxod2A<k=UY<c$ezLXMY5TX}=z^`su(6)<(n@{>2Cp)copiihGMIy1pLt
zT0mODcTZYxL+8kY;29!1ss6+5#r+zhV4@%eFE4KjtJz4oaX)r@NO$eL6^JGJx_C4_
zoxHND3hMJc_5G5L4k{XIJ8eBd2BW8=l$w&}kL@U%uh|S`u^O>`2mQ2}4&B}Ov1UPO
z8bl+%plg_LFNwmtx;*Ui_+IYXb4#Yx@}<_R>u$ZL5psHg<Bs!B#jYQake1$TIr3%}
zyqh1jYtSa;aS9G1_Xs}neYyimgS5xtAU0E_e#Z--$`g^3r#tasgY@gPczm6lVu6x_
z&!l~gU;0xxo<z*kBU*?unkX}e5g#0-+&M78M@W{8-H2uCL`&C2!M9F?@MaohnJf6A
z&^~kX4dN&}<U=orm5*wRQWHrFwBbY*(1`l3EKn(Uk$XU)mln%4e)}QancRW4-}%e-
zx(xa@p#d8UyPz65b}!CVy5D4y3ibDKktHtNN*3l$b1kKnzYwJKBQVxLx!dADa+eo!
zy?yZcqNT-rQ*)RAqfTJd67%%rg+L(hzf>ayLB3lg69#tdP39AkkmTg%ZZYO(C`U`n
zD|6zi$Wh)p^f|cL7Z=i9*5Prc2_x!&9JRS9b=cU+;EMZw16Z&U(txM@!I8X?MOMlu
zrM{EuOqPE}xZIl@jH^<at?#tq1tgu+#%M`&Dh3pDOP)Zy=h&m_G6RiiY|i3+48z>=
z<Uh;^B(g}%fEyM|@FYIZk=5v4qbPHN=l(RZ!G}(6nO*2fff4Ww<!o0Fe^5(|+`SYe
zS;(zv(-;xH!Gs6;2eWlf56`w<vJ0FgjUJz6JdvuZYL@GF++)q72l?SKsEtid3X6*)
zMoGMcumDMg28grm!34cEJY-EpO)gdUn6Zu%yC_K+uk<Phj|z?Y?2k7X^rJY8O2BXZ
zj$V&v`NLNYrJUB}$eJJ6-x<FV>Wb^#=-h%0%?TTrnDie+`r+lIM-57i&;1Q`IKG>$
znES)kM@FWE(B|gm8_LSf_uBQxjDh}0RYpLm>D@(<zYNji+mJ>#RZyVAA^)dV*K;VS
z#&w4h=+(k>*rL*+qlIX3qiNi_`?HKqsHhU&KRCLr#7M}>#)-fE2V981_C8P5GDhiS
zr`l&$6Jkn`mQt3$)GJl|Q)x^Y%2AM!bKm&8LqyMvq1)RZI5;>gQk>R#4jT&T8yXt^
zfgYX3bWBX~LYO-V<c%7ywzsy*&BrO|6u;l!dtuH0eVAG8DNrO(%yaYeY2vqV$}XLa
zC0uy-_V$4I2@VTGrNjKEYKj=^$$b3yQN;M~az~nF2jhPK7oZ0B;r|WHm;YWA=sv}N
z(A2+fNHpboZffe?FS@^QL)%eBO-;9j;!ep#;a~ikM@fo4IXUUKY}32vlnsvYW5X5g
zV3Wla<%ZQ~)A|d&l}qKampr9j{}-kHzpnp(L;C+~>s0mA`EO5<7&&Lfp`zN&g6gEx
zRy>O@U;8g)v4y|Xaa|4ogMt75?*Z)IzF0J^vOgQ<jERo!+>8|TnGdM_Z!cl6^6DUt
zL0w5vvE$)tb@Z@qb)@ZnuuWSn%e&vG(xl0GUFqYZj#xK3e1-7m1BC;HdXIx+rO<=6
z>(I8$yu3glW`D-S2!H)bPe(_0e_7XNGMvm#7-)YOdQkMMJ>aHSn*{lvcVhD5^5T|~
z^ERvOHjXIE^RsV46NL5kIR3YlNsu<~RmWDug`Z?o#5I}VR(@*5m5}-O$=>{LV*HCz
z81R|0Er?y3&=go?KRuUGz-4)RIof4kE&$igR<cQ(_^s4p?hyNiVklg}JT`0H;7den
zzlI%>Y$Wz{P9je(Em3BXd1HjlZen9Z7EHuBe4Uj)H$aGs9gQE1rHZRWuyb;GwIuJ;
zuQZ`F`O7YVdpaN_8vwyk68_cI)sm1@ec6q@gM+QAjEDDn*PR5kOibz3g+ixx=J!|I
zx)^Hpwd2lk5EeVGgM;O|NMCEWh&tb6EHS^gq~Olz0~sY59NEwfJFfDg@;9t$C&44*
zoU6H4!w>h6-X{b`V$quUV$(0rRq^!F-%#9rY#ZWnX$t?|fh9*OD91+J#ZpYLH0F#t
z`Dyli?gJUW3tx89ZXn2la5pew(8kQ9oAG^<1$SeqbPmN3D1AlOXLc%>l_rEizB>Y4
z5iMxLRJAaOO$$HI=7*snaV8kKLqFKe^^rhYOiZ(YBypV9KpA=s+PrT+f<C-{psibS
z3BoO9v6PtvAnwV6W!cHisBijmlWPp{QNXa7%?;$InVA`X+S%w-l>U>z1j-SG#2}Yo
z)!FB?wEFa!w26s{)VqP-OTU>C&f&!s7}$B(y$oW7XLU)Bi!h0-_?>}UY^UQW+L*|Z
z5{^UjqWN)v+<~iIR@1t;&*s<r{D2fk414L)3@w7|llOe>-~dE7t&ZnX%B%XTS;F@|
zOR~x=etG)T;bt<AN6PYNi+WFAJ-#27<@9WJ#N2OQ$nt|4iJ4nb8s7SnvFpBGgJ>xS
zJqb-DMeCIv8OGhh?^u(c8g4QZvB?`6qffl%{;apf<vosr8UR<|LY4plP40COJsmo&
z+szT}{TAc)`7wplE6Km|S*-U1Jpy9Cxy2^p(-FyRE7{2Qod7etvrk1C3hsPJ_L@Tj
zm*Wm9ka@1X1iV^bSpwC|>&SC8r>Q9=Fc9IHl9JL6b#Yn$ZFwNi)6~7YAqS1N4DMug
zZY}rQYFS9Rn5Iljc_|M2XI5F6>F6n9WCZF&1n}4J>~~Hz*%~<`XXQGVLsTsyWbO?M
zx1kCyouUu{0Rf+RX5#R#_rK!^G?Z7Qeb6&W^uOxw&)7P#Z1}?TIfLhVxTjMjtJ|N4
zfbxhEN8rPtt3AFxN8+(%8lN9GsLb?=y;z&}ITb$`+0f6a=y^u{E>2#!MUgR7^6_@#
zCvRR%DJ;P^YMEoJ<FKFP=YA<BHeN$Z&6A8zCHo31?4{%f3c|)Ha|RVvDpKTef?d<*
zx`bc@A+9h3bN$5k74z5AD6N`&vzG1XF~msBHC5$pp>D&l671T=S1(@xl`A8^r6mp6
zSNs4_RQ!8QA!ldy<h=3m@s61itvwiQvuX8#$@dZJE2pJJQn&0vVqsxH_~8Rv-R<_5
z0t|yuo7X8D2)m2J<O8eObe>tY_=Qqty9ad0gdtR5cC^VcNoi>lHr$uEfx=iqpBiN=
zUUE?f8mu|ZNy<vT#SZD}j0+BMPfiTsmOrp_@Of}%w<^+-eaJ($fWeRa%9*aNW{dV^
zLOkq+^G8^DC-}g&Ao0xl;N7ho!L8f3UAJ$2=HL1>IHM|TI&+?%pV;&u$UA(*Tr)nh
zJ1`60%=g$GCvE07K5j~Qa*g2EE;E^G&DCAaT``%cm}`jfDDQ{bEIQUA+9`dB=j_o_
zkC}2z+s{hMa+qt42o%#Rj!N9Un9+Ep6f>1`IXf*wn&I(U*+0f?9}2{ruI+{=DE-QP
zpbM6g$~?-xHEi{DMS9hZ2F^(5JQ8u21Y?YMrMvywLTOp9vZ}IwWQ3Z5H?;V`s<O(l
zuW!h>pf0H56Tx`9q|o;m|E9*^myN*)FH-mT+@}}UbD`VZLA?+?@!@y`;#!%r)Y03O
zE_SoDR(;h@@W6PE_{ohIkj#O-yeu#$;o;%UH#;eFhb}!mJ>`psxp{fnV0ubQ%6o|5
zJzSOolB#M<Ae2T(W=GUpqc*;#B>WZ0DSK_Di?ycGjAh<Q;4SrOf>Q}28k*IK+X)q4
zYD|mIV<U01?h)>2_BMCM{3cH%-@FDTMW8{s(}`hqE9-s76{)5ijYT1ye>O2B3o|eK
zi-8mEma*~2sb$$s=Ja2=c2Vr~I9GlQ$OGC4gJnrBL@y2*C5QK7UEHNew5qC{UC6%Y
z);?M_U9QWPN_(&5ZbJL+*seU)=F>J?Dh5VEIXOJo8j5pmB3V_%X`ZyB5)XcVBA{7J
z`H<sIJDy0e7;H$)gPwpc$GS7m@oBc*;^zR%cjeDQa7G0o-%XPV8^7-<5t0%^ou1at
z2`uM3#6}}PZL`+-?r>wzRELLEHuG)Fia##b2Gukr7nUWmY-~ANo+ztVr98u&Yw@c*
z9G+6|9kEU|o{yQ7avFhIti(>?tia5ayWKrH0|ser54(=eDgzGLIMsXUAFZcKN}&~%
z#Fw|6ii+!IN9iBQi-H=HEq>>4NTOPQKLqYa<FVxf4$b`KOw^Q|QrI3eTSc;(hvt-?
zF9SYVUv5a!8HS!pY5z(;@C%~do3P&&ExGo^MHMzvK{=Z=^9}i!7+^t|n1^R(u8h|s
zCT7liPVFj6>CcX)Jjuu_`gY$bi%M3k>FZ&6Ew=%NKv|HO9^>?+yF5Kdh4UG?3&FJ3
zO5DChE2oa*hsAUFK|k~4^NWitFg>u4w{~_Mu8$3XE%nV*zCbqwLr})Y$4BUyMRE_b
z?~SxvI$yu<eXsBFp1d#dKN|sn{+rxO)il;~yfDBjn*D81hXF3~W~(hV5mx2(<YBBR
zw;uiC!al2vRmEObmIUr$EN>wy0vG3)YLOMe>MGqwZ9?`f3omCY90Se9Kj94z*MN?0
zPz>bfU6NtYw&x6Lkr)sb+V_2Cy)&bgj<YsC56e&42kEYrTRU-Kk(y`uOM4dnL5Sw}
z^Ny(GNBR)Y)nRYdqpmSD71f%Fk2EvP^*e`lUwsBStBPu0<XI=wb&jZU9DOxa7JWZF
z&-cwuOVCfpcCMNAl3XKgc$nnti97$~-0l9}(JZvPYOy!3YQToX`SELri~Q9J?q_L+
zK^Jyqt@ZrUys*RJi;u)?hzHAN9!z(lHM?A7K`Hv@2t(y$EbVL+^Qb--UxNLtH|MN~
z^DKbybZHWL!y<EcLSpasgH{9QO@|13YFKw*p(+3S?J_@S)k#7r6kZMwiDs$o!Qz#p
zYG`~_G0WaI*CM>IV)vAs2^xuO^*b|b4jt1k1K@&8GUD1b3kh(-i}FHnSaORGM@0g^
ziRu)b^W=)SqS8zP)~JW5A`xTwbJ`!LHAP0-Dt(owYCI2BbTMDQ)_rN&#?SORD@7p@
zYD#q}5PsSvQt6d2yrN0@n%~CU_1kwvDh?V6kVumLVT6H_Az(YLaqJ277LZ{gZC(`8
z=W43FN9|>o-7}B5Xe)8mDu%LopQDmIUw#~<m)Hz`K*j-ZRo}=+UPD6?93pzT<t!62
z3d$Zp&H$9nC_o_s*(#y+oNDE6<;r1J#}zAF>{Wme-`zpglIyBBuuCx4oeIJ$nw@A|
zL}Z(2bn#Oq7<uC}kZ@D@g1FW#k)^}=r3QZyw7e9|qx(T=W<nw}JN}lQnS3-p5kIvJ
za${;`!EC8y9s7d>|1>h=nybxLpuKM2w@do&YQ4b~O_NHLbm8t}kgj)<r<!Vc$KA_9
zI=bCPe9NE`st%b%!9xd%ws=|-OQn^3i-ZI!o&4+qR37NWjH{gGEa)nexTs3=`S-I0
zkBNsK(fi!WqRfKgfW()H)Fl+OdV~AOuqD|GRiIGUcJYc~FTQABTU#5VxRWv&7=zG`
zD`SFMej?D)(XaaCB|KSp(_H=%HII_8S{8suMY}o;C<u(w7?hVxZt$`<ol2;3SLcsm
z%WkvDE9E+To=I`(@Gey2nIT1uVKzaF>!=9x81!OjS5`8b!L5$1+{Tk}jLT0^T~Vzn
zq4AO|R+Sy@aqo!IT|eJMe&`PEaYSt(!8(|1CDd0L9`B{OEnN=y1<$A!wa>j(w!jYZ
zvAbo#nS9Ho>VAXbv*|7sRGI1W1D2U~TzvfFqo>C*U_aXaWw_(z@RVJCuKhWR-qvu5
zRz)EPYVkK~JgWFi_qfHZ$ex+&KEI5{<naFJ?bKSXrlXeW^D;eLQ3HUbjg60=SXqfE
zg}o}Pu}B7Z-`10G+chU1Mb$Wf^ZfyjLP$(3q=*|q&Ofm1x*9&Yw{^S@@%rtUv3Uc{
z$j~*`3%xMtrY47k)?twsl_aXf$<oYtt?YG`XGn5Kg2IuXbT6yhjqF>dc5`YQiSN^@
z<C%^8RwLUQXHIQ;g{8qzGwnLV#6+njYDQjGSwCLBI)@;r8gaVsce8Zgc*+o=`3VYv
zC(u)5cfieVpx8TXF;(lt5J^76l+fCN;pr(R^>Pc?LSh1^sjFGdpwGUGoObW(JWtWB
zb9PBt$_G<#YnaXc{uc|Krs+n}5i=MX4kf6cqBRRk&zgPude4fHhWdG)<e<2bgVs@5
zUTs6tf(En;RuoTodgfkPCJ{Mbtt)~{LR&Fis#-*ISeeB2yVx))ADfX2JtX<vkh2V9
zw1Nb3Pc9pC*xX>ulo8WvbLcG*>6>X1jw;6-M2t`F+}kFqP>DhCyO06mIc(Tzsa9P?
zJegWwZ|;DR6oyOZuI2p7ZpUWQu8ECp>96Fk9K|IDo9V*`VE$fjE2*v2g~M>Sjf@0a
zQ}vc<ySRj!D#m_F9clQXY?(`&v+@e6D1+p(xOyzsM+SUxa}DZO`iTfeIYzm;T;tgu
zRz!kuX78l9xFQ%IhZC2Hpl3_k>@M|jCRU(%4Q|*>++=yTwCdSVXO=-IV(n4#qvv9N
zx(*lgyv!9Kdx6@6OF-awe{KJ}eiL0xOe|O|XKQ<Vd}T$>+nb*$0VRJD(7k~2G_krG
zxp-)Lw9?Z2^l+44Q4wXmSR0j`Jdng{R)5k%Quc7mlJ0|NWl@~%5^}xLSW8{l8V0IZ
zIArrMbe9ay6w3V0NItjH{JqAix>db3!dde7h%=kq=@)gC>thcN>SoXF6xR=W(5vJS
zP<8>P)+|q}p?Vh^$eb9q;wfnP+k-d1NnTm4mh@Wzez$?EzN4JPE1lU7cqY*}R;_ae
z*^}x!203-XI}3Y@+p>{yR10&brw$stI==dOwLS<<r3LzvMr-p*J(n7kTKqXBy+^LB
z>?f!CWQ!?9MwAF+i3d@o&+=p~Ppgm)F3T(4Huy1IT-~J6y7aztzTNiqi53n*|G>v*
z6=2!r!zL>{$wm={r1!9|-mn?bZ~2^)on28=(|ra$kN0sSl(`b7C)nldJrIE3iOoVi
zr$g`i5HRUATN^;4wqgo8xE8vkj-ORfWc+}mEb%oYWnA57=u&*8TU_u~(LLK1FC!s&
z1Z`HPptr%wrWR_tVs19P*+9!J3?Pq6<2vqFh!fnGUdW?9P*HrQA<<AdH+)AOrU;+y
zBGQLWK}WxA!>)uDC6xsorbl+{Et6$j&&G&)1ztdI!|+;z0~kaQ4vpK|cf{*%W}nZt
zw#<=yr$~Ts0z&(GdV0zt8-qh5mkFkypPvV~n%47Q%qJ7l%qJzb-l6B`PAfMfuBS_m
zqy3O1xW~q1&<)~j7TJDdAb5d`o2zd<W_fG1{O9^QmNp$7DgVq!)9>bR_`SVX_9e8)
zfv=WZ9?sFwb27`{@cMO%qA23xpu$bY%0`t63Fn)-VqGNkjX@2A2qqQB|DliM!>(oV
z8wYY*UPebUga8EFMi&UjZ2RtFRu5|Q`i_t(fnj|Mz}a($mtC$$jWDKK>qQr5_evaH
z5vta_yjOYCM`!`E*)9Z>9>mG$glbs@U?DK%89(uni<Z!$3eyNuiyi;vhmxLe*I&Bh
z5f@FBHGU?5zA96vp=72Y_;uJ*#J|GMSk6hzq@~WIOJPQG+|*jV#rO911_pp1AhBN5
zEy{|CA@K9_-_K_}5TT)=8Jn2=p_!_j_LMFU7sUbcHqWBcd_3D9&e+W@F*X+W8K8aP
z7PHh*&sU4ZU^qKr6B3(>uu90<e{}fxZQp6bu3^lXj1s@jx@z8H!S`EFOPPTq*SHf|
z!g2>AgN@<v;!#&ASOQ=ukF>d?N@S1-io~Di*&OE|$>d8s@c+KIIXB0}Enigexa;&f
zs*wpZam}HZ)KeWI;*8q|HFpfQyw0b&-*0x;N6~S$SO2ZvC-2^?nE~uv#^>kLFnxyq
z^8)nG&CM<0j65g{q>*G77Vd!?SAp3FcBKv$B7Q_DC;Aja!jsusTc)R7>aCw#)Hsq&
zOYjX7sa=}<CLbVPIqPQ4S~ZG^Y~Cv>#oR9j*eLFPqz|eNG^7t+xU>-r><p(=%v+K2
zd&Ek-6EZag-bR)(+yi71LQ+y=Kyt&y!>a(47hSh?cqL`!1|YovdCI`tJa}ivRITKT
zsIV}cTz<^Ngi-~hVdV%cf0oZ?AE){~VHh2+oA`Bv2t{IJ$B%>eJ>p{Z4aRiB!ong#
zZ>Or+2HzUI2>dMOL2UWEHIxeeCY79Ut!DK#z@?}m6D)t~4j&xL*R+;AIF_mkk$<8i
zn3~a>aM2XG{584QXj<9IlXlVk)mi~(75-hf*j<)E>#WibMF$Ly?k<VlgCzc-yTJ5R
z^%o?WH23s(2yJ}}_Zb-%^8j5BRqe(r%alvw>6YbOc6x<68WtXisr5KCF$9)<Yx|iT
z49>Jbpyyz?`~p8bwugoQDv+{@?UvBU>OW6m*0voLJ+QL@pdB?eHy9iOS${)C6_A=r
z`bTzZ&<1k#x=WM$cAPpbBjc~KvPdB7As`^w@uZOo`lPBBsbyIZ154RzuKW*qX%|7U
z=s+FI+y-i{c*DswLL*<}U)Q4lcJmv;oGPsD)%&(Rv5k&50Vt=tFtV*H#D~;9*mnFx
zv_%=E3#|(+#hpX69m1EBkL#F(TsRZ+EFD?ku&;E9E;J`qan~YMj;P|!VUNbT0@WjH
z%z69*EG#U{N3Q1PyVyzT*eS*4-z*MQ^19R-L4i4mg$RLITHal3ENJjJaGq9V8lp*w
z9x3Is76&IDo=k>8j+DeTLTdm`eZ4`@)_1bmt66FM3fN2op|S47qgiW3^!lbx-2CfT
z!@Y@LUI#|6jexj$^?hY=QQFaw^;w7h&!{M@3Sl5Xri1dn%PQ`@CS0q#yKm0q(MU}i
zxxM?neKUJi)pmgtl6~6leP!tX<G_6zBeAfMcHMqv*^#C$0oN!|&1~GpQKO`a4w!@E
zTd@{Hb&iVWDf@BK#fa(cA5*Atv2*fY0z)VvVtHDk;fN)@YEsG@dKpG@vl4_pD+ux&
zBagiNg5UD>+FZ!3TwSkn6ZC;R(AwIn>E-w>q88m$l@ZlxY~}+?(HVLzd}-sykWrsH
z(`g(%H)K&oyQay0JG1DdC`qxvl%X)xkIS0%lgqSVV%B94du2%*o|U79j>sfiV^fnm
zkaWx*(!NLdX$OeXxwt(CYB~)^5*-7>CWt0|4R8{0)~)*R!o$N827U&pYTy^X<90Y;
z`x%v<E(a{Y?d|QbhzP@EYQUZW*e7T<D!b9U(V;WcMTCi4P~)?R>AJ}o@4(5;x4Hr@
zKVCmvn#`0o1pSf@ovVQ5=NfO@oeenn_|~Us(bJE~2B@cCjC*VmTF@~`g(k4fc8hlX
zxfrGTP>eNwMfVZN9Ya>Z`go!h>9JPv0K84fCS%8=BIjc9QoPr$%M>J63<a?t2uj<t
zk_VJEqjqZ^L(^~W^sB0>xV^4fLJ62n0W}Yp-FQYVm+`VqryZ8D@g9X4WGRQzl8?#3
zeQF<M$#CIQz<@4&lUj$LLqoY!5#hYA5+}jZm-O34>A)pS!dR%B!PF`)b^hYoNhiOg
zBz$U01#m;qySR}p8pz6`Y1P@7KmySK2%Zh&xmxuV#Na>2T(=`E=im*tO|15P@=+_(
z4KIZO^2ccpi7h625D_8aAA$5>xhdg%jvmu62#Dch9{qg;ARc##F>(Thy{;oyhJ6LE
zC~Vtmet3qW&@t0*akgC<iBK##4$AU9o$A_X)%vUZPD<$6z7~atUvhyB<1+O@#x69O
z;~4)gz-$K6$y-HSRMuMm3|Rwc6{T0*1$nAy=s0A(3)?3oD@LgmlO&MJ&5+5;F+Oyq
zZ5+Oi>BkW}WEjO@vji&821Pucm)Ck?e)xEgH}+`ac7N5b*U8ypSC8L%Y7I+`yho7p
zK_oxz9DMzv72)cI{82#AjNaphtgP&>;^MIQczj?*78De4xr)CV6H|7z3Z9P>$Hz3c
z?Bv-3lt8MHbiZ@)PJhVS0E3B%<SQ!f=L^YVgnO0{&4$heNry~7zusG<-U)gg)Da0m
zS=r@J2=H+Xv@(t9fGoTufl;jS`77Xf&=?xP-ZdwouoQij0FEf<n@0v0>eGg7gVYYg
zA`#pV6WUA$^G2iMl0c=Jyh(d`pYtG~Qri0T8@fiYA+ae1Rm>Jq!{p@Zsyq<dH1g?P
zhc3$6+FrWy!xgP|*{S%O?<Q9LRb$~*N@-J1QynToKE_4(>6E)sQ8|rq#CC@;C@hAM
zjbsDN><3go-rx0pfW`)3<xqUaP8L*vy9PvPN_O_?%FjCa_4SEYZBGxVsHpmc2&4R0
zq>PM=z_L04$$R|(MvF}r2atVIS;625642?Y;8}&wq4#_H1r{ei{W)X{;z)D<9IR9q
zl63{7Nw#2rVgDZC`pJpw&ATEASFSO3Y5k1R?KgjCK6)26XUf(n#0Acz<v@i~NeR(W
zl_=DPP>hn9ZyJG!MiXaD-<WbGzB7}NVf^tC1-hO^eoW@qj^uUoI1jzxmxl=3R*76y
z%0qB~pXcj1$CPU+z29)+6I<c9P>(Uo2|T`06_qVP$cTwMw;izlF?G-|Gu!UCy0Z!C
zT2N7O!#P!>b$mj6z*W%HG)EIeLtA^f6w08Pgp+v)==WPch2Nr_iP@W$NLWp$zfs%!
zF!nitHDMqw0M&^!mxcwfKj5mUDFr*XsBoUYe700iWT^j)Vx(C5mO`s)OI2nvu#iEm
zFW3NaSZqA{1-bi{frFz1&WEZ-gP$;mQ&U&Y$JhMA@47(-UAG~${;KR2p1DaG{Xl&M
zD2yc!SV`50rPyaGHAR>8p%P=0^=D*=o=B+|sY>>feyXuHgv9#akVcA0D<DNv=;Gqy
z&-?oOC5yL-0asbLEx@%I%BsmuUjK17T-&(1astxDlFOp?^@ER;loX)#>azg#&xNb*
zc8sNh+v@)Gf_mYFSpnDN;AoGSTME>)^&-dY#?%F&w^2^9k|k&x#c^+!<P!>lq&-)?
z{hpzU3@LaTE3A99!(Ht1pKQo*a(fpNd;p}KA6UGK!~Je^U0u(VMLF@DCciUsg>g^8
zb=b?O%DT1SNS7q#)w~L}&<Kr)#Mp4+8Fe2PSMR{U_?$d>%l#T<7Q#8JwX)xP)gH55
zMTkrvRQvi_(f6ZITHM97tsgPC2vHpXOVq&N;0M_lAR+-g1t<Yc=LDm4fFKT<MzQ^x
zlj(#HpT6&(g-&4{C5j;|JR+@&wV;Y9LQ0FpOW4S+4W46hvXovgEoJHv>kT$nRKY=o
z=r0-M+q(TMmo*@T=dYzKECi$SSeeW9a+hf;DG8aG(Qu@oH7yH-W^02~V`bTD@L2A$
z!#=6upQC=*a&q{!fLj4M!$A%JmXguU>2?fXNT2~=JG#D|ZIh$Lt)z~fKNQJPM1=rm
zs<o>-U>O4bq{-=NQNW3mr4S5QPlCySC8~(0Q50JIUboZ8*WtBCagOVitaSg}aXwoe
z`TFIA;fnWN371SvfJLF#7La;>oU>U;hZ>Erve)W;BO)nK`!f+`y!HUtw&Nl#0DG8-
zTr$=zbrx0#>DqEb4jGh)2qV5Q=Yll^_BAl(x)#{!1wK!(h0oc(|9)tP_4|n0xjcsV
zsQIiI_FmRgu(vlOe3`2_17aH3pY`UKUiyx|;Wg{p$(%#=>l?K9FIz8|uB(jV*B-4<
zyw0#=^%VCPEF#SSOBA)Ld9s+j{Ri|QO2wo!OQeRe!`wX$9B+Lz>FwB`i<7t{QVvn-
zUtaL*uzK+dtybh36w(Q67n-#l#%^7XO-+e#&XlW2qN4&khiEM!xqVEXUW%=F4Kp)S
zQ(bJ{VvX8pqq~LUrHtM_4O^>M0`Qby-JJn*Qk2BI^?nYgw4YfxGcrFA!i=($W}2V#
zQw6M|p(}Y^?K=t(h$@cozT@eSi6SI^sjj<UjR&2A#tJvzJ4lf2Z)m(rh?Z9HVdW<P
zK-RiLLpk6AVw~LU6j24%vP`foBYrLJleQu*Kq}Oqjqn0qv0p&892$}V7Zq99*yQEq
ziT#13mm6>JA8Ww{-&956L7T}2cB2ziOI1!FRg7eWJcFNc8(aM8TDwHVI|Qu+V`zRC
zuid`=XeM<UJ~fr+6c_z-1pySRguyts)|tL7yg4<p%&e^MWO~=MB&&E?*9aukYt;;1
z7k6;?1D9_!rKQJ(-de^)Ca%?P=neauEh0r^l38zL2s|cuoyKJF!HDyPo(7L@pD<e1
zId_JIwbvSB>YzSR-E?NX%>Y7jINj=Zuj}(QFj%i<J`b>=yuU{g+&pPp6!|KdNM*8@
zX+DR`yY9og+{Rhpy-`%p`Y~9HJyrugY0u8?08wyf?y5~Z9`fBrNaMLLOIJU<yVss?
z>tNH9`JwZJb{9I-G)SKR0++e<nnJ7As$=s+pRgy_`rD>2gJgC$n=C0hq99;KqobwG
zY;H~kEX@^Pr|D%Tx3>CY%w!9&fl9+S+t66r%b~}yu{i&Qj7PLWh~4P2fOaNN>*Pj(
zvIBGUVV`q1ujB5wCjs|wCnp_wD{Fq|P|H6!Idpisvc%(_6v6_CwSW_tAM%`XeDLlY
zu+*0uosG@R&cbcI{95yJc9SE(^kKBp1uSxzsk@cLv2Iz3@AxK8IyGZs`o&u-<C2q!
zQ6XGK`e({39f&A;P>&9v{_5&Ru<)+9A2nU?T-sJ04lcSq1R;*GTLvkzzE}wE%olhd
zQc>-YdHE$}rUwPij~3`aZA#L<o!#cL>q)ooJ*llPv}N|e5sNpKgoMLttpoA(J62ZK
z^^yoqq!YBS(If%Jiq$TMUz~JkC@K902Be&H#1&&L)ZYWXi;=wmI8-VQJ^EUzMj<Op
zCsk3|g{00e_WjrkNqcn7ZMVybc|smwlt~uFIJZO^Ge+F^F0@19Dyp(Fh8PHdPUEuO
zDY_Bflgw`U$Bis1tBh$X{S};YrS|mdsN@lc4s|^wDmpq^W6^`dzOY{=e7kzyN-48b
z%Tn07mWX3SVZ?JPEg9EKUpbd00H$QzOH)D<xz+X636UsiuRho3U(1a@Hx@>j9Jzfp
zT>XTyebQSGL?I=qzh>GWcHifoTY;t6=wJM2#xV`erUgxB;)*8WUb<=;R;DB;Z_y#C
zlm0cEbfLqq8~!m_EFLE2frd>}*f@L8X8?>Hfs3T$WqY};J0OY)ya;$TFhKr;9aGz?
zF%@wBy+62ECpCY@Q2e6$>+nIUdLyuI&vP(CJg+Dgh)5JwiT&3g<d4$BB>Jyw2+0wu
zoo+SXA^NWei0R`-|9=lv_s#8p{^pMq>Hk^y-B1VvKUgq0{~wpm_ua;bJc~(W>sJK-
z`S$BRd1+nj)o%gUZd9$09ddzw{Qr1qQX>uTDnk!o4ebF%MQ}7Ow83P^e}H%Av{BF*
z+5fKdfAcbxGL-gV`vBYxZOE@9*~w=c9UIgf(}7==6|LzLF+pPXb0t<^zu-d3M<Nju
zQ}T%J+B$#0yPt{#Xy(9(Ia1Qh*@lvobzb@z(S8GrG<hHcLZJIuu*AIYr6iei3S@gC
zPB?HlI;;}%vIgC!fRjdPoDHo>N392UN6dGXE~0tfAB#wgvon6!LeYsbq|~w^gEl$K
zAsZubNSkdsBHO~aF}1ki&U)#0Az<ytZEx?g0idL*yjO4I^--bqfru9G=hM}3^H_bB
z;KjrA^BWl$BFc~818M(@4NVGwKnEO93b;<PW_(;D?Q3tm0qzas90xV9Z)7O1!0i=)
zW#3Uz!A}BgYSO#fs4I;`O5mZ=)0La&?~yeNdFbR=Pyy4x_yuiV7O>w|P=%LewWH;M
zgYYnu5sHk`Q+)k{Va@IQWA$45AQ%GerxQwa8U}KyzXjwbk9<0YrFFKLU9xEr@(ObZ
zsj2A+=@U6*lsl@;j;ELxh^p`m2X$oFuubjEzxh5L<=-45J|(hWt&nMzsSc>RSqkw!
zI@VHJR${8F#(Cdeo=lf{#bJ~@VU7yiy@v=x?vKR<Uj}n`y<7+O<POZN_1f{!GG4pn
zhdcD+jnK9oGr?5|3iEy74qVVKdMdyh`BREVoK|HB_BxK<nBP7K$YpScgTY*Bmmn$q
zM(fQ7=P5Tnw`kwy)<POZ_04YAx15`RhXw}c<z~5mtf!#F9&-x2(9wiD`J>e6DZGdo
zTy^|z;*CW_Lbe^J$EgrI-3y*zF@c9HHM{w1;bS;jTD%-};JwsG6u)Zg`o8)Qo8x<p
z$Dek`J-zCeuG}TjV;EQ!k2%D=X~z}7{B$RGdyCkG9>9G9gTgeES=%c~0_{W=%7Y@;
zLP$HvEg)Dn-9+3!D7^^9>+!_52>Hz-?3-<aN8X0#JiHYnBibq}SbOq$NIAzq{UR5-
z*Ni?JOLkjWloYKVi6}2i<^vGQDBxIsNAC7Kk7_gQO)&TmBurmCBlUfl^&OT^zj;+s
zQo;rtpb#sH+ncPHIvj(B&(8+b27qA5op`6lDbxkvPQVK;n48zwKQKg%i;jaHWIsoi
zYn;!*Auux5{-#3#Q|1qrGj~e_gh%_e_Rlu;25&i+H3lX&e&yyi2K!S^{{Q%Eig0TW
zH3v&~ZZ-bcY;?VbYgF_`5Vy)8O|I-UDf9)cnIs_<HoU_%)2~iyOGe}`@<JGF?h%t$
zza77d--hCl@qGUgXkk7_#^fO{di{9iD`{SxQb~eB+b8#y_=5$%L&yj|7glAAZf#&x
z`FGRAddE<Ul_vyG-Fx=PVqb-W<4)9{JV&}}v*|_6I~a(%PgJk#jo5qEK72w{?qy-O
z0{{2{ve?((O*F-wL}+PQcH+6S2m5gaZ>U)>c|c2=kI!ANA+4q>XTRy4mV-fumec4A
zb1JJtc^cv^d5&-wCp-{nT>Kq&$N^Eey^J<V;P+)4D2?FFD}Zzd%Br%W;`hNl!>7lG
zKSyw^mg=LP?nj?e=Tp3E=Cj%&(yYup=jHx*8tmWV$#+vTeVGZcBxh%!^xMi9Jfle2
zZR`PzDDF4g3Eb|d@5m0x*ji2y!rLCun48y(o?5*DN4kTfBc1LSnehq3rM<n}U%!4v
zM-Lny6Z+1%etXS-hFaFzNFbU9xh`mnATA>)>-C#Wm@-PAg2?gU^K!0BCVBj><v(ft
zEfVRj^hFKBt<u#lP}hEt{PH%2J}9v~X$lY^9HN`~*>#&w?j%mhJzH>eGbCptuc~R>
zlY!-OcWkrt84>{yEH^QwuoPN9f3rz?-m)vcE4C`w+Ix(;QCL#ys`M_Fx#c{@x{XW;
z3e{2oHg~}AL4I9+(9@Oe(=cPV!Q<n}VnboypHR#D&>1L5x4HT>ihO$K(>^|%ZeqtL
zGTTm==C_$j6nbn58!uWx_g>Kqdq32Tp1;F*IpnoM+`N)pWn~mi)^oa7R@4Ez*Z@2>
z9-Ngq28blgV<f&Mc3W#HggJ~XK7>7yh6sz}z4AD_<iCFL3t5W$$8Q>Z;br@>NJ+{)
z1KCUe{K8Dm5he>?+&9`|GFh>RCnhdlyzXO?J{80|-s(xw;zsr%^nPY)n(ATI*M;9H
zZEmT7Z>s;pJjk6cFbatTI4uC20IC`l7?ciY27vQit2eK_H<S+ly~d~U4GMBVoDm^b
zZz6kfef2x57@WKh{&*>);w9;9g2t;wv(H>q8uCjKnwGlq4x^F4c6gdIgki{2z7_=8
zGrrhwa@+frpm<3CJB)3~hVyF4li4K*AlCx{-Io#z*iY@*{ftS2>|PV*zj!{9$}KyX
z5;S)e<n49MEHK2oVt@3XPp4mZ8toID3OlEAct&H|hmLw{3`<vbWj(ASx0Y5(=*&ib
zsVV34H|3s)CV(%lEFx`@s~aaFRV_P6Oa3emMBu!rE0_}9G=!H@V5@8W3L5X`l2Vw~
z?+rNAA}SBrX4SQrFMC|T$I5k8al=i?^C||a*d<n6gS>lZ9>=%Ig<n&-I6E$#t9$sw
z?en8Xo8W6XC$-6nL~5tk%XG<@Ns}#0JQv8mRW0G5X&tk@^JJkfMm9&WvbD+M>4)g(
zEuyXv?|WI!Pd;jN!uil~t@xy-?iv&ze?DfTrmn4)@wt^jiQBdTAL(_@!q6ucEX?Ba
zQ&%Sa?$2k-s&1HV@-CSZPS?qpC-Ru6qgA^!G|ZgL!_2w7E*1?+E}A#OC34E*_rI<*
zl6_>iT`V|LR~A7j8FU$6(l*$(u8Wi<;Tf%jEVs&P)TxU)I<hOkm!w%0v<dLde|Z-|
zj+}|p{!(Rn#GE!rp6`a(+9<UA7taTo_Ls|ia{BK>i+{Y2wF@?ZN3jdL%<SP?lUgDH
zxgX93LI00$sV)yk(C0Fpx$T7K<KvUH=ZP(H`CYMx`Gx=NJ<p|iN*)NZ{!AkHP=Qti
z;4(x-MgO?m0Xfg-p-As6?Z^ueP_6*w4{$6mxow6+-M^_vk!}2OOo8{GbClPba<<CW
zsNBKk<{JS^R7yecv?b28&L5A^HSFu$oWKci%Ll73{QU}=wM9fl$i-Qcg0gqCL$*<A
z@yQNUx(2})i3H5LL+Q};%|H@-C2f^14Bu-wa<?bA_u6i7c@_Xx?ws4D1xR|%6*n|S
zu;W&r!56I+V}J>WUG`%AH5fm<WRz~BF`$PC1LqOl+8FeTVSv=zyppEx(k_=A;_-SO
zwd%u8s|1*H3JkxBw*-dseu=K)fUsy<CE^M?v$Id(%_y@8OUC!IDpn-dY#*BGG&O!D
z<K@jSoBLyDDOu)un>WJkpWxJnCmLJBhON(D9sxevTg$b>x_6$MnyRR2MH)!>5M>Nl
zdE$l2O1)9b@}qh;7>}tausMic6AKgZMhMJ=Lkyr(N$(LnJ>89$51UVde7?F~Y_w+m
zTutRd1&4nMk{kJ9WOdh+q6xE~n40=QSw%R^!gArLeL!C+oG}ZD56taVc3yYkimF2n
z8Tew3`Uz{hSV!kWRNagmOkf}cdt0HtICVzO_dRGIR*9{K2ag9AfD~eoO^<-3^UJ$S
z?w0Je(4a>9nj4a6jbCA9`;JHzH^{#SDfM^0p#cw_3ke521Ab)g>a3SH7sR?)hhLVT
zJ@mc@mKs7auqz{x$C$oFKw+oDkX7GayLbq&UFq&SM1Rha+SIQjq(5z+-B0U1;T^e;
zdS2ghwvO!X(yrSj+Il^Z012!!0OeH><Y2WeL(8Uts<!^Shw9?n*5w0pi*N5pG@wPl
z8d(}j!I=eN{@w3pRZlqTDQ^5<37gae@4L&pxLi)}^w+An*zu5FV{mMi&%0g3sqglU
zLeo@LNx3I_vH=It0?c+z(Cu4}c*KU3v}mYE{ln!VfVijt{j0NE8VKB3T5av%QW(Ko
zvu&#tRl)fpSXoLTgPdnG6MFTeL;SsY+Jt3|$KYZL%n0(E+~uQe4r|Vp%Z5j54}wN*
z2M@8}?&@GVzMIuRP0VOoso~k(LyXaD*!>iNtZ$p=Mmn`GP09A)T>HH9z`>Hj;Y-?(
zfOi@vw*T6BUNxq@Uu=y}V|T{Y6|&6(e*+WhBPgCLs^o`O=+pCizYVM=ZM}eP&aKpv
z|EiDvuJALgTBXv#CzSDm9hH9|o0PzX)m-+q8ZK^k`BJ!g4cV=E>Q>sk#GPolFfsAT
zv>K3jM`ljv*59SPs-9F*6NOKcgbHQ01XO}U>dYn1;3i*ocYRS6dCsDMhnKJOEBk=D
zF&wvXQQp9{;e#xT5r^sAL9@#)p?h7NLj4;*svFKsq6N{R`M44cW@{gs3(R?+255_R
zO)XbNrG%c|Yu__YU*WSyQ=lk7(rlYzUO(;j>I>P*Gt-sg{y9|)1^~0iIj!LBdgS%i
zs&91DQEN)4khGf|LwOlJ@5|Mxac#h4-sD~WJeV7S{&;ep{_<@zy!>UHN7SJUuOg$=
z8_YF%ayLQgkPxo<>HeJ8KCw>^s|o%6{p;<I-sk6+c1OG`{cB@ydU<*5%<6$NPH>_I
zZpKKi$tgeXz1R+gND`1ataYSil_DFw&Y1Sq<$YZ)0*4Qlc01q{bmiPNr@1F8=|S0*
zuOj;!onhwl72%E3IC0|Lc^<W%{BC^xWRE&CV`|epwN@u%n0GesajaGv#(CPj$Y29T
zvp&VB@&^kbM+U&FX)PN~vp6uh-?DgYWhMF5ioP9@k(WaWQkrNUwExG@!eQvWd}{;m
zb2*Y{9s?0A7s3F4-#-iodG$afymT=RBQ>*L74cfm?J_nRzXhyF{2}b}?ZF~+Ou^*?
zj&K-H%eEGdt3S>nJc%g60TD4P=8kSA#obO;0E|w?PmHC7Ag7#W_eS@4!6IP+y{<Bh
z@dGcd*>a-;;K3`D!X|R86&`dlKX;om<kz=!i**=Ss9UcHl$>iW!l&1V?GSVH;ONz*
z?d)4D48@aK6|eKf<m`mP#$*=g+eH*rETfIMx|U7gNl7Ap3US;m$o-fE%!=R;xEN(K
z5ANlJaL;WenTlWPJO6nBC_h#>t*Y7vLCY|hO?+Y;<PI;z_#}ILR>lf$n2-%&_rQrI
z`#bA8$BnL6=_?Ox^4@oJz#&LLoUX2|J(Yhtmyb<IIQwHF8573%!&nI%f5!mMe7ykB
z2uoOKx!5IDE#wd=)s68bF`bEORkh9}&QoU^Nx)t#J^}J&Jgif@=&G}`Q?j&fIEB-3
zckC^2(w3$qsnCKrIS&gYa=owKHbCaO^nor5P|4{T7)Bf0oq9)8x&NHXDQiAOHXAuV
zSy-9<6LuwaD+9o>Xh~>)jLM2VBCpHATKl6ZKI1^|o&$Ec7#$#@-<{J5b+FjpVpO)~
z1<F4@;LA*A78LCAczXHVKZeZ7n7`JQr&JxT!M%M@=`tkwW0g08HHUpj?cXu={4MC?
z!AkTb=y^nLHm$n)&^EgQ{dmQINoWHRWg;SEPy9q8%O2Q!Z-@$#WT{Tp$hO!#vy=)i
z5wvC*4*l}lvfN@?z&ly*#9|tIPaX#~dbdje%P1x`ESxf?9aCT529<T_!NJC}Z1we>
z!=->(MiMIv+{+ngx9L%pS%&vRdX2zcl>n>>L2pa`HRij!#c_7BF$uAij_}2mt*-1l
zB*qfqL~2v0Z$+-Hp!||xie-Fq^EBS}RqM1kbmL9}Z}b;SF{|5}g@E&9)AfFYcxgGy
zQuj_iekF}x5}Vbk%pyNjD!DY3tNHG>Xzn5*ls4M>n@BLGFi6VfQ7a6s&O7?Mzoh)=
zv(<Uu;HU{z2_i9RDx@Upo@<sOsQPh(;Qh;0j}6$;#rW`&eJ@!T&a3RGVDNhBn^ap;
zo|y<hVc_B6p?&{;EAsWN(F)%^HOY+anyU}gwV<Fl^H7C^x%v1-S=%FzXtyXTI%=iG
zBz5au*=jf2`y=4+txX;_J7IVTBuR{qJU>4_NP%|CW#|HH`4xgPwh(4$Hy5A*&$z$l
zbNh+-+Uut|n-m){6*dSHIRGg@=(j7U)m;0Z^Z7eI7A+bWLQ;~>7w-du#0$ZtxsPd<
z1z_;TuLRu}Yv7`tW8R~uXLxbbseJZ7jOiu$($}Wd^$hk-O@@+KQvy(I4KAjg!y+SD
z1vtFmqpjR7Dm+NvdQ8_YA3WRj3b|$U)B)L>#e58a?|C!v`%T{SPNkdxP!!)_b0uz$
z2ZPD_M;`eLrLiYHuagdvBv#kNp3CRt573<IxJOQ*ZAVEeRR6JJCrhw^B3DqQLOq<N
zqztR5W(SwAn=3mRWE6)eVX6F<epm9?k8>0=RFp;hc5Dc@Gx)5>mvpOF9S?iLiL@yi
zSvbHEBn;Y0S-q#0f82~2O5;sn<v07s7It7J2s=w#@my`;yPPuuSb=iWVdCE{N4iS=
zxI##5vdUdwKCdgina}!vI6KRrxSDU>M@Vp&0Kp-+1$TmbaQ6gvcS&$}cPF?H?(Q-{
z2PZfK!5!}A{h#-ob3fcKcUPrSHI<R<?%ln5t>5#kn2AxQPFZbjUNN!$u`K>{K>e*0
zBxEdx?U}tOV>)k6J3^;%8<p5L=N1E?IyekEW1*OUDwm+BwAQct=WF00u8sQ4!y~P&
zoo>w3Ec>Fp23XXiT+8-MaQPuWQ0vcEZ3M*WYscOV1*f%5tNVdp9Qmt-wdAheNTrYx
zJ$LT1;6wB0%{Ew>ID2QV&m*5{zyGZe*Ydf1|L(F8UH5`W9D@cejUPQ_cB3}BH=?b2
z;!<tp$-VSjBpZjGO=qill*oqrK5NBf(P!yY9C9VaiQMkbBW(VbA1wJ?*XJWpM46TC
zWxvdmSVe&seZq`pV6?m8$+(k!-QA4!Pi}?hoq_E8-gLew8T#G*ee=FQ=P3Zy#rpZZ
zQ7TE`g&PM#B=@75K{o);kfOj?w(CU>=-p_uN~c9pC7_Mt??n@ikuFT(b<MIClLG3>
zeGj+nz(2Z|q)^_|3b|`I+3Y(dcBt*l7A2c-vx<0k{sBD{tJ-OprR8fjB~JJ>#4#vq
zl~r?a|M<A0{0-!`I}2DlUgWZ;^Srt$klX<jhH0Y=F;$xSZ;`wD+~dE>DRdMiz@d$j
zZL7jPzw+8lkVR-lKhhmtSSbBKnnF`0DCNpfu&Z93@WK<Kz%Trih!s%!i~3`JbwOHQ
z9xkHk;IHyuU2FyCX_E9=IW2iH@zC}?yk7k>E){z&><z?qI{jM&{YPT`?bP;3J3v0K
zq@eJHkI0pQL`fPW6y|()a(5@)cITt-HS*K?Pr>!Zs%L8fpj57)p^?H{77`|c9n2a4
zE|zyZ`y(}x#s6`L+y96R8ylNmza!%vB94v^1w^s7s{M+8EL$*}_}NWx+U)g4^|q^K
zli6!nl!pujuCdmtjx=Bu0jT#B_SP_<L^3ruH_&i6@A$Bw$O93{;C2j>U%r=Gvj@hD
zX_Pa+ySuyVQhn+2t4twT_gWJp+85eb5}la5VnHz_(Gq&N_ye!Nd)uthX94CuH?k-k
zhOPt`*0Pu+e4-qqfBxH_hm%q`7L$a@*dpCZGkk9w>j?N)5ObMlxa1W3>4~1eg2m+)
z@KU{DDnCOh*Z&OXd)-z&6Ul)yh1L3V!+ITiYK=#KRaNcon`W7G_q-Eu$TLsl4a<-B
z<HV0V+cNbX8+|@yd69ed_xEGEc&OO_+O(sz18xw9)xsB5Rn@uh@ANpmY(mnO3ZHtJ
zB`Gif6v5$WVH)q#;!=MTo?c?%uU|18b?v|B=am%{B=y%`6}Pr<d4huH^>~L4X4Svr
zQkr^BF!S&TgKd4rhn1<|gL|A@T^tIwnLF=P$$`9}JF#G*^z`g(f4Xf)>b2{gHtO`u
z?bYpTCuiqd9~c0x`)TX;T3y;whVJop1xrio{(R|ps?hB`pn}9Bq$a@tLp*3VJ^@j)
z;oG~}VOFG$yYC0m5;xEW#L&nnbPS$K1ja9thH}bwy`{i3g3Ey)Kd&wJhht^a8_M#H
zR<6DPkLjJinzba#v0L?|p<^(1aZXrFBsEcmE2VQbQ4OZ1M>BJ2rY)=oNaC0IO9niW
z05yMd3z%0(P!Qw-89Tz;&&tSH!c)`JLM*9&4jR-Qw_t4xa&o$;3gq6sJd0VV9v&V#
ze%9O+NO2`tp`vj$HMjr?g%lmZ!o?*kf1<gx#5?Vr30^5Sy=Y@hi-WGW99C{sG)5`v
z=m72^bhl5+o=q-~o-r5$gWmxp$bN6icJJ`8*kX>}XV;r}z5j#$pVDSWF7Qg^lx$us
zT&$f>@;BV~04o9jMzwCI-x$?ZR8;IP_7ry}vnPj!;9fNU0PwaHjTx#kv$oV@aEo9;
zx2AVJ#1g8pLi|pn<aa?(Nn-VuZ|2UfZB{`}UczcTxl;qNu>R+8LEFP`LmBdh)K=Sc
zIB&+W%(&Fhb2k<GHxkff`lO1;`U+7fLt-X0loYs&BT(0T5DT~aNhpe=2sZ_NXNSte
zIN>a}u*50yx0th#FgX#Xdljz(6?cYfUsi{UxzSU%4BhAYaNyBGX9zj#C4PtjP6CjI
z2rihSoSYxW$2KoVNVRf}?)c}E__1`(Xg@zcNBlbBm)XAm<NVuhL5x$8D47&(Vh=NN
zL_+tC+t_#jD;Q4qC>;pEnjf#^9(Fi8HxkvK{6%Re&WvUD4-WF03Sx*Kd_6Tl4}`!S
zQ`Aurwzr3;AqVIW-4v6s9=ilT$%J9?$|Jy>1i+N8u3P|WL!;hoy1;g5a8fH!y5584
zJTzv{vY-Z$I&-iEo81Y-Hp7mDR_I}l9ZIB8lNU25Ldfik+)zKmqA?K`j<yZ>2$kzJ
z$MpuIDr;#;>*}ub@ptfQo7FSE&znsU8Mv$<opB855Y2E~ZlSWYuq>%KDk!v1*{EX>
zovWx8S3b1eo;t1TgL*S$qQ;66N6w9ZUv0tu?H2W+LQgu;`JCE{UljISQyH;>!9Stu
zm+{VVmJMD>g}5u5GHh;ag4n~^9#E=V6V-Hw$5s{Gc(k;1ZzmT&QRQT*@?p0x$xjX1
z?oax`_9f*<$v;CIGbL?q!|r|^XAvYZfq~Gy*CfRkn^%|bKNG72OzAYeu#mAW6?NF1
zJ#-UQNuG%>#^Vip@31onag7&iw_Pk~<X*;yrfdONW|psq@7<sc^SFd~+b=UWT>pXW
z1ri5bh>k%}DAa2MQU4_v19CUy0F8I$95u$-`k&QXs9sLF1qQ+_t0X=mCz2_RC&`+b
zbyrKZ7-XoRs@i{dIS&Y0g;r+ExL3U27Z~lw89TW+ooavdNmti<MCIY-U3gxO#w8}s
z%`1;6Jy=XgP6D`kA#=^efI&P0f&xH3tU*7p)L?lo&^hCNsG<1wv4T*vbgrhTD0@zX
z-|4DxW{_{LqO2y(^gSX?Zt&M1aTvHq#n~{iXW<{h023#GDfw1|3n1Jo>gu~s4AB(7
z^je~pMgY@|_oRn+ccHI7ozK@4)y5}@_+KbXePSQ0BqCMn=piIqaXi;BUE$*)Q!Uq4
z7V$kK_29WThx)r8&MEpkxAkD`)z}byLYi4a4VAo&c#0`ZND&S$Aj$fTmS+4q6j7*&
zSy&ZHyO~e;u#p+=zUP{JKJLpupij&esxnSW6pmioU<YPHmwG$SW~C2$*#~d8zIQ%r
zy7=77cs+qH$Ep~+MB}jfCB0wq7vvxE1krS3C8$rrrc$U($vZc9r{u;mlRcb2-=Q3?
zwr9<jscXB3QQ?`(zl<r#r;qDT_b0nR!Titf66J>{D&Opv2iPAL)d4KW`Pp;M>T7-0
zI$*`N^(Qo5WwLZ9@Ppp^OJJCNzr4GAM6T>k`LagpO*HLMK!({cB5~{h>DcMrVU^>}
zI5`p$@G%3C85Wk`y}Ss(vWi+dqVD#ePc&KrM#2ziY3WMJOACN!($8!<V6dd3qOhU@
zS$BQ~y@FEM7>YkPt7RJ*$#AZbHrRv`h>mL|2Z(7dkXUd-?P`2Rx3;#NTwUvcBV$1V
zfq+*^Pmgd|SeVJvdSXL4aKC{!0=wf*Y)*!Q2QERxn41un=_+3o!AG*JjM1s4FJO92
z9!6QEAPNBiX<Fl{IsTsg3G}a-cr`3*5z)f5fuWC-R?@<x{x^1lj=N)OFFULB!W}FG
zH@g4!+*Y7_xz-*b-%$J;e$_)u@M-5g&IaI0!iN6CynvdC!~Ley_S<nevv>Xq-zn!>
zUgeWV$C+S9m?18Rhx}zD;-g}3&B=Ks2M+1~hJ=Kopr<zx+beOSx>W`66>u<)yA#{;
z0{2uem^N@~^*L<x8Ku(uBUAsf%&Jh_zd^S)P55<K*&e0B(!Y^}6C@Gzc^oT~uvi1+
z1n+2~s;sFhrl<%HJd<;1Rqx)3l94(wWHhV+_;+LcPqc3{Mbv8_3m_D4rw@9%epDQo
z*QaacsW4R(#tHF6QT-~dD6p&c-wLI*FkSaa+*W|L&!<Zl0xKpup!H`MqZ~2RQpU(V
zbt5;eKrG^0zuVg%I)%cRMti0evZOWDp6GpQP~~Ui;Ft-VrB~I4_a_{bQkhlK+*=+D
zt-AKIhY-3toVaEgtTDZJTVoHGq8xY?D)mlS(4P%ch2hth#GuD*zka6CmpO%+zZMvw
zxacrNY+s~>({k>o%CHK97B6D8|Jlnikb2iUpHFw2oxz!GkMoBS5fNko1G>3rr$z`z
zF!5@vzoe`#kWN(s>^2DE21xX8N4DCogPunZ*lp9)T(5rMU}Fc<qMT#52cRJ#Bj>_L
z#>HVg-C6pM16%Cc-A*Idw1*!=(1SPHYahKu-W9Md=>-;-x|yqO>GYzPbyZemz5?e9
zjhw8ql1b7x+#pM0JUl%6d)zUu&UW11((9|MI}c**QA(xFD<d0Q+uenl?`l-xk_kO|
z!oW7aAsL`R9YHh$gj8lN>@5kE=H)sKBd!?$ySxN}Ftt+rWoKvq`P!#Y_v99Z9I4uO
z4fXcy!&6F2q2i8;g+Y;|QkUz;sA+vAiFyYjvcxXgh<phIN&LAX;5=0`O~EW6TSBnq
z`vjd|a5`jAe{fW^=W5_`Lhvo#%#?-ag+Rs+BcH#1^ZKzFxA=RuGg+ZNBrMFKC$@Tg
z_)`mx5-{JHPk<f$dSWON;CnBwt{ecXIIV~E=*H9K^U2ddCa<6JK4<aAps$EwfB%@f
ziu;UFEWRuSUpY5Vxz?Vp8k+%kIOqa+(G3i%*<gWPXIiYCygQygxY-|GqJ91qILp&8
zF>MR#`GmHfwA`QJtLb_u%QYKmFO=xMODn1~m=@ld$P72c?I5l`--7*uX(qfNf?-O>
z38Z+-M@UwaSu5)g`F-Dg9%g9tNk}X^xOwV4E-JpKz{kLh9KZI8DWL9(dDCVQQAbZu
zqfl!wVRgLfMRlS9ib#khD+qp>LSy>-T_b`S(nT}I`7x64Y1a2K8qK<cg9AbV8s`(&
z=+Tji3Mzg?ptN)mQbN+e#7l7mRU#mY^q}{Et4WBvyYuK$GH}-2b@aXC7I^F`)@*aL
zS2KBEtar5}=9gfF9gOhd4N%9`@qN5hQBk|g3T%9P64)h1y12@T_%1N~oo-`7ukon*
zSwGWb|HVVjMNCT#g0f!`<n7R2ysb81nuo1=P((9^+l?~fvT;-RfnI|-|E()EwJa<U
z#vb~f2UvapGNF^T;W~2^+Cu+chAp|~O9d|IVzt;<|6WBQbW4nRIsabFD@_GQWWz=d
z1E@0#3%{~jdc=amMBV{E7=acAo6%OstaV6~k0(KX>DPI8;MZ;7otp|m{keXAVIqNa
zABgX!f`Ma6ae3RaE~oO_XW72|L|xH;zkj3lhk2UU)y8DW5gEdNU*LD9Uf97ZsK}`C
z(nUu?*vJ^6eHTQ)ES*#sds6tac%+nfMJ30N0;muEa|M><`%;VlYKmK|qoYCT$Ho7O
zx>zX*0s_YWTs_<*Vj*S}FaaT=B4{#b>i=^GHXME?V9<O51m0;y+oK$^*LCLjDKmWu
zJN1ODqG4`i?+PUQl<|Cl6VHELZt0j-z06XDN+2o-8KgvI=Ir~&pnFc5?Rvt-dM?pt
zGeQ1*AQOZ&toH9an)m?9c^L4F1eRE{wD*#1$OXTtX=(eIWhpSs(-?1w0G=_gZL=+!
zkhatal!?d8J|{28(?YiR-}l4Tl^(E7OxE)Vt@AcLfBGus{?2h{jQiv}>h(noZDm0%
z+$bXkt;2A`|9+1)y+-wqr6n!0*pLdNV$y&w(xGT%mhEVM8uTuDgNzpoVsO~Xn)uGo
z99tCH$SbAH@k6eESb$*#M)hUFt28-n{&n~{&lq>f>D-IGTA5-Y21NfaBl{9pAS8b!
z(7S@sS$P8tL14JQGL^hx+WR2G!X%b4r&1d8v=k*WxlmC*$VWXtG`Q-WH*9hwY{+tO
z0hCimQf6uFA0|u<Ib**uZTWy)sJiY<t0c3_hHm&+(Vm{6{zdZ$*YVD%q5~cq<`|%P
z_>D#X-MYUvTijuutV3K$&wPPHCt6<DtdpK-ZMM&MW0dy5Z=g#tLe1a?j1?roU2K`n
z`>EQuNQL#Zn7$s^t!P+jx+P{V{W(92NCTp#*eu(NepV;*Lm&;Ix<3%~UuU&aV12kS
z4B@k6Ep|YD(C%_=7bwWt);V|T-=tY)rTzF>QI5Q?e!1U{tK6pqA^B6rhA%SkH8X&3
zA6T_$R4m-$J`8S9c@NDjT*p$t4=P)PWi~^(nD#|7*vNCJVTd9bZ#!<R4(Z&QmWtul
zZ&cuCjGjZJr{9~`Ga|M80op?srslp$$EN$05(oiyb8gR+=$eH|V?J9cd$j=#RJ&!j
z6o@j(g&4M%AL{ksa((y^5Nu)NGG!^5hJLoeK-jGEpks2FG{}v@!_h|C0a_{e!to?f
z=NZx!jDUJNQuBF=H2r-$_{MB3J)}H_SNkf=EUx_&0lH46f83mCNm5UB2mfYUy617v
zbl9#UQ07<0Vy=+hA1XagU|~7L9I2$4wZ><gY5UWqJgtG`d;*iCY8%+5=lHXo!>xEI
zwByONhjDJOp(Jsc_qseyuTs+5*0KBqwwJDJnfNKR;l7+>+5}t4Fl;$$8KB$1Qd_pG
z-i#a}#_kK=Ck@v;!esCf`(<V}&U-MfUQRfsP7rhglYcij)Xiy6xFlc(&wP-XIWnO&
zLk$GZKmQ|NYyD1JI^F8f<u$F)0UW8dv9{KlbDE|%`-l<6{X-}y#Yw%Vx6Jsjt0Pt=
zWAg;bYHFbU6AXlMfP2U2fG-Y_;YR)=%Hsi=6nQAzJ`llAyMlt_MwISaTW>EdVfVSO
zEID*qvy#`i2JGmAxIKa*Pwp93xmd*|_Xun~QaivEURUx@At%S4LB2Pu0y~ooy9(eR
zw9Z&(6pQ=a=qyxK)}qp*EOAfB#n@)ChRD-SmX$J-rsidf9zmrQa$jnp*Oux!N!%kG
z_KbZzt~4}!43Q{86CfYBfZwmcjE8MT+A?&%XVmHfgX%+@u#$vr;9t$;yZK|ysC8s2
zF{;1jj7@;<Z79cSywTTNCR_2D{+qM`){`)uZ6%5wV*_LiK(f^i5RtqrJge=VC1qvg
zv64-1?O=@U6hJtEqlB2Jdx$0<hA9_l)TdpBK-)qW@mBk!ae5y^#46<i%uD7N7n80`
zL-~`huFG!=l48H8dHIz7jHVuaz$Pve{!2}THzJXiJSsICO<&6p;B7lI@-@xOGhOj5
zzM}W#SG%p!drtR#4(q7mfzNVM8mzG<aq3U!$zJP4>D080<Tx@8E?nL6C~eZ$b`h)H
zuk&_riJug>N0XU0kM>!Y+fT*C?|C&8ShE`}=l@3acdn<oRw#ao5`Ln9P%f0HjOboz
z0*OZ}i1cm^yfzGkbP1)Ig8>`D#_kksaQH?}YgDNb#Q6yX&>?5;?TfO%zTJn7!-q?x
z+V1b2E4|e$ZII6eh1O+TS?<S4FZDrcLM3I)Vu^S|>u0UYBBUYWUf9v{<5#8g@d=(;
z^MQ`J3#lU@*K~tfPY+3s*P;T6(z%B`FA|;W6<1>52nfh@?C+tC=NDjk0P4k$8>VQf
zEF-S>6Q&$K#%p4BL7%7H{ItM0{nh<p5u+e~*)24G2oz@4B2&O_UbY~RSK)6$14%+S
zcEX(@Nj9d4F>@qxsQ61Q#PV#rKpWn8ft{r_ss9R5a6j>BOAF#L+!!p1XimqAvT>!t
z#q!9x#uv{AnWX)YI-#`2B#T-qHNE7L5r}9xO>WrpE|6Xigx@=b%LN%6+Jh^eK$=>e
z9sj!r*ZcT3q>uX96w2G|(R<IevNFy-TNj!RABGU#?7U?ik;y;0lt|}5Q1KIbiCQ=R
z*cO^8$GZT>cCs|4jCfuBeM?r~p0$-ju)l|Y&c65^GGuYt1=SNYS2A-!5W|8Lu2ZaZ
zRozJwp;DA)-9(#zDHBhW9y}Ost#yS4{yim&totE_qh_wqnmD#+#*5Gx^0d-|4?|Q7
zWk3i-G78#U4(nTIk@tXeiJ4rY9FMYKDA-BbeKSrr16Q^^lM9)VskeWZ#MTWu#EG`1
z0Cz$^%?lLHmE?<}us}<CDQV9s^A4Lu<5Dpg+ZfWL{0KuuU%6dOO8{CNQY-}0!aqRq
zZW9Et*;+KsF08Dakf^5;9F)oBQ&C7E0^$><oH*-vv)=vn__KKH!E~qxT47asbhMFW
z%XT}*C*fqXt1ICHIQS$&Z9nlPfxO}RmA=o2@<w>E?sF*I9GF>YW^cls4T6b-bxbwI
zC^b(i^3e9Tc(9{oIs#?OW@olE8|mV6oL_gumiw`-6^+ra-TZD{lSfSRS?McL&J+y~
zn-)g@G8j?3$Gb8x4gAu-HJDBfjdf0|s%^F_>|^Qt!SS{Y_Io!rtIa0ZwM_&S1!+H5
zNiY0ZDm(9Z*v1I3N8;%hS45R{(=z64SNo6owM!r^!GyN+GsaseSHD=UmJ_YC`>(zR
zC7a#z1QknxAp45s&~A=*EtQ7S$hsCOD9r;(cI<4)MwT;_nR=rka`o-~`PySc%QIzg
zw9H~Yn=U3evGsiGCtWEZf35<}x;ZIi(y<FuHf^LSE6k8&Gt(HG;4t1yA>$?KIP;IE
zNzR%u4j8fB+B@4v^#ZAb=~n4$vNVgwhz7J`6c`&XKGOhN^x_B$ED$z%g@x~4>CSW8
zZ^FDNb8k+gea8-F%XANi`gT)n-50v9pw%KZ)`5+6ao)Ko6yE$hU?Yg>$5RYwInf-4
z(43V+g(e{pJ56lMMT})@n*$|P4O~>iq`6OhqIIfbx{*h><19*dp+QSL5+<u<F;8rV
zu1xj;>EoyRHL}gh>tbhzXu5WYr=TgOmFY2EAAD`BWakP@r!<j@#;!=tW0<!<Nlg(f
zkhvg)%QRC&->Tsfd3-DC<p0z`gwo*>b36eq*RB8Y?6TsV5S&-8<<0KsIr+Eq8oDj=
z(e}>)>T16vM6pH7$G<W<Mp}w?g!aur!rP;ji+!iSZ}DKt)?>TG^fX<o)iao2sGOQL
z#G0lL8B*fwR;7Omua#V=WxE0IX`1c=@HisC>w<P~<*tZ7g6199gD73r7oSV5)wYvs
zCRHIWb*3B2m2oR=maN({zV)5?%(*w~PF_w@E;D+d0Ju)$J|s{$kkM6cq6L{->?x5D
z#xa0F=!8Gb4?7vXo$1L<(o|YSwRdWRhv==zs`6OMYM3j&A=+y3XKOLcP%LH56fA+>
zE){5zP?0Pd#aN6p3_gfz!(c!|+ooB%Kp$>=&@XfueIQxaUP!$p7@<>B2#iW6|FQs6
zT|k{(2pIfb!Dntkz=O95I03o?l^!!oOTZKZu=eZ*Eawf?r>`)e22q*v?l;sjSzama
z!G=t{D`!$dLa|5i30B!@(4z8@JvbV0X=JcOkrZe@#&YG;Z~Q1<RQWlTNs0%Ws)DI6
zX^W*UEy=@u6pQ)^9<<r(6O5V%V(;N6A6iwTM~;?8+wt(QRPU5+ZV?}y3{UF9WF_lQ
z7bV}ogXG&|H3^;k;MrhiNBoWsNs~8OBi-g(*CLC|Me_qC!3DdrA3C3AE&1mEVy^Oe
zMD(kwwmmOdh9X4%{ONPWe@(u_s5g|6Cp>YLu`N4~cVRE2+5curIAH<-JnzbL$Te;)
zq0#Us>(!ZM>=wRhZ%f6I`O?8}HY=Ya)wD*Jv){edbtS_hc^?;!HRpk0jD}j6<PX+P
zw;g`Y>U8In^E|NHHseK>yN02jzOIH27n>Q7e>7k3inU&@%Lmr&)O-EOe7EcUtT4}x
zXntST*7Pd{)A-9`d{8On8ef7{ubmYc5hNtv3}Rf6ki_&+d)$RrphYc~ZFsIwtn|~I
zk)j+jVcAhUhnQSC?Tm3j)lYeokTDiX>X>G!hM`l%_i&h%s1xz;`bg(ywmJvmg+@9$
z*iPr57*ulg=vrxA(uS?V^kO;)XfsYw(#q$hhC%lbj{OK3y;&{kRDYFGD^~-P#T1$>
zx7jmU#L)XqR!0|f)6OWrm8q$&L4m8!fcqWp$B*B)1|r-3_8>mocRur)PGoE-XWwDn
zUqQ*S5bOa^WS+<2a#me_Z+fDNul)OAKE&;*B=ATvFr;VuOD&?bFcyUpYq1gJ&tkF3
zz1I@T?bYt+*W^8yL7Z0Qd}Gw^O8RO#jQNUPtU;TfdnzPKW>*~nx_cf<JE1!K?xI<=
z^go~4bPfXL`-jXJooEG4I{fF1GmDV8MD{CQ@$q}S*+J=kU*%2FOT+Th*hne+TM*BQ
zi8y@As5@J37V6Rx5A$@0c%CS^VGC~ym&*kVRa9e~Y$_I(sQdYzV#`-h&6BR>-XVW)
zUZA69vzx&4?PzinkPt1QDH9bn{hY*{s;Vb$|3%`iC6JEWD+lve9c?tfoK?f)^wZK{
zl~J8VI=_A#<>v9)%;Cem{MKJg?O(n<k8fns{EvkR4{Zf{l##1r-x4(65*_TpT%Fl@
zFMS>^`l|7U?!(s{xhkE#ETQo@RRVL%2_C9Ik~r&ytC;#U=po#GL&VJynNM6rI^brK
zN)T6(PZ}s!4^^YxuUF$X;terEgoH5^$Xj3=VIFrmD1VJR(}#<mg@C&iO=7GzoNVfc
z>#KR2dG)LeuLo<k(bdUnCIxj%d5z<O`Yw=+@{Q57<@wi#A-kVC7DeYN0k+E1eL;E#
zg78=4>fu&;qLbB!kqhSDRPY|pb;bDuP#CPdeg=?;wyPz}a^2P>ZpWRb0xjv#BJ-D=
zCjf;0!wv$;>RpN@_hcY1k^H*;AdFe{6KR-;pWXBrJfw(*9|j_dp9(?`wk!5tdeXa^
zTef>#Ud@1*cpO{nU7|RA=WLYrtaWgZStH@9RP9f|i+8Oin7k5-XKJ*bO4zc!5!A+0
z8`6+icXh0|&Q|wWY`$7=#%r2LSZ%)0{q8XpaddC6l!`tEf1G?_q%gEJ$7V`Td8rVx
zx+(zZDfGcUXB4NgpTojssOhTeOIhT;A7^lv>(%(p^eC;KPgtgCs}9GBA)=Mw>IS1a
z+*SD3H*|KVKE>C!-O`SC-m3o4@_L(oB`|jNo+;NSaTnFp?nph`bbEp_EiKJ#sd>0J
zNq#D|d9ru%+@ek$ZzOM{d<g_uQdh>5lk*&!<*c!J94Fwe4%d|@+Ss|A5Kmv&_h}rq
zu51W#L^<MLM}TBfp~%Y)VV65he@{QBS(LKOlBJYdRAxz}NR^F|E!r(H>LJ@6h8b3w
zq1=;F3i4%%pa?Q&O5Y!LN;39f@je&zXit4gZ&=Ne^{nmO%0x<SKe<Tw>r0vXm`YJ3
zYdC_1VaZZxSkc?n_hn>kxPIPq#B*N*?a{a?RTH-9aArGZe-8DjmZm!6I?=P+*n4M<
zWpoDq5Z+WF5AUxLFHUUs<B{nL=fl|T5=9rV4#aK7W@d0d(rsEo0ZidL?t5W4Kvxgc
zn3o+!8QK7w7r>hgkPhyiDF|)UD%4`Wl?wVfQ_JjO6_j`sA<Pu-X1X1CNwWyb6pGJM
zghTeU(G+9@_hG$3wqz{ePrbU9O-<qm*q2{SP%fD`-5|I-;4Y2r1QToe4{1D|)_Z@-
zMCASDpKnUg1ka;BLO^>hY5|hvq`c=5kd9{hTs1vZFg7g^V~=Tkg=^26`gEdlD3#@F
zBbccRZTo&pTd7$W6cy!icYg=>IxRIXujy4uu-OSuubDl%$anufY3a~Z{Bhg1ZUZq=
znM&Pg8q5r@L%CJ2vdHvCz8KB2>U?u5$l+m$yiD)@>IG4t=}GUUTJ*hK`hwF9JQ1WJ
zou4<iqhs~Dosbt*p|dcH%BtV<nn*CW0&+*qX?sPzSO%)`oV+8T_oT}%$_iFLuJ?}n
zSn)XTIpJc8$;)zO?p_PNcXNW6fVkEc>%o^Aw6YWeZjRr1Gl`UOgY?Ha_{oHl;;dcW
zexp^&^|5Fix{PLmVf*zstUhVO73{mv$kHup@fc^qjlqze(;oUEeCljRdH%aI!%N>%
zsK=X{L(y`-XkiXMI_puB78Bo~ca++T3bXz=rHc*8pW<b3&m!=#S+$}8Ct>=*hMnrQ
zPz<g?JGYNyrS57As9bMlcZLCDo|i3Q*?l(?2^IA|YByu;r4P!W;FJAJ!5B!&zbIdc
zZ@OS#NYfz09CLhNZg~A6CpH9p$I3M^6K2>t&!#-=eN#NPht=G8<Bt%Xa}11U6%)@t
zEv~+H$=sNcOV{BY#V?96D*~5WOs*J)7FMBp;yjM-4-QdAb;C<O5PolaS3b$HiDBx;
z%W?PM{xrFMvc6Z+;U~{t_T7*NEXh2bl@fOU{s$61^*C6_Z1V%IxhFGKSbA#s@J6>`
zrCxg&@=5E@(q=@wedxwmDpA}p*BjhuD(;J&bgU4xP_Bdz$qH(p!?SWpmpmkH1m&n`
z5DPVUm<RUjboWXq26=)U2&~C@)6(A5g%o&#PjX6z>-telxxe#k5C*1Ej!12?^_rBg
zU_N9<@}`-kIXw&A%bI?8ISLe2lqzJV#aXvhI0)226&o^1=N;p$%#DYppc6lEQs;zH
zax||H*pOvk7X|$eXrP~Ax=F(_w+u|!7oZo)B=9#1$%!DxJLcW^IHu+%5bk7ZDGx$D
zI*hG6m7lDjXwu`^pn>rB*2Sy+3}oUjb*fT+PmS@D5QA01_aaFZGlXgPPvJyc6>EYf
z%=%004=9vRX%<qQQyd9(b%DsYE%k%GSM1~cbsgZ20@Mw%tAW3rba!t~x4bU$iML?|
zZ(du@SMm>@O@SrEUP3`BJXMf$H&QK1K?Q<&c6xDqq;(;4p(v|dLA6u^TWnDf)(mTk
zT$&Cqjf9tfnWTK~!6hl|=h;y4YmDwcymh<He+%~!NhV%DnNZ$k$Z0xel&-}?<+qbL
z=TUN2ChWy>vbA=E>UCrJ){Tuf?|q(dBdKz7Qs$#G3odu7s;$)Cea|Nsy<i3;_!)c0
zg?R-b4dEZq83VdcNrS`@rz0rP4X1e7q<3#{gIn=wfc92dvPw#-`O?^dG}Mc)7n3qB
zyt5{vafUf&%pU?&v&_=Oq}vGz?e8-+{@hhUh?F?B43(Ch=XEs^Tw)a7D<~=T0NG?9
zUS<OPw)iflM3#M@A9WnZ*#T2^Aoct*<+E@4sN5be=V!-N6)1Skg@vZakZX>qVU>71
zYMsCrh3$hdZj-esExb~VZwnf{#_w&e;(tvmE-fwL5)w8Hry0uI>I2q4bpTuo01&lO
z`6nJssK5)Dk)m&ay4+`Gj;~7ohk_TRHeEmJphxcK&O18J*#6|?xM>3$SKzVIa#6}b
z8hELl2y=S<rUWc}D%kHAlrVc@Dif)}vZ=V@4`J?%>RJRlEvx6WA2MTY_>CY#N)7yk
zeT97^b*A>_$~^AuGf8N<`$>M*7I3U9r{z?q_?<_O<Q|(<IvkV6E>3ShmUav*`&|PC
zQu(no_VA63jW&IhKs2EI#KOh~cn4rlo3UBC?dRo@y%b{F@^ZNaOBN*KQi&cFJ$4w?
zDLv1u<Hsv>H=%fGq-ZNEE6J(`yn+h=HCA?*`Tk`OIa;}=UwaDnHJEIC4psL(C5!c=
z&Xo)RK2R2HM4gp$a`Xz@BjFZ1ajb$~jAB5OqbkUFw5sUp;JW&k4dLv0GPCD2?NV#d
zOCfgbV-duDfi>#KhP<N%zMdHGc3ncs)t`@1{NHn!V5?AlZfnUFUh$u*yLqqE(V`T;
z7QCB|2AWo_ZkQkr2gDoqm6^G^xSW;9dxsG}{SAH@aW+m)pn_kb66V@|sQY4yuDlIY
z>FMx4OvGohJGn<~j6o@6-Il>Vu>N)u)Yqx#Z&F-*eV>hQrvP{0xAXeu^PU}&{olsu
zm`DYtMCKQ`PAA~%%1mBAs!U`_2p?Qz?o+Z8k@HyMm`+5Iknt3r_oOHal~;$vc92TT
zP;3Vp8aZ(|&#zSg<xRt<?L4acSf?O`NlD8CYRKH*gQ9dQNR5^z4mwqTNs#%0OR)o8
zS-k&TtSRH@?hHqVe*XrW0np%p@9_fsvMz4`mVAI$!2a;@pK+GWPfPNEGx*D&S7}9t
zxbH77FZs^LSb-{tMj}v$tuizFaAB4eMRRP1uxh+k&@56?>^TT)wY#F<@rO1sudFPb
zbIptO<m94}D6jAwdT!9#(&8oPmzzrp(17Wai8D(x(!M^Nfk|^uZ6IDJ_|-O7y=z9B
zhbh?R?K$n{$BA(rZ|M7$;6Yr(57kXiJT?#qV&eAm@ATT|j4Avd>P$YrtxIB6X-KKb
zqaKFCN=Q^tqrm-m^v6m4W4nmb3oP*<1v351urI@p&ldC}*bO4xU|7uWteojF@Ui;n
zQ+#n3K~!(F_WCI7nczv5um1_LioF|mVlYrJX=&lf^1jlvu(bRv2Ue{o{Py^C-I@L3
z4O9-q4c8s>wR>Foyg|K&z$An&HN1H4zEp>dSV~5KvWz+#V@ez}Vj*zl&mTFuZ6o*^
z0bZ}gba<F#C&c6*mWzLQQ32;J85u+XOZsWMn2bnEOZ&2507#{&kx{_Lh9Th1#{wM;
z6{X#`wKlBwde@L>TjhCi7fUV)roe~-Bv@fn&a@WEO8TvFesK;xDPt`b0$aUrN#ZGf
za*<+~An8Vt1_;?xz=&svvWWLcPS36W0~V=hfT);isffKzDt$ShJ3^iK7JH;SO?gsz
zWa%%p5M(`JT+F}fFh+gau<Q&F+x~m%p+cb7y=_R1MV2b7q^>^r^mq@n*wZ$%wssB$
zCB(g$5CfU}w}03DQO^KPK(i5Fs%$Ob+W`0_4(5r4QxaS%{xer_<M><2yndn>7cOHG
zeS@;uep~AOW8o5qirjg-^l2C1`*yy4Q|tg7?`msVfNDCRWitet$i;V%5(`>7e+yS*
zG8RC`@Q!42d0lv}(U=!Bkt9x!Xp?YIs7m2s&>tqOh3ee(!2WwidenfMj!`(_13=<A
zY)hjM3&@(A(*QMH%;M++tK8{ROo=j@;D|$Qk%C<`?@+GOCTID%-*ZaZi&8RM%)O@C
zA?4bJk-`gWBe`3qp^$qm9%8ak0sM;e!8T{QU#A32TI~t6hdYW39w8_@bwxM;YDA;2
zI4Zl+UK)lGP(uFc;^LAygE_@<76XS-qkHj5?+(^ODk9n+E}lhJmb`y&fw{0S&@7j1
z;4WCIA34w1u-@z)RaEquns(JoMNfHs!G+3(DnE`FH!0h!l>>t+kQk$c+c@7O@|}U7
z38p1YAeD?Vhu-0j2KDaiG=od4g<6-*^P^kNoAXKSQJGGJ>$g-L2&fMTH{LgcP&+4B
zFDPV=<GLLV`iw*jLFsHmyy4M7^?FvlSy=hS)dn*v0;Kr>oVi@DJq-}&H_xF<6s|Vf
z61y(j!zxJw<GAZX1&qDE{$#YzMLrF>)yq1rB7NngXf;mx`%1@*N0=48D5^+`Gcx^s
zN|DJh3*N0zjZ}llb<RB7N?lc`)YbYr39z#FeXAjG=k-_Qu_dIl$mwkGmz?F9`+WiS
z_!T_yq;{7w*y7Btc0Oi6`sqT0{5&zC%RumvA|ye-O@V-bfC4`fBfKAgFdeZ&y4KDl
z{SFEbe^ne6HyESUR#s)hDX{nwTGH~GbF)bbCaNg)9vz^QZPV2TKY<YW@3i+rRBCMG
zkRL08_x6GJpzc&?OCZmkBFN+nwzwxSOZo~@kZrTxiJ;(N<eCGiU+Svz9Z?Bl^>Hof
z>wSTi7HxP;a(0d|92yEGG|I$;p&PhRKeSV~xSCucY3b3BBo!6{x-FGSc%_}Df5tF(
z(dHU@LG25$lah54QwPFivX(Je;l-AqO@`%*Uqj0j_mM<qTqv2ne`nLr1R<zC!~!lA
zVlByDL{Hh43>e-QSP!pm2DiFs!e#Z}61=;?{Y!iC3UMxf^DhPiYI_(6$hSbO8|?v~
zUpBcd{ikhxE{8vGMdl8F*M-!(^?;UUfVIL=0`@;+)wXQk&9^9ktyM5wQ*;QolBQk2
zZNvm|)Rh2>!0{)n4y??j@q$Hv0WcR}=(D-`O*nUWje*v3zS?GmM_L@;d<@*Eg8Ng{
z^3BL7>E|I5bjCSbcQ3CDfDHvK`v%UoM}dBb23A%_Jp^sFN$iJnHI+sI0|Pib=bi2p
z)WsPv{{8^Vl|nIM$0ByWSQpWUY%;DbCZ@_z+{&{D<(E@5{7jZg!ol(b2LV$C?;<LC
zhMie-O~Ee!Euw&eT*aYOo+=B0loF5nALjJSCvE99jW<Rp%iDN@U3l_emhyK-B3`$(
zZK3{=Zode1?Kz{>&_foB9iDW&TEY3*vE%M$AmKBwR)a9{@UfbR3yGmCOpF$VY4(iy
z!}QBUmr0@r8X5tSEg<{YUhnqbYdQ9)zCKyY7OOtTW0QDUz7pg3$E86<`;sf7(u5_N
z*gtnr8a|b8Ocd@vjX!}7w_WJT1mY@S<B$G7crCr8#Kd=%*Lt?JiQj+~&t`Q7zy*{_
zR3^OV5=71TR);hX{b*2|1Uz^gym-48x3Wx1A}A}5TGgejRZ)S^)5(xsW>&4oV9*{z
zwLt}k=h}YrkY68{^k=06pu8#YT{bZ5BKb71ZzU)erYMdXms>FGMjMy~=lJJ0TCY7J
z9t%xoD@?vYL|*mR$wlT~@z2wK(&BH=#(;<1K1Fc)ipew4n!pdrYzih4n<m{YawRrG
zKk64F-uSan=R(l4;(VK(KaWs*QTF;Hy&vyS*d#6D6Hj!Lx6c<oP3KKwP0tU^4_ipf
zoq>UzWn3ARTw^3l!$xsHp6L9jZt||2{Kq6&t=)!jvVpvKrK<a{&A-xqze-9@AISj!
zU%-m7t$S)J#?~Mufxpj|EOz~Lka#!Evho!A3$UzqKAbZq?9yDjQgifZGUy$Kra7E<
z@bK^II#c#C`W1uocWOf1q=0<Y+Ai-Ea2y3-*JNFc8z5WL^{R8Gl2d)`9jO`QUf|jt
z2`n0ogO=|Xzhc}s$R>WDo?4d^QQF)97#xdG%lZlP@JuKX1l11VnrzUIg#`xml3rjj
z$K^fRArk5`46QxL{{yCl_3mCj{cz*^N=8IZ6b%`*j|+tfHS$wo0qAH7;{qL95Gxkf
z8#djX{Wtstm<W~uJ*2|unRXPS3t6`9Co-=xqT2gLy?upk9~wq?n#aOAf)7hOdLI1J
zRS2?7-OZLNNWW5|57JrTz6WHxfOoC{5S;>DINx*uy<}{BZhDE80QF9;7zOJth!*v~
zxGumF2T+QW#Y(D;84uLE{zIM&lqeV1PTT`?o$qG-1)}}OJ`8}{{+Rqm7p?~SMiRLn
zorYH#S*BeE(K%~dPxJTwK>W!}pSZ*(7hqD9F3->Twki&)TJK1`_yTunH5`Pwe{Y$o
zy!JYs%Qe}op-6NzVYR&V*fa@<&-BJpn`Pm!g#X;0A}WQjDYdi&nKnW%j77_pe8b8u
z>+4B193Z6P|9gn*wB~g{WmY&qE?b7E5!*J_HA2BjJ`jl(StoHMJB|<B;#X(UV$6-}
z?aPXe3jMjlHnZcDq<SoyPC?~mWm~DHSsPo#&s;!M<#pY<mYHBswwnh`sKLOx@ICxA
zSxoB;3*lEmV3AePCPHsYl0{)RdUEr_5WgOkzoWa?CFwbKiuUJ4yt8r&O%yqDF?=K#
zH4*n^>QzNGHPhFPW4XTpK8x|qaHVFO@QU?+QBMH!vbC-H4}kMuul#R}i_u&MtyQup
zSVm~$+n0Z!op=90Tgk}79aAMbSXe3qw7<Ai6cp@#<=8F8TmAc??*d2B>*yRz7ZkJp
z*K6iM|BEd`2s5Ii{_iWU;$KuO$4-niL6&k>_h0l$K_P{Va&tNtpk|I^{)MspdaypD
zN2|G@|Iau6-=7YSz$1<j|9>D!3b9rIjl^gu+mQG2%l`qA0MJZ^3I+RL<f@7OGaFA-
z0tOf`g;w%Qn8_+P&bWNlgeU;Fp$U4%?3nC%UR+E*IX8-Vs(6R#rGGPFXi;5xy-Zr<
zRGuo-b?KS?^Smp=`D$6yc0BM>hZSVM6DukD_~XBsF1P}>qCO|7hPortr3F!l9;k!D
z(Z0n%iJ|<&DAvj_R`xT^NkTVld^2^$D^hd^eCqOgscRS`H6wdV?(OeGcqGfhaBD>1
z?03SFlRSrYSZ_!R8@_(4=+z2F+jk`xZtiHO{?ARdGn{hX1R8b#0teaNJ~kv-@Ru~o
zB6G6B(0c5Fu{(9R*TN!ZZ%EkyBl(5+hH~<N>$)H``~`^i+K0+-+o~mA5kfH2xEsoh
zRQkRh6jW55saYaJ<`i5+4*LSd5ysc6kWszasYiMkGRMr_bEm>JcJDttu+tzZXOClF
zF7s_IHvt*J;VVAI>m*4g^(1AttC<g3ED{7Gh#0{bG!v29lWqiedO<894Nf~KC7|bH
z(gjUH=6e&wZg<+pFr&$%^tyY6$w!*hqSWc~4W=<HEE5bskpj@S%(kn1&a7Ay`2?(1
ze$Z4|aOS;~i%Fn4=I3-#88GQ@9;JA*miiD59I2TCQ8SE!ps50}CMxnpMt^io7{Rg|
zoF0L>z5+)w9M)}G!yc$u$H(_p&QTb@<gAQd)!0i#t212C^G<f>a^MWYS4+sUHpiy^
zSwbRNny9m{k}I-Jv3qB(qq>9<$1r2fbUy?dBiXwZP&t9da07+w-XB~SPbPsfIfP2k
z0rJ$*f>6$;(?d82LNfL6RR{X6$N=Hlk=OevXK(3yC504voItdcBKRLgnu`qjKDWkU
z;o&7!Rj?#D;it*Ix5+O)zCe>(4(p}9wa1mU+f5ZAQrkFdTuF&;4kV;xGtXJ8eUABi
zc>ih@D`gQL1ki75;R^Ctvzb!dKuYi*@p!nB#Y9uB>8!9ghBxDtLbRY2B>qcc<E%CG
zj_aRZDbW|toS&ytl~yq9DumtOisV#Sh8koHj&`?V@H3LLBgzuN^wZMx!cep$5@TNI
zILa?uR{D>^1@P6?kNBX9c{0;1UZx@AzL<DH>CZpq0_eC=>a59tufa^$Yn9~T;I|Kv
zSakWWdMkF;|0$IULJCeRGG=d(G61}jkHMKv&MwTCh8yXN4eq?i2a9xWn<JsD<7)3-
zXZhTj|I;1@DCz>@C%CS+sC->O-)LhLLLO1T(0=Xt=~{|1-o1W|t-8G<%fq!L<@3T=
z<+#x9OxM+TtJ#Dl@xJv(5YWnEAUVy|+Qd_2=W|_S>!uXQ{M%i^Q35|6ZV6VADGLh~
zd0;F{d9%!nGNaUW$<}K%EHIlRqdd>>m@`J|e2dpLlQ%*c8yKO?*Wvfm!!<)D&YN_}
zw4w}y)@9$xYmL<T?aJgCU;0URIkv^PGq$-#BTW(6Nq)}uJ_x@po>%6~`J(RCs_7)V
zjAwe6Cw<+P+*d4LOgUN<|4Mz6rxna}maS&DNiaY0CmX#bX_tvcCYous$kS7Mpnkar
zg&G3)$&PCb2m*#hGtSOfq-m@2D$0^)!f1Oos+H=nC&Kr*PR|#<N5@JR-jsFT(Y?r?
zUIEtYQ*4pydhUTIUc0=&J}R7xR-+LC$ku`O<v?QK({4A+y;RbXO<u`_W<%!Pc<VyD
zDV_6&v~MRK5xcgla^S3%i)Jg^9P{9?Ktx9B6g(XC=s0WqqAI^St*F8ZGQ|7ssd^Q2
z8li(qivwkx*T_Hje-%cR{wgG_7uG^hTe8|W-%2)zPAj$;2RZle8||ns`KKQ_va~-K
z%}XWr@fmfWt05I4DJip7&ToZYy6f|o=F0b9$$n6JJS&|oO5o;S`uebahRmCUPRf#8
zXxk2Po!C0WNtG8iv4G+Yj*%E~{L2Ewz1}d8+3T2yQkNz$(TN+|=trriU!-kdBGN_Y
zm8`*maZyukx{v~ir~u7)0fuJ-(8~e+lv#i?z({HqQCN5$R`O(CzMz<*CijVM(~lUA
zSlxnuxTOyUU`h@`%^rTwIoM~yh5EWs!jF#S5U*DYqpQ7LMb=ilXE5>v?>V3a=7Zv9
ztNl9+@^-jCRIMQG!4=N5U8^W|L#KyTofA=nyufG(K7s{}H+lk7iiS&7%U*2q0fSJ$
z8HWPH(8?;}lT6azA@b;^L^GS|>sOwf-aK;EuQ`r$%)e`0dLQ&jUmZ8(*}RCi7qukL
zE61(ed%~#Itn1+1dtJ&Emcy~bAY5kw*sf~jo6lL8*?3$J4`pn&6?JeOo{Y#{@L5Yb
zw*B1c3ybysksWKpY<(`hE(gReK86!deo?VcD}>GNoY7|*cP-0~tpo{HnEPm!;4)#;
zxFfbjG{#{N9H?3<=6%Xn9mpt7H;8vEl_M5hZAIDRlpYe>lRQTU?f-iJnu4tBBO`y?
z(CPY}_pmt%+q=(3(u73Yf7XWM$7D;~1(J>D4nvX2IEXsS<}1JR<1#ns7<t~6L?TrO
zrtDB8#YP~0xN1!~4`~<G_DF8e-6pkIyyn|;A0fz%<?y)IgRLsy8fz#y`9yA=I$Tfx
zZh(Bz8^#L<LyT}WOPZq#@LvY{(gF$}tZJTAY|);Cgt1*tYjU0TUtuG0A=*;gWL)E|
zS$~E=D{R&kb+lLHcF|RpzPK(N%|=v~y621>f}rr7NW_i5=-Q$6DpJeaZ`qE1<w9$A
zo84V80aOCxROPL<tCb463r$&w%WLq`(#XvXm%6SqHo#>ARV2XWdlHyYHxsTMy&|am
zM(l&>lt6M-g|<KLlgvV$DeC#o`1vI^TtqL3yj*KjR1d)4Y-{wUtnxJ89&Nu*OLNiq
ze62#o);aQha&7Fmh+l(Lby68wd+{}aKyAQ^oZN4At3d=Y&)Y9=c`cS|I~v=&$<|N~
zK*zb}kBl7i^AM&$qMn0+X5+W!mO(+qwZ52#*Ytd@QQqrt5Estd5Ra)7o5!q+6B`L#
z;G3(AfKw4;v3}y16^LCHvSes-TibqC;v@+Qjz|UdRFE=T6E{%O`&Gajvf89mq?>5X
zxVVs6VPF@Skk|g^G^7jO2V+!P?8nKVZVjopPf7`0WR5mFckp~riYMMUb(=9x8`BtF
z#WMG)jXPZm9Ib75#X|E3DZxKV7&;s;7xRg11)fFH{A=0oC;A1l?~8!E@~>O{BX0sx
zC6CYmx;k6ZQ<d(i{a&-l^{3vb&antGP4Bm&En@vp{FoJqE+|Y1GxspZxXi9NJn2iX
z4ll0=_w&kcv!#g?@iYZ&LU39w;u_qY5hHPMLFRWD#k)Ntfi7|#r|&uV7n4rsRq0De
zuUlFI%lW*1e8uT0P1ih$^GnodtuP!e9drINj-f_qo{y*S?Wz!w6eh^<uV?4ACr}-E
z(Qs!!E@szwUfWc*9MA$=HMhsbuXH<K2*?`9rz@+e4ZO59!(q^33zh4G&rc)}m@=0T
zA=JKRt4TC*vGy5RF##ig^!H14lC0R2)Mizqu9P24tdkqZSXSVBfYCn4mXx@N`yp8l
z8ObWDn1E2HbDrdx$eUyo*IaLSG&;j_Xm*A=_6-n5Yi0fIH4hZn{k(i$^8GOD<AR?4
zWG^Q5h3(*nc3HvV3t2t+qQ?G-QWAF5ZV;9w4NMW5S<#oU`e5}mHN3Eunh$by6;vb)
zndxlc0VWZiSqpJkNgCr<H5W)fHdGzX<5r4p?u`#7{^(?m`whu-5Q4pol<%aX&S%Jm
zhB(KJIM7pb<6t!$is;@Cf1OXJD<tNYbgA@Yc#}j$IkW0LniGspf{)lKvlSNIE9(I5
zE0S~-aNcF<B8$5uJxoQIJ(+&C;Cmh2VU%FCJ6;NyWQ2vW0Aik!gxM0sc{Xt+Qd$H<
zHBBsK>3TlpS48G@@Z!C%uWI{>jd~5gI+>hB_wqekuxcM3<TOW;m$7ulBYJXARr^PN
z{5gS1py%#SwqTpgIsU>==)F_`Usl$?FD-NJxMTq%GKpxSZJ=P#_wBREWY+k6=aVyF
zd1vrkO-Z$IjJVp1TKD)qI&b-bc9J+qULIEo)@-2$ovr|-?ktFpe557`=J4QXsVxvQ
z`>G5Q-(8dER&R<Td-kp7dRTY4ZdxEZsMyUfeNh*7e0+fk|4Xk6&~9)C98Z*=y0a5`
zWM=UV_UqtCWZQ~6sGc|ImRH5tiDXozmXNs6#4pu`s8O;3zDTSqGfIog2$GP~+`eqJ
z$th++;uliLSr#%+%shQv^wo&Pq2IoeCeWX+zu9YGcX@s=eT&}U6>93Rp;eG|izu(Z
zktuRHOC-{uVx@N}NMifSDWdOiI0;i}XjxRnsKzM!mc)CKigZyH&5;)6txxvMc%U`S
zToxZ`hf^$fNW<=mcFhsZ-*6cjRW`sc+xY3BIU+JryIH@mkNML(!^lPBLK3Ie634Ry
zb7yVA@sT@*--184hbNSNyEx<k!5CBQLQVYJ30Esyvy}pOl7of2Jq`|A`>O^310JDu
z*zfdC13Cb{+<2dBSKnknPx%Ukh;OK|<B|b|fa{B=XX^>Cv9U3bqt7-Rj3Vq{i;J(e
za$$qk*M_?#Xbt8~6A-lVwOF%iAN~GmwPdbILy6p9!RK*q5*?ShpIZq$4`Yt0TobIm
zR7qicB|78Bpt17>A;PJLgYUm>Pd&;G7lw=mf90Q-cz}*BJ0#m4zcX`*{FDo6U!-W0
z27%k?*jqR2`4;D{p$YaZD-TRw&5`^^G!@RbE0rC~3l0Zyx|I1N+(&v(y?XL&8I7)}
zdV1;KNvZ6IE67G1y+BQWD6g5_X9{Oik{l&WVy!lmDbc})A&IHiQXbz}<vRHbwBKV|
zq~1P=xpZ{A!qzd0l}Tk^7#E%V%*D*QbvzQ;E2W>}7-NzuR<6i$)ocf8cHF(qS_X(F
zs+YndAR)Y^eKi=KCQ0G;a5~t$lV<6~Yhh(&1o&fX!ovL@%HA@nj;+}m1_Hs|oejY~
zSb_%+?(R--cLKp3LJ}mnySw|w-CcsaJA6&fd7dBljyt~bj?sTec6YDtwbrcas#&u%
z)3B9Y#9{$$dKRF$x{AurE%EAE@OQGD{^pNW#gJGIe@chQmxqVhXXjIzl3Xk9Sluqk
zjUD9^@c)E0IL^BOonZinQ}3}y@AP&v+6XU*P$^22F@Wr+<b1~T5D;rjX-g_e-(b;S
z{H53OEmqPrXZr$0n&Qn5E1>$C?>2&M*2xkBkWdahG%+JwCPtqiej1Ob(7JUn&I6~T
zH_TT@C&Q6;z)>;ZVI~b3g<7E5`A-Wcf;p9b(g&XK!^NgPh&wu^W^Mh(UD-*hDbBFi
zvj&pLxs)hP9uKTbmv$32qWvSkkFJc&oV}3n#ue6x;olqeIqSI~B)VsL|IvJlezztM
z2!R+7VetCuwfAMVDu}1_N6uclOixemsF29w0zd;qmuw8b4ROyO2#;zr2LNAN_WM%>
z#TWc;r(~%7w`72zF(AzI4#U1G{Nw6!xxpJimP}5&QL<JzTV@hyq7|Z1RjBigqT+rp
zf*L7k6Npr#7Z#JfpcNhbDY$2Bl?H|B(?ioP0KUO%hTUtEa8+=UT__`FQTk-aSx0>K
zRrnqtEq5@x0EH^)ba(e0+bM4~l4sM{u4vR4F-fMUwF=BC5EGZ@hd@x6&iofN)psvm
zha=94$!s0{?`RVD_0zx6P!meL!yS)neOR;3tt;mCtHb!JiZoiuB_*;#fxFH8W&5d)
zh`jXRf^sgS!eP(wibt)U++G22h07t|!afv~mI8f5ismtC=t5#7vOjouL|`KpeVE}8
zG}%*eKl$o(S$EgM=UMOVH02J?tT;P*Y6mQyM!Ei{UttD1Cp6a9))9@f57%H3K;{Kn
zYm(jPEL`vORh=CO$ki^n!6pEuBraBxwYICW*49Va8lps(?{qigTfU0OJ^p+R6h_(T
z3s27`Xr1a}2Tww;3Wk%HBz@$2&QZg6ZlVjjB#?Uxv97SRBpZp}&(N(L+R(+|Z@5DF
z&E4l3V~3Y^)4gp>*3`A%UtexF@(NA<M!O|Z^v}!c%3^P?ea=nlixQyMjQv@vl4g?1
zBw8X-(#+75(V8m8?0ZfI(o9!NJz-QxKe;Xwk>CYLKPX(<fjWQ!?X#)fFi$cw=ljlc
zkBZs!PUE;OJht($IAUQ>f00^uu6R}%$y&<!ANgwEzqDR?raZ}?Oivpt87pC2z4#3u
zmzK^d$)((<<)vN_Wvv@T_3qG542y+OaAf{Okyqc_spXQYptzn>2s(a8`hL_G0S24b
z=IYIXaM&Si5N)|F(3h~V5FuNU7NYSqDgY`$Yh*p^;Ip!*|C~<l`oa;?_dTM_bqMwb
z9}dTZnG#}?xosHFi)|U+n<dBSr!yNBVN{5b6dp6a=l(5+QomR%(NCPeMcD~@(q4dI
zH=spj?uQKVg7H#COj!=OCcB?@#(eV(1x|aUJ+ecbs$uc$NQ^c?9%qOISJ`xIT+q~w
zxx!UHbG<M^tO3~)b#--!7&cuV|NZ?hs~3i(CnK3-XEu?H9^Gx@jTgvcP9|<x&qo{`
z5AXjz&o^2{92}e&X(}`n*bIw_u$wy|281SO{-K;F<f%!h&$J2-#@9(zm>tRW<Ou4p
z8v)0cqx)vlr&%k@)`?IPs8h#WF~y6^wYZI3y+!`p+79Rp`X%(#Q1p6w>%~$$H9oO>
z)I3;=tUQ)F2HQv;t^h1Us3DT9P-03{#$QHkWG#p5&N*-&<Km`gxQPCig4p}RlSp-u
zBm>&KFi$oyzbtP#iI(Zs*Q<SOKrBTNPV_{D+3)M~yC^H!u8Ln@rcMw*KPO2O#QY`w
zirkHit2CDC?cXRVDTy*y*<Dd+CwV)`9!3&!Y2$WmY>;nnZ-;$U)NXOYM(n{xVA9c{
z`O+FqGSSHfbJgJwTQb6DY9`L6`T#UnM1Ni<eTD>_5EzL3!bZvz;&{b&IcCVOF0HpF
z$B!JRYNTT*u3^NQopZG1*upeC+%$AiDB&ZcGp<ES$>L7926@G(q_#X*f&90j#*Ui0
zu<z>~RkSK3dw3|!gNspVE9=yasWIT8{UHN{4E{KLg!ZR1-NZjEK*%VmfGTjpDJUk6
zS4D>>ODA9rxk((MiXU8`$dQtuigVjeOj*P?nl072eY_ZD<>Cq+6?h>61i)a(WBY#D
zQezc%bWTgv--mF{$W(X%IXq<*m4?bdK&Eu<<oWpI6rfl?0Mm+xkKa*L)*7~Ym$KRs
zh={9A?wwU^3J9!6w?|U0xf-Su^XIyldzPkj&W}K6(zuwS^|<ZL3t>GpWeO=^gL!Sv
zhJiV&k3uJy7d))@R+DbS-e)d$hhB5nB-eg|DrUeEz3(y)uI@^a6!e6k82i1_IX$fc
zWCM)Mo%pb_$+OcNsRE3}-jHR`A+XD2HWw4o7nndRQ>Xx9+v=mEqglWf1D;V>R1^k?
zGVM8Q^~LWfLipM(LmrC5?cLc&tU|~)pjyKouzFe$as7fIi)egPBe4pJLK3mDFFxz{
z6g(bMRF75G+tHh3&Ae&O9tNZ|q~+wYDl0Jno}i^CmMOD=wg4WPcJP;WN3US?#tZcA
zN!n~hk3=FHD-ok%2Bt`61B+t}A!}F#+u9iBQIJXTLAwvxk5q8IuG`$K3))rGQQ!ee
zx+*iTNSRN-!CZ7#Wc##~y)vnl2(6SH9Hh)7&~GImj#_TxmCZ&T3kOt<rG9;Of84fx
zrh?G-@E}+P)N4w%2nY!5{`8^K&$?82xe?#yw6ybJwr4C0&N7$qy`;3gZN1TXy6_`~
zctP}~7l80NX@j^;^CP{1OuKyZ@+`1_@p$anUh_hHYf5?={X*gU0^tSIuBQXhdbbEn
zqOr^FrI=KKP{p|+p)(~B1y|#tYDJf*^e1axg9_0Gs0_MdREuCyf-JtVG<KeqMsCLi
zeBJCmQXFtfX<7XcYqjtKh;N<}gHurwm^@%DQDB4$N|IqAZS+$Yq9X+<0KGbZ1{xyd
z3P1oWd(z^tv_R-X{yw?4|6&Aq^Y%}iTzPr9@BRIKW_;1oY*1Gu2gC&2bZth-5ybw)
zV1iD4nERoymKNaxiZU5-bSBhbf+$peKEwv1dPp96p^sfIUNjgTB{)`^id8_MZM(T@
z&|-?1C5ky)FXni2@^?4(!{XRXEo#PA{n>6INz(zHf@^zy%yM9GZP$HI0?KqIARz*~
zKcSwg(?0F4ulKvPCCrIv96{e5M<N{xJH*HU6y=ofp~YnEIF{Ag%Kvy@_QDO!6TmbE
z0#RpACtpb&9UX6hR_cYWeUTzS>o%bIrN#WY*zGOKDd{tOLOqNVJ8s*O?KAeNc#wq6
zJ=5vtVEf6l+FBg5?+fPr4QU&!b`wN1#2O~VEtM}~dkSK^lDHs`7u?Yp3XDRD>w2GS
zNj~Ig69NaC-Q%$v?Fi9)?XIb}1dq13*5Xyd-cOvq3**JqFSjoBfz<Kuz3ySgP%MJ6
z<`*S2H1PNL_W?~f1+_XtUy}G73j&7*B6gWk8KTHvAWc;uY~{2Xy+cSy_&P^G?id>C
z;O3^-f;XbJmQ$G_+Nim&KF1tRLQm$+^t2#%)CVCq`B?|@*!B{wx>F!~x&f%XbOD`|
zDjFLb`3TD_y4Pztt5q0`ydE)3!<l)r6(YZ6qemNQ(F@U10v)5yxB&0#RZkok5nxZw
zz(5cB+w=Igh*`a_#7ViJMClFGms8X;`nGfWQmh|6=K@dfPqi6OwTb0%G`~JCx0N97
z;*LPI&FU?2y3|0_y%4mcLrk_)Lcpfw67xs6n8RDCRESnbx2wLPQ|5qBLB?BsGvjKR
z1gcia+f`Mb0ifner503ubczzo#S*$KKKrnI=HS$*GUSd8Si7UsiY-uITuEkeF;dbm
zVH1;|TPl~9PhSWx_0`nWv{H})&<^;+9BRl)#NP|nGwoZJ*SPjZiZdEa5u1x3Z`AvI
zj9lm?5ZRoy|ELq*i}6ECMP<4X{Cn8+3@8buz(dmfnfOsNgY*g;6ro1~PWEZfzy8R-
z)S#=s$G*+PLn7r)V!suyi%ej7q7O*laHR|U`ce$JG0RM$vlx<;uMuTQdZId?K0mG?
z8QS7`v+-IO(F*iV-URs0tTxMyCdehaIy#XjJ~vIbSpxT2$dQ+~()0AUUROGU3YUw7
zc<BB32o7to{A|2HX*)!ltKiFh(+Ok~<fE+~%=3|nj@?&Vf?Ip|fl`o1vP->&cUHc9
zF_3vG3+9IleG6ij5Ut|=v#?^@wU|FgOli$rUuBfN821YCyJZze$xEGm{YTP-v^tKO
z9MtDvbtgFINyKAJPNBaRI)qP-e~+MR@9UH7NiAy8G1gS>?)YYPPtZBK=Z==HZZA;d
z>!OWu3kYQBz4^Kn<w_r<a<dSB@c^tY`{ze@?N%>*K-|RK))ovzW^#~8yN3UK?G+e)
zfjrLTUt-<a3Oy~`=vioMfA0G#&a)IiJmU2pd6+Gt@z<b+aDmo|ZUF_a#UqyOTa4)e
zmUHO~(CcFOcCn%vve;E11uruR@W1T#M+~N)j#q7Btr0D?tPqLj+M;hv77Y5``hr#B
zQ6B?7r^VI|b<PdZ=m8>v<`x$2R+`e$i)S{U=_hwG-(1F$0i=y+KrL|ggz!xNH!uF3
z^W*P(RP*3>sG<rG1)Z`7F;&S(xqUO@w-<0p%|E_|mCd=B;u?5MJRS%JfA|%J5@mN^
zR3bfpI_PtBe7TFlca}?&PW&Al3W3C2GxaB_LMaD}Gl2KUhS{4*_y%SkHnzzR$p}ef
zWLU_GaWP?gpDsNr*YUl26A86$!>oiJ=c<a50tF=sL|o_+yY~meSbfQRm_Y$nxIzk7
zD?33v3SS5Ua`z0#!-m4aGoqYJiG%@6h1hbM0tV950chvGA};S^r^Ge8pHPcG!GVl7
zdGDMk5dF}ETnhVsDOMTg?)Fgypa}v0gD6sqhCt>(dG!2&pMT^#6)MpJD1#V7i07U0
zqKFF%mIz%ey$0_!!2SdUxJZ}>2aKV>yN}Ui*oolIDef}^mjJHQw=GgjAg`dSk#S>X
z=Kgx!0JKW?*pj?srMZLHzkkP+V9fjSlYKMX)~5V>=Kw2JV=3b*d<i>to`0@VD*})P
zL<~))cW?WkUM~v_uL`<y4~bodEok2a82#VtYW&b<vW&j%J16_+Cl};egIkx~<Ve{6
zo+AYZh;;N#n4E5om1O_G;&H$~iUCG_6yqX6Lc-(4Ai|j)@B_n_Vcs{I!S0-eeGPc3
z*GH=sK0lpXAHki6AcH7?^i};HIi&jlrO6bm%>*mMwlW-_`)P8>^>w}!*#ZQLUHO9R
zQU|r*ATwyt!hFfG;6wv6Y2=kfzp5$2ZR)&~;;mwPYJjwv9ha|bV{Y#J$Yw&~aXa~R
z=EkpPY<^ERpG3I_Jay>mbvTzbb<s3;5mMv9{m52VQ~gC2`8L<W_IVW&9$umf{mWd=
zog9QqKisVAV(FT#Ugt8Q(CsDvb(O#@JJ`Kn%XXzf_aWJ{PNnaf%R@%uF26f76iV)L
zX)<yD2bz#XEcs%+AC2#nq$AsuLlR}NV*`;xL$Q>T<wq@ZsbNO9bDQHJ8W(so(aE0b
zTmm62Aq6Z66(LC&#X_{+`v5fg>;SafHJnBoj5|Z~u5X!eAi9)}69>jfI_ba-o+30M
zTp#yUm;e^&477XuhnB8{*_p5?)EjE~O974BITCVdP|4@L@{ckv#}}0Ynv!Y4jv*$(
z#!WCaXUkY?{2RDXXcH8bFl5<4ip*OlVP|qKYAV=PXH(mDEt&B84|ORQebSZKpzu4u
zsatwtAGPI%JtXIe&B>vZ7}k2hmu2pHZn@I`6dYqW723JjUYFNo<9?v6b};=>7PgQ3
zr`*cX=Re-+RrtEyUYYOK>uz*z>WMxDrm&WJ{xZ_c*xRla3?(w)kuWC2p_X!eGY(VD
zSnjAHkYOEeHGFCOdqo%$3`6haS4@M#Tw@wyiCm}*!iF!P^AOD_j8PPd?QP1$J84`4
z1eA(rDZIist(4yN4+HWO6usUe%~Ixxt1_QzQrkJV18<f=ore}tPZ*+y4-}c7tn5oZ
zO%g#Zj`vLxkyuMK4K0&b#M~@U)Cba#wWic=e=+$aVX*jV#Z^nc%U<?mC;9iHQ!2l$
zp1D-Ft%dMT2fg*nCWaV#KclTa+PVBpuxZN<)<V*+6T3b~_PLrMyGKXvVz0Dp?$j~K
zw6{-UBGpbWT4uyBCu;{QP0-NUG>2s6Ft;;-E8K(ot^27^H^@cDY$*=CPTomC@@0gr
zcokjyMaoWYE`waF^9rsR3)gOhw!G?o$7+VLTBgDpj<gEKy6H<KW(mzb+UZC+nu>p6
zLC}sS?ilcXRElY<ugcN)FgX>o`)WnXL_ViDcH*>7EOKALF<KmdP3?1_p*B#9T)B}s
zrXu-iDNC^aIce&UF#Kwnv0P`x3jSp=d{C++?M+#|i_Z=6X6$t%8Sx72ldQ1-<th5y
zbLYZIb`t%p+%F9UO*x@+0&AO3UINHxhIAXSN*WJ&Dh~4%RlM>9;@z{0i|D0c>5_4M
zxzL>)a%+?GMfs&j6bXY69W1}tFcf5jWt7R{WhtUq(v`{MrG#nVf55&`*X#%3A%KYF
zSv_sBU+!>UxK8Y{cP*!|7Fxe8s=y9#G<S3!p*gx$wOr{|=pJ6}hh#R-!H|?|UM(i!
z&qRpTjmoU-&94+vJB@hgmCkb02&MD<7Woz8GWDRia6_k~{~HBw{p6G55A3u<?7jY9
zC>iPq4oSrRM_6++P1ItG81ssnZw-T;;KUOoWTTsA*d<i_$*<zSgji2w&Go|2QKm~+
zz*~bdg2UCZzwuaQr=z>W9ILKe=#U=8pzm2YAhM~>H887w_|$s)4J~HEye6~!*2SZI
znP7N*i%CBGbDqSIz&l&-n|3~~+`ih>^xF`duX3_}VlipywN_I0(l;LU%PXW>W{B}E
zpXEdo)hv=u_;-j@P4;a}wm2#u4<=+ht7gA0H9e`W&(d6yWK|(aZZ#AvsRaJnr^Aqh
z(2)6LdPb6I0-25cFi54852r#_oP!3JuP$9M24y0_#QX+|h8}Tk<s9LgkkI6J2}{tF
zO8mvK80U6B=RV(#*=)<)<}lMPl0y)d8%%B8*MT6B+Lz_5U3v7hUw#Z5xyA?zt9zpR
zRG=BVTF=gpe{ce{@A*J>GkUec<FwT|&LhQIe(s~E0XKc({aM%PqP6p1I4C%!Hv4CY
zNGyZfT|%rG<Jr3FX)8G%z6G&qcN5c*s|<&gsiZ_-t5_r!RVl{A$Ri<QgayQeF;<7;
z%**yy*+ZthsQl4UZXLy8u+5tcw+OR7+3_mNZEOE!b9OW}k20Fecs(1=6{pU8*t{#W
zfD>!&+E~N0nzW&{&2d}o(en_{gWa`#q+X<s{qq#T{x*OX{^4w?G5UeXfP7@&{Y&y9
zpx4~CD~_inUx0HhVr|uOzzqW(MxZ-*zE<Y$=p64%%gcpW^cfDnw?!F8@*Q-nu9&ks
zbm%ma100Cj7w~ldWCyv)lOZEdL;6X)3(#glR6zz6AQ)GD&etF#EEc3Xn*HdA<ekFy
zfpsEMb!Vy-&qJITllv{p_-bp0Q3BC^H*IrN?6K;B=j_kf!>foZkjt}r>;bW`UNP<r
zQ_ZFRT-7LHR~5fwO4*yd5qACTIq!2?9(@eq6dk<eTGfcubuAlf%l~iz(4FcwVmlAh
zHcH>jo|<|F)~?1i@cJFi!Y?^d;JPnAOkv*;GARz_9L|<A5pk>DuGE`iQ&(&)NEMIg
z^^S&H2S$Aes9~%ZRUl8r0@{rQMr=fScj1<snxR+l2yTa4^DKsJ51g)@8xtme!U9Zg
zAz-00=b^MXcxMXL{@~vj_sB0R#>(plgeM5`l+_?h(0WC>>P$MgoS!y4o3OU($RW;R
z6KvcbdrzH^A{ruE6=^W?5^s2Mi*CbP3!B??zo}5Tt0vA|M3NbBuUvFvTfPm7bfZ^w
zYn~Bu47KjT{BA5edT}dJ)+hFCMmrPHHPgnkaY(eYR4S75WL_>&(Q-XGwL!P|fICl!
z1pa;(IrZ(DZkF_2ySLK9{qHbkj_hCYvE#nQ-$mbL8-fzW<Q32b;R=7y6d`?5c_T6K
zZfXjlx~ECdn5$YJ9|zZ#LR&S;t{!1e1S2V5kScCzjNb_fkReZs!`tT#%;>-F6tZ`K
z^Tv%zUu6|Oh}~>2KukEa5v8ZHUuPKmc7Z3%vj7>9LMjTbc+P}jeM`kMZi9GR+8Tt6
z_;nQBP(PD&g(Kq9_IN4s%6a|p%s@J#TGM25ej1+FP-v01^eE5c7>#=|F6Ap9LRr_R
z_AU9-FdKS?VN4`zADx5ui^_8n3Z1h!gO)dgr(s_jkdu_KrsYp9@jej0KMn1u<(+{E
zsA=mqsPAhe=OKzD`zdWRC&=Xmxswc{&@k7?YahW&0bSKw0f+`KUgsljijJMMfrL6v
z2Fk$k8ZbnN^HQ4bl7q;=|LKcWJLZHGs38reUO%Eyw|c0K*%@B!yy`Xe+%!X$V+)w7
zQgmBMAsKnJ;6E9;wXxk&D*uHcdNso|G9jsEv_+K3y(2@J$i}x6bt_UZ&v)o8QcHgk
z`LjVx2;IXB-*sPN4?)2J{6%Wfv1KJLj2HF$g%>wJ54|$jYb1)foOiX>RhXb9DkTL%
z6qM2U$zJD_`+JUi>UOo-4l6H`xASHZy_?4@rUd1C^_lkxdg|Rup4Wn(nT$9pLa5W+
zFbYHvq{1)IOrU-mz+`CS%<h~B(k{M1FX&Ztf%!-oqRa_X;f0BAV(Ib7)3U_K*M+y2
zDylb2CI+e9UB1;Ic7RR<#vg(*?_nrqZws2WBVdbz&;;B0RKEe=%b;_I><M+c9`cIu
zyk!7l%O%Sc38xnlgd{ip8M4U@6A|O%3Sb|c3_I%JG51_Zil-}J<@nPNXN{>Dcw`YT
zT3UQUjM`!RdT)rTdt&Q+%%FSnF<c3kYCIBgm)8+yI4i4{8!7tH!{n5VcV5>1$m`Cn
zYJJD*)H`zrmwN~IHzV;`7e5NEhF3_4=Zv8x#yWb5Y{en=lB|Jsu!N1I<p9(%WyLd}
zy^g|3zr+@<>h6`g6oj;5V<0&X8k`^_GkAYMGIiFaNUJ}IB2I#7^tW}0ZJM%=T^O9`
zI81Hk++DSa58^~~ObTx7Df%}d8nm$`>~B~zMhpiVH|{g<W-w87ZCzMXxnikR_;A(z
zM&R5()!dz!&iS&TEfVu@#NEquPIpW$f`)8Kx5N(W$u$piDn6SXy9^)mtet;pQhLxp
zCf)OS%tcgt3Jsyc(lM7po`Azf4@=~pNF9|kK0w6}09&S<bc}d@TgUZ3;$1D(-DDzl
z*|S}9cZDL2mP6mT_i5={3G%D!SVMZ#f8efvg~_N>FCjW@^KMcjTQy#RWZ)Amkl!yg
zaCK)?^mAWIZSv=v-cnbIk5L%3lQUHyLCWw^qs;v1=NY4}3iH07-Q}lvtkeia>}P9p
zQZY}XUvAcW_`MSJz7_nJh7g#TN43EZeQ@`%+;;Zc0pfkNnHla_JK+2AsEhhJC#Wan
z;oWAIP@ADOLon;55r%Ny$j0qyK+UuIYQmr}-$zGuMj2{^Lld5RYN|0?_~Q$_16y%E
zUj?GBZjm-nvU9=7N1@AJB1j6c`j87(qTjx)VY11IFjUORy*;T0(oS{z2Yf2p8nvA4
zM)!{lcHP=X0X~N*W-Q^Kwbk>GNJ6L=k#H+?qhdbVl43_wFHY}`kFR#?853T`VW~cu
zOuHX&%y>`jY7)PhZAOK6{Yp`1euX}<;+Z}=x%^Ew<l(g1c4mi`XobaWm2vOrkm>Nj
zcQUqwwwE2@csShZqE|;%H%ggK<$I(=S^QXH?db09uFT#JePy8U*kyuML4G;W@`M#4
zA@ii7!}X@;2PT*JK2-=&%zIcJJwo@~z^tlo(YT|O2+&@WW*(b);mwT!H0SpY1=)s_
zO0gC7Bj8<k5XJM#5#ts2uX@kypNbRHyHyV`^+FQaPOjZoe-vE;{mc=tGCnC`(I}3$
z%!N$}(2ucgy4i~KB7^t*g4lW2dK)SQc-VaFt4_B>wLM{K08$F8%jWT&s~)SHu6^@z
z>JhTZTh`P^^?5aIZxxZxhl+#6<SD~sc<|&zNT4{C7^N%;Is*|XIuQwBFLy}inyuTz
zYreyU7Szx!_6eyvc^xfC#-GAu>16bNKTZ7XvI#;D_k*rGP;kdZO?So)@GKx$77+6|
zj}jQ0qpppJcliW@jOs%+sWts(jLeUJ_q-c{lF7|X>D5<5^8Ynw-I*<np#?R~1+_@1
zwd`lKoo93qs!SSv_9y1RwM~VcD<Sp%ExS=}eq}Ww0-GS1m6Z8v!Q@nscRs4x+oOg0
zh}zwUxP$L1xUMT}715NKI$)E8p5biI)f*?GYo(Z4i#r*~hs$Pfubp{$yn5v%*T`yk
zL2|(Q;4%$&+c3nstV-}cC={-JN+gV5BxA$bhgH(}4f!IggcJ=ClLGzx@sN4=k@m`9
z*x<-k@dp;A?1c*5Fut(}il_9P635hVEyucS8DT}~mUPG@L$|8oTg@Fomdu1l0<l5e
z;uP<!KC2s;3-~RaZrSlFNJ!%Wro~D4mqYTAF6Oztii8jB6*?&Unf)JAOaC;N@kYC3
zKz<iV?NbdfgtId80bPxT-IWSfh}1sM7mqFzE3Bi>MtQW2k+I2E9MPBaajqq+w)5%`
zJn&O)dyp@x>Bp}H{fYm@vie)+mYY#SAkCP702&ILBca6^x8~=x1huLieMN}83*^rx
zOFQ~RF$a+Ux&B87#3Hytx-T~~hD<F1?lLgnKSE<;JA2-&uME8ZQ8_%lHK}Im_x9HH
z8xehe<+%Ml??@ItSQ9dxL<V<s4Jkd`M%r*W%I^p~Hoh3%YE-)mRwp&g`_1yWfL&+S
za3I-#5E{-F^q7*|(Zd_>%%y7?)v(z^9c=dn?F0W3!kUm@4Zl|kg%0flQN{eqt<|37
zy4eS!ZUS;G*7x-D=fkZPf0k{HbuZfHs5N_Be1=@Nu<Ffra#X*WSwTlvnWPXcFqJvj
zH>qY1Hr6}Rd%X`TdEr&s&f~|LxDyLQpYITC$5U-_%Arb0>0=+BMxWRluU$P-{-PQ_
z4KmJFPX7SInM^$3&{(H6c^E&Ymz3$*nKMSlAzV&}F_!(17!qwZrk7~7CZtY}p2t@F
zju~a~y2%qZy?-<o+109+-Z=XdJB5oN-3gp)?enMUL554QGb$QIA*Dtr{?NjsmT)+a
zqV%RZ(Qw`dg07b)YXWUnHCU@>`I7{?@3z(BM{a6OGozL~?9^2qWa=OM+jH2f+R9)t
zxzaO3q0gLC=@(7a=V^j>fnoK(9Nh}fmGrC`Yp^*a-c6`WZ^_^NAqkiOx`c?Z;E8-_
z#Ff-Qo(Sh63k-9}Mu&%~NRTzO`50b|)7{!4N5S_Mv+!3>4Kou3K0E~`-QpPkhb~d4
zGFu*B7o_B95YFJuTRBvh49u0e9Ty_YV^QX}5iwD!L?3<7{mr6{>Q!D=p6>0PxSQ+m
z&L)p`)9?iK7~Wb|MX8%!x_~(0(sSMrGiL1`@dT~sPRzMj-dLJPB`#is_P-rl5%BZl
zH^cu3eVKit8BXI53#ufheP{+zl-65qrXCJGZZ+o;t-~TXQR75V_uEZ7T24ucQ8vV)
zL^*V^hMDH4X$wS}tz4yjC0#O)I*g2x*EoeubE+g<2<6y`SA{ORn<7y3z=F|PIMCEw
zF4a-|5OLr1a=f~}87<Jev5`6G89!_q3mmd}0By#04G@&KD=`OR<N$NQoe+@s7Z;SG
z`2Cq8&ZX5XW_b6c!RqaNapC~;!SUW9b+$@R9}|Wz;Nri5%=b$_;9I*ZExdocZz^QA
zMH*&`fV3&!PG=89`VwgeUm-^CUV>A-TIMqdXG<--E<odJsk_roOT#iskk-OOS-bt7
zUOApuK~2prQHWD*s5woy)%*&UMbw4!_f?3MYi?|_9lD&jcn==g=L$vX{WKNJBx}bo
z^!O6DiKmZ7RTpfLaB9IiZ5M|+!So~(>n7)<>|nO)(p47(xI>N>X+@inqR8Q$@$2KF
zi>6gpPXV4b@vL#iDq)D*lIs@|l`W2hMsHltYt;-PXjWHO{2IBbwd3U`c{+M@xNNlk
zcj&qrpFY67BZthcM5x4nvXEe^`zApXCMrs<fg>nM4{m#2UOh#*!K=XMX?8hEqK~v0
z*%#hA>30dVzcs<Gcu()%yx@*6PIOc9t>FDRU%O=#1nun1OyIG}@o-by!!)ktv_IjQ
zu`L)6^7*Rq!V7*CNj(h6<%VGGC~0lhou8jS)OMAS|CC$@*b8vbP;h}l@>o4}>wjF2
z1JHoP^zBAC^ZE6IKhWR1KaLv6*}WbJfoO2hz)@@xO~MDr8rYSWQ}Yz<r989Cw6#m#
z&`36}GRoD^8anh!Ihx>Aut%C8O@MG5ds{6(JgI#RugVgbAOE?lu19Su>qg3kGq5T-
zb7{<DSh)<Pg}dzX0^!;hvITJ(W+m#E`I)AWbs-<R_1u!VBEA2<HsPmwBy%Q1yclDp
zdc^3badw6!4H0J(MsgDn1NelDfo%*c^k?$3@w=asXz~<rG*F*uB#Nof3uDwnN8f1v
zfRW;KiRMh5+CpyMx^XDbu$50NrCCPDA-Bb$_y3vLUzE?D{`=BU$}^_y@zQezC3<9t
z{Paothj4vNyDq&~w}Y~6q~j;arZo6-?qn!_YOqJ4HHxOu&lKMjEWgx4XLyl;0ixMJ
zhH30W3IE&%=vuwU_>1MlI1C|m17gKp*0H29VWHMr24+JPdV2bV#Kew)fq|$G8Z|Fn
zuH)&lM(%gCKpPl5rNwc9O15ZRh}RU{l+wuNGJ(U#<z9!<a`ZYgEjG3&^JCr$S-D{R
z;1U{yY{P)i{PKy<{82lBF7>RPAV|tMG4DW#4LyA|Q4TtKy7KDEi1MVa^CcN*Q3925
zwD0K1MTrcR4Or}nfk8-E@P}amv4{{~AmGFb$<W;nM-h+g{BO+DTzB+s?)A0#=S7Fc
zgIWkC?%t_O5_vqkFRVxL=teO#k%Se26f?UwCL|#@MymF3RwfwRIik_xqd?_3JFW$w
z#353z^_dbao`LdV#Ov+h->q$YHsB`OlZ@@7Q*#8XO}^ivGjK+g0-kMzX^z{2#9v+$
zPdLH|8pg_GXz=M)YFLAzCQB)4u*MLM;k4!*EbNp>_yuBKqMzPpkSW$8uFIqCO_6sR
zAQuhRWemJiM($(WK~u?mO@05yStu8CbISihA6f9g6;A`JO``buHLX=kzUaoAy~S?K
zHjiQ5OC9U2>)_dCX$@zl{%sM3(a%(R_Ix&eyt=uBiGks;FAgUf?42h7j2hn|$uuBr
zmzcCfP4&jytV+X}XoGw6&IaKi`RW)>fR+1V0?6R@ped8j)zm?fdi%hhX`@-ld~(kw
z@U*-kOH{IFCKgnMH!!uqA76%zL7Cl{ID%Hqlmls;A=#8cSA1s*R%|78JR>6a`yxWY
z@%jve^}=Pr>YGh`D1ny6g5u3J>BJK#q-wD(m5tw&=>oN7qy3p;duxRhvcXw8yH$KL
zS`?f^BoU_076rS@{iap*_M2~Wb92LVP1pCu>)9W6ljjJzZ0ec5_4J4i4G&{GX4iY{
z(cy&AV`(=w%1?Qb@)-x3A%|tVH_xkj)jrK%y>FT6g^+CAS)}Iqj6RD2BvRlYTz7ui
z8G(X({o5jPwkQu*Rf6O_;JKLeguLC~8Zdw`pemDsiZ1N4Ee9%y6j+<cD>Q3y^XH<&
z7N{7qzsb8!>x&MqUl7v&r6+7Io{hyKcV9Jesibj~8JUcn(LjfJNXi29bSx2Df&jCw
z4;O|8G_<0em@~y{J5%pR=Z7j&BYaM^Ir#L$sa4;b$wfI+n<-c-p6N9c4b*bZS5UkB
z|C4AqW`;>F8<P3Xjb=gyM@lJ5tLBrBI$Yqa=qYpNE#h4yco@E!q3{M5InrvUX^Fnm
z4&Rz4`o)o6*oyw;T|iP8SvJNeCiPHXICA#`f@^3>I%5P^8{Hnm_kki*;Z3eKh8zuH
z$+@7IB7Gp`zvMfB!&GrZ#7fQ#TdU@a=sJUDsWIxb06IFge-|V9E>>N~Ib?o<ECo`h
z_jh&f0{OyLzl)fghK5*nY}3L;le(7a|G}KOL}%%8hAk%rW$%DleclLe@mCWUgAa4;
zm(-zrS@uz;$h~1dxUqy4k?O!+lZsK4ZYVYrz!F;4K6Q&_DFCc_BY>^)^XE@MnM0>3
z^LI<Y8Da0FuN`qA<mef(*zSmUf?QsV<erH`eFb_XM^!z0Yd}te6kH9lNXxuXD{t_R
ziqba^e)1k9n;z>1dW)Z?cxrJ=d3-fnPSINK(Myd4P`IGfn0pkw%h7XaT9PT`JV(p~
z32b-7c>>eCClvxxV71bcs>JZ7u_9kzc^JLxPQ`;1qk6pqdX-~Qej&;m6P5bJzKxkB
zKHdg1t^m52F|0$TXnp3)5GqxBnGujOlRUl*Bs`3#iwX!AMextN{V&3Qch0$SlTy8V
zt0&+5U4PC|tQ9s7OfnY?6|jQqb@B@lR8$ao7Q*a;tV8=|95ncl@h`22a}?%C{Eje2
z-`jqdQd!hV@N0Hr<J@z8I~fYztam=Z0q7$>d+|O6yE<h6<Hi4~y>t2ipuDWxJwcWF
zIKfsSs<B3Un_Cvml8$y~<+l?LK?#b&py{<kO~9!Ld{6>tGeFZ9z@R3irHL;Se9SY8
zpUmeO3+hdR(Qd(lJ&&@51VI3_7rS~>oOu2)BS?<?Pkb)3j1<b&+I`2J!oPLh>PZSk
z7uP))w4dNyO>ym<N#<r}f;@H?!&M<%FFS={HUN^~L<Yc+?rW@{DaQN4_A`ym>fO%g
z%^i~TcD$)RiCNf9s-J9c1?Zg4UcpNDhdkcJMOFU18mzMq{FaKsJ5|L#V@I@Dns4hY
z4h1IJ$HO3^etl;Xn1<v4f}spng3iN~-$0=~c>fDRQ3stdddIMwfZ6L3kD+cFv)lFX
zP()73+$~tmrrui7>?)uiNFx9JI<q-_&jV_$hR)o8wv!z18T2b(iip<@jan{si6j;o
zj^4fwjdIAH#yg-|%~Kf1C*Ff!2J|S-z3}p9g@bE#ZZ0G-5kJ2$OpvVn_;`k$L`*Ad
z<qJ_;H7cx-XtkoS;Nus9{L;6_-RP)+r|G3zBIJHrbv7A*8nL1zKn|lIhy?f{#h0&a
z7lW2l7JeW2hp>OBE=!+yN$4y@%_Bb~O?vUo*UoYBtpIsR4vCC<=vpdvnxwY{<}k2$
zufW@)42@mPG(r)tdTK0+MII;09p8Igi8kQ>DSyw?t<gtdz~N)a<@?MngCVoddd7)-
zU0qRbWyAnF`4mY5i#-wt6FFg(LUqy!6t46N@9v8AbxxRC!-#8|NY4r*3FX;($W8)*
z_K$FpuSU>@zCj!1<u>{yL`}~d8{p#ujX1#TUBL=^deMNyn!Oe@Cj@i=dBk|~JCV?f
zupR1){u?VqaMw-qoeptQ4hJ(t0MuPHOkq(`iR@dU5NA@+hO~)<Xk%YHovB%U%aaJg
zXw6Pw`GpX4+dnxF)I@TG^p<TpG~z^3(tr!;UI_Cq+^Xgo0FIsowEw4~_k*U0X3+&@
za0ZX(AGR;wh}Ddqt&dzmN#(J+&Y!6dT!hfKU49u;_k;!dHPu5tRVW)FqqX_q?=6T;
zi3~evKe%yGRz^C-T#xNFG&j%RrCJ5wDA2@&UA+D2pG$Mi(jAp(0gyX5tXb<KJe*O+
zu|sclU}}bg?M}j9P_L#<B*1ED`NiGC%%z~D8F>wr@To@zz=?*<F<@4m9E204sCP9Z
z8HMIxpZ>#wo6xmf{TFxZ`&6+gwh|z)yzQLmOVXx^2M$RCIYet+yTt+UwQCaPglGo(
ziQi5NJSlnI4eIq)jq-;J2cu}*cz`4Y5~4zagzh=AEzlrjpYGCZ@5=YdYa*n%b5Qea
zTFn#zp{xdJf_W=3QdPd+HPF!<5%dv017hLo3d5l3H#1{<UoUZANYqM)>T6q?n<D_#
zyQBJdr+^$*>)Ypg;uF&#^yjZHd$@hZ6B2oo_nuV#(o~Vsy(7UXgQnK8M`$Ca;v|lJ
zPSfRGz663SXd+~IA}na#ZF{%YuR~vU|9V%X*U{lEIRCwSXoIOZX#aGp<!1=Ps=uOY
z=$Tw@MNut++|*&mA6&=$Sc|EX<-mfUqBIiZM1>-cszeW82GK{Cd%lQ}VKQ}neQHXp
z;s^XLlVC2}72jWz+7wIN!Ai5uw65!C-X+-Y4MT2#?o_~S%ikq*6~g*=G#gB-r~sUY
zTYz-x`8Z?y^oz1QC35gPN)eMI!H}OA=@3NX3JMlKBjjcp7iJ7vIk$E`e{>e0S2Z><
z@eLdZK62wSah_-nt>>FJg$qqxk*ngCkQA>E@v)x=sR}I^kS8TNOc=~o3s>S8n7~xI
z?#QdCM*Wn4uG`tM*ODRkbi|qVyvek=v02gyqe%VTwVWJeM}t7w5W$^cpz(tuRw2Cr
z0cxD3x(5Ph`&cO8r2O^qPOLEz0u0SC6%NA`T^+EA6p4XlST@JGQE3sJJ(XXWbn{1K
zk{u3odR6vy`3rASTiLXpei0lHe{1>!``lU9qI_=c)O!6;&7#N-_BrCxfculN_Vlu&
zrw;eWFB1;(L-W_9k1~^Ffp&b;wcutu6ken71ECZe_<5Ar5;p?p+%Zn0@{~5~V4b&a
zngF3C1{}Zad0mdym$j;Xi9VN`@Jo?Drk6yN^DmoazJh%5PBvENADYcu5f>1Na^FO4
z$RSXjoa%kv4p4O#Kp@}^v1#b&c<)}*wuk>Z75fDDm+_K8%%4sE;JNxhA{F<SJj1K_
zxGOH;Q7`IJ;1cr>Ek`_(5p#Zcc$h)v9}><Q-dyNEL>r-h?+W+tP(WDo{}6Z30D{ur
z@z7Ml{~ct;zht5StE|4%Zh14LiiD?q!o|Lm#U8wSLvOq{EFY&rM>6^!^yGHXsJsV1
z=?VOM-b!}+ai{(T1Qiuk#4N;^CBoj7&#LUgxWIU{OX}CZcR802KdfNG6G07nSmZNw
zfqFU;edPZbAgfnaer#RaygI{cw0m$Ute0nWub#%LNA0vzJ?m)W5pON$vi{b8)d8Z|
zx_j&+`{vSTr=*J;9lIk>J-xIRxski#r%R$NO97*(qr{xeR2vROqK9p5uD=6w7ZJVw
zGbEbc09kT#$D`TA`hFti<w2dav9#ILy)8I8t%p{LPgYN4@&Gd-0Z$C|?YQ%E0>2z8
zi<>EuAbq1a)uD+e(}t76K-HK-93D4cSQMo9{lSNDg`!ASxJ#siL87K_9TuL}Ss#Kz
zLxF^8R7TkWf-W21T^HE?dJ2t-HHgiB7_U5+%fJ*VfrvXYe4Cp(=#0RWHS{x*bE?>6
z`GtibX)jA?#w6~zku0eXazf6)Up|*R8g%U!(Guk0_MZ<g-ZE$W++lP1Muy<x=M@Jc
zaZP81r7<KYBFoXmnLqN>jmcrN+Ab|eIO@j(POuTf=~sRB)yXivpNF)qI?gb~Ff*R;
zxb0Rnt8)rgc=5EmX~dRc{WY96)y0`TjIsp55LEX~<I4#8=O4zV1LyP+J%Yr?mVv*K
z%yRQs7qGk1TVU8_YB&1q(~IbXI)0HLMdKa(!`X^1?Gy9H)MOgb$2h%FExUOjsJ=up
zdMC$<gWkvYF+d4;_yoN1%`)&k8c*~Dqnht_km^o{{@ke1s(@dpkC9e|E|3LHZ)+i>
zz+5ixR2%bOk9`Y4jCUGNYfJ3M-$e2qYSn?_?`q94Jus})ieCHhc6@8UCqKLkScg|%
znX4CqOr=p%{fJ$fJEFcb%H(s^IeR$84Nhkjm|*Qh9?9u`KwO?(4h!10NN&+50?)Ze
z+>;_D<-ywb;tMZxz12tZ-u_f`V`P~ACTj-_tZ%b!mAXt%V?4eO;fQhf{K>Wc4Uy{C
zpOLQc&-P1}@$io!M|2_Hi2dC+wP__6#)Lv>DLNrNhXurMF!5NmOD&&)RXw8AexS>2
z>nRZA$vtkuG{x#0YB>3=+GVq58?VvOA3}4CZOs4IimnsqRr+1)FT&nFOX85LUKWJ(
zoIF_KZJX5Hj=fT*?zfOmm+5&u%$&KzPhEVwhhd)tl2DNFU>%WI#T#}fwW!VP2GDUP
zCfFikXH@l#A=C_eYtw_jS3?O-(i)}lP5#~1eYNDNUJhwavOq!gGX&|^M^+qMTu@H6
z?z|NaaO^n|*fyWN)pc8k`9<;%R@r-<cECEBD<MKa;1qrq`K0{8{rr_{4IF^@0hAvE
za0H;C39SKrvTxT>VG&FHDflt|?()hWd1K6fP~|^h*ERgh*{k{f4vGKiknVUnyh^#h
z@o+&UawpYVWRne<0qOPU^2WGADik444oIH+g&Kv%IyR#{74_8v-(DA5UzD*_mncm+
zymjDTNMrpM!2aj0{)=z{<iG#HzW<4E|HZ!lb?Sey@BjT&cRZ2nqlOPsKgLvFm&N%U
z=3F86^o+8h0cEIV-ARS=XNAK>oi3rjdq(tH^GCe6ye^4B=-)RM119PHUvEq%U77y5
zU(Tm;-K6y_()Kjs-={gOd8KZ9<spL3bp>ATM%_98uEV}4{lzZPN9cb{4TvYS-Nj}|
zPG9NY>xLaZh$vtkr2PA2^2V#wxxP3;w_yjFFxP+3xSQUx9wp8B0UNSfpgi+80Q|Ub
z^I9hB^xJxYeft#&^GQ(ekT;5NZ1dgUt%&-w?;3L^SA3DSGrWsYmpYhxe3~mL^f_{1
zl=aeiWUX6*OY=em&`pc5k{)vb_V?E!Y&%Z@s)Z}>e<-8TB$P+DyVT`%bjsPUSf!oZ
z@h;ud$B1=vIyB?6R><Py14|Hqkk^Jz9%wo#!U;~2C#_6KveB7bGr_E@CS1J$>fPTT
z0>%j#ZC*udE30Ex6kr}Kj&Ie|_)z~fN-ibZ3fg5Q5pAi>b~uy6$mW0*^I*<2bA!Uf
z#7w|5?_DbZNgE=Wz5UI~VjxXw(>bJ0->7#2XmX+k@uePKKSMettep3Qk{uX$mK@Pr
zU_?&LZHFj-q-?lhfg`;4+s#jC*RJ5DrIFH&E~{72%ui;&rj6xsp{8b>B)!g<F|7P~
zf|Wp-bH=D8TiD86{!>j3Y!}5*`yVu>S|TvK5^Ei)u=t7lP$nUm+vCdQFO?_qShant
zm8ts>TiTVVs#8oenn-+5W7%?LKhe3wE;h=j7xhX8U_N)oszT(8D}{dq1Gc%PJh~7@
zCXQY5@74=DBp1Ejo_7oGyncq4zU+b<+?|H8f9g`YHS%t$pJR)F7k)x@PR$hky8;g(
zYALA}d90-@tOYMFHMCjy+KqNt7bXHcA~HsimVu`d<{ZJrk5E_*_%(i^x*J5CRC&eD
zg=b03vl&<Lk1N3&_G2o}`}%O+`a^)rC2F#GF@4Y{h(@qhbRB;Xo*}DaD+-cy^&33l
z3n%7ALp9#iGY|Hfh)gaQbiOVMx0XCio$XFj^Dxw`7FO|kScvL$GdF1Qu=xv2z7NaT
z!blLnn;BybTPfvdM;c@Ki)th$-EnfqaU<}ncO#^0|70o1vwzIc{~jg>jucs-@#RW8
zB6D;5#6JdvCkiM=g#f-#MLrOT0S6715E+^v8Cp3x2T%+5H|V{_jfF$;ckzI<5dWvQ
z^uG|J;j84Y&J${ZyZ)f~yI!u=4z_=AkEU{VBPU+>Jmr|!MhDI>?d5TYm+<dvG8QjC
zS||5``Ujk1QbhE5xVEXwY5#S<M6bOwX~M4l<0ZPhr$okO6|Dxy$XGCig_>!@Y6?Q0
z4sa<Ic!s5Fq`f3=XOS7BHF7C<NlUqmH$7+vM4j25<lJ?Zu>YWfKl*%bxl5Sk#YJz+
zJTYEELVLg&!Er;#O6x=HywUDOn37JvQNE*5r+0A~E?)VKh2iao5f}Ue8nIJZl#HsA
z=idm7AHtOgv8LmMQ+5fn*8c)KZzcI6eRkdZ|7_jyo^$oIGA?(A{K?I`SFe#-EDv^k
z3w^=J8=#euh?cE`M)f%LevE2g9xHQ+QQeQf+Q$_IX&_DJXg*O@ngDVDkIiy~?2YSo
z-}eG0cn@t0U`4S<cO5ahBHV1x>Iz@1B|;&;xpD9|^7!bCENfKFC6@8ml|Ii8vuYcQ
zDKR|n)R5-lO2-C#$d-^)gRbAaV-X!n!U^4YBS@T!D<|tzLlHHZ4_74B)tCBi*@Pug
zS2Z`N>2HYfSVYcg!IjUtj@~-Bp2(ns$CetxvYYDk95XzM<r4EF5_`8MPrI{AG^+8a
zXFrs5BM8i=qrhm#U3R8xB*H<|O^zXM0@$NnQs2>58N>Vw_N1ZriFgnm4=gh)sNQjy
z>PB(@On%&t>P;ii|1%gs^oXbp>2^4QSrfRc|9W=QE!!nbDa(<up*Bw!K#sUV*Ql+r
zMG`+n$3LN#%1M8wsT8W3<RglcGl+BUTk1Nxlk0)h@IuKOAVZm9YX$Xm4Y@XO$u8Dp
zh*yn>Boin2#ya&CuCo7FY1Q{_+k=he+<3=*s&5D{NO(@*CTY-*p8mSWBOBkO`s56E
zr^u3Et;!t0Vl#^iz$gF&Y(_~w-#dg$e+t+m*2`+95*u5V^alzUgy7~`$^U~b)xvX8
zDPVIc%zf4%ekGN<f4#17<#_<m@cC?exEC{MWqZeVhN<4WLz?A1sm^`N^)ULCF^PA@
z7hx)`mpH67`bR#kB2v{U`Zm-}C#22ikwG?v)4%&*eCmDJq>CLlw>OXHKXz47e!?!c
z%52o83sjx;b&c0h)m#MjEtM1V4Qn@Ac;bb#zJ4ZgJ6=+r=Qws#CRlHAfItSwy+-PY
zjGn^jp6rRlH<aTiZ7d(3B60J9@cFuez;3nplPx+SI{59~mcuj8HJ3=~c{#W(DKdCI
zE%1z4Eg?FG9jAS)PM6o@oQ1Y!U^~}35{ph+FsG(R5bH!(^GH<5a#@CZIWBJW?{8j!
zx26+<yznrM03pMOcNDpviOwwhcjwlUoc)P=$ad^>ZM}fK1(X9S>g(ZXbFKzVtALtN
zAim%RfE&<tfw}zhU;DrLf8_HdBD2J!H-ZI-7=T{fJre)?dglN9BK$AL{jV>=|9C};
zSTN#VPADQqt?V-XxfVbyUtLqva1Z?z`eKO1-zQeTO|fqUDnQD50EH|Cpg}yF;NQEt
z5CPGMrAzK(DPuJ?mGw|STO0B(URG}AuRxi-H~JR@=MDeQd;iCoBXI%zPoa#l#tV25
zpt29-Eo-e;|2?aZLi_{9r*{N_RFnhsbm=tDm8uGWDtJ6atTZ`BBso#&e;#pzx*VvW
zSn+wVe%#V~rnFgYjWpNLNF7tff*G%TztrkYXxsM0>2qC`2Es$K2_MV-_uDu+xt-r}
z8|n4;%5)~)E(q3nfB!+T0E_>AH_IAx;or~eKe1$ZNR807p=#!^P=36A)*Dz0IT7Rk
zy$-Yx98jFzy?NHWnk>YF5qXbb6(`4k2Yu#7Boy-f$kI12{IA!?i(vd7AE@Yj)n#vm
zTEJTHyguw08j3jK2HbI=I~P#pPFKvp{OauWiQQhdxZ2r#8E3nqZFW1ye%$|Md&Ks*
zk>Z$8=z+fKlVjZ__4W2x%kAqKn(p(A+S!t@MwALA9T%`q@f0QBsj5|&jiz!0UVA`!
zj;8WS6qo*T(t9;eJPC9}9(P)|3sn#-QLd{Vq$h1WQF<+?pk~g|4a-&T(6Z&7iMIQJ
zepotv0q+yyWUVi(1aKby1`S*9bS>VbKJ3?>E~#034u}bcm6@EuUg&|dl9_y+GvkXx
zAyI7K9!f6+2w6GTpL?P+fgezaJ2$4V3U$5ku_t#}RGi_0aq?Jd;MNLo&m6X@D~f41
zmVsCgZp*r;PPyTuPV?O}ho#3=M*LYx8UMkVG2y{`+?&J2jSS)Zq@>P>11>Jo)(4!!
z;SU4^rAG(4PdYQLt<hYoiK1^x4NTG7A8glCa^mfwU##3K4GwoQ3TdTvE{Y$jZcaxU
zXuBcT3i8J6jtFp4z&mvUKs}U<kY^JNC*U6ZVcj74g$v2661vm7+VfkfJtJOD6Y8$h
z6Zsd|Wt;o-yg$wjr9HR`qErV~mp?S#Y^9^2;KqJ^Z1DEF-_z};<c5{!0)Gu7VlyF0
zvpSH&7ZnVKJnUr7Ez{^EfZ!)4orP(WB1`L<%EX_^L_BajQQc@zyA<mjn!-quOYNrL
zJlPn&$z$PoR^i=o8v1%o!ldhnFh6>_erwil#^$#3WI5yG{W{w(%l2LmKeG}Vj^UhH
zyB&VAuI8OQRV_;w6hoEDyiQT;Q&_955^40N<>+xI^RqjGz0zfLTR2x4<h11xYCbSc
zzi}4|j4?cKj&<1H5<&pwf6TA_TO_D37RmqmFFeVj(kY&ZO53xA!ftmzIlb;zsz+^a
zigOBYxawQFR364p8BUj4=#t;aubwjajyjDuIia>QfrlFLQaxT6o9|lpdS+DYOt8_?
zxP!U!q?v2^pM<qQMi%JpN>^gH5`@=$SNx`>!yCemgxj`Fbk67pTl1328er3qMNWuK
zQVJ9@o5Oe?ZK>O-nv<SWtm~S2@Sat>GU@w)k`fZ+6TPkt%?DvP&~M;ND1ZWesnL1x
z|7+^%<C$LDI7-d)=rl8&P+pF_ADyJ9o{Y4%6kCXigF`5jcWH}o(1=Ow41I78QQkIf
z=aDAIkTLJ<<R#mgEQ&sr_m_3rEazsY^Lc*%?(_TY{{61|zOV1~z3%IK6%6rmw-#Ju
z<V#Me-Oc;YsQ^-xa8KGyxu3S2CC=)I(jtnN1;14jf%eDJY{SCTSP(NOI<NNHjcZP#
z+m9;uFn?~a8+Ly?$r*J&G%Z|D?|Xe@Ab(94&M&)I(*VAiIzN3SKzixQe!)<l+H9{e
z2|++y^j3bQ9eL*iNAj|9l4HA=#5!uR8Lq3Be1+Uk{ZpLnqL}Uc^ma_*@yP6@sJ2AN
zm{;d;NMtHw@sGNxmj}9Y!lG}mvI7!*{lx<2v=69SpE-?7(3LQpJc8WzMzx3h$+eA|
z8YFf%)}XF42^*3-lPUYko}}L_mzD2>Az9}FZl)8;4fu`P3BankdJ)W5GnK^XA=O`M
zPLS@kNi12NRN0)BWy`AOBqGG+>J2yEft9JcZ#;G+^z@9ED%)@HOT~01`%WcsXi5g&
zK$@a4tppc9@H-;e>zb1d#vWjP`*W}Hlz1&qNykLv9k`V0rRm1FsMwCr<``@XSa{x?
ze$iEjq%n9^-Q8UDew$Xp8uSVeJ2m0se*EL8J6>Tenu3&`wlE@1>;}mWWx{dYE?}WL
zgK-&&1z@6|cWQpUjZ^}hq;J^gFRTWTqWK&DQ+xFR{&#8pXxG4EtzZCb?d=|k{|Sm@
zkzGwmDC?|7QF8PBXZE14r5F$rAh-0$tkXYf9f#sv3brm{i#FH&H#J03>d9087b~RD
zXi%gBB=sMU%3RwDumv^?Hc1MlV0*22W=sk{e8CBHyaN3Y-d-ofRlRdIhJ{sqln&o(
zB>|}qBlWDG<}J1&i#+V={oSJmB*X!*yMqboj3_}05A9`n>gS3<UT7JR*87Vvy9D8^
zU}@jo+-(H;hGI~FLE>=E9$MP?F53X?ab1GSoQJjdu<W6UJf=XzB5ifEUIAqxv~>{(
zbi~+xP*KKgm6(InQ6u^bC6MRniGN$~ZAwlnn3+ji4K2<XE6_lFqqa4^jLg4XWS(Pb
zpz`B<*t@s{pN|n8hXqJTshiwoKRE2Z9?{ezX54tJV<;b+nj61xVSS{Hix0dki^$wq
zgbU@cxB6=M=~Z)btmy7+MF)Cdj~O|ww$`lBUQRVpHa<A&fnzmG%i&BDb~a2fRA50)
zYm*7vxGq0R+`nLi2Vcv2U4RCY5)M~RGl!#NLZ<`GPBdqZP#@9EKj&_)l`ZLsl6Afv
z9P9y=PEQxN|C)rDGbJmbA-=MWYrxfl#Me$GMd#oWW)9TL#jE73nE?sdlp#8lw4xH*
zG{LGy%VWRbeiUojTA82^<$GYn8Fqr?5f9wu*=>viUFji*M~!Bz&gAeWVU&44$}uan
z8ysKEx}<eNe*0c(4?%p2?H}XU0C*DN`6tX!?T7h{@8kp-@_+^#2&)7NZ6gN?$>9bh
z4eI>H!p~Kq+C1p?{qezQaYETKPEve*%gDogRW12bbJ_eK7FP?i=hizx&yA1_IW`!c
zPB_9z@T16p$Oy9us(e)b2wg7mdB6RqH}>XNi0VoJc%eYF3l0UiIfIQ)okp9^G9ffq
znZW3o-LGpHj59Xh&r0US^FFRPjqBH4yhbk68Uei-(6c&gW#wPv8^py)Abv9_Bw(?7
zI8&K#Ax1Ddefw+~C%(Uq!3c<nQQJxb!_n>Y!p5XV6$RqLL<ZDwk<T`ws!TK!_ddtN
z%UvNCoIu(Zh&LgYJ0mZ4^TYphtC_ecVK}<M=LC<BMM?VltP2YZe+80&L2V20iI8nj
zxf`2;&KqAysW8=9c|oVWw`~*bYv6mjT2*@^ALl7NqS0cp|K4@W-cjGx)ANUD+bon4
z5)4o!tR)K-=)5xwtOM&J5@0PI6o6=z@(~_bp7{lWoLnxKn>G`<u=@Tz4Oiv!gtt9s
zfMkOMI0b56fV8@oPJ53ws?11FS4J695Q;jgyC`Rk^3GT5mIj4p4Z50obb20ysrWf)
z7W+d$!PalJLH#rJJ;B!CD;8n8U;;p{7Gbp81Mu!2m^517>K|G*tq#v-(l6#;eiPfo
z{!}ketru7-rKUXL(P&$wMaiH(6f%t8<~Jy^U)|l@QsYkKG&TJ<zo5XobP{8H3+O|L
zK2guvjXtPj>(VOpi!g@N-uo35O5_SnC|ldpv(TW@st06x0r<7NRA$lvnmF~vmM)3O
z$!13fcsw8r@+Lk3ySUEqJ6foP0CF`$zX$<{Z#DE8X<*Nv0gaWUO=Em1yB{{%<f{qH
zc*>CCaQUE|3^A?OOGs;nf`&N%11V4-6m!;04YD)wb(x|AZbuEB-T_2)VO<+EnxrdG
z*kALz%^o@(R2Faj2-5X_ClxG6T-AHg=XvUajPG6~A`cC}+Y<7!7y#00z$zWimWq(^
zs3u>lsOI*7-w)QW2f1cD&ESWcU*Ic}rE_au^s5R}(O<udE8gY26>r@BijXL$B!ja*
ZZ7PQ9*i~&{&gdzC>m2$#ih&GB`wR0cfX)B_

literal 0
HcmV?d00001

diff --git a/doc/img/camera.png b/doc/img/camera.png
index af73b0d73f722ba024b03454bf6ea2e9db921461..1f8a92c3492bd4e0b9e563223b0804c1c8ea81d0 100644
GIT binary patch
delta 880
zcmV-$1CRW?2LA>#iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=24YJ`
zL;(K){{a7>y{D6rKpubH1Q-b}H@-6KO#lD@9cffpbVF}#ZDnqB0000007G(RVRU6=
zAa`kWXdp*PO;BVmWd{HN0^><UK~z}7?Uuby6JZ?3KSFzV^a@<1<t0HY5~C<KDlnKB
zB~cS21G*aH-~f|hG5iBM5gmvNN8;$ai7_Tl#vr~W5~2u1BMN_ow$!#td&jk2+Y9GF
zLc%248kT;yXZStOC*R-Ov&FV;n@v<1o2(K*31HI!9RCtDGCGRe<suY`;PH4!CX>tr
zg8=mR_5IadTmEJaT)N!PhcC07?>dQQn%sTx5KqH4_WBzE82dPdv8*xm_I2?AdU|?z
zGdYdBvKj!nT0wtN6ymWsf+zrxO2mmRE^xZDli}gv;?=;w;2=M32X&2pqTzXrWer79
zNT)N%Zui>bhMolA&Ezzysur&XLZJxS%TeZqawJK@TjK>FZ5RlmKq?VOTS}0(EF`Id
zx<)_upS_^AzMiw)-Gw{g_SIwW4<N~IOw%Nuh*M^yC|`fc^L2WH*x~{Jk|ZIBBDrji
zSa_b>ckdOq4b8NHTv<g+;Na>xmq)IwLXs*FL=mSbapd3u@@57zZSXA=DozS^C^E0I
zIsCi#;oZKI9}BYpDBfBWZ!L+%FxpZAvROU`!#E`uf+(WvdT|^WA0H<kp2O)BSe*Gx
zT1%1EQkZ{w5?OXp>6Xb`7J18B7bl2f;Q*?t@^oYbfVt0;M1wQrbGfw?{ES8ba5~nT
znagIW@^}kR!LyMU2o22~Xm7*PmzeuBiMEuWdaDmtm4azz$YqwvTNX}-1E=I#tpW2F
z9f8)u9e6h}!HIKcxOx35HN6+HwgnJG5kpUs(Nll?_#Q#mb({_dlDs+-qTzWCx3zQQ
z+CbqBG&K4FxCLzYweh|aNJi0Tr$`&iC^f#d(W|N|nrTwqb&}rR-i@`E{Ra&V4cSdc
zPucB5WA>Hcirq7|V(;m`U@JbaedyS6yHIUt7Yqyza_`X-QcWGmrp`+611&rJJh*ea
z;B_>-;brvb@nfF9T(!D&SM$a#F6KHeeaT7yC4dsZ|Ilv^e4+VwhKcR~0000<MNUMn
GLSTZnJd5D~

literal 828
zcmV-C1H=4@P)<h;3K|Lk000e1NJLTq001ih001Ef1^@s6K*mz000001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~
z5;qyO=Jb0200O*8L_t(o!|j(nOCwPfhMyZ0i6kHxKVmUBLQoMDWE(}W5F!LpIh9~x
z=Rerru)jcypv8b)#3GGjrAWG@5M(qe30IgXDhhrfhTJXO1b2f=%p`<e@|O3$hx6Ps
z=Y9;d)Y88tQETAQ(UIER+~oN9_^-Z^kr5Ub7a1EH6HS3lr_;(bO{A1n`87>rX=#bc
z$w^nho?3!(xm?wt08&bFxm;u0Ael_6gM$NJUS9Bc-q)p+!f_m~udlz9sHdlgfq?;p
zcu!d@7V&z$%*@O%Jv}X4!6uVQ6_3a3Qjx!DaBvXAFqoQ}5;eEM*49?TK}#(akH@R>
zwtY5{&1M?{*WKOC@bEBqcX!yf{iR%O^#bVc@29=J9e}sDH!d$PxxKxu@OE`|F)=a0
z#l=M#wpzJ@^>{pJn#TP6JmGNox1O^sOYQ9JAf=>OESAU5&(B$1U9BmfE7+l-Ay!sa
z&~?3HbA-cTk<Dh++S(dtXJ>V3p_*X>fdF%Jb7jztjSY2rdI~@&6k>UKS?IbhEXz{&
z_xIe~+_;AI)EcPkdim4GVlkCSB*<hkWHK2Ni3G7&OqD9E>v~-(TQjWJ>jl7Z994QB
zD5X$J0dR71LO!2YAH7Y3{dl9jzP?t>JC0KxFL|2=TPPF&=;-M95ex<^=0l+not>Sj
zkKU$jFvoGQZCeEb0daVE`2G3$nS4GEKrk3&VPS#Z-rjGvZL9V5_2$A#DX}aIfbsEh
zVcWL4y1D|Oudk2M(NXd1y#3M(ts$_5LV;8&g=v~<c6Js`)5IT(QG0uP?C$P1zYPGM
zo}Sp=-bPBv{{Fu5`~3hsJUn2UCh2s#uJ4LZVSPRykB^Vl{yDe;^Z9)4PJ?JPN~uzf
zl;7_s8jZSxH4H;UB9Xcs=$~CIkw^r?Fa#~N)KW|Tr+xzC@*}1K)0E!;0000<MNUMn
GLSTZA2z(O&

diff --git a/doc/img/chain.png b/doc/img/chain.png
index c8f8bf1f34b517bebaab55ea81b8c0b660335446..6537c07d424060594ad718780d7ccd5bd7f4336e 100644
GIT binary patch
delta 337
zcmX@g`h>~2Gr-TCmrII^fq{Y7)59eQNGpIa2OE$quB!S1q}Y<Y-CY>|gW!U_%O_8C
zkgLDTBEhLITQf=c7EoR`GbEzKIX^cyHLnE7WngeFN=+<DO;IS%EXh!C_w)@&(Mx3q
zil6XwaSVw#{C27#SBrswYy7la8%HVW?m5RVMR&||`5-n=(^X2^KVjxtr8Tn~J9NxG
z&u;mj{=ks4v(wN`?n-z2QU<OCAoRZe(xKGIO?B5xU3aPkf08`=naAP&_egusQ|JFZ
z<!lj{v8=ODhB0FnTej}CTk|z@Z@Y0YK3MG@q7!g?Tl{MSo}}DU=WHi+^&PNm|1S6Z
z&cn5@XRTfP`qz!+a_|4{wGIdsW%#`>{jZ9q{qO0F3_XUI1jU|iXZ)fX!oV5;L=E*X
ZMVY_;J@z8o_^>U=yPmFoF6*2UngDhBgf##F

literal 709
zcmV;$0y_PPP)<h;3K|Lk000e1NJLTq001ih001Ef1^@s6K*mz000001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~
z5;r;*frSYG00KoxL_t(o!|j+M(3>z6$N%|m3N#)xasy2?XgnHZ?{M^}M8j3$(NqUb
zH;Ha^(O@$(IB5HAyLQm^u1}F%lKb6z@Bfkq5klZq>;o@kZ`h^m%TfooZTp=u_Vsi+
zLDMwox(;2}$s=cyB?QJ86IqsB%^QY+AP9&o%l`-LXP|?rs){&{?*jf<8q_chNRl*;
zIp;`{L_Aesw?KX0M;L}=zuyy8Rmb_JX;2h}cna)ipp;Sq0J1D2j^i0{S(fX2_D`UL
z$+8UBb;ohv_v^woO>+~}G)+?1wYX8vo_8r+hH?PiZnq*y5-`TZGy-{^k82f0S@%*n
z9*^U<>$;$nlFeo#IOhO>UtSlKQc@JfY_I2e>w0!tk_NMFdp6Fp42&@mhT&BNR)OW5
zi>~XS>-soX6a^S#f>KI+-=D3|^Bjtz5X-V|if^$r;GBynir_eoa2#ir3e&Iy7{%B3
zJ*uh_K@gDD1U7*7eUGv%A<Hr@y*PxOQaY=vUDvJmMC`f_1L)u_#uzTcE=dwJO#|nA
z6x!-f#JaA<w2)ht1<&&cfFTD(p6A%@b^w4Vie~#Mr9W1KofdReRdJbrlu}}vCfc?Y
z(+CV@O;MC@Pw5oS=QB9xw{EB_P|LF5x-R(_Y4F#urfJUZ^(cyFz*F%}K_9IEcR#-K
zJQs(<VJ4;^2mk<Snl1`@SErDssi>;zw`-OFy(?#fARv}ytq%H74^|X~V2q7bLQxbr
rjsx4a7Xe+YyM6!Uc*DM7Ul8^u->gl<RpI_700000NkvXXu0mjfRs=9w

diff --git a/doc/img/friendica_editor.png b/doc/img/friendica_editor.png
index 397c4b59586869436d8b564ee6ea7d907644d4ca..aebcf111b216821f64cc3900dee4a01d2a632812 100644
GIT binary patch
literal 8035
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

literal 14929
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
E1&4~~;Q#;t

diff --git a/doc/img/friendica_rich_editor.png b/doc/img/friendica_rich_editor.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cd8beac998e320e48a94c177ed8fd7a9c91184e
GIT binary patch
literal 9883
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
S5Wq-)AR2o2i|;*t{yzXDs{6M9

literal 0
HcmV?d00001

diff --git a/doc/img/globe.png b/doc/img/globe.png
index b8a319db095a4661ac5b5bc3e4d91b34ec858a84..ec1b7ff4aec990670527960ddfe4de558993da7c 100644
GIT binary patch
delta 790
zcmV+x1L^#@4yFb(iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=24YJ`
zL;(K){{a7>y{D6rKpubH1Q-c1H*;v^(*OVf9cffpbVF}#ZDnqB0000007G(RVRU6=
zAa`kWXdp*PO;BVmWd{HN0*XmQK~z}7?UqeQR8bVie^;V+Uj%dSZeB$BY~vVIGj6gL
zAw=}C%Ake2S{SsmXc4rETxz>1=u1KrT9^<hWM~wqs~IJ5hCqMER&RFiS&Mfk(A&bk
zW|ig(3Fg4vTrT(gIOl)<_X=yRWe1~)9gYS-1K|G!2xAx@U#D1zw*?@!>I20>%wk~%
z<wXPrq5y>O$Ye8kQj*QN{{|q8p)bEgt5fE}i7L_)6oMFxrp-6>KS}X?B1KP^&%K+6
zl5as@eu=TE5}tpaCkP?{JS71rEK15z8pm}R7_M-qe<@jj(eaS{aD`e;648w3dl+d5
zSS6B@-ls=-H>-#uiC_a_v)b6TnM3)}Wdts(v0|jCQL4<dm#6qp)a+IuYJi9l4m8zZ
z&BpW(FEf-oynPLXp=JN+8JdJdI1+^9%yDS-4N6scTS|ZPsj88{=Lmuz#MTVjF)X|}
ziFUVHfnw2Mi2?a@@AVu^&S?&2Jg%Ls;>apFze;{W@nSRuz!wvPvEYgXeL(zz5U#{=
zU~oE3&I>`WaP?w|2Y0LNQHGi^$%rtUmGv8T<6;{dKF%9bR8X=^$c8A>{sIHH=h>?g
zngXo_xmJH&mmK)s7ML$9hNl#M=x|;uax_yZDUM`3v=+&X;gw7KShogSt1qi1=Bt7G
zW5*~}(o}+o@!6Qci4@nnT9WgD?sFa;S@{dX)~{@{!S^F(Dh|E*6wRJTXQxiqikFuy
zmv0p)tr(hq6C(~hys^S!0FOpe97t<kJ<j26qWoH0nu3-V!Q@aoz1?ZntzpfEtXqRi
z$aHZdc~4gx?}yqqo&2v}!ygaRY%wIL8e9o!smOM?e>9!M02)7{20#O#0gz;T11S<2
UW;N5uG5`Po07*qoM6N<$f--nmSpWb4

literal 1848
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

diff --git a/doc/img/lock.png b/doc/img/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9a1cefc5c88f8b6d46e10cb17fd52243a0a9c2a
GIT binary patch
literal 451
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwYMS_b%wMTe)1yD#fGbEzKIX^cyHLnE7WngeFN=+<D
zO;IS%EXh!C_w)@&(Mx4#U|>}Dba4!cIQ(|nS+Bzm0uB4GT$*DWS#)jj54pJF4~#Wp
z`nA*dR%soaoF7niAv#m@pNi@v6UE(|<y4Xcy)t?j?>43;rk6i!o;g?Yd{p+!K(;SB
zd<PgU8tyT+<??DQ-8Z*2@y3t6*Ov)tE#){o;bsn-!>nZ;9IwCbGCXpSVe4lV&yGbI
z?&2(rtFNvSbXhHM<=lR&ATLFwdKFIj{PPSKijEW{l$Gsp%>G;X{>!I_3JrTL1EkHa
zYJ2oum1bCz5-~Zcv}wAn;e5XxJK{<{^ZM>|*nd~~s<Bo7#mY|`H%ZJrK4(sRpi1ce
z))l9G+Zlr1h2AdeG~H&+pnbdk4)>R^3Dd1Lrt>ri8hon#aJ<0gA8Uh?@qE7(M$Q{o
oMjhQXIqeCX5c>lLnFIbOtP|9iNPO>5Z3cy<r>mdKI;Vst0P_H^KL7v#

literal 0
HcmV?d00001

diff --git a/doc/img/mic.png b/doc/img/mic.png
index 616e798592c2395e79cebcfb318feb586540fd05..c8d4c0e382ee89a59f0554bd2429d0707e4b1de6 100644
GIT binary patch
delta 600
zcmV-e0;m1?2k8VeiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=24YJ`
zL;(K){{a7>y{D6rKpubH1Q-c1B=^>&4FCWD9cffpbVF}#ZDnqB0000007G(RVRU6=
zAa`kWXdp*PO;BVmWd{HN0nJH7K~z}7?bbhQ6hRor@$cRo-0h#+J0o17LV^*a#E60c
zv9%F=1y&MbVG4`bt1ltG0}Bzm6jo`K5QEVq5>E(R3gIm7@K%4Km%X{2of(UOwJCNF
zWS@56;lmH+$KzOQEn}P#W1a#~0RA69YyW^(t83!{tZ#k-K&2*sz`KnP^!q;ma6~y@
z!27Koy4@~e7$Sr~h*Exlt?fP9?KX`@gCGbfm&;Tt?uqyOb7pVW-Vz-i^7`cqZr{1f
zDZfIq*`!{t<NJR;j^m(Il3fC(S|uJ15u!w`7UKIpp64NiKuU>}k~lufE`ie%mzbHp
z$j8lfX0KeObMTeHVDR@nsMUz$VRnFT?G5&&<a?*X=iP0L{Eh3n#Bq$Z7Nry;nPCFE
zJ70)?_UQGxv|24Df(q4Yl^_TZLg4#87@Zwpa_SuYs7rsEYN9AY{<4H&2!Q8#7;DkS
zWCwV(c#pkX^T-GH(OUC-Wd+xDNtB|ZHP#p$$H}$_<}P1g{`wp@Z(QTa(`N`FNJb;l
zG(G+)TIW|pvoq&eUVe-<h9pU_*5Z_$e5-hR@(d4`mQX4|YYjGMz%k-13k!>+siIUq
m`8uaK%L^Pp0Vn|D2K)gB(X&kwD(JER0000<MNUMnLSTa5)CaHt

literal 1017
zcmV<V0|xwwP)<h;3K|Lk000e1NJLTq001ih001Ef1^@s6K*mz000001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~
z5;!Ft5tK6k00VhRL_t(o!|hnlOKMvb{`N`DQfUyCR%k`Pj2whVN}7al=TTIn{(u@a
z>&~LtYZmk`G>IU>iGvG~P?%)DL8-(aC(_bN$U180wD%ia@bxa-?B1*P;<bn8d~2U?
zpS9Mv*4l(IhL5s1e4wQ$)<(Ctw|}jytjzB0>_8Mn06=whH3kL-FflQ)P+MF3^-sS+
ziV+5vmzQjDaS_+o*T`nGpp<@h8^=MdR->Vz0W&i*XliOA?-~ZlWYXtyxeyMAA&O$2
zC;(7OA&Mfx;V@h-7m~@O?_J3z5(%r@?JkIOyWL1664rMmo6F^p$z%%RGMNl=x!nIp
z4L-^KXUWR4ToP<ibasAzo~hMpJUu<Z;c%e8zn}R1epXRY@v7bP^D}ySdWhHSWg8nC
zP^nbNX0w=^n|rhN{&EGYsj0#C_BI$}XlZGI)oMj36oOKzeAP~pBy@ImA`}YY=;#Q9
z5DX3umbTnZO-+$#G|Db6E}+$F5s5_D^78VVY`eR=nO3U>05mr@V|sd;lr&~5D=Wcq
z|CkkW|I76f%W)i3D%GbN{5(SmDG9ddWYg(1?(Xj1jE}`)dAuykxWB(IJy}VT005~}
z3bHJtx3{;Tjm2VtEX#Salu~Fkn$nZi>-7KtK@cE{BF4wZ^Ur>U9~~V<DwRSg6aoMk
z42EAy&flICY&IJNK|nMbh2QUo#bUwO*ci69ws3WIg>*U%0MO}l(ChWE+wD*&6gW9K
zK{A;{U0oe)Hd}ed8lLCB93CEiyScf6$KwIVahRN(Bqo!IMIsRhf&fY>OeParTU()2
zDzUV*gkUfT0BCD#1JCnc$~M;Q?(VYn^>v({p5{f~;c$TGdDPd}6G@T~kH^{Z@iA6c
zSM$AWS63H?hlgRa*+|*Q0ze=TU~6k@I5;@??k0r-9LMF02Bj2~(tHEc*Vl)Ukr9~9
z=HJq=KO##hMLZs7dwYBEcsvLOgZObjLI~R1+hMocVYOOeFc`?o3Rw2(R+1!~pP#dZ
zg#|o5KK|>SMx(*(>?}GuI!K{rr{wnr>2w-_K!BZ{o#plS$Aj$e@8jX&ftk%_qSNW#
z=iWdN1h%=k37^l0SS<D`wz07hJkMijXb485k(B+<dc9saoz6FxTBp;As;Vj&jmGl#
n1`36uEH*_=u+QoCqm%s`N}Gz!Xu3)#00000NkvXXu0mjf0aet*

diff --git a/doc/img/paper_clip.png b/doc/img/paper_clip.png
index 1d9cc0a0921c16a8f1f4b9ff9637f2a5394d3a77..51c7cdf704420edb34db4c75199bb5bfb9be7717 100644
GIT binary patch
delta 635
zcmV->0)+kN4W0!diBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pP$wf87Ka
z2`>|yDn8u+0013nR9JLFZ*6U5Zgc<u0000(a%Ew3Wn>_CX>@2HM@dakWG-a~00064
zNkl<ZSi|ksv1%$o6oBD>RV-9iK_x5}nxu(>jin@{(ZWs<Nnw*m*%ydtNE=B+#3C_?
z?;rt#g`FS>f)?AjSvR{z3GsHff8LuIQrtb|z|4FzhjV6x?RLB67sJ6XhYhd+HsIF*
zu3ao*nkJo22e;czI-SPpbRtQTrMbd)JE5-YJU%`G@b>nGD2gbGLOdQPm&^TZ3QW_a
z+wJ1_``K(ZoSvRiE|)133OqeM{cH-}-`{z7c);uRvR<!Ar_;paaRA(Ie>YYy_Dg`(
zYDKfzBp3|ha5zXL5*!>HaB*=#G#X_*9%C5B&j55?r`>K73WadFT<q=b5sSsBR;$Ef
zF;rD$GMR97b+vndrfJ;W-4TgI`274tk|dJJB(f}%OeRqjg_oBXs?{oiKw!6k<#NgW
z{XLOL1VIqk-{0r(@DN#+e@UfM%w{v5pP#wByd)S5T0WGeGJJh~rPXR7NfP;dp4;17
zrqd~l#e(DGW9IWYy<U%-n;X1d@9sOHs;Yc^e2~dx5Cnnq^K*`ljwlw3D2l>xIOO{J
z`kyzq4Dfh7Xqtu~2!F>;PEP3e`wRvHDwPVND1ND&Eu~<y*-)?7QCY9ooSmJasw%Zw
z4Z|>~R4RnS;V(Bc%dL2|S}_`pXfzrqibAPWBAd<P^ZCB@jtKUz*ap}D8}Q!){s8s-
V&Mndq`I-O#002ovPDHLkV1hVR9TETl

delta 1741
zcmV;;1~U1c1?LSeiBL{Q4GJ0x0000DNk~Le0000h0000X2nGNE06@l4rT_o{0drDE
zLIAGL9O;oEFn`<$5)%R}K&F`4000JONkl<ZSi|j@+e_4WAID$cQD;QQcG5~qvMeV@
zX;LYbN)$TK;U=QY##0&H2ze1CN&N%66iOEvJtWbE<0+#grJNeA1`nY*Sz1;r)4`0v
z(NeQUXXd*X&*MPU(^jjy1pB%C9X`DH9N*uskW%uqn16zw$o_?$E%TjC=UrW0vZ0}Y
zo}L~iCnvqnH5v_RX=!ZOuz~RKaPh7F#B4R#i4!MePfrgM6BBqmp3mO<`1mk?{(N@q
z*umz_o5eo@Yq#5ni;Iir+H5vlE|)io5fKq66bhV9C*9rMw6wGUFmK*GcJ12rO~5k>
z`{vCXd4KBEDV{!k3P4&~8e6t(Au1|LxLhuzl&DlH#>U3Dd-txatE*#RV1Tf&FpeKT
z&ccNY#oto10|Nu{?Afzk(3F%E_U_%=>F@8qroO&j_V)JTbUFzR4kk4<m5m!W3P7GY
za|XNJj@fJ`D=TaE8|=l47xKb|3-tE(0<d=NT7NP#Ge;B(#f|dva@o?-!o<Xc_xr)Y
zK>(SYoGh$Xt88s;<<_lRe+v7TN0-fJlSZSF`}gkykeHZAc6K&?etvtZs;Z9OxN(Dt
zi3y^kqe)CmBqSt+zP>)pW;1HFn)vv50EUN$XLoejY&Ka_Q$t5b2LK5P3FPMH;_vS-
zs(-4gq}gotmc-VrTTv>NT)upnmX;PA4hK%B6MujI*<T9JpFfuuFJ7d*y&ZtKxH$Ij
z-;Y|Y7Bw|Bvazwz8)<{VfKI0qLI}pk#{p0(l>oTi?%9QX`SPW#uCAu7tqlOZUQb?L
z9vY2C)YjI@YuB!MBYp7T!QVndL&e*-Z-1AWOeVU!yHP5Y=yW<%DiyC^zXrh1&u`|-
zU~q6ymY0`%Q?J+SIdI?rbLY+#wY9bK>eZ_#6bfQvV>xu_koe`7UwHriJ>}))zc)2C
z0kCGx8a8d(wAp5}$)=_zgb?U-x|xNw+wH?;Wo1~cRsdG5T18%79>KxEqPDhH)_>L2
zp-?D@j*jNYkt0H_R^xO!Id|@yv{)<vBqt}6m6e4;p}1i(nQ%B91Ox=IZQHh)gLOC@
zzm}Gk&VBgsApr65@t>rA8dR&*QdCqV0s{kaxm=t+eOk7+w<D!w-MV#TXJ?NnmC7}h
zm6g(DGU4OngI230DJe<J2<*tn$bY7il9Hp3A3p|Q_3G8+=H?O<6eOyvt7UzCy%+S@
zv11}IFc6Q&LrF=Aym#*&ZnvA1loYbEvO0ZzeTyn8Dt^Ct^CkeHp`jEM6fB=H)m2<v
zZ0hUl10X3WiHwX4!o$PGqeqYAbV=xRItmL5MPOhcQc6yqJSnYKD^pWbq<^NSl9`!V
zBZTNT8jYsu+FiVOF^3NyMx)X6&j@T;S()tb??*~Wa&j{1>FF$4vP1wZU%p(Vr>Dz~
zjt+8ia()X63c~GnQ&LhQtyU|Olar*SrC~4_YJ?E|6%`dno12>fh>VORKR=&{h=^~N
zh+l<$_3D*uZEeNrbdr#ez<<u2J6XDPsn@wusU$HmQN+Z={2CGxQZzX^Noi@R?Ck9H
zM$}+1)BqTb#-n%c+yOwV)smN&$FgP1#P>A#S79GKc)<AhI0}V=?c28#6&3ZFbCpVk
zN~J3L@ZkgJ&!3lVZEd(*E>cobFc=J-|4aQ*i^YP+;~_danyjoWR)4HmA-;EPeie3f
zbkwUk7cE-!f4>_W8>6zaQZ_d?<MDXBLdM6(=RZcH@vOyS!R>Yv6B9#5Mh3C5vEoOT
z(N|%oweFXc{<OV&_l`@KF3IcHuYV?FDk>^Ww{PF}Ms&}fJ*-^0QvB$O|LVF82?+sU
zXlMwV&GyCFd*#X%S$|(&|Cx}fuC6wj&1O6v4_d7jgTa7aum54tKaH$juV>DjISdaE
z)6md>+wGQ-k&y@?7#<$RVzDqSSmNU1*tc&VYPDKaRaHro$>i<&oSd8=PW^WsYm7#t
zY;0^~e0-dMfB>SSqfsiAJbU&Ghr{uSkO>V96-J}c8|m=yaDVdi^U>*ae;M?f=4@tW
zrkI$RkR2TzjE;`d)z$UiAANn%Xf(ve#<F|&ZXzNgL~n1e7j(gb1r!t%d~t%zT4bl~
z$&)9tt*s5a-Okk16k%autY5$WlMysBGP0?-xY#r_G(=%x;djr`zx^ow@#9B;?>Yhe
j<Ch%&Ud;VWuoiy+XBO7}dsA0e00000NkvXXu0mjfi<eql

diff --git a/doc/img/video.png b/doc/img/video.png
index be023d746d671684c023a2dd4760503039fe157e..00561f1b3e219cfa84a92adc0b712035ad6e1178 100644
GIT binary patch
delta 594
zcmV-Y0<Ha{1oZ?ViBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pP$wf87Ka
z2`~aYz!0$j0013nR9JLFZ*6U5Zgc<u0000(a%Ew3Wn>_CX>@2HM@dakWG-a~0005m
zNkl<ZSi|j>?<)gw9LL{x%+sB=dEnPl%C8in<_V8zYviF;tGfsO0woXe&=U`xgjyc?
z4<<ZV#2L8<v#zC98<MaQG0Z+5f8g50ZrMrcUiIzj+xxoLx9|JDcMK5`{ty;_j3HnM
z7y_CC56{0Vz-S#rEXyL3$^4o?saC+*=LE~L;CUVg`v>Ug?D#h8aP*?bIfN#AdEo}6
z0mCrl>UR+lkt~PvW@R}{f*?>(Ialx1qO=f6|C%34EQ#ISAlllRF*z~we`RiRY835_
z?U<b&htKEJ?=29;CA8F8AV~o{r{Ct>9xv)$ygF9=I{<*heHwG(ELvMy_31$D_yQ3n
z0#RIoBn8y@$aM*#(P&Qg_~{G)u(>7cSHd#01r1FNuv$4tQUICs!`o`#SNxfvv<|n&
zi>k^hgu<cXOPGxy2$V?Ne^C77lHw<qL`3S9h-mLNL=3~^3|&f?P3olti}MQrfEE7^
zhMnE&{x5G#sGTu!HjH=%i{FCJq#sjod%S89&88Fv#`<$ICeDT$dmUD{5A_vrIC^2P
zvE|M1JP!ciI4imuD~dmgvr%G6oE|BNUnTSAYAxk3SJ&$=@F8(mD8Lu0kca<B!1y6C
g1PlQ~;NJ<n0#W2}OIaG<qyPW_07*qoM6N<$f{&aBSO5S3

delta 511
zcmV<b0RaB>1fv8liBL{Q4GJ0x0000DNk~Le0000h0000X2nGNE06@l4rT_o{0drDE
zLIAGL9O;oEFn`<$5)%X`fiC9P0004_Nkl<ZSi|j@v5LY#6h-eyMhk<5h$0fPvaz<X
zv{10H5G<{C3$d~AUpAFL5d45BTG?3p0cr#lwU9K)gv=JpF3XB;F(V|9TMiH2;gNUm
zBZPB~uqcKQDT0k)!v?GTS1=llxMf*zU00|Pr4-d_6@SCwki2ZNmSur4COj3!7!HTS
z)0+K$&xK%J*M%%Eb{ywnkNJGgbzK+x45Thd?0z=a>-BB9Tz<@EGwgP|;K2UX@p$CZ
z=@h1E!nSSk1$%{j-^X^l<%VHkwOYaRJUMP4Q-pjO!Fs*s<M9}q%|@<u$&_u|Fin#i
zhJnlFB7fg!W$JdjVKSNEd_D(1!935y>2wN5+$xHKY&IJX*i<ToPN#!RCiAmwfrV97
z6^%xN^!t4ji^X8We#dsDQXzxE0JT~TilPJ)_IK=-N+r_k_0Vp&p{i=|@7Y`~M_R4c
zd$-$#rfI?QS>N~X-qPu`-fTAYWHQMYi-j0$JV+h~V@%4Km`EfZ_NdqEq+BkG-Lsme
zfl?|AN-0G?pMP3YC={Oh8Hs*!M6eNT1RKG=RG*@Vl~{taLJa@_002ovPDHLkV1fk%
B>SO=_


From f41c5dd1e5999e7ce0bfc1515d6998d5fa0986cd Mon Sep 17 00:00:00 2001
From: pixelroot <info@pixelbits.de>
Date: Wed, 24 Apr 2013 14:09:24 +0200
Subject: [PATCH 31/67] 	modified:   view/theme/smoothly/css/typography.css 
 modified:   view/theme/smoothly/default.php 	modified:  
 view/theme/smoothly/style.css 	modified:  
 view/theme/smoothly/templates/nav.tpl 	modified:  
 view/theme/smoothly/theme.php

---
 view/theme/smoothly/css/typography.css |  2 +
 view/theme/smoothly/default.php        |  4 ++
 view/theme/smoothly/style.css          | 74 +++++++++++++++++---------
 view/theme/smoothly/templates/nav.tpl  |  5 --
 view/theme/smoothly/theme.php          |  2 +-
 5 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/view/theme/smoothly/css/typography.css b/view/theme/smoothly/css/typography.css
index 9dda273b0e..074bd98163 100644
--- a/view/theme/smoothly/css/typography.css
+++ b/view/theme/smoothly/css/typography.css
@@ -13,10 +13,12 @@ tt {
 /* (en) base layout gets standard font size 15px */
 /* (de) Basis-Layout erhält Standardschriftgröße von 15 Pixeln */
 
+
 body {
 	margin: 0 auto;
 	padding-bottom: 3em;
 	width: 960px;
+	height: 100%;
 	font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif;
 	font-size: 15px;
 	font-size-adjust: none;
diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php
index 785e543a96..867073f0c1 100644
--- a/view/theme/smoothly/default.php
+++ b/view/theme/smoothly/default.php
@@ -27,6 +27,10 @@
 
 	<footer id="footer">
 		<?php if(x($page, 'footer')) echo $page['footer']; ?>
+		<div id="scrollup" >
+		<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a>
+		<a href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/tobottom.png" alt="to bottom" title="to bottom" /></a>
+		</div>
 	</footer>
 
 	<?php if (x($page, 'bottom')) echo $page['bottom']; ?>
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 51775d5291..bf7e639e0a 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -2,7 +2,7 @@
   	style.css
   	Theme: Smoothly
 	Maintainer: alex@friendica.pixelbits.de
-	last change: 2013-04-01
+	last change: 2013-04-24
 
 ** Colors ** 
 Blue links - #1873a2
@@ -18,7 +18,7 @@ Orange - #fec01d
 
 @media only screen and (device-width: 768px) {
 /* For general iPad layouts */
-#page {
+#body {
 	-moz-background-clip: border; 
 	-moz-background-origin: pdading; 
 	-moz-background-size: auto auto; 
@@ -133,11 +133,16 @@ input[type=submit]:active {
 }
 
 section {
+	position: relative;
 	float: left;
-	margin-top: 50px;
+	margin: 50px auto -2em; /* the bottom margin is the negative value of the footer's height */
 	width: 730px;
+	min-height: 100%;
+	height: auto !important;
+	height: 100%;
 	font-size: 0.9em;
 	line-height: 1.2em;
+	padding-bottom: 2em;
 }
 
 .lframe {
@@ -316,11 +321,9 @@ section {
 /* ========= */
 
 .pager {
-	padding-top: 10px;
-	padding-bottom: 10px;
 	display: block;
-	clear: both;
-	text-align: center;
+	/*clear: both;*/
+	text-align: left;
 }
 
 .pager a {
@@ -347,7 +350,7 @@ nav {
 	list-style: none outside none;
 	margin: 0;
 	padding: 0;
-	width: 960px;
+	width: 958px;
 	z-index: 10000;
 	height: 40px;
 	position: fixed;
@@ -569,16 +572,16 @@ ul#user-menu-popup li a.nav-sep {
 }
 
 #lang-select-icon {
-	bottom: 6px;
+	bottom: 5px;
 	cursor: pointer;
-	left: 28px;
+	left: 915px;
 	position: fixed;
 	z-index: 10;
 }
 #language-selector {
 	position: fixed;
 	bottom: 2px;
-	left: 52px;
+	left: 945px;
 	z-index: 10;
 }
 
@@ -1723,7 +1726,7 @@ ul .sidebar-group-li .icon {
 #item-delete-selected-end,
 #item-delete-selected {	
 	overflow: auto;
-	margin-top: 20px;
+	margin-top: 0px;
 	float: right;
 	width: 250px;
 }
@@ -3720,23 +3723,23 @@ margin-left: 0px;
 .field {
     /*margin-bottom: 10px;*/
     overflow: auto;
-    padding-bottom: 0px;
+    padding-bottom: 10px;
     width: 100%;
 }
 
 .field.radio .field_help {
-    margin-left: 205px;
+    margin-left: 255px;
 }
 
 .field .field_help {
     color: #666666;
     display: block;
-    margin-left: 200px;
+    margin-left: 225px;
 }
 
 .field label {
     float: left;
-    width: 210px;
+    width: 225px;
 }
 
 .field checkbox {
@@ -3746,7 +3749,8 @@ margin-left: 0px;
 
 .field input,
 .field textarea {
-	width: 400px;
+	/*width: 400px;*/
+	float: left;
 	border: 1px solid #7C7D7B;
 	border-radius: 5px;
 		-moz-border-radius: 5px;
@@ -3921,10 +3925,32 @@ margin-left: 0px;
 	font-size: 0.7em; 
 }
 
-footer { 
-	display: block; 
-	margin: 50px 20%; 
-	clear: both; 
+footer {
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f0edf0), color-stop(1, #e2e2e2) );
+	background: -moz-linear-gradient( center top, #f0edf0 5%, #e2e2e2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f0edf0', endColorstr='#e2e2e2');
+	background-color: #f0edf0;
+	border-radius: 5px 5px 0px 0px;
+		-moz-border-radius: 5px 5px 0px 0px;
+		-webkit-border-radius: 5px 5px 0px 0px;
+	border: 1px solid #7C7D7B;
+	border-bottom: none;
+	box-shadow: 1px 2px 6px 0px #959494;
+		-moz-box-shadow: 1px 2px 6px 0px #959494;
+		-webkit-box-shadow: 1px 2px 6px 0px #959494;
+	color: #EFEFEF;
+	display: block;
+	float: right;
+	font-size: 15px;
+	height: 2em;
+	list-style: none outside none;
+	margin: 0 0 0 755px;
+	padding: 0;
+	position: fixed;
+	bottom: 0;
+	width: 203px;
+	z-index: 10;
+	clear:both;
 }
 
 
@@ -4295,9 +4321,9 @@ ul.menu-popup {
 /* SCROLL TO TOP
 ----------------------------------------------------------- */
 #scrollup {
-	position: fixed;
-	right: 1px;
-	bottom: 260px;
+	position: absolute;
+	right: 70px;
+	bottom: -4px;
 	z-index: 100;
 }
 
diff --git a/view/theme/smoothly/templates/nav.tpl b/view/theme/smoothly/templates/nav.tpl
index 0bbca7e694..dd98189a9a 100644
--- a/view/theme/smoothly/templates/nav.tpl
+++ b/view/theme/smoothly/templates/nav.tpl
@@ -61,11 +61,6 @@
 	</div>
 </nav>
 
-<div id="scrollup" >
-<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a><br />
-<a href="javascript:ScrollToBottom()"><img src="view/theme/smoothly/images/tobottom.png" alt="to bottom" title="to bottom" /></a>
-</div>
-
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
 </ul>
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index be63b4d542..76b3abc907 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme optimized for iPad[2].
- * Version: Version 2013-04-1
+ * Version: Version 2013-04-24
  * Author: Anne Walk
  * Author: Devlon Duthied
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>

From 1ed6a2bd3d32c3c1ba472e0d167a2039a956ba93 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 25 Apr 2013 02:36:52 -0700
Subject: [PATCH 32/67] rev update

---
 boot.php           |   2 +-
 include/bbcode.php |   4 +
 util/messages.po   | 580 +++++++++++++++++++++++----------------------
 3 files changed, 297 insertions(+), 289 deletions(-)

diff --git a/boot.php b/boot.php
index b306662eba..6a273d9cc9 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1679' );
+define ( 'FRIENDICA_VERSION',      '3.1.1681' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/include/bbcode.php b/include/bbcode.php
index 01c8f14df9..c341f37f97 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -407,6 +407,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 	$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="external-link">$2</a>', $Text);
 	//$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
 
+	// Red compatibility, though the link can't be authenticated on Friendica
+	$Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a href="$1" target="external-link">$2</a>', $Text);
+
+
 	// we may need to restrict this further if it picks up too many strays
 	// link acct:user@host to a webfinger profile redirector
 
diff --git a/util/messages.po b/util/messages.po
index 9ba4ad9dc1..370cd01015 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1679\n"
+"Project-Id-Version: 3.1.1681\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-23 00:02-0700\n"
+"POT-Creation-Date: 2013-04-25 00:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,16 +21,16 @@ msgstr ""
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
 #: ../../include/nav.php:77 ../../mod/profperm.php:103
 #: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88
-#: ../../boot.php:1877
+#: ../../boot.php:1945
 msgid "Profile"
 msgstr ""
 
-#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1072
+#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1079
 msgid "Full Name:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
-#: ../../boot.php:1417
+#: ../../boot.php:1485
 msgid "Gender:"
 msgstr ""
 
@@ -51,7 +51,7 @@ msgid "Age:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
-#: ../../boot.php:1420
+#: ../../boot.php:1488
 msgid "Status:"
 msgstr ""
 
@@ -65,7 +65,7 @@ msgid "Sexual Preference:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
-#: ../../boot.php:1422
+#: ../../boot.php:1490
 msgid "Homepage:"
 msgstr ""
 
@@ -401,306 +401,306 @@ msgstr ""
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/text.php:313
+#: ../../include/text.php:294
 msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:315
+#: ../../include/text.php:296
 msgid "first"
 msgstr ""
 
-#: ../../include/text.php:344
+#: ../../include/text.php:325
 msgid "last"
 msgstr ""
 
-#: ../../include/text.php:347
+#: ../../include/text.php:328
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:371
+#: ../../include/text.php:352
 msgid "newer"
 msgstr ""
 
-#: ../../include/text.php:375
+#: ../../include/text.php:356
 msgid "older"
 msgstr ""
 
-#: ../../include/text.php:837
+#: ../../include/text.php:807
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:846
+#: ../../include/text.php:816
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:858 ../../mod/viewcontacts.php:76
+#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
 msgid "View Contacts"
 msgstr ""
 
-#: ../../include/text.php:935 ../../include/text.php:936
+#: ../../include/text.php:905 ../../include/text.php:906
 #: ../../include/nav.php:118 ../../mod/search.php:99
 msgid "Search"
 msgstr ""
 
-#: ../../include/text.php:938 ../../mod/notes.php:63 ../../mod/filer.php:31
+#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
 msgid "Save"
 msgstr ""
 
-#: ../../include/text.php:987
+#: ../../include/text.php:957
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:987 ../../include/conversation.php:211
+#: ../../include/text.php:957 ../../include/conversation.php:211
 msgid "poked"
 msgstr ""
 
-#: ../../include/text.php:988
+#: ../../include/text.php:958
 msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:988
+#: ../../include/text.php:958
 msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:989
+#: ../../include/text.php:959
 msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:989
+#: ../../include/text.php:959
 msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:990
+#: ../../include/text.php:960
 msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:990
+#: ../../include/text.php:960
 msgid "slapped"
 msgstr ""
 
-#: ../../include/text.php:991
+#: ../../include/text.php:961
 msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:991
+#: ../../include/text.php:961
 msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:992
+#: ../../include/text.php:962
 msgid "rebuff"
 msgstr ""
 
-#: ../../include/text.php:992
+#: ../../include/text.php:962
 msgid "rebuffed"
 msgstr ""
 
-#: ../../include/text.php:1006
+#: ../../include/text.php:976
 msgid "happy"
 msgstr ""
 
-#: ../../include/text.php:1007
+#: ../../include/text.php:977
 msgid "sad"
 msgstr ""
 
-#: ../../include/text.php:1008
+#: ../../include/text.php:978
 msgid "mellow"
 msgstr ""
 
-#: ../../include/text.php:1009
+#: ../../include/text.php:979
 msgid "tired"
 msgstr ""
 
-#: ../../include/text.php:1010
+#: ../../include/text.php:980
 msgid "perky"
 msgstr ""
 
-#: ../../include/text.php:1011
+#: ../../include/text.php:981
 msgid "angry"
 msgstr ""
 
-#: ../../include/text.php:1012
+#: ../../include/text.php:982
 msgid "stupified"
 msgstr ""
 
-#: ../../include/text.php:1013
+#: ../../include/text.php:983
 msgid "puzzled"
 msgstr ""
 
-#: ../../include/text.php:1014
+#: ../../include/text.php:984
 msgid "interested"
 msgstr ""
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:985
 msgid "bitter"
 msgstr ""
 
-#: ../../include/text.php:1016
+#: ../../include/text.php:986
 msgid "cheerful"
 msgstr ""
 
-#: ../../include/text.php:1017
+#: ../../include/text.php:987
 msgid "alive"
 msgstr ""
 
-#: ../../include/text.php:1018
+#: ../../include/text.php:988
 msgid "annoyed"
 msgstr ""
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:989
 msgid "anxious"
 msgstr ""
 
-#: ../../include/text.php:1020
+#: ../../include/text.php:990
 msgid "cranky"
 msgstr ""
 
-#: ../../include/text.php:1021
+#: ../../include/text.php:991
 msgid "disturbed"
 msgstr ""
 
-#: ../../include/text.php:1022
+#: ../../include/text.php:992
 msgid "frustrated"
 msgstr ""
 
-#: ../../include/text.php:1023
+#: ../../include/text.php:993
 msgid "motivated"
 msgstr ""
 
-#: ../../include/text.php:1024
+#: ../../include/text.php:994
 msgid "relaxed"
 msgstr ""
 
-#: ../../include/text.php:1025
+#: ../../include/text.php:995
 msgid "surprised"
 msgstr ""
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1352
+#: ../../include/text.php:1322
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:1379 ../../include/text.php:1391
+#: ../../include/text.php:1349 ../../include/text.php:1361
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1553 ../../mod/events.php:335
+#: ../../include/text.php:1523 ../../mod/events.php:335
 msgid "link to source"
 msgstr ""
 
-#: ../../include/text.php:1596 ../../include/user.php:237
+#: ../../include/text.php:1566 ../../include/user.php:237
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1608
+#: ../../include/text.php:1578
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1860 ../../include/conversation.php:118
+#: ../../include/text.php:1830 ../../include/conversation.php:118
 #: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
 msgid "event"
 msgstr ""
 
-#: ../../include/text.php:1862 ../../include/diaspora.php:1874
+#: ../../include/text.php:1832 ../../include/diaspora.php:1874
 #: ../../include/conversation.php:126 ../../include/conversation.php:254
 #: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
 #: ../../view/theme/diabook/theme.php:464
 msgid "photo"
 msgstr ""
 
-#: ../../include/text.php:1864
+#: ../../include/text.php:1834
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1866 ../../mod/content.php:628
+#: ../../include/text.php:1836 ../../mod/content.php:628
 #: ../../object/Item.php:364 ../../object/Item.php:377
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:1867
+#: ../../include/text.php:1837
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:2022
+#: ../../include/text.php:1992
 msgid "Item filed"
 msgstr ""
 
@@ -751,7 +751,7 @@ msgid "Finishes:"
 msgstr ""
 
 #: ../../include/bb2diaspora.php:415 ../../include/event.php:40
-#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1415
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1483
 msgid "Location:"
 msgstr ""
 
@@ -958,7 +958,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: ../../include/contact_selectors.php:80 ../../mod/settings.php:701
+#: ../../include/contact_selectors.php:80 ../../mod/settings.php:705
 #: ../../mod/dfrn_request.php:842
 msgid "Diaspora"
 msgstr ""
@@ -1001,7 +1001,7 @@ msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
 #: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
-#: ../../mod/match.php:58 ../../boot.php:1347
+#: ../../mod/match.php:58 ../../boot.php:1415
 msgid "Connect"
 msgstr ""
 
@@ -1078,7 +1078,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../include/contact_widgets.php:204 ../../mod/content.php:629
-#: ../../object/Item.php:365 ../../boot.php:653
+#: ../../object/Item.php:365 ../../boot.php:669
 msgid "show more"
 msgstr ""
 
@@ -1266,20 +1266,20 @@ msgstr ""
 
 #: ../../include/items.php:4020 ../../mod/profiles.php:610
 #: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
-#: ../../mod/settings.php:954 ../../mod/settings.php:960
-#: ../../mod/settings.php:968 ../../mod/settings.php:972
-#: ../../mod/settings.php:977 ../../mod/settings.php:983
-#: ../../mod/settings.php:989 ../../mod/settings.php:995
-#: ../../mod/settings.php:1025 ../../mod/settings.php:1026
-#: ../../mod/settings.php:1027 ../../mod/settings.php:1028
-#: ../../mod/settings.php:1029 ../../mod/dfrn_request.php:836
+#: ../../mod/settings.php:961 ../../mod/settings.php:967
+#: ../../mod/settings.php:975 ../../mod/settings.php:979
+#: ../../mod/settings.php:984 ../../mod/settings.php:990
+#: ../../mod/settings.php:996 ../../mod/settings.php:1002
+#: ../../mod/settings.php:1032 ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034 ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036 ../../mod/dfrn_request.php:836
 #: ../../mod/suggest.php:29 ../../mod/message.php:209
 msgid "Yes"
 msgstr ""
 
 #: ../../include/items.php:4023 ../../include/conversation.php:1080
-#: ../../mod/contacts.php:249 ../../mod/settings.php:581
-#: ../../mod/settings.php:607 ../../mod/dfrn_request.php:848
+#: ../../mod/contacts.php:249 ../../mod/settings.php:585
+#: ../../mod/settings.php:611 ../../mod/dfrn_request.php:848
 #: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
 #: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
 #: ../../mod/fbrowser.php:116 ../../mod/message.php:212
@@ -1293,7 +1293,7 @@ msgstr ""
 #: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
 #: ../../mod/contacts.php:147 ../../mod/settings.php:91
-#: ../../mod/settings.php:562 ../../mod/settings.php:567
+#: ../../mod/settings.php:566 ../../mod/settings.php:571
 #: ../../mod/crepair.php:115 ../../mod/delegate.php:6 ../../mod/poke.php:135
 #: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
 #: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
@@ -1548,7 +1548,7 @@ msgid "Select"
 msgstr ""
 
 #: ../../include/conversation.php:588 ../../mod/admin.php:770
-#: ../../mod/settings.php:643 ../../mod/group.php:171
+#: ../../mod/settings.php:647 ../../mod/group.php:171
 #: ../../mod/photos.php:1637 ../../mod/content.php:462
 #: ../../mod/content.php:764 ../../object/Item.php:127
 msgid "Delete"
@@ -1992,7 +1992,7 @@ msgstr ""
 msgid "Clear notifications"
 msgstr ""
 
-#: ../../include/nav.php:73 ../../boot.php:1066
+#: ../../include/nav.php:73 ../../boot.php:1134
 msgid "Logout"
 msgstr ""
 
@@ -2000,7 +2000,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:76 ../../boot.php:1870
+#: ../../include/nav.php:76 ../../boot.php:1938
 msgid "Status"
 msgstr ""
 
@@ -2014,7 +2014,7 @@ msgid "Your profile page"
 msgstr ""
 
 #: ../../include/nav.php:78 ../../mod/fbrowser.php:25
-#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1884
+#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1952
 msgid "Photos"
 msgstr ""
 
@@ -2023,7 +2023,7 @@ msgid "Your photos"
 msgstr ""
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1894
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1962
 msgid "Events"
 msgstr ""
 
@@ -2039,7 +2039,7 @@ msgstr ""
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../include/nav.php:91 ../../boot.php:1067
+#: ../../include/nav.php:91 ../../boot.php:1135
 msgid "Login"
 msgstr ""
 
@@ -2056,7 +2056,7 @@ msgstr ""
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1042
+#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1110
 msgid "Register"
 msgstr ""
 
@@ -2185,7 +2185,7 @@ msgstr ""
 msgid "Account settings"
 msgstr ""
 
-#: ../../include/nav.php:169 ../../boot.php:1369
+#: ../../include/nav.php:169 ../../boot.php:1437
 msgid "Profiles"
 msgstr ""
 
@@ -2390,13 +2390,13 @@ msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
 #: ../../mod/profiles.php:611 ../../mod/api.php:106 ../../mod/register.php:240
-#: ../../mod/settings.php:954 ../../mod/settings.php:960
-#: ../../mod/settings.php:968 ../../mod/settings.php:972
-#: ../../mod/settings.php:977 ../../mod/settings.php:983
-#: ../../mod/settings.php:989 ../../mod/settings.php:995
-#: ../../mod/settings.php:1025 ../../mod/settings.php:1026
-#: ../../mod/settings.php:1027 ../../mod/settings.php:1028
-#: ../../mod/settings.php:1029 ../../mod/dfrn_request.php:837
+#: ../../mod/settings.php:961 ../../mod/settings.php:967
+#: ../../mod/settings.php:975 ../../mod/settings.php:979
+#: ../../mod/settings.php:984 ../../mod/settings.php:990
+#: ../../mod/settings.php:996 ../../mod/settings.php:1002
+#: ../../mod/settings.php:1032 ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034 ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036 ../../mod/dfrn_request.php:837
 msgid "No"
 msgstr ""
 
@@ -2406,9 +2406,9 @@ msgstr ""
 
 #: ../../mod/profiles.php:630 ../../mod/admin.php:491 ../../mod/admin.php:763
 #: ../../mod/admin.php:902 ../../mod/admin.php:1102 ../../mod/admin.php:1189
-#: ../../mod/contacts.php:386 ../../mod/settings.php:580
-#: ../../mod/settings.php:690 ../../mod/settings.php:759
-#: ../../mod/settings.php:831 ../../mod/settings.php:1057
+#: ../../mod/contacts.php:386 ../../mod/settings.php:584
+#: ../../mod/settings.php:694 ../../mod/settings.php:763
+#: ../../mod/settings.php:837 ../../mod/settings.php:1064
 #: ../../mod/crepair.php:166 ../../mod/poke.php:199 ../../mod/events.php:478
 #: ../../mod/fsuggest.php:107 ../../mod/group.php:87 ../../mod/invite.php:140
 #: ../../mod/localtime.php:45 ../../mod/manage.php:110
@@ -2584,23 +2584,23 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:726 ../../boot.php:1375 ../../boot.php:1401
+#: ../../mod/profiles.php:726 ../../boot.php:1443 ../../boot.php:1469
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:727 ../../boot.php:1376
+#: ../../mod/profiles.php:727 ../../boot.php:1444
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:738 ../../boot.php:1386
+#: ../../mod/profiles.php:738 ../../boot.php:1454
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:740 ../../boot.php:1389
+#: ../../mod/profiles.php:740 ../../boot.php:1457
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:741 ../../boot.php:1390
+#: ../../mod/profiles.php:741 ../../boot.php:1458
 msgid "Edit visibility"
 msgstr ""
 
@@ -2628,7 +2628,7 @@ msgstr ""
 msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1901
+#: ../../mod/notes.php:44 ../../boot.php:1969
 msgid "Personal Notes"
 msgstr ""
 
@@ -2800,7 +2800,7 @@ msgstr ""
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:434 ../../mod/settings.php:789
+#: ../../mod/admin.php:434 ../../mod/settings.php:793
 msgid "No special theme for mobile devices"
 msgstr ""
 
@@ -3343,8 +3343,8 @@ msgstr ""
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:766 ../../mod/admin.php:777 ../../mod/settings.php:582
-#: ../../mod/settings.php:608 ../../mod/crepair.php:148
+#: ../../mod/admin.php:766 ../../mod/admin.php:777 ../../mod/settings.php:586
+#: ../../mod/settings.php:612 ../../mod/crepair.php:148
 msgid "Name"
 msgstr ""
 
@@ -4071,7 +4071,7 @@ msgstr ""
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:121 ../../mod/settings.php:606
+#: ../../mod/settings.php:121 ../../mod/settings.php:610
 msgid "Update"
 msgstr ""
 
@@ -4087,530 +4087,534 @@ msgstr ""
 msgid "Features updated"
 msgstr ""
 
-#: ../../mod/settings.php:308
+#: ../../mod/settings.php:312
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:313
+#: ../../mod/settings.php:317
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:321
+#: ../../mod/settings.php:325
 msgid "Wrong password."
 msgstr ""
 
-#: ../../mod/settings.php:332
+#: ../../mod/settings.php:336
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:334
+#: ../../mod/settings.php:338
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:399
+#: ../../mod/settings.php:403
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:401
+#: ../../mod/settings.php:405
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:410
+#: ../../mod/settings.php:414
 msgid "Wrong Password"
 msgstr ""
 
-#: ../../mod/settings.php:415
+#: ../../mod/settings.php:419
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:418
+#: ../../mod/settings.php:422
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:472
+#: ../../mod/settings.php:476
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:476
+#: ../../mod/settings.php:480
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:506
+#: ../../mod/settings.php:510
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:579 ../../mod/settings.php:605
-#: ../../mod/settings.php:641
+#: ../../mod/settings.php:583 ../../mod/settings.php:609
+#: ../../mod/settings.php:645
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:583 ../../mod/settings.php:609
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:584 ../../mod/settings.php:610
+#: ../../mod/settings.php:588 ../../mod/settings.php:614
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:585 ../../mod/settings.php:611
+#: ../../mod/settings.php:589 ../../mod/settings.php:615
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:586 ../../mod/settings.php:612
+#: ../../mod/settings.php:590 ../../mod/settings.php:616
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:597
+#: ../../mod/settings.php:601
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:640
+#: ../../mod/settings.php:644
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:642 ../../mod/editpost.php:109
+#: ../../mod/settings.php:646 ../../mod/editpost.php:109
 #: ../../mod/content.php:751 ../../object/Item.php:117
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/settings.php:644
+#: ../../mod/settings.php:648
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:645
+#: ../../mod/settings.php:649
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:646
+#: ../../mod/settings.php:650
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:658
+#: ../../mod/settings.php:662
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:666
+#: ../../mod/settings.php:670
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:680
+#: ../../mod/settings.php:684
 msgid "Off"
 msgstr ""
 
-#: ../../mod/settings.php:680
+#: ../../mod/settings.php:684
 msgid "On"
 msgstr ""
 
-#: ../../mod/settings.php:688
+#: ../../mod/settings.php:692
 msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/settings.php:701 ../../mod/settings.php:702
+#: ../../mod/settings.php:705 ../../mod/settings.php:706
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:701 ../../mod/settings.php:702
+#: ../../mod/settings.php:705 ../../mod/settings.php:706
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:701 ../../mod/settings.php:702
+#: ../../mod/settings.php:705 ../../mod/settings.php:706
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:702
+#: ../../mod/settings.php:706
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:738
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:741
+#: ../../mod/settings.php:745
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:746
+#: ../../mod/settings.php:750
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:747
+#: ../../mod/settings.php:751
 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:748
+#: ../../mod/settings.php:752
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:750
+#: ../../mod/settings.php:754
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:751
+#: ../../mod/settings.php:755
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:752
+#: ../../mod/settings.php:756
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:752 ../../mod/settings.php:757
+#: ../../mod/settings.php:756 ../../mod/settings.php:761
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:753
+#: ../../mod/settings.php:757
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:754
+#: ../../mod/settings.php:758
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:755
+#: ../../mod/settings.php:759
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:756
+#: ../../mod/settings.php:760
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:757
+#: ../../mod/settings.php:761
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:757
+#: ../../mod/settings.php:761
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:757
+#: ../../mod/settings.php:761
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:758
+#: ../../mod/settings.php:762
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:829
+#: ../../mod/settings.php:835
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:835 ../../mod/settings.php:846
+#: ../../mod/settings.php:841 ../../mod/settings.php:853
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:836
+#: ../../mod/settings.php:842
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:837
+#: ../../mod/settings.php:843
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:837
+#: ../../mod/settings.php:843
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:838
+#: ../../mod/settings.php:844
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: ../../mod/settings.php:838
+#: ../../mod/settings.php:844 ../../mod/settings.php:845
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:839
+#: ../../mod/settings.php:845
+msgid "Number of items to display per page when viewed from mobile device:"
+msgstr ""
+
+#: ../../mod/settings.php:846
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:915
+#: ../../mod/settings.php:922
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:916
+#: ../../mod/settings.php:923
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:919
+#: ../../mod/settings.php:926
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:920
+#: ../../mod/settings.php:927
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:930
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:931
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:927
+#: ../../mod/settings.php:934
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:935
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:931
+#: ../../mod/settings.php:938
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:932
+#: ../../mod/settings.php:939
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:944
+#: ../../mod/settings.php:951
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:944
+#: ../../mod/settings.php:951
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:954
+#: ../../mod/settings.php:961
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:967
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:968
+#: ../../mod/settings.php:975
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:972
+#: ../../mod/settings.php:979
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:977
+#: ../../mod/settings.php:984
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:990
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:989
+#: ../../mod/settings.php:996
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:995
+#: ../../mod/settings.php:1002
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:1003
+#: ../../mod/settings.php:1010
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:1006 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:1013 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:1011
+#: ../../mod/settings.php:1018
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:1029
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:1029
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1030
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1031
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1032
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1033
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:1027
+#: ../../mod/settings.php:1034
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1028
+#: ../../mod/settings.php:1035
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1036
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:1055
+#: ../../mod/settings.php:1062
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1070
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1071
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1072
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1072
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1073
 msgid "Current Password:"
 msgstr ""
 
-#: ../../mod/settings.php:1066 ../../mod/settings.php:1067
+#: ../../mod/settings.php:1073 ../../mod/settings.php:1074
 msgid "Your current password to confirm the changes"
 msgstr ""
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1074
 msgid "Password:"
 msgstr ""
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1078
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1080
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1081
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1082
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1083
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1086
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1081
+#: ../../mod/settings.php:1088
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:1081 ../../mod/settings.php:1111
+#: ../../mod/settings.php:1088 ../../mod/settings.php:1118
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:1082
+#: ../../mod/settings.php:1089
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1083
+#: ../../mod/settings.php:1090
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1092 ../../mod/photos.php:1140
+#: ../../mod/settings.php:1099 ../../mod/photos.php:1140
 #: ../../mod/photos.php:1506
 msgid "Show to Groups"
 msgstr ""
 
-#: ../../mod/settings.php:1093 ../../mod/photos.php:1141
+#: ../../mod/settings.php:1100 ../../mod/photos.php:1141
 #: ../../mod/photos.php:1507
 msgid "Show to Contacts"
 msgstr ""
 
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1101
 msgid "Default Private Post"
 msgstr ""
 
-#: ../../mod/settings.php:1095
+#: ../../mod/settings.php:1102
 msgid "Default Public Post"
 msgstr ""
 
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1106
 msgid "Default Permissions for New Posts"
 msgstr ""
 
-#: ../../mod/settings.php:1111
+#: ../../mod/settings.php:1118
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1114
+#: ../../mod/settings.php:1121
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1115
+#: ../../mod/settings.php:1122
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1116
+#: ../../mod/settings.php:1123
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1117
+#: ../../mod/settings.php:1124
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1118
+#: ../../mod/settings.php:1125
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1119
+#: ../../mod/settings.php:1126
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1120
+#: ../../mod/settings.php:1127
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:1121
+#: ../../mod/settings.php:1128
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1122
+#: ../../mod/settings.php:1129
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1123
+#: ../../mod/settings.php:1130
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1124
+#: ../../mod/settings.php:1131
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1125
+#: ../../mod/settings.php:1132
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1126
+#: ../../mod/settings.php:1133
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1127
+#: ../../mod/settings.php:1134
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1130
+#: ../../mod/settings.php:1137
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1131
+#: ../../mod/settings.php:1138
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
@@ -4819,7 +4823,7 @@ msgstr ""
 msgid "%1$s has joined %2$s"
 msgstr ""
 
-#: ../../mod/dfrn_poll.php:101 ../../mod/dfrn_poll.php:534
+#: ../../mod/dfrn_poll.php:103 ../../mod/dfrn_poll.php:536
 #, php-format
 msgid "%1$s welcomes %2$s"
 msgstr ""
@@ -5543,7 +5547,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:84 ../../boot.php:1081
+#: ../../mod/lostpass.php:84 ../../boot.php:1149
 msgid "Password Reset"
 msgstr ""
 
@@ -5929,7 +5933,7 @@ msgstr ""
 msgid "Home Notifications"
 msgstr ""
 
-#: ../../mod/photos.php:51 ../../boot.php:1887
+#: ../../mod/photos.php:51 ../../boot.php:1955
 msgid "Photo Albums"
 msgstr ""
 
@@ -6129,7 +6133,7 @@ msgstr ""
 
 #: ../../mod/photos.php:1551 ../../mod/photos.php:1595
 #: ../../mod/photos.php:1678 ../../mod/content.php:732
-#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:652
+#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:668
 msgid "Comment"
 msgstr ""
 
@@ -6322,7 +6326,7 @@ msgid ""
 "features and resources."
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:1255
+#: ../../mod/profile.php:21 ../../boot.php:1323
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -6961,124 +6965,124 @@ msgstr ""
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:651
+#: ../../boot.php:667
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:654
+#: ../../boot.php:670
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:929
+#: ../../boot.php:997
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:931
+#: ../../boot.php:999
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1041
+#: ../../boot.php:1109
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:1069
+#: ../../boot.php:1137
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:1070
+#: ../../boot.php:1138
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:1071
+#: ../../boot.php:1139
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1074
+#: ../../boot.php:1142
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:1080
+#: ../../boot.php:1148
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1083
+#: ../../boot.php:1151
 msgid "Website Terms of Service"
 msgstr ""
 
-#: ../../boot.php:1084
+#: ../../boot.php:1152
 msgid "terms of service"
 msgstr ""
 
-#: ../../boot.php:1086
+#: ../../boot.php:1154
 msgid "Website Privacy Policy"
 msgstr ""
 
-#: ../../boot.php:1087
+#: ../../boot.php:1155
 msgid "privacy policy"
 msgstr ""
 
-#: ../../boot.php:1216
+#: ../../boot.php:1284
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1295 ../../boot.php:1399
+#: ../../boot.php:1363 ../../boot.php:1467
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1361
+#: ../../boot.php:1429
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1369
+#: ../../boot.php:1437
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../boot.php:1498 ../../boot.php:1584
+#: ../../boot.php:1566 ../../boot.php:1652
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1499 ../../boot.php:1585
+#: ../../boot.php:1567 ../../boot.php:1653
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1544 ../../boot.php:1625
+#: ../../boot.php:1612 ../../boot.php:1693
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1556
+#: ../../boot.php:1624
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1557
+#: ../../boot.php:1625
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1618
+#: ../../boot.php:1686
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1636
+#: ../../boot.php:1704
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1637
+#: ../../boot.php:1705
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1873
+#: ../../boot.php:1941
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1880
+#: ../../boot.php:1948
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1897
+#: ../../boot.php:1965
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1904
+#: ../../boot.php:1972
 msgid "Only You Can See This"
 msgstr ""

From f84c57e7f2fd56aa3ed6dbcfaa7b65534cba646e Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 27 Apr 2013 10:57:06 +0200
Subject: [PATCH 33/67] DE: update to the strings

---
 view/de/messages.po | 989 ++++++++++++++++++++++----------------------
 view/de/strings.php |  57 +--
 2 files changed, 535 insertions(+), 511 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index 024cdcea17..4a864cbacb 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -3,30 +3,30 @@
 # This file is distributed under the same license as the Friendica package.
 # 
 # Translators:
-# bavatar <tobias.diekershoff@gmx.net>, 2011.
-# Erkan Yilmaz <erkan77@gmail.com>, 2011.
-# Fabian Dost <friends@dostmusik.de>, 2012.
-#   <friends@dostmusik.de>, 2012.
-#   <greeneyedred@googlemail.com>, 2012.
-# Hauke Zühl <hzuehl@phone-talk.de>, 2012.
-#   <hzuehl@phone-talk.de>, 2011-2012.
-#   <leberwurscht@hoegners.de>, 2012.
-#   <marmor69@web.de>, 2012.
-# Martin Schmitt <mas@scsy.de>, 2012.
-#   <matthias@matthiasmoritz.de>, 2012.
-# Oliver  <post@toktan.org>, 2012.
-#  <sebastian@sebsen.net>, 2013.
-#   <sebastian@sebsen.net>, 2012-2013.
-#  <tobias.diekershoff@gmx.net>, 2013.
-#   <tobias.diekershoff@gmx.net>, 2011-2013.
-#   <transifex@zottel.net>, 2011-2012.
-#   <ts+transifex@ml.tschlotfeldt.de>, 2011.
+# bavatar <tobias.diekershoff@gmx.net>, 2011
+# Erkan Yilmaz <erkan77@gmail.com>, 2011
+# Fabian Dost <friends@dostmusik.de>, 2012
+# Fabian Dost <friends@dostmusik.de>, 2012
+# greeneyedred <greeneyedred@googlemail.com>, 2012
+# Hauke Zühl <hzuehl@phone-talk.de>, 2012
+# Hauke Zühl <hzuehl@phone-talk.de>, 2011-2012
+# leberwurscht <leberwurscht@hoegners.de>, 2012
+# marmor <marmor69@web.de>, 2012
+# Martin Schmitt <mas@scsy.de>, 2012
+# MatthiasMoritz <matthias@matthiasmoritz.de>, 2012
+# Oliver <post@toktan.org>, 2012
+# Sennewood <sebastian@sebsen.net>, 2013
+# Sennewood <sebastian@sebsen.net>, 2012-2013
+# bavatar <tobias.diekershoff@gmx.net>, 2013
+# bavatar <tobias.diekershoff@gmx.net>, 2011-2013
+# zottel <transifex@zottel.net>, 2011-2012
+# tschlotfeldt <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: 2013-04-04 00:02-0700\n"
-"PO-Revision-Date: 2013-04-14 15:25+0000\n"
+"POT-Creation-Date: 2013-04-25 00:02-0700\n"
+"PO-Revision-Date: 2013-04-26 17:47+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"
@@ -38,16 +38,16 @@ msgstr ""
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
 #: ../../include/nav.php:77 ../../mod/profperm.php:103
 #: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88
-#: ../../boot.php:1877
+#: ../../boot.php:1945
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1050
+#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1079
 msgid "Full Name:"
 msgstr "Kompletter Name:"
 
 #: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
-#: ../../boot.php:1417
+#: ../../boot.php:1485
 msgid "Gender:"
 msgstr "Geschlecht:"
 
@@ -68,7 +68,7 @@ msgid "Age:"
 msgstr "Alter:"
 
 #: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
-#: ../../boot.php:1420
+#: ../../boot.php:1488
 msgid "Status:"
 msgstr "Status:"
 
@@ -77,16 +77,16 @@ msgstr "Status:"
 msgid "for %1$d %2$s"
 msgstr "für %1$d %2$s"
 
-#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:646
+#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:650
 msgid "Sexual Preference:"
 msgstr "Sexuelle Vorlieben:"
 
 #: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
-#: ../../boot.php:1422
+#: ../../boot.php:1490
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:648
+#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:652
 msgid "Hometown:"
 msgstr "Heimatort:"
 
@@ -94,7 +94,7 @@ msgstr "Heimatort:"
 msgid "Tags:"
 msgstr "Tags"
 
-#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:649
+#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:653
 msgid "Political Views:"
 msgstr "Politische Ansichten:"
 
@@ -110,11 +110,11 @@ msgstr "Über:"
 msgid "Hobbies/Interests:"
 msgstr "Hobbies/Interessen:"
 
-#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:653
+#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:657
 msgid "Likes:"
 msgstr "Likes:"
 
-#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:654
+#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:658
 msgid "Dislikes:"
 msgstr "Dislikes:"
 
@@ -418,306 +418,306 @@ msgstr "Kontakt bearbeiten"
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
-#: ../../include/text.php:313
+#: ../../include/text.php:294
 msgid "prev"
 msgstr "vorige"
 
-#: ../../include/text.php:315
+#: ../../include/text.php:296
 msgid "first"
 msgstr "erste"
 
-#: ../../include/text.php:344
+#: ../../include/text.php:325
 msgid "last"
 msgstr "letzte"
 
-#: ../../include/text.php:347
+#: ../../include/text.php:328
 msgid "next"
 msgstr "nächste"
 
-#: ../../include/text.php:371
+#: ../../include/text.php:352
 msgid "newer"
 msgstr "neuer"
 
-#: ../../include/text.php:375
+#: ../../include/text.php:356
 msgid "older"
 msgstr "älter"
 
-#: ../../include/text.php:837
+#: ../../include/text.php:807
 msgid "No contacts"
 msgstr "Keine Kontakte"
 
-#: ../../include/text.php:846
+#: ../../include/text.php:816
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d Kontakt"
 msgstr[1] "%d Kontakte"
 
-#: ../../include/text.php:858 ../../mod/viewcontacts.php:76
+#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
 msgid "View Contacts"
 msgstr "Kontakte anzeigen"
 
-#: ../../include/text.php:935 ../../include/text.php:936
+#: ../../include/text.php:905 ../../include/text.php:906
 #: ../../include/nav.php:118 ../../mod/search.php:99
 msgid "Search"
 msgstr "Suche"
 
-#: ../../include/text.php:938 ../../mod/notes.php:63 ../../mod/filer.php:31
+#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
 msgid "Save"
 msgstr "Speichern"
 
-#: ../../include/text.php:987
+#: ../../include/text.php:957
 msgid "poke"
 msgstr "anstupsen"
 
-#: ../../include/text.php:987 ../../include/conversation.php:211
+#: ../../include/text.php:957 ../../include/conversation.php:211
 msgid "poked"
 msgstr "stupste"
 
-#: ../../include/text.php:988
+#: ../../include/text.php:958
 msgid "ping"
 msgstr "anpingen"
 
-#: ../../include/text.php:988
+#: ../../include/text.php:958
 msgid "pinged"
 msgstr "pingte"
 
-#: ../../include/text.php:989
+#: ../../include/text.php:959
 msgid "prod"
 msgstr "knuffen"
 
-#: ../../include/text.php:989
+#: ../../include/text.php:959
 msgid "prodded"
 msgstr "knuffte"
 
-#: ../../include/text.php:990
+#: ../../include/text.php:960
 msgid "slap"
 msgstr "ohrfeigen"
 
-#: ../../include/text.php:990
+#: ../../include/text.php:960
 msgid "slapped"
 msgstr "ohrfeigte"
 
-#: ../../include/text.php:991
+#: ../../include/text.php:961
 msgid "finger"
 msgstr "befummeln"
 
-#: ../../include/text.php:991
+#: ../../include/text.php:961
 msgid "fingered"
 msgstr "befummelte"
 
-#: ../../include/text.php:992
+#: ../../include/text.php:962
 msgid "rebuff"
 msgstr "eine Abfuhr erteilen"
 
-#: ../../include/text.php:992
+#: ../../include/text.php:962
 msgid "rebuffed"
 msgstr "abfuhrerteilte"
 
-#: ../../include/text.php:1006
+#: ../../include/text.php:976
 msgid "happy"
 msgstr "glücklich"
 
-#: ../../include/text.php:1007
+#: ../../include/text.php:977
 msgid "sad"
 msgstr "traurig"
 
-#: ../../include/text.php:1008
+#: ../../include/text.php:978
 msgid "mellow"
 msgstr "sanft"
 
-#: ../../include/text.php:1009
+#: ../../include/text.php:979
 msgid "tired"
 msgstr "müde"
 
-#: ../../include/text.php:1010
+#: ../../include/text.php:980
 msgid "perky"
 msgstr "frech"
 
-#: ../../include/text.php:1011
+#: ../../include/text.php:981
 msgid "angry"
 msgstr "sauer"
 
-#: ../../include/text.php:1012
+#: ../../include/text.php:982
 msgid "stupified"
 msgstr "verblüfft"
 
-#: ../../include/text.php:1013
+#: ../../include/text.php:983
 msgid "puzzled"
 msgstr "verwirrt"
 
-#: ../../include/text.php:1014
+#: ../../include/text.php:984
 msgid "interested"
 msgstr "interessiert"
 
-#: ../../include/text.php:1015
+#: ../../include/text.php:985
 msgid "bitter"
 msgstr "verbittert"
 
-#: ../../include/text.php:1016
+#: ../../include/text.php:986
 msgid "cheerful"
 msgstr "fröhlich"
 
-#: ../../include/text.php:1017
+#: ../../include/text.php:987
 msgid "alive"
 msgstr "lebendig"
 
-#: ../../include/text.php:1018
+#: ../../include/text.php:988
 msgid "annoyed"
 msgstr "verärgert"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:989
 msgid "anxious"
 msgstr "unruhig"
 
-#: ../../include/text.php:1020
+#: ../../include/text.php:990
 msgid "cranky"
 msgstr "schrullig"
 
-#: ../../include/text.php:1021
+#: ../../include/text.php:991
 msgid "disturbed"
 msgstr "verstört"
 
-#: ../../include/text.php:1022
+#: ../../include/text.php:992
 msgid "frustrated"
 msgstr "frustriert"
 
-#: ../../include/text.php:1023
+#: ../../include/text.php:993
 msgid "motivated"
 msgstr "motiviert"
 
-#: ../../include/text.php:1024
+#: ../../include/text.php:994
 msgid "relaxed"
 msgstr "entspannt"
 
-#: ../../include/text.php:1025
+#: ../../include/text.php:995
 msgid "surprised"
 msgstr "überrascht"
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Monday"
 msgstr "Montag"
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1161
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "January"
 msgstr "Januar"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "February"
 msgstr "Februar"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "March"
 msgstr "März"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "April"
 msgstr "April"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "May"
 msgstr "Mai"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "June"
 msgstr "Juni"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "July"
 msgstr "Juli"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "August"
 msgstr "August"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "September"
 msgstr "September"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "October"
 msgstr "Oktober"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "November"
 msgstr "November"
 
-#: ../../include/text.php:1195
+#: ../../include/text.php:1165
 msgid "December"
 msgstr "Dezember"
 
-#: ../../include/text.php:1352
+#: ../../include/text.php:1322
 msgid "bytes"
 msgstr "Byte"
 
-#: ../../include/text.php:1379 ../../include/text.php:1391
+#: ../../include/text.php:1349 ../../include/text.php:1361
 msgid "Click to open/close"
 msgstr "Zum öffnen/schließen klicken"
 
-#: ../../include/text.php:1553 ../../mod/events.php:335
+#: ../../include/text.php:1523 ../../mod/events.php:335
 msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
-#: ../../include/text.php:1596 ../../include/user.php:237
+#: ../../include/text.php:1566 ../../include/user.php:237
 msgid "default"
 msgstr "Standard"
 
-#: ../../include/text.php:1608
+#: ../../include/text.php:1578
 msgid "Select an alternate language"
 msgstr "Alternative Sprache auswählen"
 
-#: ../../include/text.php:1860 ../../include/conversation.php:118
+#: ../../include/text.php:1830 ../../include/conversation.php:118
 #: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
 msgid "event"
 msgstr "Veranstaltung"
 
-#: ../../include/text.php:1862 ../../include/diaspora.php:1874
+#: ../../include/text.php:1832 ../../include/diaspora.php:1874
 #: ../../include/conversation.php:126 ../../include/conversation.php:254
 #: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
 #: ../../view/theme/diabook/theme.php:464
 msgid "photo"
 msgstr "Foto"
 
-#: ../../include/text.php:1864
+#: ../../include/text.php:1834
 msgid "activity"
 msgstr "Aktivität"
 
-#: ../../include/text.php:1866 ../../mod/content.php:628
+#: ../../include/text.php:1836 ../../mod/content.php:628
 #: ../../object/Item.php:364 ../../object/Item.php:377
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] "Kommentar"
 
-#: ../../include/text.php:1867
+#: ../../include/text.php:1837
 msgid "post"
 msgstr "Beitrag"
 
-#: ../../include/text.php:2022
+#: ../../include/text.php:1992
 msgid "Item filed"
 msgstr "Beitrag abgelegt"
 
@@ -754,46 +754,6 @@ msgstr "Beim Versuch dich mit der von dir angegebenen OpenID anzumelden trat ein
 msgid "The error message was:"
 msgstr "Die Fehlermeldung lautete:"
 
-#: ../../include/uimport.php:61
-msgid "Error decoding account file"
-msgstr "Fehler beim Verarbeiten der Account Datei"
-
-#: ../../include/uimport.php:67
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"
-
-#: ../../include/uimport.php:72
-msgid "Error! I can't import this file: DB schema version is not compatible."
-msgstr "Fehler! Kann diese Datei nicht importieren. Die DB Schema Versionen sind nicht kompatibel."
-
-#: ../../include/uimport.php:81
-msgid "Error! Cannot check nickname"
-msgstr "Fehler! Konnte den Nickname nicht überprüfen."
-
-#: ../../include/uimport.php:85
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "Nutzer '%s' existiert bereits auf diesem Server!"
-
-#: ../../include/uimport.php:104
-msgid "User creation error"
-msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten"
-
-#: ../../include/uimport.php:122
-msgid "User profile creation error"
-msgstr "Fehler beim Anlegen des Nutzerkontos"
-
-#: ../../include/uimport.php:167
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "%d Kontakt nicht importiert"
-msgstr[1] "%d Kontakte nicht importiert"
-
-#: ../../include/uimport.php:245
-msgid "Done. You can now login with your username and password"
-msgstr "Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden"
-
 #: ../../include/bb2diaspora.php:393 ../../include/event.php:11
 #: ../../mod/localtime.php:12
 msgid "l F d, Y \\@ g:i A"
@@ -808,7 +768,7 @@ msgid "Finishes:"
 msgstr "Endet:"
 
 #: ../../include/bb2diaspora.php:415 ../../include/event.php:40
-#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1415
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1483
 msgid "Location:"
 msgstr "Ort:"
 
@@ -1015,7 +975,7 @@ msgstr "RSS/Atom"
 msgid "Email"
 msgstr "E-Mail"
 
-#: ../../include/contact_selectors.php:80 ../../mod/settings.php:681
+#: ../../include/contact_selectors.php:80 ../../mod/settings.php:705
 #: ../../mod/dfrn_request.php:842
 msgid "Diaspora"
 msgstr "Diaspora"
@@ -1058,7 +1018,7 @@ msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "Beispiel: bob@example.com, http://example.com/barbara"
 
 #: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
-#: ../../mod/match.php:58 ../../boot.php:1347
+#: ../../mod/match.php:58 ../../boot.php:1415
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1135,7 +1095,7 @@ msgstr[0] "%d gemeinsamer Kontakt"
 msgstr[1] "%d gemeinsame Kontakte"
 
 #: ../../include/contact_widgets.php:204 ../../mod/content.php:629
-#: ../../object/Item.php:365 ../../boot.php:653
+#: ../../object/Item.php:365 ../../boot.php:669
 msgid "show more"
 msgstr "mehr anzeigen"
 
@@ -1162,91 +1122,6 @@ msgstr "$1 hat geschrieben:"
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
-#: ../../include/items.php:1791 ../../include/datetime.php:472
-#, php-format
-msgid "%s's birthday"
-msgstr "%ss Geburtstag"
-
-#: ../../include/items.php:1792 ../../include/datetime.php:473
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "Herzlichen Glückwunsch %s"
-
-#: ../../include/items.php:3466 ../../mod/dfrn_request.php:716
-msgid "[Name Withheld]"
-msgstr "[Name unterdrückt]"
-
-#: ../../include/items.php:3473
-msgid "A new person is sharing with you at "
-msgstr "Eine neue Person teilt mit dir auf "
-
-#: ../../include/items.php:3473
-msgid "You have a new follower at "
-msgstr "Du hast einen neuen Kontakt auf "
-
-#: ../../include/items.php:3957 ../../mod/admin.php:158
-#: ../../mod/admin.php:809 ../../mod/admin.php:1009 ../../mod/viewsrc.php:15
-#: ../../mod/notice.php:15 ../../mod/display.php:51 ../../mod/display.php:213
-msgid "Item not found."
-msgstr "Beitrag nicht gefunden."
-
-#: ../../include/items.php:3996
-msgid "Do you really want to delete this item?"
-msgstr "Möchtest du wirklich dieses Item löschen?"
-
-#: ../../include/items.php:3998 ../../mod/profiles.php:606
-#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
-#: ../../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/dfrn_request.php:836
-#: ../../mod/suggest.php:29 ../../mod/message.php:209
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../include/items.php:4001 ../../include/conversation.php:1080
-#: ../../mod/contacts.php:249 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/dfrn_request.php:848
-#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
-#: ../../mod/photos.php:202 ../../mod/photos.php:290
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: ../../include/items.php:4121 ../../mod/profiles.php:146
-#: ../../mod/profiles.php:567 ../../mod/notes.php:20 ../../mod/nogroup.php:25
-#: ../../mod/item.php:140 ../../mod/item.php:156 ../../mod/allfriends.php:9
-#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/register.php:40
-#: ../../mod/regmod.php:118 ../../mod/attach.php:33 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:542
-#: ../../mod/settings.php:547 ../../mod/crepair.php:115
-#: ../../mod/delegate.php:6 ../../mod/poke.php:135
-#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
-#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
-#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
-#: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
-#: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
-#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
-#: ../../mod/wallmessage.php:103 ../../mod/manage.php:96
-#: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
-#: ../../mod/network.php:6 ../../mod/notifications.php:66
-#: ../../mod/photos.php:133 ../../mod/photos.php:1044
-#: ../../mod/display.php:209 ../../mod/install.php:151
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
-#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
-#: ../../index.php:346
-msgid "Permission denied."
-msgstr "Zugriff verweigert."
-
-#: ../../include/items.php:4191
-msgid "Archives"
-msgstr "Archiv"
-
 #: ../../include/network.php:875
 msgid "view full size"
 msgstr "Volle Größe anzeigen"
@@ -1324,6 +1199,16 @@ msgstr "Sekunden"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s her"
 
+#: ../../include/datetime.php:472 ../../include/items.php:1813
+#, php-format
+msgid "%s's birthday"
+msgstr "%ss Geburtstag"
+
+#: ../../include/datetime.php:473 ../../include/items.php:1814
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Herzlichen Glückwunsch %s"
+
 #: ../../include/plugin.php:439 ../../include/plugin.php:441
 msgid "Click here to upgrade."
 msgstr "Zum Upgraden hier klicken."
@@ -1374,6 +1259,80 @@ msgstr "%1$s mag %2$ss %3$s"
 msgid "Attachments:"
 msgstr "Anhänge:"
 
+#: ../../include/items.php:3488 ../../mod/dfrn_request.php:716
+msgid "[Name Withheld]"
+msgstr "[Name unterdrückt]"
+
+#: ../../include/items.php:3495
+msgid "A new person is sharing with you at "
+msgstr "Eine neue Person teilt mit dir auf "
+
+#: ../../include/items.php:3495
+msgid "You have a new follower at "
+msgstr "Du hast einen neuen Kontakt auf "
+
+#: ../../include/items.php:3979 ../../mod/display.php:51
+#: ../../mod/display.php:246 ../../mod/admin.php:158 ../../mod/admin.php:809
+#: ../../mod/admin.php:1009 ../../mod/viewsrc.php:15 ../../mod/notice.php:15
+msgid "Item not found."
+msgstr "Beitrag nicht gefunden."
+
+#: ../../include/items.php:4018
+msgid "Do you really want to delete this item?"
+msgstr "Möchtest du wirklich dieses Item löschen?"
+
+#: ../../include/items.php:4020 ../../mod/profiles.php:610
+#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
+#: ../../mod/settings.php:961 ../../mod/settings.php:967
+#: ../../mod/settings.php:975 ../../mod/settings.php:979
+#: ../../mod/settings.php:984 ../../mod/settings.php:990
+#: ../../mod/settings.php:996 ../../mod/settings.php:1002
+#: ../../mod/settings.php:1032 ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034 ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036 ../../mod/dfrn_request.php:836
+#: ../../mod/suggest.php:29 ../../mod/message.php:209
+msgid "Yes"
+msgstr "Ja"
+
+#: ../../include/items.php:4023 ../../include/conversation.php:1080
+#: ../../mod/contacts.php:249 ../../mod/settings.php:585
+#: ../../mod/settings.php:611 ../../mod/dfrn_request.php:848
+#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
+#: ../../mod/photos.php:202 ../../mod/photos.php:290
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../../include/items.php:4143 ../../mod/profiles.php:146
+#: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/display.php:242
+#: ../../mod/nogroup.php:25 ../../mod/item.php:140 ../../mod/item.php:156
+#: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
+#: ../../mod/contacts.php:147 ../../mod/settings.php:91
+#: ../../mod/settings.php:566 ../../mod/settings.php:571
+#: ../../mod/crepair.php:115 ../../mod/delegate.php:6 ../../mod/poke.php:135
+#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
+#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
+#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
+#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
+#: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
+#: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/manage.php:96
+#: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
+#: ../../mod/network.php:6 ../../mod/notifications.php:66
+#: ../../mod/photos.php:133 ../../mod/photos.php:1044
+#: ../../mod/install.php:151 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:169 ../../mod/profile_photo.php:180
+#: ../../mod/profile_photo.php:193 ../../index.php:346
+msgid "Permission denied."
+msgstr "Zugriff verweigert."
+
+#: ../../include/items.php:4213
+msgid "Archives"
+msgstr "Archiv"
+
 #: ../../include/features.php:23
 msgid "General Features"
 msgstr "Allgemeine Features"
@@ -1606,7 +1565,7 @@ msgid "Select"
 msgstr "Auswählen"
 
 #: ../../include/conversation.php:588 ../../mod/admin.php:770
-#: ../../mod/settings.php:623 ../../mod/group.php:171
+#: ../../mod/settings.php:647 ../../mod/group.php:171
 #: ../../mod/photos.php:1637 ../../mod/content.php:462
 #: ../../mod/content.php:764 ../../object/Item.php:127
 msgid "Delete"
@@ -2051,7 +2010,7 @@ msgstr "Keine Neuigkeiten."
 msgid "Clear notifications"
 msgstr "Bereinige Benachrichtigungen"
 
-#: ../../include/nav.php:73 ../../boot.php:1066
+#: ../../include/nav.php:73 ../../boot.php:1134
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -2059,7 +2018,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:76 ../../boot.php:1870
+#: ../../include/nav.php:76 ../../boot.php:1938
 msgid "Status"
 msgstr "Status"
 
@@ -2073,7 +2032,7 @@ msgid "Your profile page"
 msgstr "Deine Profilseite"
 
 #: ../../include/nav.php:78 ../../mod/fbrowser.php:25
-#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1884
+#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1952
 msgid "Photos"
 msgstr "Bilder"
 
@@ -2082,7 +2041,7 @@ msgid "Your photos"
 msgstr "Deine Fotos"
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1894
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1962
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -2098,7 +2057,7 @@ msgstr "Persönliche Notizen"
 msgid "Your personal photos"
 msgstr "Deine privaten Fotos"
 
-#: ../../include/nav.php:91 ../../boot.php:1067
+#: ../../include/nav.php:91 ../../boot.php:1135
 msgid "Login"
 msgstr "Anmeldung"
 
@@ -2115,7 +2074,7 @@ msgstr "Pinnwand"
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1042
+#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1110
 msgid "Register"
 msgstr "Registrieren"
 
@@ -2244,7 +2203,7 @@ msgstr "Einstellungen"
 msgid "Account settings"
 msgstr "Kontoeinstellungen"
 
-#: ../../include/nav.php:169 ../../boot.php:1369
+#: ../../include/nav.php:169 ../../boot.php:1437
 msgid "Profiles"
 msgstr "Profile"
 
@@ -2285,6 +2244,42 @@ msgstr "Eingebetteter Inhalt"
 msgid "Embedding disabled"
 msgstr "Einbettungen deaktiviert"
 
+#: ../../include/uimport.php:94
+msgid "Error decoding account file"
+msgstr "Fehler beim Verarbeiten der Account Datei"
+
+#: ../../include/uimport.php:100
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"
+
+#: ../../include/uimport.php:116
+msgid "Error! Cannot check nickname"
+msgstr "Fehler! Konnte den Nickname nicht überprüfen."
+
+#: ../../include/uimport.php:120
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "Nutzer '%s' existiert bereits auf diesem Server!"
+
+#: ../../include/uimport.php:139
+msgid "User creation error"
+msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten"
+
+#: ../../include/uimport.php:157
+msgid "User profile creation error"
+msgstr "Fehler beim Anlegen des Nutzerkontos"
+
+#: ../../include/uimport.php:202
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d Kontakt nicht importiert"
+msgstr[1] "%d Kontakte nicht importiert"
+
+#: ../../include/uimport.php:272
+msgid "Done. You can now login with your username and password"
+msgstr "Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden"
+
 #: ../../include/security.php:22
 msgid "Welcome "
 msgstr "Willkommen "
@@ -2304,7 +2299,7 @@ msgid ""
 msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:133
-#: ../../mod/profiles.php:160 ../../mod/profiles.php:579
+#: ../../mod/profiles.php:160 ../../mod/profiles.php:583
 #: ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr "Profil nicht gefunden."
@@ -2385,53 +2380,53 @@ msgstr "Wohnort"
 msgid "Profile updated."
 msgstr "Profil aktualisiert."
 
-#: ../../mod/profiles.php:517
+#: ../../mod/profiles.php:521
 msgid " and "
 msgstr " und "
 
-#: ../../mod/profiles.php:525
+#: ../../mod/profiles.php:529
 msgid "public profile"
 msgstr "öffentliches Profil"
 
-#: ../../mod/profiles.php:528
+#: ../../mod/profiles.php:532
 #, 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:529
+#: ../../mod/profiles.php:533
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr " – %1$ss %2$s besuchen"
 
-#: ../../mod/profiles.php:532
+#: ../../mod/profiles.php:536
 #, 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:605
+#: ../../mod/profiles.php:609
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"
 
-#: ../../mod/profiles.php:607 ../../mod/api.php:106 ../../mod/register.php:240
-#: ../../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/dfrn_request.php:837
+#: ../../mod/profiles.php:611 ../../mod/api.php:106 ../../mod/register.php:240
+#: ../../mod/settings.php:961 ../../mod/settings.php:967
+#: ../../mod/settings.php:975 ../../mod/settings.php:979
+#: ../../mod/settings.php:984 ../../mod/settings.php:990
+#: ../../mod/settings.php:996 ../../mod/settings.php:1002
+#: ../../mod/settings.php:1032 ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034 ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036 ../../mod/dfrn_request.php:837
 msgid "No"
 msgstr "Nein"
 
-#: ../../mod/profiles.php:625
+#: ../../mod/profiles.php:629
 msgid "Edit Profile Details"
 msgstr "Profil bearbeiten"
 
-#: ../../mod/profiles.php:626 ../../mod/admin.php:491 ../../mod/admin.php:763
+#: ../../mod/profiles.php:630 ../../mod/admin.php:491 ../../mod/admin.php:763
 #: ../../mod/admin.php:902 ../../mod/admin.php:1102 ../../mod/admin.php:1189
-#: ../../mod/contacts.php:386 ../../mod/settings.php:560
-#: ../../mod/settings.php:670 ../../mod/settings.php:739
-#: ../../mod/settings.php:811 ../../mod/settings.php:1037
+#: ../../mod/contacts.php:386 ../../mod/settings.php:584
+#: ../../mod/settings.php:694 ../../mod/settings.php:763
+#: ../../mod/settings.php:837 ../../mod/settings.php:1064
 #: ../../mod/crepair.php:166 ../../mod/poke.php:199 ../../mod/events.php:478
 #: ../../mod/fsuggest.php:107 ../../mod/group.php:87 ../../mod/invite.php:140
 #: ../../mod/localtime.php:45 ../../mod/manage.php:110
@@ -2448,182 +2443,182 @@ msgstr "Profil bearbeiten"
 msgid "Submit"
 msgstr "Senden"
 
-#: ../../mod/profiles.php:627
+#: ../../mod/profiles.php:631
 msgid "Change Profile Photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:628
+#: ../../mod/profiles.php:632
 msgid "View this profile"
 msgstr "Dieses Profil anzeigen"
 
-#: ../../mod/profiles.php:629
+#: ../../mod/profiles.php:633
 msgid "Create a new profile using these settings"
 msgstr "Neues Profil anlegen und diese Einstellungen verwenden"
 
-#: ../../mod/profiles.php:630
+#: ../../mod/profiles.php:634
 msgid "Clone this profile"
 msgstr "Dieses Profil duplizieren"
 
-#: ../../mod/profiles.php:631
+#: ../../mod/profiles.php:635
 msgid "Delete this profile"
 msgstr "Dieses Profil löschen"
 
-#: ../../mod/profiles.php:632
+#: ../../mod/profiles.php:636
 msgid "Profile Name:"
 msgstr "Profilname:"
 
-#: ../../mod/profiles.php:633
+#: ../../mod/profiles.php:637
 msgid "Your Full Name:"
 msgstr "Dein kompletter Name:"
 
-#: ../../mod/profiles.php:634
+#: ../../mod/profiles.php:638
 msgid "Title/Description:"
 msgstr "Titel/Beschreibung:"
 
-#: ../../mod/profiles.php:635
+#: ../../mod/profiles.php:639
 msgid "Your Gender:"
 msgstr "Dein Geschlecht:"
 
-#: ../../mod/profiles.php:636
+#: ../../mod/profiles.php:640
 #, php-format
 msgid "Birthday (%s):"
 msgstr "Geburtstag (%s):"
 
-#: ../../mod/profiles.php:637
+#: ../../mod/profiles.php:641
 msgid "Street Address:"
 msgstr "Adresse:"
 
-#: ../../mod/profiles.php:638
+#: ../../mod/profiles.php:642
 msgid "Locality/City:"
 msgstr "Wohnort:"
 
-#: ../../mod/profiles.php:639
+#: ../../mod/profiles.php:643
 msgid "Postal/Zip Code:"
 msgstr "Postleitzahl:"
 
-#: ../../mod/profiles.php:640
+#: ../../mod/profiles.php:644
 msgid "Country:"
 msgstr "Land:"
 
-#: ../../mod/profiles.php:641
+#: ../../mod/profiles.php:645
 msgid "Region/State:"
 msgstr "Region/Bundesstaat:"
 
-#: ../../mod/profiles.php:642
+#: ../../mod/profiles.php:646
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Beziehungsstatus:"
 
-#: ../../mod/profiles.php:643
+#: ../../mod/profiles.php:647
 msgid "Who: (if applicable)"
 msgstr "Wer: (falls anwendbar)"
 
-#: ../../mod/profiles.php:644
+#: ../../mod/profiles.php:648
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/profiles.php:645
+#: ../../mod/profiles.php:649
 msgid "Since [date]:"
 msgstr "Seit [Datum]:"
 
-#: ../../mod/profiles.php:647
+#: ../../mod/profiles.php:651
 msgid "Homepage URL:"
 msgstr "Adresse der Homepage:"
 
-#: ../../mod/profiles.php:650
+#: ../../mod/profiles.php:654
 msgid "Religious Views:"
 msgstr "Religiöse Ansichten:"
 
-#: ../../mod/profiles.php:651
+#: ../../mod/profiles.php:655
 msgid "Public Keywords:"
 msgstr "Öffentliche Schlüsselwörter:"
 
-#: ../../mod/profiles.php:652
+#: ../../mod/profiles.php:656
 msgid "Private Keywords:"
 msgstr "Private Schlüsselwörter:"
 
-#: ../../mod/profiles.php:655
+#: ../../mod/profiles.php:659
 msgid "Example: fishing photography software"
 msgstr "Beispiel: Fischen Fotografie Software"
 
-#: ../../mod/profiles.php:656
+#: ../../mod/profiles.php:660
 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:657
+#: ../../mod/profiles.php:661
 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:658
+#: ../../mod/profiles.php:662
 msgid "Tell us about yourself..."
 msgstr "Erzähle uns ein bisschen von dir …"
 
-#: ../../mod/profiles.php:659
+#: ../../mod/profiles.php:663
 msgid "Hobbies/Interests"
 msgstr "Hobbies/Interessen"
 
-#: ../../mod/profiles.php:660
+#: ../../mod/profiles.php:664
 msgid "Contact information and Social Networks"
 msgstr "Kontaktinformationen und Soziale Netzwerke"
 
-#: ../../mod/profiles.php:661
+#: ../../mod/profiles.php:665
 msgid "Musical interests"
 msgstr "Musikalische Interessen"
 
-#: ../../mod/profiles.php:662
+#: ../../mod/profiles.php:666
 msgid "Books, literature"
 msgstr "Literatur/Bücher"
 
-#: ../../mod/profiles.php:663
+#: ../../mod/profiles.php:667
 msgid "Television"
 msgstr "Fernsehen"
 
-#: ../../mod/profiles.php:664
+#: ../../mod/profiles.php:668
 msgid "Film/dance/culture/entertainment"
 msgstr "Filme/Tänze/Kultur/Unterhaltung"
 
-#: ../../mod/profiles.php:665
+#: ../../mod/profiles.php:669
 msgid "Love/romance"
 msgstr "Liebesleben"
 
-#: ../../mod/profiles.php:666
+#: ../../mod/profiles.php:670
 msgid "Work/employment"
 msgstr "Arbeit/Beschäftigung"
 
-#: ../../mod/profiles.php:667
+#: ../../mod/profiles.php:671
 msgid "School/education"
 msgstr "Schule/Ausbildung"
 
-#: ../../mod/profiles.php:672
+#: ../../mod/profiles.php:676
 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:682 ../../mod/directory.php:111
+#: ../../mod/profiles.php:686 ../../mod/directory.php:111
 msgid "Age: "
 msgstr "Alter: "
 
-#: ../../mod/profiles.php:721
+#: ../../mod/profiles.php:725
 msgid "Edit/Manage Profiles"
 msgstr "Verwalte/Editiere Profile"
 
-#: ../../mod/profiles.php:722 ../../boot.php:1375 ../../boot.php:1401
+#: ../../mod/profiles.php:726 ../../boot.php:1443 ../../boot.php:1469
 msgid "Change profile photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:723 ../../boot.php:1376
+#: ../../mod/profiles.php:727 ../../boot.php:1444
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: ../../mod/profiles.php:734 ../../boot.php:1386
+#: ../../mod/profiles.php:738 ../../boot.php:1454
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: ../../mod/profiles.php:736 ../../boot.php:1389
+#: ../../mod/profiles.php:740 ../../boot.php:1457
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:737 ../../boot.php:1390
+#: ../../mod/profiles.php:741 ../../boot.php:1458
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
@@ -2651,10 +2646,25 @@ msgstr "Sichtbar für"
 msgid "All Contacts (with secure profile access)"
 msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
 
-#: ../../mod/notes.php:44 ../../boot.php:1901
+#: ../../mod/notes.php:44 ../../boot.php:1969
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
+#: ../../mod/display.php:19 ../../mod/search.php:89
+#: ../../mod/dfrn_request.php:761 ../../mod/directory.php:31
+#: ../../mod/viewcontacts.php:17 ../../mod/photos.php:914
+#: ../../mod/community.php:18
+msgid "Public access denied."
+msgstr "Öffentlicher Zugriff verweigert."
+
+#: ../../mod/display.php:99 ../../mod/profile.php:155
+msgid "Access to this profile has been restricted."
+msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
+
+#: ../../mod/display.php:239
+msgid "Item has been removed."
+msgstr "Eintrag wurde entfernt."
+
 #: ../../mod/nogroup.php:40 ../../mod/contacts.php:395
 #: ../../mod/contacts.php:585 ../../mod/viewcontacts.php:62
 #, php-format
@@ -2808,7 +2818,7 @@ msgstr "Aktive Plugins"
 msgid "Site settings updated."
 msgstr "Seiteneinstellungen aktualisiert."
 
-#: ../../mod/admin.php:434 ../../mod/settings.php:769
+#: ../../mod/admin.php:434 ../../mod/settings.php:793
 msgid "No special theme for mobile devices"
 msgstr "Kein spezielles Theme für mobile Geräte verwenden."
 
@@ -3352,8 +3362,8 @@ msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
 msgid "Request date"
 msgstr "Anfragedatum"
 
-#: ../../mod/admin.php:766 ../../mod/admin.php:777 ../../mod/settings.php:562
-#: ../../mod/settings.php:588 ../../mod/crepair.php:148
+#: ../../mod/admin.php:766 ../../mod/admin.php:777 ../../mod/settings.php:586
+#: ../../mod/settings.php:612 ../../mod/crepair.php:148
 msgid "Name"
 msgstr "Name"
 
@@ -3560,13 +3570,6 @@ msgstr "Keine Freunde zum Anzeigen."
 msgid "Remove term"
 msgstr "Begriff entfernen"
 
-#: ../../mod/search.php:89 ../../mod/dfrn_request.php:761
-#: ../../mod/directory.php:31 ../../mod/viewcontacts.php:17
-#: ../../mod/photos.php:914 ../../mod/display.php:19
-#: ../../mod/community.php:18
-msgid "Public access denied."
-msgstr "Öffentlicher Zugriff verweigert."
-
 #: ../../mod/search.php:180 ../../mod/search.php:206
 #: ../../mod/community.php:61 ../../mod/community.php:89
 msgid "No results."
@@ -4088,7 +4091,7 @@ msgstr "Konto löschen"
 msgid "Missing some important data!"
 msgstr "Wichtige Daten fehlen!"
 
-#: ../../mod/settings.php:121 ../../mod/settings.php:586
+#: ../../mod/settings.php:121 ../../mod/settings.php:610
 msgid "Update"
 msgstr "Aktualisierungen"
 
@@ -4104,511 +4107,535 @@ msgstr "E-Mail Einstellungen bearbeitet."
 msgid "Features updated"
 msgstr "Features aktualisiert"
 
-#: ../../mod/settings.php:307
+#: ../../mod/settings.php:312
 msgid "Passwords do not match. Password unchanged."
 msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
 
-#: ../../mod/settings.php:312
+#: ../../mod/settings.php:317
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
 
-#: ../../mod/settings.php:323
+#: ../../mod/settings.php:325
+msgid "Wrong password."
+msgstr "Falsches Passwort."
+
+#: ../../mod/settings.php:336
 msgid "Password changed."
 msgstr "Passwort geändert."
 
-#: ../../mod/settings.php:325
+#: ../../mod/settings.php:338
 msgid "Password update failed. Please try again."
 msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
 
-#: ../../mod/settings.php:390
+#: ../../mod/settings.php:403
 msgid " Please use a shorter name."
 msgstr " Bitte verwende einen kürzeren Namen."
 
-#: ../../mod/settings.php:392
+#: ../../mod/settings.php:405
 msgid " Name too short."
 msgstr " Name ist zu kurz."
 
-#: ../../mod/settings.php:398
+#: ../../mod/settings.php:414
+msgid "Wrong Password"
+msgstr "Falsches Passwort"
+
+#: ../../mod/settings.php:419
 msgid " Not valid email."
 msgstr " Keine gültige E-Mail."
 
-#: ../../mod/settings.php:400
+#: ../../mod/settings.php:422
 msgid " Cannot change to that email."
 msgstr "Ändern der E-Mail nicht möglich. "
 
-#: ../../mod/settings.php:454
+#: ../../mod/settings.php:476
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt."
 
-#: ../../mod/settings.php:458
+#: ../../mod/settings.php:480
 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
+#: ../../mod/settings.php:510
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: ../../mod/settings.php:559 ../../mod/settings.php:585
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:583 ../../mod/settings.php:609
+#: ../../mod/settings.php:645
 msgid "Add application"
 msgstr "Programm hinzufügen"
 
-#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../mod/settings.php:588 ../../mod/settings.php:614
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:565 ../../mod/settings.php:591
+#: ../../mod/settings.php:589 ../../mod/settings.php:615
 msgid "Redirect"
 msgstr "Umleiten"
 
-#: ../../mod/settings.php:566 ../../mod/settings.php:592
+#: ../../mod/settings.php:590 ../../mod/settings.php:616
 msgid "Icon url"
 msgstr "Icon URL"
 
-#: ../../mod/settings.php:577
+#: ../../mod/settings.php:601
 msgid "You can't edit this application."
 msgstr "Du kannst dieses Programm nicht bearbeiten."
 
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:644
 msgid "Connected Apps"
 msgstr "Verbundene Programme"
 
-#: ../../mod/settings.php:622 ../../mod/editpost.php:109
+#: ../../mod/settings.php:646 ../../mod/editpost.php:109
 #: ../../mod/content.php:751 ../../object/Item.php:117
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:648
 msgid "Client key starts with"
 msgstr "Anwenderschlüssel beginnt mit"
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:649
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:650
 msgid "Remove authorization"
 msgstr "Autorisierung entziehen"
 
-#: ../../mod/settings.php:638
+#: ../../mod/settings.php:662
 msgid "No Plugin settings configured"
 msgstr "Keine Plugin-Einstellungen konfiguriert"
 
-#: ../../mod/settings.php:646
+#: ../../mod/settings.php:670
 msgid "Plugin Settings"
 msgstr "Plugin-Einstellungen"
 
-#: ../../mod/settings.php:660
+#: ../../mod/settings.php:684
 msgid "Off"
 msgstr "Aus"
 
-#: ../../mod/settings.php:660
+#: ../../mod/settings.php:684
 msgid "On"
 msgstr "An"
 
-#: ../../mod/settings.php:668
+#: ../../mod/settings.php:692
 msgid "Additional Features"
 msgstr "Zusätzliche Features"
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:705 ../../mod/settings.php:706
 #, 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:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:705 ../../mod/settings.php:706
 msgid "enabled"
 msgstr "eingeschaltet"
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:705 ../../mod/settings.php:706
 msgid "disabled"
 msgstr "ausgeschaltet"
 
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:706
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:738
 msgid "Email access is disabled on this site."
 msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
 
-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:745
 msgid "Connector Settings"
 msgstr "Verbindungs-Einstellungen"
 
-#: ../../mod/settings.php:726
+#: ../../mod/settings.php:750
 msgid "Email/Mailbox Setup"
 msgstr "E-Mail/Postfach-Einstellungen"
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:751
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an."
 
-#: ../../mod/settings.php:728
+#: ../../mod/settings.php:752
 msgid "Last successful email check:"
 msgstr "Letzter erfolgreicher E-Mail Check"
 
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:754
 msgid "IMAP server name:"
 msgstr "IMAP-Server-Name:"
 
-#: ../../mod/settings.php:731
+#: ../../mod/settings.php:755
 msgid "IMAP port:"
 msgstr "IMAP-Port:"
 
-#: ../../mod/settings.php:732
+#: ../../mod/settings.php:756
 msgid "Security:"
 msgstr "Sicherheit:"
 
-#: ../../mod/settings.php:732 ../../mod/settings.php:737
+#: ../../mod/settings.php:756 ../../mod/settings.php:761
 msgid "None"
 msgstr "Keine"
 
-#: ../../mod/settings.php:733
+#: ../../mod/settings.php:757
 msgid "Email login name:"
 msgstr "E-Mail-Login-Name:"
 
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:758
 msgid "Email password:"
 msgstr "E-Mail-Passwort:"
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:759
 msgid "Reply-to address:"
 msgstr "Reply-to Adresse:"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:760
 msgid "Send public posts to all email contacts:"
 msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:761
 msgid "Action after import:"
 msgstr "Aktion nach Import:"
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:761
 msgid "Mark as seen"
 msgstr "Als gelesen markieren"
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:761
 msgid "Move to folder"
 msgstr "In einen Ordner verschieben"
 
-#: ../../mod/settings.php:738
+#: ../../mod/settings.php:762
 msgid "Move to folder:"
 msgstr "In diesen Ordner verschieben:"
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:835
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../../mod/settings.php:815 ../../mod/settings.php:826
+#: ../../mod/settings.php:841 ../../mod/settings.php:853
 msgid "Display Theme:"
 msgstr "Theme:"
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:842
 msgid "Mobile Theme:"
 msgstr "Mobiles Theme"
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:843
 msgid "Update browser every xx seconds"
 msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:843
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimal 10 Sekunden, kein Maximum"
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:844
 msgid "Number of items to display per page:"
 msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:844 ../../mod/settings.php:845
 msgid "Maximum of 100 items"
 msgstr "Maximal 100 Beiträge"
 
-#: ../../mod/settings.php:819
+#: ../../mod/settings.php:845
+msgid "Number of items to display per page when viewed from mobile device:"
+msgstr "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:"
+
+#: ../../mod/settings.php:846
 msgid "Don't show emoticons"
 msgstr "Keine Smilies anzeigen"
 
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:922
 msgid "Normal Account Page"
 msgstr "Normales Konto"
 
-#: ../../mod/settings.php:896
+#: ../../mod/settings.php:923
 msgid "This account is a normal personal profile"
 msgstr "Dieses Konto ist ein normales persönliches Profil"
 
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:926
 msgid "Soapbox Page"
 msgstr "Marktschreier-Konto"
 
-#: ../../mod/settings.php:900
+#: ../../mod/settings.php:927
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert"
 
-#: ../../mod/settings.php:903
+#: ../../mod/settings.php:930
 msgid "Community Forum/Celebrity Account"
 msgstr "Forum/Promi-Konto"
 
-#: ../../mod/settings.php:904
+#: ../../mod/settings.php:931
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"
 
-#: ../../mod/settings.php:907
+#: ../../mod/settings.php:934
 msgid "Automatic Friend Page"
 msgstr "Automatische Freunde Seite"
 
-#: ../../mod/settings.php:908
+#: ../../mod/settings.php:935
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Kontaktanfragen werden automatisch als Freund akzeptiert"
 
-#: ../../mod/settings.php:911
+#: ../../mod/settings.php:938
 msgid "Private Forum [Experimental]"
 msgstr "Privates Forum [Versuchsstadium]"
 
-#: ../../mod/settings.php:912
+#: ../../mod/settings.php:939
 msgid "Private forum - approved members only"
 msgstr "Privates Forum, nur für Mitglieder"
 
-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:951
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:951
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."
 
-#: ../../mod/settings.php:934
+#: ../../mod/settings.php:961
 msgid "Publish your default profile in your local site directory?"
 msgstr "Darf dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"
 
-#: ../../mod/settings.php:940
+#: ../../mod/settings.php:967
 msgid "Publish your default profile in the global social directory?"
 msgstr "Darf dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"
 
-#: ../../mod/settings.php:948
+#: ../../mod/settings.php:975
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"
 
-#: ../../mod/settings.php:952
+#: ../../mod/settings.php:979
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
 
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:984
 msgid "Allow friends to post to your profile page?"
 msgstr "Dürfen deine Kontakte auf deine Pinnwand schreiben?"
 
-#: ../../mod/settings.php:963
+#: ../../mod/settings.php:990
 msgid "Allow friends to tag your posts?"
 msgstr "Dürfen deine Kontakte deine Beiträge mit Schlagwörtern versehen?"
 
-#: ../../mod/settings.php:969
+#: ../../mod/settings.php:996
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../mod/settings.php:975
+#: ../../mod/settings.php:1002
 msgid "Permit unknown people to send you private mail?"
 msgstr "Dürfen dir Unbekannte private Nachrichten schicken?"
 
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:1010
 msgid "Profile is <strong>not published</strong>."
 msgstr "Profil ist <strong>nicht veröffentlicht</strong>."
 
-#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:1013 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr "oder"
 
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:1018
 msgid "Your Identity Address is"
 msgstr "Die Adresse deines Profils lautet:"
 
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1029
 msgid "Automatically expire posts after this many days:"
 msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"
 
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1029
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."
 
-#: ../../mod/settings.php:1003
+#: ../../mod/settings.php:1030
 msgid "Advanced expiration settings"
 msgstr "Erweiterte Verfallseinstellungen"
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1031
 msgid "Advanced Expiration"
 msgstr "Erweitertes Verfallen"
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1032
 msgid "Expire posts:"
 msgstr "Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1033
 msgid "Expire personal notes:"
 msgstr "Persönliche Notizen verfallen lassen:"
 
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1034
 msgid "Expire starred posts:"
 msgstr "Markierte Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1035
 msgid "Expire photos:"
 msgstr "Fotos verfallen lassen:"
 
-#: ../../mod/settings.php:1009
+#: ../../mod/settings.php:1036
 msgid "Only expire posts by others:"
 msgstr "Nur Beiträge anderer verfallen:"
 
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1062
 msgid "Account Settings"
 msgstr "Kontoeinstellungen"
 
-#: ../../mod/settings.php:1043
+#: ../../mod/settings.php:1070
 msgid "Password Settings"
 msgstr "Passwort-Einstellungen"
 
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1071
 msgid "New Password:"
 msgstr "Neues Passwort:"
 
-#: ../../mod/settings.php:1045
+#: ../../mod/settings.php:1072
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: ../../mod/settings.php:1045
+#: ../../mod/settings.php:1072
 msgid "Leave password fields blank unless changing"
 msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern"
 
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1073
+msgid "Current Password:"
+msgstr "Aktuelles Passwort:"
+
+#: ../../mod/settings.php:1073 ../../mod/settings.php:1074
+msgid "Your current password to confirm the changes"
+msgstr "Dein aktuelles Passwort um die Änderungen zu bestätigen"
+
+#: ../../mod/settings.php:1074
+msgid "Password:"
+msgstr "Passwort:"
+
+#: ../../mod/settings.php:1078
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1080
 msgid "Email Address:"
 msgstr "E-Mail-Adresse:"
 
-#: ../../mod/settings.php:1052
+#: ../../mod/settings.php:1081
 msgid "Your Timezone:"
 msgstr "Deine Zeitzone:"
 
-#: ../../mod/settings.php:1053
+#: ../../mod/settings.php:1082
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../mod/settings.php:1054
+#: ../../mod/settings.php:1083
 msgid "Use Browser Location:"
 msgstr "Standort des Browsers verwenden:"
 
-#: ../../mod/settings.php:1057
+#: ../../mod/settings.php:1086
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Privatsphäre-Einstellungen"
 
-#: ../../mod/settings.php:1059
+#: ../../mod/settings.php:1088
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:"
 
-#: ../../mod/settings.php:1059 ../../mod/settings.php:1089
+#: ../../mod/settings.php:1088 ../../mod/settings.php:1118
 msgid "(to prevent spam abuse)"
 msgstr "(um SPAM zu vermeiden)"
 
-#: ../../mod/settings.php:1060
+#: ../../mod/settings.php:1089
 msgid "Default Post Permissions"
 msgstr "Standard-Zugriffsrechte für Beiträge"
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1090
 msgid "(click to open/close)"
 msgstr "(klicke zum öffnen/schließen)"
 
-#: ../../mod/settings.php:1070 ../../mod/photos.php:1140
+#: ../../mod/settings.php:1099 ../../mod/photos.php:1140
 #: ../../mod/photos.php:1506
 msgid "Show to Groups"
 msgstr "Zeige den Gruppen"
 
-#: ../../mod/settings.php:1071 ../../mod/photos.php:1141
+#: ../../mod/settings.php:1100 ../../mod/photos.php:1141
 #: ../../mod/photos.php:1507
 msgid "Show to Contacts"
 msgstr "Zeige den Kontakten"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1101
 msgid "Default Private Post"
 msgstr "Privater Standardbeitrag"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1102
 msgid "Default Public Post"
 msgstr "Öffentlicher Standardbeitrag"
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1106
 msgid "Default Permissions for New Posts"
 msgstr "Standardberechtigungen für neue Beiträge"
 
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1118
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:"
 
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1121
 msgid "Notification Settings"
 msgstr "Benachrichtigungseinstellungen"
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1122
 msgid "By default post a status message when:"
 msgstr "Standardmäßig eine Statusnachricht posten, wenn:"
 
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1123
 msgid "accepting a friend request"
 msgstr "– du eine Kontaktanfrage akzeptierst"
 
-#: ../../mod/settings.php:1095
+#: ../../mod/settings.php:1124
 msgid "joining a forum/community"
 msgstr "– du einem Forum/einer Gemeinschaftsseite beitrittst"
 
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1125
 msgid "making an <em>interesting</em> profile change"
 msgstr "– du eine <em>interessante</em> Änderung an deinem Profil durchführst"
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1126
 msgid "Send a notification email when:"
 msgstr "Benachrichtigungs-E-Mail senden wenn:"
 
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1127
 msgid "You receive an introduction"
 msgstr "– du eine Kontaktanfrage erhältst"
 
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1128
 msgid "Your introductions are confirmed"
 msgstr "– eine deiner Kontaktanfragen akzeptiert wurde"
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1129
 msgid "Someone writes on your profile wall"
 msgstr "– jemand etwas auf deine Pinnwand schreibt"
 
-#: ../../mod/settings.php:1101
+#: ../../mod/settings.php:1130
 msgid "Someone writes a followup comment"
 msgstr "– jemand auch einen Kommentar verfasst"
 
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1131
 msgid "You receive a private message"
 msgstr "– du eine private Nachricht erhältst"
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1132
 msgid "You receive a friend suggestion"
 msgstr "– du eine Empfehlung erhältst"
 
-#: ../../mod/settings.php:1104
+#: ../../mod/settings.php:1133
 msgid "You are tagged in a post"
 msgstr "– du in einem Beitrag erwähnt wirst"
 
-#: ../../mod/settings.php:1105
+#: ../../mod/settings.php:1134
 msgid "You are poked/prodded/etc. in a post"
 msgstr "– du von jemandem angestupst oder sonstwie behandelt wirst"
 
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1137
 msgid "Advanced Account/Page Type Settings"
 msgstr "Erweiterte Konto-/Seitentyp-Einstellungen"
 
-#: ../../mod/settings.php:1109
+#: ../../mod/settings.php:1138
 msgid "Change the behaviour of this account for special situations"
 msgstr "Verhalten dieses Kontos in bestimmten Situationen:"
 
@@ -4817,7 +4844,7 @@ msgstr "Auf %s wurde die Verbindung akzeptiert"
 msgid "%1$s has joined %2$s"
 msgstr "%1$s ist %2$s beigetreten"
 
-#: ../../mod/dfrn_poll.php:101 ../../mod/dfrn_poll.php:534
+#: ../../mod/dfrn_poll.php:103 ../../mod/dfrn_poll.php:536
 #, php-format
 msgid "%1$s welcomes %2$s"
 msgstr "%1$s heißt %2$s herzlich willkommen"
@@ -5541,7 +5568,7 @@ msgid ""
 "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:84 ../../boot.php:1081
+#: ../../mod/lostpass.php:84 ../../boot.php:1149
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
@@ -5927,7 +5954,7 @@ msgstr "Keine weiteren Pinnwand-Benachrichtigungen"
 msgid "Home Notifications"
 msgstr "Pinnwand Benachrichtigungen"
 
-#: ../../mod/photos.php:51 ../../boot.php:1887
+#: ../../mod/photos.php:51 ../../boot.php:1955
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
@@ -6128,7 +6155,7 @@ msgstr "Das bist du"
 
 #: ../../mod/photos.php:1551 ../../mod/photos.php:1595
 #: ../../mod/photos.php:1678 ../../mod/content.php:732
-#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:652
+#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:668
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -6321,22 +6348,14 @@ msgid ""
 " features and resources."
 msgstr "Unsere <strong>Hilfe</strong> Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten."
 
-#: ../../mod/profile.php:21 ../../boot.php:1255
+#: ../../mod/profile.php:21 ../../boot.php:1323
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../mod/profile.php:155 ../../mod/display.php:99
-msgid "Access to this profile has been restricted."
-msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
-
 #: ../../mod/profile.php:180
 msgid "Tips for New Members"
 msgstr "Tipps für neue Nutzer"
 
-#: ../../mod/display.php:206
-msgid "Item has been removed."
-msgstr "Eintrag wurde entfernt."
-
 #: ../../mod/install.php:117
 msgid "Friendica Social Communications Server - Setup"
 msgstr "Friendica-Server für soziale Netzwerke – Setup"
@@ -6969,124 +6988,124 @@ msgstr "Schriftgröße in Eingabefeldern"
 msgid "toggle mobile"
 msgstr "auf/von Mobile Ansicht wechseln"
 
-#: ../../boot.php:651
+#: ../../boot.php:667
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: ../../boot.php:654
+#: ../../boot.php:670
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: ../../boot.php:929
+#: ../../boot.php:997
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
 
-#: ../../boot.php:931
+#: ../../boot.php:999
 #, php-format
 msgid "Update Error at %s"
 msgstr "Updatefehler bei %s"
 
-#: ../../boot.php:1041
+#: ../../boot.php:1109
 msgid "Create a New Account"
 msgstr "Neues Konto erstellen"
 
-#: ../../boot.php:1069
+#: ../../boot.php:1137
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder E-Mail-Adresse: "
 
-#: ../../boot.php:1070
+#: ../../boot.php:1138
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:1071
+#: ../../boot.php:1139
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: ../../boot.php:1074
+#: ../../boot.php:1142
 msgid "Or login using OpenID: "
 msgstr "Oder melde dich mit deiner OpenID an: "
 
-#: ../../boot.php:1080
+#: ../../boot.php:1148
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:1083
+#: ../../boot.php:1151
 msgid "Website Terms of Service"
 msgstr "Website Nutzungsbedingungen"
 
-#: ../../boot.php:1084
+#: ../../boot.php:1152
 msgid "terms of service"
 msgstr "Nutzungsbedingungen"
 
-#: ../../boot.php:1086
+#: ../../boot.php:1154
 msgid "Website Privacy Policy"
 msgstr "Website Datenschutzerklärung"
 
-#: ../../boot.php:1087
+#: ../../boot.php:1155
 msgid "privacy policy"
 msgstr "Datenschutzerklärung"
 
-#: ../../boot.php:1216
+#: ../../boot.php:1284
 msgid "Requested account is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../boot.php:1295 ../../boot.php:1399
+#: ../../boot.php:1363 ../../boot.php:1467
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: ../../boot.php:1361
+#: ../../boot.php:1429
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../boot.php:1369
+#: ../../boot.php:1437
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
 
-#: ../../boot.php:1498 ../../boot.php:1584
+#: ../../boot.php:1566 ../../boot.php:1652
 msgid "g A l F d"
 msgstr "l, d. F G \\U\\h\\r"
 
-#: ../../boot.php:1499 ../../boot.php:1585
+#: ../../boot.php:1567 ../../boot.php:1653
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1544 ../../boot.php:1625
+#: ../../boot.php:1612 ../../boot.php:1693
 msgid "[today]"
 msgstr "[heute]"
 
-#: ../../boot.php:1556
+#: ../../boot.php:1624
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:1557
+#: ../../boot.php:1625
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:1618
+#: ../../boot.php:1686
 msgid "[No description]"
 msgstr "[keine Beschreibung]"
 
-#: ../../boot.php:1636
+#: ../../boot.php:1704
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: ../../boot.php:1637
+#: ../../boot.php:1705
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1873
+#: ../../boot.php:1941
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:1880
+#: ../../boot.php:1948
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1897
+#: ../../boot.php:1965
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1904
+#: ../../boot.php:1972
 msgid "Only You Can See This"
 msgstr "Nur du kannst das sehen"
diff --git a/view/de/strings.php b/view/de/strings.php
index 862d0cf2f0..b849806cee 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -184,18 +184,6 @@ $a->strings["Logged out."] = "Abgemeldet.";
 $a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
 $a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass du die OpenID richtig geschrieben hast.";
 $a->strings["The error message was:"] = "Die Fehlermeldung lautete:";
-$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?";
-$a->strings["Error! I can't import this file: DB schema version is not compatible."] = "Fehler! Kann diese Datei nicht importieren. Die DB Schema Versionen sind nicht kompatibel.";
-$a->strings["Error! Cannot check nickname"] = "Fehler! Konnte den Nickname nicht überprüfen.";
-$a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!";
-$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten";
-$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos";
-$a->strings["%d contact not imported"] = array(
-	0 => "%d Kontakt nicht importiert",
-	1 => "%d Kontakte nicht importiert",
-);
-$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden";
 $a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\, H:i";
 $a->strings["Starts:"] = "Beginnt:";
 $a->strings["Finishes:"] = "Endet:";
@@ -285,17 +273,6 @@ $a->strings["Image/photo"] = "Bild/Foto";
 $a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "<span><a href=\"%s\" target=\"external-link\">%s</a> schrieb den folgenden <a href=\"%s\" target=\"external-link\">Beitrag</a>";
 $a->strings["$1 wrote:"] = "$1 hat geschrieben:";
 $a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
-$a->strings["%s's birthday"] = "%ss Geburtstag";
-$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
-$a->strings["[Name Withheld]"] = "[Name unterdrückt]";
-$a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf ";
-$a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
-$a->strings["Item not found."] = "Beitrag nicht gefunden.";
-$a->strings["Do you really want to delete this item?"] = "Möchtest du wirklich dieses Item löschen?";
-$a->strings["Yes"] = "Ja";
-$a->strings["Cancel"] = "Abbrechen";
-$a->strings["Permission denied."] = "Zugriff verweigert.";
-$a->strings["Archives"] = "Archiv";
 $a->strings["view full size"] = "Volle Größe anzeigen";
 $a->strings["Miscellaneous"] = "Verschiedenes";
 $a->strings["year"] = "Jahr";
@@ -315,6 +292,8 @@ $a->strings["minutes"] = "Minuten";
 $a->strings["second"] = "Sekunde";
 $a->strings["seconds"] = "Sekunden";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s her";
+$a->strings["%s's birthday"] = "%ss Geburtstag";
+$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
 $a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken.";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze deines Abonnements.";
 $a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in deinem Abonnement nicht verfügbar.";
@@ -325,6 +304,15 @@ $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrich
 $a->strings["status"] = "Status";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s";
 $a->strings["Attachments:"] = "Anhänge:";
+$a->strings["[Name Withheld]"] = "[Name unterdrückt]";
+$a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf ";
+$a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
+$a->strings["Item not found."] = "Beitrag nicht gefunden.";
+$a->strings["Do you really want to delete this item?"] = "Möchtest du wirklich dieses Item löschen?";
+$a->strings["Yes"] = "Ja";
+$a->strings["Cancel"] = "Abbrechen";
+$a->strings["Permission denied."] = "Zugriff verweigert.";
+$a->strings["Archives"] = "Archiv";
 $a->strings["General Features"] = "Allgemeine Features";
 $a->strings["Multiple Profiles"] = "Mehrere Profile";
 $a->strings["Ability to create multiple profiles"] = "Möglichkeit mehrere Profile zu erstellen";
@@ -531,6 +519,17 @@ $a->strings["Navigation"] = "Navigation";
 $a->strings["Site map"] = "Sitemap";
 $a->strings["Embedded content"] = "Eingebetteter Inhalt";
 $a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
+$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?";
+$a->strings["Error! Cannot check nickname"] = "Fehler! Konnte den Nickname nicht überprüfen.";
+$a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!";
+$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten";
+$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos";
+$a->strings["%d contact not imported"] = array(
+	0 => "%d Kontakt nicht importiert",
+	1 => "%d Kontakte nicht importiert",
+);
+$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden";
 $a->strings["Welcome "] = "Willkommen ";
 $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
 $a->strings["Welcome back "] = "Willkommen zurück ";
@@ -615,6 +614,9 @@ $a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an,
 $a->strings["Visible To"] = "Sichtbar für";
 $a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit gesichertem Profilzugriff)";
 $a->strings["Personal Notes"] = "Persönliche Notizen";
+$a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert.";
+$a->strings["Access to this profile has been restricted."] = "Der Zugriff zu diesem Profil wurde eingeschränkt.";
+$a->strings["Item has been removed."] = "Eintrag wurde entfernt.";
 $a->strings["Visit %s's profile [%s]"] = "Besuche %ss Profil [%s]";
 $a->strings["Edit contact"] = "Kontakt bearbeiten";
 $a->strings["Contacts who are not members of a group"] = "Kontakte, die keiner Gruppe zugewiesen sind";
@@ -822,7 +824,6 @@ $a->strings["%s posted an update."] = "%s hat ein Update veröffentlicht.";
 $a->strings["Friends of %s"] = "Freunde von %s";
 $a->strings["No friends to display."] = "Keine Freunde zum Anzeigen.";
 $a->strings["Remove term"] = "Begriff entfernen";
-$a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert.";
 $a->strings["No results."] = "Keine Ergebnisse.";
 $a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren";
 $a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:";
@@ -952,10 +953,12 @@ $a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet.";
 $a->strings["Features updated"] = "Features aktualisiert";
 $a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert.";
+$a->strings["Wrong password."] = "Falsches Passwort.";
 $a->strings["Password changed."] = "Passwort geändert.";
 $a->strings["Password update failed. Please try again."] = "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal.";
 $a->strings[" Please use a shorter name."] = " Bitte verwende einen kürzeren Namen.";
 $a->strings[" Name too short."] = " Name ist zu kurz.";
+$a->strings["Wrong Password"] = "Falsches Passwort";
 $a->strings[" Not valid email."] = " Keine gültige E-Mail.";
 $a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. ";
 $a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt.";
@@ -1005,6 +1008,7 @@ $a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktua
 $a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum";
 $a->strings["Number of items to display per page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: ";
 $a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge";
+$a->strings["Number of items to display per page when viewed from mobile device:"] = "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:";
 $a->strings["Don't show emoticons"] = "Keine Smilies anzeigen";
 $a->strings["Normal Account Page"] = "Normales Konto";
 $a->strings["This account is a normal personal profile"] = "Dieses Konto ist ein normales persönliches Profil";
@@ -1043,6 +1047,9 @@ $a->strings["Password Settings"] = "Passwort-Einstellungen";
 $a->strings["New Password:"] = "Neues Passwort:";
 $a->strings["Confirm:"] = "Bestätigen:";
 $a->strings["Leave password fields blank unless changing"] = "Lass die Passwort-Felder leer, außer du willst das Passwort ändern";
+$a->strings["Current Password:"] = "Aktuelles Passwort:";
+$a->strings["Your current password to confirm the changes"] = "Dein aktuelles Passwort um die Änderungen zu bestätigen";
+$a->strings["Password:"] = "Passwort:";
 $a->strings["Basic Settings"] = "Grundeinstellungen";
 $a->strings["Email Address:"] = "E-Mail-Adresse:";
 $a->strings["Your Timezone:"] = "Deine Zeitzone:";
@@ -1466,9 +1473,7 @@ $a->strings["Getting Help"] = "Hilfe bekommen";
 $a->strings["Go to the Help Section"] = "Zum Hilfe Abschnitt gehen";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Unsere <strong>Hilfe</strong> Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten.";
 $a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden.";
-$a->strings["Access to this profile has been restricted."] = "Der Zugriff zu diesem Profil wurde eingeschränkt.";
 $a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
-$a->strings["Item has been removed."] = "Eintrag wurde entfernt.";
 $a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
 $a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert";
 $a->strings["Could not create table."] = "Konnte Tabelle nicht erstellen.";

From 7e5ec9fcebe47c50fc6503ae9f23f43a604674ba Mon Sep 17 00:00:00 2001
From: Carsten Pfeiffer <carsten.pfeiffer@gebit.de>
Date: Sat, 27 Apr 2013 21:08:45 +0200
Subject: [PATCH 34/67] Wrap class OAuthException with !class_exists

Same problem and solution as discussed on
https://drupal.org/node/1334528
---
 library/OAuth1.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/OAuth1.php b/library/OAuth1.php
index 0db6fabcbe..53b905e771 100644
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
@@ -3,8 +3,10 @@
 
 /* Generic exception class
  */
-class OAuthException extends Exception {
-  // pass
+if (!class_exists('OAuthException')) {
+	class OAuthException extends Exception {
+		// pass
+	}
 }
 
 class OAuthConsumer {

From 7f6a7af2b3407f345043bb58756be14c4e12d3ae Mon Sep 17 00:00:00 2001
From: Carsten Pfeiffer <carsten.pfeiffer@gebit.de>
Date: Sat, 27 Apr 2013 21:40:40 +0200
Subject: [PATCH 35/67] fix reading sitename config

---
 include/enotify.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/enotify.php b/include/enotify.php
index f294a4fc77..c41f55a5d6 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -17,7 +17,7 @@ function notification($params) {
 	$product = FRIENDICA_PLATFORM;
 	$siteurl = $a->get_baseurl(true);
 	$thanks = t('Thank You,');
-	$sitename = get_config('config','sitename');
+	$sitename = $a->config['sitename'];
 	$site_admin = sprintf( t('%s Administrator'), $sitename);
 
 	$sender_name = $product;

From 61a0f9c196e61342bdca56d9283ea66e66b82bd6 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 28 Apr 2013 04:30:20 -0700
Subject: [PATCH 36/67] bug #540 and hush up a couple of log messages that are
 way too verbose

---
 boot.php                                     |  2 +-
 include/items.php                            |  2 +-
 object/Item.php                              |  2 +-
 util/messages.po                             | 10 +++++-----
 view/theme/diabook/templates/wall_thread.tpl |  6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/boot.php b/boot.php
index 6a273d9cc9..070ddd64d6 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1681' );
+define ( 'FRIENDICA_VERSION',      '3.1.1684' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/include/items.php b/include/items.php
index 194e19b5c0..f4f972e72d 100755
--- a/include/items.php
+++ b/include/items.php
@@ -294,7 +294,7 @@ function construct_activity_target($item) {
 if(! function_exists('limit_body_size')) {
 function limit_body_size($body) {
 
-	logger('limit_body_size: start', LOGGER_DEBUG);
+//	logger('limit_body_size: start', LOGGER_DEBUG);
 
 	$maxlen = get_max_import_size();
 
diff --git a/object/Item.php b/object/Item.php
index 575a28f58f..ae4d26cc10 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -529,7 +529,7 @@ class Item extends BaseObject {
 	 */
 	public function get_data_value($name) {
 		if(!isset($this->data[$name])) {
-			logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
+//			logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
 			return false;
 		}
 
diff --git a/util/messages.po b/util/messages.po
index 370cd01015..17ef89bf2b 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1681\n"
+"Project-Id-Version: 3.1.1684\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-25 00:02-0700\n"
+"POT-Creation-Date: 2013-04-28 00:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1086,7 +1086,7 @@ msgstr ""
 msgid " on Last.fm"
 msgstr ""
 
-#: ../../include/bbcode.php:210 ../../include/bbcode.php:545
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:549
 msgid "Image/photo"
 msgstr ""
 
@@ -1097,11 +1097,11 @@ msgid ""
 "href=\"%s\" target=\"external-link\">post</a>"
 msgstr ""
 
-#: ../../include/bbcode.php:510 ../../include/bbcode.php:530
+#: ../../include/bbcode.php:514 ../../include/bbcode.php:534
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/bbcode.php:553 ../../include/bbcode.php:554
+#: ../../include/bbcode.php:557 ../../include/bbcode.php:558
 msgid "Encrypted content"
 msgstr ""
 
diff --git a/view/theme/diabook/templates/wall_thread.tpl b/view/theme/diabook/templates/wall_thread.tpl
index be143cfbaa..8c4dd450d7 100644
--- a/view/theme/diabook/templates/wall_thread.tpl
+++ b/view/theme/diabook/templates/wall_thread.tpl
@@ -75,11 +75,11 @@
 				{{if $item.vote.dislike}}
 				<a href="#" id="dislike-{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
 				{{/if}}
-			{{/if}}
 						
-			{{if $item.vote.share}}
+				{{if $item.vote.share}}
 				<a href="#" id="share-{{$item.id}}" class="icon recycle" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>
-			{{/if}}	
+				{{/if}}	
+			{{/if}}
 
 
 			{{if $item.star}}

From 0bbd0939e48a8844297e7d5d734d3c37c6180f1a Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 28 Apr 2013 15:35:34 +0200
Subject: [PATCH 37/67] ZH-CN: update to the strings

---
 view/zh-cn/messages.po | 6041 +++++++++++-----------------------------
 view/zh-cn/strings.php |  982 ++-----
 2 files changed, 1818 insertions(+), 5205 deletions(-)

diff --git a/view/zh-cn/messages.po b/view/zh-cn/messages.po
index be21353e9d..be5909293f 100644
--- a/view/zh-cn/messages.po
+++ b/view/zh-cn/messages.po
@@ -1,18 +1,18 @@
 # FRIENDICA Distributed Social Network
-# Copyright (C) 2010, 2011 the Friendica Project
+# Copyright (C) 2010, 2011, 2012, 2013 the Friendica Project
 # This file is distributed under the same license as the Friendica package.
 # 
 # Translators:
-# Matthew Exon <transifex.mexon@spamgourmet.com>, 2013.
-# Mike Macgirvin, 2010.
-#   <transifex.mexon@spamgourmet.com>, 2012-2013.
+# matthew_exon <transifex.mexon@spamgourmet.com>, 2013
+# Mike Macgirvin, 2010
+# matthew_exon <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: 2013-02-26 00:00-0800\n"
-"PO-Revision-Date: 2013-02-26 03:52+0000\n"
-"Last-Translator: matthew_exon <transifex.mexon@spamgourmet.com>\n"
+"POT-Creation-Date: 2013-04-25 00:02-0700\n"
+"PO-Revision-Date: 2013-04-28 09:36+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/friendica/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,3285 +20,22 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../addon.old/altpager/altpager.php:46
-#: ../../addon/altpager/altpager.php:46
-msgid "Altpager settings updated."
-msgstr "Altpager设置更新了。"
-
-#: ../../addon.old/altpager/altpager.php:79
-#: ../../addon/altpager/altpager.php:83
-msgid "Alternate Pagination Setting"
-msgstr "供替换的分页设置"
-
-#: ../../addon.old/altpager/altpager.php:81
-#: ../../addon/altpager/altpager.php:85
-msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
-msgstr "用到「更新」和「更旧」页代替页数？"
-
-#: ../../addon.old/altpager/altpager.php:87 ../../addon.old/bg/bg.php:90
-#: ../../addon.old/blackout/blackout.php:98
-#: ../../addon.old/blockem/blockem.php:57
-#: ../../addon.old/blogger/blogger.php:102
-#: ../../addon.old/drpost/drpost.php:110 ../../addon.old/dwpost/dwpost.php:93
-#: ../../addon.old/editplain/editplain.php:84
-#: ../../addon.old/facebook/facebook.php:619
-#: ../../addon.old/fbpost/fbpost.php:226
-#: ../../addon.old/forumlist/forumlist.php:175
-#: ../../addon.old/fromapp/fromapp.php:77
-#: ../../addon.old/fromgplus/fromgplus.php:40
-#: ../../addon.old/geonames/geonames.php:187 ../../addon.old/gnot/gnot.php:88
-#: ../../addon.old/gravatar/gravatar.php:95
-#: ../../addon.old/group_text/group_text.php:84
-#: ../../addon.old/ijpost/ijpost.php:93
-#: ../../addon.old/impressum/impressum.php:83 ../../addon.old/irc/irc.php:55
-#: ../../addon.old/jappixmini/jappixmini.php:307
-#: ../../addon.old/libertree/libertree.php:90
-#: ../../addon.old/libravatar/libravatar.php:99
-#: ../../addon.old/ljpost/ljpost.php:93 ../../addon.old/mathjax/mathjax.php:42
-#: ../../addon.old/notimeline/notimeline.php:64
-#: ../../addon.old/nsfw/nsfw.php:88
-#: ../../addon.old/numfriends/numfriends.php:85
-#: ../../addon.old/oembed.old/oembed.php:41
-#: ../../addon.old/openstreetmap/openstreetmap.php:70
-#: ../../addon.old/page/page.php:211
-#: ../../addon.old/pageheader/pageheader.php:55
-#: ../../addon.old/piwik/piwik.php:89 ../../addon.old/planets/planets.php:158
-#: ../../addon.old/posterous/posterous.php:103
-#: ../../addon.old/qcomment/qcomment.php:61
-#: ../../addon.old/randplace/randplace.php:177
-#: ../../addon.old/showmore/showmore.php:48
-#: ../../addon.old/snautofollow/snautofollow.php:64
-#: ../../addon.old/startpage/startpage.php:92
-#: ../../addon.old/statusnet/statusnet.php:278
-#: ../../addon.old/statusnet/statusnet.php:292
-#: ../../addon.old/statusnet/statusnet.php:318
-#: ../../addon.old/statusnet/statusnet.php:325
-#: ../../addon.old/statusnet/statusnet.php:353
-#: ../../addon.old/statusnet/statusnet.php:576
-#: ../../addon.old/tumblr/tumblr.php:90
-#: ../../addon.old/twitter/twitter.php:180
-#: ../../addon.old/twitter/twitter.php:209
-#: ../../addon.old/twitter/twitter.php:394
-#: ../../addon.old/uhremotestorage/uhremotestorage.php:89
-#: ../../addon.old/wppost/wppost.php:110 ../../addon.old/yourls/yourls.php:76
-#: ../../addon/altpager/altpager.php:91 ../../addon/altpager/altpager.php:98
-#: ../../addon/blackout/blackout.php:99 ../../addon/blockem/blockem.php:57
-#: ../../addon/blogger/blogger.php:102 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/editplain/editplain.php:84
-#: ../../addon/facebook/facebook.php:621 ../../addon/fbpost/fbpost.php:280
-#: ../../addon/forumlist/forumlist.php:178 ../../addon/fromapp/fromapp.php:77
-#: ../../addon/fromgplus/fromgplus.php:44
-#: ../../addon/geonames/geonames.php:187 ../../addon/gnot/gnot.php:88
-#: ../../addon/gravatar/gravatar.php:95
-#: ../../addon/group_text/group_text.php:84 ../../addon/ijpost/ijpost.php:93
-#: ../../addon/impressum/impressum.php:83 ../../addon/irc/irc.php:55
-#: ../../addon/jappixmini/jappixmini.php:307
-#: ../../addon/libertree/libertree.php:90
-#: ../../addon/libravatar/libravatar.php:99 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/mathjax/mathjax.php:42 ../../addon/notimeline/notimeline.php:64
-#: ../../addon/nsfw/nsfw.php:88 ../../addon/numfriends/numfriends.php:85
-#: ../../addon/openstreetmap/openstreetmap.php:94
-#: ../../addon/page/page.php:211 ../../addon/pageheader/pageheader.php:55
-#: ../../addon/piwik/piwik.php:89 ../../addon/planets/planets.php:158
-#: ../../addon/posterous/posterous.php:103
-#: ../../addon/qcomment/qcomment.php:61
-#: ../../addon/randplace/randplace.php:177
-#: ../../addon/remote_permissions/remote_permissions.php:48
-#: ../../addon/remote_permissions/remote_permissions.php:196
-#: ../../addon/showmore/showmore.php:48
-#: ../../addon/snautofollow/snautofollow.php:64
-#: ../../addon/startpage/startpage.php:92
-#: ../../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/twitter/twitter.php:191 ../../addon/twitter/twitter.php:229
-#: ../../addon/twitter/twitter.php:556
-#: ../../addon/uhremotestorage/uhremotestorage.php:89
-#: ../../addon/wppost/wppost.php:110 ../../addon/yourls/yourls.php:76
-#: ../../mod/profiles.php:626 ../../mod/admin.php:475 ../../mod/admin.php:744
-#: ../../mod/admin.php:882 ../../mod/admin.php:1082 ../../mod/admin.php:1169
-#: ../../mod/contacts.php:386 ../../mod/settings.php:560
-#: ../../mod/settings.php:670 ../../mod/settings.php:739
-#: ../../mod/settings.php:811 ../../mod/settings.php:1037
-#: ../../mod/crepair.php:166 ../../mod/poke.php:199 ../../mod/events.php:478
-#: ../../mod/fsuggest.php:107 ../../mod/group.php:87 ../../mod/install.php:248
-#: ../../mod/install.php:286 ../../mod/invite.php:140
-#: ../../mod/localtime.php:45 ../../mod/manage.php:110
-#: ../../mod/message.php:335 ../../mod/message.php:564 ../../mod/mood.php:137
-#: ../../mod/photos.php:1078 ../../mod/photos.php:1199
-#: ../../mod/photos.php:1501 ../../mod/photos.php:1552
-#: ../../mod/photos.php:1596 ../../mod/photos.php:1679
-#: ../../mod/content.php:733 ../../object/Item.php:643
-#: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/config.php:152
-#: ../../view/theme/diabook/theme.php:642 ../../view/theme/dispy/config.php:70
-#: ../../view/theme/quattro/config.php:64
-msgid "Submit"
-msgstr "提交"
-
-#: ../../addon.old/bg/bg.php:51
-msgid "Bg settings updated."
-msgstr "Bg设置更新了"
-
-#: ../../addon.old/bg/bg.php:82
-msgid "Bg Settings"
-msgstr "Bg设置"
-
-#: ../../addon.old/bg/bg.php:84 ../../addon.old/numfriends/numfriends.php:79
-#: ../../addon/numfriends/numfriends.php:79
-msgid "How many contacts to display on profile sidebar"
-msgstr "多少熟人表示在简介工具栏"
-
-#: ../../addon.old/blockem/blockem.php:51 ../../addon/blockem/blockem.php:51
-msgid "\"Blockem\" Settings"
-msgstr "「Blockem」配置"
-
-#: ../../addon.old/blockem/blockem.php:53 ../../addon/blockem/blockem.php:53
-msgid "Comma separated profile URLS to block"
-msgstr "逗号分简介URL为栏"
-
-#: ../../addon.old/blockem/blockem.php:70 ../../addon/blockem/blockem.php:70
-msgid "BLOCKEM Settings saved."
-msgstr "「Blockem」配置保存了。"
-
-#: ../../addon.old/blockem/blockem.php:105 ../../addon/blockem/blockem.php:105
-#, php-format
-msgid "Blocked %s - Click to open/close"
-msgstr "%s拦了－点击为开关"
-
-#: ../../addon.old/blockem/blockem.php:160 ../../addon/blockem/blockem.php:160
-msgid "Unblock Author"
-msgstr "不拦作家"
-
-#: ../../addon.old/blockem/blockem.php:162 ../../addon/blockem/blockem.php:162
-msgid "Block Author"
-msgstr "拦作家"
-
-#: ../../addon.old/blockem/blockem.php:194 ../../addon/blockem/blockem.php:194
-msgid "blockem settings updated"
-msgstr "blockem设置更新了"
-
-#: ../../addon.old/blogger/blogger.php:42 ../../addon/blogger/blogger.php:42
-msgid "Post to blogger"
-msgstr "转播到blogger"
-
-#: ../../addon.old/blogger/blogger.php:74 ../../addon/blogger/blogger.php:74
-msgid "Blogger Post Settings"
-msgstr "Blogger转播设置"
-
-#: ../../addon.old/blogger/blogger.php:76 ../../addon/blogger/blogger.php:76
-msgid "Enable Blogger Post Plugin"
-msgstr "使Blogger转播插件可用"
-
-#: ../../addon.old/blogger/blogger.php:81 ../../addon/blogger/blogger.php:81
-msgid "Blogger username"
-msgstr "Blogger用户名"
-
-#: ../../addon.old/blogger/blogger.php:86 ../../addon/blogger/blogger.php:86
-msgid "Blogger password"
-msgstr "Blogger密码"
-
-#: ../../addon.old/blogger/blogger.php:91 ../../addon/blogger/blogger.php:91
-msgid "Blogger API URL"
-msgstr "Blogger API URL"
-
-#: ../../addon.old/blogger/blogger.php:96 ../../addon/blogger/blogger.php:96
-msgid "Post to Blogger by default"
-msgstr "默认地转播到Blogger"
-
-#: ../../addon.old/blogger/blogger.php:172
-#: ../../addon.old/drpost/drpost.php:184
-#: ../../addon.old/posterous/posterous.php:189
-#: ../../addon.old/wppost/wppost.php:201 ../../addon/blogger/blogger.php:172
-#: ../../addon/posterous/posterous.php:189 ../../addon/wppost/wppost.php:201
-msgid "Post from Friendica"
-msgstr "文章从Friendica"
-
-#: ../../addon.old/buglink/buglink.php:15 ../../addon/buglink/buglink.php:15
-msgid "Report Bug"
-msgstr "报案程序错误"
-
-#: ../../addon.old/communityhome/twillingham/communityhome.php:28
-#: ../../addon.old/communityhome/twillingham/communityhome.php:34
-#: ../../addon.old/communityhome/communityhome.php:28
-#: ../../addon.old/communityhome/communityhome.php:34
-#: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:91
-#: ../../boot.php:1058
-msgid "Login"
-msgstr "登录"
-
-#: ../../addon.old/communityhome/twillingham/communityhome.php:29
-#: ../../addon.old/communityhome/communityhome.php:29
-#: ../../addon/communityhome/communityhome.php:29
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../../addon.old/communityhome/twillingham/communityhome.php:38
-#: ../../addon.old/communityhome/communityhome.php:38
-#: ../../addon/communityhome/communityhome.php:39
-msgid "Latest users"
-msgstr "最近用户"
-
-#: ../../addon.old/communityhome/twillingham/communityhome.php:81
-#: ../../addon.old/communityhome/communityhome.php:81
-#: ../../addon/communityhome/communityhome.php:84
-msgid "Most active users"
-msgstr "最积极用户"
-
-#: ../../addon.old/communityhome/communityhome.php:98
-#: ../../addon/communityhome/communityhome.php:102
-msgid "Latest photos"
-msgstr "最近照片"
-
-#: ../../addon.old/communityhome/communityhome.php:110
-#: ../../addon/communityhome/communityhome.php:115 ../../mod/photos.php:59
-#: ../../mod/photos.php:154 ../../mod/photos.php:1058
-#: ../../mod/photos.php:1183 ../../mod/photos.php:1206
-#: ../../mod/photos.php:1736 ../../mod/photos.php:1748
-#: ../../view/theme/diabook/theme.php:492
-msgid "Contact Photos"
-msgstr "熟人照片"
-
-#: ../../addon.old/communityhome/communityhome.php:111
-#: ../../addon/communityhome/communityhome.php:116 ../../include/user.php:325
-#: ../../include/user.php:332 ../../include/user.php:339
-#: ../../mod/photos.php:154 ../../mod/photos.php:725 ../../mod/photos.php:1183
-#: ../../mod/photos.php:1206 ../../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 ../../view/theme/diabook/theme.php:493
-msgid "Profile Photos"
-msgstr "简介照片"
-
-#: ../../addon.old/communityhome/communityhome.php:133
-#: ../../addon/communityhome/communityhome.php:141
-msgid "Latest likes"
-msgstr "最近喜欢"
-
-#: ../../addon.old/communityhome/communityhome.php:155
-#: ../../addon/communityhome/communityhome.php:163 ../../include/text.php:1554
-#: ../../include/conversation.php:118 ../../include/conversation.php:246
-#: ../../view/theme/diabook/theme.php:456
-msgid "event"
-msgstr "项目"
-
-#: ../../addon.old/communityhome/communityhome.php:158
-#: ../../addon.old/communityhome/communityhome.php:167
-#: ../../addon.old/facebook/facebook.php:1598
-#: ../../addon/communityhome/communityhome.php:166
-#: ../../addon/communityhome/communityhome.php:175
-#: ../../addon/facebook/facebook.php:1600 ../../include/diaspora.php:1874
-#: ../../include/conversation.php:121 ../../include/conversation.php:130
-#: ../../include/conversation.php:249 ../../include/conversation.php:258
-#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
-#: ../../mod/like.php:322 ../../view/theme/diabook/theme.php:459
-#: ../../view/theme/diabook/theme.php:468
-msgid "status"
-msgstr "现状"
-
-#: ../../addon.old/communityhome/communityhome.php:163
-#: ../../addon/communityhome/communityhome.php:171 ../../include/text.php:1556
-#: ../../include/diaspora.php:1874 ../../include/conversation.php:126
-#: ../../include/conversation.php:254 ../../mod/subthread.php:87
-#: ../../mod/tagger.php:62 ../../mod/like.php:151
-#: ../../view/theme/diabook/theme.php:464
-msgid "photo"
-msgstr "照片"
-
-#: ../../addon.old/communityhome/communityhome.php:172
-#: ../../addon.old/facebook/facebook.php:1602
-#: ../../addon/communityhome/communityhome.php:180
-#: ../../addon/facebook/facebook.php:1604 ../../include/diaspora.php:1890
-#: ../../include/conversation.php:137 ../../mod/like.php:168
-#: ../../view/theme/diabook/theme.php:473
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s喜欢%2$s的%3$s"
-
-#: ../../addon.old/communityhome/communityhome.php:179
-#: ../../addon/communityhome/communityhome.php:189 ../../mod/home.php:34
-#, php-format
-msgid "Welcome to %s"
-msgstr "%s欢迎你"
-
-#: ../../addon.old/dav/common/dav_caldav_backend_private.inc.php:39
-#: ../../addon/dav/common/dav_caldav_backend_private.inc.php:39
-msgid "Private Events"
-msgstr "私人项目"
-
-#: ../../addon.old/dav/common/dav_carddav_backend_private.inc.php:46
-#: ../../addon/dav/common/dav_carddav_backend_private.inc.php:46
-msgid "Private Addressbooks"
-msgstr "私人通讯录"
-
-#: ../../addon.old/dav/common/wdcal_backend.inc.php:92
-#: ../../addon.old/dav/common/wdcal_backend.inc.php:166
-#: ../../addon.old/dav/common/wdcal_backend.inc.php:178
-#: ../../addon.old/dav/common/wdcal_backend.inc.php:206
-#: ../../addon.old/dav/common/wdcal_backend.inc.php:214
-#: ../../addon.old/dav/common/wdcal_backend.inc.php:229
-#: ../../addon/dav/common/wdcal_backend.inc.php:92
-#: ../../addon/dav/common/wdcal_backend.inc.php:166
-#: ../../addon/dav/common/wdcal_backend.inc.php:178
-#: ../../addon/dav/common/wdcal_backend.inc.php:206
-#: ../../addon/dav/common/wdcal_backend.inc.php:214
-#: ../../addon/dav/common/wdcal_backend.inc.php:229
-msgid "No access"
-msgstr "看不了"
-
-#: ../../addon.old/dav/common/wdcal_configuration.php:148
-#: ../../addon/dav/common/wdcal_configuration.php:148
-msgid "U.S. Time Format (mm/dd/YYYY)"
-msgstr "美国时间形式（月／日／年）"
-
-#: ../../addon.old/dav/common/wdcal_configuration.php:243
-#: ../../addon/dav/common/wdcal_configuration.php:243
-msgid "German Time Format (dd.mm.YYYY)"
-msgstr "德国时间形式（日／月／年）"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:30
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:738
-#: ../../addon/dav/common/wdcal_edit.inc.php:30
-#: ../../addon/dav/common/wdcal_edit.inc.php:738
-msgid "Could not open component for editing"
-msgstr "开不了部件为编辑"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:140
-#: ../../addon.old/dav/friendica/layout.fnk.php:143
-#: ../../addon.old/dav/friendica/layout.fnk.php:422
-#: ../../addon/dav/common/wdcal_edit.inc.php:140
-#: ../../addon/dav/friendica/layout.fnk.php:143
-#: ../../addon/dav/friendica/layout.fnk.php:422
-msgid "Go back to the calendar"
-msgstr "返回日历"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:144
-#: ../../addon/dav/common/wdcal_edit.inc.php:144
-msgid "Event data"
-msgstr "项目内容"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:146
-#: ../../addon.old/dav/friendica/main.php:239
-#: ../../addon/dav/common/wdcal_edit.inc.php:146
-#: ../../addon/dav/friendica/main.php:239
-msgid "Calendar"
-msgstr "日历"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:163
-#: ../../addon/dav/common/wdcal_edit.inc.php:163
-msgid "Special color"
-msgstr "特别颜色"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:169
-#: ../../addon/dav/common/wdcal_edit.inc.php:169
-msgid "Subject"
-msgstr "题目"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:173
-#: ../../addon/dav/common/wdcal_edit.inc.php:173
-msgid "Starts"
-msgstr "开始"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:178
-#: ../../addon/dav/common/wdcal_edit.inc.php:178
-msgid "Ends"
-msgstr "结束"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:183
-#: ../../addon/dav/common/wdcal_edit.inc.php:183 ../../mod/profiles.php:367
-msgid "Location"
-msgstr "位置"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:185
-#: ../../addon/dav/common/wdcal_edit.inc.php:185
-msgid "Description"
-msgstr "描述"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:188
-#: ../../addon/dav/common/wdcal_edit.inc.php:188
-msgid "Recurrence"
-msgstr "复发"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:190
-#: ../../addon/dav/common/wdcal_edit.inc.php:190
-msgid "Frequency"
-msgstr "频率"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:191
-#: ../../addon/dav/common/wdcal_edit.inc.php:191
-#: ../../addon/fbpost/fbpost.php:255 ../../addon/fbpost/fbpost.php:257
-#: ../../mod/settings.php:732 ../../mod/settings.php:737
-msgid "None"
-msgstr "没有"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:194
-#: ../../addon/dav/common/wdcal_edit.inc.php:194
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "每日"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:197
-#: ../../addon/dav/common/wdcal_edit.inc.php:197
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "每周"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:200
-#: ../../addon/dav/common/wdcal_edit.inc.php:200
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "每月"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:203
-#: ../../addon/dav/common/wdcal_edit.inc.php:203
-msgid "Yearly"
-msgstr "一年一次"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:214
-#: ../../addon/dav/common/wdcal_edit.inc.php:214
-#: ../../include/datetime.php:288
-msgid "days"
-msgstr "天"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:215
-#: ../../addon/dav/common/wdcal_edit.inc.php:215
-#: ../../include/datetime.php:287
-msgid "weeks"
-msgstr "星期"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:216
-#: ../../addon/dav/common/wdcal_edit.inc.php:216
-#: ../../include/datetime.php:286
-msgid "months"
-msgstr "月"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:217
-#: ../../addon/dav/common/wdcal_edit.inc.php:217
-#: ../../include/datetime.php:285
-msgid "years"
-msgstr "年"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:218
-#: ../../addon/dav/common/wdcal_edit.inc.php:218
-msgid "Interval"
-msgstr "间隔"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:218
-#: ../../addon/dav/common/wdcal_edit.inc.php:218
-msgid "All %select% %time%"
-msgstr "每%select%%time%"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:222
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:260
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:481
-#: ../../addon/dav/common/wdcal_edit.inc.php:222
-#: ../../addon/dav/common/wdcal_edit.inc.php:260
-#: ../../addon/dav/common/wdcal_edit.inc.php:481
-msgid "Days"
-msgstr "天"
-
-#: ../../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
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:293
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:305
-#: ../../addon/dav/common/wdcal_edit.inc.php:231
-#: ../../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:1015
-msgid "Sunday"
-msgstr "星期天"
-
-#: ../../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
-#: ../../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:1015
-msgid "Monday"
-msgstr "星期一"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:238
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:277
-#: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:1015
-msgid "Tuesday"
-msgstr "星期二"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:241
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:280
-#: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:1015
-msgid "Wednesday"
-msgstr "星期三"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:244
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:283
-#: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:1015
-msgid "Thursday"
-msgstr "星期四"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:247
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:286
-#: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:1015
-msgid "Friday"
-msgstr "星期五"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:250
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:289
-#: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:1015
-msgid "Saturday"
-msgstr "星期六"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:297
-#: ../../addon/dav/common/wdcal_edit.inc.php:297
-msgid "First day of week:"
-msgstr "星期第一天："
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:350
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:373
-#: ../../addon/dav/common/wdcal_edit.inc.php:350
-#: ../../addon/dav/common/wdcal_edit.inc.php:373
-msgid "Day of month"
-msgstr "月里天数"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:354
-#: ../../addon/dav/common/wdcal_edit.inc.php:354
-msgid "#num#th of each month"
-msgstr "每月第#num#个"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:357
-#: ../../addon/dav/common/wdcal_edit.inc.php:357
-msgid "#num#th-last of each month"
-msgstr "每月第#num#个最后"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:360
-#: ../../addon/dav/common/wdcal_edit.inc.php:360
-msgid "#num#th #wkday# of each month"
-msgstr "每月第#num#个#wkday#"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:363
-#: ../../addon/dav/common/wdcal_edit.inc.php:363
-msgid "#num#th-last #wkday# of each month"
-msgstr "每月第#num#个最后#wkday#"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:372
-#: ../../addon.old/dav/friendica/layout.fnk.php:255
-#: ../../addon/dav/common/wdcal_edit.inc.php:372
-#: ../../addon/dav/friendica/layout.fnk.php:255
-msgid "Month"
-msgstr "月"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:377
-#: ../../addon/dav/common/wdcal_edit.inc.php:377
-msgid "#num#th of the given month"
-msgstr "月第#num#个天"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:380
-#: ../../addon/dav/common/wdcal_edit.inc.php:380
-msgid "#num#th-last of the given month"
-msgstr "月第#num#个最后天"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:383
-#: ../../addon/dav/common/wdcal_edit.inc.php:383
-msgid "#num#th #wkday# of the given month"
-msgstr "月第#num#个#wkday#"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:386
-#: ../../addon/dav/common/wdcal_edit.inc.php:386
-msgid "#num#th-last #wkday# of the given month"
-msgstr "月第#num#个最后#wkday#"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:413
-#: ../../addon/dav/common/wdcal_edit.inc.php:413
-msgid "Repeat until"
-msgstr "重复到"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:417
-#: ../../addon/dav/common/wdcal_edit.inc.php:417
-msgid "Infinite"
-msgstr "无限的"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:420
-#: ../../addon/dav/common/wdcal_edit.inc.php:420
-msgid "Until the following date"
-msgstr "到下个日期"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:423
-#: ../../addon/dav/common/wdcal_edit.inc.php:423
-msgid "Number of times"
-msgstr "多少次"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:429
-#: ../../addon/dav/common/wdcal_edit.inc.php:429
-msgid "Exceptions"
-msgstr "除外"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:432
-#: ../../addon/dav/common/wdcal_edit.inc.php:432
-msgid "none"
-msgstr "没有"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:449
-#: ../../addon/dav/common/wdcal_edit.inc.php:449
-msgid "Notification"
-msgstr "通知"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:466
-#: ../../addon/dav/common/wdcal_edit.inc.php:466
-msgid "Notify by"
-msgstr "用地方法为通知"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:468
-#: ../../addon/dav/common/wdcal_edit.inc.php:468 ../../mod/delegate.php:130
-#: ../../mod/tagrm.php:93
-msgid "Remove"
-msgstr "移走"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:469
-#: ../../addon/dav/common/wdcal_edit.inc.php:469
-msgid "E-Mail"
-msgstr "电子邮件"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:470
-#: ../../addon/dav/common/wdcal_edit.inc.php:470
-msgid "On Friendica / Display"
-msgstr "在Friendica／表示"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:474
-#: ../../addon/dav/common/wdcal_edit.inc.php:474
-msgid "Time"
-msgstr "时间"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:478
-#: ../../addon/dav/common/wdcal_edit.inc.php:478
-msgid "Hours"
-msgstr "小时"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:479
-#: ../../addon/dav/common/wdcal_edit.inc.php:479
-msgid "Minutes"
-msgstr "分钟"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:480
-#: ../../addon/dav/common/wdcal_edit.inc.php:480
-msgid "Seconds"
-msgstr "秒"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:482
-#: ../../addon/dav/common/wdcal_edit.inc.php:482
-msgid "Weeks"
-msgstr "周"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:485
-#: ../../addon/dav/common/wdcal_edit.inc.php:485
-msgid "before the"
-msgstr "前"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:486
-#: ../../addon/dav/common/wdcal_edit.inc.php:486
-msgid "start of the event"
-msgstr "项目开始"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:487
-#: ../../addon/dav/common/wdcal_edit.inc.php:487
-msgid "end of the event"
-msgstr "项目结束"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:492
-#: ../../addon/dav/common/wdcal_edit.inc.php:492
-msgid "Add a notification"
-msgstr "加一个通知"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:687
-#: ../../addon/dav/common/wdcal_edit.inc.php:687
-msgid "The event #name# will start at #date"
-msgstr "项目#name#开始在#date"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:696
-#: ../../addon/dav/common/wdcal_edit.inc.php:696
-msgid "#name# is about to begin."
-msgstr "#name#快开始。"
-
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:769
-#: ../../addon/dav/common/wdcal_edit.inc.php:769
-msgid "Saved"
-msgstr "保存了"
-
-#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:206
-#: ../../addon/dav/friendica/calendar.friendica.fnk.php:206
-msgid "Private Calendar"
-msgstr "私人日历"
-
-#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:207
-#: ../../addon/dav/friendica/calendar.friendica.fnk.php:207
-msgid "Friendica Events: Mine"
-msgstr "Friendica项目：我的"
-
-#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:208
-#: ../../addon/dav/friendica/calendar.friendica.fnk.php:208
-msgid "Friendica Events: Contacts"
-msgstr "Friendica项目：熟人"
-
-#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:248
-#: ../../addon/dav/friendica/calendar.friendica.fnk.php:248
-msgid "Private Addresses"
-msgstr "私人地址"
-
-#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:249
-#: ../../addon/dav/friendica/calendar.friendica.fnk.php:249
-msgid "Friendica Contacts"
-msgstr "Friendica熟人"
-
-#: ../../addon.old/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php:36
-#: ../../addon/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php:36
-msgid "Friendica-Native events"
-msgstr "本Friendica项目"
-
-#: ../../addon.old/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:36
-#: ../../addon.old/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:59
-#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:36
-#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:59
-msgid "Friendica-Contacts"
-msgstr "Friendica熟人"
-
-#: ../../addon.old/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:60
-#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:60
-msgid "Your Friendica-Contacts"
-msgstr "您的Friendica熟人"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:99
-#: ../../addon.old/dav/friendica/layout.fnk.php:136
-#: ../../addon/dav/friendica/layout.fnk.php:99
-#: ../../addon/dav/friendica/layout.fnk.php:136
-msgid ""
-"Something went wrong when trying to import the file. Sorry. Maybe some "
-"events were imported anyway."
-msgstr "进口文件出了问题。不好意思。可能一些项目却是成功地进口了。"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:131
-#: ../../addon/dav/friendica/layout.fnk.php:131
-msgid "Something went wrong when trying to import the file. Sorry."
-msgstr "进口文件出了问题。不好意思。"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:134
-#: ../../addon/dav/friendica/layout.fnk.php:134
-msgid "The ICS-File has been imported."
-msgstr "把ICS文件进口了。"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:138
-#: ../../addon/dav/friendica/layout.fnk.php:138
-msgid "No file was uploaded."
-msgstr "没有上传的文件。"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:147
-#: ../../addon/dav/friendica/layout.fnk.php:147
-msgid "Import a ICS-file"
-msgstr "进口ICS文件"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:150
-#: ../../addon/dav/friendica/layout.fnk.php:150
-msgid "ICS-File"
-msgstr "ICS文件"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:151
-#: ../../addon/dav/friendica/layout.fnk.php:151
-msgid "Overwrite all #num# existing events"
-msgstr "替换所有#num#现有的项目"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:152
-#: ../../addon/dav/friendica/layout.fnk.php:152
-#: ../../mod/profile_photo.php:245
-msgid "Upload"
-msgstr "上传"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:225
-#: ../../addon.old/mathjax/mathjax.php:36
-#: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:167
-#: ../../mod/admin.php:841 ../../mod/admin.php:1049 ../../mod/settings.php:74
-#: ../../mod/uexport.php:48 ../../mod/newmember.php:22
-#: ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:658
-msgid "Settings"
-msgstr "配置"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:225
-#: ../../addon/dav/friendica/layout.fnk.php:225 ../../include/nav.php:113
-#: ../../mod/help.php:84
-msgid "Help"
-msgstr "帮助"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:228
-#: ../../addon/dav/friendica/layout.fnk.php:228
-msgid "New event"
-msgstr "新项目"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:232
-#: ../../addon/dav/friendica/layout.fnk.php:232
-msgid "Today"
-msgstr "今天"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:241
-#: ../../addon/dav/friendica/layout.fnk.php:241
-msgid "Day"
-msgstr "天"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:248
-#: ../../addon/dav/friendica/layout.fnk.php:248
-msgid "Week"
-msgstr "周"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:260
-#: ../../addon/dav/friendica/layout.fnk.php:260
-msgid "Reload"
-msgstr "再装入"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:263
-#: ../../addon/dav/friendica/layout.fnk.php:263 ../../mod/events.php:372
-msgid "Previous"
-msgstr "上"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:266
-#: ../../addon/dav/friendica/layout.fnk.php:266 ../../mod/events.php:373
-#: ../../mod/install.php:207
-msgid "Next"
-msgstr "下"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:271
-#: ../../addon/dav/friendica/layout.fnk.php:271
-msgid "Date"
-msgstr "日期"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:313
-#: ../../addon/dav/friendica/layout.fnk.php:313
-msgid "Error"
-msgstr "错误"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:354
-#: ../../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/dav/friendica/layout.fnk.php:354
-#: ../../addon/facebook/facebook.php:512 ../../addon/facebook/facebook.php:518
-#: ../../addon/fbpost/fbpost.php:170 ../../addon/fbpost/fbpost.php:176
-#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:4090
-#: ../../mod/profiles.php:146 ../../mod/profiles.php:567
-#: ../../mod/notes.php:20 ../../mod/nogroup.php:25 ../../mod/item.php:140
-#: ../../mod/item.php:156 ../../mod/allfriends.php:9 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/register.php:40 ../../mod/regmod.php:118
-#: ../../mod/attach.php:33 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:542
-#: ../../mod/settings.php:547 ../../mod/crepair.php:115
-#: ../../mod/delegate.php:6 ../../mod/poke.php:135
-#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
-#: ../../mod/display.php:180 ../../mod/editpost.php:10
-#: ../../mod/events.php:140 ../../mod/uimport.php:23 ../../mod/follow.php:9
-#: ../../mod/fsuggest.php:78 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
-#: ../../mod/install.php:151 ../../mod/wall_upload.php:66
-#: ../../mod/invite.php:15 ../../mod/invite.php:101
-#: ../../mod/wallmessage.php:9 ../../mod/wallmessage.php:33
-#: ../../mod/wallmessage.php:79 ../../mod/wallmessage.php:103
-#: ../../mod/manage.php:96 ../../mod/message.php:38 ../../mod/message.php:174
-#: ../../mod/mood.php:114 ../../mod/network.php:6 ../../mod/photos.php:133
-#: ../../mod/photos.php:1044 ../../mod/notifications.php:66
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
-#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
-#: ../../index.php:341
-msgid "Permission denied."
-msgstr "权限不够。"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:361
-#: ../../addon.old/facebook/facebook.php:799
-#: ../../addon.old/fbpost/fbpost.php:282
-#: ../../addon/dav/friendica/layout.fnk.php:361
-#: ../../addon/facebook/facebook.php:801 ../../addon/fbpost/fbpost.php:337
-msgid "The new values have been saved."
-msgstr "新的设置保存了。"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:380
-#: ../../addon/dav/friendica/layout.fnk.php:380
-msgid "The calendar has been updated."
-msgstr "日历更新了。"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:393
-#: ../../addon/dav/friendica/layout.fnk.php:393
-msgid "The new calendar has been created."
-msgstr "新日历创造了。"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:417
-#: ../../addon/dav/friendica/layout.fnk.php:417
-msgid "The calendar has been deleted."
-msgstr "日历删除了。"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:424
-#: ../../addon/dav/friendica/layout.fnk.php:424
-msgid "Calendar Settings"
-msgstr "日历设置"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:430
-#: ../../addon/dav/friendica/layout.fnk.php:430
-msgid "Date format"
-msgstr "日期形式"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:439
-#: ../../addon/dav/friendica/layout.fnk.php:439
-msgid "Time zone"
-msgstr "时区"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:441
-#: ../../addon.old/dav/friendica/layout.fnk.php:488
-#: ../../addon.old/facebook/facebook.php:770
-#: ../../addon.old/fbpost/fbpost.php:267
-#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263
-#: ../../addon/dav/friendica/layout.fnk.php:441
-#: ../../addon/dav/friendica/layout.fnk.php:488
-#: ../../addon/facebook/facebook.php:772 ../../addon/fbpost/fbpost.php:322
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:354
-#: ../../include/text.php:781 ../../mod/notes.php:63 ../../mod/filer.php:31
-msgid "Save"
-msgstr "保存"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:445
-#: ../../addon/dav/friendica/layout.fnk.php:445
-msgid "Calendars"
-msgstr "日历"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:487
-#: ../../addon/dav/friendica/layout.fnk.php:487
-msgid "Create a new calendar"
-msgstr "创造新日历"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:496
-#: ../../addon/dav/friendica/layout.fnk.php:496
-msgid "Limitations"
-msgstr "限制"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:500
-#: ../../addon.old/libravatar/libravatar.php:82
-#: ../../addon/dav/friendica/layout.fnk.php:500
-#: ../../addon/libravatar/libravatar.php:82
-msgid "Warning"
-msgstr "警告"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:504
-#: ../../addon/dav/friendica/layout.fnk.php:504
-msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
-msgstr "同步（iPhone，Thunderbird Lightning, 案桌，等）"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:511
-#: ../../addon/dav/friendica/layout.fnk.php:511
-msgid "Synchronizing this calendar with the iPhone"
-msgstr "正在把这个日历跟iPhone同步"
-
-#: ../../addon.old/dav/friendica/layout.fnk.php:522
-#: ../../addon/dav/friendica/layout.fnk.php:522
-msgid "Synchronizing your Friendica-Contacts with the iPhone"
-msgstr "正在把您的Friendica熟人跟iPhone同步"
-
-#: ../../addon.old/dav/friendica/main.php:202
-#: ../../addon/dav/friendica/main.php:202
-msgid ""
-"The current version of this plugin has not been set up correctly. Please "
-"contact the system administrator of your installation of friendica to fix "
-"this."
-msgstr "现有的插件没安装好。请跟系统管理您的friendica安装联系为维修。"
-
-#: ../../addon.old/dav/friendica/main.php:242
-#: ../../addon/dav/friendica/main.php:242
-msgid "Extended calendar with CalDAV-support"
-msgstr "增能日历跟CalDAV支持"
-
-#: ../../addon.old/dav/friendica/main.php:279
-#: ../../addon.old/dav/friendica/main.php:280
-#: ../../addon/dav/friendica/main.php:279
-#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
-#: ../../include/enotify.php:28 ../../include/notifier.php:785
-msgid "noreply"
-msgstr "noreply"
-
-#: ../../addon.old/dav/friendica/main.php:282
-#: ../../addon/dav/friendica/main.php:282
-msgid "Notification: "
-msgstr "通知："
-
-#: ../../addon.old/dav/friendica/main.php:309
-#: ../../addon/dav/friendica/main.php:309
-msgid "The database tables have been installed."
-msgstr "数据库表格被安装了。"
-
-#: ../../addon.old/dav/friendica/main.php:310
-#: ../../addon/dav/friendica/main.php:310
-msgid "An error occurred during the installation."
-msgstr "安装出错误。"
-
-#: ../../addon.old/dav/friendica/main.php:316
-#: ../../addon/dav/friendica/main.php:316
-msgid "The database tables have been updated."
-msgstr "数据库表格更新了。"
-
-#: ../../addon.old/dav/friendica/main.php:317
-#: ../../addon/dav/friendica/main.php:317
-msgid "An error occurred during the update."
-msgstr "更新出了问题。"
-
-#: ../../addon.old/dav/friendica/main.php:333
-#: ../../addon/dav/friendica/main.php:333
-msgid "No system-wide settings yet."
-msgstr "还没有系统设置。"
-
-#: ../../addon.old/dav/friendica/main.php:336
-#: ../../addon/dav/friendica/main.php:336
-msgid "Database status"
-msgstr "数据库现状"
-
-#: ../../addon.old/dav/friendica/main.php:339
-#: ../../addon/dav/friendica/main.php:339
-msgid "Installed"
-msgstr "安装了"
-
-#: ../../addon.old/dav/friendica/main.php:343
-#: ../../addon/dav/friendica/main.php:343
-msgid "Upgrade needed"
-msgstr "必须更新"
-
-#: ../../addon.old/dav/friendica/main.php:343
-#: ../../addon/dav/friendica/main.php:343
-msgid ""
-"Please back up all calendar data (the tables beginning with dav_*) before "
-"proceeding. While all calendar events <i>should</i> be converted to the new "
-"database structure, it's always safe to have a backup. Below, you can have a"
-" look at the database-queries that will be made when pressing the "
-"'update'-button."
-msgstr "请备份所有的日历数据（表格有前缀「dav_」）继续之前。虽然所有的日历项目<i>应该</i>被转化成新数据库体系，备份总是最好。下边您会看数据库命令进行按「更新」按钮的时候。"
-
-#: ../../addon.old/dav/friendica/main.php:343
-#: ../../addon/dav/friendica/main.php:343
-msgid "Upgrade"
-msgstr "更新"
-
-#: ../../addon.old/dav/friendica/main.php:346
-#: ../../addon/dav/friendica/main.php:346
-msgid "Not installed"
-msgstr "没安装"
-
-#: ../../addon.old/dav/friendica/main.php:346
-#: ../../addon/dav/friendica/main.php:346
-msgid "Install"
-msgstr "安装"
-
-#: ../../addon.old/dav/friendica/main.php:350
-#: ../../addon/dav/friendica/main.php:350
-msgid "Unknown"
-msgstr "不知道的"
-
-#: ../../addon.old/dav/friendica/main.php:350
-#: ../../addon/dav/friendica/main.php:350
-msgid ""
-"Something really went wrong. I cannot recover from this state automatically,"
-" sorry. Please go to the database backend, back up the data, and delete all "
-"tables beginning with 'dav_' manually. Afterwards, this installation routine"
-" should be able to reinitialize the tables automatically."
-msgstr "出什么真糟糕的问题。我不能自动地恢复，不好意思。请看数据库系统，备份数据，而手动地把所有前缀着「dav_」表格删除。之后，这个安装程序应该能把表格自动地初始化。"
-
-#: ../../addon.old/dav/friendica/main.php:355
-#: ../../addon/dav/friendica/main.php:355
-msgid "Troubleshooting"
-msgstr "调试"
-
-#: ../../addon.old/dav/friendica/main.php:356
-#: ../../addon/dav/friendica/main.php:356
-msgid "Manual creation of the database tables:"
-msgstr "手动造成数据库表格："
-
-#: ../../addon.old/dav/friendica/main.php:357
-#: ../../addon/dav/friendica/main.php:357
-msgid "Show SQL-statements"
-msgstr "表示SQL陈述"
-
-#: ../../addon.old/drpost/drpost.php:35
-msgid "Post to Drupal"
-msgstr "发到Drupal"
-
-#: ../../addon.old/drpost/drpost.php:72
-msgid "Drupal Post Settings"
-msgstr "Drupal设置"
-
-#: ../../addon.old/drpost/drpost.php:74
-msgid "Enable Drupal Post Plugin"
-msgstr "使Drupal插件能够"
-
-#: ../../addon.old/drpost/drpost.php:79
-msgid "Drupal username"
-msgstr "Drupal用户名"
-
-#: ../../addon.old/drpost/drpost.php:84
-msgid "Drupal password"
-msgstr "Drupal密码"
-
-#: ../../addon.old/drpost/drpost.php:89
-msgid "Post Type - article,page,or blog"
-msgstr "文章种类－文章，页，博客"
-
-#: ../../addon.old/drpost/drpost.php:94
-msgid "Drupal site URL"
-msgstr "Drupal网站URL"
-
-#: ../../addon.old/drpost/drpost.php:99
-msgid "Drupal site uses clean URLS"
-msgstr "Drupal网站用整洁URL"
-
-#: ../../addon.old/drpost/drpost.php:104
-msgid "Post to Drupal by default"
-msgstr "默认地发到Drupal"
-
-#: ../../addon.old/dwpost/dwpost.php:39 ../../addon/dwpost/dwpost.php:39
-msgid "Post to Dreamwidth"
-msgstr "转播到Dreamwidth"
-
-#: ../../addon.old/dwpost/dwpost.php:70 ../../addon/dwpost/dwpost.php:70
-msgid "Dreamwidth Post Settings"
-msgstr "Dreamwidth转播设置"
-
-#: ../../addon.old/dwpost/dwpost.php:72 ../../addon/dwpost/dwpost.php:72
-msgid "Enable dreamwidth Post Plugin"
-msgstr "使Dreamwidth转播插件可用"
-
-#: ../../addon.old/dwpost/dwpost.php:77 ../../addon/dwpost/dwpost.php:77
-msgid "dreamwidth username"
-msgstr "Dreamwidth用户名"
-
-#: ../../addon.old/dwpost/dwpost.php:82 ../../addon/dwpost/dwpost.php:82
-msgid "dreamwidth password"
-msgstr "Dreamwidth密码"
-
-#: ../../addon.old/dwpost/dwpost.php:87 ../../addon/dwpost/dwpost.php:87
-msgid "Post to dreamwidth by default"
-msgstr "默认地转播到Dreamwidth"
-
-#: ../../addon.old/editplain/editplain.php:46
-#: ../../addon.old/group_text/group_text.php:46
-#: ../../addon/editplain/editplain.php:46
-msgid "Editplain settings updated."
-msgstr "Editplain设置更新了"
-
-#: ../../addon.old/editplain/editplain.php:76
-#: ../../addon/editplain/editplain.php:76
-msgid "Editplain Settings"
-msgstr "Editplain设置"
-
-#: ../../addon.old/editplain/editplain.php:78
-#: ../../addon/editplain/editplain.php:78
-msgid "Disable richtext status editor"
-msgstr "使richtext现状编辑 不能用"
-
-#: ../../addon.old/facebook/facebook.php:495
-#: ../../addon.old/fbpost/fbpost.php:144
-#: ../../addon.old/impressum/impressum.php:78
-#: ../../addon.old/mathjax/mathjax.php:66
-#: ../../addon.old/openstreetmap/openstreetmap.php:80
-#: ../../addon.old/piwik/piwik.php:105 ../../addon.old/twitter/twitter.php:389
-#: ../../addon/altpager/altpager.php:107 ../../addon/facebook/facebook.php:497
-#: ../../addon/fbpost/fbpost.php:155 ../../addon/impressum/impressum.php:78
-#: ../../addon/mathjax/mathjax.php:66
-#: ../../addon/openstreetmap/openstreetmap.php:104
-#: ../../addon/piwik/piwik.php:105
-#: ../../addon/remote_permissions/remote_permissions.php:205
-#: ../../addon/twitter/twitter.php:550 ../../mod/settings.php:488
-msgid "Settings updated."
-msgstr "设置跟新了"
-
-#: ../../addon.old/facebook/facebook.php:523
-#: ../../addon/facebook/facebook.php:525
-msgid "Facebook disabled"
-msgstr "Facebook废"
-
-#: ../../addon.old/facebook/facebook.php:528
-#: ../../addon/facebook/facebook.php:530
-msgid "Updating contacts"
-msgstr "正才更新熟人"
-
-#: ../../addon.old/facebook/facebook.php:551
-#: ../../addon.old/fbpost/fbpost.php:192 ../../addon/facebook/facebook.php:553
-#: ../../addon/fbpost/fbpost.php:203
-msgid "Facebook API key is missing."
-msgstr "Facebook API钥匙失踪的。"
-
-#: ../../addon.old/facebook/facebook.php:558
-#: ../../addon/facebook/facebook.php:560
-msgid "Facebook Connect"
-msgstr "Facebook联络"
-
-#: ../../addon.old/facebook/facebook.php:564
-#: ../../addon/facebook/facebook.php:566
-msgid "Install Facebook connector for this account."
-msgstr "安装Facebook连接器为这个账户。"
-
-#: ../../addon.old/facebook/facebook.php:571
-#: ../../addon/facebook/facebook.php:573
-msgid "Remove Facebook connector"
-msgstr "删除Facebook连接器"
-
-#: ../../addon.old/facebook/facebook.php:576
-#: ../../addon.old/fbpost/fbpost.php:217 ../../addon/facebook/facebook.php:578
-#: ../../addon/fbpost/fbpost.php:228
-msgid ""
-"Re-authenticate [This is necessary whenever your Facebook password is "
-"changed.]"
-msgstr "复认证[这是必要的每当您Facebook密码变化了]"
-
-#: ../../addon.old/facebook/facebook.php:583
-#: ../../addon.old/fbpost/fbpost.php:224 ../../addon/facebook/facebook.php:585
-#: ../../addon/fbpost/fbpost.php:235
-msgid "Post to Facebook by default"
-msgstr "默认地放在Facebook"
-
-#: ../../addon.old/facebook/facebook.php:589
-#: ../../addon/facebook/facebook.php:591
-msgid ""
-"Facebook friend linking has been disabled on this site. The following "
-"settings will have no effect."
-msgstr "这个网站使Facebook朋友环节不能用。这下的设置没有印象。"
-
-#: ../../addon.old/facebook/facebook.php:593
-#: ../../addon/facebook/facebook.php:595
-msgid ""
-"Facebook friend linking has been disabled on this site. If you disable it, "
-"you will be unable to re-enable it."
-msgstr "这个网站使Facebook朋友环节不能用。假如那样的话您不会再使可用的。"
-
-#: ../../addon.old/facebook/facebook.php:596
-#: ../../addon/facebook/facebook.php:598
-msgid "Link all your Facebook friends and conversations on this website"
-msgstr "连接您所有的Facebook朋友们和交流在这个网站"
-
-#: ../../addon.old/facebook/facebook.php:598
-#: ../../addon/facebook/facebook.php:600
-msgid ""
-"Facebook conversations consist of your <em>profile wall</em> and your friend"
-" <em>stream</em>."
-msgstr "Facebook交流由您的<em>简介墙</em>和您朋友的<em>溪流</em>组成。 "
-
-#: ../../addon.old/facebook/facebook.php:599
-#: ../../addon/facebook/facebook.php:601
-msgid "On this website, your Facebook friend stream is only visible to you."
-msgstr "在这个网站，您Facebook朋友溪流是只您可见的。"
-
-#: ../../addon.old/facebook/facebook.php:600
-#: ../../addon/facebook/facebook.php:602
-msgid ""
-"The following settings determine the privacy of your Facebook profile wall "
-"on this website."
-msgstr "下面的设置决定您在这个网站Facebook简介墙的隐私。"
-
-#: ../../addon.old/facebook/facebook.php:604
-#: ../../addon/facebook/facebook.php:606
-msgid ""
-"On this website your Facebook profile wall conversations will only be "
-"visible to you"
-msgstr "在这个网站您Facebook简介墙交流是只您可见的。"
-
-#: ../../addon.old/facebook/facebook.php:609
-#: ../../addon/facebook/facebook.php:611
-msgid "Do not import your Facebook profile wall conversations"
-msgstr "别进口您Facebook简介墙交流"
-
-#: ../../addon.old/facebook/facebook.php:611
-#: ../../addon/facebook/facebook.php:613
-msgid ""
-"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."
-msgstr "如果您选择连接交流和留这两个复选框空则，您Facebook简介墙被在您这网站的简介墙融合和您的这网站隐私设置决定谁能看那些交流。"
-
-#: ../../addon.old/facebook/facebook.php:616
-#: ../../addon/facebook/facebook.php:618
-msgid "Comma separated applications to ignore"
-msgstr "逗号分开的应用要不理"
-
-#: ../../addon.old/facebook/facebook.php:700
-#: ../../addon/facebook/facebook.php:702
-msgid "Problems with Facebook Real-Time Updates"
-msgstr "Facebook实时更新有问题"
-
-#: ../../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
-#: ../../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
-msgid "Administrator"
-msgstr "管理员"
-
-#: ../../addon.old/facebook/facebook.php:728
-#: ../../addon.old/fbpost/fbpost.php:239 ../../addon/facebook/facebook.php:730
-#: ../../addon/fbpost/fbpost.php:294 ../../include/contact_selectors.php:81
-#: ../../mod/newmember.php:49 ../../mod/newmember.php:51
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../addon.old/facebook/facebook.php:729
-#: ../../addon/facebook/facebook.php:731
-msgid "Facebook Connector Settings"
-msgstr "Facebook连接器设置"
-
-#: ../../addon.old/facebook/facebook.php:744
-#: ../../addon.old/fbpost/fbpost.php:255 ../../addon/facebook/facebook.php:746
-#: ../../addon/fbpost/fbpost.php:310
-msgid "Facebook API Key"
-msgstr "Facebook API密码"
-
-#: ../../addon.old/facebook/facebook.php:754
-#: ../../addon.old/fbpost/fbpost.php:262 ../../addon/facebook/facebook.php:756
-#: ../../addon/fbpost/fbpost.php:317
-msgid ""
-"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>"
-msgstr "错误：看上去您输入App-ID和-Secret在您的.htconfig.php文件。它们那里输入的时候，您不能把他们在这个表格输入。<br><br>"
-
-#: ../../addon.old/facebook/facebook.php:759
-#: ../../addon/facebook/facebook.php:761
-msgid ""
-"Error: the given API Key seems to be incorrect (the application access token"
-" could not be retrieved)."
-msgstr "错误：输入的API密码显得不对（取回不了应用代金券）。"
-
-#: ../../addon.old/facebook/facebook.php:761
-#: ../../addon/facebook/facebook.php:763
-msgid "The given API Key seems to work correctly."
-msgstr "输入的API密码显得对地运行。"
-
-#: ../../addon.old/facebook/facebook.php:763
-#: ../../addon/facebook/facebook.php:765
-msgid ""
-"The correctness of the API Key could not be detected. Something strange's "
-"going on."
-msgstr "API钥匙的正确性发现不了。什么奇怪的进行"
-
-#: ../../addon.old/facebook/facebook.php:766
-#: ../../addon.old/fbpost/fbpost.php:264 ../../addon/facebook/facebook.php:768
-#: ../../addon/fbpost/fbpost.php:319
-msgid "App-ID / API-Key"
-msgstr "App-ID / API-Key"
-
-#: ../../addon.old/facebook/facebook.php:767
-#: ../../addon.old/fbpost/fbpost.php:265 ../../addon/facebook/facebook.php:769
-#: ../../addon/fbpost/fbpost.php:320
-msgid "Application secret"
-msgstr "应用密码"
-
-#: ../../addon.old/facebook/facebook.php:768
-#: ../../addon/facebook/facebook.php:770
-#, php-format
-msgid "Polling Interval in minutes (minimum %1$s minutes)"
-msgstr "核实间隔分钟（最少%1$s分钟）"
-
-#: ../../addon.old/facebook/facebook.php:769
-#: ../../addon/facebook/facebook.php:771
-msgid ""
-"Synchronize comments (no comments on Facebook are missed, at the cost of "
-"increased system load)"
-msgstr "同步评论（无Facebook评论错过了，代价增添系统工作量）"
-
-#: ../../addon.old/facebook/facebook.php:773
-#: ../../addon/facebook/facebook.php:775
-msgid "Real-Time Updates"
-msgstr "实时更新"
-
-#: ../../addon.old/facebook/facebook.php:777
-#: ../../addon/facebook/facebook.php:779
-msgid "Real-Time Updates are activated."
-msgstr "实时更新使活动"
-
-#: ../../addon.old/facebook/facebook.php:778
-#: ../../addon/facebook/facebook.php:780
-msgid "Deactivate Real-Time Updates"
-msgstr "使实时更新不活动"
-
-#: ../../addon.old/facebook/facebook.php:780
-#: ../../addon/facebook/facebook.php:782
-msgid "Real-Time Updates not activated."
-msgstr "实时更新使不活动"
-
-#: ../../addon.old/facebook/facebook.php:780
-#: ../../addon/facebook/facebook.php:782
-msgid "Activate Real-Time Updates"
-msgstr "使实时更新活动"
-
-#: ../../addon.old/facebook/facebook.php:823
-#: ../../addon.old/fbpost/fbpost.php:301 ../../addon/facebook/facebook.php:825
-#: ../../addon/fbpost/fbpost.php:356
-msgid "Post to Facebook"
-msgstr "放在Facebook"
-
-#: ../../addon.old/facebook/facebook.php:921
-#: ../../addon.old/fbpost/fbpost.php:399 ../../addon/facebook/facebook.php:923
-#: ../../addon/fbpost/fbpost.php:487
-msgid ""
-"Post to Facebook cancelled because of multi-network access permission "
-"conflict."
-msgstr "发送到Facebook取消由于多网络准许矛盾。"
-
-#: ../../addon.old/facebook/facebook.php:1149
-#: ../../addon.old/fbpost/fbpost.php:610
-#: ../../addon/facebook/facebook.php:1151 ../../addon/fbpost/fbpost.php:766
-msgid "View on Friendica"
-msgstr "看在Friendica"
-
-#: ../../addon.old/facebook/facebook.php:1182
-#: ../../addon.old/fbpost/fbpost.php:643
-#: ../../addon/facebook/facebook.php:1184 ../../addon/fbpost/fbpost.php:803
-msgid "Facebook post failed. Queued for retry."
-msgstr "Facebook发送失败了。排队着待再试。"
-
-#: ../../addon.old/facebook/facebook.php:1222
-#: ../../addon.old/fbpost/fbpost.php:683
-#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:843
-msgid "Your Facebook connection became invalid. Please Re-authenticate."
-msgstr "您Facebook联系成无效的。请再认证。"
-
-#: ../../addon.old/facebook/facebook.php:1223
-#: ../../addon.old/fbpost/fbpost.php:684
-#: ../../addon/facebook/facebook.php:1225 ../../addon/fbpost/fbpost.php:844
-msgid "Facebook connection became invalid"
-msgstr "Facebook联系成无效的"
-
-#: ../../addon.old/facebook/facebook.php:1224
-#: ../../addon.old/fbpost/fbpost.php:685
-#: ../../addon/facebook/facebook.php:1226 ../../addon/fbpost/fbpost.php:845
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"The connection between your accounts on %2$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
-msgstr "你好%1$s,⏎ ⏎ 您账户在%2$s和Facebook的接通无效了。平时这是因为您把密码改变了。为使接通再可用，您要%3$s再认证Facebook连接器%4$s。"
-
-#: ../../addon.old/fbpost/fbpost.php:172 ../../addon/fbpost/fbpost.php:183
-msgid "Facebook Post disabled"
-msgstr "使Facebook文章不可用的"
-
-#: ../../addon.old/fbpost/fbpost.php:199 ../../addon/fbpost/fbpost.php:210
-msgid "Facebook Post"
-msgstr "Facebook文章"
-
-#: ../../addon.old/fbpost/fbpost.php:205 ../../addon/fbpost/fbpost.php:216
-msgid "Install Facebook Post connector for this account."
-msgstr "安装Facebook文章连接器为这个账户"
-
-#: ../../addon.old/fbpost/fbpost.php:212 ../../addon/fbpost/fbpost.php:223
-msgid "Remove Facebook Post connector"
-msgstr "把Facebook文章连接器删除"
-
-#: ../../addon.old/fbpost/fbpost.php:240 ../../addon/fbpost/fbpost.php:295
-msgid "Facebook Post Settings"
-msgstr "Facebook文章设置"
-
-#: ../../addon.old/forumlist/forumlist.php:60 ../../addon.old/page/page.php:62
-#: ../../addon.old/page/page.php:92 ../../addon/forumlist/forumlist.php:64
-#: ../../addon/page/page.php:62 ../../addon/page/page.php:92
-msgid "Forums"
-msgstr "论坛"
-
-#: ../../addon.old/forumlist/forumlist.php:63
-#: ../../addon/forumlist/forumlist.php:67
-msgid "show/hide"
-msgstr "表示／隐藏"
-
-#: ../../addon.old/forumlist/forumlist.php:77
-#: ../../addon/forumlist/forumlist.php:81
-msgid "No forum subscriptions"
-msgstr "没有评坛订阅"
-
-#: ../../addon.old/forumlist/forumlist.php:94
-#: ../../addon.old/page/page.php:130 ../../addon/forumlist/forumlist.php:98
-#: ../../addon/page/page.php:130
-msgid "Forums:"
-msgstr "评坛："
-
-#: ../../addon.old/forumlist/forumlist.php:131
-#: ../../addon/forumlist/forumlist.php:134
-msgid "Forumlist settings updated."
-msgstr "评坛单设置更新了。"
-
-#: ../../addon.old/forumlist/forumlist.php:159
-#: ../../addon/forumlist/forumlist.php:162
-msgid "Forumlist Settings"
-msgstr "评坛单设置"
-
-#: ../../addon.old/forumlist/forumlist.php:161
-#: ../../addon/forumlist/forumlist.php:164
-msgid "Randomise forum list"
-msgstr "洗牌评坛单"
-
-#: ../../addon.old/forumlist/forumlist.php:164
-#: ../../addon/forumlist/forumlist.php:167
-msgid "Show forums on profile page"
-msgstr "表示评坛在简介页"
-
-#: ../../addon.old/forumlist/forumlist.php:167
-#: ../../addon/forumlist/forumlist.php:170
-msgid "Show forums on network page"
-msgstr "表示评坛在网络页"
-
-#: ../../addon.old/fromapp/fromapp.php:38 ../../addon/fromapp/fromapp.php:38
-msgid "Fromapp settings updated."
-msgstr "Fromapp设置更新了"
-
-#: ../../addon.old/fromapp/fromapp.php:64 ../../addon/fromapp/fromapp.php:64
-msgid "FromApp Settings"
-msgstr "Fromapp设置"
-
-#: ../../addon.old/fromapp/fromapp.php:66 ../../addon/fromapp/fromapp.php:66
-msgid ""
-"The application name you would like to show your posts originating from."
-msgstr "应用名您想当您文章的来源"
-
-#: ../../addon.old/fromapp/fromapp.php:70 ../../addon/fromapp/fromapp.php:70
-msgid "Use this application name even if another application was used."
-msgstr "连别应用是用了也用这名。"
-
-#: ../../addon.old/fromgplus/fromgplus.php:29
-#: ../../addon/fromgplus/fromgplus.php:33
-msgid "Google+ Import Settings"
-msgstr "Google+进口设置"
-
-#: ../../addon.old/fromgplus/fromgplus.php:32
-#: ../../addon/fromgplus/fromgplus.php:36
-msgid "Enable Google+ Import"
-msgstr "使Google+进口可用"
-
-#: ../../addon.old/fromgplus/fromgplus.php:35
-#: ../../addon/fromgplus/fromgplus.php:39
-msgid "Google Account ID"
-msgstr "Google+用户名"
-
-#: ../../addon.old/fromgplus/fromgplus.php:55
-#: ../../addon/fromgplus/fromgplus.php:59
-msgid "Google+ Import Settings saved."
-msgstr "把Google+进口设置保存了"
-
-#: ../../addon.old/geonames/geonames.php:143
-#: ../../addon/geonames/geonames.php:143
-msgid "Geonames settings updated."
-msgstr "Geonames设置更新了。"
-
-#: ../../addon.old/geonames/geonames.php:179
-#: ../../addon/geonames/geonames.php:179
-msgid "Geonames Settings"
-msgstr "Geonames设置"
-
-#: ../../addon.old/geonames/geonames.php:181
-#: ../../addon/geonames/geonames.php:181
-msgid "Enable Geonames Plugin"
-msgstr "使Geonames插件能用"
-
-#: ../../addon.old/gnot/gnot.php:48 ../../addon/gnot/gnot.php:48
-msgid "Gnot settings updated."
-msgstr "Gnot设置更新了。"
-
-#: ../../addon.old/gnot/gnot.php:79 ../../addon/gnot/gnot.php:79
-msgid "Gnot Settings"
-msgstr "Gnot设置"
-
-#: ../../addon.old/gnot/gnot.php:81 ../../addon/gnot/gnot.php:81
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the"
-" subject line."
-msgstr "允许邮件评论通知在Gmail和匿名话题行。"
-
-#: ../../addon.old/gnot/gnot.php:82 ../../addon/gnot/gnot.php:82
-msgid "Enable this plugin/addon?"
-msgstr "使这个插件／加件可用？"
-
-#: ../../addon.old/gnot/gnot.php:97 ../../addon/gnot/gnot.php:97
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr "[Friendica:Notify]评论在交流#%d"
-
-#: ../../addon.old/gravatar/gravatar.php:71
-#: ../../addon.old/libravatar/libravatar.php:73
-#: ../../addon/gravatar/gravatar.php:71
-#: ../../addon/libravatar/libravatar.php:73
-msgid "generic profile image"
-msgstr "通用简介图片"
-
-#: ../../addon.old/gravatar/gravatar.php:72
-#: ../../addon.old/libravatar/libravatar.php:74
-#: ../../addon/gravatar/gravatar.php:72
-#: ../../addon/libravatar/libravatar.php:74
-msgid "random geometric pattern"
-msgstr "随机的几何图案"
-
-#: ../../addon.old/gravatar/gravatar.php:73
-#: ../../addon.old/libravatar/libravatar.php:75
-#: ../../addon/gravatar/gravatar.php:73
-#: ../../addon/libravatar/libravatar.php:75
-msgid "monster face"
-msgstr "怪物面子"
-
-#: ../../addon.old/gravatar/gravatar.php:74
-#: ../../addon.old/libravatar/libravatar.php:76
-#: ../../addon/gravatar/gravatar.php:74
-#: ../../addon/libravatar/libravatar.php:76
-msgid "computer generated face"
-msgstr "电脑造成的面子"
-
-#: ../../addon.old/gravatar/gravatar.php:75
-#: ../../addon.old/libravatar/libravatar.php:77
-#: ../../addon/gravatar/gravatar.php:75
-#: ../../addon/libravatar/libravatar.php:77
-msgid "retro arcade style face"
-msgstr "复古游乐场式面子"
-
-#: ../../addon.old/gravatar/gravatar.php:89
-#: ../../addon.old/libravatar/libravatar.php:93
-#: ../../addon/gravatar/gravatar.php:89
-#: ../../addon/libravatar/libravatar.php:93
-msgid "Information"
-msgstr "信息"
-
-#: ../../addon.old/gravatar/gravatar.php:89
-#: ../../addon/gravatar/gravatar.php:89
-msgid ""
-"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."
-msgstr "Libravatar加件页安装着。请是Libravatar加件或者这个Gravatar加件。<br>Libravatar加件没找到在Libravatar的时候可依靠的是Gravatar"
-
-#: ../../addon.old/gravatar/gravatar.php:96
-#: ../../addon.old/libravatar/libravatar.php:100
-#: ../../addon/gravatar/gravatar.php:96
-#: ../../addon/libravatar/libravatar.php:100
-msgid "Default avatar image"
-msgstr "默认纸娃娃系统"
-
-#: ../../addon.old/gravatar/gravatar.php:96
-#: ../../addon/gravatar/gravatar.php:96
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr "如果Gravatar上没找到纸娃娃系统选择默认的。看README"
-
-#: ../../addon.old/gravatar/gravatar.php:97
-#: ../../addon/gravatar/gravatar.php:97
-msgid "Rating of images"
-msgstr "照相评定"
-
-#: ../../addon.old/gravatar/gravatar.php:97
-#: ../../addon/gravatar/gravatar.php:97
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr "选择适合您网站的纸娃娃系统。看README"
-
-#: ../../addon.old/gravatar/gravatar.php:111
-#: ../../addon/gravatar/gravatar.php:111
-msgid "Gravatar settings updated."
-msgstr "Gravatar设置更新了。"
-
-#: ../../addon.old/group_text/group_text.php:76
-#: ../../addon/group_text/group_text.php:76
-msgid "Group Text"
-msgstr "组正文"
-
-#: ../../addon.old/group_text/group_text.php:78
-#: ../../addon/group_text/group_text.php:78
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "用光正文（无图片）组选择器在「组编辑」单"
-
-#: ../../addon.old/ijpost/ijpost.php:39 ../../addon/ijpost/ijpost.php:39
-msgid "Post to Insanejournal"
-msgstr "转播到Insanejournal"
-
-#: ../../addon.old/ijpost/ijpost.php:70 ../../addon/ijpost/ijpost.php:70
-msgid "InsaneJournal Post Settings"
-msgstr "Insanejournal转播设置"
-
-#: ../../addon.old/ijpost/ijpost.php:72 ../../addon/ijpost/ijpost.php:72
-msgid "Enable InsaneJournal Post Plugin"
-msgstr "使InsaneJournal转播插件可用"
-
-#: ../../addon.old/ijpost/ijpost.php:77 ../../addon/ijpost/ijpost.php:77
-msgid "InsaneJournal username"
-msgstr "InsaneJournal用户名"
-
-#: ../../addon.old/ijpost/ijpost.php:82 ../../addon/ijpost/ijpost.php:82
-msgid "InsaneJournal password"
-msgstr "InsaneJournal密码"
-
-#: ../../addon.old/ijpost/ijpost.php:87 ../../addon/ijpost/ijpost.php:87
-msgid "Post to InsaneJournal by default"
-msgstr "默认地转播到InsaneJournal"
-
-#: ../../addon.old/impressum/impressum.php:37
-#: ../../addon/impressum/impressum.php:37
-msgid "Impressum"
-msgstr "Impressum(法定的出版信息)"
-
-#: ../../addon.old/impressum/impressum.php:50
-#: ../../addon.old/impressum/impressum.php:52
-#: ../../addon.old/impressum/impressum.php:84
-#: ../../addon/impressum/impressum.php:50
-#: ../../addon/impressum/impressum.php:52
-#: ../../addon/impressum/impressum.php:84
-msgid "Site Owner"
-msgstr "网站主"
-
-#: ../../addon.old/impressum/impressum.php:50
-#: ../../addon.old/impressum/impressum.php:88
-#: ../../addon/impressum/impressum.php:50
-#: ../../addon/impressum/impressum.php:88
-msgid "Email Address"
-msgstr "电子邮件地址"
-
-#: ../../addon.old/impressum/impressum.php:55
-#: ../../addon.old/impressum/impressum.php:86
-#: ../../addon/impressum/impressum.php:55
-#: ../../addon/impressum/impressum.php:86
-msgid "Postal Address"
-msgstr "邮政邮件地址"
-
-#: ../../addon.old/impressum/impressum.php:61
-#: ../../addon/impressum/impressum.php:61
-msgid ""
-"The impressum addon needs to be configured!<br />Please add at least the "
-"<tt>owner</tt> variable to your config file. For other variables please "
-"refer to the README file of the addon."
-msgstr "Impressum插件必须被设置！<br />请加至少<tt>owner</tt>变量在您的设置文件。关于别的变量请指插件的README文件。"
-
-#: ../../addon.old/impressum/impressum.php:84
-#: ../../addon/impressum/impressum.php:84
-msgid "The page operators name."
-msgstr "也运作员名。"
-
-#: ../../addon.old/impressum/impressum.php:85
-#: ../../addon/impressum/impressum.php:85
-msgid "Site Owners Profile"
-msgstr "网站主的简介"
-
-#: ../../addon.old/impressum/impressum.php:85
-#: ../../addon/impressum/impressum.php:85
-msgid "Profile address of the operator."
-msgstr "运作员的简介地址。"
-
-#: ../../addon.old/impressum/impressum.php:86
-#: ../../addon/impressum/impressum.php:86
-msgid "How to contact the operator via snail mail. You can use BBCode here."
-msgstr "怎么用邮政跟运作员联系。您会用BBCode。"
-
-#: ../../addon.old/impressum/impressum.php:87
-#: ../../addon/impressum/impressum.php:87
-msgid "Notes"
-msgstr "便条"
-
-#: ../../addon.old/impressum/impressum.php:87
-#: ../../addon/impressum/impressum.php:87
-msgid ""
-"Additional notes that are displayed beneath the contact information. You can"
-" use BBCode here."
-msgstr "附加的便条表示在联系消息下。您会用BBCode。"
-
-#: ../../addon.old/impressum/impressum.php:88
-#: ../../addon/impressum/impressum.php:88
-msgid "How to contact the operator via email. (will be displayed obfuscated)"
-msgstr "怎么用电子邮件跟运作员联系。（将使混乱的表示）"
-
-#: ../../addon.old/impressum/impressum.php:89
-#: ../../addon/impressum/impressum.php:89
-msgid "Footer note"
-msgstr "页脚便条"
-
-#: ../../addon.old/impressum/impressum.php:89
-#: ../../addon/impressum/impressum.php:89
-msgid "Text for the footer. You can use BBCode here."
-msgstr "页脚征文。您会用BBCode。"
-
-#: ../../addon.old/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
-#: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
-msgid "Infinite Improbability Drive"
-msgstr "无穷不至于机车"
-
-#: ../../addon.old/irc/irc.php:44 ../../addon/irc/irc.php:44
-msgid "IRC Settings"
-msgstr "IRC设置"
-
-#: ../../addon.old/irc/irc.php:46 ../../addon/irc/irc.php:46
-msgid "Channel(s) to auto connect (comma separated)"
-msgstr "频道要自动地连接（逗号分隔）"
-
-#: ../../addon.old/irc/irc.php:51 ../../addon/irc/irc.php:51
-msgid "Popular Channels (comma separated)"
-msgstr "流行频道（逗号分隔）"
-
-#: ../../addon.old/irc/irc.php:69 ../../addon/irc/irc.php:69
-msgid "IRC settings saved."
-msgstr "IRC设置保存了。"
-
-#: ../../addon.old/irc/irc.php:74 ../../addon/irc/irc.php:74
-msgid "IRC Chatroom"
-msgstr "IRC聊间"
-
-#: ../../addon.old/irc/irc.php:96 ../../addon/irc/irc.php:96
-msgid "Popular Channels"
-msgstr "流行频道"
-
-#: ../../addon.old/jappixmini/jappixmini.php:266
-#: ../../addon/jappixmini/jappixmini.php:266
-msgid "Jappix Mini addon settings"
-msgstr "Jappix Mini加件设置"
-
-#: ../../addon.old/jappixmini/jappixmini.php:268
-#: ../../addon/jappixmini/jappixmini.php:268
-msgid "Activate addon"
-msgstr "使加件可用"
-
-#: ../../addon.old/jappixmini/jappixmini.php:271
-#: ../../addon/jappixmini/jappixmini.php:271
-msgid ""
-"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
-msgstr "<em>别</em>把Jappixmini聊小窗插入网用户界面"
-
-#: ../../addon.old/jappixmini/jappixmini.php:274
-#: ../../addon/jappixmini/jappixmini.php:274
-msgid "Jabber username"
-msgstr "Jabber用户名"
-
-#: ../../addon.old/jappixmini/jappixmini.php:277
-#: ../../addon/jappixmini/jappixmini.php:277
-msgid "Jabber server"
-msgstr "Jabber服务器"
-
-#: ../../addon.old/jappixmini/jappixmini.php:281
-#: ../../addon/jappixmini/jappixmini.php:281
-msgid "Jabber BOSH host"
-msgstr "Jabber BOSH主机"
-
-#: ../../addon.old/jappixmini/jappixmini.php:285
-#: ../../addon/jappixmini/jappixmini.php:285
-msgid "Jabber password"
-msgstr "Jabber密码"
-
-#: ../../addon.old/jappixmini/jappixmini.php:290
-#: ../../addon/jappixmini/jappixmini.php:290
-msgid "Encrypt Jabber password with Friendica password (recommended)"
-msgstr "把Jabber密码跟Friendica密码加密（推荐的）"
-
-#: ../../addon.old/jappixmini/jappixmini.php:293
-#: ../../addon/jappixmini/jappixmini.php:293
-msgid "Friendica password"
-msgstr "Friendica密码"
-
-#: ../../addon.old/jappixmini/jappixmini.php:296
-#: ../../addon/jappixmini/jappixmini.php:296
-msgid "Approve subscription requests from Friendica contacts automatically"
-msgstr "自动地批准从Friendica熟人的订阅要求"
-
-#: ../../addon.old/jappixmini/jappixmini.php:299
-#: ../../addon/jappixmini/jappixmini.php:299
-msgid "Subscribe to Friendica contacts automatically"
-msgstr "自动地订阅Friendica熟人"
-
-#: ../../addon.old/jappixmini/jappixmini.php:302
-#: ../../addon/jappixmini/jappixmini.php:302
-msgid "Purge internal list of jabber addresses of contacts"
-msgstr "把熟人jabber地址从内部单"
-
-#: ../../addon.old/jappixmini/jappixmini.php:308
-#: ../../addon/jappixmini/jappixmini.php:308
-msgid "Add contact"
-msgstr "加熟人"
-
-#: ../../addon.old/js_upload/js_upload.php:43
-#: ../../addon/js_upload/js_upload.php:43
-msgid "Upload a file"
-msgstr "上传文件"
-
-#: ../../addon.old/js_upload/js_upload.php:44
-#: ../../addon/js_upload/js_upload.php:44
-msgid "Drop files here to upload"
-msgstr "在这儿放文件为上传"
-
-#: ../../addon.old/js_upload/js_upload.php:45
-#: ../../addon/js_upload/js_upload.php:45 ../../include/items.php:3970
-#: ../../include/conversation.php:1080 ../../mod/contacts.php:249
-#: ../../mod/settings.php:561 ../../mod/settings.php:587
-#: ../../mod/dfrn_request.php:848 ../../mod/suggest.php:32
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:148
-#: ../../mod/fbrowser.php:81 ../../mod/fbrowser.php:116
-#: ../../mod/message.php:212 ../../mod/photos.php:202 ../../mod/photos.php:290
-msgid "Cancel"
-msgstr "退消"
-
-#: ../../addon.old/js_upload/js_upload.php:46
-#: ../../addon/js_upload/js_upload.php:46
-msgid "Failed"
-msgstr "失败"
-
-#: ../../addon.old/js_upload/js_upload.php:297
-#: ../../addon/js_upload/js_upload.php:303
-msgid "No files were uploaded."
-msgstr "没有文件上传。"
-
-#: ../../addon.old/js_upload/js_upload.php:303
-#: ../../addon/js_upload/js_upload.php:309
-msgid "Uploaded file is empty"
-msgstr "上传的文件空的"
-
-#: ../../addon.old/js_upload/js_upload.php:315
-#: ../../addon/js_upload/js_upload.php:321 ../../mod/photos.php:761
-msgid "Image exceeds size limit of "
-msgstr "图片超出最大尺寸"
-
-#: ../../addon.old/js_upload/js_upload.php:326
-#: ../../addon/js_upload/js_upload.php:332
-msgid "File has an invalid extension, it should be one of "
-msgstr "文件扩展名无效的，应该是这些一个："
-
-#: ../../addon.old/js_upload/js_upload.php:337
-#: ../../addon/js_upload/js_upload.php:343
-msgid "Upload was cancelled, or server error encountered"
-msgstr "上传注销了，或相遇服务器错误"
-
-#: ../../addon.old/libertree/libertree.php:36
-#: ../../addon/libertree/libertree.php:36
-msgid "Post to libertree"
-msgstr "转播到libertree"
-
-#: ../../addon.old/libertree/libertree.php:67
-#: ../../addon/libertree/libertree.php:67
-msgid "libertree Post Settings"
-msgstr "libertree转播设置"
-
-#: ../../addon.old/libertree/libertree.php:69
-#: ../../addon/libertree/libertree.php:69
-msgid "Enable Libertree Post Plugin"
-msgstr "使Libertree转播插件可用"
-
-#: ../../addon.old/libertree/libertree.php:74
-#: ../../addon/libertree/libertree.php:74
-msgid "Libertree API token"
-msgstr "Libertree API令牌"
-
-#: ../../addon.old/libertree/libertree.php:79
-#: ../../addon/libertree/libertree.php:79
-msgid "Libertree site URL"
-msgstr "Libertree网站URL"
-
-#: ../../addon.old/libertree/libertree.php:84
-#: ../../addon/libertree/libertree.php:84
-msgid "Post to Libertree by default"
-msgstr "默认地转播到Libertree"
-
-#: ../../addon.old/libravatar/libravatar.php:14
-#: ../../addon/libravatar/libravatar.php:14
-msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
-msgstr "安装不了Libravatar。<br>它要求PHP>=5.3"
-
-#: ../../addon.old/libravatar/libravatar.php:83
-#: ../../addon/libravatar/libravatar.php:83
-#, php-format
-msgid "Your PHP version %s is lower than the required PHP >= 5.3."
-msgstr "您PHP版体数%s是比要求的5.3少。"
-
-#: ../../addon.old/libravatar/libravatar.php:84
-#: ../../addon/libravatar/libravatar.php:84
-msgid "This addon is not functional on your server."
-msgstr "这个加件在您的服务器不可用的"
-
-#: ../../addon.old/libravatar/libravatar.php:93
-#: ../../addon/libravatar/libravatar.php:93
-msgid ""
-"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
-"Libravatar addon will fall back to Gravatar if nothing was found at "
-"Libravatar."
-msgstr "Gravatar加件安装着。请使Gravatar加件不可用。<br>如果找不到什么在Libravatar加件可依靠的是Gravatar。"
-
-#: ../../addon.old/libravatar/libravatar.php:100
-#: ../../addon/libravatar/libravatar.php:100
-msgid "Select default avatar image if none was found. See README"
-msgstr "选择默认纸娃娃系统如果一个也找不到。看README"
-
-#: ../../addon.old/libravatar/libravatar.php:112
-#: ../../addon/libravatar/libravatar.php:112
-msgid "Libravatar settings updated."
-msgstr "Libravatar设置更新了。"
-
-#: ../../addon.old/ljpost/ljpost.php:39 ../../addon/ljpost/ljpost.php:39
-msgid "Post to LiveJournal"
-msgstr "转播到LiveJournal"
-
-#: ../../addon.old/ljpost/ljpost.php:70 ../../addon/ljpost/ljpost.php:70
-msgid "LiveJournal Post Settings"
-msgstr "LiveJournal转播设置"
-
-#: ../../addon.old/ljpost/ljpost.php:72 ../../addon/ljpost/ljpost.php:72
-msgid "Enable LiveJournal Post Plugin"
-msgstr "使Livejournal转播插件可用"
-
-#: ../../addon.old/ljpost/ljpost.php:77 ../../addon/ljpost/ljpost.php:77
-msgid "LiveJournal username"
-msgstr "LiveJournal用户名"
-
-#: ../../addon.old/ljpost/ljpost.php:82 ../../addon/ljpost/ljpost.php:82
-msgid "LiveJournal password"
-msgstr "LiveJournal密码"
-
-#: ../../addon.old/ljpost/ljpost.php:87 ../../addon/ljpost/ljpost.php:87
-msgid "Post to LiveJournal by default"
-msgstr "默认地转播到LiveJournal"
-
-#: ../../addon.old/mathjax/mathjax.php:37 ../../addon/mathjax/mathjax.php:37
-msgid ""
-"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."
-msgstr "MathJax插件表示用LaTeX句法的数学公式，围绕$$或者eqnarray快，在您墙，网络分页和私人收件箱的文章。"
-
-#: ../../addon.old/mathjax/mathjax.php:38 ../../addon/mathjax/mathjax.php:38
-msgid "Use the MathJax renderer"
-msgstr "用MathJax表示器"
-
-#: ../../addon.old/mathjax/mathjax.php:74 ../../addon/mathjax/mathjax.php:75
-msgid "MathJax Base URL"
-msgstr "MathJax基础URL"
-
-#: ../../addon.old/mathjax/mathjax.php:74 ../../addon/mathjax/mathjax.php:75
-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 "URL JavaScript文件应该包括为用MathJax。可以MathJax CDN或者别的MathJax安装。"
-
-#: ../../addon.old/membersince/membersince.php:18
-#: ../../addon/membersince/membersince.php:18
-msgid "Member since:"
-msgstr "客人从："
-
-#: ../../addon.old/morepokes/morepokes.php:19
-#: ../../addon/morepokes/morepokes.php:19
-msgid "bitchslap"
-msgstr "恶毒掌击"
-
-#: ../../addon.old/morepokes/morepokes.php:19
-#: ../../addon/morepokes/morepokes.php:19
-msgid "bitchslapped"
-msgstr "恶毒掌击了"
-
-#: ../../addon.old/morepokes/morepokes.php:20
-#: ../../addon/morepokes/morepokes.php:20
-msgid "shag"
-msgstr "肏"
-
-#: ../../addon.old/morepokes/morepokes.php:20
-#: ../../addon/morepokes/morepokes.php:20
-msgid "shagged"
-msgstr "肏了"
-
-#: ../../addon.old/morepokes/morepokes.php:21
-#: ../../addon/morepokes/morepokes.php:21
-msgid "do something obscenely biological to"
-msgstr "做什么淫秽生物的于"
-
-#: ../../addon.old/morepokes/morepokes.php:21
-#: ../../addon/morepokes/morepokes.php:21
-msgid "did something obscenely biological to"
-msgstr "做了什么淫秽生物的于"
-
-#: ../../addon.old/morepokes/morepokes.php:22
-#: ../../addon/morepokes/morepokes.php:22
-msgid "point out the poke feature to"
-msgstr "把戳特点指给"
-
-#: ../../addon.old/morepokes/morepokes.php:22
-#: ../../addon/morepokes/morepokes.php:22
-msgid "pointed out the poke feature to"
-msgstr "把了戳特点指给"
-
-#: ../../addon.old/morepokes/morepokes.php:23
-#: ../../addon/morepokes/morepokes.php:23
-msgid "declare undying love for"
-msgstr "表明永远的爱情为"
-
-#: ../../addon.old/morepokes/morepokes.php:23
-#: ../../addon/morepokes/morepokes.php:23
-msgid "declared undying love for"
-msgstr "表明了永远的爱情为"
-
-#: ../../addon.old/morepokes/morepokes.php:24
-#: ../../addon/morepokes/morepokes.php:24
-msgid "patent"
-msgstr "专利"
-
-#: ../../addon.old/morepokes/morepokes.php:24
-#: ../../addon/morepokes/morepokes.php:24
-msgid "patented"
-msgstr "专利了"
-
-#: ../../addon.old/morepokes/morepokes.php:25
-#: ../../addon/morepokes/morepokes.php:25
-msgid "stroke beard"
-msgstr "摸胡子"
-
-#: ../../addon.old/morepokes/morepokes.php:25
-#: ../../addon/morepokes/morepokes.php:25
-msgid "stroked their beard at"
-msgstr "摸胡子了"
-
-#: ../../addon.old/morepokes/morepokes.php:26
-#: ../../addon/morepokes/morepokes.php:26
-msgid ""
-"bemoan the declining standards of modern secondary and tertiary education to"
-msgstr "哀叹现代的二三等教育规格的衰退给"
-
-#: ../../addon.old/morepokes/morepokes.php:26
-#: ../../addon/morepokes/morepokes.php:26
-msgid ""
-"bemoans the declining standards of modern secondary and tertiary education "
-"to"
-msgstr "哀叹现代的二三等教育规格的衰退给"
-
-#: ../../addon.old/morepokes/morepokes.php:27
-#: ../../addon/morepokes/morepokes.php:27
-msgid "hug"
-msgstr "拥抱"
-
-#: ../../addon.old/morepokes/morepokes.php:27
-#: ../../addon/morepokes/morepokes.php:27
-msgid "hugged"
-msgstr "拥抱了"
-
-#: ../../addon.old/morepokes/morepokes.php:28
-#: ../../addon/morepokes/morepokes.php:28
-msgid "kiss"
-msgstr "亲吻"
-
-#: ../../addon.old/morepokes/morepokes.php:28
-#: ../../addon/morepokes/morepokes.php:28
-msgid "kissed"
-msgstr "亲吻了"
-
-#: ../../addon.old/morepokes/morepokes.php:29
-#: ../../addon/morepokes/morepokes.php:29
-msgid "raise eyebrows at"
-msgstr "举起眉毛于"
-
-#: ../../addon.old/morepokes/morepokes.php:29
-#: ../../addon/morepokes/morepokes.php:29
-msgid "raised their eyebrows at"
-msgstr "举起了眉毛于"
-
-#: ../../addon.old/morepokes/morepokes.php:30
-#: ../../addon/morepokes/morepokes.php:30
-msgid "insult"
-msgstr "侮辱"
-
-#: ../../addon.old/morepokes/morepokes.php:30
-#: ../../addon/morepokes/morepokes.php:30
-msgid "insulted"
-msgstr "侮辱"
-
-#: ../../addon.old/morepokes/morepokes.php:31
-#: ../../addon/morepokes/morepokes.php:31
-msgid "praise"
-msgstr "赞扬"
-
-#: ../../addon.old/morepokes/morepokes.php:31
-#: ../../addon/morepokes/morepokes.php:31
-msgid "praised"
-msgstr "赞扬了"
-
-#: ../../addon.old/morepokes/morepokes.php:32
-#: ../../addon/morepokes/morepokes.php:32
-msgid "be dubious of"
-msgstr "怀疑"
-
-#: ../../addon.old/morepokes/morepokes.php:32
-#: ../../addon/morepokes/morepokes.php:32
-msgid "was dubious of"
-msgstr "怀疑了"
-
-#: ../../addon.old/morepokes/morepokes.php:33
-#: ../../addon/morepokes/morepokes.php:33
-msgid "eat"
-msgstr "吃"
-
-#: ../../addon.old/morepokes/morepokes.php:33
-#: ../../addon/morepokes/morepokes.php:33
-msgid "ate"
-msgstr "吃了"
-
-#: ../../addon.old/morepokes/morepokes.php:34
-#: ../../addon/morepokes/morepokes.php:34
-msgid "giggle and fawn at"
-msgstr "咯咯地笑和巴结为"
-
-#: ../../addon.old/morepokes/morepokes.php:34
-#: ../../addon/morepokes/morepokes.php:34
-msgid "giggled and fawned at"
-msgstr "咯咯地笑和巴结为了"
-
-#: ../../addon.old/morepokes/morepokes.php:35
-#: ../../addon/morepokes/morepokes.php:35
-msgid "doubt"
-msgstr "怀疑"
-
-#: ../../addon.old/morepokes/morepokes.php:35
-#: ../../addon/morepokes/morepokes.php:35
-msgid "doubted"
-msgstr "怀疑了"
-
-#: ../../addon.old/morepokes/morepokes.php:36
-#: ../../addon/morepokes/morepokes.php:36
-msgid "glare"
-msgstr "瞪"
-
-#: ../../addon.old/morepokes/morepokes.php:36
-#: ../../addon/morepokes/morepokes.php:36
-msgid "glared at"
-msgstr "瞪了"
-
-#: ../../addon.old/notimeline/notimeline.php:32
-#: ../../addon/notimeline/notimeline.php:32
-msgid "No Timeline settings updated."
-msgstr "没有时间链设置更新"
-
-#: ../../addon.old/notimeline/notimeline.php:56
-#: ../../addon/notimeline/notimeline.php:56
-msgid "No Timeline Settings"
-msgstr "没有时间链设置"
-
-#: ../../addon.old/notimeline/notimeline.php:58
-#: ../../addon/notimeline/notimeline.php:58
-msgid "Disable Archive selector on profile wall"
-msgstr "使在简介墙上档案选择器不能用"
-
-#: ../../addon.old/nsfw/nsfw.php:78 ../../addon/nsfw/nsfw.php:78
-msgid "Not Safe For Work (General Purpose Content Filter) settings"
-msgstr "工作不安全（通用内容过滤）设置"
-
-#: ../../addon.old/nsfw/nsfw.php:80 ../../addon/nsfw/nsfw.php:80
-msgid ""
-"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."
-msgstr "这个插件搜索您下面输入的词／正文在所有的文章里，和把包含那些关键词的内容隐藏，省得不妥当的时候表示，比如性的影射在办公室里。是礼貌和建议的把什么包括裸体的内容跟#NSFW标签。这个过滤也会符合设么别的您输入的词，从而能当通用内容过滤有用的。"
-
-#: ../../addon.old/nsfw/nsfw.php:81 ../../addon/nsfw/nsfw.php:81
-msgid "Enable Content filter"
-msgstr "使内容过滤可用"
-
-#: ../../addon.old/nsfw/nsfw.php:84 ../../addon/nsfw/nsfw.php:84
-msgid "Comma separated list of keywords to hide"
-msgstr "逗号分隔单词要隐藏"
-
-#: ../../addon.old/nsfw/nsfw.php:89 ../../addon/nsfw/nsfw.php:89
-msgid "Use /expression/ to provide regular expressions"
-msgstr "用/<i>表达式</i>/为输入正则表达式"
-
-#: ../../addon.old/nsfw/nsfw.php:105 ../../addon/nsfw/nsfw.php:105
-msgid "NSFW Settings saved."
-msgstr "NSFW设置保持了。"
-
-#: ../../addon.old/nsfw/nsfw.php:157 ../../addon/nsfw/nsfw.php:157
-#, php-format
-msgid "%s - Click to open/close"
-msgstr "%s - 点击为打开／关闭"
-
-#: ../../addon.old/numfriends/numfriends.php:46
-#: ../../addon/numfriends/numfriends.php:46
-msgid "Numfriends settings updated."
-msgstr "Numfriends设置更新了"
-
-#: ../../addon.old/numfriends/numfriends.php:77
-#: ../../addon/numfriends/numfriends.php:77
-msgid "Numfriends Settings"
-msgstr "Numfriends设置"
-
-#: ../../addon.old/oembed.old/oembed.php:30
-msgid "OEmbed settings updated"
-msgstr "OEmbed设置更新了"
-
-#: ../../addon.old/oembed.old/oembed.php:43
-msgid "Use OEmbed for YouTube videos"
-msgstr "用OEmbed为YouTube视频"
-
-#: ../../addon.old/oembed.old/oembed.php:71
-msgid "URL to embed:"
-msgstr "URL要嵌入："
-
-#: ../../addon.old/openstreetmap/openstreetmap.php:71
-#: ../../addon/openstreetmap/openstreetmap.php:95
-msgid "Tile Server URL"
-msgstr "砖服务器URL"
-
-#: ../../addon.old/openstreetmap/openstreetmap.php:71
-#: ../../addon/openstreetmap/openstreetmap.php:95
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
-"target=\"_blank\">public tile servers</a>"
-msgstr "一单<a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">公共砖服务器</a>"
-
-#: ../../addon.old/openstreetmap/openstreetmap.php:72
-#: ../../addon/openstreetmap/openstreetmap.php:96
-msgid "Default zoom"
-msgstr "默认变焦距"
-
-#: ../../addon.old/openstreetmap/openstreetmap.php:72
-#: ../../addon/openstreetmap/openstreetmap.php:96
-msgid "The default zoom level. (1:world, 18:highest)"
-msgstr "默认变焦距。(1:世界, 18:最高)"
-
-#: ../../addon.old/page/page.php:77 ../../addon.old/page/page.php:111
-#: ../../addon.old/showmore/showmore.php:119 ../../addon/page/page.php:77
-#: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:204 ../../mod/content.php:629
-#: ../../object/Item.php:355 ../../boot.php:652
-msgid "show more"
-msgstr "看多"
-
-#: ../../addon.old/page/page.php:166 ../../addon/page/page.php:166
-msgid "Page settings updated."
-msgstr "页设置更新了"
-
-#: ../../addon.old/page/page.php:195 ../../addon/page/page.php:195
-msgid "Page Settings"
-msgstr "页设置"
-
-#: ../../addon.old/page/page.php:197 ../../addon/page/page.php:197
-msgid "How many forums to display on sidebar without paging"
-msgstr "多少评坛要在工具栏上表示无分页"
-
-#: ../../addon.old/page/page.php:200 ../../addon/page/page.php:200
-msgid "Randomise Page/Forum list"
-msgstr "把页／评坛单洗牌"
-
-#: ../../addon.old/page/page.php:203 ../../addon/page/page.php:203
-msgid "Show pages/forums on profile page"
-msgstr "表示页／评坛在简介页"
-
-#: ../../addon.old/pageheader/pageheader.php:50
-#: ../../addon/pageheader/pageheader.php:50
-msgid "\"pageheader\" Settings"
-msgstr "\"pageheader"
-
-#: ../../addon.old/pageheader/pageheader.php:68
-#: ../../addon/pageheader/pageheader.php:68
-msgid "pageheader Settings saved."
-msgstr "pageHeader配置保存了。"
-
-#: ../../addon.old/piwik/piwik.php:79 ../../addon/piwik/piwik.php:79
-msgid ""
-"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
-"analytics tool."
-msgstr "这个网站用<a href='http://www.piwik.org'>Piwik</a>分析工具追踪 。"
-
-#: ../../addon.old/piwik/piwik.php:82 ../../addon/piwik/piwik.php:82
-#, php-format
-msgid ""
-"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)."
-msgstr "如果您不想您访问这样记录您<a href='%s'>可以用一个cookie防Piwik追踪未来的访问</a>(选择性退出)。"
-
-#: ../../addon.old/piwik/piwik.php:90 ../../addon/piwik/piwik.php:90
-msgid "Piwik Base URL"
-msgstr "Piwik基础URL"
-
-#: ../../addon.old/piwik/piwik.php:90 ../../addon/piwik/piwik.php:90
-msgid ""
-"Absolute path to your Piwik installation. (without protocol (http/s), with "
-"trailing slash)"
-msgstr "绝对道路到Piwik安装。（没有协议（http/s）跟斜线后缀）"
-
-#: ../../addon.old/piwik/piwik.php:91 ../../addon/piwik/piwik.php:91
-msgid "Site ID"
-msgstr "网站ID"
-
-#: ../../addon.old/piwik/piwik.php:92 ../../addon/piwik/piwik.php:92
-msgid "Show opt-out cookie link?"
-msgstr " 显示选择性退出cookie按钮？"
-
-#: ../../addon.old/piwik/piwik.php:93 ../../addon/piwik/piwik.php:93
-msgid "Asynchronous tracking"
-msgstr "异步追踪"
-
-#: ../../addon.old/planets/planets.php:150 ../../addon/planets/planets.php:150
-msgid "Planets Settings"
-msgstr "行星设置"
-
-#: ../../addon.old/planets/planets.php:152 ../../addon/planets/planets.php:152
-msgid "Enable Planets Plugin"
-msgstr "使行星插件可用"
-
-#: ../../addon.old/posterous/posterous.php:37
-#: ../../addon/posterous/posterous.php:37
-msgid "Post to Posterous"
-msgstr "发送往Posterous"
-
-#: ../../addon.old/posterous/posterous.php:70
-#: ../../addon/posterous/posterous.php:70
-msgid "Posterous Post Settings"
-msgstr "Posterous发送设置"
-
-#: ../../addon.old/posterous/posterous.php:72
-#: ../../addon/posterous/posterous.php:72
-msgid "Enable Posterous Post Plugin"
-msgstr "使Posterous发送插件可用的"
-
-#: ../../addon.old/posterous/posterous.php:77
-#: ../../addon/posterous/posterous.php:77
-msgid "Posterous login"
-msgstr "Posterous登记名"
-
-#: ../../addon.old/posterous/posterous.php:82
-#: ../../addon/posterous/posterous.php:82
-msgid "Posterous password"
-msgstr "Posterous密码"
-
-#: ../../addon.old/posterous/posterous.php:87
-#: ../../addon/posterous/posterous.php:87
-msgid "Posterous site ID"
-msgstr "Posterous网站身份证明"
-
-#: ../../addon.old/posterous/posterous.php:92
-#: ../../addon/posterous/posterous.php:92
-msgid "Posterous API token"
-msgstr "Posterous API令牌"
-
-#: ../../addon.old/posterous/posterous.php:97
-#: ../../addon/posterous/posterous.php:97
-msgid "Post to Posterous by default"
-msgstr "默认地发送往Posterous"
-
-#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:351
-msgid "Lifetime of the cache (in hours)"
-msgstr "缓存期（小时）"
-
-#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:356
-msgid "Cache Statistics"
-msgstr "缓存统计"
-
-#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:359
-msgid "Number of items"
-msgstr "项目数量"
-
-#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:361
-msgid "Size of the cache"
-msgstr "缓存尺寸"
-
-#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:363
-msgid "Delete the whole cache"
-msgstr "删除全缓存"
-
-#: ../../addon.old/public_server/public_server.php:126
-#: ../../addon.old/testdrive/testdrive.php:94
-#: ../../addon/public_server/public_server.php:126
-#: ../../addon/testdrive/testdrive.php:94
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr "您账户在%s几天后过期了。"
-
-#: ../../addon.old/public_server/public_server.php:127
-#: ../../addon/public_server/public_server.php:127
-msgid "Your Friendica account is about to expire."
-msgstr "您Friendica账户快过期。"
-
-#: ../../addon.old/public_server/public_server.php:128
-#: ../../addon/public_server/public_server.php:128
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your 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"
-msgstr "你好%1$s,⏎ ⏎您的账户在%2$s五天内过期。您会继续您的账户经由每30天至少一次登录。"
-
-#: ../../addon.old/qcomment/qcomment.php:51
-#: ../../addon/qcomment/qcomment.php:51
-msgid ":-)"
-msgstr ":-)"
-
-#: ../../addon.old/qcomment/qcomment.php:51
-#: ../../addon/qcomment/qcomment.php:51
-msgid ":-("
-msgstr ":-("
-
-#: ../../addon.old/qcomment/qcomment.php:51
-#: ../../addon/qcomment/qcomment.php:51
-msgid "lol"
-msgstr "lol"
-
-#: ../../addon.old/qcomment/qcomment.php:54
-#: ../../addon/qcomment/qcomment.php:54
-msgid "Quick Comment Settings"
-msgstr "快捷评论设置"
-
-#: ../../addon.old/qcomment/qcomment.php:56
-#: ../../addon/qcomment/qcomment.php:56
-msgid ""
-"Quick comments are found near comment boxes, sometimes hidden. Click them to"
-" provide simple replies."
-msgstr "快捷评论是在评论文本框，有时候隐藏。点击它们为输入简单的回答。"
-
-#: ../../addon.old/qcomment/qcomment.php:57
-#: ../../addon/qcomment/qcomment.php:57
-msgid "Enter quick comments, one per line"
-msgstr "输入快捷评论，一行一个"
-
-#: ../../addon.old/qcomment/qcomment.php:75
-#: ../../addon/qcomment/qcomment.php:75
-msgid "Quick Comment settings saved."
-msgstr "快捷评论设置保存了。"
-
-#: ../../addon.old/randplace/randplace.php:169
-#: ../../addon/randplace/randplace.php:169
-msgid "Randplace Settings"
-msgstr "随意下设置"
-
-#: ../../addon.old/randplace/randplace.php:171
-#: ../../addon/randplace/randplace.php:171
-msgid "Enable Randplace Plugin"
-msgstr "使随意下插件能用"
-
-#: ../../addon.old/showmore/showmore.php:38
-#: ../../addon/showmore/showmore.php:38
-msgid "\"Show more\" Settings"
-msgstr "「看更多」设置"
-
-#: ../../addon.old/showmore/showmore.php:41
-#: ../../addon/showmore/showmore.php:41
-msgid "Enable Show More"
-msgstr "使看更多能用"
-
-#: ../../addon.old/showmore/showmore.php:44
-#: ../../addon/showmore/showmore.php:44
-msgid "Cutting posts after how much characters"
-msgstr "剪掉文章多少字后"
-
-#: ../../addon.old/showmore/showmore.php:65
-#: ../../addon/showmore/showmore.php:65
-msgid "Show More Settings saved."
-msgstr "看更多设置保存了。"
-
-#: ../../addon.old/snautofollow/snautofollow.php:32
-#: ../../addon/snautofollow/snautofollow.php:32
-msgid "StatusNet AutoFollow settings updated."
-msgstr "StatusNet自动关注设置更新了。"
-
-#: ../../addon.old/snautofollow/snautofollow.php:56
-#: ../../addon/snautofollow/snautofollow.php:56
-msgid "StatusNet AutoFollow Settings"
-msgstr "StatusNet自动关注设置"
-
-#: ../../addon.old/snautofollow/snautofollow.php:58
-#: ../../addon/snautofollow/snautofollow.php:58
-msgid "Automatically follow any StatusNet followers/mentioners"
-msgstr "自动关注所有的StatusGet关注者／提及"
-
-#: ../../addon.old/startpage/startpage.php:83
-#: ../../addon/startpage/startpage.php:83
-msgid "Startpage Settings"
-msgstr "开始页设置"
-
-#: ../../addon.old/startpage/startpage.php:85
-#: ../../addon/startpage/startpage.php:85
-msgid "Home page to load after login  - leave blank for profile wall"
-msgstr "主页登录后表示－留空白为简介墙"
-
-#: ../../addon.old/startpage/startpage.php:88
-#: ../../addon/startpage/startpage.php:88
-msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
-msgstr "例如：&quot;网络&quot;或&quot;通知／系统&quot;"
-
-#: ../../addon.old/statusnet/statusnet.php:134
-#: ../../addon/statusnet/statusnet.php:138
-msgid "Post to StatusNet"
-msgstr "发送到StatusNet"
-
-#: ../../addon.old/statusnet/statusnet.php:176
-#: ../../addon/statusnet/statusnet.php:180
-msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
-msgstr "请联系您的网站行政人员。<br />提供的API URL无效。"
-
-#: ../../addon.old/statusnet/statusnet.php:204
-#: ../../addon/statusnet/statusnet.php:208
-msgid "We could not contact the StatusNet API with the Path you entered."
-msgstr "我们不能联系StatusNet API在您输入的路径。"
-
-#: ../../addon.old/statusnet/statusnet.php:232
-#: ../../addon/statusnet/statusnet.php:238
-msgid "StatusNet settings updated."
-msgstr "StatusNet设置更新了。"
-
-#: ../../addon.old/statusnet/statusnet.php:257
-#: ../../addon/statusnet/statusnet.php:269
-msgid "StatusNet Posting Settings"
-msgstr "StatusNet发送设置"
-
-#: ../../addon.old/statusnet/statusnet.php:271
-#: ../../addon/statusnet/statusnet.php:283
-msgid "Globally Available StatusNet OAuthKeys"
-msgstr "综合可用的StatusNet OAuthKeys"
-
-#: ../../addon.old/statusnet/statusnet.php:272
-#: ../../addon/statusnet/statusnet.php:284
-msgid ""
-"There are preconfigured OAuth key pairs for some StatusNet servers "
-"available. If you are useing one of them, please use these credentials. If "
-"not feel free to connect to any other StatusNet instance (see below)."
-msgstr "有已经装配的OAuth钥匙双于有的StatusNet服务器可用。如果您用那些之一，请用那个。否则随便连接任何别的StatusNet（看下）。"
-
-#: ../../addon.old/statusnet/statusnet.php:280
-#: ../../addon/statusnet/statusnet.php:292
-msgid "Provide your own OAuth Credentials"
-msgstr "提供您自己的OAuth证件"
-
-#: ../../addon.old/statusnet/statusnet.php:281
-#: ../../addon/statusnet/statusnet.php:293
-msgid ""
-"No consumer key pair for StatusNet found. Register your Friendica Account as"
-" an desktop client on your StatusNet account, copy the consumer key pair "
-"here and enter the API base root.<br />Before you register your own OAuth "
-"key pair ask the administrator if there is already a key pair for this "
-"Friendica installation at your favorited StatusNet installation."
-msgstr "找不到「consumer key」双为StatusNet。注册您Friendica账户当「desktop client」在您的StatusNet账户，粘贴「consumer key」双这儿和输入API基础根。<br />您登记您的OAuth钥匙双前问行政人员已经有没有钥匙双为这个Friendica安装在您最喜欢的StatusNet安装。"
-
-#: ../../addon.old/statusnet/statusnet.php:283
-#: ../../addon/statusnet/statusnet.php:295
-msgid "OAuth Consumer Key"
-msgstr "Oauth消费者钥匙"
-
-#: ../../addon.old/statusnet/statusnet.php:286
-#: ../../addon/statusnet/statusnet.php:298
-msgid "OAuth Consumer Secret"
-msgstr "Oauth消费者密码"
-
-#: ../../addon.old/statusnet/statusnet.php:289
-#: ../../addon/statusnet/statusnet.php:301
-msgid "Base API Path (remember the trailing /)"
-msgstr "基础API地址(注意最后的／)"
-
-#: ../../addon.old/statusnet/statusnet.php:310
-#: ../../addon/statusnet/statusnet.php:322
-msgid ""
-"To connect to your StatusNet account click the button below to get a "
-"security code from StatusNet which you have to copy into the input box below"
-" and submit the form. Only your <strong>public</strong> posts will be posted"
-" to StatusNet."
-msgstr "为连接您的StatusNet账户点击下按钮得到安全密码从StatusNet您要在输入在下个栏和提交表单。只您的公开文章被送到StatusNet。"
-
-#: ../../addon.old/statusnet/statusnet.php:311
-#: ../../addon/statusnet/statusnet.php:323
-msgid "Log in with StatusNet"
-msgstr "用StatusNet登记"
-
-#: ../../addon.old/statusnet/statusnet.php:313
-#: ../../addon/statusnet/statusnet.php:325
-msgid "Copy the security code from StatusNet here"
-msgstr "复制安全密码从StatusNet这儿"
-
-#: ../../addon.old/statusnet/statusnet.php:319
-#: ../../addon/statusnet/statusnet.php:331
-msgid "Cancel Connection Process"
-msgstr "注销连接过程 "
-
-#: ../../addon.old/statusnet/statusnet.php:321
-#: ../../addon/statusnet/statusnet.php:333
-msgid "Current StatusNet API is"
-msgstr "现在StatusNet API是"
-
-#: ../../addon.old/statusnet/statusnet.php:322
-#: ../../addon/statusnet/statusnet.php:334
-msgid "Cancel StatusNet Connection"
-msgstr "注销StatusNet连接"
-
-#: ../../addon.old/statusnet/statusnet.php:333
-#: ../../addon.old/twitter/twitter.php:189
-#: ../../addon/statusnet/statusnet.php:345 ../../addon/twitter/twitter.php:200
-msgid "Currently connected to: "
-msgstr "现在连接到："
-
-#: ../../addon.old/statusnet/statusnet.php:334
-#: ../../addon/statusnet/statusnet.php:346
-msgid ""
-"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."
-msgstr "如果使可用的都您<strong>公开的</strong>文章会被发送到有关的StatusNet账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。"
-
-#: ../../addon.old/statusnet/statusnet.php:336
-#: ../../addon/statusnet/statusnet.php:348
-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 "<strong>注意</strong>: 由于您的隐私设置(<em>隐藏您的简介内容为生看者？</em>)超链接可能包括在公文章转播到StatusNets会带领来客到空白页讲他看您的简介被限制。"
-
-#: ../../addon.old/statusnet/statusnet.php:339
-#: ../../addon/statusnet/statusnet.php:351
-msgid "Allow posting to StatusNet"
-msgstr "许放在StatusNet"
-
-#: ../../addon.old/statusnet/statusnet.php:342
-#: ../../addon/statusnet/statusnet.php:354
-msgid "Send public postings to StatusNet by default"
-msgstr "默认发送公开文章在StatusNet"
-
-#: ../../addon.old/statusnet/statusnet.php:345
-#: ../../addon/statusnet/statusnet.php:366
-msgid "Send linked #-tags and @-names to StatusNet"
-msgstr "转播连接的#标签盒@名到StatusNet"
-
-#: ../../addon.old/statusnet/statusnet.php:350
-#: ../../addon.old/twitter/twitter.php:206
-#: ../../addon/statusnet/statusnet.php:371 ../../addon/twitter/twitter.php:226
-msgid "Clear OAuth configuration"
-msgstr "清理出OAuth设置"
-
-#: ../../addon.old/statusnet/statusnet.php:567
-#: ../../addon/statusnet/statusnet.php:744 ../../mod/admin.php:484
-msgid "Site name"
-msgstr "网页名字"
-
-#: ../../addon.old/statusnet/statusnet.php:568
-#: ../../addon/statusnet/statusnet.php:745
-msgid "API URL"
-msgstr "API URL"
-
-#: ../../addon.old/statusnet/statusnet.php:569
-#: ../../addon/statusnet/statusnet.php:746 ../../mod/settings.php:564
-#: ../../mod/settings.php:590
-msgid "Consumer Secret"
-msgstr "密码(Consumer Secret)"
-
-#: ../../addon.old/statusnet/statusnet.php:570
-#: ../../addon/statusnet/statusnet.php:747 ../../mod/settings.php:563
-#: ../../mod/settings.php:589
-msgid "Consumer Key"
-msgstr "钥匙(Consumer Key)"
-
-#: ../../addon.old/testdrive/testdrive.php:95
-#: ../../addon/testdrive/testdrive.php:95
-msgid "Your Friendica test account is about to expire."
-msgstr "您Friendica化验账户快过期了。"
-
-#: ../../addon.old/testdrive/testdrive.php:96
-#: ../../addon/testdrive/testdrive.php:96
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your 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."
-msgstr "你好%1$s,⏎ ⏎您化验账户在%2$s五天内将过期。我们希望您享受了这个试车和用这个机会为您综合社会交通找持久的Friendica网站。一单公开的网站是在http://dir.friendica.com/siteinfo。为多消息安排您自己的Friendica服务器请看工程网站在http://friendica.com。"
-
-#: ../../addon.old/tictac/tictac.php:20 ../../addon/tictac/tictac.php:20
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr "三维井字棋"
-
-#: ../../addon.old/tictac/tictac.php:53 ../../addon/tictac/tictac.php:53
-msgid "3D Tic-Tac-Toe"
-msgstr "三维井字棋"
-
-#: ../../addon.old/tictac/tictac.php:58 ../../addon/tictac/tictac.php:58
-msgid "New game"
-msgstr "新游戏"
-
-#: ../../addon.old/tictac/tictac.php:59 ../../addon/tictac/tictac.php:59
-msgid "New game with handicap"
-msgstr "新游戏不利条件 "
-
-#: ../../addon.old/tictac/tictac.php:60 ../../addon/tictac/tictac.php:60
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
-msgstr "三维井字棋跟传统的一样，除了完同时在多水平。"
-
-#: ../../addon.old/tictac/tictac.php:61 ../../addon/tictac/tictac.php:61
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
-msgstr "这游戏有三水平。您赢经过实现三一连在任何水平，不亚于上，下，和倾斜跨越三水平。"
-
-#: ../../addon.old/tictac/tictac.php:63 ../../addon/tictac/tictac.php:63
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr "不利条件游戏使中间位置不能用因为占用着选手常常有不平的好处。"
-
-#: ../../addon.old/tictac/tictac.php:182 ../../addon/tictac/tictac.php:182
-msgid "You go first..."
-msgstr "您先下..."
-
-#: ../../addon.old/tictac/tictac.php:187 ../../addon/tictac/tictac.php:187
-msgid "I'm going first this time..."
-msgstr "这次我先下..."
-
-#: ../../addon.old/tictac/tictac.php:193 ../../addon/tictac/tictac.php:193
-msgid "You won!"
-msgstr "您赢了！"
-
-#: ../../addon.old/tictac/tictac.php:199 ../../addon.old/tictac/tictac.php:224
-#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224
-msgid "\"Cat\" game!"
-msgstr "「猫子」游戏！"
-
-#: ../../addon.old/tictac/tictac.php:222 ../../addon/tictac/tictac.php:222
-msgid "I won!"
-msgstr "我赢了！"
-
-#: ../../addon.old/tumblr/tumblr.php:36 ../../addon/tumblr/tumblr.php:158
-msgid "Post to Tumblr"
-msgstr "发送到Tumblr"
-
-#: ../../addon.old/tumblr/tumblr.php:67 ../../addon/tumblr/tumblr.php:185
-msgid "Tumblr Post Settings"
-msgstr "Tumblr发送设置"
-
-#: ../../addon.old/tumblr/tumblr.php:69 ../../addon/tumblr/tumblr.php:192
-msgid "Enable Tumblr Post Plugin"
-msgstr "使Tumblr发送插件能够"
-
-#: ../../addon.old/tumblr/tumblr.php:74
-msgid "Tumblr login"
-msgstr "Tumblr登记名"
-
-#: ../../addon.old/tumblr/tumblr.php:79
-msgid "Tumblr password"
-msgstr "Tumblr密码"
-
-#: ../../addon.old/tumblr/tumblr.php:84 ../../addon/tumblr/tumblr.php:197
-msgid "Post to Tumblr by default"
-msgstr "默认地给Tumblr发送"
-
-#: ../../addon.old/twitter/twitter.php:73 ../../addon/twitter/twitter.php:77
-msgid "Post to Twitter"
-msgstr "发送到在Twitter"
-
-#: ../../addon.old/twitter/twitter.php:122 ../../addon/twitter/twitter.php:129
-msgid "Twitter settings updated."
-msgstr "Twitter设置更新了。"
-
-#: ../../addon.old/twitter/twitter.php:146 ../../addon/twitter/twitter.php:157
-msgid "Twitter Posting Settings"
-msgstr "Twitter发送设置"
-
-#: ../../addon.old/twitter/twitter.php:153 ../../addon/twitter/twitter.php:164
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
-msgstr "找不到Twitter的消费钥匙双。请联系您的网页行政人员。"
-
-#: ../../addon.old/twitter/twitter.php:172 ../../addon/twitter/twitter.php:183
-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 "
-"button below to get a PIN from Twitter which you have to copy into the input"
-" box below and submit the form. Only your <strong>public</strong> posts will"
-" be posted to Twitter."
-msgstr "在这个Friendica网站使Twitter插件可用的可您还没有把您的账户和您Twitter账户连通。为这做点击下边的按钮得到密码从Twitter您要粘贴在下边的输入框和提交。只您的<strong>公开</strong>文章被发送到Twitter。"
-
-#: ../../addon.old/twitter/twitter.php:173 ../../addon/twitter/twitter.php:184
-msgid "Log in with Twitter"
-msgstr "用Twitter登记"
-
-#: ../../addon.old/twitter/twitter.php:175 ../../addon/twitter/twitter.php:186
-msgid "Copy the PIN from Twitter here"
-msgstr "复制Twitter密码这儿"
-
-#: ../../addon.old/twitter/twitter.php:190 ../../addon/twitter/twitter.php:201
-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.old/twitter/twitter.php:192 ../../addon/twitter/twitter.php:203
-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 Twitter will lead the visitor to a blank page informing "
-"the visitor that the access to your profile has been restricted."
-msgstr "<strong>注意</strong>：由于您的隐私设置（<em>隐藏您的简介内容为生人？</em>）环节包括在转播到Twitter的条文可能通空白页通知看者看您的简介有限。"
-
-#: ../../addon.old/twitter/twitter.php:195 ../../addon/twitter/twitter.php:206
-msgid "Allow posting to Twitter"
-msgstr "允许发送到Twitter"
-
-#: ../../addon.old/twitter/twitter.php:198 ../../addon/twitter/twitter.php:209
-msgid "Send public postings to Twitter by default"
-msgstr "默认地发送公开文章到Twitter"
-
-#: ../../addon.old/twitter/twitter.php:201 ../../addon/twitter/twitter.php:221
-msgid "Send linked #-tags and @-names to Twitter"
-msgstr "转播连接的#标签盒@名到Twitter"
-
-#: ../../addon.old/twitter/twitter.php:396 ../../addon/twitter/twitter.php:558
-msgid "Consumer key"
-msgstr "钥匙(Consumer key)"
-
-#: ../../addon.old/twitter/twitter.php:397 ../../addon/twitter/twitter.php:559
-msgid "Consumer secret"
-msgstr "密码(Consumer secret)"
-
-#: ../../addon.old/uhremotestorage/uhremotestorage.php:84
-#: ../../addon/uhremotestorage/uhremotestorage.php:84
-#, php-format
-msgid ""
-"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>"
-msgstr "许用您的friendica用户名（%s）根对外没主办的贮藏（比如ownCloud）。看<a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
-
-#: ../../addon.old/uhremotestorage/uhremotestorage.php:85
-#: ../../addon/uhremotestorage/uhremotestorage.php:85
-msgid "Template URL (with {category})"
-msgstr "模板URL（根{category}）"
-
-#: ../../addon.old/uhremotestorage/uhremotestorage.php:86
-#: ../../addon/uhremotestorage/uhremotestorage.php:86
-msgid "OAuth end-point"
-msgstr "OAuth 端点"
-
-#: ../../addon.old/uhremotestorage/uhremotestorage.php:87
-#: ../../addon/uhremotestorage/uhremotestorage.php:87
-msgid "Api"
-msgstr "API"
-
-#: ../../addon.old/viewsrc/viewsrc.php:37 ../../addon/viewsrc/viewsrc.php:39
-msgid "View Source"
-msgstr "看源代码"
-
-#: ../../addon.old/widgets/widget_friendheader.php:40
-#: ../../addon/widgets/widget_friendheader.php:40
-msgid "Get added to this list!"
-msgstr "被在这个单子加入！"
-
-#: ../../addon.old/widgets/widget_friends.php:40
-#: ../../addon/widgets/widget_friends.php:40
-msgid "Connect on Friendica!"
-msgstr "连接在Friendica！"
-
-#: ../../addon.old/widgets/widget_like.php:58
-#: ../../addon/widgets/widget_like.php:59
-#, php-format
-msgid "%d person likes this"
-msgid_plural "%d people like this"
-msgstr[0] "%d人喜欢这个"
-
-#: ../../addon.old/widgets/widget_like.php:61
-#: ../../addon/widgets/widget_like.php:62
-#, php-format
-msgid "%d person doesn't like this"
-msgid_plural "%d people don't like this"
-msgstr[0] "%d人不喜欢这个"
-
-#: ../../addon.old/widgets/widgets.php:56 ../../addon/widgets/widgets.php:57
-msgid "Generate new key"
-msgstr "造成新钥匙"
-
-#: ../../addon.old/widgets/widgets.php:59 ../../addon/widgets/widgets.php:60
-msgid "Widgets key"
-msgstr "小窗口钥匙"
-
-#: ../../addon.old/widgets/widgets.php:61 ../../addon/widgets/widgets.php:62
-msgid "Widgets available"
-msgstr "可用的小窗口"
-
-#: ../../addon.old/widgets/widgets.php:123 ../../addon/widgets/widgets.php:124
-#: ../../mod/settings.php:646
-msgid "Plugin Settings"
-msgstr "插件设置"
-
-#: ../../addon.old/wppost/wppost.php:42 ../../addon/wppost/wppost.php:42
-msgid "Post to Wordpress"
-msgstr "发送到Wordpress"
-
-#: ../../addon.old/wppost/wppost.php:76 ../../addon/wppost/wppost.php:76
-msgid "WordPress Post Settings"
-msgstr "Wordpress发送设置"
-
-#: ../../addon.old/wppost/wppost.php:78 ../../addon/wppost/wppost.php:78
-msgid "Enable WordPress Post Plugin"
-msgstr "使Wordpress发送插件可用"
-
-#: ../../addon.old/wppost/wppost.php:83 ../../addon/wppost/wppost.php:83
-msgid "WordPress username"
-msgstr "Wordpress用户名"
-
-#: ../../addon.old/wppost/wppost.php:88 ../../addon/wppost/wppost.php:88
-msgid "WordPress password"
-msgstr "Wordpress密码"
-
-#: ../../addon.old/wppost/wppost.php:93 ../../addon/wppost/wppost.php:93
-msgid "WordPress API URL"
-msgstr "WordPress API URL"
-
-#: ../../addon.old/wppost/wppost.php:98 ../../addon/wppost/wppost.php:98
-msgid "Post to WordPress by default"
-msgstr "默认地发送到Wordpress"
-
-#: ../../addon.old/wppost/wppost.php:103 ../../addon/wppost/wppost.php:103
-msgid "Provide a backlink to the Friendica post"
-msgstr "输入反向链接到Friendica文章"
-
-#: ../../addon.old/wppost/wppost.php:207 ../../addon/wppost/wppost.php:207
-msgid "Read the original post and comment stream on Friendica"
-msgstr "看原来文章和评论溪流在Friendica"
-
-#: ../../addon.old/yourls/yourls.php:55 ../../addon/yourls/yourls.php:55
-msgid "YourLS Settings"
-msgstr "YourLS配置"
-
-#: ../../addon.old/yourls/yourls.php:57 ../../addon/yourls/yourls.php:57
-msgid "URL: http://"
-msgstr "URL: http://"
-
-#: ../../addon.old/yourls/yourls.php:62 ../../addon/yourls/yourls.php:62
-msgid "Username:"
-msgstr "用户名："
-
-#: ../../addon.old/yourls/yourls.php:67 ../../addon/yourls/yourls.php:67
-msgid "Password:"
-msgstr "密码："
-
-#: ../../addon.old/yourls/yourls.php:72 ../../addon/yourls/yourls.php:72
-msgid "Use SSL "
-msgstr "用SSL"
-
-#: ../../addon.old/yourls/yourls.php:92 ../../addon/yourls/yourls.php:92
-msgid "yourls Settings saved."
-msgstr "yourls配置保存了。"
-
-#: ../../addon/altpager/altpager.php:99
-#: ../../addon/remote_permissions/remote_permissions.php:197
-msgid "Global"
-msgstr "综合"
-
-#: ../../addon/altpager/altpager.php:99
-msgid "Force global use of the alternate pager"
-msgstr "让大家用供替换的分页"
-
-#: ../../addon/altpager/altpager.php:100
-#: ../../addon/remote_permissions/remote_permissions.php:198
-msgid "Individual"
-msgstr "一个人的"
-
-#: ../../addon/altpager/altpager.php:100
-msgid "Each user chooses whether to use the alternate pager"
-msgstr "每用户选择是否用供替换的分页"
-
-#: ../../addon/fbpost/fbpost.php:239
-msgid "Suppress \"View on friendica\""
-msgstr "禁止「看在Friendica」"
-
-#: ../../addon/fbpost/fbpost.php:243
-msgid "Mirror wall posts from facebook to friendica."
-msgstr "复制墙文章从facebook到friendica。"
-
-#: ../../addon/fbpost/fbpost.php:253
-msgid "Post to page/group:"
-msgstr "放在页／组："
-
-#: ../../addon/fbpost/fbpost.php:375
-#, php-format
-msgid "%s:"
-msgstr "%s："
-
-#: ../../addon/forumdirectory/forumdirectory.php:22
-msgid "Forum Directory"
-msgstr "评坛目录"
-
-#: ../../addon/forumdirectory/forumdirectory.php:53 ../../mod/search.php:89
-#: ../../mod/dfrn_request.php:761 ../../mod/directory.php:31
-#: ../../mod/display.php:19 ../../mod/viewcontacts.php:17
-#: ../../mod/community.php:18 ../../mod/photos.php:914
-msgid "Public access denied."
-msgstr "公众看拒绝"
-
-#: ../../addon/forumdirectory/forumdirectory.php:71 ../../mod/directory.php:49
-#: ../../view/theme/diabook/theme.php:518
-msgid "Global Directory"
-msgstr "综合目录"
-
-#: ../../addon/forumdirectory/forumdirectory.php:79 ../../mod/directory.php:57
-msgid "Find on this site"
-msgstr "找在这网站"
-
-#: ../../addon/forumdirectory/forumdirectory.php:81 ../../mod/contacts.php:612
-#: ../../mod/directory.php:59
-msgid "Finding: "
-msgstr "找着："
-
-#: ../../addon/forumdirectory/forumdirectory.php:82 ../../mod/directory.php:60
-msgid "Site Directory"
-msgstr "网站目录"
-
-#: ../../addon/forumdirectory/forumdirectory.php:83
-#: ../../include/contact_widgets.php:33 ../../mod/contacts.php:613
-#: ../../mod/directory.php:61
-msgid "Find"
-msgstr "搜索"
-
-#: ../../addon/forumdirectory/forumdirectory.php:133
-#: ../../mod/profiles.php:682 ../../mod/directory.php:111
-msgid "Age: "
-msgstr "年纪："
-
-#: ../../addon/forumdirectory/forumdirectory.php:136
-#: ../../mod/directory.php:114
-msgid "Gender: "
-msgstr "性别："
-
-#: ../../addon/forumdirectory/forumdirectory.php:156
-#: ../../include/bb2diaspora.php:415 ../../include/event.php:40
-#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1406
-msgid "Location:"
-msgstr "位置:"
-
-#: ../../addon/forumdirectory/forumdirectory.php:158
-#: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
-#: ../../boot.php:1408
-msgid "Gender:"
-msgstr "性别:"
-
-#: ../../addon/forumdirectory/forumdirectory.php:160
-#: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
-#: ../../boot.php:1411
-msgid "Status:"
-msgstr "现状:"
-
-#: ../../addon/forumdirectory/forumdirectory.php:162
-#: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
-#: ../../boot.php:1413
-msgid "Homepage:"
-msgstr "主页:"
-
-#: ../../addon/forumdirectory/forumdirectory.php:164
-#: ../../include/profile_advanced.php:58 ../../mod/directory.php:142
-msgid "About:"
-msgstr "关于："
-
-#: ../../addon/forumdirectory/forumdirectory.php:201
-#: ../../mod/directory.php:187
-msgid "No entries (some entries may be hidden)."
-msgstr "没有文章(有的文章会被隐藏)。"
-
-#: ../../addon/group_text/group_text.php:46
-msgid "Group Text settings updated."
-msgstr "组正文设置更新了。"
-
-#: ../../addon/remote_permissions/remote_permissions.php:45
-msgid "Remote Permissions Settings"
-msgstr "对外批准设置"
-
-#: ../../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:58
-msgid "Remote Permissions settings updated."
-msgstr "对外批准设置更新了。"
-
-#: ../../addon/remote_permissions/remote_permissions.php:124
-#: ../../mod/lockview.php:48
-msgid "Visible to:"
-msgstr "可见给："
-
-#: ../../addon/remote_permissions/remote_permissions.php:178
-msgid "Visible to"
-msgstr "可见的给"
-
-#: ../../addon/remote_permissions/remote_permissions.php:178
-msgid "may only be a partial list"
-msgstr "可能部分的单"
-
-#: ../../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:198
-msgid "Each user chooses whether his/her posts show the post recipients"
-msgstr "各用户选择他问上是否表示接受者"
-
-#: ../../addon/statusnet/statusnet.php:358
-msgid ""
-"Mirror all posts from statusnet that are no replies or repeated messages"
-msgstr "复制所有文章从statusnet除了回答或重复的通知以外"
-
-#: ../../addon/statusnet/statusnet.php:362
-msgid "Shortening method that optimizes the post"
-msgstr "缩短方法优化文章"
-
-#: ../../addon/tumblr/tumblr.php:144
-msgid "You are now authenticated to tumblr."
-msgstr "现在tumblr证明您是真的"
-
-#: ../../addon/tumblr/tumblr.php:145
-msgid "return to the connector page"
-msgstr "会连接器页"
-
-#: ../../addon/tumblr/tumblr.php:188
-msgid "(Re-)Authenticate your tumblr page"
-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 "tumblr没证明您是真的"
-
-#: ../../addon/twitter/twitter.php:213
-msgid "Mirror all posts from twitter that are no replies or retweets"
-msgstr "复制所有文章从twitter除了回答或复准文以外"
-
-#: ../../addon/twitter/twitter.php:217
-msgid "Shortening method that optimizes the tweet"
-msgstr "缩短方法优化缩短方法优化准文"
-
-#: ../../addon/twitter/twitter.php:560
-msgid "Name of the Twitter Application"
-msgstr "Twitter应用名"
-
-#: ../../addon/twitter/twitter.php:560
-msgid ""
-"set this to avoid mirroring postings from ~friendica back to ~friendica"
-msgstr "选择这个为避免复制文章从~friendica回归~friendica"
-
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
 #: ../../include/nav.php:77 ../../mod/profperm.php:103
 #: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88
-#: ../../boot.php:1868
+#: ../../boot.php:1945
 msgid "Profile"
 msgstr "简介"
 
-#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1050
+#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1079
 msgid "Full Name:"
 msgstr "全名："
 
+#: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
+#: ../../boot.php:1485
+msgid "Gender:"
+msgstr "性别:"
+
 #: ../../include/profile_advanced.php:22
 msgid "j F, Y"
 msgstr "j F, Y"
@@ -3315,16 +52,26 @@ msgstr "生日："
 msgid "Age:"
 msgstr "年纪："
 
+#: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
+#: ../../boot.php:1488
+msgid "Status:"
+msgstr "现状:"
+
 #: ../../include/profile_advanced.php:43
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "为%1$d %2$s"
 
-#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:646
+#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:650
 msgid "Sexual Preference:"
 msgstr "性取向"
 
-#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:648
+#: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
+#: ../../boot.php:1490
+msgid "Homepage:"
+msgstr "主页:"
+
+#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:652
 msgid "Hometown:"
 msgstr "故乡："
 
@@ -3332,7 +79,7 @@ msgstr "故乡："
 msgid "Tags:"
 msgstr "标签："
 
-#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:649
+#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:653
 msgid "Political Views:"
 msgstr "政治观念："
 
@@ -3340,15 +87,19 @@ msgstr "政治观念："
 msgid "Religion:"
 msgstr "宗教："
 
+#: ../../include/profile_advanced.php:58 ../../mod/directory.php:142
+msgid "About:"
+msgstr "关于："
+
 #: ../../include/profile_advanced.php:60
 msgid "Hobbies/Interests:"
 msgstr "爱好／兴趣"
 
-#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:653
+#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:657
 msgid "Likes:"
 msgstr "喜欢："
 
-#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:654
+#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:658
 msgid "Dislikes:"
 msgstr "不喜欢："
 
@@ -3652,260 +403,304 @@ msgstr "编辑熟人"
 msgid "Send PM"
 msgstr "法私人的新闻"
 
-#: ../../include/text.php:276
+#: ../../include/text.php:294
 msgid "prev"
 msgstr "上个"
 
-#: ../../include/text.php:278
+#: ../../include/text.php:296
 msgid "first"
 msgstr "首先"
 
-#: ../../include/text.php:307
+#: ../../include/text.php:325
 msgid "last"
 msgstr "最后"
 
-#: ../../include/text.php:310
+#: ../../include/text.php:328
 msgid "next"
 msgstr "下个"
 
-#: ../../include/text.php:328
+#: ../../include/text.php:352
 msgid "newer"
 msgstr "更新"
 
-#: ../../include/text.php:332
+#: ../../include/text.php:356
 msgid "older"
 msgstr "更旧"
 
-#: ../../include/text.php:697
+#: ../../include/text.php:807
 msgid "No contacts"
 msgstr "没有熟人"
 
-#: ../../include/text.php:706
+#: ../../include/text.php:816
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d熟人"
 
-#: ../../include/text.php:718 ../../mod/viewcontacts.php:76
+#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
 msgid "View Contacts"
 msgstr "看熟人"
 
-#: ../../include/text.php:778 ../../include/text.php:779
+#: ../../include/text.php:905 ../../include/text.php:906
 #: ../../include/nav.php:118 ../../mod/search.php:99
 msgid "Search"
 msgstr "搜索"
 
-#: ../../include/text.php:819
+#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
+msgid "Save"
+msgstr "保存"
+
+#: ../../include/text.php:957
 msgid "poke"
 msgstr "戳"
 
-#: ../../include/text.php:819 ../../include/conversation.php:211
+#: ../../include/text.php:957 ../../include/conversation.php:211
 msgid "poked"
 msgstr "戳了"
 
-#: ../../include/text.php:820
+#: ../../include/text.php:958
 msgid "ping"
 msgstr "砰"
 
-#: ../../include/text.php:820
+#: ../../include/text.php:958
 msgid "pinged"
 msgstr "砰了"
 
-#: ../../include/text.php:821
+#: ../../include/text.php:959
 msgid "prod"
 msgstr "柔戳"
 
-#: ../../include/text.php:821
+#: ../../include/text.php:959
 msgid "prodded"
 msgstr "柔戳了"
 
-#: ../../include/text.php:822
+#: ../../include/text.php:960
 msgid "slap"
 msgstr "掌击"
 
-#: ../../include/text.php:822
+#: ../../include/text.php:960
 msgid "slapped"
 msgstr "掌击了"
 
-#: ../../include/text.php:823
+#: ../../include/text.php:961
 msgid "finger"
 msgstr "指"
 
-#: ../../include/text.php:823
+#: ../../include/text.php:961
 msgid "fingered"
 msgstr "指了"
 
-#: ../../include/text.php:824
+#: ../../include/text.php:962
 msgid "rebuff"
 msgstr "窝脖儿"
 
-#: ../../include/text.php:824
+#: ../../include/text.php:962
 msgid "rebuffed"
 msgstr "窝脖儿了"
 
-#: ../../include/text.php:836
+#: ../../include/text.php:976
 msgid "happy"
 msgstr "开心"
 
-#: ../../include/text.php:837
+#: ../../include/text.php:977
 msgid "sad"
 msgstr "伤心"
 
-#: ../../include/text.php:838
+#: ../../include/text.php:978
 msgid "mellow"
 msgstr "轻松"
 
-#: ../../include/text.php:839
+#: ../../include/text.php:979
 msgid "tired"
 msgstr "累"
 
-#: ../../include/text.php:840
+#: ../../include/text.php:980
 msgid "perky"
 msgstr "机敏"
 
-#: ../../include/text.php:841
+#: ../../include/text.php:981
 msgid "angry"
 msgstr "生气"
 
-#: ../../include/text.php:842
+#: ../../include/text.php:982
 msgid "stupified"
 msgstr "麻醉"
 
-#: ../../include/text.php:843
+#: ../../include/text.php:983
 msgid "puzzled"
 msgstr "纳闷"
 
-#: ../../include/text.php:844
+#: ../../include/text.php:984
 msgid "interested"
 msgstr "有兴趣"
 
-#: ../../include/text.php:845
+#: ../../include/text.php:985
 msgid "bitter"
 msgstr "苦"
 
-#: ../../include/text.php:846
+#: ../../include/text.php:986
 msgid "cheerful"
 msgstr "快乐"
 
-#: ../../include/text.php:847
+#: ../../include/text.php:987
 msgid "alive"
 msgstr "活着"
 
-#: ../../include/text.php:848
+#: ../../include/text.php:988
 msgid "annoyed"
 msgstr "被烦恼"
 
-#: ../../include/text.php:849
+#: ../../include/text.php:989
 msgid "anxious"
 msgstr "心焦"
 
-#: ../../include/text.php:850
+#: ../../include/text.php:990
 msgid "cranky"
 msgstr "不稳"
 
-#: ../../include/text.php:851
+#: ../../include/text.php:991
 msgid "disturbed"
 msgstr "不安"
 
-#: ../../include/text.php:852
+#: ../../include/text.php:992
 msgid "frustrated"
 msgstr "被作梗"
 
-#: ../../include/text.php:853
+#: ../../include/text.php:993
 msgid "motivated"
 msgstr "士气高涨"
 
-#: ../../include/text.php:854
+#: ../../include/text.php:994
 msgid "relaxed"
 msgstr "轻松"
 
-#: ../../include/text.php:855
+#: ../../include/text.php:995
 msgid "surprised"
 msgstr "诧异"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1161
+msgid "Monday"
+msgstr "星期一"
+
+#: ../../include/text.php:1161
+msgid "Tuesday"
+msgstr "星期二"
+
+#: ../../include/text.php:1161
+msgid "Wednesday"
+msgstr "星期三"
+
+#: ../../include/text.php:1161
+msgid "Thursday"
+msgstr "星期四"
+
+#: ../../include/text.php:1161
+msgid "Friday"
+msgstr "星期五"
+
+#: ../../include/text.php:1161
+msgid "Saturday"
+msgstr "星期六"
+
+#: ../../include/text.php:1161
+msgid "Sunday"
+msgstr "星期天"
+
+#: ../../include/text.php:1165
 msgid "January"
 msgstr "一月"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1165
 msgid "February"
 msgstr "二月"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1165
 msgid "March"
 msgstr "三月"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1165
 msgid "April"
 msgstr "四月"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1165
 msgid "May"
 msgstr "五月"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1165
 msgid "June"
 msgstr "六月"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1165
 msgid "July"
 msgstr "七月"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1165
 msgid "August"
 msgstr "八月"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1165
 msgid "September"
 msgstr "九月"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1165
 msgid "October"
 msgstr "十月"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1165
 msgid "November"
 msgstr "十一月"
 
-#: ../../include/text.php:1019
+#: ../../include/text.php:1165
 msgid "December"
 msgstr "十二月"
 
-#: ../../include/text.php:1124
+#: ../../include/text.php:1322
 msgid "bytes"
 msgstr "字节"
 
-#: ../../include/text.php:1151 ../../include/text.php:1163
+#: ../../include/text.php:1349 ../../include/text.php:1361
 msgid "Click to open/close"
 msgstr "点击为开关"
 
-#: ../../include/text.php:1304 ../../mod/events.php:335
+#: ../../include/text.php:1523 ../../mod/events.php:335
 msgid "link to source"
 msgstr "链接到来源"
 
-#: ../../include/text.php:1336 ../../include/user.php:237
+#: ../../include/text.php:1566 ../../include/user.php:237
 msgid "default"
 msgstr "默认"
 
-#: ../../include/text.php:1348
+#: ../../include/text.php:1578
 msgid "Select an alternate language"
 msgstr "选择别的语言"
 
-#: ../../include/text.php:1558
+#: ../../include/text.php:1830 ../../include/conversation.php:118
+#: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
+msgid "event"
+msgstr "项目"
+
+#: ../../include/text.php:1832 ../../include/diaspora.php:1874
+#: ../../include/conversation.php:126 ../../include/conversation.php:254
+#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
+#: ../../view/theme/diabook/theme.php:464
+msgid "photo"
+msgstr "照片"
+
+#: ../../include/text.php:1834
 msgid "activity"
 msgstr "活动"
 
-#: ../../include/text.php:1560 ../../mod/content.php:628
-#: ../../object/Item.php:354 ../../object/Item.php:367
+#: ../../include/text.php:1836 ../../mod/content.php:628
+#: ../../object/Item.php:364 ../../object/Item.php:377
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "评论"
 
-#: ../../include/text.php:1561
+#: ../../include/text.php:1837
 msgid "post"
 msgstr "文章"
 
-#: ../../include/text.php:1716
+#: ../../include/text.php:1992
 msgid "Item filed"
 msgstr "把项目归档了"
 
@@ -3942,45 +737,6 @@ msgstr "我们用您输入的OpenID登录的时候碰到问题。请核实拼法
 msgid "The error message was:"
 msgstr "错误通知是："
 
-#: ../../include/uimport.php:61
-msgid "Error decoding account file"
-msgstr "解码账户文件出错误"
-
-#: ../../include/uimport.php:67
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "错误！文件没有版本数！这不是Friendica账户文件吗？"
-
-#: ../../include/uimport.php:72
-msgid "Error! I can't import this file: DB schema version is not compatible."
-msgstr "错误！我进口不了这个文件：数据库版本不相容的。"
-
-#: ../../include/uimport.php:81
-msgid "Error! Cannot check nickname"
-msgstr "错误！不能检查昵称"
-
-#: ../../include/uimport.php:85
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "用户「%s」已经存在这个服务器！"
-
-#: ../../include/uimport.php:104
-msgid "User creation error"
-msgstr "用户创造错误"
-
-#: ../../include/uimport.php:122
-msgid "User profile creation error"
-msgstr "用户简介创造错误"
-
-#: ../../include/uimport.php:167
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "%d熟人没进口了"
-
-#: ../../include/uimport.php:245
-msgid "Done. You can now login with your username and password"
-msgstr "完了。您现在会用您用户名和密码登录"
-
 #: ../../include/bb2diaspora.php:393 ../../include/event.php:11
 #: ../../mod/localtime.php:12
 msgid "l F d, Y \\@ g:i A"
@@ -3994,6 +750,11 @@ msgstr "开始："
 msgid "Finishes:"
 msgstr "结束："
 
+#: ../../include/bb2diaspora.php:415 ../../include/event.php:40
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1483
+msgid "Location:"
+msgstr "位置:"
+
 #: ../../include/follow.php:27 ../../mod/dfrn_request.php:502
 msgid "Disallowed profile URL."
 msgstr "不允许的简介地址."
@@ -4121,6 +882,16 @@ msgstr "报到出了问题。请再试。"
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "造成默认简介出了问题。请再试。"
 
+#: ../../include/user.php:325 ../../include/user.php:332
+#: ../../include/user.php:339 ../../mod/photos.php:154
+#: ../../mod/photos.php:725 ../../mod/photos.php:1183
+#: ../../mod/photos.php:1206 ../../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 ../../view/theme/diabook/theme.php:493
+msgid "Profile Photos"
+msgstr "简介照片"
+
 #: ../../include/contact_selectors.php:32
 msgid "Unknown | Not categorised"
 msgstr "未知的 ｜无分类"
@@ -4145,18 +916,30 @@ msgstr "行，大概无恶意的"
 msgid "Reputable, has my trust"
 msgstr "可信的，有我的信任"
 
-#: ../../include/contact_selectors.php:56
+#: ../../include/contact_selectors.php:56 ../../mod/admin.php:452
 msgid "Frequently"
 msgstr "时常"
 
-#: ../../include/contact_selectors.php:57
+#: ../../include/contact_selectors.php:57 ../../mod/admin.php:453
 msgid "Hourly"
 msgstr "每小时"
 
-#: ../../include/contact_selectors.php:58
+#: ../../include/contact_selectors.php:58 ../../mod/admin.php:454
 msgid "Twice daily"
 msgstr "每日两次"
 
+#: ../../include/contact_selectors.php:59 ../../mod/admin.php:455
+msgid "Daily"
+msgstr "每日"
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "每周"
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "每月"
+
 #: ../../include/contact_selectors.php:76 ../../mod/dfrn_request.php:840
 msgid "Friendica"
 msgstr "Friendica"
@@ -4170,16 +953,21 @@ msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:79
-#: ../../include/contact_selectors.php:86 ../../mod/admin.php:747
-#: ../../mod/admin.php:757
+#: ../../include/contact_selectors.php:86 ../../mod/admin.php:766
+#: ../../mod/admin.php:777
 msgid "Email"
 msgstr "电子邮件"
 
-#: ../../include/contact_selectors.php:80 ../../mod/settings.php:681
+#: ../../include/contact_selectors.php:80 ../../mod/settings.php:705
 #: ../../mod/dfrn_request.php:842
 msgid "Diaspora"
 msgstr "Diaspora"
 
+#: ../../include/contact_selectors.php:81 ../../mod/newmember.php:49
+#: ../../mod/newmember.php:51
+msgid "Facebook"
+msgstr "Facebook"
+
 #: ../../include/contact_selectors.php:82
 msgid "Zot!"
 msgstr "Zot!"
@@ -4213,7 +1001,7 @@ msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "比如：li@example.com, http://example.com/li"
 
 #: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
-#: ../../mod/match.php:58 ../../boot.php:1338
+#: ../../mod/match.php:58 ../../boot.php:1415
 msgid "Connect"
 msgstr "连接"
 
@@ -4239,6 +1027,11 @@ msgstr "连接/关注"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "比如：李某，打鱼"
 
+#: ../../include/contact_widgets.php:33 ../../mod/contacts.php:613
+#: ../../mod/directory.php:61
+msgid "Find"
+msgstr "搜索"
+
 #: ../../include/contact_widgets.php:34 ../../mod/suggest.php:66
 #: ../../view/theme/diabook/theme.php:520
 msgid "Friend Suggestions"
@@ -4282,6 +1075,11 @@ msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] "%d共同熟人"
 
+#: ../../include/contact_widgets.php:204 ../../mod/content.php:629
+#: ../../object/Item.php:365 ../../boot.php:669
+msgid "show more"
+msgstr "看多"
+
 #: ../../include/Scrape.php:583
 msgid " on Last.fm"
 msgstr "在Last.fm"
@@ -4305,6 +1103,10 @@ msgstr "$1写："
 msgid "Encrypted content"
 msgstr "加密的内容"
 
+#: ../../include/network.php:875
+msgid "view full size"
+msgstr "看全尺寸"
+
 #: ../../include/datetime.php:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
 msgstr "形形色色"
@@ -4329,10 +1131,26 @@ msgstr "从未"
 msgid "less than a second ago"
 msgstr "一秒以内"
 
+#: ../../include/datetime.php:285
+msgid "years"
+msgstr "年"
+
+#: ../../include/datetime.php:286
+msgid "months"
+msgstr "月"
+
 #: ../../include/datetime.php:287
 msgid "week"
 msgstr "星期"
 
+#: ../../include/datetime.php:287
+msgid "weeks"
+msgstr "星期"
+
+#: ../../include/datetime.php:288
+msgid "days"
+msgstr "天"
+
 #: ../../include/datetime.php:289
 msgid "hour"
 msgstr "小时"
@@ -4362,55 +1180,16 @@ msgstr "秒"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s以前"
 
-#: ../../include/datetime.php:472 ../../include/items.php:1764
+#: ../../include/datetime.php:472 ../../include/items.php:1813
 #, php-format
 msgid "%s's birthday"
 msgstr "%s的生日"
 
-#: ../../include/datetime.php:473 ../../include/items.php:1765
+#: ../../include/datetime.php:473 ../../include/items.php:1814
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "生日快乐%s"
 
-#: ../../include/items.php:3439 ../../mod/dfrn_request.php:716
-msgid "[Name Withheld]"
-msgstr "[名字拒给]"
-
-#: ../../include/items.php:3446
-msgid "A new person is sharing with you at "
-msgstr "一位新人给你分享在"
-
-#: ../../include/items.php:3446
-msgid "You have a new follower at "
-msgstr "你有新的关注者在"
-
-#: ../../include/items.php:3926 ../../mod/admin.php:158
-#: ../../mod/admin.php:789 ../../mod/admin.php:989 ../../mod/display.php:51
-#: ../../mod/display.php:184 ../../mod/viewsrc.php:15 ../../mod/notice.php:15
-msgid "Item not found."
-msgstr "项目找不到。"
-
-#: ../../include/items.php:3965
-msgid "Do you really want to delete this item?"
-msgstr "您真的想删除这个项目吗？"
-
-#: ../../include/items.php:3967 ../../mod/profiles.php:606
-#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
-#: ../../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/dfrn_request.php:836
-#: ../../mod/suggest.php:29 ../../mod/message.php:209
-msgid "Yes"
-msgstr "是"
-
-#: ../../include/items.php:4160
-msgid "Archives"
-msgstr "档案"
-
 #: ../../include/plugin.php:439 ../../include/plugin.php:441
 msgid "Click here to upgrade."
 msgstr "这里点击为更新。"
@@ -4427,6 +1206,11 @@ msgstr "这个行动在您的订阅不可用的。"
 msgid "(no subject)"
 msgstr "沒有题目"
 
+#: ../../include/delivery.php:468 ../../include/enotify.php:28
+#: ../../include/notifier.php:785
+msgid "noreply"
+msgstr "noreply"
+
 #: ../../include/diaspora.php:621 ../../include/conversation.php:172
 #: ../../mod/dfrn_confirm.php:477
 #, php-format
@@ -4437,195 +1221,98 @@ msgstr "%1$s是成为%2$s的朋友"
 msgid "Sharing notification from Diaspora network"
 msgstr "分享通知从Diaspora网络"
 
+#: ../../include/diaspora.php:1874 ../../include/conversation.php:121
+#: ../../include/conversation.php:130 ../../include/conversation.php:249
+#: ../../include/conversation.php:258 ../../mod/subthread.php:87
+#: ../../mod/tagger.php:62 ../../mod/like.php:151 ../../mod/like.php:322
+#: ../../view/theme/diabook/theme.php:459
+#: ../../view/theme/diabook/theme.php:468
+msgid "status"
+msgstr "现状"
+
+#: ../../include/diaspora.php:1890 ../../include/conversation.php:137
+#: ../../mod/like.php:168 ../../view/theme/diabook/theme.php:473
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s喜欢%2$s的%3$s"
+
 #: ../../include/diaspora.php:2262
 msgid "Attachments:"
 msgstr "附件："
 
-#: ../../include/enotify.php:16
-msgid "Friendica Notification"
-msgstr "Friendica 通知"
+#: ../../include/items.php:3488 ../../mod/dfrn_request.php:716
+msgid "[Name Withheld]"
+msgstr "[名字拒给]"
 
-#: ../../include/enotify.php:19
-msgid "Thank You,"
-msgstr "谢谢，"
+#: ../../include/items.php:3495
+msgid "A new person is sharing with you at "
+msgstr "一位新人给你分享在"
 
-#: ../../include/enotify.php:21
-#, php-format
-msgid "%s Administrator"
-msgstr "%s管理员"
+#: ../../include/items.php:3495
+msgid "You have a new follower at "
+msgstr "你有新的关注者在"
 
-#: ../../include/enotify.php:40
-#, php-format
-msgid "%s <!item_type!>"
-msgstr "%s <!item_type!>"
+#: ../../include/items.php:3979 ../../mod/display.php:51
+#: ../../mod/display.php:246 ../../mod/admin.php:158 ../../mod/admin.php:809
+#: ../../mod/admin.php:1009 ../../mod/viewsrc.php:15 ../../mod/notice.php:15
+msgid "Item not found."
+msgstr "项目找不到。"
 
-#: ../../include/enotify.php:44
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
-msgstr "[Friendica:Notify]收到新邮件在%s"
+#: ../../include/items.php:4018
+msgid "Do you really want to delete this item?"
+msgstr "您真的想删除这个项目吗？"
 
-#: ../../include/enotify.php:46
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$s发给您新私人通知在%2$s."
+#: ../../include/items.php:4020 ../../mod/profiles.php:610
+#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
+#: ../../mod/settings.php:961 ../../mod/settings.php:967
+#: ../../mod/settings.php:975 ../../mod/settings.php:979
+#: ../../mod/settings.php:984 ../../mod/settings.php:990
+#: ../../mod/settings.php:996 ../../mod/settings.php:1002
+#: ../../mod/settings.php:1032 ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034 ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036 ../../mod/dfrn_request.php:836
+#: ../../mod/suggest.php:29 ../../mod/message.php:209
+msgid "Yes"
+msgstr "是"
 
-#: ../../include/enotify.php:47
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s发给您%2$s."
+#: ../../include/items.php:4023 ../../include/conversation.php:1080
+#: ../../mod/contacts.php:249 ../../mod/settings.php:585
+#: ../../mod/settings.php:611 ../../mod/dfrn_request.php:848
+#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
+#: ../../mod/photos.php:202 ../../mod/photos.php:290
+msgid "Cancel"
+msgstr "退消"
 
-#: ../../include/enotify.php:47
-msgid "a private message"
-msgstr "一条私人的消息"
+#: ../../include/items.php:4143 ../../mod/profiles.php:146
+#: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/display.php:242
+#: ../../mod/nogroup.php:25 ../../mod/item.php:140 ../../mod/item.php:156
+#: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
+#: ../../mod/contacts.php:147 ../../mod/settings.php:91
+#: ../../mod/settings.php:566 ../../mod/settings.php:571
+#: ../../mod/crepair.php:115 ../../mod/delegate.php:6 ../../mod/poke.php:135
+#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
+#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
+#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
+#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
+#: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
+#: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/manage.php:96
+#: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
+#: ../../mod/network.php:6 ../../mod/notifications.php:66
+#: ../../mod/photos.php:133 ../../mod/photos.php:1044
+#: ../../mod/install.php:151 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:169 ../../mod/profile_photo.php:180
+#: ../../mod/profile_photo.php:193 ../../index.php:346
+msgid "Permission denied."
+msgstr "权限不够。"
 
-#: ../../include/enotify.php:48
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "清去%s为了看或回答你私人的消息"
-
-#: ../../include/enotify.php:90
-#, php-format
-msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
-msgstr "%1$s于[url=%2$s]a %3$s[/url]评论了"
-
-#: ../../include/enotify.php:97
-#, php-format
-msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
-msgstr "%1$s于[url=%2$s]%3$s的%4$s[/url]评论了"
-
-#: ../../include/enotify.php:105
-#, php-format
-msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
-msgstr "%1$s于[url=%2$s]您的%3$s[/url]评论了"
-
-#: ../../include/enotify.php:115
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Friendica:Notify]于交流#%1$d由%2$s评论"
-
-#: ../../include/enotify.php:116
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "%s对你有兴趣的项目／ 交谈发表意见"
-
-#: ../../include/enotify.php:119 ../../include/enotify.php:134
-#: ../../include/enotify.php:147 ../../include/enotify.php:165
-#: ../../include/enotify.php:178
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "清去%s为了看或回答交谈"
-
-#: ../../include/enotify.php:126
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr "[Friendica:Notify] %s贴在您的简介墙"
-
-#: ../../include/enotify.php:128
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "%1$s放在您的简介墙在%2$s"
-
-#: ../../include/enotify.php:130
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr "%1$s放在[url=%2$s]您的墙[/url]"
-
-#: ../../include/enotify.php:141
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
-msgstr "[Friendica:Notify] %s标签您"
-
-#: ../../include/enotify.php:142
-#, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr "%1$s把您在%2$s标签"
-
-#: ../../include/enotify.php:143
-#, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
-msgstr "%1$s[url=%2$s]把您标签[/url]."
-
-#: ../../include/enotify.php:155
-#, php-format
-msgid "[Friendica:Notify] %1$s poked you"
-msgstr "[Friendica:Notify]您被%1$s戳"
-
-#: ../../include/enotify.php:156
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "您被%1$s戳在%2$s"
-
-#: ../../include/enotify.php:157
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr "%1$s[url=%2$s]把您戳[/url]。"
-
-#: ../../include/enotify.php:172
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
-msgstr "[Friendica:Notify] %s标前您的文章"
-
-#: ../../include/enotify.php:173
-#, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr "%1$s把您的文章在%2$s标签"
-
-#: ../../include/enotify.php:174
-#, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
-msgstr "%1$s把[url=%2$s]您的文章[/url]标签"
-
-#: ../../include/enotify.php:185
-msgid "[Friendica:Notify] Introduction received"
-msgstr "[Friendica:Notify] 收到介绍"
-
-#: ../../include/enotify.php:186
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr "您从「%1$s」受到一个介绍在%2$s"
-
-#: ../../include/enotify.php:187
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
-msgstr "您从%2$s收到[url=%1$s]一个介绍[/url]。"
-
-#: ../../include/enotify.php:190 ../../include/enotify.php:208
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "你能看他的简介在%s"
-
-#: ../../include/enotify.php:192
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr "请批准或拒绝介绍在%s"
-
-#: ../../include/enotify.php:199
-msgid "[Friendica:Notify] Friend suggestion received"
-msgstr "[Friendica:Notify] 收到朋友建议"
-
-#: ../../include/enotify.php:200
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "您从「%2$s」收到[url=%1$s]一个朋友建议[/url]。"
-
-#: ../../include/enotify.php:201
-#, php-format
-msgid ""
-"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
-msgstr "您从%2$s收到[url=%1$s]一个朋友建议[/url]为%2$s。"
-
-#: ../../include/enotify.php:206
-msgid "Name:"
-msgstr "名字："
-
-#: ../../include/enotify.php:207
-msgid "Photo:"
-msgstr "照片："
-
-#: ../../include/enotify.php:210
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "请批准或拒绝建议在%s"
+#: ../../include/items.php:4213
+msgid "Archives"
+msgstr "档案"
 
 #: ../../include/features.php:23
 msgid "General Features"
@@ -4854,34 +1541,34 @@ msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s标注%2$s的%3$s为偏爱"
 
 #: ../../include/conversation.php:587 ../../mod/content.php:461
-#: ../../mod/content.php:763 ../../object/Item.php:119
+#: ../../mod/content.php:763 ../../object/Item.php:126
 msgid "Select"
 msgstr "选择"
 
-#: ../../include/conversation.php:588 ../../mod/admin.php:751
-#: ../../mod/settings.php:623 ../../mod/group.php:171
+#: ../../include/conversation.php:588 ../../mod/admin.php:770
+#: ../../mod/settings.php:647 ../../mod/group.php:171
 #: ../../mod/photos.php:1637 ../../mod/content.php:462
-#: ../../mod/content.php:764 ../../object/Item.php:120
+#: ../../mod/content.php:764 ../../object/Item.php:127
 msgid "Delete"
 msgstr "删除"
 
 #: ../../include/conversation.php:627 ../../mod/content.php:495
 #: ../../mod/content.php:875 ../../mod/content.php:876
-#: ../../object/Item.php:297 ../../object/Item.php:298
+#: ../../object/Item.php:306 ../../object/Item.php:307
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "看%s的简介@ %s"
 
-#: ../../include/conversation.php:639 ../../object/Item.php:288
+#: ../../include/conversation.php:639 ../../object/Item.php:297
 msgid "Categories:"
 msgstr "种类："
 
-#: ../../include/conversation.php:640 ../../object/Item.php:289
+#: ../../include/conversation.php:640 ../../object/Item.php:298
 msgid "Filed under:"
 msgstr "归档在："
 
 #: ../../include/conversation.php:647 ../../mod/content.php:505
-#: ../../mod/content.php:887 ../../object/Item.php:311
+#: ../../mod/content.php:887 ../../object/Item.php:320
 #, php-format
 msgid "%s from %s"
 msgstr "%s从%s"
@@ -4894,7 +1581,7 @@ msgstr "看在上下文"
 #: ../../mod/editpost.php:124 ../../mod/wallmessage.php:156
 #: ../../mod/message.php:334 ../../mod/message.php:565
 #: ../../mod/photos.php:1532 ../../mod/content.php:522
-#: ../../mod/content.php:906 ../../object/Item.php:332
+#: ../../mod/content.php:906 ../../object/Item.php:341
 msgid "Please wait"
 msgstr "请等一下"
 
@@ -5084,7 +1771,7 @@ msgstr "比如: li@example.com, wang@example.com"
 #: ../../include/conversation.php:1077 ../../mod/editpost.php:145
 #: ../../mod/photos.php:1553 ../../mod/photos.php:1597
 #: ../../mod/photos.php:1680 ../../mod/content.php:742
-#: ../../object/Item.php:652
+#: ../../object/Item.php:662
 msgid "Preview"
 msgstr "预演"
 
@@ -5100,6 +1787,192 @@ msgstr "发到熟人"
 msgid "Private post"
 msgstr "私人文章"
 
+#: ../../include/enotify.php:16
+msgid "Friendica Notification"
+msgstr "Friendica 通知"
+
+#: ../../include/enotify.php:19
+msgid "Thank You,"
+msgstr "谢谢，"
+
+#: ../../include/enotify.php:21
+#, php-format
+msgid "%s Administrator"
+msgstr "%s管理员"
+
+#: ../../include/enotify.php:40
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
+
+#: ../../include/enotify.php:44
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr "[Friendica:Notify]收到新邮件在%s"
+
+#: ../../include/enotify.php:46
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
+msgstr "%1$s发给您新私人通知在%2$s."
+
+#: ../../include/enotify.php:47
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s发给您%2$s."
+
+#: ../../include/enotify.php:47
+msgid "a private message"
+msgstr "一条私人的消息"
+
+#: ../../include/enotify.php:48
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "清去%s为了看或回答你私人的消息"
+
+#: ../../include/enotify.php:90
+#, php-format
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
+msgstr "%1$s于[url=%2$s]a %3$s[/url]评论了"
+
+#: ../../include/enotify.php:97
+#, php-format
+msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
+msgstr "%1$s于[url=%2$s]%3$s的%4$s[/url]评论了"
+
+#: ../../include/enotify.php:105
+#, php-format
+msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
+msgstr "%1$s于[url=%2$s]您的%3$s[/url]评论了"
+
+#: ../../include/enotify.php:115
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Friendica:Notify]于交流#%1$d由%2$s评论"
+
+#: ../../include/enotify.php:116
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s对你有兴趣的项目／ 交谈发表意见"
+
+#: ../../include/enotify.php:119 ../../include/enotify.php:134
+#: ../../include/enotify.php:147 ../../include/enotify.php:165
+#: ../../include/enotify.php:178
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "清去%s为了看或回答交谈"
+
+#: ../../include/enotify.php:126
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica:Notify] %s贴在您的简介墙"
+
+#: ../../include/enotify.php:128
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$s放在您的简介墙在%2$s"
+
+#: ../../include/enotify.php:130
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr "%1$s放在[url=%2$s]您的墙[/url]"
+
+#: ../../include/enotify.php:141
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr "[Friendica:Notify] %s标签您"
+
+#: ../../include/enotify.php:142
+#, php-format
+msgid "%1$s tagged you at %2$s"
+msgstr "%1$s把您在%2$s标签"
+
+#: ../../include/enotify.php:143
+#, php-format
+msgid "%1$s [url=%2$s]tagged you[/url]."
+msgstr "%1$s[url=%2$s]把您标签[/url]."
+
+#: ../../include/enotify.php:155
+#, php-format
+msgid "[Friendica:Notify] %1$s poked you"
+msgstr "[Friendica:Notify]您被%1$s戳"
+
+#: ../../include/enotify.php:156
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr "您被%1$s戳在%2$s"
+
+#: ../../include/enotify.php:157
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr "%1$s[url=%2$s]把您戳[/url]。"
+
+#: ../../include/enotify.php:172
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr "[Friendica:Notify] %s标前您的文章"
+
+#: ../../include/enotify.php:173
+#, php-format
+msgid "%1$s tagged your post at %2$s"
+msgstr "%1$s把您的文章在%2$s标签"
+
+#: ../../include/enotify.php:174
+#, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
+msgstr "%1$s把[url=%2$s]您的文章[/url]标签"
+
+#: ../../include/enotify.php:185
+msgid "[Friendica:Notify] Introduction received"
+msgstr "[Friendica:Notify] 收到介绍"
+
+#: ../../include/enotify.php:186
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr "您从「%1$s」受到一个介绍在%2$s"
+
+#: ../../include/enotify.php:187
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr "您从%2$s收到[url=%1$s]一个介绍[/url]。"
+
+#: ../../include/enotify.php:190 ../../include/enotify.php:208
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "你能看他的简介在%s"
+
+#: ../../include/enotify.php:192
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "请批准或拒绝介绍在%s"
+
+#: ../../include/enotify.php:199
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr "[Friendica:Notify] 收到朋友建议"
+
+#: ../../include/enotify.php:200
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr "您从「%2$s」收到[url=%1$s]一个朋友建议[/url]。"
+
+#: ../../include/enotify.php:201
+#, php-format
+msgid ""
+"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr "您从%3$s收到[url=%1$s]一个朋友建议[/url]为%2$s。"
+
+#: ../../include/enotify.php:206
+msgid "Name:"
+msgstr "名字："
+
+#: ../../include/enotify.php:207
+msgid "Photo:"
+msgstr "照片："
+
+#: ../../include/enotify.php:210
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "请批准或拒绝建议在%s"
+
 #: ../../include/message.php:15 ../../include/message.php:172
 msgid "[no subject]"
 msgstr "[无题目]"
@@ -5118,7 +1991,7 @@ msgstr "这里没有什么新的"
 msgid "Clear notifications"
 msgstr "清理出通知"
 
-#: ../../include/nav.php:73 ../../boot.php:1057
+#: ../../include/nav.php:73 ../../boot.php:1134
 msgid "Logout"
 msgstr "注销"
 
@@ -5126,7 +1999,7 @@ msgstr "注销"
 msgid "End this session"
 msgstr "结束这段时间"
 
-#: ../../include/nav.php:76 ../../boot.php:1861
+#: ../../include/nav.php:76 ../../boot.php:1938
 msgid "Status"
 msgstr "现状"
 
@@ -5140,7 +2013,7 @@ msgid "Your profile page"
 msgstr "你的简介页"
 
 #: ../../include/nav.php:78 ../../mod/fbrowser.php:25
-#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1875
+#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1952
 msgid "Photos"
 msgstr "照片"
 
@@ -5149,7 +2022,7 @@ msgid "Your photos"
 msgstr "你的照片"
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1885
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1962
 msgid "Events"
 msgstr "事件"
 
@@ -5165,6 +2038,10 @@ msgstr "私人的便条"
 msgid "Your personal photos"
 msgstr "你私人的照片"
 
+#: ../../include/nav.php:91 ../../boot.php:1135
+msgid "Login"
+msgstr "登录"
+
 #: ../../include/nav.php:91
 msgid "Sign in"
 msgstr "登记"
@@ -5178,7 +2055,7 @@ msgstr "主页"
 msgid "Home Page"
 msgstr "主页"
 
-#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1033
+#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1110
 msgid "Register"
 msgstr "注册"
 
@@ -5186,6 +2063,10 @@ msgstr "注册"
 msgid "Create an account"
 msgstr "注册"
 
+#: ../../include/nav.php:113 ../../mod/help.php:84
+msgid "Help"
+msgstr "帮助"
+
 #: ../../include/nav.php:113
 msgid "Help and documentation"
 msgstr "帮助证件"
@@ -5292,11 +2173,18 @@ msgstr "代表"
 msgid "Delegate Page Management"
 msgstr "页代表管理"
 
+#: ../../include/nav.php:167 ../../mod/admin.php:861 ../../mod/admin.php:1069
+#: ../../mod/settings.php:74 ../../mod/uexport.php:48
+#: ../../mod/newmember.php:22 ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:658
+msgid "Settings"
+msgstr "配置"
+
 #: ../../include/nav.php:167 ../../mod/settings.php:30 ../../mod/uexport.php:9
 msgid "Account settings"
 msgstr "帐户配置"
 
-#: ../../include/nav.php:169 ../../boot.php:1360
+#: ../../include/nav.php:169 ../../boot.php:1437
 msgid "Profiles"
 msgstr "简介"
 
@@ -5329,10 +2217,6 @@ msgstr "航行"
 msgid "Site map"
 msgstr "网站地图"
 
-#: ../../include/network.php:875
-msgid "view full size"
-msgstr "看全尺寸"
-
 #: ../../include/oembed.php:138
 msgid "Embedded content"
 msgstr "嵌入内容"
@@ -5341,6 +2225,41 @@ msgstr "嵌入内容"
 msgid "Embedding disabled"
 msgstr "嵌入不能用"
 
+#: ../../include/uimport.php:94
+msgid "Error decoding account file"
+msgstr "解码账户文件出错误"
+
+#: ../../include/uimport.php:100
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "错误！文件没有版本数！这不是Friendica账户文件吗？"
+
+#: ../../include/uimport.php:116
+msgid "Error! Cannot check nickname"
+msgstr "错误！不能检查昵称"
+
+#: ../../include/uimport.php:120
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "用户「%s」已经存在这个服务器！"
+
+#: ../../include/uimport.php:139
+msgid "User creation error"
+msgstr "用户创造错误"
+
+#: ../../include/uimport.php:157
+msgid "User profile creation error"
+msgstr "用户简介创造错误"
+
+#: ../../include/uimport.php:202
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d熟人没进口了"
+
+#: ../../include/uimport.php:272
+msgid "Done. You can now login with your username and password"
+msgstr "完了。您现在会用您用户名和密码登录"
+
 #: ../../include/security.php:22
 msgid "Welcome "
 msgstr "欢迎"
@@ -5360,7 +2279,7 @@ msgid ""
 msgstr "表格安全令牌不对。最可能因为表格开着太久（三个小时以上）提交前。"
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:133
-#: ../../mod/profiles.php:160 ../../mod/profiles.php:579
+#: ../../mod/profiles.php:160 ../../mod/profiles.php:583
 #: ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr "找不到简介。"
@@ -5433,228 +2352,257 @@ msgstr "兴趣"
 msgid "Address"
 msgstr "地址"
 
+#: ../../mod/profiles.php:367
+msgid "Location"
+msgstr "位置"
+
 #: ../../mod/profiles.php:450
 msgid "Profile updated."
 msgstr "简介更新了。"
 
-#: ../../mod/profiles.php:517
+#: ../../mod/profiles.php:521
 msgid " and "
 msgstr "和"
 
-#: ../../mod/profiles.php:525
+#: ../../mod/profiles.php:529
 msgid "public profile"
 msgstr "公开简介"
 
-#: ../../mod/profiles.php:528
+#: ../../mod/profiles.php:532
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr "%1$s把%2$s变化成&ldquo;%3$s&rdquo;"
 
-#: ../../mod/profiles.php:529
+#: ../../mod/profiles.php:533
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr " - 看 %1$s的%2$s"
 
-#: ../../mod/profiles.php:532
+#: ../../mod/profiles.php:536
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s有更新的%2$s，修改%3$s."
 
-#: ../../mod/profiles.php:605
+#: ../../mod/profiles.php:609
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "藏起来发现您的熟人／朋友单不让这个简介看着看？"
 
-#: ../../mod/profiles.php:607 ../../mod/api.php:106 ../../mod/register.php:240
-#: ../../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/dfrn_request.php:837
+#: ../../mod/profiles.php:611 ../../mod/api.php:106 ../../mod/register.php:240
+#: ../../mod/settings.php:961 ../../mod/settings.php:967
+#: ../../mod/settings.php:975 ../../mod/settings.php:979
+#: ../../mod/settings.php:984 ../../mod/settings.php:990
+#: ../../mod/settings.php:996 ../../mod/settings.php:1002
+#: ../../mod/settings.php:1032 ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034 ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036 ../../mod/dfrn_request.php:837
 msgid "No"
 msgstr "否"
 
-#: ../../mod/profiles.php:625
+#: ../../mod/profiles.php:629
 msgid "Edit Profile Details"
 msgstr "剪辑简介消息"
 
-#: ../../mod/profiles.php:627
+#: ../../mod/profiles.php:630 ../../mod/admin.php:491 ../../mod/admin.php:763
+#: ../../mod/admin.php:902 ../../mod/admin.php:1102 ../../mod/admin.php:1189
+#: ../../mod/contacts.php:386 ../../mod/settings.php:584
+#: ../../mod/settings.php:694 ../../mod/settings.php:763
+#: ../../mod/settings.php:837 ../../mod/settings.php:1064
+#: ../../mod/crepair.php:166 ../../mod/poke.php:199 ../../mod/events.php:478
+#: ../../mod/fsuggest.php:107 ../../mod/group.php:87 ../../mod/invite.php:140
+#: ../../mod/localtime.php:45 ../../mod/manage.php:110
+#: ../../mod/message.php:335 ../../mod/message.php:564 ../../mod/mood.php:137
+#: ../../mod/photos.php:1078 ../../mod/photos.php:1199
+#: ../../mod/photos.php:1501 ../../mod/photos.php:1552
+#: ../../mod/photos.php:1596 ../../mod/photos.php:1679
+#: ../../mod/install.php:248 ../../mod/install.php:286
+#: ../../mod/content.php:733 ../../object/Item.php:653
+#: ../../view/theme/cleanzero/config.php:80
+#: ../../view/theme/diabook/config.php:152
+#: ../../view/theme/diabook/theme.php:642 ../../view/theme/dispy/config.php:70
+#: ../../view/theme/quattro/config.php:64
+msgid "Submit"
+msgstr "提交"
+
+#: ../../mod/profiles.php:631
 msgid "Change Profile Photo"
 msgstr "改变简介照片"
 
-#: ../../mod/profiles.php:628
+#: ../../mod/profiles.php:632
 msgid "View this profile"
 msgstr "看这个简介"
 
-#: ../../mod/profiles.php:629
+#: ../../mod/profiles.php:633
 msgid "Create a new profile using these settings"
 msgstr "造成新的简介用这些设置"
 
-#: ../../mod/profiles.php:630
+#: ../../mod/profiles.php:634
 msgid "Clone this profile"
 msgstr "复制这个简介"
 
-#: ../../mod/profiles.php:631
+#: ../../mod/profiles.php:635
 msgid "Delete this profile"
 msgstr "删除这个简介"
 
-#: ../../mod/profiles.php:632
+#: ../../mod/profiles.php:636
 msgid "Profile Name:"
 msgstr "简介名："
 
-#: ../../mod/profiles.php:633
+#: ../../mod/profiles.php:637
 msgid "Your Full Name:"
 msgstr "你的全名："
 
-#: ../../mod/profiles.php:634
+#: ../../mod/profiles.php:638
 msgid "Title/Description:"
 msgstr "标题／描述："
 
-#: ../../mod/profiles.php:635
+#: ../../mod/profiles.php:639
 msgid "Your Gender:"
 msgstr "你的性："
 
-#: ../../mod/profiles.php:636
+#: ../../mod/profiles.php:640
 #, php-format
 msgid "Birthday (%s):"
 msgstr "生日(%s):"
 
-#: ../../mod/profiles.php:637
+#: ../../mod/profiles.php:641
 msgid "Street Address:"
 msgstr "地址："
 
-#: ../../mod/profiles.php:638
+#: ../../mod/profiles.php:642
 msgid "Locality/City:"
 msgstr "现场／城市："
 
-#: ../../mod/profiles.php:639
+#: ../../mod/profiles.php:643
 msgid "Postal/Zip Code:"
 msgstr "邮政编码："
 
-#: ../../mod/profiles.php:640
+#: ../../mod/profiles.php:644
 msgid "Country:"
 msgstr "国家："
 
-#: ../../mod/profiles.php:641
+#: ../../mod/profiles.php:645
 msgid "Region/State:"
 msgstr "区域／省"
 
-#: ../../mod/profiles.php:642
+#: ../../mod/profiles.php:646
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span>婚姻状况："
 
-#: ../../mod/profiles.php:643
+#: ../../mod/profiles.php:647
 msgid "Who: (if applicable)"
 msgstr "谁：（要是使用）"
 
-#: ../../mod/profiles.php:644
+#: ../../mod/profiles.php:648
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "比如：limou，李某，limou＠example。com"
 
-#: ../../mod/profiles.php:645
+#: ../../mod/profiles.php:649
 msgid "Since [date]:"
 msgstr "追溯［日期］："
 
-#: ../../mod/profiles.php:647
+#: ../../mod/profiles.php:651
 msgid "Homepage URL:"
 msgstr "主页URL："
 
-#: ../../mod/profiles.php:650
+#: ../../mod/profiles.php:654
 msgid "Religious Views:"
 msgstr " 宗教信仰 ："
 
-#: ../../mod/profiles.php:651
+#: ../../mod/profiles.php:655
 msgid "Public Keywords:"
 msgstr "公开关键字 ："
 
-#: ../../mod/profiles.php:652
+#: ../../mod/profiles.php:656
 msgid "Private Keywords:"
 msgstr "私人关键字"
 
-#: ../../mod/profiles.php:655
+#: ../../mod/profiles.php:659
 msgid "Example: fishing photography software"
 msgstr "例如：钓鱼 照片 软件"
 
-#: ../../mod/profiles.php:656
+#: ../../mod/profiles.php:660
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(用于建议可能的朋友们，会被别人看)"
 
-#: ../../mod/profiles.php:657
+#: ../../mod/profiles.php:661
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(用于搜索简介，没有给别人看)"
 
-#: ../../mod/profiles.php:658
+#: ../../mod/profiles.php:662
 msgid "Tell us about yourself..."
 msgstr "给我们自我介绍..."
 
-#: ../../mod/profiles.php:659
+#: ../../mod/profiles.php:663
 msgid "Hobbies/Interests"
 msgstr "爱好／兴趣"
 
-#: ../../mod/profiles.php:660
+#: ../../mod/profiles.php:664
 msgid "Contact information and Social Networks"
 msgstr "熟人信息和社会化网络"
 
-#: ../../mod/profiles.php:661
+#: ../../mod/profiles.php:665
 msgid "Musical interests"
 msgstr "音乐兴趣"
 
-#: ../../mod/profiles.php:662
+#: ../../mod/profiles.php:666
 msgid "Books, literature"
 msgstr "书，文学"
 
-#: ../../mod/profiles.php:663
+#: ../../mod/profiles.php:667
 msgid "Television"
 msgstr "电视"
 
-#: ../../mod/profiles.php:664
+#: ../../mod/profiles.php:668
 msgid "Film/dance/culture/entertainment"
 msgstr "电影／跳舞／文化／娱乐"
 
-#: ../../mod/profiles.php:665
+#: ../../mod/profiles.php:669
 msgid "Love/romance"
 msgstr "爱情／浪漫"
 
-#: ../../mod/profiles.php:666
+#: ../../mod/profiles.php:670
 msgid "Work/employment"
 msgstr "工作"
 
-#: ../../mod/profiles.php:667
+#: ../../mod/profiles.php:671
 msgid "School/education"
 msgstr "学院／教育"
 
-#: ../../mod/profiles.php:672
+#: ../../mod/profiles.php:676
 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:721
+#: ../../mod/profiles.php:686 ../../mod/directory.php:111
+msgid "Age: "
+msgstr "年纪："
+
+#: ../../mod/profiles.php:725
 msgid "Edit/Manage Profiles"
 msgstr "编辑／管理简介"
 
-#: ../../mod/profiles.php:722 ../../boot.php:1366 ../../boot.php:1392
+#: ../../mod/profiles.php:726 ../../boot.php:1443 ../../boot.php:1469
 msgid "Change profile photo"
 msgstr "换简介照片"
 
-#: ../../mod/profiles.php:723 ../../boot.php:1367
+#: ../../mod/profiles.php:727 ../../boot.php:1444
 msgid "Create New Profile"
 msgstr "创造新的简介"
 
-#: ../../mod/profiles.php:734 ../../boot.php:1377
+#: ../../mod/profiles.php:738 ../../boot.php:1454
 msgid "Profile Image"
 msgstr "简介图像"
 
-#: ../../mod/profiles.php:736 ../../boot.php:1380
+#: ../../mod/profiles.php:740 ../../boot.php:1457
 msgid "visible to everybody"
 msgstr "给打假可见的"
 
-#: ../../mod/profiles.php:737 ../../boot.php:1381
+#: ../../mod/profiles.php:741 ../../boot.php:1458
 msgid "Edit visibility"
 msgstr "修改能见度"
 
-#: ../../mod/profperm.php:19 ../../mod/group.php:72 ../../index.php:340
+#: ../../mod/profperm.php:19 ../../mod/group.php:72 ../../index.php:345
 msgid "Permission denied"
 msgstr "权限不够"
 
@@ -5678,10 +2626,25 @@ msgstr "能见被"
 msgid "All Contacts (with secure profile access)"
 msgstr "所有熟人(跟安全地简介使用权)"
 
-#: ../../mod/notes.php:44 ../../boot.php:1892
+#: ../../mod/notes.php:44 ../../boot.php:1969
 msgid "Personal Notes"
 msgstr "私人便条"
 
+#: ../../mod/display.php:19 ../../mod/search.php:89
+#: ../../mod/dfrn_request.php:761 ../../mod/directory.php:31
+#: ../../mod/viewcontacts.php:17 ../../mod/photos.php:914
+#: ../../mod/community.php:18
+msgid "Public access denied."
+msgstr "公众看拒绝"
+
+#: ../../mod/display.php:99 ../../mod/profile.php:155
+msgid "Access to this profile has been restricted."
+msgstr "使用权这个简介被限制了."
+
+#: ../../mod/display.php:239
+msgid "Item has been removed."
+msgstr "项目被删除了。"
+
 #: ../../mod/nogroup.php:40 ../../mod/contacts.php:395
 #: ../../mod/contacts.php:585 ../../mod/viewcontacts.php:62
 #, php-format
@@ -5745,19 +2708,19 @@ msgstr "{0}提到您在文章"
 msgid "Theme settings updated."
 msgstr "主题设置更新了。"
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:474
+#: ../../mod/admin.php:96 ../../mod/admin.php:490
 msgid "Site"
 msgstr "网站"
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:743 ../../mod/admin.php:756
+#: ../../mod/admin.php:97 ../../mod/admin.php:762 ../../mod/admin.php:776
 msgid "Users"
 msgstr "用户"
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:839 ../../mod/admin.php:881
+#: ../../mod/admin.php:98 ../../mod/admin.php:859 ../../mod/admin.php:901
 msgid "Plugins"
 msgstr "插件"
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:1047 ../../mod/admin.php:1081
+#: ../../mod/admin.php:99 ../../mod/admin.php:1067 ../../mod/admin.php:1101
 msgid "Themes"
 msgstr "主题"
 
@@ -5765,7 +2728,7 @@ msgstr "主题"
 msgid "DB updates"
 msgstr "数据库更新"
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1168
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1188
 msgid "Logs"
 msgstr "记录"
 
@@ -5777,19 +2740,19 @@ msgstr "插件特点"
 msgid "User registrations waiting for confirmation"
 msgstr "用户注册等确认"
 
-#: ../../mod/admin.php:182 ../../mod/admin.php:714
+#: ../../mod/admin.php:182 ../../mod/admin.php:733
 msgid "Normal Account"
 msgstr "正常帐户"
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:715
+#: ../../mod/admin.php:183 ../../mod/admin.php:734
 msgid "Soapbox Account"
 msgstr "演讲台帐户"
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:716
+#: ../../mod/admin.php:184 ../../mod/admin.php:735
 msgid "Community/Celebrity Account"
 msgstr "社会／名人帐户"
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:717
+#: ../../mod/admin.php:185 ../../mod/admin.php:736
 msgid "Automatic Friend Account"
 msgstr "自动朋友帐户"
 
@@ -5805,9 +2768,9 @@ msgstr "私人评坛"
 msgid "Message queues"
 msgstr "通知排队"
 
-#: ../../mod/admin.php:211 ../../mod/admin.php:473 ../../mod/admin.php:742
-#: ../../mod/admin.php:838 ../../mod/admin.php:880 ../../mod/admin.php:1046
-#: ../../mod/admin.php:1080 ../../mod/admin.php:1167
+#: ../../mod/admin.php:211 ../../mod/admin.php:489 ../../mod/admin.php:761
+#: ../../mod/admin.php:858 ../../mod/admin.php:900 ../../mod/admin.php:1066
+#: ../../mod/admin.php:1100 ../../mod/admin.php:1187
 msgid "Administration"
 msgstr "管理"
 
@@ -5831,655 +2794,709 @@ msgstr "版本"
 msgid "Active plugins"
 msgstr "活跃的插件"
 
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:405
 msgid "Site settings updated."
 msgstr "网站设置更新了。"
 
-#: ../../mod/admin.php:427 ../../mod/settings.php:769
+#: ../../mod/admin.php:434 ../../mod/settings.php:793
 msgid "No special theme for mobile devices"
 msgstr "没专门适合手机的主题"
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:451 ../../mod/contacts.php:330
+msgid "Never"
+msgstr "从未"
+
+#: ../../mod/admin.php:460
 msgid "Multi user instance"
 msgstr "多用户网站"
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:476
 msgid "Closed"
 msgstr "关闭"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:477
 msgid "Requires approval"
 msgstr "要批准"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:478
 msgid "Open"
 msgstr "打开"
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:482
 msgid "No SSL policy, links will track page SSL state"
 msgstr "没SSL方针，环节将追踪页SSL现状"
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:483
 msgid "Force all links to use SSL"
 msgstr "让所有的环节用SSL"
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:484
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "自签证书，用SSL再光本地环节（劝止的）"
 
-#: ../../mod/admin.php:476 ../../mod/register.php:261
+#: ../../mod/admin.php:492 ../../mod/register.php:261
 msgid "Registration"
 msgstr "注册"
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:493
 msgid "File upload"
 msgstr "文件上传"
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:494
 msgid "Policies"
 msgstr "政策"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:495
 msgid "Advanced"
 msgstr "高等"
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:496
 msgid "Performance"
 msgstr "性能"
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:500
+msgid "Site name"
+msgstr "网页名字"
+
+#: ../../mod/admin.php:501
 msgid "Banner/Logo"
 msgstr "标题/标志"
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:502
 msgid "System language"
 msgstr "系统语言"
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:503
 msgid "System theme"
 msgstr "系统主题"
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:503
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "默认系统主题－会被用户简介超驰－<a href='#' id='cnftheme'>把主题设置变化</a>"
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:504
 msgid "Mobile system theme"
 msgstr "手机系统主题"
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:504
 msgid "Theme for mobile devices"
 msgstr "主题适合手机"
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:505
 msgid "SSL link policy"
 msgstr "SSL环节方针"
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:505
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "决定产生的环节否则被强迫用SSL"
 
-#: ../../mod/admin.php:490
+#: ../../mod/admin.php:506
 msgid "'Share' element"
 msgstr "「合用」要素"
 
-#: ../../mod/admin.php:490
+#: ../../mod/admin.php:506
 msgid "Activates the bbcode element 'share' for repeating items."
 msgstr "把bbcode要素「合用」为重复项目。"
 
-#: ../../mod/admin.php:491
+#: ../../mod/admin.php:507
 msgid "Hide help entry from navigation menu"
 msgstr "隐藏帮助在航行选单"
 
-#: ../../mod/admin.php:491
+#: ../../mod/admin.php:507
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr "隐藏帮助项目在航行选单。您还能用它经过手动的输入「/help」"
 
-#: ../../mod/admin.php:492
+#: ../../mod/admin.php:508
 msgid "Single user instance"
 msgstr "单用户网站"
 
-#: ../../mod/admin.php:492
+#: ../../mod/admin.php:508
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "弄这网站多用户或单用户为选择的用户"
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:509
 msgid "Maximum image size"
 msgstr "图片最大尺寸"
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:509
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "最多上传照相的字节。默认是零，意思是无限。"
 
-#: ../../mod/admin.php:494
+#: ../../mod/admin.php:510
 msgid "Maximum image length"
 msgstr "最大图片大小"
 
-#: ../../mod/admin.php:494
+#: ../../mod/admin.php:510
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "最多像素在上传图片的长度。默认-1，意思是无限。"
 
-#: ../../mod/admin.php:495
+#: ../../mod/admin.php:511
 msgid "JPEG image quality"
 msgstr "JPEG图片质量"
 
-#: ../../mod/admin.php:495
+#: ../../mod/admin.php:511
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "上传的JPEG被用这质量［0－100］保存。默认100，最高。"
 
-#: ../../mod/admin.php:497
+#: ../../mod/admin.php:513
 msgid "Register policy"
 msgstr "注册政策"
 
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:514
 msgid "Maximum Daily Registrations"
 msgstr "一天最多注册"
 
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:514
 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:499
+#: ../../mod/admin.php:515
 msgid "Register text"
 msgstr "注册正文"
 
-#: ../../mod/admin.php:499
+#: ../../mod/admin.php:515
 msgid "Will be displayed prominently on the registration page."
 msgstr "被显著的在注册页表示。"
 
-#: ../../mod/admin.php:500
+#: ../../mod/admin.php:516
 msgid "Accounts abandoned after x days"
 msgstr "账户丢弃X天后"
 
-#: ../../mod/admin.php:500
+#: ../../mod/admin.php:516
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "拒绝浪费系统资源看外网站找丢弃的账户。输入0为无时限。"
 
-#: ../../mod/admin.php:501
+#: ../../mod/admin.php:517
 msgid "Allowed friend domains"
 msgstr "允许的朋友域"
 
-#: ../../mod/admin.php:501
+#: ../../mod/admin.php:517
 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:502
+#: ../../mod/admin.php:518
 msgid "Allowed email domains"
 msgstr "允许的电子邮件域"
 
-#: ../../mod/admin.php:502
+#: ../../mod/admin.php:518
 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:503
+#: ../../mod/admin.php:519
 msgid "Block public"
 msgstr "拦公开"
 
-#: ../../mod/admin.php:503
+#: ../../mod/admin.php:519
 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:504
+#: ../../mod/admin.php:520
 msgid "Force publish"
 msgstr "需要出版"
 
-#: ../../mod/admin.php:504
+#: ../../mod/admin.php:520
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "让所有这网站的的简介表明在网站目录。"
 
-#: ../../mod/admin.php:505
+#: ../../mod/admin.php:521
 msgid "Global directory update URL"
 msgstr "综合目录更新URL"
 
-#: ../../mod/admin.php:505
+#: ../../mod/admin.php:521
 msgid ""
 "URL to update the global directory. If this is not set, the global directory"
 " is completely unavailable to the application."
 msgstr "URL为更新综合目录。如果没有，这个应用用不了综合目录。"
 
-#: ../../mod/admin.php:506
+#: ../../mod/admin.php:522
 msgid "Allow threaded items"
 msgstr "允许线绳项目"
 
-#: ../../mod/admin.php:506
+#: ../../mod/admin.php:522
 msgid "Allow infinite level threading for items on this site."
 msgstr "允许无限水平线绳为这网站的项目。"
 
-#: ../../mod/admin.php:507
+#: ../../mod/admin.php:523
 msgid "Private posts by default for new users"
 msgstr "新用户默认写私人文章"
 
-#: ../../mod/admin.php:507
+#: ../../mod/admin.php:523
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "默认新用户文章批准使默认隐私组，没有公开。"
 
-#: ../../mod/admin.php:509
+#: ../../mod/admin.php:524
+msgid "Don't include post content in email notifications"
+msgstr "别包含文章内容在邮件消息"
+
+#: ../../mod/admin.php:524
+msgid ""
+"Don't include the content of a post/comment/private message/etc. in the "
+"email notifications that are sent out from this site, as a privacy measure."
+msgstr "别包含文章／谈论／私消息／等的内容在文件消息被这个网站寄出，为了隐私。"
+
+#: ../../mod/admin.php:525
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr "不允许插件的公众使用权在应用选单。"
+
+#: ../../mod/admin.php:525
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr "复选这个框为把应用选内插件限制仅成员"
+
+#: ../../mod/admin.php:526
+msgid "Don't embed private images in posts"
+msgstr "别嵌入私人图案在文章里"
+
+#: ../../mod/admin.php:526
+msgid ""
+"Don't replace locally-hosted private photos in posts with an embedded copy "
+"of the image. This means that contacts who receive posts containing private "
+"photos will have to authenticate and load each image, which may take a "
+"while."
+msgstr "别把复制嵌入的照相代替本网站的私人照相在文章里。结果是收包括私人照相的熟人要认证才卸载个张照片，会花许久。"
+
+#: ../../mod/admin.php:528
 msgid "Block multiple registrations"
 msgstr "拦一人多注册"
 
-#: ../../mod/admin.php:509
+#: ../../mod/admin.php:528
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "不允许用户注册别的账户为当页。"
 
-#: ../../mod/admin.php:510
+#: ../../mod/admin.php:529
 msgid "OpenID support"
 msgstr "OpenID支持"
 
-#: ../../mod/admin.php:510
+#: ../../mod/admin.php:529
 msgid "OpenID support for registration and logins."
 msgstr "OpenID支持注册和登录。"
 
-#: ../../mod/admin.php:511
+#: ../../mod/admin.php:530
 msgid "Fullname check"
 msgstr "全名核实"
 
-#: ../../mod/admin.php:511
+#: ../../mod/admin.php:530
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "让用户注册的时候放空格姓名中间，省得垃圾注册。"
 
-#: ../../mod/admin.php:512
+#: ../../mod/admin.php:531
 msgid "UTF-8 Regular expressions"
 msgstr "UTF-8正则表达式"
 
-#: ../../mod/admin.php:512
+#: ../../mod/admin.php:531
 msgid "Use PHP UTF8 regular expressions"
 msgstr "用PHP UTF8正则表达式"
 
-#: ../../mod/admin.php:513
+#: ../../mod/admin.php:532
 msgid "Show Community Page"
 msgstr "表示社会页"
 
-#: ../../mod/admin.php:513
+#: ../../mod/admin.php:532
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr "表示社会页表明这网站所有最近公开的文章"
 
-#: ../../mod/admin.php:514
+#: ../../mod/admin.php:533
 msgid "Enable OStatus support"
 msgstr "使OStatus支持可用"
 
-#: ../../mod/admin.php:514
+#: ../../mod/admin.php:533
 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 "提供内装的OStatus（identi.ca, status.net, 等）兼容。OStatus内，什么通知是公开的，所以偶尔隐私警告被表示。"
 
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:534
+msgid "OStatus conversation completion interval"
+msgstr "OStatus对话完成间隔"
+
+#: ../../mod/admin.php:534
+msgid ""
+"How often shall the poller check for new entries in OStatus conversations? "
+"This can be a very ressource task."
+msgstr "喂器要多久查一次新文章在OStatus交流？这会花许多系统资源。"
+
+#: ../../mod/admin.php:535
 msgid "Enable Diaspora support"
 msgstr "使Diaspora支持能够"
 
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:535
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "提供内装Diaspora网络兼容。"
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:536
 msgid "Only allow Friendica contacts"
 msgstr "只许Friendica熟人"
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:536
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "所有的熟人要用Friendica协议 。别的内装的沟通协议都不能用。"
 
-#: ../../mod/admin.php:517
+#: ../../mod/admin.php:537
 msgid "Verify SSL"
 msgstr "证实"
 
-#: ../../mod/admin.php:517
+#: ../../mod/admin.php:537
 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 "你想的话，您会使严格证书核实可用。意思是您不能根自签的SSL网站交流。"
 
-#: ../../mod/admin.php:518
+#: ../../mod/admin.php:538
 msgid "Proxy user"
 msgstr "代理用户"
 
-#: ../../mod/admin.php:519
+#: ../../mod/admin.php:539
 msgid "Proxy URL"
 msgstr "代理URL"
 
-#: ../../mod/admin.php:520
+#: ../../mod/admin.php:540
 msgid "Network timeout"
 msgstr "网络超时"
 
-#: ../../mod/admin.php:520
+#: ../../mod/admin.php:540
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "输入秒数。输入零为无限（不推荐的）。"
 
-#: ../../mod/admin.php:521
+#: ../../mod/admin.php:541
 msgid "Delivery interval"
 msgstr "传送间隔"
 
-#: ../../mod/admin.php:521
+#: ../../mod/admin.php:541
 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 "把背景传送过程耽误这多秒为减少系统工作量。推荐：4－5在共用服务器，2－3在私人服务器。0－1在大专门服务器。"
 
-#: ../../mod/admin.php:522
+#: ../../mod/admin.php:542
 msgid "Poll interval"
 msgstr "检查时间"
 
-#: ../../mod/admin.php:522
+#: ../../mod/admin.php:542
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "把背景检查行程耽误这数秒为减少系统负荷。如果是0,用发布时间。"
 
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:543
 msgid "Maximum Load Average"
 msgstr "最大负荷平均"
 
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:543
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "系统负荷平均以上转播和检查行程会被耽误－默认50。"
 
-#: ../../mod/admin.php:525
+#: ../../mod/admin.php:545
 msgid "Use MySQL full text engine"
 msgstr "用MySQL全正文机车"
 
-#: ../../mod/admin.php:525
+#: ../../mod/admin.php:545
 msgid ""
 "Activates the full text engine. Speeds up search - but can only search for "
 "four and more characters."
 msgstr "使全正文机车可用。把搜索催－可是只能搜索4字以上"
 
-#: ../../mod/admin.php:526
+#: ../../mod/admin.php:546
 msgid "Path to item cache"
 msgstr "路线到项目缓存"
 
-#: ../../mod/admin.php:527
+#: ../../mod/admin.php:547
 msgid "Cache duration in seconds"
 msgstr "缓存时间秒"
 
-#: ../../mod/admin.php:527
+#: ../../mod/admin.php:547
 msgid ""
 "How long should the cache files be hold? Default value is 86400 seconds (One"
 " day)."
 msgstr "缓存文件应该保存多久？默认是86400秒（一天）。"
 
-#: ../../mod/admin.php:528
+#: ../../mod/admin.php:548
 msgid "Path for lock file"
 msgstr "路线到锁文件"
 
-#: ../../mod/admin.php:529
+#: ../../mod/admin.php:549
 msgid "Temp path"
 msgstr "临时文件路线"
 
-#: ../../mod/admin.php:530
+#: ../../mod/admin.php:550
 msgid "Base path to installation"
 msgstr "基础安装路线"
 
-#: ../../mod/admin.php:548
+#: ../../mod/admin.php:567
 msgid "Update has been marked successful"
 msgstr "更新当成功标签了"
 
-#: ../../mod/admin.php:558
+#: ../../mod/admin.php:577
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "把%s实行没通过了。看系统记录。"
 
-#: ../../mod/admin.php:561
+#: ../../mod/admin.php:580
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "把%s更新成功地实行。"
 
-#: ../../mod/admin.php:565
+#: ../../mod/admin.php:584
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "%s更新没回答现状。不知道是否成功。"
 
-#: ../../mod/admin.php:568
+#: ../../mod/admin.php:587
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "找不到更新功能%s。"
 
-#: ../../mod/admin.php:583
+#: ../../mod/admin.php:602
 msgid "No failed updates."
 msgstr "没有不通过地更新。"
 
-#: ../../mod/admin.php:587
+#: ../../mod/admin.php:606
 msgid "Failed Updates"
 msgstr "没通过的更新"
 
-#: ../../mod/admin.php:588
+#: ../../mod/admin.php:607
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "这个不包括1139号更新之前，它们没回答装线。"
 
-#: ../../mod/admin.php:589
+#: ../../mod/admin.php:608
 msgid "Mark success (if update was manually applied)"
 msgstr "标注成功（如果手动地把更新实行了）"
 
-#: ../../mod/admin.php:590
+#: ../../mod/admin.php:609
 msgid "Attempt to execute this update step automatically"
 msgstr "试图自动地把这步更新实行"
 
-#: ../../mod/admin.php:615
+#: ../../mod/admin.php:634
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s用户拦／不拦了"
 
-#: ../../mod/admin.php:622
+#: ../../mod/admin.php:641
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s用户删除了"
 
-#: ../../mod/admin.php:661
+#: ../../mod/admin.php:680
 #, php-format
 msgid "User '%s' deleted"
 msgstr "用户「%s」删除了"
 
-#: ../../mod/admin.php:669
+#: ../../mod/admin.php:688
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "用户「%s」无拦了"
 
-#: ../../mod/admin.php:669
+#: ../../mod/admin.php:688
 #, php-format
 msgid "User '%s' blocked"
 msgstr "用户「%s」拦了"
 
-#: ../../mod/admin.php:745
+#: ../../mod/admin.php:764
 msgid "select all"
 msgstr "都选"
 
-#: ../../mod/admin.php:746
+#: ../../mod/admin.php:765
 msgid "User registrations waiting for confirm"
 msgstr "用户注册等待确认"
 
-#: ../../mod/admin.php:747
+#: ../../mod/admin.php:766
 msgid "Request date"
 msgstr "要求日期"
 
-#: ../../mod/admin.php:747 ../../mod/admin.php:757 ../../mod/settings.php:562
-#: ../../mod/settings.php:588 ../../mod/crepair.php:148
+#: ../../mod/admin.php:766 ../../mod/admin.php:777 ../../mod/settings.php:586
+#: ../../mod/settings.php:612 ../../mod/crepair.php:148
 msgid "Name"
 msgstr "名字"
 
-#: ../../mod/admin.php:748
+#: ../../mod/admin.php:767
 msgid "No registrations."
 msgstr "没有注册。"
 
-#: ../../mod/admin.php:749 ../../mod/notifications.php:161
+#: ../../mod/admin.php:768 ../../mod/notifications.php:161
 #: ../../mod/notifications.php:208
 msgid "Approve"
 msgstr "批准"
 
-#: ../../mod/admin.php:750
+#: ../../mod/admin.php:769
 msgid "Deny"
 msgstr "否定"
 
-#: ../../mod/admin.php:752 ../../mod/contacts.php:353
+#: ../../mod/admin.php:771 ../../mod/contacts.php:353
 #: ../../mod/contacts.php:412
 msgid "Block"
 msgstr "拦"
 
-#: ../../mod/admin.php:753 ../../mod/contacts.php:353
+#: ../../mod/admin.php:772 ../../mod/contacts.php:353
 #: ../../mod/contacts.php:412
 msgid "Unblock"
 msgstr "不拦"
 
-#: ../../mod/admin.php:754
+#: ../../mod/admin.php:773
 msgid "Site admin"
 msgstr "网站管理员"
 
-#: ../../mod/admin.php:757
+#: ../../mod/admin.php:774
+msgid "Account expired"
+msgstr "帐户过期了"
+
+#: ../../mod/admin.php:777
 msgid "Register date"
 msgstr "注册日期"
 
-#: ../../mod/admin.php:757
+#: ../../mod/admin.php:777
 msgid "Last login"
 msgstr "上次登录"
 
-#: ../../mod/admin.php:757
+#: ../../mod/admin.php:777
 msgid "Last item"
 msgstr "上项目"
 
-#: ../../mod/admin.php:757
+#: ../../mod/admin.php:777
 msgid "Account"
 msgstr "帐户"
 
-#: ../../mod/admin.php:759
+#: ../../mod/admin.php:779
 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:760
+#: ../../mod/admin.php:780
 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:801
+#: ../../mod/admin.php:821
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "使插件%s不能用。"
 
-#: ../../mod/admin.php:805
+#: ../../mod/admin.php:825
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "使插件%s能用。"
 
-#: ../../mod/admin.php:815 ../../mod/admin.php:1018
+#: ../../mod/admin.php:835 ../../mod/admin.php:1038
 msgid "Disable"
 msgstr "使不能用"
 
-#: ../../mod/admin.php:817 ../../mod/admin.php:1020
+#: ../../mod/admin.php:837 ../../mod/admin.php:1040
 msgid "Enable"
 msgstr "使能用"
 
-#: ../../mod/admin.php:840 ../../mod/admin.php:1048
+#: ../../mod/admin.php:860 ../../mod/admin.php:1068
 msgid "Toggle"
 msgstr "肘节"
 
-#: ../../mod/admin.php:848 ../../mod/admin.php:1058
+#: ../../mod/admin.php:868 ../../mod/admin.php:1078
 msgid "Author: "
 msgstr "作家："
 
-#: ../../mod/admin.php:849 ../../mod/admin.php:1059
+#: ../../mod/admin.php:869 ../../mod/admin.php:1079
 msgid "Maintainer: "
 msgstr "保持员："
 
-#: ../../mod/admin.php:978
+#: ../../mod/admin.php:998
 msgid "No themes found."
 msgstr "找不到主题。"
 
-#: ../../mod/admin.php:1040
+#: ../../mod/admin.php:1060
 msgid "Screenshot"
 msgstr "截图"
 
-#: ../../mod/admin.php:1086
+#: ../../mod/admin.php:1106
 msgid "[Experimental]"
 msgstr "［试验］"
 
-#: ../../mod/admin.php:1087
+#: ../../mod/admin.php:1107
 msgid "[Unsupported]"
 msgstr "［没支持］"
 
-#: ../../mod/admin.php:1114
+#: ../../mod/admin.php:1134
 msgid "Log settings updated."
 msgstr "日志设置更新了。"
 
-#: ../../mod/admin.php:1170
+#: ../../mod/admin.php:1190
 msgid "Clear"
 msgstr "清理出"
 
-#: ../../mod/admin.php:1176
-msgid "Debugging"
-msgstr "调试"
+#: ../../mod/admin.php:1196
+msgid "Enable Debugging"
+msgstr "把调试使可用的"
 
-#: ../../mod/admin.php:1177
+#: ../../mod/admin.php:1197
 msgid "Log file"
 msgstr "记录文件"
 
-#: ../../mod/admin.php:1177
+#: ../../mod/admin.php:1197
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "必要被网页服务器可写的。相对Friendica主文件夹。"
 
-#: ../../mod/admin.php:1178
+#: ../../mod/admin.php:1198
 msgid "Log level"
 msgstr "记录水平"
 
-#: ../../mod/admin.php:1227 ../../mod/contacts.php:409
+#: ../../mod/admin.php:1247 ../../mod/contacts.php:409
 msgid "Update now"
 msgstr "现在更新"
 
-#: ../../mod/admin.php:1228
+#: ../../mod/admin.php:1248
 msgid "Close"
 msgstr "关闭"
 
-#: ../../mod/admin.php:1234
+#: ../../mod/admin.php:1254
 msgid "FTP Host"
 msgstr "FTP主机"
 
-#: ../../mod/admin.php:1235
+#: ../../mod/admin.php:1255
 msgid "FTP Path"
 msgstr "FTP目录"
 
-#: ../../mod/admin.php:1236
+#: ../../mod/admin.php:1256
 msgid "FTP User"
 msgstr "FTP用户"
 
-#: ../../mod/admin.php:1237
+#: ../../mod/admin.php:1257
 msgid "FTP Password"
 msgstr "FTP密码"
 
@@ -6532,7 +3549,7 @@ msgid "Remove term"
 msgstr "删除关键字"
 
 #: ../../mod/search.php:180 ../../mod/search.php:206
-#: ../../mod/community.php:61 ../../mod/community.php:88
+#: ../../mod/community.php:61 ../../mod/community.php:89
 msgid "No results."
 msgstr "没有结果"
 
@@ -6634,14 +3651,6 @@ msgstr "选择简介昵称。昵称头一字必须拉丁字。您再这个网站
 msgid "Choose a nickname: "
 msgstr "选择昵称："
 
-#: ../../mod/apps.php:4
-msgid "Applications"
-msgstr "应用"
-
-#: ../../mod/apps.php:7
-msgid "No installed applications."
-msgstr "没有安装的应用"
-
 #: ../../mod/regmod.php:63
 msgid "Account approved."
 msgstr "账户批准了"
@@ -6733,6 +3742,18 @@ msgstr "普通朋友们"
 msgid "No contacts in common."
 msgstr "没有共同熟人。"
 
+#: ../../mod/apps.php:7
+msgid "You must be logged in to use addons. "
+msgstr "您用插件前要登录"
+
+#: ../../mod/apps.php:11
+msgid "Applications"
+msgstr "应用"
+
+#: ../../mod/apps.php:14
+msgid "No installed applications."
+msgstr "没有安装的应用"
+
 #: ../../mod/contacts.php:85 ../../mod/contacts.php:165
 msgid "Could not access contact record."
 msgstr "用不了熟人记录。"
@@ -6800,10 +3821,6 @@ msgstr "%s给您分享"
 msgid "Private communications are not available for this contact."
 msgstr "没有私人的沟通跟这个熟人"
 
-#: ../../mod/contacts.php:330
-msgid "Never"
-msgstr "从未"
-
 #: ../../mod/contacts.php:334
 msgid "(Update was successful)"
 msgstr "(更新成功)"
@@ -7012,6 +4029,10 @@ msgstr "你喜欢"
 msgid "Search your contacts"
 msgstr "搜索您的熟人"
 
+#: ../../mod/contacts.php:612 ../../mod/directory.php:59
+msgid "Finding: "
+msgstr "找着："
+
 #: ../../mod/settings.php:23 ../../mod/photos.php:79
 msgid "everybody"
 msgstr "每人"
@@ -7048,7 +4069,7 @@ msgstr "删除账户"
 msgid "Missing some important data!"
 msgstr "有的重要信息失踪的！"
 
-#: ../../mod/settings.php:121 ../../mod/settings.php:586
+#: ../../mod/settings.php:121 ../../mod/settings.php:610
 msgid "Update"
 msgstr "更新"
 
@@ -7064,491 +4085,535 @@ msgstr "电子邮件设置更新了"
 msgid "Features updated"
 msgstr "特点更新了"
 
-#: ../../mod/settings.php:307
+#: ../../mod/settings.php:312
 msgid "Passwords do not match. Password unchanged."
 msgstr "密码们不相配。密码没未改变的。"
 
-#: ../../mod/settings.php:312
+#: ../../mod/settings.php:317
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "空的密码禁止。密码没未改变的。"
 
-#: ../../mod/settings.php:323
+#: ../../mod/settings.php:325
+msgid "Wrong password."
+msgstr "密码不正确。"
+
+#: ../../mod/settings.php:336
 msgid "Password changed."
 msgstr "密码变化了。"
 
-#: ../../mod/settings.php:325
+#: ../../mod/settings.php:338
 msgid "Password update failed. Please try again."
 msgstr "密码更新失败了。请再试。"
 
-#: ../../mod/settings.php:390
+#: ../../mod/settings.php:403
 msgid " Please use a shorter name."
 msgstr "请用短一点个名。"
 
-#: ../../mod/settings.php:392
+#: ../../mod/settings.php:405
 msgid " Name too short."
 msgstr "名字太短。"
 
-#: ../../mod/settings.php:398
+#: ../../mod/settings.php:414
+msgid "Wrong Password"
+msgstr "密码不正确"
+
+#: ../../mod/settings.php:419
 msgid " Not valid email."
 msgstr " 电子邮件地址无效."
 
-#: ../../mod/settings.php:400
+#: ../../mod/settings.php:422
 msgid " Cannot change to that email."
 msgstr "不能变化到这个邮件地址。"
 
-#: ../../mod/settings.php:454
+#: ../../mod/settings.php:476
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr "私人评坛没有隐私批准。默认隐私组用者。"
 
-#: ../../mod/settings.php:458
+#: ../../mod/settings.php:480
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr "私人评坛没有隐私批准或默认隐私组。"
 
-#: ../../mod/settings.php:559 ../../mod/settings.php:585
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:510
+msgid "Settings updated."
+msgstr "设置跟新了"
+
+#: ../../mod/settings.php:583 ../../mod/settings.php:609
+#: ../../mod/settings.php:645
 msgid "Add application"
 msgstr "加入应用"
 
-#: ../../mod/settings.php:565 ../../mod/settings.php:591
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
+msgid "Consumer Key"
+msgstr "钥匙(Consumer Key)"
+
+#: ../../mod/settings.php:588 ../../mod/settings.php:614
+msgid "Consumer Secret"
+msgstr "密码(Consumer Secret)"
+
+#: ../../mod/settings.php:589 ../../mod/settings.php:615
 msgid "Redirect"
 msgstr "重定向"
 
-#: ../../mod/settings.php:566 ../../mod/settings.php:592
+#: ../../mod/settings.php:590 ../../mod/settings.php:616
 msgid "Icon url"
 msgstr "图符URL"
 
-#: ../../mod/settings.php:577
+#: ../../mod/settings.php:601
 msgid "You can't edit this application."
 msgstr "您不能编辑这个应用。"
 
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:644
 msgid "Connected Apps"
 msgstr "连接着应用"
 
-#: ../../mod/settings.php:622 ../../mod/editpost.php:109
-#: ../../mod/content.php:751 ../../object/Item.php:110
+#: ../../mod/settings.php:646 ../../mod/editpost.php:109
+#: ../../mod/content.php:751 ../../object/Item.php:117
 msgid "Edit"
 msgstr "编辑"
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:648
 msgid "Client key starts with"
 msgstr "客户钥匙头字是"
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:649
 msgid "No name"
 msgstr "无名"
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:650
 msgid "Remove authorization"
 msgstr "撤消权能"
 
-#: ../../mod/settings.php:638
+#: ../../mod/settings.php:662
 msgid "No Plugin settings configured"
 msgstr "没插件设置配置了"
 
-#: ../../mod/settings.php:660
+#: ../../mod/settings.php:670
+msgid "Plugin Settings"
+msgstr "插件设置"
+
+#: ../../mod/settings.php:684
 msgid "Off"
 msgstr "关"
 
-#: ../../mod/settings.php:660
+#: ../../mod/settings.php:684
 msgid "On"
 msgstr "开"
 
-#: ../../mod/settings.php:668
+#: ../../mod/settings.php:692
 msgid "Additional Features"
 msgstr "附加的特点"
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:705 ../../mod/settings.php:706
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "包括的支持为%s连通性是%s"
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:705 ../../mod/settings.php:706
 msgid "enabled"
 msgstr "能够做的"
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:705 ../../mod/settings.php:706
 msgid "disabled"
 msgstr "使不能用"
 
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:706
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:738
 msgid "Email access is disabled on this site."
 msgstr "这个网站没有邮件使用权"
 
-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:745
 msgid "Connector Settings"
 msgstr "连接器设置"
 
-#: ../../mod/settings.php:726
+#: ../../mod/settings.php:750
 msgid "Email/Mailbox Setup"
 msgstr "邮件收件箱设置"
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:751
 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:728
+#: ../../mod/settings.php:752
 msgid "Last successful email check:"
 msgstr "上个成功收件箱检查："
 
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:754
 msgid "IMAP server name:"
 msgstr "IMAP服务器名字："
 
-#: ../../mod/settings.php:731
+#: ../../mod/settings.php:755
 msgid "IMAP port:"
 msgstr "IMAP服务器端口："
 
-#: ../../mod/settings.php:732
+#: ../../mod/settings.php:756
 msgid "Security:"
 msgstr "安全："
 
-#: ../../mod/settings.php:733
+#: ../../mod/settings.php:756 ../../mod/settings.php:761
+msgid "None"
+msgstr "没有"
+
+#: ../../mod/settings.php:757
 msgid "Email login name:"
 msgstr "邮件登记名："
 
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:758
 msgid "Email password:"
 msgstr "邮件密码："
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:759
 msgid "Reply-to address:"
 msgstr "回答地址："
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:760
 msgid "Send public posts to all email contacts:"
 msgstr "发公开的文章给所有的邮件熟人："
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:761
 msgid "Action after import:"
 msgstr "进口后行动："
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:761
 msgid "Mark as seen"
 msgstr "标注看过"
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:761
 msgid "Move to folder"
 msgstr "搬到文件夹"
 
-#: ../../mod/settings.php:738
+#: ../../mod/settings.php:762
 msgid "Move to folder:"
 msgstr "搬到文件夹："
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:835
 msgid "Display Settings"
 msgstr "表示设置"
 
-#: ../../mod/settings.php:815 ../../mod/settings.php:826
+#: ../../mod/settings.php:841 ../../mod/settings.php:853
 msgid "Display Theme:"
 msgstr "显示主题："
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:842
 msgid "Mobile Theme:"
 msgstr "手机主题："
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:843
 msgid "Update browser every xx seconds"
 msgstr "更新游览器每XX秒"
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:843
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "最小10秒，没有上限"
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:844
 msgid "Number of items to display per page:"
 msgstr "每页表示多少项目："
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:844 ../../mod/settings.php:845
 msgid "Maximum of 100 items"
 msgstr "最多100项目"
 
-#: ../../mod/settings.php:819
+#: ../../mod/settings.php:845
+msgid "Number of items to display per page when viewed from mobile device:"
+msgstr "用手机看一页展示多少项目："
+
+#: ../../mod/settings.php:846
 msgid "Don't show emoticons"
 msgstr "别表示请表符号"
 
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:922
 msgid "Normal Account Page"
 msgstr "平常账户页"
 
-#: ../../mod/settings.php:896
+#: ../../mod/settings.php:923
 msgid "This account is a normal personal profile"
 msgstr "这个帐户是正常私人简介"
 
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:926
 msgid "Soapbox Page"
 msgstr "演讲台页"
 
-#: ../../mod/settings.php:900
+#: ../../mod/settings.php:927
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "自动批准所有联络／友谊要求当只看的迷"
 
-#: ../../mod/settings.php:903
+#: ../../mod/settings.php:930
 msgid "Community Forum/Celebrity Account"
 msgstr "社会评坛／名人账户"
 
-#: ../../mod/settings.php:904
+#: ../../mod/settings.php:931
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "自动批准所有联络／友谊要求当看写的迷"
 
-#: ../../mod/settings.php:907
+#: ../../mod/settings.php:934
 msgid "Automatic Friend Page"
 msgstr "自动朋友页"
 
-#: ../../mod/settings.php:908
+#: ../../mod/settings.php:935
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "自动批准所有联络／友谊要求当朋友"
 
-#: ../../mod/settings.php:911
+#: ../../mod/settings.php:938
 msgid "Private Forum [Experimental]"
 msgstr "隐私评坛［实验性的 ］"
 
-#: ../../mod/settings.php:912
+#: ../../mod/settings.php:939
 msgid "Private forum - approved members only"
 msgstr "隐私评坛－只批准的成员"
 
-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:951
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:951
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(可选的)许这个OpenID这个账户登记。"
 
-#: ../../mod/settings.php:934
+#: ../../mod/settings.php:961
 msgid "Publish your default profile in your local site directory?"
 msgstr "出版您默认简介在您当地的网站目录？"
 
-#: ../../mod/settings.php:940
+#: ../../mod/settings.php:967
 msgid "Publish your default profile in the global social directory?"
 msgstr "出版您默认简介在综合社会目录？"
 
-#: ../../mod/settings.php:948
+#: ../../mod/settings.php:975
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "藏起来  发现您的熟人／朋友单不让这个简介看着看？\n "
 
-#: ../../mod/settings.php:952
+#: ../../mod/settings.php:979
 msgid "Hide your profile details from unknown viewers?"
 msgstr "使简介信息给陌生的看着看不了？"
 
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:984
 msgid "Allow friends to post to your profile page?"
 msgstr "允许朋友们贴文章在您的简介页？"
 
-#: ../../mod/settings.php:963
+#: ../../mod/settings.php:990
 msgid "Allow friends to tag your posts?"
 msgstr "允许朋友们标签您的文章？"
 
-#: ../../mod/settings.php:969
+#: ../../mod/settings.php:996
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "允许我们建议您潜力朋友给新成员？"
 
-#: ../../mod/settings.php:975
+#: ../../mod/settings.php:1002
 msgid "Permit unknown people to send you private mail?"
 msgstr "允许生人寄给您私人邮件？"
 
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:1010
 msgid "Profile is <strong>not published</strong>."
 msgstr "简介是<strong>没出版</strong>"
 
-#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:1013 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr "或者"
 
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:1018
 msgid "Your Identity Address is"
 msgstr "您的同一个人地址是"
 
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1029
 msgid "Automatically expire posts after this many days:"
 msgstr "自动地过期文章这数天："
 
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1029
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "如果空的，文章不会过期。过期的文章被删除"
 
-#: ../../mod/settings.php:1003
+#: ../../mod/settings.php:1030
 msgid "Advanced expiration settings"
 msgstr "先进的过期设置"
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1031
 msgid "Advanced Expiration"
 msgstr "先进的过期"
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1032
 msgid "Expire posts:"
 msgstr "把文章过期："
 
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1033
 msgid "Expire personal notes:"
 msgstr "把私人便条过期："
 
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1034
 msgid "Expire starred posts:"
 msgstr "把星的文章过期："
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1035
 msgid "Expire photos:"
 msgstr "把照片过期："
 
-#: ../../mod/settings.php:1009
+#: ../../mod/settings.php:1036
 msgid "Only expire posts by others:"
 msgstr "只别人的文章过期："
 
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1062
 msgid "Account Settings"
 msgstr "帐户设置"
 
-#: ../../mod/settings.php:1043
+#: ../../mod/settings.php:1070
 msgid "Password Settings"
 msgstr "密码设置"
 
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1071
 msgid "New Password:"
 msgstr "新密码："
 
-#: ../../mod/settings.php:1045
+#: ../../mod/settings.php:1072
 msgid "Confirm:"
 msgstr "确认："
 
-#: ../../mod/settings.php:1045
+#: ../../mod/settings.php:1072
 msgid "Leave password fields blank unless changing"
 msgstr "非变化留空密码栏"
 
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1073
+msgid "Current Password:"
+msgstr "目前密码："
+
+#: ../../mod/settings.php:1073 ../../mod/settings.php:1074
+msgid "Your current password to confirm the changes"
+msgstr "您目前密码为确认变化"
+
+#: ../../mod/settings.php:1074
+msgid "Password:"
+msgstr "密码："
+
+#: ../../mod/settings.php:1078
 msgid "Basic Settings"
 msgstr "基础设置"
 
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1080
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
-#: ../../mod/settings.php:1052
+#: ../../mod/settings.php:1081
 msgid "Your Timezone:"
 msgstr "您的时区："
 
-#: ../../mod/settings.php:1053
+#: ../../mod/settings.php:1082
 msgid "Default Post Location:"
 msgstr "默认文章位置："
 
-#: ../../mod/settings.php:1054
+#: ../../mod/settings.php:1083
 msgid "Use Browser Location:"
 msgstr "用游览器位置："
 
-#: ../../mod/settings.php:1057
+#: ../../mod/settings.php:1086
 msgid "Security and Privacy Settings"
 msgstr "安全和隐私设置"
 
-#: ../../mod/settings.php:1059
+#: ../../mod/settings.php:1088
 msgid "Maximum Friend Requests/Day:"
 msgstr "最多友谊要求个天："
 
-#: ../../mod/settings.php:1059 ../../mod/settings.php:1089
+#: ../../mod/settings.php:1088 ../../mod/settings.php:1118
 msgid "(to prevent spam abuse)"
 msgstr "(为防止垃圾邮件滥用)"
 
-#: ../../mod/settings.php:1060
+#: ../../mod/settings.php:1089
 msgid "Default Post Permissions"
 msgstr "默认文章准许"
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1090
 msgid "(click to open/close)"
 msgstr "（点击为打开/关闭）"
 
-#: ../../mod/settings.php:1070 ../../mod/photos.php:1140
+#: ../../mod/settings.php:1099 ../../mod/photos.php:1140
 #: ../../mod/photos.php:1506
 msgid "Show to Groups"
 msgstr "给组表示"
 
-#: ../../mod/settings.php:1071 ../../mod/photos.php:1141
+#: ../../mod/settings.php:1100 ../../mod/photos.php:1141
 #: ../../mod/photos.php:1507
 msgid "Show to Contacts"
 msgstr "给熟人表示"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1101
 msgid "Default Private Post"
 msgstr "默认私人文章"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1102
 msgid "Default Public Post"
 msgstr "默认公开文章"
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1106
 msgid "Default Permissions for New Posts"
 msgstr "默认权利为新文章"
 
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1118
 msgid "Maximum private messages per day from unknown people:"
 msgstr "一天最多从生人私人邮件："
 
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1121
 msgid "Notification Settings"
 msgstr "消息设置"
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1122
 msgid "By default post a status message when:"
 msgstr "默认地发现状通知如果："
 
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1123
 msgid "accepting a friend request"
 msgstr "接受朋友邀请"
 
-#: ../../mod/settings.php:1095
+#: ../../mod/settings.php:1124
 msgid "joining a forum/community"
 msgstr "加入评坛／社会"
 
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1125
 msgid "making an <em>interesting</em> profile change"
 msgstr "把简介有意思地变修改"
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1126
 msgid "Send a notification email when:"
 msgstr "发一个消息要是："
 
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1127
 msgid "You receive an introduction"
 msgstr "你受到一个介绍"
 
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1128
 msgid "Your introductions are confirmed"
 msgstr "你的介绍确认了"
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1129
 msgid "Someone writes on your profile wall"
 msgstr "某人写在你的简历墙"
 
-#: ../../mod/settings.php:1101
+#: ../../mod/settings.php:1130
 msgid "Someone writes a followup comment"
 msgstr "某人写一个后续的评论"
 
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1131
 msgid "You receive a private message"
 msgstr "你受到一个私消息"
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1132
 msgid "You receive a friend suggestion"
 msgstr "你受到一个朋友建议"
 
-#: ../../mod/settings.php:1104
+#: ../../mod/settings.php:1133
 msgid "You are tagged in a post"
 msgstr "你被在新闻标签"
 
-#: ../../mod/settings.php:1105
+#: ../../mod/settings.php:1134
 msgid "You are poked/prodded/etc. in a post"
 msgstr "您在文章被戳"
 
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1137
 msgid "Advanced Account/Page Type Settings"
 msgstr "专家账户／页种设置"
 
-#: ../../mod/settings.php:1109
+#: ../../mod/settings.php:1138
 msgid "Change the behaviour of this account for special situations"
 msgstr "把这个账户特别情况的时候行动变化"
 
@@ -7644,6 +4709,10 @@ msgstr "目前页代表"
 msgid "Potential Delegates"
 msgstr "潜力的代表"
 
+#: ../../mod/delegate.php:130 ../../mod/tagrm.php:93
+msgid "Remove"
+msgstr "移走"
+
 #: ../../mod/delegate.php:131
 msgid "Add"
 msgstr "加"
@@ -7753,7 +4822,7 @@ msgstr "联络接受了在%s"
 msgid "%1$s has joined %2$s"
 msgstr "%1$s加入%2$s了"
 
-#: ../../mod/dfrn_poll.php:101 ../../mod/dfrn_poll.php:534
+#: ../../mod/dfrn_poll.php:103 ../../mod/dfrn_poll.php:536
 #, php-format
 msgid "%1$s welcomes %2$s"
 msgstr "%1$s欢迎%2$s"
@@ -7930,6 +4999,26 @@ msgstr "提交要求"
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s关注着%2$s的%3$s"
 
+#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
+msgid "Global Directory"
+msgstr "综合目录"
+
+#: ../../mod/directory.php:57
+msgid "Find on this site"
+msgstr "找在这网站"
+
+#: ../../mod/directory.php:60
+msgid "Site Directory"
+msgstr "网站目录"
+
+#: ../../mod/directory.php:114
+msgid "Gender: "
+msgstr "性别："
+
+#: ../../mod/directory.php:187
+msgid "No entries (some entries may be hidden)."
+msgstr "没有文章(有的文章会被隐藏)。"
+
 #: ../../mod/suggest.php:27
 msgid "Do you really want to delete this suggestion?"
 msgstr "您真的想删除这个建议吗？"
@@ -7952,14 +5041,6 @@ msgstr "搜索人物"
 msgid "No matches"
 msgstr "没有结果"
 
-#: ../../mod/display.php:99 ../../mod/profile.php:155
-msgid "Access to this profile has been restricted."
-msgstr "使用权这个简介被限制了."
-
-#: ../../mod/display.php:177
-msgid "Item has been removed."
-msgstr "项目被删除了。"
-
 #: ../../mod/tagrm.php:41
 msgid "Tag removed"
 msgstr "标签去除了"
@@ -7996,6 +5077,14 @@ msgstr "编项目"
 msgid "Create New Event"
 msgstr "造成新的项目"
 
+#: ../../mod/events.php:372
+msgid "Previous"
+msgstr "上"
+
+#: ../../mod/events.php:373 ../../mod/install.php:207
+msgid "Next"
+msgstr "下"
+
 #: ../../mod/events.php:446
 msgid "hour:minute"
 msgstr "小时：分钟"
@@ -8208,11 +5297,11 @@ msgstr "无简介"
 msgid "Help:"
 msgstr "帮助："
 
-#: ../../mod/help.php:90 ../../index.php:226
+#: ../../mod/help.php:90 ../../index.php:231
 msgid "Not Found"
 msgstr "未发现"
 
-#: ../../mod/help.php:93 ../../index.php:229
+#: ../../mod/help.php:93 ../../index.php:234
 msgid "Page not found."
 msgstr "页发现。"
 
@@ -8220,6 +5309,11 @@ msgstr "页发现。"
 msgid "No contacts."
 msgstr "没有熟人。"
 
+#: ../../mod/home.php:34
+#, php-format
+msgid "Welcome to %s"
+msgstr "%s欢迎你"
+
 #: ../../mod/viewsrc.php:7
 msgid "Access denied."
 msgstr "没有用权。"
@@ -8233,289 +5327,6 @@ msgstr "文件数目超过最多%d"
 msgid "File upload failed."
 msgstr "文件上传失败。"
 
-#: ../../mod/install.php:117
-msgid "Friendica Social Communications Server - Setup"
-msgstr "Friendica社会交通服务器－安装"
-
-#: ../../mod/install.php:123
-msgid "Could not connect to database."
-msgstr "解不了数据库。"
-
-#: ../../mod/install.php:127
-msgid "Could not create table."
-msgstr "造成不了表格。"
-
-#: ../../mod/install.php:133
-msgid "Your Friendica site database has been installed."
-msgstr "您Friendica网站数据库被安装了。"
-
-#: ../../mod/install.php:138
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "您可能要手工地进口文件「database.sql」用phpmyadmin或mysql。"
-
-#: ../../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:203
-msgid "System check"
-msgstr "系统检测"
-
-#: ../../mod/install.php:208
-msgid "Check again"
-msgstr "再检测"
-
-#: ../../mod/install.php:227
-msgid "Database connection"
-msgstr "数据库接通"
-
-#: ../../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:229
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "你有关于这些设置有问题的话，请给互联网托管服务或者网页管理联系。"
-
-#: ../../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:234
-msgid "Database Server Name"
-msgstr "数据库服务器名"
-
-#: ../../mod/install.php:235
-msgid "Database Login Name"
-msgstr "数据库登录名"
-
-#: ../../mod/install.php:236
-msgid "Database Login Password"
-msgstr "数据库登录密码"
-
-#: ../../mod/install.php:237
-msgid "Database Name"
-msgstr "数据库名字"
-
-#: ../../mod/install.php:238 ../../mod/install.php:277
-msgid "Site administrator email address"
-msgstr "网站行政人员邮件地址"
-
-#: ../../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:242 ../../mod/install.php:280
-msgid "Please select a default timezone for your website"
-msgstr "请选择您网站的默认时区"
-
-#: ../../mod/install.php:267
-msgid "Site settings"
-msgstr "网站设置"
-
-#: ../../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: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 "如果您没有命令行PHP在服务器，您实行不了用cron背景检查。看<a href='http://friendica.com/node/27'>「使安排做的任务可用」</a>"
-
-#: ../../mod/install.php:325
-msgid "PHP executable path"
-msgstr "PHP可执行路径"
-
-#: ../../mod/install.php:325
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "输入全路线到php执行程序。您会留空白为继续安装。"
-
-#: ../../mod/install.php:330
-msgid "Command line PHP"
-msgstr "命令行PHP"
-
-#: ../../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:340
-msgid "This is required for message delivery to work."
-msgstr "这必要为通信发布成功。"
-
-#: ../../mod/install.php:342
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
-
-#: ../../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: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:366
-msgid "Generate encryption keys"
-msgstr "产生加密钥匙"
-
-#: ../../mod/install.php:373
-msgid "libCurl PHP module"
-msgstr "libCurl PHP模块"
-
-#: ../../mod/install.php:374
-msgid "GD graphics PHP module"
-msgstr "GD显示PHP模块"
-
-#: ../../mod/install.php:375
-msgid "OpenSSL PHP module"
-msgstr "OpenSSL PHP模块"
-
-#: ../../mod/install.php:376
-msgid "mysqli PHP module"
-msgstr "mysqli PHP模块"
-
-#: ../../mod/install.php:377
-msgid "mb_string PHP module"
-msgstr "mb_string PHP模块"
-
-#: ../../mod/install.php:382 ../../mod/install.php:384
-msgid "Apache mod_rewrite module"
-msgstr "Apache mod_rewrite部件"
-
-#: ../../mod/install.php:382
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "错误：Apache服务器的mod-rewrite模块是必要的可却不安装的。"
-
-#: ../../mod/install.php:390
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "错误：libCurl PHP模块是必要的可却不安装的。"
-
-#: ../../mod/install.php:394
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "错误：GD显示PHP模块跟JPEG支持是必要的可却安装的。"
-
-#: ../../mod/install.php:398
-msgid "Error: openssl PHP module required but not installed."
-msgstr "错误：openssl PHP模块是必要的可却不安装的。"
-
-#: ../../mod/install.php:402
-msgid "Error: mysqli PHP module required but not installed."
-msgstr "错误：mysqli PHP模块是必要的可却不安装的。"
-
-#: ../../mod/install.php:406
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "错误：mbstring PHP模块必要可没安装的。"
-
-#: ../../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: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: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 "这个步骤头，我们给您正文要保存在叫.htconfig.php的文件在您Friendica主文件夹。"
-
-#: ../../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 "或者您会这个步骤不做还是实行手动的安装。请看INSTALL.txt文件为说明。"
-
-#: ../../mod/install.php:429
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php是可写的"
-
-#: ../../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用Smarty3模板机车为建筑网页。Smarty3把模板编译成PHP为催建筑网页。"
-
-#: ../../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 "为了保存这些模板，网服务器要写权利于view/smarty3/目录在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 "请保险您网服务器用户（比如www-data）有这个目录的写权利。"
-
-#: ../../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 "注意：为了安全，您应该只给网服务器写权利于view/smarty3/－没有模板文件（.tpl）之下。"
-
-#: ../../mod/install.php:445
-msgid "view/smarty3 is writable"
-msgstr "能写view/smarty3"
-
-#: ../../mod/install.php:457
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr " URL改写在.htaccess不行。检查您服务器设置。"
-
-#: ../../mod/install.php:459
-msgid "Url rewrite is working"
-msgstr "URL改写发挥机能"
-
-#: ../../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:493
-msgid "Errors encountered creating database tables."
-msgstr "造成数据库列表相遇错误。"
-
-#: ../../mod/install.php:504
-msgid "<h1>What next</h1>"
-msgstr "<h1>下步是什么</h1>"
-
-#: ../../mod/install.php:505
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "重要：您要[手工地]准备安排的任务给喂器。"
-
 #: ../../mod/wall_upload.php:90 ../../mod/profile_photo.php:144
 #, php-format
 msgid "Image exceeds size limit of %d"
@@ -8710,6 +5521,10 @@ msgstr "请选择你的时区:"
 msgid "Remote privacy information not available."
 msgstr "摇隐私信息无效"
 
+#: ../../mod/lockview.php:48
+msgid "Visible to:"
+msgstr "可见给："
+
 #: ../../mod/lostpass.php:17
 msgid "No valid account found."
 msgstr "找不到效的账户。"
@@ -8729,7 +5544,7 @@ msgid ""
 "Password reset failed."
 msgstr "要求确认不了。(您可能已经提交它。)重设密码失败了。"
 
-#: ../../mod/lostpass.php:84 ../../boot.php:1072
+#: ../../mod/lostpass.php:84 ../../boot.php:1149
 msgid "Password Reset"
 msgstr "复位密码"
 
@@ -8970,14 +5785,160 @@ msgstr "私人通信给这个人回被公开。"
 msgid "Invalid contact."
 msgstr "无效熟人。"
 
-#: ../../mod/community.php:23
-msgid "Not available."
-msgstr "不可用的"
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr "无效要求身份号。"
 
-#: ../../mod/photos.php:51 ../../boot.php:1878
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
+#: ../../mod/notifications.php:211
+msgid "Discard"
+msgstr "丢弃"
+
+#: ../../mod/notifications.php:78
+msgid "System"
+msgstr "系统"
+
+#: ../../mod/notifications.php:122
+msgid "Show Ignored Requests"
+msgstr "显示不理的要求"
+
+#: ../../mod/notifications.php:122
+msgid "Hide Ignored Requests"
+msgstr "隐藏不理的要求"
+
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
+msgid "Notification type: "
+msgstr "通知种类："
+
+#: ../../mod/notifications.php:150
+msgid "Friend Suggestion"
+msgstr "朋友建议"
+
+#: ../../mod/notifications.php:152
+#, php-format
+msgid "suggested by %s"
+msgstr "由%s建议的"
+
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
+msgid "Post a new friend activity"
+msgstr "表新朋友活动"
+
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
+msgid "if applicable"
+msgstr "或适用"
+
+#: ../../mod/notifications.php:181
+msgid "Claims to be known to you: "
+msgstr "声称被您认识："
+
+#: ../../mod/notifications.php:181
+msgid "yes"
+msgstr "是"
+
+#: ../../mod/notifications.php:181
+msgid "no"
+msgstr "否"
+
+#: ../../mod/notifications.php:188
+msgid "Approve as: "
+msgstr "批准作为"
+
+#: ../../mod/notifications.php:189
+msgid "Friend"
+msgstr "朋友"
+
+#: ../../mod/notifications.php:190
+msgid "Sharer"
+msgstr "分享者"
+
+#: ../../mod/notifications.php:190
+msgid "Fan/Admirer"
+msgstr "迷／赞赏者"
+
+#: ../../mod/notifications.php:196
+msgid "Friend/Connect Request"
+msgstr "友谊／联络要求"
+
+#: ../../mod/notifications.php:196
+msgid "New Follower"
+msgstr "新关注者："
+
+#: ../../mod/notifications.php:217
+msgid "No introductions."
+msgstr "没有介绍。"
+
+#: ../../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:266 ../../mod/notifications.php:391
+#: ../../mod/notifications.php:478
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "%s不喜欢了%s的消息"
+
+#: ../../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:287 ../../mod/notifications.php:412
+#, php-format
+msgid "%s created a new post"
+msgstr "%s造成新文章"
+
+#: ../../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:302
+msgid "No more network notifications."
+msgstr "没有别的网络通信。"
+
+#: ../../mod/notifications.php:306
+msgid "Network Notifications"
+msgstr "网络通知"
+
+#: ../../mod/notifications.php:332 ../../mod/notify.php:61
+msgid "No more system notifications."
+msgstr "没别系统通知。"
+
+#: ../../mod/notifications.php:336 ../../mod/notify.php:65
+msgid "System Notifications"
+msgstr "系统通知"
+
+#: ../../mod/notifications.php:427
+msgid "No more personal notifications."
+msgstr "没有别的私人通信。"
+
+#: ../../mod/notifications.php:431
+msgid "Personal Notifications"
+msgstr "私人通知"
+
+#: ../../mod/notifications.php:508
+msgid "No more home notifications."
+msgstr "没有别的家通信。"
+
+#: ../../mod/notifications.php:512
+msgid "Home Notifications"
+msgstr "主页通知"
+
+#: ../../mod/photos.php:51 ../../boot.php:1955
 msgid "Photo Albums"
 msgstr "相册"
 
+#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1058
+#: ../../mod/photos.php:1183 ../../mod/photos.php:1206
+#: ../../mod/photos.php:1736 ../../mod/photos.php:1748
+#: ../../view/theme/diabook/theme.php:492
+msgid "Contact Photos"
+msgstr "熟人照片"
+
 #: ../../mod/photos.php:66 ../../mod/photos.php:1222 ../../mod/photos.php:1795
 msgid "Upload New Photos"
 msgstr "上传新照片"
@@ -9015,6 +5976,10 @@ msgstr "%1$s被%3$s标签在%2$s"
 msgid "a photo"
 msgstr "一张照片"
 
+#: ../../mod/photos.php:761
+msgid "Image exceeds size limit of "
+msgstr "图片超出最大尺寸"
+
 #: ../../mod/photos.php:769
 msgid "Image file is empty."
 msgstr "图片文件空的。"
@@ -9097,7 +6062,7 @@ msgid "Use as profile photo"
 msgstr "用为资料图"
 
 #: ../../mod/photos.php:1351 ../../mod/content.php:643
-#: ../../object/Item.php:106
+#: ../../object/Item.php:113
 msgid "Private Message"
 msgstr "私人的新闻"
 
@@ -9147,24 +6112,24 @@ msgid "Public photo"
 msgstr "公开照相"
 
 #: ../../mod/photos.php:1529 ../../mod/content.php:707
-#: ../../object/Item.php:223
+#: ../../object/Item.php:232
 msgid "I like this (toggle)"
 msgstr "我喜欢这(交替)"
 
 #: ../../mod/photos.php:1530 ../../mod/content.php:708
-#: ../../object/Item.php:224
+#: ../../object/Item.php:233
 msgid "I don't like this (toggle)"
 msgstr "我不喜欢这(交替)"
 
 #: ../../mod/photos.php:1549 ../../mod/photos.php:1593
 #: ../../mod/photos.php:1676 ../../mod/content.php:730
-#: ../../object/Item.php:640
+#: ../../object/Item.php:650
 msgid "This is you"
 msgstr "这是你"
 
 #: ../../mod/photos.php:1551 ../../mod/photos.php:1595
 #: ../../mod/photos.php:1678 ../../mod/content.php:732
-#: ../../object/Item.php:329 ../../object/Item.php:642 ../../boot.php:651
+#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:668
 msgid "Comment"
 msgstr "评论"
 
@@ -9357,7 +6322,7 @@ msgid ""
 " features and resources."
 msgstr "我们<strong>帮助</strong>页可查阅到详情关于别的编程特点和资源。"
 
-#: ../../mod/profile.php:21 ../../boot.php:1246
+#: ../../mod/profile.php:21 ../../boot.php:1323
 msgid "Requested profile is not available."
 msgstr "要求的简介联系不上的。"
 
@@ -9365,148 +6330,300 @@ msgstr "要求的简介联系不上的。"
 msgid "Tips for New Members"
 msgstr "提示对新成员"
 
-#: ../../mod/notifications.php:26
-msgid "Invalid request identifier."
-msgstr "无效要求身份号。"
+#: ../../mod/install.php:117
+msgid "Friendica Social Communications Server - Setup"
+msgstr "Friendica社会交通服务器－安装"
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
-#: ../../mod/notifications.php:211
-msgid "Discard"
-msgstr "丢弃"
+#: ../../mod/install.php:123
+msgid "Could not connect to database."
+msgstr "解不了数据库。"
 
-#: ../../mod/notifications.php:78
-msgid "System"
-msgstr "系统"
+#: ../../mod/install.php:127
+msgid "Could not create table."
+msgstr "造成不了表格。"
 
-#: ../../mod/notifications.php:122
-msgid "Show Ignored Requests"
-msgstr "显示不理的要求"
+#: ../../mod/install.php:133
+msgid "Your Friendica site database has been installed."
+msgstr "您Friendica网站数据库被安装了。"
 
-#: ../../mod/notifications.php:122
-msgid "Hide Ignored Requests"
-msgstr "隐藏不理的要求"
+#: ../../mod/install.php:138
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "您可能要手工地进口文件「database.sql」用phpmyadmin或mysql。"
 
-#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
-msgid "Notification type: "
-msgstr "通知种类："
+#: ../../mod/install.php:139 ../../mod/install.php:206
+#: ../../mod/install.php:521
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "请看文件「INSTALL.txt」"
 
-#: ../../mod/notifications.php:150
-msgid "Friend Suggestion"
-msgstr "朋友建议"
+#: ../../mod/install.php:203
+msgid "System check"
+msgstr "系统检测"
 
-#: ../../mod/notifications.php:152
-#, php-format
-msgid "suggested by %s"
-msgstr "由%s建议的"
+#: ../../mod/install.php:208
+msgid "Check again"
+msgstr "再检测"
 
-#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
-msgid "Post a new friend activity"
-msgstr "表新朋友活动"
+#: ../../mod/install.php:227
+msgid "Database connection"
+msgstr "数据库接通"
 
-#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
-msgid "if applicable"
-msgstr "或适用"
+#: ../../mod/install.php:228
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "为安装Friendica我们要知道怎么连接您的数据库。"
 
-#: ../../mod/notifications.php:181
-msgid "Claims to be known to you: "
-msgstr "声称被您认识："
+#: ../../mod/install.php:229
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "你有关于这些设置有问题的话，请给互联网托管服务或者网页管理联系。"
 
-#: ../../mod/notifications.php:181
-msgid "yes"
-msgstr "是"
+#: ../../mod/install.php:230
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "您下边指定的数据库应该已经存在。如果还没有，请继续前造成。"
 
-#: ../../mod/notifications.php:181
-msgid "no"
-msgstr "否"
+#: ../../mod/install.php:234
+msgid "Database Server Name"
+msgstr "数据库服务器名"
 
-#: ../../mod/notifications.php:188
-msgid "Approve as: "
-msgstr "批准作为"
+#: ../../mod/install.php:235
+msgid "Database Login Name"
+msgstr "数据库登录名"
 
-#: ../../mod/notifications.php:189
-msgid "Friend"
-msgstr "朋友"
+#: ../../mod/install.php:236
+msgid "Database Login Password"
+msgstr "数据库登录密码"
 
-#: ../../mod/notifications.php:190
-msgid "Sharer"
-msgstr "分享者"
+#: ../../mod/install.php:237
+msgid "Database Name"
+msgstr "数据库名字"
 
-#: ../../mod/notifications.php:190
-msgid "Fan/Admirer"
-msgstr "迷／赞赏者"
+#: ../../mod/install.php:238 ../../mod/install.php:277
+msgid "Site administrator email address"
+msgstr "网站行政人员邮件地址"
 
-#: ../../mod/notifications.php:196
-msgid "Friend/Connect Request"
-msgstr "友谊／联络要求"
+#: ../../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/notifications.php:196
-msgid "New Follower"
-msgstr "新关注者："
+#: ../../mod/install.php:242 ../../mod/install.php:280
+msgid "Please select a default timezone for your website"
+msgstr "请选择您网站的默认时区"
 
-#: ../../mod/notifications.php:217
-msgid "No introductions."
-msgstr "没有介绍。"
+#: ../../mod/install.php:267
+msgid "Site settings"
+msgstr "网站设置"
 
-#: ../../mod/notifications.php:257 ../../mod/notifications.php:382
-#: ../../mod/notifications.php:469
-#, php-format
-msgid "%s liked %s's post"
-msgstr "%s喜欢了%s的消息"
+#: ../../mod/install.php:321
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "没找到命令行PHP在网服务器PATH。"
 
-#: ../../mod/notifications.php:266 ../../mod/notifications.php:391
-#: ../../mod/notifications.php:478
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "%s不喜欢了%s的消息"
+#: ../../mod/install.php:322
+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 "如果您没有命令行PHP在服务器，您实行不了用cron背景检查。看<a href='http://friendica.com/node/27'>「使安排做的任务可用」</a>"
 
-#: ../../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/install.php:326
+msgid "PHP executable path"
+msgstr "PHP可执行路径"
 
-#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
-#, php-format
-msgid "%s created a new post"
-msgstr "%s造成新文章"
+#: ../../mod/install.php:326
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "输入全路线到php执行程序。您会留空白为继续安装。"
 
-#: ../../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/install.php:331
+msgid "Command line PHP"
+msgstr "命令行PHP"
 
-#: ../../mod/notifications.php:302
-msgid "No more network notifications."
-msgstr "没有别的网络通信。"
+#: ../../mod/install.php:340
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+msgstr "PHP执行程序不是命令行PHP執行檔（有可能是cgi-fgci版本）"
 
-#: ../../mod/notifications.php:306
-msgid "Network Notifications"
-msgstr "网络通知"
+#: ../../mod/install.php:341
+msgid "Found PHP version: "
+msgstr "找到PHP版本号："
 
-#: ../../mod/notifications.php:332 ../../mod/notify.php:61
-msgid "No more system notifications."
-msgstr "没别系统通知。"
+#: ../../mod/install.php:343
+msgid "PHP cli binary"
+msgstr "命令行PHP執行檔"
 
-#: ../../mod/notifications.php:336 ../../mod/notify.php:65
-msgid "System Notifications"
-msgstr "系统通知"
+#: ../../mod/install.php:354
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "您系统的命令行PHP没有能够「register_argc_argv」。"
 
-#: ../../mod/notifications.php:427
-msgid "No more personal notifications."
-msgstr "没有别的私人通信。"
+#: ../../mod/install.php:355
+msgid "This is required for message delivery to work."
+msgstr "这必要为通信发布成功。"
 
-#: ../../mod/notifications.php:431
-msgid "Personal Notifications"
-msgstr "私人通知"
+#: ../../mod/install.php:357
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
-#: ../../mod/notifications.php:508
-msgid "No more home notifications."
-msgstr "没有别的家通信。"
+#: ../../mod/install.php:378
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "错误：这系统的「register_argc_argv」子程序不能产生加密钥匙"
 
-#: ../../mod/notifications.php:512
-msgid "Home Notifications"
-msgstr "主页通知"
+#: ../../mod/install.php:379
+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:381
+msgid "Generate encryption keys"
+msgstr "产生加密钥匙"
+
+#: ../../mod/install.php:388
+msgid "libCurl PHP module"
+msgstr "libCurl PHP模块"
+
+#: ../../mod/install.php:389
+msgid "GD graphics PHP module"
+msgstr "GD显示PHP模块"
+
+#: ../../mod/install.php:390
+msgid "OpenSSL PHP module"
+msgstr "OpenSSL PHP模块"
+
+#: ../../mod/install.php:391
+msgid "mysqli PHP module"
+msgstr "mysqli PHP模块"
+
+#: ../../mod/install.php:392
+msgid "mb_string PHP module"
+msgstr "mb_string PHP模块"
+
+#: ../../mod/install.php:397 ../../mod/install.php:399
+msgid "Apache mod_rewrite module"
+msgstr "Apache mod_rewrite部件"
+
+#: ../../mod/install.php:397
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "错误：Apache服务器的mod-rewrite模块是必要的可却不安装的。"
+
+#: ../../mod/install.php:405
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "错误：libCurl PHP模块是必要的可却不安装的。"
+
+#: ../../mod/install.php:409
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "错误：GD显示PHP模块跟JPEG支持是必要的可却安装的。"
+
+#: ../../mod/install.php:413
+msgid "Error: openssl PHP module required but not installed."
+msgstr "错误：openssl PHP模块是必要的可却不安装的。"
+
+#: ../../mod/install.php:417
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "错误：mysqli PHP模块是必要的可却不安装的。"
+
+#: ../../mod/install.php:421
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "错误：mbstring PHP模块必要可没安装的。"
+
+#: ../../mod/install.php:438
+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:439
+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:440
+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 "这个步骤头，我们给您正文要保存在叫.htconfig.php的文件在您Friendica主文件夹。"
+
+#: ../../mod/install.php:441
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"INSTALL.txt\" for instructions."
+msgstr "或者您会这个步骤不做还是实行手动的安装。请看INSTALL.txt文件为说明。"
+
+#: ../../mod/install.php:444
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php是可写的"
+
+#: ../../mod/install.php:454
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Friendica用Smarty3模板机车为建筑网页。Smarty3把模板编译成PHP为催建筑网页。"
+
+#: ../../mod/install.php:455
+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 "为了保存这些模板，网服务器要写权利于view/smarty3/目录在Friendica主目录下。"
+
+#: ../../mod/install.php:456
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "请保险您网服务器用户（比如www-data）有这个目录的写权利。"
+
+#: ../../mod/install.php:457
+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 "注意：为了安全，您应该只给网服务器写权利于view/smarty3/－没有模板文件（.tpl）之下。"
+
+#: ../../mod/install.php:460
+msgid "view/smarty3 is writable"
+msgstr "能写view/smarty3"
+
+#: ../../mod/install.php:472
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr " URL改写在.htaccess不行。检查您服务器设置。"
+
+#: ../../mod/install.php:474
+msgid "Url rewrite is working"
+msgstr "URL改写发挥机能"
+
+#: ../../mod/install.php:484
+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:508
+msgid "Errors encountered creating database tables."
+msgstr "造成数据库列表相遇错误。"
+
+#: ../../mod/install.php:519
+msgid "<h1>What next</h1>"
+msgstr "<h1>下步是什么</h1>"
+
+#: ../../mod/install.php:520
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "重要：您要[手工地]准备安排的任务给喂器。"
 
 #: ../../mod/oexchange.php:25
 msgid "Post successful."
@@ -9549,6 +6666,10 @@ msgstr "上传文件："
 msgid "Select a profile:"
 msgstr "选择一个简介"
 
+#: ../../mod/profile_photo.php:245
+msgid "Upload"
+msgstr "上传"
+
 #: ../../mod/profile_photo.php:248
 msgid "skip this step"
 msgstr "略过这步"
@@ -9573,97 +6694,105 @@ msgstr "编完了"
 msgid "Image uploaded successfully."
 msgstr "照片成功地上传了"
 
-#: ../../mod/content.php:626 ../../object/Item.php:352
+#: ../../mod/community.php:23
+msgid "Not available."
+msgstr "不可用的"
+
+#: ../../mod/content.php:626 ../../object/Item.php:362
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d评论"
 
-#: ../../mod/content.php:707 ../../object/Item.php:223
+#: ../../mod/content.php:707 ../../object/Item.php:232
 msgid "like"
 msgstr "喜欢"
 
-#: ../../mod/content.php:708 ../../object/Item.php:224
+#: ../../mod/content.php:708 ../../object/Item.php:233
 msgid "dislike"
 msgstr "讨厌"
 
-#: ../../mod/content.php:710 ../../object/Item.php:226
+#: ../../mod/content.php:710 ../../object/Item.php:235
 msgid "Share this"
 msgstr "分享这个"
 
-#: ../../mod/content.php:710 ../../object/Item.php:226
+#: ../../mod/content.php:710 ../../object/Item.php:235
 msgid "share"
 msgstr "分享"
 
-#: ../../mod/content.php:734 ../../object/Item.php:644
+#: ../../mod/content.php:734 ../../object/Item.php:654
 msgid "Bold"
 msgstr "粗体字 "
 
-#: ../../mod/content.php:735 ../../object/Item.php:645
+#: ../../mod/content.php:735 ../../object/Item.php:655
 msgid "Italic"
 msgstr "斜体 "
 
-#: ../../mod/content.php:736 ../../object/Item.php:646
+#: ../../mod/content.php:736 ../../object/Item.php:656
 msgid "Underline"
 msgstr "下划线"
 
-#: ../../mod/content.php:737 ../../object/Item.php:647
+#: ../../mod/content.php:737 ../../object/Item.php:657
 msgid "Quote"
 msgstr "引语"
 
-#: ../../mod/content.php:738 ../../object/Item.php:648
+#: ../../mod/content.php:738 ../../object/Item.php:658
 msgid "Code"
 msgstr "源代码"
 
-#: ../../mod/content.php:739 ../../object/Item.php:649
+#: ../../mod/content.php:739 ../../object/Item.php:659
 msgid "Image"
 msgstr "图片"
 
-#: ../../mod/content.php:740 ../../object/Item.php:650
+#: ../../mod/content.php:740 ../../object/Item.php:660
 msgid "Link"
 msgstr "环节"
 
-#: ../../mod/content.php:741 ../../object/Item.php:651
+#: ../../mod/content.php:741 ../../object/Item.php:661
 msgid "Video"
 msgstr "录像"
 
-#: ../../mod/content.php:776 ../../object/Item.php:202
+#: ../../mod/content.php:776 ../../object/Item.php:211
 msgid "add star"
 msgstr "加星"
 
-#: ../../mod/content.php:777 ../../object/Item.php:203
+#: ../../mod/content.php:777 ../../object/Item.php:212
 msgid "remove star"
 msgstr "消星"
 
-#: ../../mod/content.php:778 ../../object/Item.php:204
+#: ../../mod/content.php:778 ../../object/Item.php:213
 msgid "toggle star status"
 msgstr "转变星现状"
 
-#: ../../mod/content.php:781 ../../object/Item.php:207
+#: ../../mod/content.php:781 ../../object/Item.php:216
 msgid "starred"
 msgstr "被贴星"
 
-#: ../../mod/content.php:782 ../../object/Item.php:212
+#: ../../mod/content.php:782 ../../object/Item.php:221
 msgid "add tag"
 msgstr "加标签"
 
-#: ../../mod/content.php:786 ../../object/Item.php:123
+#: ../../mod/content.php:786 ../../object/Item.php:130
 msgid "save to folder"
 msgstr "保存在文件夹"
 
-#: ../../mod/content.php:877 ../../object/Item.php:299
+#: ../../mod/content.php:877 ../../object/Item.php:308
 msgid "to"
 msgstr "至"
 
-#: ../../mod/content.php:878 ../../object/Item.php:301
+#: ../../mod/content.php:878 ../../object/Item.php:310
 msgid "Wall-to-Wall"
 msgstr "从墙到墙"
 
-#: ../../mod/content.php:879 ../../object/Item.php:302
+#: ../../mod/content.php:879 ../../object/Item.php:311
 msgid "via Wall-To-Wall:"
 msgstr "通过从墙到墙"
 
-#: ../../object/Item.php:300
+#: ../../object/Item.php:92
+msgid "This entry was edited"
+msgstr "这个文章被编辑了"
+
+#: ../../object/Item.php:309
 msgid "via"
 msgstr "经过"
 
@@ -9828,128 +6957,128 @@ msgstr "文章"
 msgid "Textareas font size"
 msgstr "文本区字体大小"
 
-#: ../../index.php:400
+#: ../../index.php:405
 msgid "toggle mobile"
 msgstr "交替手机"
 
-#: ../../boot.php:650
+#: ../../boot.php:667
 msgid "Delete this item?"
 msgstr "删除这个项目？"
 
-#: ../../boot.php:653
+#: ../../boot.php:670
 msgid "show fewer"
 msgstr "显示更小"
 
-#: ../../boot.php:920
+#: ../../boot.php:997
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "更新%s美通过。看错误记录。"
 
-#: ../../boot.php:922
+#: ../../boot.php:999
 #, php-format
 msgid "Update Error at %s"
 msgstr "更新错误在%s"
 
-#: ../../boot.php:1032
+#: ../../boot.php:1109
 msgid "Create a New Account"
 msgstr "创造新的账户"
 
-#: ../../boot.php:1060
+#: ../../boot.php:1137
 msgid "Nickname or Email address: "
 msgstr "绰号或电子邮件地址: "
 
-#: ../../boot.php:1061
+#: ../../boot.php:1138
 msgid "Password: "
 msgstr "密码: "
 
-#: ../../boot.php:1062
+#: ../../boot.php:1139
 msgid "Remember me"
 msgstr "记住我"
 
-#: ../../boot.php:1065
+#: ../../boot.php:1142
 msgid "Or login using OpenID: "
 msgstr "或者用OpenID登记："
 
-#: ../../boot.php:1071
+#: ../../boot.php:1148
 msgid "Forgot your password?"
 msgstr "忘记你的密码吗？"
 
-#: ../../boot.php:1074
+#: ../../boot.php:1151
 msgid "Website Terms of Service"
 msgstr "网站的各项规定"
 
-#: ../../boot.php:1075
+#: ../../boot.php:1152
 msgid "terms of service"
 msgstr "各项规定"
 
-#: ../../boot.php:1077
+#: ../../boot.php:1154
 msgid "Website Privacy Policy"
 msgstr "网站隐私政策"
 
-#: ../../boot.php:1078
+#: ../../boot.php:1155
 msgid "privacy policy"
 msgstr "隐私政策"
 
-#: ../../boot.php:1207
+#: ../../boot.php:1284
 msgid "Requested account is not available."
 msgstr "要求的账户不可用。"
 
-#: ../../boot.php:1286 ../../boot.php:1390
+#: ../../boot.php:1363 ../../boot.php:1467
 msgid "Edit profile"
 msgstr "修改简介"
 
-#: ../../boot.php:1352
+#: ../../boot.php:1429
 msgid "Message"
 msgstr "通知"
 
-#: ../../boot.php:1360
+#: ../../boot.php:1437
 msgid "Manage/edit profiles"
 msgstr "管理/修改简介"
 
-#: ../../boot.php:1489 ../../boot.php:1575
+#: ../../boot.php:1566 ../../boot.php:1652
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../boot.php:1490 ../../boot.php:1576
+#: ../../boot.php:1567 ../../boot.php:1653
 msgid "F d"
 msgstr "F d"
 
-#: ../../boot.php:1535 ../../boot.php:1616
+#: ../../boot.php:1612 ../../boot.php:1693
 msgid "[today]"
 msgstr "[今天]"
 
-#: ../../boot.php:1547
+#: ../../boot.php:1624
 msgid "Birthday Reminders"
 msgstr "提醒生日"
 
-#: ../../boot.php:1548
+#: ../../boot.php:1625
 msgid "Birthdays this week:"
 msgstr "这周的生日:"
 
-#: ../../boot.php:1609
+#: ../../boot.php:1686
 msgid "[No description]"
 msgstr "[无描述]"
 
-#: ../../boot.php:1627
+#: ../../boot.php:1704
 msgid "Event Reminders"
 msgstr "事件提醒"
 
-#: ../../boot.php:1628
+#: ../../boot.php:1705
 msgid "Events this week:"
 msgstr "这周的事件:"
 
-#: ../../boot.php:1864
+#: ../../boot.php:1941
 msgid "Status Messages and Posts"
 msgstr "现状通知和文章"
 
-#: ../../boot.php:1871
+#: ../../boot.php:1948
 msgid "Profile Details"
 msgstr "简介内容"
 
-#: ../../boot.php:1888
+#: ../../boot.php:1965
 msgid "Events and Calendar"
 msgstr "项目和日历"
 
-#: ../../boot.php:1895
+#: ../../boot.php:1972
 msgid "Only You Can See This"
 msgstr "只您许看这个"
diff --git a/view/zh-cn/strings.php b/view/zh-cn/strings.php
index f038e6bad9..da920f55dd 100644
--- a/view/zh-cn/strings.php
+++ b/view/zh-cn/strings.php
@@ -5,611 +5,22 @@ function string_plural_select_zh_cn($n){
 	return 0;;
 }}
 ;
-$a->strings["Altpager settings updated."] = "Altpager设置更新了。";
-$a->strings["Alternate Pagination Setting"] = "供替换的分页设置";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "用到「更新」和「更旧」页代替页数？";
-$a->strings["Submit"] = "提交";
-$a->strings["Bg settings updated."] = "Bg设置更新了";
-$a->strings["Bg Settings"] = "Bg设置";
-$a->strings["How many contacts to display on profile sidebar"] = "多少熟人表示在简介工具栏";
-$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["Post to blogger"] = "转播到blogger";
-$a->strings["Blogger Post Settings"] = "Blogger转播设置";
-$a->strings["Enable Blogger Post Plugin"] = "使Blogger转播插件可用";
-$a->strings["Blogger username"] = "Blogger用户名";
-$a->strings["Blogger password"] = "Blogger密码";
-$a->strings["Blogger API URL"] = "Blogger API URL";
-$a->strings["Post to Blogger by default"] = "默认地转播到Blogger";
-$a->strings["Post from Friendica"] = "文章从Friendica";
-$a->strings["Report Bug"] = "报案程序错误";
-$a->strings["Login"] = "登录";
-$a->strings["OpenID"] = "OpenID";
-$a->strings["Latest users"] = "最近用户";
-$a->strings["Most active users"] = "最积极用户";
-$a->strings["Latest photos"] = "最近照片";
-$a->strings["Contact Photos"] = "熟人照片";
-$a->strings["Profile Photos"] = "简介照片";
-$a->strings["Latest likes"] = "最近喜欢";
-$a->strings["event"] = "项目";
-$a->strings["status"] = "现状";
-$a->strings["photo"] = "照片";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s喜欢%2\$s的%3\$s";
-$a->strings["Welcome to %s"] = "%s欢迎你";
-$a->strings["Private Events"] = "私人项目";
-$a->strings["Private Addressbooks"] = "私人通讯录";
-$a->strings["No access"] = "看不了";
-$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "美国时间形式（月／日／年）";
-$a->strings["German Time Format (dd.mm.YYYY)"] = "德国时间形式（日／月／年）";
-$a->strings["Could not open component for editing"] = "开不了部件为编辑";
-$a->strings["Go back to the calendar"] = "返回日历";
-$a->strings["Event data"] = "项目内容";
-$a->strings["Calendar"] = "日历";
-$a->strings["Special color"] = "特别颜色";
-$a->strings["Subject"] = "题目";
-$a->strings["Starts"] = "开始";
-$a->strings["Ends"] = "结束";
-$a->strings["Location"] = "位置";
-$a->strings["Description"] = "描述";
-$a->strings["Recurrence"] = "复发";
-$a->strings["Frequency"] = "频率";
-$a->strings["None"] = "没有";
-$a->strings["Daily"] = "每日";
-$a->strings["Weekly"] = "每周";
-$a->strings["Monthly"] = "每月";
-$a->strings["Yearly"] = "一年一次";
-$a->strings["days"] = "天";
-$a->strings["weeks"] = "星期";
-$a->strings["months"] = "月";
-$a->strings["years"] = "年";
-$a->strings["Interval"] = "间隔";
-$a->strings["All %select% %time%"] = "每%select%%time%";
-$a->strings["Days"] = "天";
-$a->strings["Sunday"] = "星期天";
-$a->strings["Monday"] = "星期一";
-$a->strings["Tuesday"] = "星期二";
-$a->strings["Wednesday"] = "星期三";
-$a->strings["Thursday"] = "星期四";
-$a->strings["Friday"] = "星期五";
-$a->strings["Saturday"] = "星期六";
-$a->strings["First day of week:"] = "星期第一天：";
-$a->strings["Day of month"] = "月里天数";
-$a->strings["#num#th of each month"] = "每月第#num#个";
-$a->strings["#num#th-last of each month"] = "每月第#num#个最后";
-$a->strings["#num#th #wkday# of each month"] = "每月第#num#个#wkday#";
-$a->strings["#num#th-last #wkday# of each month"] = "每月第#num#个最后#wkday#";
-$a->strings["Month"] = "月";
-$a->strings["#num#th of the given month"] = "月第#num#个天";
-$a->strings["#num#th-last of the given month"] = "月第#num#个最后天";
-$a->strings["#num#th #wkday# of the given month"] = "月第#num#个#wkday#";
-$a->strings["#num#th-last #wkday# of the given month"] = "月第#num#个最后#wkday#";
-$a->strings["Repeat until"] = "重复到";
-$a->strings["Infinite"] = "无限的";
-$a->strings["Until the following date"] = "到下个日期";
-$a->strings["Number of times"] = "多少次";
-$a->strings["Exceptions"] = "除外";
-$a->strings["none"] = "没有";
-$a->strings["Notification"] = "通知";
-$a->strings["Notify by"] = "用地方法为通知";
-$a->strings["Remove"] = "移走";
-$a->strings["E-Mail"] = "电子邮件";
-$a->strings["On Friendica / Display"] = "在Friendica／表示";
-$a->strings["Time"] = "时间";
-$a->strings["Hours"] = "小时";
-$a->strings["Minutes"] = "分钟";
-$a->strings["Seconds"] = "秒";
-$a->strings["Weeks"] = "周";
-$a->strings["before the"] = "前";
-$a->strings["start of the event"] = "项目开始";
-$a->strings["end of the event"] = "项目结束";
-$a->strings["Add a notification"] = "加一个通知";
-$a->strings["The event #name# will start at #date"] = "项目#name#开始在#date";
-$a->strings["#name# is about to begin."] = "#name#快开始。";
-$a->strings["Saved"] = "保存了";
-$a->strings["Private Calendar"] = "私人日历";
-$a->strings["Friendica Events: Mine"] = "Friendica项目：我的";
-$a->strings["Friendica Events: Contacts"] = "Friendica项目：熟人";
-$a->strings["Private Addresses"] = "私人地址";
-$a->strings["Friendica Contacts"] = "Friendica熟人";
-$a->strings["Friendica-Native events"] = "本Friendica项目";
-$a->strings["Friendica-Contacts"] = "Friendica熟人";
-$a->strings["Your Friendica-Contacts"] = "您的Friendica熟人";
-$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "进口文件出了问题。不好意思。可能一些项目却是成功地进口了。";
-$a->strings["Something went wrong when trying to import the file. Sorry."] = "进口文件出了问题。不好意思。";
-$a->strings["The ICS-File has been imported."] = "把ICS文件进口了。";
-$a->strings["No file was uploaded."] = "没有上传的文件。";
-$a->strings["Import a ICS-file"] = "进口ICS文件";
-$a->strings["ICS-File"] = "ICS文件";
-$a->strings["Overwrite all #num# existing events"] = "替换所有#num#现有的项目";
-$a->strings["Upload"] = "上传";
-$a->strings["Settings"] = "配置";
-$a->strings["Help"] = "帮助";
-$a->strings["New event"] = "新项目";
-$a->strings["Today"] = "今天";
-$a->strings["Day"] = "天";
-$a->strings["Week"] = "周";
-$a->strings["Reload"] = "再装入";
-$a->strings["Previous"] = "上";
-$a->strings["Next"] = "下";
-$a->strings["Date"] = "日期";
-$a->strings["Error"] = "错误";
-$a->strings["Permission denied."] = "权限不够。";
-$a->strings["The new values have been saved."] = "新的设置保存了。";
-$a->strings["The calendar has been updated."] = "日历更新了。";
-$a->strings["The new calendar has been created."] = "新日历创造了。";
-$a->strings["The calendar has been deleted."] = "日历删除了。";
-$a->strings["Calendar Settings"] = "日历设置";
-$a->strings["Date format"] = "日期形式";
-$a->strings["Time zone"] = "时区";
-$a->strings["Save"] = "保存";
-$a->strings["Calendars"] = "日历";
-$a->strings["Create a new calendar"] = "创造新日历";
-$a->strings["Limitations"] = "限制";
-$a->strings["Warning"] = "警告";
-$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "同步（iPhone，Thunderbird Lightning, 案桌，等）";
-$a->strings["Synchronizing this calendar with the iPhone"] = "正在把这个日历跟iPhone同步";
-$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "正在把您的Friendica熟人跟iPhone同步";
-$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "现有的插件没安装好。请跟系统管理您的friendica安装联系为维修。";
-$a->strings["Extended calendar with CalDAV-support"] = "增能日历跟CalDAV支持";
-$a->strings["noreply"] = "noreply";
-$a->strings["Notification: "] = "通知：";
-$a->strings["The database tables have been installed."] = "数据库表格被安装了。";
-$a->strings["An error occurred during the installation."] = "安装出错误。";
-$a->strings["The database tables have been updated."] = "数据库表格更新了。";
-$a->strings["An error occurred during the update."] = "更新出了问题。";
-$a->strings["No system-wide settings yet."] = "还没有系统设置。";
-$a->strings["Database status"] = "数据库现状";
-$a->strings["Installed"] = "安装了";
-$a->strings["Upgrade needed"] = "必须更新";
-$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "请备份所有的日历数据（表格有前缀「dav_」）继续之前。虽然所有的日历项目<i>应该</i>被转化成新数据库体系，备份总是最好。下边您会看数据库命令进行按「更新」按钮的时候。";
-$a->strings["Upgrade"] = "更新";
-$a->strings["Not installed"] = "没安装";
-$a->strings["Install"] = "安装";
-$a->strings["Unknown"] = "不知道的";
-$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "出什么真糟糕的问题。我不能自动地恢复，不好意思。请看数据库系统，备份数据，而手动地把所有前缀着「dav_」表格删除。之后，这个安装程序应该能把表格自动地初始化。";
-$a->strings["Troubleshooting"] = "调试";
-$a->strings["Manual creation of the database tables:"] = "手动造成数据库表格：";
-$a->strings["Show SQL-statements"] = "表示SQL陈述";
-$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["Post to Dreamwidth"] = "转播到Dreamwidth";
-$a->strings["Dreamwidth Post Settings"] = "Dreamwidth转播设置";
-$a->strings["Enable dreamwidth Post Plugin"] = "使Dreamwidth转播插件可用";
-$a->strings["dreamwidth username"] = "Dreamwidth用户名";
-$a->strings["dreamwidth password"] = "Dreamwidth密码";
-$a->strings["Post to dreamwidth by default"] = "默认地转播到Dreamwidth";
-$a->strings["Editplain settings updated."] = "Editplain设置更新了";
-$a->strings["Editplain Settings"] = "Editplain设置";
-$a->strings["Disable richtext status editor"] = "使richtext现状编辑 不能用";
-$a->strings["Settings updated."] = "设置跟新了";
-$a->strings["Facebook disabled"] = "Facebook废";
-$a->strings["Updating contacts"] = "正才更新熟人";
-$a->strings["Facebook API key is missing."] = "Facebook API钥匙失踪的。";
-$a->strings["Facebook Connect"] = "Facebook联络";
-$a->strings["Install Facebook connector for this account."] = "安装Facebook连接器为这个账户。";
-$a->strings["Remove Facebook connector"] = "删除Facebook连接器";
-$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "复认证[这是必要的每当您Facebook密码变化了]";
-$a->strings["Post to Facebook by default"] = "默认地放在Facebook";
-$a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "这个网站使Facebook朋友环节不能用。这下的设置没有印象。";
-$a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "这个网站使Facebook朋友环节不能用。假如那样的话您不会再使可用的。";
-$a->strings["Link all your Facebook friends and conversations on this website"] = "连接您所有的Facebook朋友们和交流在这个网站";
-$a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Facebook交流由您的<em>简介墙</em>和您朋友的<em>溪流</em>组成。 ";
-$a->strings["On this website, your Facebook friend stream is only visible to you."] = "在这个网站，您Facebook朋友溪流是只您可见的。";
-$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "下面的设置决定您在这个网站Facebook简介墙的隐私。";
-$a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "在这个网站您Facebook简介墙交流是只您可见的。";
-$a->strings["Do not import your Facebook profile wall conversations"] = "别进口您Facebook简介墙交流";
-$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"] = "Facebook实时更新有问题";
-$a->strings["Administrator"] = "管理员";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Facebook Connector Settings"] = "Facebook连接器设置";
-$a->strings["Facebook API Key"] = "Facebook API密码";
-$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>"] = "错误：看上去您输入App-ID和-Secret在您的.htconfig.php文件。它们那里输入的时候，您不能把他们在这个表格输入。<br><br>";
-$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "错误：输入的API密码显得不对（取回不了应用代金券）。";
-$a->strings["The given API Key seems to work correctly."] = "输入的API密码显得对地运行。";
-$a->strings["The correctness of the API Key could not be detected. Something strange's going on."] = "API钥匙的正确性发现不了。什么奇怪的进行";
-$a->strings["App-ID / API-Key"] = "App-ID / API-Key";
-$a->strings["Application secret"] = "应用密码";
-$a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "核实间隔分钟（最少%1\$s分钟）";
-$a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "同步评论（无Facebook评论错过了，代价增添系统工作量）";
-$a->strings["Real-Time Updates"] = "实时更新";
-$a->strings["Real-Time Updates are activated."] = "实时更新使活动";
-$a->strings["Deactivate Real-Time Updates"] = "使实时更新不活动";
-$a->strings["Real-Time Updates not activated."] = "实时更新使不活动";
-$a->strings["Activate Real-Time Updates"] = "使实时更新活动";
-$a->strings["Post to Facebook"] = "放在Facebook";
-$a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "发送到Facebook取消由于多网络准许矛盾。";
-$a->strings["View on Friendica"] = "看在Friendica";
-$a->strings["Facebook post failed. Queued for retry."] = "Facebook发送失败了。排队着待再试。";
-$a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "您Facebook联系成无效的。请再认证。";
-$a->strings["Facebook connection became invalid"] = "Facebook联系成无效的";
-$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "你好%1\$s,⏎ ⏎ 您账户在%2\$s和Facebook的接通无效了。平时这是因为您把密码改变了。为使接通再可用，您要%3\$s再认证Facebook连接器%4\$s。";
-$a->strings["Facebook Post disabled"] = "使Facebook文章不可用的";
-$a->strings["Facebook Post"] = "Facebook文章";
-$a->strings["Install Facebook Post connector for this account."] = "安装Facebook文章连接器为这个账户";
-$a->strings["Remove Facebook Post connector"] = "把Facebook文章连接器删除";
-$a->strings["Facebook Post Settings"] = "Facebook文章设置";
-$a->strings["Forums"] = "论坛";
-$a->strings["show/hide"] = "表示／隐藏";
-$a->strings["No forum subscriptions"] = "没有评坛订阅";
-$a->strings["Forums:"] = "评坛：";
-$a->strings["Forumlist settings updated."] = "评坛单设置更新了。";
-$a->strings["Forumlist Settings"] = "评坛单设置";
-$a->strings["Randomise forum list"] = "洗牌评坛单";
-$a->strings["Show forums on profile page"] = "表示评坛在简介页";
-$a->strings["Show forums on network page"] = "表示评坛在网络页";
-$a->strings["Fromapp settings updated."] = "Fromapp设置更新了";
-$a->strings["FromApp Settings"] = "Fromapp设置";
-$a->strings["The application name you would like to show your posts originating from."] = "应用名您想当您文章的来源";
-$a->strings["Use this application name even if another application was used."] = "连别应用是用了也用这名。";
-$a->strings["Google+ Import Settings"] = "Google+进口设置";
-$a->strings["Enable Google+ Import"] = "使Google+进口可用";
-$a->strings["Google Account ID"] = "Google+用户名";
-$a->strings["Google+ Import Settings saved."] = "把Google+进口设置保存了";
-$a->strings["Geonames settings updated."] = "Geonames设置更新了。";
-$a->strings["Geonames Settings"] = "Geonames设置";
-$a->strings["Enable Geonames Plugin"] = "使Geonames插件能用";
-$a->strings["Gnot settings updated."] = "Gnot设置更新了。";
-$a->strings["Gnot Settings"] = "Gnot设置";
-$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "允许邮件评论通知在Gmail和匿名话题行。";
-$a->strings["Enable this plugin/addon?"] = "使这个插件／加件可用？";
-$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify]评论在交流#%d";
-$a->strings["generic profile image"] = "通用简介图片";
-$a->strings["random geometric pattern"] = "随机的几何图案";
-$a->strings["monster face"] = "怪物面子";
-$a->strings["computer generated face"] = "电脑造成的面子";
-$a->strings["retro arcade style face"] = "复古游乐场式面子";
-$a->strings["Information"] = "信息";
-$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."] = "Libravatar加件页安装着。请是Libravatar加件或者这个Gravatar加件。<br>Libravatar加件没找到在Libravatar的时候可依靠的是Gravatar";
-$a->strings["Default avatar image"] = "默认纸娃娃系统";
-$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "如果Gravatar上没找到纸娃娃系统选择默认的。看README";
-$a->strings["Rating of images"] = "照相评定";
-$a->strings["Select the appropriate avatar rating for your site. See README"] = "选择适合您网站的纸娃娃系统。看README";
-$a->strings["Gravatar settings updated."] = "Gravatar设置更新了。";
-$a->strings["Group Text"] = "组正文";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "用光正文（无图片）组选择器在「组编辑」单";
-$a->strings["Post to Insanejournal"] = "转播到Insanejournal";
-$a->strings["InsaneJournal Post Settings"] = "Insanejournal转播设置";
-$a->strings["Enable InsaneJournal Post Plugin"] = "使InsaneJournal转播插件可用";
-$a->strings["InsaneJournal username"] = "InsaneJournal用户名";
-$a->strings["InsaneJournal password"] = "InsaneJournal密码";
-$a->strings["Post to InsaneJournal by default"] = "默认地转播到InsaneJournal";
-$a->strings["Impressum"] = "Impressum(法定的出版信息)";
-$a->strings["Site Owner"] = "网站主";
-$a->strings["Email Address"] = "电子邮件地址";
-$a->strings["Postal Address"] = "邮政邮件地址";
-$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Impressum插件必须被设置！<br />请加至少<tt>owner</tt>变量在您的设置文件。关于别的变量请指插件的README文件。";
-$a->strings["The page operators name."] = "也运作员名。";
-$a->strings["Site Owners Profile"] = "网站主的简介";
-$a->strings["Profile address of the operator."] = "运作员的简介地址。";
-$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "怎么用邮政跟运作员联系。您会用BBCode。";
-$a->strings["Notes"] = "便条";
-$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "附加的便条表示在联系消息下。您会用BBCode。";
-$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "怎么用电子邮件跟运作员联系。（将使混乱的表示）";
-$a->strings["Footer note"] = "页脚便条";
-$a->strings["Text for the footer. You can use BBCode here."] = "页脚征文。您会用BBCode。";
-$a->strings["Infinite Improbability Drive"] = "无穷不至于机车";
-$a->strings["IRC Settings"] = "IRC设置";
-$a->strings["Channel(s) to auto connect (comma separated)"] = "频道要自动地连接（逗号分隔）";
-$a->strings["Popular Channels (comma separated)"] = "流行频道（逗号分隔）";
-$a->strings["IRC settings saved."] = "IRC设置保存了。";
-$a->strings["IRC Chatroom"] = "IRC聊间";
-$a->strings["Popular Channels"] = "流行频道";
-$a->strings["Jappix Mini addon settings"] = "Jappix Mini加件设置";
-$a->strings["Activate addon"] = "使加件可用";
-$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "<em>别</em>把Jappixmini聊小窗插入网用户界面";
-$a->strings["Jabber username"] = "Jabber用户名";
-$a->strings["Jabber server"] = "Jabber服务器";
-$a->strings["Jabber BOSH host"] = "Jabber BOSH主机";
-$a->strings["Jabber password"] = "Jabber密码";
-$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "把Jabber密码跟Friendica密码加密（推荐的）";
-$a->strings["Friendica password"] = "Friendica密码";
-$a->strings["Approve subscription requests from Friendica contacts automatically"] = "自动地批准从Friendica熟人的订阅要求";
-$a->strings["Subscribe to Friendica contacts automatically"] = "自动地订阅Friendica熟人";
-$a->strings["Purge internal list of jabber addresses of contacts"] = "把熟人jabber地址从内部单";
-$a->strings["Add contact"] = "加熟人";
-$a->strings["Upload a file"] = "上传文件";
-$a->strings["Drop files here to upload"] = "在这儿放文件为上传";
-$a->strings["Cancel"] = "退消";
-$a->strings["Failed"] = "失败";
-$a->strings["No files were uploaded."] = "没有文件上传。";
-$a->strings["Uploaded file is empty"] = "上传的文件空的";
-$a->strings["Image exceeds size limit of "] = "图片超出最大尺寸";
-$a->strings["File has an invalid extension, it should be one of "] = "文件扩展名无效的，应该是这些一个：";
-$a->strings["Upload was cancelled, or server error encountered"] = "上传注销了，或相遇服务器错误";
-$a->strings["Post to libertree"] = "转播到libertree";
-$a->strings["libertree Post Settings"] = "libertree转播设置";
-$a->strings["Enable Libertree Post Plugin"] = "使Libertree转播插件可用";
-$a->strings["Libertree API token"] = "Libertree API令牌";
-$a->strings["Libertree site URL"] = "Libertree网站URL";
-$a->strings["Post to Libertree by default"] = "默认地转播到Libertree";
-$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "安装不了Libravatar。<br>它要求PHP>=5.3";
-$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "您PHP版体数%s是比要求的5.3少。";
-$a->strings["This addon is not functional on your server."] = "这个加件在您的服务器不可用的";
-$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Gravatar加件安装着。请使Gravatar加件不可用。<br>如果找不到什么在Libravatar加件可依靠的是Gravatar。";
-$a->strings["Select default avatar image if none was found. See README"] = "选择默认纸娃娃系统如果一个也找不到。看README";
-$a->strings["Libravatar settings updated."] = "Libravatar设置更新了。";
-$a->strings["Post to LiveJournal"] = "转播到LiveJournal";
-$a->strings["LiveJournal Post Settings"] = "LiveJournal转播设置";
-$a->strings["Enable LiveJournal Post Plugin"] = "使Livejournal转播插件可用";
-$a->strings["LiveJournal username"] = "LiveJournal用户名";
-$a->strings["LiveJournal password"] = "LiveJournal密码";
-$a->strings["Post to LiveJournal by default"] = "默认地转播到LiveJournal";
-$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."] = "MathJax插件表示用LaTeX句法的数学公式，围绕\$\$或者eqnarray快，在您墙，网络分页和私人收件箱的文章。";
-$a->strings["Use the MathJax renderer"] = "用MathJax表示器";
-$a->strings["MathJax Base URL"] = "MathJax基础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."] = "URL JavaScript文件应该包括为用MathJax。可以MathJax CDN或者别的MathJax安装。";
-$a->strings["Member since:"] = "客人从：";
-$a->strings["bitchslap"] = "恶毒掌击";
-$a->strings["bitchslapped"] = "恶毒掌击了";
-$a->strings["shag"] = "肏";
-$a->strings["shagged"] = "肏了";
-$a->strings["do something obscenely biological to"] = "做什么淫秽生物的于";
-$a->strings["did something obscenely biological to"] = "做了什么淫秽生物的于";
-$a->strings["point out the poke feature to"] = "把戳特点指给";
-$a->strings["pointed out the poke feature to"] = "把了戳特点指给";
-$a->strings["declare undying love for"] = "表明永远的爱情为";
-$a->strings["declared undying love for"] = "表明了永远的爱情为";
-$a->strings["patent"] = "专利";
-$a->strings["patented"] = "专利了";
-$a->strings["stroke beard"] = "摸胡子";
-$a->strings["stroked their beard at"] = "摸胡子了";
-$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "哀叹现代的二三等教育规格的衰退给";
-$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "哀叹现代的二三等教育规格的衰退给";
-$a->strings["hug"] = "拥抱";
-$a->strings["hugged"] = "拥抱了";
-$a->strings["kiss"] = "亲吻";
-$a->strings["kissed"] = "亲吻了";
-$a->strings["raise eyebrows at"] = "举起眉毛于";
-$a->strings["raised their eyebrows at"] = "举起了眉毛于";
-$a->strings["insult"] = "侮辱";
-$a->strings["insulted"] = "侮辱";
-$a->strings["praise"] = "赞扬";
-$a->strings["praised"] = "赞扬了";
-$a->strings["be dubious of"] = "怀疑";
-$a->strings["was dubious of"] = "怀疑了";
-$a->strings["eat"] = "吃";
-$a->strings["ate"] = "吃了";
-$a->strings["giggle and fawn at"] = "咯咯地笑和巴结为";
-$a->strings["giggled and fawned at"] = "咯咯地笑和巴结为了";
-$a->strings["doubt"] = "怀疑";
-$a->strings["doubted"] = "怀疑了";
-$a->strings["glare"] = "瞪";
-$a->strings["glared at"] = "瞪了";
-$a->strings["No Timeline settings updated."] = "没有时间链设置更新";
-$a->strings["No Timeline Settings"] = "没有时间链设置";
-$a->strings["Disable Archive selector on profile wall"] = "使在简介墙上档案选择器不能用";
-$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."] = "这个插件搜索您下面输入的词／正文在所有的文章里，和把包含那些关键词的内容隐藏，省得不妥当的时候表示，比如性的影射在办公室里。是礼貌和建议的把什么包括裸体的内容跟#NSFW标签。这个过滤也会符合设么别的您输入的词，从而能当通用内容过滤有用的。";
-$a->strings["Enable Content filter"] = "使内容过滤可用";
-$a->strings["Comma separated list of keywords to hide"] = "逗号分隔单词要隐藏";
-$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["Numfriends settings updated."] = "Numfriends设置更新了";
-$a->strings["Numfriends Settings"] = "Numfriends设置";
-$a->strings["OEmbed settings updated"] = "OEmbed设置更新了";
-$a->strings["Use OEmbed for YouTube videos"] = "用OEmbed为YouTube视频";
-$a->strings["URL to embed:"] = "URL要嵌入：";
-$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["show more"] = "看多";
-$a->strings["Page settings updated."] = "页设置更新了";
-$a->strings["Page Settings"] = "页设置";
-$a->strings["How many forums to display on sidebar without paging"] = "多少评坛要在工具栏上表示无分页";
-$a->strings["Randomise Page/Forum list"] = "把页／评坛单洗牌";
-$a->strings["Show pages/forums on profile page"] = "表示页／评坛在简介页";
-$a->strings["\"pageheader\" Settings"] = "\"pageheader";
-$a->strings["pageheader Settings saved."] = "pageHeader配置保存了。";
-$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)"] = "绝对道路到Piwik安装。（没有协议（http/s）跟斜线后缀）";
-$a->strings["Site ID"] = "网站ID";
-$a->strings["Show opt-out cookie link?"] = " 显示选择性退出cookie按钮？";
-$a->strings["Asynchronous tracking"] = "异步追踪";
-$a->strings["Planets Settings"] = "行星设置";
-$a->strings["Enable Planets Plugin"] = "使行星插件可用";
-$a->strings["Post to Posterous"] = "发送往Posterous";
-$a->strings["Posterous Post Settings"] = "Posterous发送设置";
-$a->strings["Enable Posterous Post Plugin"] = "使Posterous发送插件可用的";
-$a->strings["Posterous login"] = "Posterous登记名";
-$a->strings["Posterous password"] = "Posterous密码";
-$a->strings["Posterous site ID"] = "Posterous网站身份证明";
-$a->strings["Posterous API token"] = "Posterous API令牌";
-$a->strings["Post to Posterous by default"] = "默认地发送往Posterous";
-$a->strings["Lifetime of the cache (in hours)"] = "缓存期（小时）";
-$a->strings["Cache Statistics"] = "缓存统计";
-$a->strings["Number of items"] = "项目数量";
-$a->strings["Size of the cache"] = "缓存尺寸";
-$a->strings["Delete the whole cache"] = "删除全缓存";
-$a->strings["Your account on %s will expire in a few days."] = "您账户在%s几天后过期了。";
-$a->strings["Your Friendica account is about to expire."] = "您Friendica账户快过期。";
-$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"] = "你好%1\$s,⏎ ⏎您的账户在%2\$s五天内过期。您会继续您的账户经由每30天至少一次登录。";
-$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["Randplace Settings"] = "随意下设置";
-$a->strings["Enable Randplace Plugin"] = "使随意下插件能用";
-$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["StatusNet AutoFollow settings updated."] = "StatusNet自动关注设置更新了。";
-$a->strings["StatusNet AutoFollow Settings"] = "StatusNet自动关注设置";
-$a->strings["Automatically follow any StatusNet followers/mentioners"] = "自动关注所有的StatusGet关注者／提及";
-$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;"] = "例如：&quot;网络&quot;或&quot;通知／系统&quot;";
-$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在您输入的路径。";
-$a->strings["StatusNet settings updated."] = "StatusNet设置更新了。";
-$a->strings["StatusNet Posting Settings"] = "StatusNet发送设置";
-$a->strings["Globally Available StatusNet OAuthKeys"] = "综合可用的StatusNet OAuthKeys";
-$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "有已经装配的OAuth钥匙双于有的StatusNet服务器可用。如果您用那些之一，请用那个。否则随便连接任何别的StatusNet（看下）。";
-$a->strings["Provide your own OAuth Credentials"] = "提供您自己的OAuth证件";
-$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "找不到「consumer key」双为StatusNet。注册您Friendica账户当「desktop client」在您的StatusNet账户，粘贴「consumer key」双这儿和输入API基础根。<br />您登记您的OAuth钥匙双前问行政人员已经有没有钥匙双为这个Friendica安装在您最喜欢的StatusNet安装。";
-$a->strings["OAuth Consumer Key"] = "Oauth消费者钥匙";
-$a->strings["OAuth Consumer Secret"] = "Oauth消费者密码";
-$a->strings["Base API Path (remember the trailing /)"] = "基础API地址(注意最后的／)";
-$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "为连接您的StatusNet账户点击下按钮得到安全密码从StatusNet您要在输入在下个栏和提交表单。只您的公开文章被送到StatusNet。";
-$a->strings["Log in with StatusNet"] = "用StatusNet登记";
-$a->strings["Copy the security code from StatusNet here"] = "复制安全密码从StatusNet这儿";
-$a->strings["Cancel Connection Process"] = "注销连接过程 ";
-$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."] = "<strong>注意</strong>: 由于您的隐私设置(<em>隐藏您的简介内容为生看者？</em>)超链接可能包括在公文章转播到StatusNets会带领来客到空白页讲他看您的简介被限制。";
-$a->strings["Allow posting to StatusNet"] = "许放在StatusNet";
-$a->strings["Send public postings to StatusNet by default"] = "默认发送公开文章在StatusNet";
-$a->strings["Send linked #-tags and @-names to StatusNet"] = "转播连接的#标签盒@名到StatusNet";
-$a->strings["Clear OAuth configuration"] = "清理出OAuth设置";
-$a->strings["Site name"] = "网页名字";
-$a->strings["API URL"] = "API URL";
-$a->strings["Consumer Secret"] = "密码(Consumer Secret)";
-$a->strings["Consumer Key"] = "钥匙(Consumer Key)";
-$a->strings["Your Friendica test account is about to expire."] = "您Friendica化验账户快过期了。";
-$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."] = "你好%1\$s,⏎ ⏎您化验账户在%2\$s五天内将过期。我们希望您享受了这个试车和用这个机会为您综合社会交通找持久的Friendica网站。一单公开的网站是在http://dir.friendica.com/siteinfo。为多消息安排您自己的Friendica服务器请看工程网站在http://friendica.com。";
-$a->strings["Three Dimensional Tic-Tac-Toe"] = "三维井字棋";
-$a->strings["3D Tic-Tac-Toe"] = "三维井字棋";
-$a->strings["New game"] = "新游戏";
-$a->strings["New game with handicap"] = "新游戏不利条件 ";
-$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "三维井字棋跟传统的一样，除了完同时在多水平。";
-$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "这游戏有三水平。您赢经过实现三一连在任何水平，不亚于上，下，和倾斜跨越三水平。";
-$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "不利条件游戏使中间位置不能用因为占用着选手常常有不平的好处。";
-$a->strings["You go first..."] = "您先下...";
-$a->strings["I'm going first this time..."] = "这次我先下...";
-$a->strings["You won!"] = "您赢了！";
-$a->strings["\"Cat\" game!"] = "「猫子」游戏！";
-$a->strings["I won!"] = "我赢了！";
-$a->strings["Post to Tumblr"] = "发送到Tumblr";
-$a->strings["Tumblr Post Settings"] = "Tumblr发送设置";
-$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["Post to Twitter"] = "发送到在Twitter";
-$a->strings["Twitter settings updated."] = "Twitter设置更新了。";
-$a->strings["Twitter Posting Settings"] = "Twitter发送设置";
-$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "找不到Twitter的消费钥匙双。请联系您的网页行政人员。";
-$a->strings["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 button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "在这个Friendica网站使Twitter插件可用的可您还没有把您的账户和您Twitter账户连通。为这做点击下边的按钮得到密码从Twitter您要粘贴在下边的输入框和提交。只您的<strong>公开</strong>文章被发送到Twitter。";
-$a->strings["Log in with Twitter"] = "用Twitter登记";
-$a->strings["Copy the PIN from Twitter here"] = "复制Twitter密码这儿";
-$a->strings["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."] = "如果使可用的都您<strong>公开的</strong>文章会被发送到有关的Twitter账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。";
-$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>注意</strong>：由于您的隐私设置（<em>隐藏您的简介内容为生人？</em>）环节包括在转播到Twitter的条文可能通空白页通知看者看您的简介有限。";
-$a->strings["Allow posting to Twitter"] = "允许发送到Twitter";
-$a->strings["Send public postings to Twitter by default"] = "默认地发送公开文章到Twitter";
-$a->strings["Send linked #-tags and @-names to Twitter"] = "转播连接的#标签盒@名到Twitter";
-$a->strings["Consumer key"] = "钥匙(Consumer key)";
-$a->strings["Consumer secret"] = "密码(Consumer secret)";
-$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["View Source"] = "看源代码";
-$a->strings["Get added to this list!"] = "被在这个单子加入！";
-$a->strings["Connect on Friendica!"] = "连接在Friendica！";
-$a->strings["%d person likes this"] = array(
-	0 => "%d人喜欢这个",
-);
-$a->strings["%d person doesn't like this"] = array(
-	0 => "%d人不喜欢这个",
-);
-$a->strings["Generate new key"] = "造成新钥匙";
-$a->strings["Widgets key"] = "小窗口钥匙";
-$a->strings["Widgets available"] = "可用的小窗口";
-$a->strings["Plugin Settings"] = "插件设置";
-$a->strings["Post to Wordpress"] = "发送到Wordpress";
-$a->strings["WordPress Post Settings"] = "Wordpress发送设置";
-$a->strings["Enable WordPress Post Plugin"] = "使Wordpress发送插件可用";
-$a->strings["WordPress username"] = "Wordpress用户名";
-$a->strings["WordPress password"] = "Wordpress密码";
-$a->strings["WordPress API URL"] = "WordPress API URL";
-$a->strings["Post to WordPress by default"] = "默认地发送到Wordpress";
-$a->strings["Provide a backlink to the Friendica post"] = "输入反向链接到Friendica文章";
-$a->strings["Read the original post and comment stream on Friendica"] = "看原来文章和评论溪流在Friendica";
-$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["Global"] = "综合";
-$a->strings["Force global use of the alternate pager"] = "让大家用供替换的分页";
-$a->strings["Individual"] = "一个人的";
-$a->strings["Each user chooses whether to use the alternate pager"] = "每用户选择是否用供替换的分页";
-$a->strings["Suppress \"View on friendica\""] = "禁止「看在Friendica」";
-$a->strings["Mirror wall posts from facebook to friendica."] = "复制墙文章从facebook到friendica。";
-$a->strings["Post to page/group:"] = "放在页／组：";
-$a->strings["%s:"] = "%s：";
-$a->strings["Forum Directory"] = "评坛目录";
-$a->strings["Public access denied."] = "公众看拒绝";
-$a->strings["Global Directory"] = "综合目录";
-$a->strings["Find on this site"] = "找在这网站";
-$a->strings["Finding: "] = "找着：";
-$a->strings["Site Directory"] = "网站目录";
-$a->strings["Find"] = "搜索";
-$a->strings["Age: "] = "年纪：";
-$a->strings["Gender: "] = "性别：";
-$a->strings["Location:"] = "位置:";
-$a->strings["Gender:"] = "性别:";
-$a->strings["Status:"] = "现状:";
-$a->strings["Homepage:"] = "主页:";
-$a->strings["About:"] = "关于：";
-$a->strings["No entries (some entries may be hidden)."] = "没有文章(有的文章会被隐藏)。";
-$a->strings["Group Text settings updated."] = "组正文设置更新了。";
-$a->strings["Remote Permissions Settings"] = "对外批准设置";
-$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "允许您私人文章接受者看别接受者。";
-$a->strings["Remote Permissions settings updated."] = "对外批准设置更新了。";
-$a->strings["Visible to:"] = "可见给：";
-$a->strings["Visible to"] = "可见的给";
-$a->strings["may only be a partial list"] = "可能部分的单";
-$a->strings["The posts of every user on this server show the post recipients"] = "这网站所有用户的文章表示接受者";
-$a->strings["Each user chooses whether his/her posts show the post recipients"] = "各用户选择他问上是否表示接受者";
-$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "复制所有文章从statusnet除了回答或重复的通知以外";
-$a->strings["Shortening method that optimizes the post"] = "缩短方法优化文章";
-$a->strings["You are now authenticated to tumblr."] = "现在tumblr证明您是真的";
-$a->strings["return to the connector page"] = "会连接器页";
-$a->strings["(Re-)Authenticate your tumblr page"] = "再认证您的tumblr页";
-$a->strings["Post to page:"] = "放在页：";
-$a->strings["You are not authenticated to tumblr"] = "tumblr没证明您是真的";
-$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "复制所有文章从twitter除了回答或复准文以外";
-$a->strings["Shortening method that optimizes the tweet"] = "缩短方法优化缩短方法优化准文";
-$a->strings["Name of the Twitter Application"] = "Twitter应用名";
-$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "选择这个为避免复制文章从~friendica回归~friendica";
 $a->strings["Profile"] = "简介";
 $a->strings["Full Name:"] = "全名：";
+$a->strings["Gender:"] = "性别:";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
 $a->strings["Birthday:"] = "生日：";
 $a->strings["Age:"] = "年纪：";
+$a->strings["Status:"] = "现状:";
 $a->strings["for %1\$d %2\$s"] = "为%1\$d %2\$s";
 $a->strings["Sexual Preference:"] = "性取向";
+$a->strings["Homepage:"] = "主页:";
 $a->strings["Hometown:"] = "故乡：";
 $a->strings["Tags:"] = "标签：";
 $a->strings["Political Views:"] = "政治观念：";
 $a->strings["Religion:"] = "宗教：";
+$a->strings["About:"] = "关于：";
 $a->strings["Hobbies/Interests:"] = "爱好／兴趣";
 $a->strings["Likes:"] = "喜欢：";
 $a->strings["Dislikes:"] = "不喜欢：";
@@ -699,6 +110,7 @@ $a->strings["%d Contact"] = array(
 );
 $a->strings["View Contacts"] = "看熟人";
 $a->strings["Search"] = "搜索";
+$a->strings["Save"] = "保存";
 $a->strings["poke"] = "戳";
 $a->strings["poked"] = "戳了";
 $a->strings["ping"] = "砰";
@@ -731,6 +143,13 @@ $a->strings["frustrated"] = "被作梗";
 $a->strings["motivated"] = "士气高涨";
 $a->strings["relaxed"] = "轻松";
 $a->strings["surprised"] = "诧异";
+$a->strings["Monday"] = "星期一";
+$a->strings["Tuesday"] = "星期二";
+$a->strings["Wednesday"] = "星期三";
+$a->strings["Thursday"] = "星期四";
+$a->strings["Friday"] = "星期五";
+$a->strings["Saturday"] = "星期六";
+$a->strings["Sunday"] = "星期天";
 $a->strings["January"] = "一月";
 $a->strings["February"] = "二月";
 $a->strings["March"] = "三月";
@@ -748,6 +167,8 @@ $a->strings["Click to open/close"] = "点击为开关";
 $a->strings["link to source"] = "链接到来源";
 $a->strings["default"] = "默认";
 $a->strings["Select an alternate language"] = "选择别的语言";
+$a->strings["event"] = "项目";
+$a->strings["photo"] = "照片";
 $a->strings["activity"] = "活动";
 $a->strings["comment"] = array(
 	0 => "评论",
@@ -761,20 +182,10 @@ $a->strings["Logged out."] = "注销了";
 $a->strings["Login failed."] = "登记失败了。";
 $a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "我们用您输入的OpenID登录的时候碰到问题。请核实拼法是对的。";
 $a->strings["The error message was:"] = "错误通知是：";
-$a->strings["Error decoding account file"] = "解码账户文件出错误";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "错误！文件没有版本数！这不是Friendica账户文件吗？";
-$a->strings["Error! I can't import this file: DB schema version is not compatible."] = "错误！我进口不了这个文件：数据库版本不相容的。";
-$a->strings["Error! Cannot check nickname"] = "错误！不能检查昵称";
-$a->strings["User '%s' already exists on this server!"] = "用户「%s」已经存在这个服务器！";
-$a->strings["User creation error"] = "用户创造错误";
-$a->strings["User profile creation error"] = "用户简介创造错误";
-$a->strings["%d contact not imported"] = array(
-	0 => "%d熟人没进口了",
-);
-$a->strings["Done. You can now login with your username and password"] = "完了。您现在会用您用户名和密码登录";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
 $a->strings["Starts:"] = "开始：";
 $a->strings["Finishes:"] = "结束：";
+$a->strings["Location:"] = "位置:";
 $a->strings["Disallowed profile URL."] = "不允许的简介地址.";
 $a->strings["Connect URL missing."] = "连接URL失踪的。";
 $a->strings["This site is not configured to allow communications with other networks."] = "这网站没配置允许跟别的网络交流.";
@@ -804,6 +215,7 @@ $a->strings["Nickname was once registered here and may not be re-used. Please ch
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "要紧错误：产生安全钥匙失败了。";
 $a->strings["An error occurred during registration. Please try again."] = "报到出了问题。请再试。";
 $a->strings["An error occurred creating your default profile. Please try again."] = "造成默认简介出了问题。请再试。";
+$a->strings["Profile Photos"] = "简介照片";
 $a->strings["Unknown | Not categorised"] = "未知的 ｜无分类";
 $a->strings["Block immediately"] = "立即拦";
 $a->strings["Shady, spammer, self-marketer"] = "可疑，发垃圾者，自市场开发者";
@@ -813,11 +225,15 @@ $a->strings["Reputable, has my trust"] = "可信的，有我的信任";
 $a->strings["Frequently"] = "时常";
 $a->strings["Hourly"] = "每小时";
 $a->strings["Twice daily"] = "每日两次";
+$a->strings["Daily"] = "每日";
+$a->strings["Weekly"] = "每周";
+$a->strings["Monthly"] = "每月";
 $a->strings["Friendica"] = "Friendica";
 $a->strings["OStatus"] = "OStatus";
 $a->strings["RSS/Atom"] = "RSS/Atom";
 $a->strings["Email"] = "电子邮件";
 $a->strings["Diaspora"] = "Diaspora";
+$a->strings["Facebook"] = "Facebook";
 $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
@@ -834,6 +250,7 @@ $a->strings["Find People"] = "找人物";
 $a->strings["Enter name or interest"] = "输入名字或兴趣";
 $a->strings["Connect/Follow"] = "连接/关注";
 $a->strings["Examples: Robert Morgenstein, Fishing"] = "比如：李某，打鱼";
+$a->strings["Find"] = "搜索";
 $a->strings["Friend Suggestions"] = "友谊建议";
 $a->strings["Similar Interests"] = "相似兴趣";
 $a->strings["Random Profile"] = "随机简介";
@@ -846,18 +263,24 @@ $a->strings["Categories"] = "种类";
 $a->strings["%d contact in common"] = array(
 	0 => "%d共同熟人",
 );
+$a->strings["show more"] = "看多";
 $a->strings[" on Last.fm"] = "在Last.fm";
 $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 href=\"%s\" target=\"external-link\">%s</a>写了下面的<a href=\"%s\" target=\"external-link\">文章</a>";
 $a->strings["$1 wrote:"] = "$1写：";
 $a->strings["Encrypted content"] = "加密的内容";
+$a->strings["view full size"] = "看全尺寸";
 $a->strings["Miscellaneous"] = "形形色色";
 $a->strings["year"] = "年";
 $a->strings["month"] = "月";
 $a->strings["day"] = "日";
 $a->strings["never"] = "从未";
 $a->strings["less than a second ago"] = "一秒以内";
+$a->strings["years"] = "年";
+$a->strings["months"] = "月";
 $a->strings["week"] = "星期";
+$a->strings["weeks"] = "星期";
+$a->strings["days"] = "天";
 $a->strings["hour"] = "小时";
 $a->strings["hours"] = "小时";
 $a->strings["minute"] = "分钟";
@@ -867,58 +290,25 @@ $a->strings["seconds"] = "秒";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s以前";
 $a->strings["%s's birthday"] = "%s的生日";
 $a->strings["Happy Birthday %s"] = "生日快乐%s";
+$a->strings["Click here to upgrade."] = "这里点击为更新。";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "这个行动超过您订阅的限制。";
+$a->strings["This action is not available under your subscription plan."] = "这个行动在您的订阅不可用的。";
+$a->strings["(no subject)"] = "沒有题目";
+$a->strings["noreply"] = "noreply";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s是成为%2\$s的朋友";
+$a->strings["Sharing notification from Diaspora network"] = "分享通知从Diaspora网络";
+$a->strings["status"] = "现状";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s喜欢%2\$s的%3\$s";
+$a->strings["Attachments:"] = "附件：";
 $a->strings["[Name Withheld]"] = "[名字拒给]";
 $a->strings["A new person is sharing with you at "] = "一位新人给你分享在";
 $a->strings["You have a new follower at "] = "你有新的关注者在";
 $a->strings["Item not found."] = "项目找不到。";
 $a->strings["Do you really want to delete this item?"] = "您真的想删除这个项目吗？";
 $a->strings["Yes"] = "是";
+$a->strings["Cancel"] = "退消";
+$a->strings["Permission denied."] = "权限不够。";
 $a->strings["Archives"] = "档案";
-$a->strings["Click here to upgrade."] = "这里点击为更新。";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "这个行动超过您订阅的限制。";
-$a->strings["This action is not available under your subscription plan."] = "这个行动在您的订阅不可用的。";
-$a->strings["(no subject)"] = "沒有题目";
-$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s是成为%2\$s的朋友";
-$a->strings["Sharing notification from Diaspora network"] = "分享通知从Diaspora网络";
-$a->strings["Attachments:"] = "附件：";
-$a->strings["Friendica Notification"] = "Friendica 通知";
-$a->strings["Thank You,"] = "谢谢，";
-$a->strings["%s Administrator"] = "%s管理员";
-$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notify]收到新邮件在%s";
-$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s发给您新私人通知在%2\$s.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s发给您%2\$s.";
-$a->strings["a private message"] = "一条私人的消息";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "清去%s为了看或回答你私人的消息";
-$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s于[url=%2\$s]a %3\$s[/url]评论了";
-$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s于[url=%2\$s]%3\$s的%4\$s[/url]评论了";
-$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s于[url=%2\$s]您的%3\$s[/url]评论了";
-$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Notify]于交流#%1\$d由%2\$s评论";
-$a->strings["%s commented on an item/conversation you have been following."] = "%s对你有兴趣的项目／ 交谈发表意见";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "清去%s为了看或回答交谈";
-$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notify] %s贴在您的简介墙";
-$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s放在您的简介墙在%2\$s";
-$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s放在[url=%2\$s]您的墙[/url]";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notify] %s标签您";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s把您在%2\$s标签";
-$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s[url=%2\$s]把您标签[/url].";
-$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notify]您被%1\$s戳";
-$a->strings["%1\$s poked you at %2\$s"] = "您被%1\$s戳在%2\$s";
-$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s[url=%2\$s]把您戳[/url]。";
-$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notify] %s标前您的文章";
-$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s把您的文章在%2\$s标签";
-$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s把[url=%2\$s]您的文章[/url]标签";
-$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Notify] 收到介绍";
-$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "您从「%1\$s」受到一个介绍在%2\$s";
-$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "您从%2\$s收到[url=%1\$s]一个介绍[/url]。";
-$a->strings["You may visit their profile at %s"] = "你能看他的简介在%s";
-$a->strings["Please visit %s to approve or reject the introduction."] = "请批准或拒绝介绍在%s";
-$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Notify] 收到朋友建议";
-$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "您从「%2\$s」收到[url=%1\$s]一个朋友建议[/url]。";
-$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "您从%2\$s收到[url=%1\$s]一个朋友建议[/url]为%2\$s。";
-$a->strings["Name:"] = "名字：";
-$a->strings["Photo:"] = "照片：";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "请批准或拒绝建议在%s";
 $a->strings["General Features"] = "总的特点";
 $a->strings["Multiple Profiles"] = "多简介";
 $a->strings["Ability to create multiple profiles"] = "能穿凿多简介";
@@ -1027,6 +417,44 @@ $a->strings["Preview"] = "预演";
 $a->strings["Post to Groups"] = "发到组";
 $a->strings["Post to Contacts"] = "发到熟人";
 $a->strings["Private post"] = "私人文章";
+$a->strings["Friendica Notification"] = "Friendica 通知";
+$a->strings["Thank You,"] = "谢谢，";
+$a->strings["%s Administrator"] = "%s管理员";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notify]收到新邮件在%s";
+$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s发给您新私人通知在%2\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s发给您%2\$s.";
+$a->strings["a private message"] = "一条私人的消息";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "清去%s为了看或回答你私人的消息";
+$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s于[url=%2\$s]a %3\$s[/url]评论了";
+$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s于[url=%2\$s]%3\$s的%4\$s[/url]评论了";
+$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s于[url=%2\$s]您的%3\$s[/url]评论了";
+$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Notify]于交流#%1\$d由%2\$s评论";
+$a->strings["%s commented on an item/conversation you have been following."] = "%s对你有兴趣的项目／ 交谈发表意见";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "清去%s为了看或回答交谈";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notify] %s贴在您的简介墙";
+$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s放在您的简介墙在%2\$s";
+$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s放在[url=%2\$s]您的墙[/url]";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notify] %s标签您";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s把您在%2\$s标签";
+$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s[url=%2\$s]把您标签[/url].";
+$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notify]您被%1\$s戳";
+$a->strings["%1\$s poked you at %2\$s"] = "您被%1\$s戳在%2\$s";
+$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s[url=%2\$s]把您戳[/url]。";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notify] %s标前您的文章";
+$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s把您的文章在%2\$s标签";
+$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s把[url=%2\$s]您的文章[/url]标签";
+$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Notify] 收到介绍";
+$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "您从「%1\$s」受到一个介绍在%2\$s";
+$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "您从%2\$s收到[url=%1\$s]一个介绍[/url]。";
+$a->strings["You may visit their profile at %s"] = "你能看他的简介在%s";
+$a->strings["Please visit %s to approve or reject the introduction."] = "请批准或拒绝介绍在%s";
+$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Notify] 收到朋友建议";
+$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "您从「%2\$s」收到[url=%1\$s]一个朋友建议[/url]。";
+$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "您从%3\$s收到[url=%1\$s]一个朋友建议[/url]为%2\$s。";
+$a->strings["Name:"] = "名字：";
+$a->strings["Photo:"] = "照片：";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "请批准或拒绝建议在%s";
 $a->strings["[no subject]"] = "[无题目]";
 $a->strings["Wall Photos"] = "墙照片";
 $a->strings["Nothing new here"] = "这里没有什么新的";
@@ -1042,11 +470,13 @@ $a->strings["Events"] = "事件";
 $a->strings["Your events"] = "你的项目";
 $a->strings["Personal notes"] = "私人的便条";
 $a->strings["Your personal photos"] = "你私人的照片";
+$a->strings["Login"] = "登录";
 $a->strings["Sign in"] = "登记";
 $a->strings["Home"] = "主页";
 $a->strings["Home Page"] = "主页";
 $a->strings["Register"] = "注册";
 $a->strings["Create an account"] = "注册";
+$a->strings["Help"] = "帮助";
 $a->strings["Help and documentation"] = "帮助证件";
 $a->strings["Apps"] = "应用程序";
 $a->strings["Addon applications, utilities, games"] = "可加的应用，设施，游戏";
@@ -1073,6 +503,7 @@ $a->strings["Manage"] = "代用户";
 $a->strings["Manage other pages"] = "管理别的页";
 $a->strings["Delegations"] = "代表";
 $a->strings["Delegate Page Management"] = "页代表管理";
+$a->strings["Settings"] = "配置";
 $a->strings["Account settings"] = "帐户配置";
 $a->strings["Profiles"] = "简介";
 $a->strings["Manage/Edit Profiles"] = "管理／编辑简介";
@@ -1082,9 +513,18 @@ $a->strings["Admin"] = "管理";
 $a->strings["Site setup and configuration"] = "网站开办和配置";
 $a->strings["Navigation"] = "航行";
 $a->strings["Site map"] = "网站地图";
-$a->strings["view full size"] = "看全尺寸";
 $a->strings["Embedded content"] = "嵌入内容";
 $a->strings["Embedding disabled"] = "嵌入不能用";
+$a->strings["Error decoding account file"] = "解码账户文件出错误";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "错误！文件没有版本数！这不是Friendica账户文件吗？";
+$a->strings["Error! Cannot check nickname"] = "错误！不能检查昵称";
+$a->strings["User '%s' already exists on this server!"] = "用户「%s」已经存在这个服务器！";
+$a->strings["User creation error"] = "用户创造错误";
+$a->strings["User profile creation error"] = "用户简介创造错误";
+$a->strings["%d contact not imported"] = array(
+	0 => "%d熟人没进口了",
+);
+$a->strings["Done. You can now login with your username and password"] = "完了。您现在会用您用户名和密码登录";
 $a->strings["Welcome "] = "欢迎";
 $a->strings["Please upload a profile photo."] = "请上传一张简介照片";
 $a->strings["Welcome back "] = "欢迎归来";
@@ -1107,6 +547,7 @@ $a->strings["Sexual Preference"] = "性取向";
 $a->strings["Homepage"] = "主页";
 $a->strings["Interests"] = "兴趣";
 $a->strings["Address"] = "地址";
+$a->strings["Location"] = "位置";
 $a->strings["Profile updated."] = "简介更新了。";
 $a->strings[" and "] = "和";
 $a->strings["public profile"] = "公开简介";
@@ -1116,6 +557,7 @@ $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s有更新的%
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "藏起来发现您的熟人／朋友单不让这个简介看着看？";
 $a->strings["No"] = "否";
 $a->strings["Edit Profile Details"] = "剪辑简介消息";
+$a->strings["Submit"] = "提交";
 $a->strings["Change Profile Photo"] = "改变简介照片";
 $a->strings["View this profile"] = "看这个简介";
 $a->strings["Create a new profile using these settings"] = "造成新的简介用这些设置";
@@ -1153,6 +595,7 @@ $a->strings["Love/romance"] = "爱情／浪漫";
 $a->strings["Work/employment"] = "工作";
 $a->strings["School/education"] = "学院／教育";
 $a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "这是你的<strong>公开的</strong>简介。<br />它<strong>可能</strong>被所有的因特网用的看到。";
+$a->strings["Age: "] = "年纪：";
 $a->strings["Edit/Manage Profiles"] = "编辑／管理简介";
 $a->strings["Change profile photo"] = "换简介照片";
 $a->strings["Create New Profile"] = "创造新的简介";
@@ -1166,6 +609,9 @@ $a->strings["Click on a contact to add or remove."] = "点击熟人为添加或
 $a->strings["Visible To"] = "能见被";
 $a->strings["All Contacts (with secure profile access)"] = "所有熟人(跟安全地简介使用权)";
 $a->strings["Personal Notes"] = "私人便条";
+$a->strings["Public access denied."] = "公众看拒绝";
+$a->strings["Access to this profile has been restricted."] = "使用权这个简介被限制了.";
+$a->strings["Item has been removed."] = "项目被删除了。";
 $a->strings["Visit %s's profile [%s]"] = "看%s的简介[%s]";
 $a->strings["Edit contact"] = "编熟人";
 $a->strings["Contacts who are not members of a group"] = "没当成员的熟人";
@@ -1203,6 +649,7 @@ $a->strings["Version"] = "版本";
 $a->strings["Active plugins"] = "活跃的插件";
 $a->strings["Site settings updated."] = "网站设置更新了。";
 $a->strings["No special theme for mobile devices"] = "没专门适合手机的主题";
+$a->strings["Never"] = "从未";
 $a->strings["Multi user instance"] = "多用户网站";
 $a->strings["Closed"] = "关闭";
 $a->strings["Requires approval"] = "要批准";
@@ -1215,6 +662,7 @@ $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"] = "系统语言";
 $a->strings["System theme"] = "系统主题";
@@ -1256,6 +704,12 @@ $a->strings["Allow threaded items"] = "允许线绳项目";
 $a->strings["Allow infinite level threading for items on this site."] = "允许无限水平线绳为这网站的项目。";
 $a->strings["Private posts by default for new users"] = "新用户默认写私人文章";
 $a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "默认新用户文章批准使默认隐私组，没有公开。";
+$a->strings["Don't include post content in email notifications"] = "别包含文章内容在邮件消息";
+$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "别包含文章／谈论／私消息／等的内容在文件消息被这个网站寄出，为了隐私。";
+$a->strings["Disallow public access to addons listed in the apps menu."] = "不允许插件的公众使用权在应用选单。";
+$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "复选这个框为把应用选内插件限制仅成员";
+$a->strings["Don't embed private images in posts"] = "别嵌入私人图案在文章里";
+$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "别把复制嵌入的照相代替本网站的私人照相在文章里。结果是收包括私人照相的熟人要认证才卸载个张照片，会花许久。";
 $a->strings["Block multiple registrations"] = "拦一人多注册";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "不允许用户注册别的账户为当页。";
 $a->strings["OpenID support"] = "OpenID支持";
@@ -1268,6 +722,8 @@ $a->strings["Show Community Page"] = "表示社会页";
 $a->strings["Display a Community page showing all recent public postings on this site."] = "表示社会页表明这网站所有最近公开的文章";
 $a->strings["Enable OStatus support"] = "使OStatus支持可用";
 $a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "提供内装的OStatus（identi.ca, status.net, 等）兼容。OStatus内，什么通知是公开的，所以偶尔隐私警告被表示。";
+$a->strings["OStatus conversation completion interval"] = "OStatus对话完成间隔";
+$a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "喂器要多久查一次新文章在OStatus交流？这会花许多系统资源。";
 $a->strings["Enable Diaspora support"] = "使Diaspora支持能够";
 $a->strings["Provide built-in Diaspora network compatibility."] = "提供内装Diaspora网络兼容。";
 $a->strings["Only allow Friendica contacts"] = "只许Friendica熟人";
@@ -1321,6 +777,7 @@ $a->strings["Deny"] = "否定";
 $a->strings["Block"] = "拦";
 $a->strings["Unblock"] = "不拦";
 $a->strings["Site admin"] = "网站管理员";
+$a->strings["Account expired"] = "帐户过期了";
 $a->strings["Register date"] = "注册日期";
 $a->strings["Last login"] = "上次登录";
 $a->strings["Last item"] = "上项目";
@@ -1340,7 +797,7 @@ $a->strings["[Experimental]"] = "［试验］";
 $a->strings["[Unsupported]"] = "［没支持］";
 $a->strings["Log settings updated."] = "日志设置更新了。";
 $a->strings["Clear"] = "清理出";
-$a->strings["Debugging"] = "调试";
+$a->strings["Enable Debugging"] = "把调试使可用的";
 $a->strings["Log file"] = "记录文件";
 $a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "必要被网页服务器可写的。相对Friendica主文件夹。";
 $a->strings["Log level"] = "记录水平";
@@ -1382,8 +839,6 @@ $a->strings["Your Full Name (e.g. Joe Smith): "] = "您姓名(例如「张三」
 $a->strings["Your Email Address: "] = "你的电子邮件地址：";
 $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "选择简介昵称。昵称头一字必须拉丁字。您再这个网站的简介地址将「<strong>example@\$sitename</strong>」.";
 $a->strings["Choose a nickname: "] = "选择昵称：";
-$a->strings["Applications"] = "应用";
-$a->strings["No installed applications."] = "没有安装的应用";
 $a->strings["Account approved."] = "账户批准了";
 $a->strings["Registration revoked for %s"] = "%s的登记撤销了";
 $a->strings["Please login."] = "清登录。";
@@ -1406,6 +861,9 @@ $a->strings["Source input (Diaspora format): "] = "源代输入（Diaspora形式
 $a->strings["diaspora2bb: "] = "diaspora2bb: ";
 $a->strings["Common Friends"] = "普通朋友们";
 $a->strings["No contacts in common."] = "没有共同熟人。";
+$a->strings["You must be logged in to use addons. "] = "您用插件前要登录";
+$a->strings["Applications"] = "应用";
+$a->strings["No installed applications."] = "没有安装的应用";
 $a->strings["Could not access contact record."] = "用不了熟人记录。";
 $a->strings["Could not locate selected profile."] = "找不到选择的简介。";
 $a->strings["Contact updated."] = "熟人更新了。";
@@ -1422,7 +880,6 @@ $a->strings["You are mutual friends with %s"] = "您和%s是共同朋友们";
 $a->strings["You are sharing with %s"] = "您分享给%s";
 $a->strings["%s is sharing with you"] = "%s给您分享";
 $a->strings["Private communications are not available for this contact."] = "没有私人的沟通跟这个熟人";
-$a->strings["Never"] = "从未";
 $a->strings["(Update was successful)"] = "(更新成功)";
 $a->strings["(Update was not successful)"] = "(更新不成功)";
 $a->strings["Suggest friends"] = "建议朋友们";
@@ -1473,6 +930,7 @@ $a->strings["Mutual Friendship"] = "共同友谊";
 $a->strings["is a fan of yours"] = "是您迷";
 $a->strings["you are a fan of"] = "你喜欢";
 $a->strings["Search your contacts"] = "搜索您的熟人";
+$a->strings["Finding: "] = "找着：";
 $a->strings["everybody"] = "每人";
 $a->strings["Additional features"] = "附加的特点";
 $a->strings["Display settings"] = "表示设置";
@@ -1488,15 +946,20 @@ $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["Wrong password."] = "密码不正确。";
 $a->strings["Password changed."] = "密码变化了。";
 $a->strings["Password update failed. Please try again."] = "密码更新失败了。请再试。";
 $a->strings[" Please use a shorter name."] = "请用短一点个名。";
 $a->strings[" Name too short."] = "名字太短。";
+$a->strings["Wrong Password"] = "密码不正确";
 $a->strings[" Not valid email."] = " 电子邮件地址无效.";
 $a->strings[" Cannot change to that email."] = "不能变化到这个邮件地址。";
 $a->strings["Private forum has no privacy permissions. Using default privacy group."] = "私人评坛没有隐私批准。默认隐私组用者。";
 $a->strings["Private forum has no privacy permissions and no default privacy group."] = "私人评坛没有隐私批准或默认隐私组。";
+$a->strings["Settings updated."] = "设置跟新了";
 $a->strings["Add application"] = "加入应用";
+$a->strings["Consumer Key"] = "钥匙(Consumer Key)";
+$a->strings["Consumer Secret"] = "密码(Consumer Secret)";
 $a->strings["Redirect"] = "重定向";
 $a->strings["Icon url"] = "图符URL";
 $a->strings["You can't edit this application."] = "您不能编辑这个应用。";
@@ -1506,6 +969,7 @@ $a->strings["Client key starts with"] = "客户钥匙头字是";
 $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"] = "附加的特点";
@@ -1521,6 +985,7 @@ $a->strings["Last successful email check:"] = "上个成功收件箱检查：";
 $a->strings["IMAP server name:"] = "IMAP服务器名字：";
 $a->strings["IMAP port:"] = "IMAP服务器端口：";
 $a->strings["Security:"] = "安全：";
+$a->strings["None"] = "没有";
 $a->strings["Email login name:"] = "邮件登记名：";
 $a->strings["Email password:"] = "邮件密码：";
 $a->strings["Reply-to address:"] = "回答地址：";
@@ -1536,6 +1001,7 @@ $a->strings["Update browser every xx seconds"] = "更新游览器每XX秒";
 $a->strings["Minimum of 10 seconds, no maximum"] = "最小10秒，没有上限";
 $a->strings["Number of items to display per page:"] = "每页表示多少项目：";
 $a->strings["Maximum of 100 items"] = "最多100项目";
+$a->strings["Number of items to display per page when viewed from mobile device:"] = "用手机看一页展示多少项目：";
 $a->strings["Don't show emoticons"] = "别表示请表符号";
 $a->strings["Normal Account Page"] = "平常账户页";
 $a->strings["This account is a normal personal profile"] = "这个帐户是正常私人简介";
@@ -1574,6 +1040,9 @@ $a->strings["Password Settings"] = "密码设置";
 $a->strings["New Password:"] = "新密码：";
 $a->strings["Confirm:"] = "确认：";
 $a->strings["Leave password fields blank unless changing"] = "非变化留空密码栏";
+$a->strings["Current Password:"] = "目前密码：";
+$a->strings["Your current password to confirm the changes"] = "您目前密码为确认变化";
+$a->strings["Password:"] = "密码：";
 $a->strings["Basic Settings"] = "基础设置";
 $a->strings["Email Address:"] = "电子邮件地址:";
 $a->strings["Your Timezone:"] = "您的时区：";
@@ -1627,6 +1096,7 @@ $a->strings["Delegates are able to manage all aspects of this account/page excep
 $a->strings["Existing Page Managers"] = "目前页管理员";
 $a->strings["Existing Page Delegates"] = "目前页代表";
 $a->strings["Potential Delegates"] = "潜力的代表";
+$a->strings["Remove"] = "移走";
 $a->strings["Add"] = "加";
 $a->strings["No entries."] = "没有项目。";
 $a->strings["Poke/Prod"] = "戳";
@@ -1693,13 +1163,16 @@ $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspo
 $a->strings["Your Identity Address:"] = "您的同一个人地址：";
 $a->strings["Submit Request"] = "提交要求";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s关注着%2\$s的%3\$s";
+$a->strings["Global Directory"] = "综合目录";
+$a->strings["Find on this site"] = "找在这网站";
+$a->strings["Site Directory"] = "网站目录";
+$a->strings["Gender: "] = "性别：";
+$a->strings["No entries (some entries may be hidden)."] = "没有文章(有的文章会被隐藏)。";
 $a->strings["Do you really want to delete this suggestion?"] = "您真的想删除这个建议吗？";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "没有建议。如果这是新网站，请24小时后再试。";
 $a->strings["Ignore/Hide"] = "不理／隐藏";
 $a->strings["People Search"] = "搜索人物";
 $a->strings["No matches"] = "没有结果";
-$a->strings["Access to this profile has been restricted."] = "使用权这个简介被限制了.";
-$a->strings["Item has been removed."] = "项目被删除了。";
 $a->strings["Tag removed"] = "标签去除了";
 $a->strings["Remove Item Tag"] = "去除项目标签";
 $a->strings["Select a tag to remove: "] = "选择标签去除";
@@ -1709,6 +1182,8 @@ $a->strings["Event title and start time are required."] = "项目标题和开始
 $a->strings["l, F j"] = "l, F j";
 $a->strings["Edit event"] = "编项目";
 $a->strings["Create New Event"] = "造成新的项目";
+$a->strings["Previous"] = "上";
+$a->strings["Next"] = "下";
 $a->strings["hour:minute"] = "小时：分钟";
 $a->strings["Event details"] = "项目内容";
 $a->strings["Format is %s %s. Starting date and Title are required."] = "形式是%s%s。开始时间和标题是必须的。";
@@ -1760,68 +1235,10 @@ $a->strings["Help:"] = "帮助：";
 $a->strings["Not Found"] = "未发现";
 $a->strings["Page not found."] = "页发现。";
 $a->strings["No contacts."] = "没有熟人。";
+$a->strings["Welcome to %s"] = "%s欢迎你";
 $a->strings["Access denied."] = "没有用权。";
 $a->strings["File exceeds size limit of %d"] = "文件数目超过最多%d";
 $a->strings["File upload failed."] = "文件上传失败。";
-$a->strings["Friendica Social Communications Server - Setup"] = "Friendica社会交通服务器－安装";
-$a->strings["Could not connect to database."] = "解不了数据库。";
-$a->strings["Could not create table."] = "造成不了表格。";
-$a->strings["Your Friendica site database has been installed."] = "您Friendica网站数据库被安装了。";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "您可能要手工地进口文件「database.sql」用phpmyadmin或mysql。";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "请看文件「INSTALL.txt」";
-$a->strings["System check"] = "系统检测";
-$a->strings["Check again"] = "再检测";
-$a->strings["Database connection"] = "数据库接通";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "为安装Friendica我们要知道怎么连接您的数据库。";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "你有关于这些设置有问题的话，请给互联网托管服务或者网页管理联系。";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "您下边指定的数据库应该已经存在。如果还没有，请继续前造成。";
-$a->strings["Database Server Name"] = "数据库服务器名";
-$a->strings["Database Login Name"] = "数据库登录名";
-$a->strings["Database Login Password"] = "数据库登录密码";
-$a->strings["Database Name"] = "数据库名字";
-$a->strings["Site administrator email address"] = "网站行政人员邮件地址";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "您账户邮件地址必要符合这个为用网站处理仪表板";
-$a->strings["Please select a default timezone for your website"] = "请选择您网站的默认时区";
-$a->strings["Site settings"] = "网站设置";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "没找到命令行PHP在网服务器PATH。";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"] = "如果您没有命令行PHP在服务器，您实行不了用cron背景检查。看<a href='http://friendica.com/node/27'>「使安排做的任务可用」</a>";
-$a->strings["PHP executable path"] = "PHP可执行路径";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "输入全路线到php执行程序。您会留空白为继续安装。";
-$a->strings["Command line PHP"] = "命令行PHP";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "您系统的命令行PHP没有能够「register_argc_argv」。";
-$a->strings["This is required for message delivery to work."] = "这必要为通信发布成功。";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "错误：这系统的「register_argc_argv」子程序不能产生加密钥匙";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "如果您用Windows，请看「http://www.php.net/manual/en/openssl.installation.php」。";
-$a->strings["Generate encryption keys"] = "产生加密钥匙";
-$a->strings["libCurl PHP module"] = "libCurl PHP模块";
-$a->strings["GD graphics PHP module"] = "GD显示PHP模块";
-$a->strings["OpenSSL PHP module"] = "OpenSSL PHP模块";
-$a->strings["mysqli PHP module"] = "mysqli PHP模块";
-$a->strings["mb_string PHP module"] = "mb_string PHP模块";
-$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite部件";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "错误：Apache服务器的mod-rewrite模块是必要的可却不安装的。";
-$a->strings["Error: libCURL PHP module required but not installed."] = "错误：libCurl PHP模块是必要的可却不安装的。";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "错误：GD显示PHP模块跟JPEG支持是必要的可却安装的。";
-$a->strings["Error: openssl PHP module required but not installed."] = "错误：openssl PHP模块是必要的可却不安装的。";
-$a->strings["Error: mysqli PHP module required but not installed."] = "错误：mysqli PHP模块是必要的可却不安装的。";
-$a->strings["Error: mb_string PHP module required but not installed."] = "错误：mbstring PHP模块必要可没安装的。";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "网页安装者要能造成叫「.htconfig.php」在网服务器主文件夹可却不能。";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "这常常是一个权设置，因为网服务器可能不会写文件在文件夹－即使您会。";
-$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."] = "这个步骤头，我们给您正文要保存在叫.htconfig.php的文件在您Friendica主文件夹。";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "或者您会这个步骤不做还是实行手动的安装。请看INSTALL.txt文件为说明。";
-$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."] = "Friendica用Smarty3模板机车为建筑网页。Smarty3把模板编译成PHP为催建筑网页。";
-$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."] = "为了保存这些模板，网服务器要写权利于view/smarty3/目录在Friendica主目录下。";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "请保险您网服务器用户（比如www-data）有这个目录的写权利。";
-$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."] = "注意：为了安全，您应该只给网服务器写权利于view/smarty3/－没有模板文件（.tpl）之下。";
-$a->strings["view/smarty3 is writable"] = "能写view/smarty3";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = " URL改写在.htaccess不行。检查您服务器设置。";
-$a->strings["Url rewrite is working"] = "URL改写发挥机能";
-$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」不能被写。请把包括的正文造成设置文件在网服务器子目录。";
-$a->strings["Errors encountered creating database tables."] = "造成数据库列表相遇错误。";
-$a->strings["<h1>What next</h1>"] = "<h1>下步是什么</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "重要：您要[手工地]准备安排的任务给喂器。";
 $a->strings["Image exceeds size limit of %d"] = "图像超标最大极限尺寸 %d";
 $a->strings["Unable to process image."] = "处理不了图像.";
 $a->strings["Image upload failed."] = "图像上载失败了.";
@@ -1863,6 +1280,7 @@ $a->strings["Current timezone: %s"] = "现在时区: %s";
 $a->strings["Converted localtime: %s"] = "装换的当地时间：%s";
 $a->strings["Please select your timezone:"] = "请选择你的时区:";
 $a->strings["Remote privacy information not available."] = "摇隐私信息无效";
+$a->strings["Visible to:"] = "可见给：";
 $a->strings["No valid account found."] = "找不到效的账户。";
 $a->strings["Password reset request issued. Check your email."] = "重设密码要求发布了。核对您的收件箱。";
 $a->strings["Password reset requested at %s"] = "重设密码要求被发布%s";
@@ -1927,8 +1345,41 @@ $a->strings["Group: "] = "组：";
 $a->strings["Contact: "] = "熟人：";
 $a->strings["Private messages to this person are at risk of public disclosure."] = "私人通信给这个人回被公开。";
 $a->strings["Invalid contact."] = "无效熟人。";
-$a->strings["Not available."] = "不可用的";
+$a->strings["Invalid request identifier."] = "无效要求身份号。";
+$a->strings["Discard"] = "丢弃";
+$a->strings["System"] = "系统";
+$a->strings["Show Ignored Requests"] = "显示不理的要求";
+$a->strings["Hide Ignored Requests"] = "隐藏不理的要求";
+$a->strings["Notification type: "] = "通知种类：";
+$a->strings["Friend Suggestion"] = "朋友建议";
+$a->strings["suggested by %s"] = "由%s建议的";
+$a->strings["Post a new friend activity"] = "表新朋友活动";
+$a->strings["if applicable"] = "或适用";
+$a->strings["Claims to be known to you: "] = "声称被您认识：";
+$a->strings["yes"] = "是";
+$a->strings["no"] = "否";
+$a->strings["Approve as: "] = "批准作为";
+$a->strings["Friend"] = "朋友";
+$a->strings["Sharer"] = "分享者";
+$a->strings["Fan/Admirer"] = "迷／赞赏者";
+$a->strings["Friend/Connect Request"] = "友谊／联络要求";
+$a->strings["New Follower"] = "新关注者：";
+$a->strings["No introductions."] = "没有介绍。";
+$a->strings["%s liked %s's post"] = "%s喜欢了%s的消息";
+$a->strings["%s disliked %s's post"] = "%s不喜欢了%s的消息";
+$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["No more personal notifications."] = "没有别的私人通信。";
+$a->strings["Personal Notifications"] = "私人通知";
+$a->strings["No more home notifications."] = "没有别的家通信。";
+$a->strings["Home Notifications"] = "主页通知";
 $a->strings["Photo Albums"] = "相册";
+$a->strings["Contact Photos"] = "熟人照片";
 $a->strings["Upload New Photos"] = "上传新照片";
 $a->strings["Contact information unavailable"] = "熟人信息不可用";
 $a->strings["Album not found."] = "取回不了相册.";
@@ -1938,6 +1389,7 @@ $a->strings["Delete Photo"] = "删除照片";
 $a->strings["Do you really want to delete this photo?"] = "您真的想删除这个照相吗？";
 $a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s被%3\$s标签在%2\$s";
 $a->strings["a photo"] = "一张照片";
+$a->strings["Image exceeds size limit of "] = "图片超出最大尺寸";
 $a->strings["Image file is empty."] = "图片文件空的。";
 $a->strings["No photos selected"] = "没有照片挑选了";
 $a->strings["Access to this item is restricted."] = "这个项目使用权限的。";
@@ -2011,39 +1463,68 @@ $a->strings["Go to the Help Section"] = "看帮助部分";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "我们<strong>帮助</strong>页可查阅到详情关于别的编程特点和资源。";
 $a->strings["Requested profile is not available."] = "要求的简介联系不上的。";
 $a->strings["Tips for New Members"] = "提示对新成员";
-$a->strings["Invalid request identifier."] = "无效要求身份号。";
-$a->strings["Discard"] = "丢弃";
-$a->strings["System"] = "系统";
-$a->strings["Show Ignored Requests"] = "显示不理的要求";
-$a->strings["Hide Ignored Requests"] = "隐藏不理的要求";
-$a->strings["Notification type: "] = "通知种类：";
-$a->strings["Friend Suggestion"] = "朋友建议";
-$a->strings["suggested by %s"] = "由%s建议的";
-$a->strings["Post a new friend activity"] = "表新朋友活动";
-$a->strings["if applicable"] = "或适用";
-$a->strings["Claims to be known to you: "] = "声称被您认识：";
-$a->strings["yes"] = "是";
-$a->strings["no"] = "否";
-$a->strings["Approve as: "] = "批准作为";
-$a->strings["Friend"] = "朋友";
-$a->strings["Sharer"] = "分享者";
-$a->strings["Fan/Admirer"] = "迷／赞赏者";
-$a->strings["Friend/Connect Request"] = "友谊／联络要求";
-$a->strings["New Follower"] = "新关注者：";
-$a->strings["No introductions."] = "没有介绍。";
-$a->strings["%s liked %s's post"] = "%s喜欢了%s的消息";
-$a->strings["%s disliked %s's post"] = "%s不喜欢了%s的消息";
-$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["No more personal notifications."] = "没有别的私人通信。";
-$a->strings["Personal Notifications"] = "私人通知";
-$a->strings["No more home notifications."] = "没有别的家通信。";
-$a->strings["Home Notifications"] = "主页通知";
+$a->strings["Friendica Social Communications Server - Setup"] = "Friendica社会交通服务器－安装";
+$a->strings["Could not connect to database."] = "解不了数据库。";
+$a->strings["Could not create table."] = "造成不了表格。";
+$a->strings["Your Friendica site database has been installed."] = "您Friendica网站数据库被安装了。";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "您可能要手工地进口文件「database.sql」用phpmyadmin或mysql。";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "请看文件「INSTALL.txt」";
+$a->strings["System check"] = "系统检测";
+$a->strings["Check again"] = "再检测";
+$a->strings["Database connection"] = "数据库接通";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "为安装Friendica我们要知道怎么连接您的数据库。";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "你有关于这些设置有问题的话，请给互联网托管服务或者网页管理联系。";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "您下边指定的数据库应该已经存在。如果还没有，请继续前造成。";
+$a->strings["Database Server Name"] = "数据库服务器名";
+$a->strings["Database Login Name"] = "数据库登录名";
+$a->strings["Database Login Password"] = "数据库登录密码";
+$a->strings["Database Name"] = "数据库名字";
+$a->strings["Site administrator email address"] = "网站行政人员邮件地址";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "您账户邮件地址必要符合这个为用网站处理仪表板";
+$a->strings["Please select a default timezone for your website"] = "请选择您网站的默认时区";
+$a->strings["Site settings"] = "网站设置";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "没找到命令行PHP在网服务器PATH。";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"] = "如果您没有命令行PHP在服务器，您实行不了用cron背景检查。看<a href='http://friendica.com/node/27'>「使安排做的任务可用」</a>";
+$a->strings["PHP executable path"] = "PHP可执行路径";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "输入全路线到php执行程序。您会留空白为继续安装。";
+$a->strings["Command line PHP"] = "命令行PHP";
+$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "PHP执行程序不是命令行PHP執行檔（有可能是cgi-fgci版本）";
+$a->strings["Found PHP version: "] = "找到PHP版本号：";
+$a->strings["PHP cli binary"] = "命令行PHP執行檔";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "您系统的命令行PHP没有能够「register_argc_argv」。";
+$a->strings["This is required for message delivery to work."] = "这必要为通信发布成功。";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "错误：这系统的「register_argc_argv」子程序不能产生加密钥匙";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "如果您用Windows，请看「http://www.php.net/manual/en/openssl.installation.php」。";
+$a->strings["Generate encryption keys"] = "产生加密钥匙";
+$a->strings["libCurl PHP module"] = "libCurl PHP模块";
+$a->strings["GD graphics PHP module"] = "GD显示PHP模块";
+$a->strings["OpenSSL PHP module"] = "OpenSSL PHP模块";
+$a->strings["mysqli PHP module"] = "mysqli PHP模块";
+$a->strings["mb_string PHP module"] = "mb_string PHP模块";
+$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite部件";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "错误：Apache服务器的mod-rewrite模块是必要的可却不安装的。";
+$a->strings["Error: libCURL PHP module required but not installed."] = "错误：libCurl PHP模块是必要的可却不安装的。";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "错误：GD显示PHP模块跟JPEG支持是必要的可却安装的。";
+$a->strings["Error: openssl PHP module required but not installed."] = "错误：openssl PHP模块是必要的可却不安装的。";
+$a->strings["Error: mysqli PHP module required but not installed."] = "错误：mysqli PHP模块是必要的可却不安装的。";
+$a->strings["Error: mb_string PHP module required but not installed."] = "错误：mbstring PHP模块必要可没安装的。";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "网页安装者要能造成叫「.htconfig.php」在网服务器主文件夹可却不能。";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "这常常是一个权设置，因为网服务器可能不会写文件在文件夹－即使您会。";
+$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."] = "这个步骤头，我们给您正文要保存在叫.htconfig.php的文件在您Friendica主文件夹。";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "或者您会这个步骤不做还是实行手动的安装。请看INSTALL.txt文件为说明。";
+$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."] = "Friendica用Smarty3模板机车为建筑网页。Smarty3把模板编译成PHP为催建筑网页。";
+$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."] = "为了保存这些模板，网服务器要写权利于view/smarty3/目录在Friendica主目录下。";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "请保险您网服务器用户（比如www-data）有这个目录的写权利。";
+$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."] = "注意：为了安全，您应该只给网服务器写权利于view/smarty3/－没有模板文件（.tpl）之下。";
+$a->strings["view/smarty3 is writable"] = "能写view/smarty3";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = " URL改写在.htaccess不行。检查您服务器设置。";
+$a->strings["Url rewrite is working"] = "URL改写发挥机能";
+$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」不能被写。请把包括的正文造成设置文件在网服务器子目录。";
+$a->strings["Errors encountered creating database tables."] = "造成数据库列表相遇错误。";
+$a->strings["<h1>What next</h1>"] = "<h1>下步是什么</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "重要：您要[手工地]准备安排的任务给喂器。";
 $a->strings["Post successful."] = "评论发表了。";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID协议错误。没ID还。 ";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "找不到账户和OpenID注册不允许。";
@@ -2053,12 +1534,14 @@ $a->strings["Shift-reload the page or clear browser cache if the new photo does
 $a->strings["Unable to process image"] = "不能处理照片";
 $a->strings["Upload File:"] = "上传文件：";
 $a->strings["Select a profile:"] = "选择一个简介";
+$a->strings["Upload"] = "上传";
 $a->strings["skip this step"] = "略过这步";
 $a->strings["select a photo from your photo albums"] = "从您的照片册选择一片。";
 $a->strings["Crop Image"] = "修剪照片";
 $a->strings["Please adjust the image cropping for optimum viewing."] = "请调图片剪裁为最好看。";
 $a->strings["Done Editing"] = "编完了";
 $a->strings["Image uploaded successfully."] = "照片成功地上传了";
+$a->strings["Not available."] = "不可用的";
 $a->strings["%d comment"] = array(
 	0 => "%d评论",
 );
@@ -2083,6 +1566,7 @@ $a->strings["save to folder"] = "保存在文件夹";
 $a->strings["to"] = "至";
 $a->strings["Wall-to-Wall"] = "从墙到墙";
 $a->strings["via Wall-To-Wall:"] = "通过从墙到墙";
+$a->strings["This entry was edited"] = "这个文章被编辑了";
 $a->strings["via"] = "经过";
 $a->strings["Theme settings"] = "主题设置";
 $a->strings["Set resize level for images in posts and comments (width and height)"] = "选择图片在文章和评论的重设尺寸（宽和高）";

From 1d358fe6ded6517ef6186554c4bb9c5f2f3ffe1c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 28 Apr 2013 21:02:53 -0700
Subject: [PATCH 38/67] system support for complete blocking

---
 include/conversation.php | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/include/conversation.php b/include/conversation.php
index 36ac57f17d..2e336efab0 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -377,6 +377,18 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	$page_writeable = false;
 	$live_update_div = '';
 
+	$arr_blocked = null;
+
+	if(local_user()) {
+		$str_blocked = get_pconfig(local_user(),'system','blocked');
+		if($str_blocked) {
+			$arr_blocked = explode(',',$str_blocked);
+			for($x = 0; $x < count($arr_blocked); $x ++)
+				$arr_blocked[$x] = trim($arr_blocked[$x]);
+		}
+
+	}
+
 	$previewing = (($preview) ? ' preview ' : '');
 
 	if($mode === 'network') {
@@ -493,6 +505,19 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 			$tpl = 'search_item.tpl';
 
 			foreach($items as $item) {
+				if($arr_blocked) {
+					$blocked = false;
+					foreach($arr_blocked as $b) {
+						if($b && link_compare($item['author-link'],$b)) {
+							$blocked = true;
+							break;
+						}
+					}
+					if($blocked)
+						continue;
+				}
+							
+
 				$threadsid++;
 
 				$comment     = '';
@@ -691,6 +716,21 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 			$threads = array();
 			foreach($items as $item) {
 
+				if($arr_blocked) {
+					$blocked = false;
+					foreach($arr_blocked as $b) {
+						
+						if($b && link_compare($item['author-link'],$b)) {
+							$blocked = true;
+							break;
+						}
+					}
+					if($blocked)
+						continue;
+				}
+							
+
+
 				// Can we put this after the visibility check?
 				like_puller($a,$item,$alike,'like');
 				like_puller($a,$item,$dlike,'dislike');

From 5ee19401c464a7d6eb20cd504e6ffa0b1e0637f1 Mon Sep 17 00:00:00 2001
From: Carsten Pfeiffer <carsten.pfeiffer@gebit.de>
Date: Mon, 29 Apr 2013 22:44:21 +0200
Subject: [PATCH 39/67] pgettext needs dba.php for q()

---
 include/pgettext.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/pgettext.php b/include/pgettext.php
index 525b64a186..93dd3e4b6d 100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once("dba.php");
+
 /**
  * translation support
  */

From 185d29c41ea9c7e4d286c685b958a0296d6ebeef Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 2 May 2013 21:42:34 -0700
Subject: [PATCH 40/67] undefined element

---
 boot.php         |   3 +-
 index.php        |   5 +-
 util/messages.po | 128 +++++++++++++++++++++++------------------------
 3 files changed, 70 insertions(+), 66 deletions(-)

diff --git a/boot.php b/boot.php
index 070ddd64d6..5e50fa17a9 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1684' );
+define ( 'FRIENDICA_VERSION',      '3.1.1688' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
@@ -423,6 +423,7 @@ if(! class_exists('App')) {
 			$this->performance["start"] = microtime(true);
 			$this->performance["database"] = 0;
 			$this->performance["network"] = 0;
+			$this->performance["file"] = 0;
 			$this->performance["rendering"] = 0;
 			$this->performance["parser"] = 0;
 			$this->performance["marktime"] = 0;
diff --git a/index.php b/index.php
index 8e2376e918..8abca2eb82 100644
--- a/index.php
+++ b/index.php
@@ -414,7 +414,10 @@ if(!$a->theme['stylesheet'])
 	$stylesheet = current_theme_url();
 else
 	$stylesheet = $a->theme['stylesheet'];
-$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
+// this creates hundreds of compiled templates, when all we really want is a string replace.
+// $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
+
+$a->page['htmlhead'] = str_replace('$stylesheet',$stylesheet,$a->page['htmlhead']);
 
 $page    = $a->page;
 $profile = $a->profile;
diff --git a/util/messages.po b/util/messages.po
index 17ef89bf2b..9dd1731faa 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1684\n"
+"Project-Id-Version: 3.1.1688\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-28 00:02-0700\n"
+"POT-Creation-Date: 2013-05-02 00:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -370,34 +370,34 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:225 ../../include/conversation.php:838
+#: ../../include/Contact.php:225 ../../include/conversation.php:878
 msgid "Poke"
 msgstr ""
 
-#: ../../include/Contact.php:226 ../../include/conversation.php:832
+#: ../../include/Contact.php:226 ../../include/conversation.php:872
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:227 ../../include/conversation.php:833
+#: ../../include/Contact.php:227 ../../include/conversation.php:873
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:834
+#: ../../include/Contact.php:228 ../../include/conversation.php:874
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:229 ../../include/Contact.php:251
-#: ../../include/conversation.php:835
+#: ../../include/conversation.php:875
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:230 ../../include/Contact.php:251
-#: ../../include/conversation.php:836
+#: ../../include/conversation.php:876
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:231 ../../include/Contact.php:251
-#: ../../include/conversation.php:837
+#: ../../include/conversation.php:877
 msgid "Send PM"
 msgstr ""
 
@@ -1277,7 +1277,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../../include/items.php:4023 ../../include/conversation.php:1080
+#: ../../include/items.php:4023 ../../include/conversation.php:1120
 #: ../../mod/contacts.php:249 ../../mod/settings.php:585
 #: ../../mod/settings.php:611 ../../mod/dfrn_request.php:848
 #: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
@@ -1542,44 +1542,44 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:587 ../../mod/content.php:461
+#: ../../include/conversation.php:612 ../../mod/content.php:461
 #: ../../mod/content.php:763 ../../object/Item.php:126
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:588 ../../mod/admin.php:770
+#: ../../include/conversation.php:613 ../../mod/admin.php:770
 #: ../../mod/settings.php:647 ../../mod/group.php:171
 #: ../../mod/photos.php:1637 ../../mod/content.php:462
 #: ../../mod/content.php:764 ../../object/Item.php:127
 msgid "Delete"
 msgstr ""
 
-#: ../../include/conversation.php:627 ../../mod/content.php:495
+#: ../../include/conversation.php:652 ../../mod/content.php:495
 #: ../../mod/content.php:875 ../../mod/content.php:876
 #: ../../object/Item.php:306 ../../object/Item.php:307
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:639 ../../object/Item.php:297
+#: ../../include/conversation.php:664 ../../object/Item.php:297
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/conversation.php:640 ../../object/Item.php:298
+#: ../../include/conversation.php:665 ../../object/Item.php:298
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/conversation.php:647 ../../mod/content.php:505
+#: ../../include/conversation.php:672 ../../mod/content.php:505
 #: ../../mod/content.php:887 ../../object/Item.php:320
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../include/conversation.php:662 ../../mod/content.php:520
+#: ../../include/conversation.php:687 ../../mod/content.php:520
 msgid "View in context"
 msgstr ""
 
-#: ../../include/conversation.php:664 ../../include/conversation.php:1060
+#: ../../include/conversation.php:689 ../../include/conversation.php:1100
 #: ../../mod/editpost.php:124 ../../mod/wallmessage.php:156
 #: ../../mod/message.php:334 ../../mod/message.php:565
 #: ../../mod/photos.php:1532 ../../mod/content.php:522
@@ -1587,205 +1587,205 @@ msgstr ""
 msgid "Please wait"
 msgstr ""
 
-#: ../../include/conversation.php:728
+#: ../../include/conversation.php:768
 msgid "remove"
 msgstr ""
 
-#: ../../include/conversation.php:732
+#: ../../include/conversation.php:772
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:831
+#: ../../include/conversation.php:871
 msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:900
+#: ../../include/conversation.php:940
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:900
+#: ../../include/conversation.php:940
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:905
+#: ../../include/conversation.php:945
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr ""
 
-#: ../../include/conversation.php:908
+#: ../../include/conversation.php:948
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr ""
 
-#: ../../include/conversation.php:922
+#: ../../include/conversation.php:962
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:928
+#: ../../include/conversation.php:968
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:970
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:970
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:957 ../../include/conversation.php:975
+#: ../../include/conversation.php:997 ../../include/conversation.php:1015
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:958 ../../include/conversation.php:976
+#: ../../include/conversation.php:998 ../../include/conversation.php:1016
 #: ../../mod/wallmessage.php:127 ../../mod/wallmessage.php:135
 #: ../../mod/message.php:283 ../../mod/message.php:291
 #: ../../mod/message.php:466 ../../mod/message.php:474
 msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../include/conversation.php:959 ../../include/conversation.php:977
+#: ../../include/conversation.php:999 ../../include/conversation.php:1017
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:960 ../../include/conversation.php:978
+#: ../../include/conversation.php:1000 ../../include/conversation.php:1018
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:961 ../../include/conversation.php:979
+#: ../../include/conversation.php:1001 ../../include/conversation.php:1019
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:962 ../../include/conversation.php:980
+#: ../../include/conversation.php:1002 ../../include/conversation.php:1020
 #: ../../mod/filer.php:30
 msgid "Save to Folder:"
 msgstr ""
 
-#: ../../include/conversation.php:963 ../../include/conversation.php:981
+#: ../../include/conversation.php:1003 ../../include/conversation.php:1021
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:1004
 msgid "Delete item(s)?"
 msgstr ""
 
-#: ../../include/conversation.php:1006
+#: ../../include/conversation.php:1046
 msgid "Post to Email"
 msgstr ""
 
-#: ../../include/conversation.php:1041 ../../mod/photos.php:1531
+#: ../../include/conversation.php:1081 ../../mod/photos.php:1531
 msgid "Share"
 msgstr ""
 
-#: ../../include/conversation.php:1042 ../../mod/editpost.php:110
+#: ../../include/conversation.php:1082 ../../mod/editpost.php:110
 #: ../../mod/wallmessage.php:154 ../../mod/message.php:332
 #: ../../mod/message.php:562
 msgid "Upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1043 ../../mod/editpost.php:111
+#: ../../include/conversation.php:1083 ../../mod/editpost.php:111
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1044 ../../mod/editpost.php:112
+#: ../../include/conversation.php:1084 ../../mod/editpost.php:112
 msgid "Attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1045 ../../mod/editpost.php:113
+#: ../../include/conversation.php:1085 ../../mod/editpost.php:113
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1046 ../../mod/editpost.php:114
+#: ../../include/conversation.php:1086 ../../mod/editpost.php:114
 #: ../../mod/wallmessage.php:155 ../../mod/message.php:333
 #: ../../mod/message.php:563
 msgid "Insert web link"
 msgstr ""
 
-#: ../../include/conversation.php:1047 ../../mod/editpost.php:115
+#: ../../include/conversation.php:1087 ../../mod/editpost.php:115
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:1048 ../../mod/editpost.php:116
+#: ../../include/conversation.php:1088 ../../mod/editpost.php:116
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:1049 ../../mod/editpost.php:117
+#: ../../include/conversation.php:1089 ../../mod/editpost.php:117
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:1050 ../../mod/editpost.php:118
+#: ../../include/conversation.php:1090 ../../mod/editpost.php:118
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1051 ../../mod/editpost.php:119
+#: ../../include/conversation.php:1091 ../../mod/editpost.php:119
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1052 ../../mod/editpost.php:120
+#: ../../include/conversation.php:1092 ../../mod/editpost.php:120
 msgid "Set your location"
 msgstr ""
 
-#: ../../include/conversation.php:1053 ../../mod/editpost.php:121
+#: ../../include/conversation.php:1093 ../../mod/editpost.php:121
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1054 ../../mod/editpost.php:122
+#: ../../include/conversation.php:1094 ../../mod/editpost.php:122
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/conversation.php:1055 ../../mod/editpost.php:123
+#: ../../include/conversation.php:1095 ../../mod/editpost.php:123
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1057 ../../mod/editpost.php:137
+#: ../../include/conversation.php:1097 ../../mod/editpost.php:137
 msgid "Set title"
 msgstr ""
 
-#: ../../include/conversation.php:1059 ../../mod/editpost.php:139
+#: ../../include/conversation.php:1099 ../../mod/editpost.php:139
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../include/conversation.php:1061 ../../mod/editpost.php:125
+#: ../../include/conversation.php:1101 ../../mod/editpost.php:125
 msgid "Permission settings"
 msgstr ""
 
-#: ../../include/conversation.php:1062
+#: ../../include/conversation.php:1102
 msgid "permissions"
 msgstr ""
 
-#: ../../include/conversation.php:1070 ../../mod/editpost.php:133
+#: ../../include/conversation.php:1110 ../../mod/editpost.php:133
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../include/conversation.php:1071 ../../mod/editpost.php:134
+#: ../../include/conversation.php:1111 ../../mod/editpost.php:134
 msgid "Public post"
 msgstr ""
 
-#: ../../include/conversation.php:1073 ../../mod/editpost.php:140
+#: ../../include/conversation.php:1113 ../../mod/editpost.php:140
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../include/conversation.php:1077 ../../mod/editpost.php:145
+#: ../../include/conversation.php:1117 ../../mod/editpost.php:145
 #: ../../mod/photos.php:1553 ../../mod/photos.php:1597
 #: ../../mod/photos.php:1680 ../../mod/content.php:742
 #: ../../object/Item.php:662
 msgid "Preview"
 msgstr ""
 
-#: ../../include/conversation.php:1086
+#: ../../include/conversation.php:1126
 msgid "Post to Groups"
 msgstr ""
 
-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:1127
 msgid "Post to Contacts"
 msgstr ""
 
-#: ../../include/conversation.php:1088
+#: ../../include/conversation.php:1128
 msgid "Private post"
 msgstr ""
 

From ed5768c4a316172e944ba0ea9fbd8ee15973ed1b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 2 May 2013 21:59:20 -0700
Subject: [PATCH 41/67] optimise cachefile logic - still not sure why the
 cachefile profiling was getting triggered on a site with no cachefile
 configured

---
 boot.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/boot.php b/boot.php
index 5e50fa17a9..cf4a7abfb6 100644
--- a/boot.php
+++ b/boot.php
@@ -2099,10 +2099,7 @@ function random_digits($digits) {
 function get_cachefile($file, $writemode = true) {
 	$cache = get_config("system","itemcache");
 
-	if ($cache == "")
-		return("");
-
-	if (!is_dir($cache))
+	if ((! $cache) || (! is_dir($cache)))
 		return("");
 
 	$subfolder = $cache."/".substr($file, 0, 2);

From 886c3d14728ac62fed0d437388c14250ff44ca76 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 2 May 2013 22:19:16 -0700
Subject: [PATCH 42/67] bad checkin

---
 include/network.php | 8 +++++---
 index.php           | 5 +----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/network.php b/include/network.php
index 5a36bd6a00..d2732e0393 100644
--- a/include/network.php
+++ b/include/network.php
@@ -819,12 +819,12 @@ function add_fcontact($arr,$update = false) {
 }
 
 
-function scale_external_images($s, $include_link = true, $scale_replace = false) {
+function scale_external_images($srctext, $include_link = true, $scale_replace = false) {
 
 	$a = get_app();
 
 	// Picture addresses can contain special characters
-	$s = htmlspecialchars_decode($s);
+	$s = htmlspecialchars_decode($srctext);
 
 	$matches = null;
 	$c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
@@ -846,7 +846,9 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
 				$scaled = str_replace($scale_replace[0], $scale_replace[1], $mtch[1]);
 			else
 				$scaled = $mtch[1];
-			$i = fetch_url($scaled);
+			$i = @fetch_url($scaled);
+			if(! $i)
+				return $srctext;
 
 			$cachefile = get_cachefile(hash("md5", $scaled));
 			if ($cachefile != '') {
diff --git a/index.php b/index.php
index 8abca2eb82..8e2376e918 100644
--- a/index.php
+++ b/index.php
@@ -414,10 +414,7 @@ if(!$a->theme['stylesheet'])
 	$stylesheet = current_theme_url();
 else
 	$stylesheet = $a->theme['stylesheet'];
-// this creates hundreds of compiled templates, when all we really want is a string replace.
-// $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
-
-$a->page['htmlhead'] = str_replace('$stylesheet',$stylesheet,$a->page['htmlhead']);
+$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
 
 $page    = $a->page;
 $profile = $a->profile;

From 04681618da523e894562d92ca559b735fbf924ad Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 2 May 2013 22:21:06 -0700
Subject: [PATCH 43/67] spelling

---
 doc/Home.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Home.md b/doc/Home.md
index 3f2c51bebf..4c0523398f 100644
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -3,7 +3,7 @@ Friendica Documentation and Resources
 
 **Contents**
 
-* Generell functions - first steps
+* General functions - first steps
 	* [Account Basics](help/Account-Basics)
 	* [New User Quick Start](help/Quick-Start-guide)
 	* [Creating posts](help/Text_editor)

From fec4581f34f9711f79e808ea410ace8c81a5b9bf Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Fri, 3 May 2013 18:17:56 -0600
Subject: [PATCH 44/67] basic video playback support using VideoJS

---
 boot.php                                      |    7 +
 include/text.php                              |   42 +-
 js/main.js                                    |    3 +
 js/main.min.js                                |    2 +-
 library/video-js/captions.vtt                 |   41 +
 library/video-js/demo.html                    |   30 +
 library/video-js/video-js.css                 |  499 ++
 library/video-js/video-js.min.css             |    1 +
 library/video-js/video-js.png                 |  Bin 0 -> 8235 bytes
 library/video-js/video-js.swf                 |  Bin 0 -> 9612 bytes
 library/video-js/video.js                     | 4569 +++++++++++++++++
 library/video-js/video.min.js                 |   21 +
 mod/attach.php                                |    7 +-
 mod/videos.php                                |  323 ++
 util/minifyjs.sh                              |    2 +
 view/templates/video_top.tpl                  |   22 +
 view/templates/videos_end.tpl                 |    0
 view/templates/videos_head.tpl                |    6 +
 view/templates/videos_recent.tpl              |   11 +
 .../decaf-mobile/templates/videos_end.tpl     |    0
 .../decaf-mobile/templates/videos_head.tpl    |    0
 view/theme/frost-mobile/js/main.js            |    3 +
 view/theme/frost-mobile/js/main.min.js        |    2 +-
 .../frost-mobile/templates/videos_end.tpl     |    5 +
 .../frost-mobile/templates/videos_head.tpl    |    2 +
 view/theme/frost/js/main.js                   |    2 +
 view/theme/frost/js/main.min.js               |    2 +-
 view/theme/frost/templates/videos_end.tpl     |    5 +
 view/theme/frost/templates/videos_head.tpl    |    2 +
 29 files changed, 5596 insertions(+), 13 deletions(-)
 create mode 100644 library/video-js/captions.vtt
 create mode 100644 library/video-js/demo.html
 create mode 100644 library/video-js/video-js.css
 create mode 100644 library/video-js/video-js.min.css
 create mode 100644 library/video-js/video-js.png
 create mode 100644 library/video-js/video-js.swf
 create mode 100644 library/video-js/video.js
 create mode 100644 library/video-js/video.min.js
 create mode 100644 mod/videos.php
 create mode 100644 view/templates/video_top.tpl
 create mode 100644 view/templates/videos_end.tpl
 create mode 100644 view/templates/videos_head.tpl
 create mode 100644 view/templates/videos_recent.tpl
 create mode 100644 view/theme/decaf-mobile/templates/videos_end.tpl
 create mode 100644 view/theme/decaf-mobile/templates/videos_head.tpl
 create mode 100644 view/theme/frost-mobile/templates/videos_end.tpl
 create mode 100644 view/theme/frost-mobile/templates/videos_head.tpl
 create mode 100644 view/theme/frost/templates/videos_end.tpl
 create mode 100644 view/theme/frost/templates/videos_head.tpl

diff --git a/boot.php b/boot.php
index cf4a7abfb6..adcb7534aa 100644
--- a/boot.php
+++ b/boot.php
@@ -1956,6 +1956,13 @@ if(! function_exists('profile_tabs')){
 				'title' => t('Photo Albums'),
 				'id' => 'photo-tab',
 			),
+			array(
+				'label' => t('Videos'),
+				'url'	=> $a->get_baseurl() . '/videos/' . $nickname,
+				'sel'	=> ((!isset($tab)&&$a->argv[0]=='videos')?'active':''),
+				'title' => t('Videos'),
+				'id' => 'video-tab',
+			),
 		);
 	
 		if ($is_owner){
diff --git a/include/text.php b/include/text.php
index 72a2e1c372..9374e624b0 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1285,18 +1285,45 @@ function prepare_body($item,$attach = false) {
 		return $s;
 	}
 
+	$as = '';
+	$vhead = false;
 	$arr = explode('[/attach],',$item['attach']);
 	if(count($arr)) {
-		$s .= '<div class="body-attach">';
+		$as .= '<div class="body-attach">';
 		foreach($arr as $r) {
 			$matches = false;
 			$icon = '';
 			$cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches, PREG_SET_ORDER);
 			if($cnt) {
 				foreach($matches as $mtch) {
-					$filetype = strtolower(substr( $mtch[3], 0, strpos($mtch[3],'/') ));
+					$mime = $mtch[3];
+
+					if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN))
+						$the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
+					else
+						$the_url = $mtch[1];
+
+					if(strpos($mime, 'video') !== false) {
+						if(!$vhead) {
+							$vhead = true;
+							$a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array());
+							$a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array());
+						}
+
+						$id = end(explode('/', $the_url));
+						$as .= replace_macros(get_markup_template('video_top.tpl'), array(
+							'$video'	=> array(
+								'id'       => $id,
+								'title' 	=> t('View Video'),
+								'src'     	=> $the_url,
+								'mime'		=> $mime,
+							),
+						));
+					}
+
+					$filetype = strtolower(substr( $mime, 0, strpos($mime,'/') ));
 					if($filetype) {
-						$filesubtype = strtolower(substr( $mtch[3], strpos($mtch[3],'/') + 1 ));
+						$filesubtype = strtolower(substr( $mime, strpos($mime,'/') + 1 ));
 						$filesubtype = str_replace('.', '-', $filesubtype);
 					}
 					else {
@@ -1320,17 +1347,14 @@ function prepare_body($item,$attach = false) {
 
 					$title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1]));
 					$title .= ' ' . $mtch[2] . ' ' . t('bytes');
-					if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN))
-						$the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
-					else
-						$the_url = $mtch[1];
 
-					$s .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="external-link" >' . $icon . '</a>';
+					$as .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="external-link" >' . $icon . '</a>';
 				}
 			}
 		}
-		$s .= '<div class="clear"></div></div>';
+		$as .= '<div class="clear"></div></div>';
 	}
+	$s = $s . $as;
 
 
 	// Look for spoiler
diff --git a/js/main.js b/js/main.js
index 488d5d4c72..badad4edf5 100644
--- a/js/main.js
+++ b/js/main.js
@@ -381,6 +381,9 @@
 			}
 			/* autocomplete @nicknames */
 			$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
+
+			// setup videos, since VideoJS won't take care of any loaded via AJAX
+			_V_.autoSetup();
 		});
 	}
 
diff --git a/js/main.min.js b/js/main.min.js
index cd127f9795..698190ebbe 100644
--- a/js/main.min.js
+++ b/js/main.min.js
@@ -1 +1 @@
-function openClose(theID){if(document.getElementById(theID).style.display=="block"){document.getElementById(theID).style.display="none"}else{document.getElementById(theID).style.display="block"}}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;$(function(){$.ajaxSetup({cache:false});msie=$.browser.msie;$(".onoff input").each(function(){val=$(this).val();id=$(this).attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$(".onoff > a").click(function(event){event.preventDefault();var input=$(this).siblings("input");var val=1-input.val();var id=input.attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(){if(last_popup_menu){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}$("a[rel^=#]").click(function(e){close_last_popup_menu();menu=$($(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$(this).parent().toggleClass("selected");menu.toggle();if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$(this).parent()}return false});$("html").click(function(){close_last_popup_menu()});$("a.popupbox").colorbox({inline:true,transition:"elastic"});var notifications_tpl=unescape($("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($("<div>").append($("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($("<div>").append($("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,data){var invalid=$(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$(data).find("net").text();if(net==0){net="";$("#net-update").removeClass("show")}else{$("#net-update").addClass("show")}$("#net-update").html(net);var home=$(data).find("home").text();if(home==0){home="";$("#home-update").removeClass("show")}else{$("#home-update").addClass("show")}$("#home-update").html(home);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update").removeClass("show")}else{$("#intro-update").addClass("show")}$("#intro-update").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update").removeClass("show")}else{$("#mail-update").addClass("show")}$("#mail-update").html(mail);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update-li").removeClass("show")}else{$("#intro-update-li").addClass("show")}$("#intro-update-li").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update-li").removeClass("show")}else{$("#mail-update-li").addClass("show")}$("#mail-update-li").html(mail);var allevents=$(data).find("all-events").text();if(allevents==0){allevents="";$("#allevents-update").removeClass("show")}else{$("#allevents-update").addClass("show")}$("#allevents-update").html(allevents);var alleventstoday=$(data).find("all-events-today").text();if(alleventstoday==0){$("#allevents-update").removeClass("notif-allevents-today")}else{$("#allevents-update").addClass("notif-allevents-today")}var events=$(data).find("events").text();if(events==0){events="";$("#events-update").removeClass("show")}else{$("#events-update").addClass("show")}$("#events-update").html(events);var eventstoday=$(data).find("events-today").text();if(eventstoday==0){$("#events-update").removeClass("notif-events-today")}else{$("#events-update").addClass("notif-events-today")}var birthdays=$(data).find("birthdays").text();if(birthdays==0){birthdays="";$("#birthdays-update").removeClass("show")}else{$("#birthdays-update").addClass("show")}$("#birthdays-update").html(birthdays);var birthdaystoday=$(data).find("birthdays-today").text();if(birthdaystoday==0){$("#birthdays-update").removeClass("notif-birthdays-today")}else{$("#birthdays-update").addClass("notif-birthdays-today")}var eNotif=$(data).find("notif");if(eNotif.children("note").length==0){$("#nav-notifications-menu").html(notifications_empty)}else{nnm=$("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$(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)});$("img[data-src]",nnm).each(function(i,el){$(el).attr("src",$(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$("#nav-notifications-linkmenu").addClass("on")}else{$("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$("#notify-update").removeClass("show")}else{$("#notify-update").addClass("show")}$("#notify-update").html(notif);var eSysmsg=$(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$(this).text();$.jGrowl(text,{sticky:true,theme:"notice"})});eSysmsg.children("info").each(function(){text=$(this).text();$.jGrowl(text,{sticky:false,theme:"info",life:1e4})})});NavUpdate();$(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}$("#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:"");$.get(pingCmd,function(data){$(data).find("result").each(function(){$("nav").trigger("nav-update",this);if($("#live-network").length){src="network";liveUpdate()}if($("#live-profile").length){src="profile";liveUpdate()}if($("#live-community").length){src="community";liveUpdate()}if($("#live-notes").length){src="notes";liveUpdate()}if($("#live-display").length){src="display";liveUpdate()}if($("#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){$(".like-rotator").hide();return}if($(".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);$.get(update_url,function(data){in_progress=false;$(".toplevel_item",data).each(function(){var ident=$(this).attr("id");if($("#"+ident).length==0&&profile_page==1){$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("#"+prev).after($(this))}else{var id=$(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$("#collapsed-comments-"+id).is(":visible")}$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("html").height($("html").height());$("#"+ident).replaceWith($(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$("html").height("auto")}prev=ident});$(".like-rotator").hide();if(commentBusy){commentBusy=false;$("body").css("cursor","auto")}$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl")})}function imgbright(node){$(node).removeClass("drophide").addClass("drop")}function imgdull(node){$(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$("#like-rotator-"+ident.toString()).show();$.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dosubthread(ident){unpause();$("#like-rotator-"+ident.toString()).show();$.get("subthread/"+ident.toString(),NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$("#like-rotator-"+ident).show();$.get("starred/"+ident,function(data){if(data.match(/1/)){$("#starred-"+ident).addClass("starred");$("#starred-"+ident).removeClass("unstarred");$("#star-"+ident).addClass("hidden");$("#unstar-"+ident).removeClass("hidden")}else{$("#starred-"+ident).addClass("unstarred");$("#starred-"+ident).removeClass("starred");$("#star-"+ident).removeClass("hidden");$("#unstar-"+ident).addClass("hidden")}$("#like-rotator-"+ident).hide()})}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;$.get("lockview/"+id,function(data){$("#panel").html(data);$("#panel").css({left:cursor.x+5,top:cursor.y+5});$("#panel").show()})}}function lockviewhide(){lockvisible=false;$("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$("body").css("cursor","wait");$("#comment-preview-inp-"+id).val("0");$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$("#comment-edit-wrapper-"+id).hide();$("#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){$("#comment-preview-inp-"+id).val("1");$("#comment-edit-preview-"+id).show();$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$("#comment-edit-preview-"+id).html(data.preview);$("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($("#collapsed-comments-"+id).is(":visible")){$("#collapsed-comments-"+id).hide();$("#hide-comments-"+id).html(window.showMore)}else{$("#collapsed-comments-"+id).show();$("#hide-comments-"+id).html(window.showFewer)}}function preview_post(){$("#jot-preview").val("1");$("#jot-preview-content").show();tinyMCE.triggerSave();$.post("item",$("#profile-jot-form").serialize(),function(data){if(data.preview){$("#jot-preview-content").html(data.preview);$("#jot-preview-content"+" a").click(function(){return false})}},"json");$("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$("#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){$("body .fakelink").css("cursor","wait");$.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$("#group-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$("body .fakelink").css("cursor","wait");$.get("profperm/"+gid+"/"+cid,function(data){$("#prof-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$("body").css("cursor","wait");$.get("contactgroup/"+gid+"/"+cid,function(data){$("body").css("cursor","auto")})}function checkboxhighlight(box){if($(box).is(":checked")){$(box).addClass("checkeditem")}else{$(box).removeClass("checkeditem")}}function notifyMarkAll(){$.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,forced_root_block:"div",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=$(elm).val();$.getJSON("pretheme?f=&theme="+theme,function(data){$("#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(theID){if(document.getElementById(theID).style.display=="block"){document.getElementById(theID).style.display="none"}else{document.getElementById(theID).style.display="block"}}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;$(function(){$.ajaxSetup({cache:false});msie=$.browser.msie;$(".onoff input").each(function(){val=$(this).val();id=$(this).attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$(".onoff > a").click(function(event){event.preventDefault();var input=$(this).siblings("input");var val=1-input.val();var id=input.attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(){if(last_popup_menu){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}$("a[rel^=#]").click(function(e){close_last_popup_menu();menu=$($(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$(this).parent().toggleClass("selected");menu.toggle();if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$(this).parent()}return false});$("html").click(function(){close_last_popup_menu()});$("a.popupbox").colorbox({inline:true,transition:"elastic"});var notifications_tpl=unescape($("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($("<div>").append($("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($("<div>").append($("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,data){var invalid=$(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$(data).find("net").text();if(net==0){net="";$("#net-update").removeClass("show")}else{$("#net-update").addClass("show")}$("#net-update").html(net);var home=$(data).find("home").text();if(home==0){home="";$("#home-update").removeClass("show")}else{$("#home-update").addClass("show")}$("#home-update").html(home);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update").removeClass("show")}else{$("#intro-update").addClass("show")}$("#intro-update").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update").removeClass("show")}else{$("#mail-update").addClass("show")}$("#mail-update").html(mail);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update-li").removeClass("show")}else{$("#intro-update-li").addClass("show")}$("#intro-update-li").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update-li").removeClass("show")}else{$("#mail-update-li").addClass("show")}$("#mail-update-li").html(mail);var allevents=$(data).find("all-events").text();if(allevents==0){allevents="";$("#allevents-update").removeClass("show")}else{$("#allevents-update").addClass("show")}$("#allevents-update").html(allevents);var alleventstoday=$(data).find("all-events-today").text();if(alleventstoday==0){$("#allevents-update").removeClass("notif-allevents-today")}else{$("#allevents-update").addClass("notif-allevents-today")}var events=$(data).find("events").text();if(events==0){events="";$("#events-update").removeClass("show")}else{$("#events-update").addClass("show")}$("#events-update").html(events);var eventstoday=$(data).find("events-today").text();if(eventstoday==0){$("#events-update").removeClass("notif-events-today")}else{$("#events-update").addClass("notif-events-today")}var birthdays=$(data).find("birthdays").text();if(birthdays==0){birthdays="";$("#birthdays-update").removeClass("show")}else{$("#birthdays-update").addClass("show")}$("#birthdays-update").html(birthdays);var birthdaystoday=$(data).find("birthdays-today").text();if(birthdaystoday==0){$("#birthdays-update").removeClass("notif-birthdays-today")}else{$("#birthdays-update").addClass("notif-birthdays-today")}var eNotif=$(data).find("notif");if(eNotif.children("note").length==0){$("#nav-notifications-menu").html(notifications_empty)}else{nnm=$("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$(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)});$("img[data-src]",nnm).each(function(i,el){$(el).attr("src",$(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$("#nav-notifications-linkmenu").addClass("on")}else{$("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$("#notify-update").removeClass("show")}else{$("#notify-update").addClass("show")}$("#notify-update").html(notif);var eSysmsg=$(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$(this).text();$.jGrowl(text,{sticky:true,theme:"notice"})});eSysmsg.children("info").each(function(){text=$(this).text();$.jGrowl(text,{sticky:false,theme:"info",life:1e4})})});NavUpdate();$(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}$("#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:"");$.get(pingCmd,function(data){$(data).find("result").each(function(){$("nav").trigger("nav-update",this);if($("#live-network").length){src="network";liveUpdate()}if($("#live-profile").length){src="profile";liveUpdate()}if($("#live-community").length){src="community";liveUpdate()}if($("#live-notes").length){src="notes";liveUpdate()}if($("#live-display").length){src="display";liveUpdate()}if($("#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){$(".like-rotator").hide();return}if($(".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);$.get(update_url,function(data){in_progress=false;$(".toplevel_item",data).each(function(){var ident=$(this).attr("id");if($("#"+ident).length==0&&profile_page==1){$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("#"+prev).after($(this))}else{var id=$(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$("#collapsed-comments-"+id).is(":visible")}$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("html").height($("html").height());$("#"+ident).replaceWith($(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$("html").height("auto")}prev=ident});$(".like-rotator").hide();if(commentBusy){commentBusy=false;$("body").css("cursor","auto")}$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");_V_.autoSetup()})}function imgbright(node){$(node).removeClass("drophide").addClass("drop")}function imgdull(node){$(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$("#like-rotator-"+ident.toString()).show();$.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dosubthread(ident){unpause();$("#like-rotator-"+ident.toString()).show();$.get("subthread/"+ident.toString(),NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$("#like-rotator-"+ident).show();$.get("starred/"+ident,function(data){if(data.match(/1/)){$("#starred-"+ident).addClass("starred");$("#starred-"+ident).removeClass("unstarred");$("#star-"+ident).addClass("hidden");$("#unstar-"+ident).removeClass("hidden")}else{$("#starred-"+ident).addClass("unstarred");$("#starred-"+ident).removeClass("starred");$("#star-"+ident).removeClass("hidden");$("#unstar-"+ident).addClass("hidden")}$("#like-rotator-"+ident).hide()})}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;$.get("lockview/"+id,function(data){$("#panel").html(data);$("#panel").css({left:cursor.x+5,top:cursor.y+5});$("#panel").show()})}}function lockviewhide(){lockvisible=false;$("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$("body").css("cursor","wait");$("#comment-preview-inp-"+id).val("0");$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$("#comment-edit-wrapper-"+id).hide();$("#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){$("#comment-preview-inp-"+id).val("1");$("#comment-edit-preview-"+id).show();$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$("#comment-edit-preview-"+id).html(data.preview);$("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($("#collapsed-comments-"+id).is(":visible")){$("#collapsed-comments-"+id).hide();$("#hide-comments-"+id).html(window.showMore)}else{$("#collapsed-comments-"+id).show();$("#hide-comments-"+id).html(window.showFewer)}}function preview_post(){$("#jot-preview").val("1");$("#jot-preview-content").show();tinyMCE.triggerSave();$.post("item",$("#profile-jot-form").serialize(),function(data){if(data.preview){$("#jot-preview-content").html(data.preview);$("#jot-preview-content"+" a").click(function(){return false})}},"json");$("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$("#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){$("body .fakelink").css("cursor","wait");$.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$("#group-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$("body .fakelink").css("cursor","wait");$.get("profperm/"+gid+"/"+cid,function(data){$("#prof-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$("body").css("cursor","wait");$.get("contactgroup/"+gid+"/"+cid,function(data){$("body").css("cursor","auto")})}function checkboxhighlight(box){if($(box).is(":checked")){$(box).addClass("checkeditem")}else{$(box).removeClass("checkeditem")}}function notifyMarkAll(){$.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,forced_root_block:"div",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=$(elm).val();$.getJSON("pretheme?f=&theme="+theme,function(data){$("#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/library/video-js/captions.vtt b/library/video-js/captions.vtt
new file mode 100644
index 0000000000..e598be1982
--- /dev/null
+++ b/library/video-js/captions.vtt
@@ -0,0 +1,41 @@
+WEBVTT
+
+00:00.700 --> 00:04.110
+Captions describe all relevant audio for the hearing impaired.
+[ Heroic music playing for a seagull ]
+
+00:04.500 --> 00:05.000
+[ Splash!!! ]
+
+00:05.100 --> 00:06.000
+[ Sploosh!!! ]
+
+00:08.000 --> 00:09.225
+[ Splash...splash...splash splash splash ]
+
+00:10.525 --> 00:11.255
+[ Splash, Sploosh again ]
+
+00:13.500 --> 00:14.984
+Dolphin: eeeEEEEEeeee!
+
+00:14.984 --> 00:16.984
+Dolphin: Squawk! eeeEEE?
+
+00:25.000 --> 00:28.284
+[ A whole ton of splashes ]
+
+00:29.500 --> 00:31.000
+Mine. Mine. Mine.
+
+00:34.300 --> 00:36.000
+Shark: Chomp
+
+00:36.800 --> 00:37.900
+Shark: CHOMP!!!
+
+00:37.861 --> 00:41.193
+EEEEEEOOOOOOOOOOWHALENOISE
+
+00:42.593 --> 00:45.611
+[ BIG SPLASH ]
\ No newline at end of file
diff --git a/library/video-js/demo.html b/library/video-js/demo.html
new file mode 100644
index 0000000000..b35cdc2838
--- /dev/null
+++ b/library/video-js/demo.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Video.js | HTML5 Video Player</title>
+
+  <!-- Chang URLs to wherever Video.js files will be hosted -->
+  <link href="video-js.css" rel="stylesheet" type="text/css">
+  <!-- video.js must be in the <head> for older IEs to work. -->
+  <script src="video.js"></script>
+
+  <!-- Unless using the CDN hosted version, update the URL to the Flash SWF -->
+  <script>
+    _V_.options.flash.swf = "video-js.swf";
+  </script>
+
+
+</head>
+<body>
+
+  <video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264"
+      poster="http://video-js.zencoder.com/oceans-clip.png"
+      data-setup="{}">
+    <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
+    <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
+    <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
+    <track kind="captions" src="captions.vtt" srclang="en" label="English" />
+  </video>
+
+</body>
+</html>
diff --git a/library/video-js/video-js.css b/library/video-js/video-js.css
new file mode 100644
index 0000000000..7956aeee28
--- /dev/null
+++ b/library/video-js/video-js.css
@@ -0,0 +1,499 @@
+/*
+VideoJS Default Styles (http://videojs.com)
+Version 3.2.0
+*/
+
+/*
+REQUIRED STYLES (be careful overriding)
+================================================================================ */
+/* When loading the player, the video tag is replaced with a DIV,
+   that will hold the video tag or object tag for other playback methods.
+   The div contains the video playback element (Flash or HTML5) and controls, and sets the width and height of the video.
+
+   ** If you want to add some kind of border/padding (e.g. a frame), or special positioning, use another containing element.
+   Otherwise you risk messing up control positioning and full window mode. **
+*/
+.video-js {
+  background-color: #000; position: relative; padding: 0;
+
+  /* Start with 10px for base font size so other dimensions can be em based and easily calculable. */
+  font-size: 10px;
+
+  /* Allow poster to be vertially aligned. */
+  vertical-align: middle;
+  /*  display: table-cell; */ /*This works in Safari but not Firefox.*/
+}
+
+/* Playback technology elements expand to the width/height of the containing div. <video> or <object> */
+.video-js .vjs-tech { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+/* Fix for Firefox 9 fullscreen (only if it is enabled). Not needed when checking fullScreenEnabled. */
+.video-js:-moz-full-screen { position: absolute; }
+
+/* Fullscreen Styles */
+body.vjs-full-window {
+  padding: 0; margin: 0;
+  height: 100%; overflow-y: auto; /* Fix for IE6 full-window. http://www.cssplay.co.uk/layouts/fixed.html */
+}
+.video-js.vjs-fullscreen {
+  position: fixed; overflow: hidden; z-index: 1000; left: 0; top: 0; bottom: 0; right: 0; width: 100% !important; height: 100% !important;
+  _position: absolute; /* IE6 Full-window (underscore hack) */
+}
+.video-js:-webkit-full-screen {
+  width: 100% !important; height: 100% !important;
+}
+
+/* Poster Styles */
+.vjs-poster {
+  margin: 0 auto; padding: 0; cursor: pointer;
+
+  /* Scale with the size of the player div. Works when poster is vertically shorter, but stretches when it's less wide. */
+  position: relative; width: 100%; max-height: 100%;
+}
+
+/* Text Track Styles */
+/* Overall track holder for both captions and subtitles */
+.video-js .vjs-text-track-display { text-align: center; position: absolute; bottom: 4em; left: 1em; right: 1em; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; }
+/* Individual tracks */
+.video-js .vjs-text-track {
+  display: none; color: #fff; font-size: 1.4em; text-align: center; margin-bottom: 0.1em;
+  /* Transparent black background, or fallback to all black (IE6) */
+  background: rgb(0, 0, 0); background: rgba(0, 0, 0, 0.50);
+}
+.video-js .vjs-subtitles { color: #fff; }
+.video-js .vjs-captions { color: #fc6; }
+.vjs-tt-cue { display: block; }
+
+/* Fading sytles, used to fade control bar. */
+.vjs-fade-in {
+  visibility: visible !important; /* Needed to make sure things hide in older browsers too. */
+  opacity: 1 !important;
+
+  -webkit-transition: visibility 0s linear 0s, opacity 0.3s linear;
+  -moz-transition: visibility 0s linear 0s, opacity 0.3s linear;
+  -ms-transition: visibility 0s linear 0s, opacity 0.3s linear;
+  -o-transition: visibility 0s linear 0s, opacity 0.3s linear;
+  transition: visibility 0s linear 0s, opacity 0.3s linear;
+}
+.vjs-fade-out {
+  visibility: hidden !important;
+  opacity: 0 !important;
+
+  -webkit-transition: visibility 0s linear 1.5s,opacity 1.5s linear;
+  -moz-transition: visibility 0s linear 1.5s,opacity 1.5s linear;
+  -ms-transition: visibility 0s linear 1.5s,opacity 1.5s linear;
+  -o-transition: visibility 0s linear 1.5s,opacity 1.5s linear;
+  transition: visibility 0s linear 1.5s,opacity 1.5s linear;
+}
+
+/* DEFAULT SKIN (override in another file to create new skins)
+================================================================================
+Instead of editing this file, I recommend creating your own skin CSS file to be included after this file,
+so you can upgrade to newer versions easier. You can remove all these styles by removing the 'vjs-default-skin' class from the tag. */
+
+/* The default control bar. Created by bar.js */
+.vjs-default-skin .vjs-controls {
+  position: absolute;
+  bottom: 0; /* Distance from the bottom of the box/video. Keep 0. Use height to add more bottom margin. */
+  left: 0; right: 0; /* 100% width of div */
+  margin: 0; padding: 0; /* Controls are absolutely position, so no padding necessary */
+  height: 2.6em; /* Including any margin you want above or below control items */
+  color: #fff; border-top: 1px solid #404040;
+
+  /* CSS Gradient */
+  /* Can use the Ultimate CSS Gradient Generator: http://www.colorzilla.com/gradient-editor/ */
+  background: #242424; /* Old browsers */
+  background: -moz-linear-gradient(top, #242424 50%, #1f1f1f 50%, #171717 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(50%,#242424), color-stop(50%,#1f1f1f), color-stop(100%,#171717)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #242424 50%,#1f1f1f 50%,#171717 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #242424 50%,#1f1f1f 50%,#171717 100%); /* Opera11.10+ */
+  background: -ms-linear-gradient(top, #242424 50%,#1f1f1f 50%,#171717 100%); /* IE10+ */
+  /* Filter was causing a lot of weird issues in IE. Elements would stop showing up, or other styles would break. */
+  /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#242424', endColorstr='#171717',GradientType=0 );*/ /* IE6-9 */
+  background: linear-gradient(top, #242424 50%,#1f1f1f 50%,#171717 100%); /* W3C */
+
+  /* Start hidden and with 0 opacity. Opacity is used to fade in modern browsers. */
+  /* Can't use display block to hide initially because widths of slider handles aren't calculated and avaialbe for positioning correctly. */
+  visibility: hidden;
+  opacity: 0;
+}
+
+/* General styles for individual controls. */
+.vjs-default-skin .vjs-control {
+  position: relative; float: left;
+  text-align: center; margin: 0; padding: 0;
+  height: 2.6em; width: 2.6em;
+}
+
+.vjs-default-skin .vjs-control:focus {
+  outline: 0;
+/*  background-color: #555;*/
+}
+
+/* Hide control text visually, but have it available for screenreaders: h5bp.com/v */
+.vjs-default-skin .vjs-control-text { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
+
+
+/* Play/Pause
+-------------------------------------------------------------------------------- */
+.vjs-default-skin .vjs-play-control { width: 5em; cursor: pointer !important; }
+/* Play Icon */
+.vjs-default-skin.vjs-paused .vjs-play-control div { width: 15px; height: 17px; background: url('video-js.png'); margin: 0.5em auto 0; }
+.vjs-default-skin.vjs-playing .vjs-play-control div { width: 15px; height: 17px; background: url('video-js.png') -25px 0; margin: 0.5em auto 0; }
+
+/* Rewind
+-------------------------------------------------------------------------------- */
+.vjs-default-skin .vjs-rewind-control { width: 5em; cursor: pointer !important; }
+.vjs-default-skin .vjs-rewind-control div { width: 19px; height: 16px; background: url('video-js.png'); margin: 0.5em auto 0; }
+
+/* Volume/Mute
+-------------------------------------------------------------------------------- */
+.vjs-default-skin .vjs-mute-control { width: 3.8em; cursor: pointer !important; float: right; }
+.vjs-default-skin .vjs-mute-control div { width: 22px; height: 16px; background: url('video-js.png') -75px -25px; margin: 0.5em auto 0; }
+.vjs-default-skin .vjs-mute-control.vjs-vol-0 div { background: url('video-js.png') 0 -25px; }
+.vjs-default-skin .vjs-mute-control.vjs-vol-1 div { background: url('video-js.png') -25px -25px; }
+.vjs-default-skin .vjs-mute-control.vjs-vol-2 div { background: url('video-js.png') -50px -25px; }
+
+
+.vjs-default-skin .vjs-volume-control { width: 5em; float: right; }
+.vjs-default-skin .vjs-volume-bar {
+  position: relative; width: 5em; height: 0.6em; margin: 1em auto 0; cursor: pointer !important;
+
+  -moz-border-radius: 0.3em; -webkit-border-radius: 0.3em; border-radius: 0.3em;
+
+  background: #666;
+  background: -moz-linear-gradient(top, #333, #666);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#333), to(#666));
+  background: -webkit-linear-gradient(top, #333, #666);
+  background: -o-linear-gradient(top, #333, #666);
+  background: -ms-linear-gradient(top, #333, #666);
+  background: linear-gradient(top, #333, #666);
+}
+.vjs-default-skin .vjs-volume-level {
+  position: absolute; top: 0; left: 0; height: 0.6em;
+
+  -moz-border-radius: 0.3em; -webkit-border-radius: 0.3em; border-radius: 0.3em;
+
+  background: #fff;
+  background: -moz-linear-gradient(top, #fff, #ccc);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#ccc));
+  background: -webkit-linear-gradient(top, #fff, #ccc);
+  background: -o-linear-gradient(top, #fff, #ccc);
+  background: -ms-linear-gradient(top, #fff, #ccc);
+  background: linear-gradient(top, #fff, #ccc);
+}
+.vjs-default-skin .vjs-volume-handle {
+  position: absolute; top: -0.2em; width: 0.8em; height: 0.8em; background: #ccc; left: 0;
+  border: 1px solid #fff;
+  -moz-border-radius: 0.6em; -webkit-border-radius: 0.6em; border-radius: 0.6em;
+}
+
+/* Progress
+-------------------------------------------------------------------------------- */
+.vjs-default-skin div.vjs-progress-control {
+  position: absolute;
+  left: 4.8em; right: 4.8em; /* Leave room for time displays. */
+  height: 1.0em; width: auto;
+  top: -1.3em; /* Set above the rest of the controls. And leave room for 2px of borders (progress bottom and controls top). */
+  border-bottom: 1px solid #1F1F1F;
+  border-top: 1px solid #222;
+
+  /* CSS Gradient */
+  background: #333;
+  background: -moz-linear-gradient(top, #222, #333);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#222), to(#333));
+  background: -webkit-linear-gradient(top, #222, #333);
+  background: -o-linear-gradient(top, #333, #222);
+  background: -ms-linear-gradient(top, #333, #222);
+  background: linear-gradient(top, #333, #222);
+
+
+  /* 1px top shadow */
+/*  -webkit-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.15); -moz-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.15); box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.15);*/
+}
+
+/* Box containing play and load progresses. Also acts as seek scrubber. */
+.vjs-default-skin .vjs-progress-holder {
+  position: relative; cursor: pointer !important; /*overflow: hidden;*/
+  padding: 0; margin: 0; /* Placement within the progress control item */
+  height: 1.0em;
+  -moz-border-radius: 0.6em; -webkit-border-radius: 0.6em; border-radius: 0.6em;
+
+  /* CSS Gradient */
+  background: #111;
+  background: -moz-linear-gradient(top, #111, #262626);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#111), to(#262626));
+  background: -webkit-linear-gradient(top, #111, #262626);
+  background: -o-linear-gradient(top, #111, #262626);
+  background: -ms-linear-gradient(top, #111, #262626);
+  background: linear-gradient(top, #111, #262626);
+}
+.vjs-default-skin .vjs-progress-holder .vjs-play-progress,
+.vjs-default-skin .vjs-progress-holder .vjs-load-progress { /* Progress Bars */
+  position: absolute; display: block; height: 1.0em; margin: 0; padding: 0;
+  left: 0; top: 0; /*Needed for IE6*/
+  -moz-border-radius: 0.6em; -webkit-border-radius: 0.6em; border-radius: 0.6em;
+
+  /*width: 0;*/
+}
+
+.vjs-default-skin .vjs-play-progress {
+  /* CSS Gradient. */
+  background: #fff; /* Old browsers */
+  background: -moz-linear-gradient(top, #fff 0%, #d6d6d6 50%, #fff 100%);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%,#fff), color-stop(50%,#d6d6d6), color-stop(100%,#fff));
+  background: -webkit-linear-gradient(top, #fff 0%,#d6d6d6 50%,#fff 100%);
+  background: -o-linear-gradient(top, #fff 0%,#d6d6d6 50%,#fff 100%);
+  background: -ms-linear-gradient(top, #fff 0%,#d6d6d6 50%,#fff 100%);
+  background: linear-gradient(top, #fff 0%,#d6d6d6 50%,#fff 100%);
+
+  background: #efefef;
+  background: -moz-linear-gradient(top, #efefef 0%, #f5f5f5 50%, #dbdbdb 50%, #f1f1f1 100%);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%,#efefef), color-stop(50%,#f5f5f5), color-stop(50%,#dbdbdb), color-stop(100%,#f1f1f1));
+  background: -webkit-linear-gradient(top, #efefef 0%,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);
+  background: -o-linear-gradient(top, #efefef 0%,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);
+  background: -ms-linear-gradient(top, #efefef 0%,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#efefef', endColorstr='#f1f1f1',GradientType=0 );
+  background: linear-gradient(top, #efefef 0%,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);
+}
+.vjs-default-skin .vjs-load-progress {
+  opacity: 0.8;
+
+  /* CSS Gradient */
+  background: #666;
+  background: -moz-linear-gradient(top, #666, #333);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#666), to(#333));
+  background: -webkit-linear-gradient(top, #666, #333);
+  background: -o-linear-gradient(top, #666, #333);
+  background: -ms-linear-gradient(top, #666, #333);
+  background: linear-gradient(top, #666, #333);
+}
+
+.vjs-default-skin div.vjs-seek-handle {
+  position: absolute;
+  width: 16px; height: 16px; /* Match img pixles */
+  margin-top: -0.3em;
+  left: 0; top: 0; /*Needed for IE6*/
+
+  background: url('video-js.png') 0 -50px;
+  /* CSS Curved Corners. Needed to make shadows curved. */
+  -moz-border-radius: 0.8em; -webkit-border-radius: 0.8em; border-radius: 0.8em;
+  /* CSS Shadows */
+  -webkit-box-shadow: 0 2px 4px 0 #000; -moz-box-shadow: 0 2px 4px 0 #000; box-shadow: 0 2px 4px 0 #000;
+}
+/* Time Display
+-------------------------------------------------------------------------------- */
+.vjs-default-skin .vjs-time-controls {
+  position: absolute;
+  right: 0;
+  height: 1.0em; width: 4.8em;
+  top: -1.3em;
+  border-bottom: 1px solid #1F1F1F;
+  border-top: 1px solid #222;
+  background-color: #333;
+
+  font-size: 1em; line-height: 1.0em; font-weight: normal; font-family: Helvetica, Arial, sans-serif;
+
+  background: #333;
+  background: -moz-linear-gradient(top, #222, #333);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#222), to(#333));
+  background: -webkit-linear-gradient(top, #222, #333);
+  background: -o-linear-gradient(top, #333, #222);
+  background: -ms-linear-gradient(top, #333, #222);
+  background: linear-gradient(top, #333, #222);
+
+  /* 1px top shadow */
+/*  -webkit-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.15); -moz-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.15); box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.15);*/
+}
+
+.vjs-default-skin .vjs-current-time { left: 0; }
+
+.vjs-default-skin .vjs-duration { right: 0; display: none; }
+.vjs-default-skin .vjs-remaining-time { right: 0; }
+
+.vjs-time-divider { display:none; }
+
+.vjs-default-skin .vjs-time-control { font-size: 1em; line-height: 1; font-weight: normal; font-family: Helvetica, Arial, sans-serif; }
+.vjs-default-skin .vjs-time-control span { line-height: 25px; /* Centering vertically */ }
+
+/* Fullscreen
+-------------------------------------------------------------------------------- */
+.vjs-secondary-controls { float: right; }
+
+.vjs-default-skin .vjs-fullscreen-control { width: 3.8em; cursor: pointer !important; float: right; }
+.vjs-default-skin .vjs-fullscreen-control div { width: 16px; height: 16px; background: url('video-js.png') -50px 0; margin: 0.5em auto 0; }
+
+.vjs-default-skin.vjs-fullscreen .vjs-fullscreen-control div { background: url('video-js.png') -75px 0; }
+
+
+/* Big Play Button (at start)
+---------------------------------------------------------*/
+.vjs-default-skin .vjs-big-play-button {
+  display: block; /* Start hidden */ z-index: 2;
+  position: absolute; top: 50%; left: 50%; width: 8.0em; height: 8.0em; margin: -42px 0 0 -42px; text-align: center; vertical-align: center; cursor: pointer !important;
+  border: 0.2em solid #fff; opacity: 0.95;
+  -webkit-border-radius: 25px; -moz-border-radius: 25px; border-radius: 25px;
+
+  background: #454545;
+  background: -moz-linear-gradient(top, #454545 0%, #232323 50%, #161616 50%, #3f3f3f 100%);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%,#454545), color-stop(50%,#232323), color-stop(50%,#161616), color-stop(100%,#3f3f3f));
+  background: -webkit-linear-gradient(top, #454545 0%,#232323 50%,#161616 50%,#3f3f3f 100%);
+  background: -o-linear-gradient(top, #454545 0%,#232323 50%,#161616 50%,#3f3f3f 100%);
+  background: -ms-linear-gradient(top, #454545 0%,#232323 50%,#161616 50%,#3f3f3f 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#454545', endColorstr='#3f3f3f',GradientType=0 );
+  background: linear-gradient(top, #454545 0%,#232323 50%,#161616 50%,#3f3f3f 100%);
+
+  /* CSS Shadows */
+  -webkit-box-shadow: 4px 4px 8px #000; -moz-box-shadow: 4px 4px 8px #000; box-shadow: 4px 4px 8px #000;
+}
+
+.vjs-default-skin div.vjs-big-play-button:hover {
+  -webkit-box-shadow: 0 0 80px #fff; -moz-box-shadow: 0 0 80px #fff; box-shadow: 0 0 80px #fff;
+}
+
+.vjs-default-skin div.vjs-big-play-button span {
+  position: absolute; top: 50%; left: 50%;
+  display: block; width: 35px; height: 42px;
+  margin: -20px 0 0 -15px; /* Using negative margin to center image. */
+  background: url('video-js.png') -100px 0;
+}
+
+/* Loading Spinner
+---------------------------------------------------------*/
+/* CSS Spinners by Kilian Valkhof - http://kilianvalkhof.com/2010/css-xhtml/css3-loading-spinners-without-images/ */
+.vjs-loading-spinner {
+  display: none;
+  position: absolute; top: 50%; left: 50%; width: 55px; height: 55px;
+  margin: -28px 0 0 -28px;
+  -webkit-animation-name: rotatethis;
+  -webkit-animation-duration:1s;
+  -webkit-animation-iteration-count:infinite;
+  -webkit-animation-timing-function:linear;
+  -moz-animation-name: rotatethis;
+  -moz-animation-duration:1s;
+  -moz-animation-iteration-count:infinite;
+  -moz-animation-timing-function:linear;
+}
+
+@-webkit-keyframes rotatethis {
+  0% {-webkit-transform:scale(0.6) rotate(0deg); }
+  12.5% {-webkit-transform:scale(0.6) rotate(0deg); }
+  12.51% {-webkit-transform:scale(0.6) rotate(45deg); }
+  25% {-webkit-transform:scale(0.6) rotate(45deg); }
+  25.01% {-webkit-transform:scale(0.6) rotate(90deg);}
+  37.5% {-webkit-transform:scale(0.6) rotate(90deg);}
+  37.51% {-webkit-transform:scale(0.6) rotate(135deg);}
+  50% {-webkit-transform:scale(0.6) rotate(135deg);}
+  50.01% {-webkit-transform:scale(0.6) rotate(180deg);}
+  62.5% {-webkit-transform:scale(0.6) rotate(180deg);}
+  62.51% {-webkit-transform:scale(0.6) rotate(225deg);}
+  75% {-webkit-transform:scale(0.6) rotate(225deg);}
+  75.01% {-webkit-transform:scale(0.6) rotate(270deg);}
+  87.5% {-webkit-transform:scale(0.6) rotate(270deg);}
+  87.51% {-webkit-transform:scale(0.6) rotate(315deg);}
+  100% {-webkit-transform:scale(0.6) rotate(315deg);}
+}
+
+@-moz-keyframes rotatethis {
+  0% {-moz-transform:scale(0.6) rotate(0deg);}
+  12.5% {-moz-transform:scale(0.6) rotate(0deg);}
+  12.51% {-moz-transform:scale(0.6) rotate(45deg);}
+  25% {-moz-transform:scale(0.6) rotate(45deg);}
+  25.01% {-moz-transform:scale(0.6) rotate(90deg);}
+  37.5% {-moz-transform:scale(0.6) rotate(90deg);}
+  37.51% {-moz-transform:scale(0.6) rotate(135deg);}
+  50% {-moz-transform:scale(0.6) rotate(135deg);}
+  50.01% {-moz-transform:scale(0.6) rotate(180deg);}
+  62.5% {-moz-transform:scale(0.6) rotate(180deg);}
+  62.51% {-moz-transform:scale(0.6) rotate(225deg);}
+  75% {-moz-transform:scale(0.6) rotate(225deg);}
+  75.01% {-moz-transform:scale(0.6) rotate(270deg);}
+  87.5% {-moz-transform:scale(0.6) rotate(270deg);}
+  87.51% {-moz-transform:scale(0.6) rotate(315deg);}
+  100% {-moz-transform:scale(0.6) rotate(315deg);}
+}
+/* Each circle */
+div.vjs-loading-spinner .ball1 { opacity: 0.12; position:absolute; left: 20px; top: 0px; width: 13px; height: 13px; background: #fff;
+  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
+
+div.vjs-loading-spinner .ball2 { opacity: 0.25; position:absolute; left: 34px; top: 6px; width: 13px; height: 13px; background: #fff;
+  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
+
+div.vjs-loading-spinner .ball3 { opacity: 0.37; position:absolute; left: 40px; top: 20px; width: 13px; height: 13px; background: #fff;
+  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
+
+div.vjs-loading-spinner .ball4 { opacity: 0.50; position:absolute; left: 34px; top: 34px; width: 13px; height: 13px; background: #fff;
+  border-radius: 10px; -webkit-border-radius: 10px; -moz-border-radius: 15px; border: 1px solid #ccc; }
+
+div.vjs-loading-spinner .ball5 { opacity: 0.62; position:absolute; left: 20px; top: 40px; width: 13px; height: 13px; background: #fff;
+  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
+
+div.vjs-loading-spinner .ball6 { opacity: 0.75; position:absolute; left: 6px; top: 34px; width: 13px; height: 13px; background: #fff;
+  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
+
+div.vjs-loading-spinner .ball7 { opacity: 0.87; position:absolute; left: 0px; top: 20px; width: 13px; height: 13px; background: #fff;
+  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
+
+div.vjs-loading-spinner .ball8 { opacity: 1.00; position:absolute; left: 6px; top: 6px; width: 13px; height: 13px; background: #fff;
+  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
+
+/* Menu Buttons (Captions/Subtitles/etc.)
+-------------------------------------------------------------------------------- */
+.vjs-default-skin .vjs-menu-button {
+  float: right; margin: 0.2em 0.5em 0 0; padding: 0; width: 3em; height: 2em; cursor: pointer !important;
+
+  border: 1px solid #111; -moz-border-radius: 0.3em; -webkit-border-radius: 0.3em; border-radius: 0.3em;
+
+  background: #4d4d4d;
+  background: -moz-linear-gradient(top,  #4d4d4d 0%, #3f3f3f 50%, #333333 50%, #252525 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4d4d4d), color-stop(50%,#3f3f3f), color-stop(50%,#333333), color-stop(100%,#252525));
+  background: -webkit-linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
+  background: -o-linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
+  background: -ms-linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
+  background: linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
+}
+/* Button Icon */
+.vjs-default-skin .vjs-menu-button div { background: url('video-js.png') 0px -75px no-repeat; width: 16px; height: 16px; margin: 0.2em auto 0; padding: 0; }
+
+/* Button Pop-up Menu */
+.vjs-default-skin .vjs-menu-button ul {
+  display: none; /* Start hidden. Hover will show. */
+  opacity: 0.8;
+  padding: 0; margin: 0;
+  position: absolute; width: 10em; bottom: 2em; max-height: 15em;
+  left: -3.5em; /* Width of menu - width of button / 2 */
+  background-color: #111;
+  border: 2px solid #333;
+  -moz-border-radius: 0.7em; -webkit-border-radius: 1em; border-radius: .5em;
+  -webkit-box-shadow: 0 2px 4px 0 #000; -moz-box-shadow: 0 2px 4px 0 #000; box-shadow: 0 2px 4px 0 #000;
+  overflow: auto;
+}
+
+.vjs-default-skin .vjs-menu-button:focus ul,
+.vjs-default-skin .vjs-menu-button:hover ul { display: block; list-style: none; }
+.vjs-default-skin .vjs-menu-button ul li { list-style: none; margin: 0; padding: 0.3em 0 0.3em 20px; line-height: 1.4em; font-size: 1.2em; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; text-align: left; }
+.vjs-default-skin .vjs-menu-button ul li.vjs-selected { text-decoration: underline; background: url('video-js.png') -125px -50px no-repeat; }
+.vjs-default-skin .vjs-menu-button ul li:focus,
+.vjs-default-skin .vjs-menu-button ul li:hover,
+.vjs-default-skin .vjs-menu-button ul li.vjs-selected:focus,
+.vjs-default-skin .vjs-menu-button ul li.vjs-selected:hover { background-color: #ccc; color: #111; outline: 0; }
+.vjs-default-skin .vjs-menu-button ul li.vjs-menu-title {
+  text-align: center; text-transform: uppercase; font-size: 1em; line-height: 2em; padding: 0; margin: 0 0 0.3em 0;
+
+  color: #fff; font-weight: bold;
+
+  cursor: default;
+
+  background: #4d4d4d;
+  background: -moz-linear-gradient(top,  #4d4d4d 0%, #3f3f3f 50%, #333333 50%, #252525 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4d4d4d), color-stop(50%,#3f3f3f), color-stop(50%,#333333), color-stop(100%,#252525));
+  background: -webkit-linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
+  background: -o-linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
+  background: -ms-linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
+  background: linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
+}
+
+/* Subtitles Button */
+.vjs-default-skin .vjs-captions-button div { background-position: -25px -75px; }
+.vjs-default-skin .vjs-chapters-button div { background-position: -100px -75px; }
+.vjs-default-skin .vjs-chapters-button ul { width: 20em; left: -8.5em; /* Width of menu - width of button / 2 */ }
diff --git a/library/video-js/video-js.min.css b/library/video-js/video-js.min.css
new file mode 100644
index 0000000000..06c0e6b4f6
--- /dev/null
+++ b/library/video-js/video-js.min.css
@@ -0,0 +1 @@
+.video-js{background-color:#000;position:relative;padding:0;font-size:10px;vertical-align:middle}.video-js .vjs-tech{position:absolute;top:0;left:0;width:100%;height:100%}.video-js:-moz-full-screen{position:absolute}body.vjs-full-window{padding:0;margin:0;height:100%;overflow-y:auto}.video-js.vjs-fullscreen{position:fixed;overflow:hidden;z-index:1000;left:0;top:0;bottom:0;right:0;width:100%!important;height:100%!important;_position:absolute}.video-js:-webkit-full-screen{width:100%!important;height:100%!important}.vjs-poster{margin:0 auto;padding:0;cursor:pointer;position:relative;width:100%;max-height:100%}.video-js .vjs-text-track-display{text-align:center;position:absolute;bottom:4em;left:1em;right:1em;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}.video-js .vjs-text-track{display:none;color:#fff;font-size:1.4em;text-align:center;margin-bottom:.1em;background:#000;background:rgba(0,0,0,0.50)}.video-js .vjs-subtitles{color:#fff}.video-js .vjs-captions{color:#fc6}.vjs-tt-cue{display:block}.vjs-fade-in{visibility:visible!important;opacity:1!important;-webkit-transition:visibility 0s linear 0s,opacity .3s linear;-moz-transition:visibility 0s linear 0s,opacity .3s linear;-ms-transition:visibility 0s linear 0s,opacity .3s linear;-o-transition:visibility 0s linear 0s,opacity .3s linear;transition:visibility 0s linear 0s,opacity .3s linear}.vjs-fade-out{visibility:hidden!important;opacity:0!important;-webkit-transition:visibility 0s linear 1.5s,opacity 1.5s linear;-moz-transition:visibility 0s linear 1.5s,opacity 1.5s linear;-ms-transition:visibility 0s linear 1.5s,opacity 1.5s linear;-o-transition:visibility 0s linear 1.5s,opacity 1.5s linear;transition:visibility 0s linear 1.5s,opacity 1.5s linear}.vjs-default-skin .vjs-controls{position:absolute;bottom:0;left:0;right:0;margin:0;padding:0;height:2.6em;color:#fff;border-top:1px solid #404040;background:#242424;background:-moz-linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(50%,#242424),color-stop(50%,#1f1f1f),color-stop(100%,#171717));background:-webkit-linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);background:-o-linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);background:-ms-linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);background:linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);visibility:hidden;opacity:0}.vjs-default-skin .vjs-control{position:relative;float:left;text-align:center;margin:0;padding:0;height:2.6em;width:2.6em}.vjs-default-skin .vjs-control:focus{outline:0}.vjs-default-skin .vjs-control-text{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.vjs-default-skin .vjs-play-control{width:5em;cursor:pointer!important}.vjs-default-skin.vjs-paused .vjs-play-control div{width:15px;height:17px;background:url('video-js.png');margin:.5em auto 0}.vjs-default-skin.vjs-playing .vjs-play-control div{width:15px;height:17px;background:url('video-js.png') -25px 0;margin:.5em auto 0}.vjs-default-skin .vjs-rewind-control{width:5em;cursor:pointer!important}.vjs-default-skin .vjs-rewind-control div{width:19px;height:16px;background:url('video-js.png');margin:.5em auto 0}.vjs-default-skin .vjs-mute-control{width:3.8em;cursor:pointer!important;float:right}.vjs-default-skin .vjs-mute-control div{width:22px;height:16px;background:url('video-js.png') -75px -25px;margin:.5em auto 0}.vjs-default-skin .vjs-mute-control.vjs-vol-0 div{background:url('video-js.png') 0 -25px}.vjs-default-skin .vjs-mute-control.vjs-vol-1 div{background:url('video-js.png') -25px -25px}.vjs-default-skin .vjs-mute-control.vjs-vol-2 div{background:url('video-js.png') -50px -25px}.vjs-default-skin .vjs-volume-control{width:5em;float:right}.vjs-default-skin .vjs-volume-bar{position:relative;width:5em;height:.6em;margin:1em auto 0;cursor:pointer!important;-moz-border-radius:.3em;-webkit-border-radius:.3em;border-radius:.3em;background:#666;background:-moz-linear-gradient(top,#333,#666);background:-webkit-gradient(linear,0% 0,0% 100%,from(#333),to(#666));background:-webkit-linear-gradient(top,#333,#666);background:-o-linear-gradient(top,#333,#666);background:-ms-linear-gradient(top,#333,#666);background:linear-gradient(top,#333,#666)}.vjs-default-skin .vjs-volume-level{position:absolute;top:0;left:0;height:.6em;-moz-border-radius:.3em;-webkit-border-radius:.3em;border-radius:.3em;background:#fff;background:-moz-linear-gradient(top,#fff,#ccc);background:-webkit-gradient(linear,0% 0,0% 100%,from(#fff),to(#ccc));background:-webkit-linear-gradient(top,#fff,#ccc);background:-o-linear-gradient(top,#fff,#ccc);background:-ms-linear-gradient(top,#fff,#ccc);background:linear-gradient(top,#fff,#ccc)}.vjs-default-skin .vjs-volume-handle{position:absolute;top:-0.2em;width:.8em;height:.8em;background:#ccc;left:0;border:1px solid #fff;-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em}.vjs-default-skin div.vjs-progress-control{position:absolute;left:4.8em;right:4.8em;height:1.0em;width:auto;top:-1.3em;border-bottom:1px solid #1f1f1f;border-top:1px solid #222;background:#333;background:-moz-linear-gradient(top,#222,#333);background:-webkit-gradient(linear,0% 0,0% 100%,from(#222),to(#333));background:-webkit-linear-gradient(top,#222,#333);background:-o-linear-gradient(top,#333,#222);background:-ms-linear-gradient(top,#333,#222);background:linear-gradient(top,#333,#222)}.vjs-default-skin .vjs-progress-holder{position:relative;cursor:pointer!important;padding:0;margin:0;height:1.0em;-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em;background:#111;background:-moz-linear-gradient(top,#111,#262626);background:-webkit-gradient(linear,0% 0,0% 100%,from(#111),to(#262626));background:-webkit-linear-gradient(top,#111,#262626);background:-o-linear-gradient(top,#111,#262626);background:-ms-linear-gradient(top,#111,#262626);background:linear-gradient(top,#111,#262626)}.vjs-default-skin .vjs-progress-holder .vjs-play-progress,.vjs-default-skin .vjs-progress-holder .vjs-load-progress{position:absolute;display:block;height:1.0em;margin:0;padding:0;left:0;top:0;-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em}.vjs-default-skin .vjs-play-progress{background:#fff;background:-moz-linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(0%,#fff),color-stop(50%,#d6d6d6),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:-o-linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:-ms-linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:#efefef;background:-moz-linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(0%,#efefef),color-stop(50%,#f5f5f5),color-stop(50%,#dbdbdb),color-stop(100%,#f1f1f1));background:-webkit-linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);background:-o-linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);background:-ms-linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#efefef',endColorstr='#f1f1f1',GradientType=0);background:linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%)}.vjs-default-skin .vjs-load-progress{opacity:.8;background:#666;background:-moz-linear-gradient(top,#666,#333);background:-webkit-gradient(linear,0% 0,0% 100%,from(#666),to(#333));background:-webkit-linear-gradient(top,#666,#333);background:-o-linear-gradient(top,#666,#333);background:-ms-linear-gradient(top,#666,#333);background:linear-gradient(top,#666,#333)}.vjs-default-skin div.vjs-seek-handle{position:absolute;width:16px;height:16px;margin-top:-0.3em;left:0;top:0;background:url('video-js.png') 0 -50px;-moz-border-radius:.8em;-webkit-border-radius:.8em;border-radius:.8em;-webkit-box-shadow:0 2px 4px 0 #000;-moz-box-shadow:0 2px 4px 0 #000;box-shadow:0 2px 4px 0 #000}.vjs-default-skin .vjs-time-controls{position:absolute;right:0;height:1.0em;width:4.8em;top:-1.3em;border-bottom:1px solid #1f1f1f;border-top:1px solid #222;background-color:#333;font-size:1em;line-height:1.0em;font-weight:normal;font-family:Helvetica,Arial,sans-serif;background:#333;background:-moz-linear-gradient(top,#222,#333);background:-webkit-gradient(linear,0% 0,0% 100%,from(#222),to(#333));background:-webkit-linear-gradient(top,#222,#333);background:-o-linear-gradient(top,#333,#222);background:-ms-linear-gradient(top,#333,#222);background:linear-gradient(top,#333,#222)}.vjs-default-skin .vjs-current-time{left:0}.vjs-default-skin .vjs-duration{right:0;display:none}.vjs-default-skin .vjs-remaining-time{right:0}.vjs-time-divider{display:none}.vjs-default-skin .vjs-time-control{font-size:1em;line-height:1;font-weight:normal;font-family:Helvetica,Arial,sans-serif}.vjs-default-skin .vjs-time-control span{line-height:25px}.vjs-secondary-controls{float:right}.vjs-default-skin .vjs-fullscreen-control{width:3.8em;cursor:pointer!important;float:right}.vjs-default-skin .vjs-fullscreen-control div{width:16px;height:16px;background:url('video-js.png') -50px 0;margin:.5em auto 0}.vjs-default-skin.vjs-fullscreen .vjs-fullscreen-control div{background:url('video-js.png') -75px 0}.vjs-default-skin .vjs-big-play-button{display:block;z-index:2;position:absolute;top:50%;left:50%;width:8.0em;height:8.0em;margin:-42px 0 0 -42px;text-align:center;vertical-align:center;cursor:pointer!important;border:.2em solid #fff;opacity:.95;-webkit-border-radius:25px;-moz-border-radius:25px;border-radius:25px;background:#454545;background:-moz-linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(0%,#454545),color-stop(50%,#232323),color-stop(50%,#161616),color-stop(100%,#3f3f3f));background:-webkit-linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);background:-o-linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);background:-ms-linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545',endColorstr='#3f3f3f',GradientType=0);background:linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);-webkit-box-shadow:4px 4px 8px #000;-moz-box-shadow:4px 4px 8px #000;box-shadow:4px 4px 8px #000}.vjs-default-skin div.vjs-big-play-button:hover{-webkit-box-shadow:0 0 80px #fff;-moz-box-shadow:0 0 80px #fff;box-shadow:0 0 80px #fff}.vjs-default-skin div.vjs-big-play-button span{position:absolute;top:50%;left:50%;display:block;width:35px;height:42px;margin:-20px 0 0 -15px;background:url('video-js.png') -100px 0}.vjs-loading-spinner{display:none;position:absolute;top:50%;left:50%;width:55px;height:55px;margin:-28px 0 0 -28px;-webkit-animation-name:rotatethis;-webkit-animation-duration:1s;-webkit-animation-iteration-count:infinite;-webkit-animation-timing-function:linear;-moz-animation-name:rotatethis;-moz-animation-duration:1s;-moz-animation-iteration-count:infinite;-moz-animation-timing-function:linear}@-webkit-keyframes rotatethis{0%{-webkit-transform:scale(0.6) rotate(0deg)}12.5%{-webkit-transform:scale(0.6) rotate(0deg)}12.51%{-webkit-transform:scale(0.6) rotate(45deg)}25%{-webkit-transform:scale(0.6) rotate(45deg)}25.01%{-webkit-transform:scale(0.6) rotate(90deg)}37.5%{-webkit-transform:scale(0.6) rotate(90deg)}37.51%{-webkit-transform:scale(0.6) rotate(135deg)}50%{-webkit-transform:scale(0.6) rotate(135deg)}50.01%{-webkit-transform:scale(0.6) rotate(180deg)}62.5%{-webkit-transform:scale(0.6) rotate(180deg)}62.51%{-webkit-transform:scale(0.6) rotate(225deg)}75%{-webkit-transform:scale(0.6) rotate(225deg)}75.01%{-webkit-transform:scale(0.6) rotate(270deg)}87.5%{-webkit-transform:scale(0.6) rotate(270deg)}87.51%{-webkit-transform:scale(0.6) rotate(315deg)}100%{-webkit-transform:scale(0.6) rotate(315deg)}}@-moz-keyframes rotatethis{0%{-moz-transform:scale(0.6) rotate(0deg)}12.5%{-moz-transform:scale(0.6) rotate(0deg)}12.51%{-moz-transform:scale(0.6) rotate(45deg)}25%{-moz-transform:scale(0.6) rotate(45deg)}25.01%{-moz-transform:scale(0.6) rotate(90deg)}37.5%{-moz-transform:scale(0.6) rotate(90deg)}37.51%{-moz-transform:scale(0.6) rotate(135deg)}50%{-moz-transform:scale(0.6) rotate(135deg)}50.01%{-moz-transform:scale(0.6) rotate(180deg)}62.5%{-moz-transform:scale(0.6) rotate(180deg)}62.51%{-moz-transform:scale(0.6) rotate(225deg)}75%{-moz-transform:scale(0.6) rotate(225deg)}75.01%{-moz-transform:scale(0.6) rotate(270deg)}87.5%{-moz-transform:scale(0.6) rotate(270deg)}87.51%{-moz-transform:scale(0.6) rotate(315deg)}100%{-moz-transform:scale(0.6) rotate(315deg)}}div.vjs-loading-spinner .ball1{opacity:.12;position:absolute;left:20px;top:0;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball2{opacity:.25;position:absolute;left:34px;top:6px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball3{opacity:.37;position:absolute;left:40px;top:20px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball4{opacity:.50;position:absolute;left:34px;top:34px;width:13px;height:13px;background:#fff;border-radius:10px;-webkit-border-radius:10px;-moz-border-radius:15px;border:1px solid #ccc}div.vjs-loading-spinner .ball5{opacity:.62;position:absolute;left:20px;top:40px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball6{opacity:.75;position:absolute;left:6px;top:34px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball7{opacity:.87;position:absolute;left:0;top:20px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball8{opacity:1.00;position:absolute;left:6px;top:6px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}.vjs-default-skin .vjs-menu-button{float:right;margin:.2em .5em 0 0;padding:0;width:3em;height:2em;cursor:pointer!important;border:1px solid #111;-moz-border-radius:.3em;-webkit-border-radius:.3em;border-radius:.3em;background:#4d4d4d;background:-moz-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#4d4d4d),color-stop(50%,#3f3f3f),color-stop(50%,#333),color-stop(100%,#252525));background:-webkit-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-o-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-ms-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%)}.vjs-default-skin .vjs-menu-button div{background:url('video-js.png') 0 -75px no-repeat;width:16px;height:16px;margin:.2em auto 0;padding:0}.vjs-default-skin .vjs-menu-button ul{display:none;opacity:.8;padding:0;margin:0;position:absolute;width:10em;bottom:2em;max-height:15em;left:-3.5em;background-color:#111;border:2px solid #333;-moz-border-radius:.7em;-webkit-border-radius:1em;border-radius:.5em;-webkit-box-shadow:0 2px 4px 0 #000;-moz-box-shadow:0 2px 4px 0 #000;box-shadow:0 2px 4px 0 #000;overflow:auto}.vjs-default-skin .vjs-menu-button:focus ul,.vjs-default-skin .vjs-menu-button:hover ul{display:block;list-style:none}.vjs-default-skin .vjs-menu-button ul li{list-style:none;margin:0;padding:.3em 0 .3em 20px;line-height:1.4em;font-size:1.2em;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;text-align:left}.vjs-default-skin .vjs-menu-button ul li.vjs-selected{text-decoration:underline;background:url('video-js.png') -125px -50px no-repeat}.vjs-default-skin .vjs-menu-button ul li:focus,.vjs-default-skin .vjs-menu-button ul li:hover,.vjs-default-skin .vjs-menu-button ul li.vjs-selected:focus,.vjs-default-skin .vjs-menu-button ul li.vjs-selected:hover{background-color:#ccc;color:#111;outline:0}.vjs-default-skin .vjs-menu-button ul li.vjs-menu-title{text-align:center;text-transform:uppercase;font-size:1em;line-height:2em;padding:0;margin:0 0 .3em 0;color:#fff;font-weight:bold;cursor:default;background:#4d4d4d;background:-moz-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#4d4d4d),color-stop(50%,#3f3f3f),color-stop(50%,#333),color-stop(100%,#252525));background:-webkit-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-o-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-ms-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%)}.vjs-default-skin .vjs-captions-button div{background-position:-25px -75px}.vjs-default-skin .vjs-chapters-button div{background-position:-100px -75px}.vjs-default-skin .vjs-chapters-button ul{width:20em;left:-8.5em}
\ No newline at end of file
diff --git a/library/video-js/video-js.png b/library/video-js/video-js.png
new file mode 100644
index 0000000000000000000000000000000000000000..100bc7f8ed1e56b3c61417dba339abc131898f66
GIT binary patch
literal 8235
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

literal 0
HcmV?d00001

diff --git a/library/video-js/video-js.swf b/library/video-js/video-js.swf
new file mode 100644
index 0000000000000000000000000000000000000000..3273af5ad7841e9aaa0106a61aaf7b832a7a321a
GIT binary patch
literal 9612
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
CtL;(%

literal 0
HcmV?d00001

diff --git a/library/video-js/video.js b/library/video-js/video.js
new file mode 100644
index 0000000000..80d9f56be7
--- /dev/null
+++ b/library/video-js/video.js
@@ -0,0 +1,4569 @@
+/*!
+Video.js - HTML5 Video Player
+Version 3.2.0
+
+LGPL v3 LICENSE INFO
+This file is part of Video.js. Copyright 2011 Zencoder, Inc.
+
+Video.js is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Video.js is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with Video.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// Self-executing function to prevent global vars and help with minification
+;(function(window, undefined){
+  var document = window.document;// HTML5 Shiv. Must be in <head> to support older browsers.
+document.createElement("video");document.createElement("audio");
+
+var VideoJS = function(id, addOptions, ready){
+  var tag; // Element of ID
+
+  // Allow for element or ID to be passed in
+  // String ID
+  if (typeof id == "string") {
+
+    // Adjust for jQuery ID syntax
+    if (id.indexOf("#") === 0) {
+      id = id.slice(1);
+    }
+
+    // If a player instance has already been created for this ID return it.
+    if (_V_.players[id]) {
+      return _V_.players[id];
+
+    // Otherwise get element for ID
+    } else {
+      tag = _V_.el(id)
+    }
+
+  // ID is a media element
+  } else {
+    tag = id;
+  }
+
+  // Check for a useable element
+  if (!tag || !tag.nodeName) { // re: nodeName, could be a box div also
+    throw new TypeError("The element or ID supplied is not valid. (VideoJS)"); // Returns
+  }
+
+  // Element may have a player attr referring to an already created player instance.
+  // If not, set up a new player and return the instance.
+  return tag.player || new _V_.Player(tag, addOptions, ready);
+},
+
+// Shortcut
+_V_ = VideoJS,
+
+// CDN Version. Used to target right flash swf.
+CDN_VERSION = "3.2";
+
+VideoJS.players = {};
+
+VideoJS.options = {
+
+  // Default order of fallback technology
+  techOrder: ["html5","flash"],
+  // techOrder: ["flash","html5"],
+
+  html5: {},
+  flash: { swf: "http://vjs.zencdn.net/c/video-js.swf" },
+
+  // Default of web browser is 300x150. Should rely on source width/height.
+  width: "auto",
+  height: "auto",
+  
+  // defaultVolume: 0.85,
+  defaultVolume: 0.00, // The freakin seaguls are driving me crazy!
+
+  // Included control sets
+  components: {
+    "posterImage": {},
+    "textTrackDisplay": {},
+    "loadingSpinner": {},
+    "bigPlayButton": {},
+    "controlBar": {}
+  }
+
+  // components: [
+  //   "poster",
+  //   "loadingSpinner",
+  //   "bigPlayButton",
+  //   { name: "controlBar", options: {
+  //     components: [
+  //       "playToggle",
+  //       "fullscreenToggle",
+  //       "currentTimeDisplay",
+  //       "timeDivider",
+  //       "durationDisplay",
+  //       "remainingTimeDisplay",
+  //       { name: "progressControl", options: {
+  //         components: [
+  //           { name: "seekBar", options: {
+  //             components: [
+  //               "loadProgressBar",
+  //               "playProgressBar",
+  //               "seekHandle"
+  //             ]}
+  //           }
+  //         ]}
+  //       },
+  //       { name: "volumeControl", options: {
+  //         components: [
+  //           { name: "volumeBar", options: {
+  //             components: [
+  //               "volumeLevel",
+  //               "volumeHandle"
+  //             ]}
+  //           }
+  //         ]}
+  //       },
+  //       "muteToggle"
+  //     ]
+  //   }},
+  //   "subtitlesDisplay"/*, "replay"*/
+  // ]
+};
+
+// Set CDN Version of swf
+if (CDN_VERSION != "GENERATED_CDN_VSN") {
+  _V_.options.flash.swf = "http://vjs.zencdn.net/"+CDN_VERSION+"/video-js.swf"
+}_V_.merge = function(obj1, obj2, safe){
+  // Make sure second object exists
+  if (!obj2) { obj2 = {}; };
+
+  for (var attrname in obj2){
+    if (obj2.hasOwnProperty(attrname) && (!safe || !obj1.hasOwnProperty(attrname))) { obj1[attrname]=obj2[attrname]; }
+  }
+  return obj1;
+};
+_V_.extend = function(obj){ this.merge(this, obj, true); };
+
+_V_.extend({
+  tech: {}, // Holder for playback technology settings
+  controlSets: {}, // Holder for control set definitions
+
+  // Device Checks
+  isIE: function(){ return !+"\v1"; },
+  isFF: function(){ return !!_V_.ua.match("Firefox") },
+  isIPad: function(){ return navigator.userAgent.match(/iPad/i) !== null; },
+  isIPhone: function(){ return navigator.userAgent.match(/iPhone/i) !== null; },
+  isIOS: function(){ return VideoJS.isIPhone() || VideoJS.isIPad(); },
+  iOSVersion: function() {
+    var match = navigator.userAgent.match(/OS (\d+)_/i);
+    if (match && match[1]) { return match[1]; }
+  },
+  isAndroid: function(){ return navigator.userAgent.match(/Android.*AppleWebKit/i) !== null; },
+  androidVersion: function() {
+    var match = navigator.userAgent.match(/Android (\d+)\./i);
+    if (match && match[1]) { return match[1]; }
+  },
+
+  testVid: document.createElement("video"),
+  ua: navigator.userAgent,
+  support: {},
+
+  each: function(arr, fn){
+    if (!arr || arr.length === 0) { return; }
+    for (var i=0,j=arr.length; i<j; i++) {
+      fn.call(this, arr[i], i);
+    }
+  },
+
+  eachProp: function(obj, fn){
+    if (!obj) { return; }
+    for (var name in obj) {
+      if (obj.hasOwnProperty(name)) {
+        fn.call(this, name, obj[name]);
+      }
+    }
+  },
+
+  el: function(id){ return document.getElementById(id); },
+  createElement: function(tagName, attributes){
+    var el = document.createElement(tagName),
+        attrname;
+    for (attrname in attributes){
+      if (attributes.hasOwnProperty(attrname)) {
+        if (attrname.indexOf("-") !== -1) {
+          el.setAttribute(attrname, attributes[attrname]);
+        } else {
+          el[attrname] = attributes[attrname];
+        }
+      }
+    }
+    return el;
+  },
+
+  insertFirst: function(node, parent){
+    if (parent.firstChild) {
+      parent.insertBefore(node, parent.firstChild);
+    } else {
+      parent.appendChild(node);
+    }
+  },
+
+  addClass: function(element, classToAdd){
+    if ((" "+element.className+" ").indexOf(" "+classToAdd+" ") == -1) {
+      element.className = element.className === "" ? classToAdd : element.className + " " + classToAdd;
+    }
+  },
+
+  removeClass: function(element, classToRemove){
+    if (element.className.indexOf(classToRemove) == -1) { return; }
+    var classNames = element.className.split(" ");
+    classNames.splice(classNames.indexOf(classToRemove),1);
+    element.className = classNames.join(" ");
+  },
+  
+  remove: function(item, array){
+    if (!array) return;
+    var i = array.indexOf(item);
+    if (i != -1) { 
+      return array.splice(i, 1)
+    };
+  },
+
+  // Attempt to block the ability to select text while dragging controls
+  blockTextSelection: function(){
+    document.body.focus();
+    document.onselectstart = function () { return false; };
+  },
+  // Turn off text selection blocking
+  unblockTextSelection: function(){ document.onselectstart = function () { return true; }; },
+
+  // Return seconds as H:MM:SS or M:SS
+  // Supplying a guide (in seconds) will include enough leading zeros to cover the length of the guide
+  formatTime: function(seconds, guide) {
+    guide = guide || seconds; // Default to using seconds as guide
+    var s = Math.floor(seconds % 60),
+        m = Math.floor(seconds / 60 % 60),
+        h = Math.floor(seconds / 3600),
+        gm = Math.floor(guide / 60 % 60),
+        gh = Math.floor(guide / 3600);
+
+    // Check if we need to show hours
+    h = (h > 0 || gh > 0) ? h + ":" : "";
+
+    // If hours are showing, we may need to add a leading zero.
+    // Always show at least one digit of minutes.
+    m = (((h || gm >= 10) && m < 10) ? "0" + m : m) + ":";
+
+    // Check if leading zero is need for seconds
+    s = (s < 10) ? "0" + s : s;
+
+    return h + m + s;
+  },
+
+  uc: function(string){
+    return string.charAt(0).toUpperCase() + string.slice(1);
+  },
+
+  // Return the relative horizonal position of an event as a value from 0-1
+  getRelativePosition: function(x, relativeElement){
+    return Math.max(0, Math.min(1, (x - _V_.findPosX(relativeElement)) / relativeElement.offsetWidth));
+  },
+  
+  getComputedStyleValue: function(element, style){
+    return window.getComputedStyle(element, null).getPropertyValue(style);
+  },
+
+  trim: function(string){ return string.toString().replace(/^\s+/, "").replace(/\s+$/, ""); },
+  round: function(num, dec) {
+    if (!dec) { dec = 0; }
+    return Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);
+  },
+
+  isEmpty: function(object) {
+    for (var prop in object) {
+      return false;
+    }
+    return true;
+  },
+
+  // Mimic HTML5 TimeRange Spec.
+  createTimeRange: function(start, end){
+    return {
+      length: 1,
+      start: function() { return start; },
+      end: function() { return end; }
+    };
+  },
+
+  /* Element Data Store. Allows for binding data to an element without putting it directly on the element.
+     Ex. Event listneres are stored here.
+     (also from jsninja.com)
+  ================================================================================ */
+  cache: {}, // Where the data is stored
+  guid: 1, // Unique ID for the element
+  expando: "vdata" + (new Date).getTime(), // Unique attribute to store element's guid in
+
+  // Returns the cache object where data for the element is stored
+  getData: function(elem){
+    var id = elem[_V_.expando];
+    if (!id) {
+      id = elem[_V_.expando] = _V_.guid++;
+      _V_.cache[id] = {};
+    }
+    return _V_.cache[id];
+  },
+  // Delete data for the element from the cache and the guid attr from element
+  removeData: function(elem){
+    var id = elem[_V_.expando];
+    if (!id) { return; }
+    // Remove all stored data
+    delete _V_.cache[id];
+    // Remove the expando property from the DOM node
+    try {
+      delete elem[_V_.expando];
+    } catch(e) {
+      if (elem.removeAttribute) {
+        elem.removeAttribute(_V_.expando);
+      } else {
+        // IE doesn't appear to support removeAttribute on the document element
+        elem[_V_.expando] = null;
+      }
+    }
+  },
+
+  /* Proxy (a.k.a Bind or Context). A simple method for changing the context of a function
+     It also stores a unique id on the function so it can be easily removed from events
+  ================================================================================ */
+  proxy: function(context, fn, uid) {
+    // Make sure the function has a unique ID
+    if (!fn.guid) { fn.guid = _V_.guid++; }
+
+    // Create the new function that changes the context
+    var ret = function() {
+      return fn.apply(context, arguments);
+    }
+
+    // Allow for the ability to individualize this function
+    // Needed in the case where multiple objects might share the same prototype
+    // IF both items add an event listener with the same function, then you try to remove just one
+    // it will remove both because they both have the same guid.
+    // when using this, you need to use the proxy method when you remove the listener as well.
+    ret.guid = (uid) ? uid + "_" + fn.guid : fn.guid;
+
+    return ret;
+  },
+
+  get: function(url, onSuccess, onError){
+    // if (netscape.security.PrivilegeManager.enablePrivilege) {
+    //   netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
+    // }
+
+    var local = (url.indexOf("file:") == 0 || (window.location.href.indexOf("file:") == 0 && url.indexOf("http:") == -1));
+
+    if (typeof XMLHttpRequest == "undefined") {
+      XMLHttpRequest = function () {
+        try { return new ActiveXObject("Msxml2.XMLHTTP.6.0"); } catch (e) {}
+        try { return new ActiveXObject("Msxml2.XMLHTTP.3.0"); } catch (f) {}
+        try { return new ActiveXObject("Msxml2.XMLHTTP"); } catch (g) {}
+        throw new Error("This browser does not support XMLHttpRequest.");
+      };
+    }
+
+    var request = new XMLHttpRequest();
+
+    try {
+      request.open("GET", url);
+    } catch(e) {
+      _V_.log("VideoJS XMLHttpRequest (open)", e);
+      // onError(e);
+      return false;
+    }
+
+    request.onreadystatechange = _V_.proxy(this, function() {
+      if (request.readyState == 4) {
+        if (request.status == 200 || local && request.status == 0) {
+          onSuccess(request.responseText);
+        } else {
+          if (onError) {
+            onError();
+          }
+        }
+      }
+    });
+
+    try {
+      request.send();
+    } catch(e) {
+      _V_.log("VideoJS XMLHttpRequest (send)", e);
+      if (onError) {
+        onError(e);
+      }
+    }
+  },
+
+  /* Local Storage
+  ================================================================================ */
+  setLocalStorage: function(key, value){
+    // IE was throwing errors referencing the var anywhere without this
+    var localStorage = window.localStorage || false;
+    if (!localStorage) { return; }
+    try {
+      localStorage[key] = value;
+    } catch(e) {
+      if (e.code == 22 || e.code == 1014) { // Webkit == 22 / Firefox == 1014
+        _V_.log("LocalStorage Full (VideoJS)", e);
+      } else {
+        _V_.log("LocalStorage Error (VideoJS)", e);
+      }
+    }
+  },
+
+  // Get abosolute version of relative URL. Used to tell flash correct URL.
+  // http://stackoverflow.com/questions/470832/getting-an-absolute-url-from-a-relative-one-ie6-issue
+  getAbsoluteURL: function(url){
+
+    // Check if absolute URL
+    if (!url.match(/^https?:\/\//)) {
+      // Convert to absolute URL. Flash hosted off-site needs an absolute URL.
+      url = _V_.createElement('div', {
+        innerHTML: '<a href="'+url+'">x</a>'
+      }).firstChild.href;
+    }
+
+    return url;
+  }
+
+});
+
+// usage: log('inside coolFunc', this, arguments);
+// paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/
+_V_.log = function(){
+  _V_.log.history = _V_.log.history || [];// store logs to an array for reference
+  _V_.log.history.push(arguments);
+  if(window.console) {
+    arguments.callee = arguments.callee.caller;
+    var newarr = [].slice.call(arguments);
+    (typeof console.log === 'object' ? _V_.log.apply.call(console.log, console, newarr) : console.log.apply(console, newarr));
+  }
+};
+
+// make it safe to use console.log always
+(function(b){function c(){}for(var d="assert,count,debug,dir,dirxml,error,exception,group,groupCollapsed,groupEnd,info,log,timeStamp,profile,profileEnd,time,timeEnd,trace,warn".split(","),a;a=d.pop();){b[a]=b[a]||c}})((function(){try
+{console.log();return window.console;}catch(err){return window.console={};}})());
+
+// Offset Left
+// getBoundingClientRect technique from John Resig http://ejohn.org/blog/getboundingclientrect-is-awesome/
+if ("getBoundingClientRect" in document.documentElement) {
+  _V_.findPosX = function(el) {
+    var box;
+
+    try {
+      box = el.getBoundingClientRect();
+    } catch(e) {}
+
+    if (!box) { return 0; }
+
+    var docEl = document.documentElement,
+        body = document.body,
+        clientLeft = docEl.clientLeft || body.clientLeft || 0,
+        scrollLeft = window.pageXOffset || body.scrollLeft,
+        left = box.left + scrollLeft - clientLeft;
+
+    return left;
+  };
+} else {
+  _V_.findPosX = function(el) {
+    var curleft = el.offsetLeft;
+    // _V_.log(obj.className, obj.offsetLeft)
+    while(el = obj.offsetParent) {
+      if (el.className.indexOf("video-js") == -1) {
+        // _V_.log(el.offsetParent, "OFFSETLEFT", el.offsetLeft)
+        // _V_.log("-webkit-full-screen", el.webkitMatchesSelector("-webkit-full-screen"));
+        // _V_.log("-webkit-full-screen", el.querySelectorAll(".video-js:-webkit-full-screen"));
+      } else {
+      }
+      curleft += el.offsetLeft;
+    }
+    return curleft;
+  };
+}// Using John Resig's Class implementation http://ejohn.org/blog/simple-javascript-inheritance/
+// (function(){var initializing=false, fnTest=/xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/; _V_.Class = function(){}; _V_.Class.extend = function(prop) { var _super = this.prototype; initializing = true; var prototype = new this(); initializing = false; for (var name in prop) { prototype[name] = typeof prop[name] == "function" && typeof _super[name] == "function" && fnTest.test(prop[name]) ? (function(name, fn){ return function() { var tmp = this._super; this._super = _super[name]; var ret = fn.apply(this, arguments); this._super = tmp; return ret; }; })(name, prop[name]) : prop[name]; } function Class() { if ( !initializing && this.init ) this.init.apply(this, arguments); } Class.prototype = prototype; Class.constructor = Class; Class.extend = arguments.callee; return Class;};})();
+(function(){
+  var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
+  _V_.Class = function(){};
+  _V_.Class.extend = function(prop) {
+    var _super = this.prototype;
+    initializing = true;
+    var prototype = new this();
+    initializing = false;
+    for (var name in prop) {
+      prototype[name] = typeof prop[name] == "function" &&
+        typeof _super[name] == "function" && fnTest.test(prop[name]) ?
+        (function(name, fn){
+          return function() {
+            var tmp = this._super;
+            this._super = _super[name];
+            var ret = fn.apply(this, arguments);
+            this._super = tmp;
+            return ret;
+          };
+        })(name, prop[name]) :
+        prop[name];
+    }
+    function Class() {
+      if ( !initializing && this.init ) {
+        return this.init.apply(this, arguments);
+
+      // Attempting to recreate accessing function form of class.
+      } else if (!initializing) {
+        return arguments.callee.prototype.init()
+      }
+    }
+    Class.prototype = prototype;
+    Class.constructor = Class;
+    Class.extend = arguments.callee;
+    return Class;
+  };
+})();
+
+/* Player Component- Base class for all UI objects
+================================================================================ */
+_V_.Component = _V_.Class.extend({
+
+  init: function(player, options){
+    this.player = player;
+
+    // Allow for overridding default component options
+    options = this.options = _V_.merge(this.options || {}, options);
+
+    // Create element if one wasn't provided in options
+    if (options.el) {
+      this.el = options.el;
+    } else {
+      this.el = this.createElement();
+    }
+
+    // Add any components in options
+    this.initComponents();
+  },
+
+  destroy: function(){},
+
+  createElement: function(type, attrs){
+    return _V_.createElement(type || "div", attrs);
+  },
+
+  buildCSSClass: function(){
+    // Child classes can include a function that does:
+    // return "CLASS NAME" + this._super();
+    return "";
+  },
+
+  initComponents: function(){
+    var options = this.options;
+    if (options && options.components) {
+      // Loop through components and add them to the player
+      this.eachProp(options.components, function(name, opts){
+
+        // Allow waiting to add components until a specific event is called
+        var tempAdd = this.proxy(function(){
+          // Set property name on player. Could cause conflicts with other prop names, but it's worth making refs easy.
+          this[name] = this.addComponent(name, opts);
+        });
+
+        if (opts.loadEvent) {
+          this.one(opts.loadEvent, tempAdd)
+        } else {
+          tempAdd();
+        }
+      });
+    }
+  },
+
+  // Add child components to this component.
+  // Will generate a new child component and then append child component's element to this component's element.
+  // Takes either the name of the UI component class, or an object that contains a name, UI Class, and options.
+  addComponent: function(name, options){
+    var component, componentClass;
+
+    // If string, create new component with options
+    if (typeof name == "string") {
+
+      // Make sure options is at least an empty object to protect against errors
+      options = options || {};
+
+      // Assume name of set is a lowercased name of the UI Class (PlayButton, etc.)
+      componentClass = options.componentClass || _V_.uc(name);
+
+      // Create a new object & element for this controls set
+      // If there's no .player, this is a player
+      component = new _V_[componentClass](this.player || this, options);
+
+    } else {
+      component = name;
+    }
+
+    // Add the UI object's element to the container div (box)
+    this.el.appendChild(component.el);
+
+    // Return so it can stored on parent object if desired.
+    return component;
+  },
+
+  removeComponent: function(component){
+    this.el.removeChild(component.el);
+  },
+
+  /* Display
+  ================================================================================ */
+  show: function(){
+    this.el.style.display = "block";
+  },
+
+  hide: function(){
+    this.el.style.display = "none";
+  },
+  
+  fadeIn: function(){
+    this.removeClass("vjs-fade-out");
+    this.addClass("vjs-fade-in");
+  },
+
+  fadeOut: function(){
+    this.removeClass("vjs-fade-in");
+    this.addClass("vjs-fade-out");
+  },
+
+  lockShowing: function(){
+    var style = this.el.style;
+    style.display = "block";
+    style.opacity = 1;
+    style.visiblity = "visible";
+  },
+
+  unlockShowing: function(){
+    var style = this.el.style;
+    style.display = "";
+    style.opacity = "";
+    style.visiblity = "";
+  },
+
+  addClass: function(classToAdd){
+    _V_.addClass(this.el, classToAdd);
+  },
+
+  removeClass: function(classToRemove){
+    _V_.removeClass(this.el, classToRemove);
+  },
+
+  /* Events
+  ================================================================================ */
+  addEvent: function(type, fn, uid){
+    return _V_.addEvent(this.el, type, _V_.proxy(this, fn));
+  },
+  removeEvent: function(type, fn){
+    return _V_.removeEvent(this.el, type, fn);
+  },
+  triggerEvent: function(type, e){
+    return _V_.triggerEvent(this.el, type, e);
+  },
+  one: function(type, fn) {
+    _V_.one(this.el, type, _V_.proxy(this, fn));
+  },
+
+  /* Ready - Trigger functions when component is ready
+  ================================================================================ */
+  ready: function(fn){
+    if (!fn) return this;
+
+    if (this.isReady) {
+      fn.call(this);
+    } else {
+      if (this.readyQueue === undefined) {
+        this.readyQueue = [];
+      }
+      this.readyQueue.push(fn);
+    }
+
+    return this;
+  },
+
+  triggerReady: function(){
+    this.isReady = true;
+    if (this.readyQueue && this.readyQueue.length > 0) {
+      // Call all functions in ready queue
+      this.each(this.readyQueue, function(fn){
+        fn.call(this);
+      });
+
+      // Reset Ready Queue
+      this.readyQueue = [];
+
+      // Allow for using event listeners also, in case you want to do something everytime a source is ready.
+      this.triggerEvent("ready");
+    }
+  },
+
+  /* Utility
+  ================================================================================ */
+  each: function(arr, fn){ _V_.each.call(this, arr, fn); },
+
+  eachProp: function(obj, fn){ _V_.eachProp.call(this, obj, fn); },
+
+  extend: function(obj){ _V_.merge(this, obj) },
+
+  // More easily attach 'this' to functions
+  proxy: function(fn, uid){  return _V_.proxy(this, fn, uid); }
+
+});/* Control - Base class for all control elements
+================================================================================ */
+_V_.Control = _V_.Component.extend({
+
+  buildCSSClass: function(){
+    return "vjs-control " + this._super();
+  }
+
+});
+
+/* Control Bar
+================================================================================ */
+_V_.ControlBar = _V_.Component.extend({
+
+  options: {
+    loadEvent: "play",
+    components: {
+      "playToggle": {},
+      "fullscreenToggle": {},
+      "currentTimeDisplay": {},
+      "timeDivider": {},
+      "durationDisplay": {},
+      "remainingTimeDisplay": {},
+      "progressControl": {},
+      "volumeControl": {},
+      "muteToggle": {}
+    }
+  },
+
+  init: function(player, options){
+    this._super(player, options);
+
+    player.addEvent("play", this.proxy(function(){
+      this.fadeIn();
+      this.player.addEvent("mouseover", this.proxy(this.fadeIn));
+      this.player.addEvent("mouseout", this.proxy(this.fadeOut));
+    }));
+
+  },
+
+  createElement: function(){
+    return _V_.createElement("div", {
+      className: "vjs-controls"
+    });
+  },
+
+  fadeIn: function(){
+    this._super();
+    this.player.triggerEvent("controlsvisible");
+  },
+
+  fadeOut: function(){
+    this._super();
+    this.player.triggerEvent("controlshidden");
+  },
+
+  lockShowing: function(){
+    this.el.style.opacity = "1";
+  }
+
+});
+
+/* Button - Base class for all buttons
+================================================================================ */
+_V_.Button = _V_.Control.extend({
+
+  init: function(player, options){
+    this._super(player, options);
+
+    this.addEvent("click", this.onClick);
+    this.addEvent("focus", this.onFocus);
+    this.addEvent("blur", this.onBlur);
+  },
+
+  createElement: function(type, attrs){
+    // Add standard Aria and Tabindex info
+    attrs = _V_.merge({
+      className: this.buildCSSClass(),
+      innerHTML: '<div><span class="vjs-control-text">' + (this.buttonText || "Need Text") + '</span></div>',
+      role: "button",
+      tabIndex: 0
+    }, attrs);
+
+    return this._super(type, attrs);
+  },
+
+  // Click - Override with specific functionality for button
+  onClick: function(){},
+
+  // Focus - Add keyboard functionality to element
+  onFocus: function(){
+    _V_.addEvent(document, "keyup", _V_.proxy(this, this.onKeyPress));
+  },
+
+  // KeyPress (document level) - Trigger click when keys are pressed
+  onKeyPress: function(event){
+    // Check for space bar (32) or enter (13) keys
+    if (event.which == 32 || event.which == 13) {
+      event.preventDefault();
+      this.onClick();
+    }
+  },
+
+  // Blur - Remove keyboard triggers
+  onBlur: function(){
+    _V_.removeEvent(document, "keyup", _V_.proxy(this, this.onKeyPress));
+  }
+
+});
+
+/* Play Button
+================================================================================ */
+_V_.PlayButton = _V_.Button.extend({
+
+  buttonText: "Play",
+
+  buildCSSClass: function(){
+    return "vjs-play-button " + this._super();
+  },
+
+  onClick: function(){
+    this.player.play();
+  }
+
+});
+
+/* Pause Button
+================================================================================ */
+_V_.PauseButton = _V_.Button.extend({
+
+  buttonText: "Pause",
+
+  buildCSSClass: function(){
+    return "vjs-pause-button " + this._super();
+  },
+
+  onClick: function(){
+    this.player.pause();
+  }
+
+});
+
+/* Play Toggle - Play or Pause Media
+================================================================================ */
+_V_.PlayToggle = _V_.Button.extend({
+
+  buttonText: "Play",
+
+  init: function(player, options){
+    this._super(player, options);
+
+    player.addEvent("play", _V_.proxy(this, this.onPlay));
+    player.addEvent("pause", _V_.proxy(this, this.onPause));
+  },
+
+  buildCSSClass: function(){
+    return "vjs-play-control " + this._super();
+  },
+
+  // OnClick - Toggle between play and pause
+  onClick: function(){
+    if (this.player.paused()) {
+      this.player.play();
+    } else {
+      this.player.pause();
+    }
+  },
+
+  // OnPlay - Add the vjs-playing class to the element so it can change appearance
+  onPlay: function(){
+    _V_.removeClass(this.el, "vjs-paused");
+    _V_.addClass(this.el, "vjs-playing");
+  },
+
+  // OnPause - Add the vjs-paused class to the element so it can change appearance
+  onPause: function(){
+    _V_.removeClass(this.el, "vjs-playing");
+    _V_.addClass(this.el, "vjs-paused");
+  }
+
+});
+
+
+/* Fullscreen Toggle Behaviors
+================================================================================ */
+_V_.FullscreenToggle = _V_.Button.extend({
+
+  buttonText: "Fullscreen",
+
+  buildCSSClass: function(){
+    return "vjs-fullscreen-control " + this._super();
+  },
+
+  onClick: function(){
+    if (!this.player.isFullScreen) {
+      this.player.requestFullScreen();
+    } else {
+      this.player.cancelFullScreen();
+    }
+  }
+
+});
+
+/* Big Play Button
+================================================================================ */
+_V_.BigPlayButton = _V_.Button.extend({
+  init: function(player, options){
+    this._super(player, options);
+
+    player.addEvent("play", _V_.proxy(this, this.hide));
+    player.addEvent("ended", _V_.proxy(this, this.show));
+  },
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-big-play-button",
+      innerHTML: "<span></span>"
+    });
+  },
+
+  onClick: function(){
+    // Go back to the beginning if big play button is showing at the end.
+    // Have to check for current time otherwise it might throw a 'not ready' error.
+    if(this.player.currentTime()) {
+      this.player.currentTime(0);
+    }
+    this.player.play();
+  }
+});
+
+/* Loading Spinner
+================================================================================ */
+_V_.LoadingSpinner = _V_.Component.extend({
+  init: function(player, options){
+    this._super(player, options);
+
+    player.addEvent("canplay", _V_.proxy(this, this.hide));
+    player.addEvent("canplaythrough", _V_.proxy(this, this.hide));
+    player.addEvent("playing", _V_.proxy(this, this.hide));
+
+    player.addEvent("seeking", _V_.proxy(this, this.show));
+    player.addEvent("error", _V_.proxy(this, this.show));
+
+    // Not showing spinner on stalled any more. Browsers may stall and then not trigger any events that would remove the spinner.
+    // Checked in Chrome 16 and Safari 5.1.2. http://help.videojs.com/discussions/problems/883-why-is-the-download-progress-showing
+    // player.addEvent("stalled", _V_.proxy(this, this.show));
+
+    player.addEvent("waiting", _V_.proxy(this, this.show));
+  },
+
+  createElement: function(){
+
+    var classNameSpinner, innerHtmlSpinner;
+
+    if ( typeof this.player.el.style.WebkitBorderRadius == "string"
+         || typeof this.player.el.style.MozBorderRadius == "string"
+         || typeof this.player.el.style.KhtmlBorderRadius == "string"
+         || typeof this.player.el.style.borderRadius == "string")
+      {
+        classNameSpinner = "vjs-loading-spinner";
+        innerHtmlSpinner = "<div class='ball1'></div><div class='ball2'></div><div class='ball3'></div><div class='ball4'></div><div class='ball5'></div><div class='ball6'></div><div class='ball7'></div><div class='ball8'></div>";
+      } else {
+        classNameSpinner = "vjs-loading-spinner-fallback";
+        innerHtmlSpinner = "";
+      }
+
+    return this._super("div", {
+      className: classNameSpinner,
+      innerHTML: innerHtmlSpinner
+    });
+  }
+});
+
+/* Time
+================================================================================ */
+_V_.CurrentTimeDisplay = _V_.Component.extend({
+
+  init: function(player, options){
+    this._super(player, options);
+
+    player.addEvent("timeupdate", _V_.proxy(this, this.updateContent));
+  },
+
+  createElement: function(){
+    var el = this._super("div", {
+      className: "vjs-current-time vjs-time-controls vjs-control"
+    });
+
+    this.content = _V_.createElement("div", {
+      className: "vjs-current-time-display",
+      innerHTML: '0:00'
+    });
+
+    el.appendChild(_V_.createElement("div").appendChild(this.content));
+    return el;
+  },
+
+  updateContent: function(){
+    // Allows for smooth scrubbing, when player can't keep up.
+    var time = (this.player.scrubbing) ? this.player.values.currentTime : this.player.currentTime();
+    this.content.innerHTML = _V_.formatTime(time, this.player.duration());
+  }
+
+});
+
+_V_.DurationDisplay = _V_.Component.extend({
+
+  init: function(player, options){
+    this._super(player, options);
+
+    player.addEvent("timeupdate", _V_.proxy(this, this.updateContent));
+  },
+
+  createElement: function(){
+    var el = this._super("div", {
+      className: "vjs-duration vjs-time-controls vjs-control"
+    });
+
+    this.content = _V_.createElement("div", {
+      className: "vjs-duration-display",
+      innerHTML: '0:00'
+    });
+
+    el.appendChild(_V_.createElement("div").appendChild(this.content));
+    return el;
+  },
+
+  updateContent: function(){
+    if (this.player.duration()) { this.content.innerHTML = _V_.formatTime(this.player.duration()); }
+  }
+
+});
+
+// Time Separator (Not used in main skin, but still available, and could be used as a 'spare element')
+_V_.TimeDivider = _V_.Component.extend({
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-time-divider",
+      innerHTML: '<div><span>/</span></div>'
+    });
+  }
+
+});
+
+_V_.RemainingTimeDisplay = _V_.Component.extend({
+
+  init: function(player, options){
+    this._super(player, options);
+
+    player.addEvent("timeupdate", _V_.proxy(this, this.updateContent));
+  },
+
+  createElement: function(){
+    var el = this._super("div", {
+      className: "vjs-remaining-time vjs-time-controls vjs-control"
+    });
+
+    this.content = _V_.createElement("div", {
+      className: "vjs-remaining-time-display",
+      innerHTML: '-0:00'
+    });
+
+    el.appendChild(_V_.createElement("div").appendChild(this.content));
+    return el;
+  },
+
+  updateContent: function(){
+    if (this.player.duration()) { this.content.innerHTML = "-"+_V_.formatTime(this.player.remainingTime()); }
+
+    // Allows for smooth scrubbing, when player can't keep up.
+    // var time = (this.player.scrubbing) ? this.player.values.currentTime : this.player.currentTime();
+    // this.content.innerHTML = _V_.formatTime(time, this.player.duration());
+  }
+
+});
+
+/* Slider - Parent for seek bar and volume slider
+================================================================================ */
+_V_.Slider = _V_.Component.extend({
+
+  init: function(player, options){
+    this._super(player, options);
+
+    player.addEvent(this.playerEvent, _V_.proxy(this, this.update));
+
+    this.addEvent("mousedown", this.onMouseDown);
+    this.addEvent("focus", this.onFocus);
+    this.addEvent("blur", this.onBlur);
+
+    this.player.addEvent("controlsvisible", this.proxy(this.update));
+
+    // This is actually to fix the volume handle position. http://twitter.com/#!/gerritvanaaken/status/159046254519787520
+    // this.player.one("timeupdate", this.proxy(this.update));
+
+    this.update();
+  },
+
+  createElement: function(type, attrs) {
+    attrs = _V_.merge({
+      role: "slider",
+      "aria-valuenow": 0,
+      "aria-valuemin": 0,
+      "aria-valuemax": 100,
+      tabIndex: 0
+    }, attrs);
+
+    return this._super(type, attrs);
+  },
+
+  onMouseDown: function(event){
+    event.preventDefault();
+    _V_.blockTextSelection();
+
+    _V_.addEvent(document, "mousemove", _V_.proxy(this, this.onMouseMove));
+    _V_.addEvent(document, "mouseup", _V_.proxy(this, this.onMouseUp));
+
+    this.onMouseMove(event);
+  },
+
+  onMouseUp: function(event) {
+    _V_.unblockTextSelection();
+    _V_.removeEvent(document, "mousemove", this.onMouseMove, false);
+    _V_.removeEvent(document, "mouseup", this.onMouseUp, false);
+
+    this.update();
+  },
+
+  update: function(){
+    // If scrubbing, we could use a cached value to make the handle keep up with the user's mouse.
+    // On HTML5 browsers scrubbing is really smooth, but some flash players are slow, so we might want to utilize this later.
+    // var progress =  (this.player.scrubbing) ? this.player.values.currentTime / this.player.duration() : this.player.currentTime() / this.player.duration();
+
+    var barProgress,
+        progress = this.getPercent();
+        handle = this.handle,
+        bar = this.bar;
+
+    // Protect against no duration and other division issues
+    if (isNaN(progress)) { progress = 0; }
+
+    barProgress = progress;
+
+    // If there is a handle, we need to account for the handle in our calculation for progress bar
+    // so that it doesn't fall short of or extend past the handle.
+    if (handle) {
+
+      var box = this.el,
+          boxWidth = box.offsetWidth,
+
+          handleWidth = handle.el.offsetWidth,
+
+          // The width of the handle in percent of the containing box
+          // In IE, widths may not be ready yet causing NaN
+          handlePercent = (handleWidth) ? handleWidth / boxWidth : 0,
+
+          // Get the adjusted size of the box, considering that the handle's center never touches the left or right side.
+          // There is a margin of half the handle's width on both sides.
+          boxAdjustedPercent = 1 - handlePercent;
+
+          // Adjust the progress that we'll use to set widths to the new adjusted box width
+          adjustedProgress = progress * boxAdjustedPercent,
+
+          // The bar does reach the left side, so we need to account for this in the bar's width
+          barProgress = adjustedProgress + (handlePercent / 2);
+
+      // Move the handle from the left based on the adjected progress
+      handle.el.style.left = _V_.round(adjustedProgress * 100, 2) + "%";
+    }
+
+    // Set the new bar width
+    bar.el.style.width = _V_.round(barProgress * 100, 2) + "%";
+  },
+
+  calculateDistance: function(event){
+    var box = this.el,
+        boxX = _V_.findPosX(box),
+        boxW = box.offsetWidth,
+        handle = this.handle;
+
+    if (handle) {
+      var handleW = handle.el.offsetWidth;
+
+      // Adjusted X and Width, so handle doesn't go outside the bar
+      boxX = boxX + (handleW / 2);
+      boxW = boxW - handleW;
+    }
+
+    // Percent that the click is through the adjusted area
+    return Math.max(0, Math.min(1, (event.pageX - boxX) / boxW));
+  },
+
+  onFocus: function(event){
+    _V_.addEvent(document, "keyup", _V_.proxy(this, this.onKeyPress));
+  },
+
+  onKeyPress: function(event){
+    if (event.which == 37) { // Left Arrow
+      event.preventDefault();
+      this.stepBack();
+    } else if (event.which == 39) { // Right Arrow
+      event.preventDefault();
+      this.stepForward();
+    }
+  },
+
+  onBlur: function(event){
+    _V_.removeEvent(document, "keyup", _V_.proxy(this, this.onKeyPress));
+  }
+});
+
+
+/* Progress
+================================================================================ */
+
+// Progress Control: Seek, Load Progress, and Play Progress
+_V_.ProgressControl = _V_.Component.extend({
+
+  options: {
+    components: {
+      "seekBar": {}
+    }
+  },
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-progress-control vjs-control"
+    });
+  }
+
+});
+
+// Seek Bar and holder for the progress bars
+_V_.SeekBar = _V_.Slider.extend({
+
+  options: {
+    components: {
+      "loadProgressBar": {},
+
+      // Set property names to bar and handle to match with the parent Slider class is looking for
+      "bar": { componentClass: "PlayProgressBar" },
+      "handle": { componentClass: "SeekHandle" }
+    }
+  },
+
+  playerEvent: "timeupdate",
+
+  init: function(player, options){
+    this._super(player, options);
+  },
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-progress-holder"
+    });
+  },
+
+  getPercent: function(){
+    return this.player.currentTime() / this.player.duration();
+  },
+
+  onMouseDown: function(event){
+    this._super(event);
+
+    this.player.scrubbing = true;
+
+    this.videoWasPlaying = !this.player.paused();
+    this.player.pause();
+  },
+
+  onMouseMove: function(event){
+    var newTime = this.calculateDistance(event) * this.player.duration();
+
+    // Don't let video end while scrubbing.
+    if (newTime == this.player.duration()) { newTime = newTime - 0.1; }
+
+    // Set new time (tell player to seek to new time)
+    this.player.currentTime(newTime);
+  },
+
+  onMouseUp: function(event){
+    this._super(event);
+
+    this.player.scrubbing = false;
+    if (this.videoWasPlaying) {
+      this.player.play();
+    }
+  },
+
+  stepForward: function(){
+    this.player.currentTime(this.player.currentTime() + 1);
+  },
+
+  stepBack: function(){
+    this.player.currentTime(this.player.currentTime() - 1);
+  }
+
+});
+
+// Load Progress Bar
+_V_.LoadProgressBar = _V_.Component.extend({
+
+  init: function(player, options){
+    this._super(player, options);
+    player.addEvent("progress", _V_.proxy(this, this.update));
+  },
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-load-progress",
+      innerHTML: '<span class="vjs-control-text">Loaded: 0%</span>'
+    });
+  },
+
+  update: function(){
+    if (this.el.style) { this.el.style.width = _V_.round(this.player.bufferedPercent() * 100, 2) + "%"; }
+  }
+
+});
+
+// Play Progress Bar
+_V_.PlayProgressBar = _V_.Component.extend({
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-play-progress",
+      innerHTML: '<span class="vjs-control-text">Progress: 0%</span>'
+    });
+  }
+
+});
+
+// Seek Handle
+// SeekBar Behavior includes play progress bar, and seek handle
+// Needed so it can determine seek position based on handle position/size
+_V_.SeekHandle = _V_.Component.extend({
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-seek-handle",
+      innerHTML: '<span class="vjs-control-text">00:00</span>'
+    });
+  }
+
+});
+
+/* Volume Scrubber
+================================================================================ */
+// Progress Control: Seek, Load Progress, and Play Progress
+_V_.VolumeControl = _V_.Component.extend({
+
+  options: {
+    components: {
+      "volumeBar": {}
+    }
+  },
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-volume-control vjs-control"
+    });
+  }
+
+});
+
+_V_.VolumeBar = _V_.Slider.extend({
+
+  options: {
+    components: {
+      "bar": { componentClass: "VolumeLevel" },
+      "handle": { componentClass: "VolumeHandle" }
+    }
+  },
+
+  playerEvent: "volumechange",
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-volume-bar"
+    });
+  },
+
+  onMouseMove: function(event) {
+    this.player.volume(this.calculateDistance(event));
+  },
+
+  getPercent: function(){
+   return this.player.volume();
+  },
+
+  stepForward: function(){
+    this.player.volume(this.player.volume() + 0.1);
+  },
+
+  stepBack: function(){
+    this.player.volume(this.player.volume() - 0.1);
+  }
+});
+
+_V_.VolumeLevel = _V_.Component.extend({
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-volume-level",
+      innerHTML: '<span class="vjs-control-text"></span>'
+    });
+  }
+
+});
+
+_V_.VolumeHandle = _V_.Component.extend({
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-volume-handle",
+      innerHTML: '<span class="vjs-control-text"></span>'
+      // tabindex: 0,
+      // role: "slider", "aria-valuenow": 0, "aria-valuemin": 0, "aria-valuemax": 100
+    });
+  }
+
+});
+
+_V_.MuteToggle = _V_.Button.extend({
+
+  init: function(player, options){
+    this._super(player, options);
+
+    player.addEvent("volumechange", _V_.proxy(this, this.update));
+  },
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-mute-control vjs-control",
+      innerHTML: '<div><span class="vjs-control-text">Mute</span></div>'
+    });
+  },
+
+  onClick: function(event){
+    this.player.muted( this.player.muted() ? false : true );
+  },
+
+  update: function(event){
+    var vol = this.player.volume(),
+        level = 3;
+
+    if (vol == 0 || this.player.muted()) {
+      level = 0;
+    } else if (vol < 0.33) {
+      level = 1;
+    } else if (vol < 0.67) {
+      level = 2;
+    }
+
+    /* TODO improve muted icon classes */
+    _V_.each.call(this, [0,1,2,3], function(i){
+      _V_.removeClass(this.el, "vjs-vol-"+i);
+    });
+    _V_.addClass(this.el, "vjs-vol-"+level);
+  }
+
+});
+
+
+/* Poster Image
+================================================================================ */
+_V_.PosterImage = _V_.Button.extend({
+  init: function(player, options){
+    this._super(player, options);
+
+    if (!this.player.options.poster) {
+      this.hide();
+    }
+
+    player.addEvent("play", _V_.proxy(this, this.hide));
+  },
+
+  createElement: function(){
+    return _V_.createElement("img", {
+      className: "vjs-poster",
+      src: this.player.options.poster,
+
+      // Don't want poster to be tabbable.
+      tabIndex: -1
+    });
+  },
+
+  onClick: function(){
+    this.player.play();
+  }
+});
+
+/* Menu
+================================================================================ */
+// The base for text track and settings menu buttons.
+_V_.Menu = _V_.Component.extend({
+
+  init: function(player, options){
+    this._super(player, options);
+  },
+
+  addItem: function(component){
+    this.addComponent(component);
+    component.addEvent("click", this.proxy(function(){
+      this.unlockShowing();
+    }));
+  },
+
+  createElement: function(){
+    return this._super("ul", {
+      className: "vjs-menu"
+    });
+  }
+
+});
+
+_V_.MenuItem = _V_.Button.extend({
+
+  init: function(player, options){
+    this._super(player, options);
+
+    if (options.selected) {
+      this.addClass("vjs-selected");
+    }
+  },
+
+  createElement: function(type, attrs){
+    return this._super("li", _V_.merge({
+      className: "vjs-menu-item",
+      innerHTML: this.options.label
+    }, attrs));
+  },
+
+  onClick: function(){
+    this.selected(true);
+  },
+
+  selected: function(selected){
+    if (selected) {
+      this.addClass("vjs-selected");
+    } else {
+      this.removeClass("vjs-selected")
+    }
+  }
+
+});// ECMA-262 is the standard for javascript.
+// The following methods are impelemented EXACTLY as described in the standard (according to Mozilla Docs), and do not override the default method if one exists.
+// This may conflict with other libraries that modify the array prototype, but those libs should update to use the standard.
+
+// [].indexOf
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
+if (!Array.prototype.indexOf) {
+    Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) {
+        "use strict";
+        if (this === void 0 || this === null) {
+            throw new TypeError();
+        }
+        var t = Object(this);
+        var len = t.length >>> 0;
+        if (len === 0) {
+            return -1;
+        }
+        var n = 0;
+        if (arguments.length > 0) {
+            n = Number(arguments[1]);
+            if (n !== n) { // shortcut for verifying if it's NaN
+                n = 0;
+            } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
+                n = (n > 0 || -1) * Math.floor(Math.abs(n));
+            }
+        }
+        if (n >= len) {
+            return -1;
+        }
+        var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0);
+        for (; k < len; k++) {
+            if (k in t && t[k] === searchElement) {
+                return k;
+            }
+        }
+        return -1;
+    }
+}
+
+// NOT NEEDED YET
+// [].lastIndexOf
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
+// if (!Array.prototype.lastIndexOf)
+// {
+//   Array.prototype.lastIndexOf = function(searchElement /*, fromIndex*/)
+//   {
+//     "use strict";
+// 
+//     if (this === void 0 || this === null)
+//       throw new TypeError();
+// 
+//     var t = Object(this);
+//     var len = t.length >>> 0;
+//     if (len === 0)
+//       return -1;
+// 
+//     var n = len;
+//     if (arguments.length > 1)
+//     {
+//       n = Number(arguments[1]);
+//       if (n !== n)
+//         n = 0;
+//       else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0))
+//         n = (n > 0 || -1) * Math.floor(Math.abs(n));
+//     }
+// 
+//     var k = n >= 0
+//           ? Math.min(n, len - 1)
+//           : len - Math.abs(n);
+// 
+//     for (; k >= 0; k--)
+//     {
+//       if (k in t && t[k] === searchElement)
+//         return k;
+//     }
+//     return -1;
+//   };
+// }
+
+
+// NOT NEEDED YET
+// Array forEach per ECMA standard https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/foreach
+// Production steps of ECMA-262, Edition 5, 15.4.4.18
+// Reference: http://es5.github.com/#x15.4.4.18
+// if ( !Array.prototype.forEach ) {
+// 
+//   Array.prototype.forEach = function( callback, thisArg ) {
+// 
+//     var T, k;
+// 
+//     if ( this == null ) {
+//       throw new TypeError( " this is null or not defined" );
+//     }
+// 
+//     // 1. Let O be the result of calling ToObject passing the |this| value as the argument.
+//     var O = Object(this);
+// 
+//     // 2. Let lenValue be the result of calling the Get internal method of O with the argument "length".
+//     // 3. Let len be ToUint32(lenValue).
+//     var len = O.length >>> 0;
+// 
+//     // 4. If IsCallable(callback) is false, throw a TypeError exception.
+//     // See: http://es5.github.com/#x9.11
+//     if ( {}.toString.call(callback) != "[object Function]" ) {
+//       throw new TypeError( callback + " is not a function" );
+//     }
+// 
+//     // 5. If thisArg was supplied, let T be thisArg; else let T be undefined.
+//     if ( thisArg ) {
+//       T = thisArg;
+//     }
+// 
+//     // 6. Let k be 0
+//     k = 0;
+// 
+//     // 7. Repeat, while k < len
+//     while( k < len ) {
+// 
+//       var kValue;
+// 
+//       // a. Let Pk be ToString(k).
+//       //   This is implicit for LHS operands of the in operator
+//       // b. Let kPresent be the result of calling the HasProperty internal method of O with argument Pk.
+//       //   This step can be combined with c
+//       // c. If kPresent is true, then
+//       if ( k in O ) {
+// 
+//         // i. Let kValue be the result of calling the Get internal method of O with argument Pk.
+//         kValue = O[ Pk ];
+// 
+//         // ii. Call the Call internal method of callback with T as the this value and
+//         // argument list containing kValue, k, and O.
+//         callback.call( T, kValue, k, O );
+//       }
+//       // d. Increase k by 1.
+//       k++;
+//     }
+//     // 8. return undefined
+//   };
+// }
+
+
+// NOT NEEDED YET
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/map
+// Production steps of ECMA-262, Edition 5, 15.4.4.19
+// Reference: http://es5.github.com/#x15.4.4.19
+// if (!Array.prototype.map) {
+//   Array.prototype.map = function(callback, thisArg) {
+// 
+//     var T, A, k;
+// 
+//     if (this == null) {
+//       throw new TypeError(" this is null or not defined");
+//     }
+// 
+//     // 1. Let O be the result of calling ToObject passing the |this| value as the argument.
+//     var O = Object(this);
+// 
+//     // 2. Let lenValue be the result of calling the Get internal method of O with the argument "length".
+//     // 3. Let len be ToUint32(lenValue).
+//     var len = O.length >>> 0;
+// 
+//     // 4. If IsCallable(callback) is false, throw a TypeError exception.
+//     // See: http://es5.github.com/#x9.11
+//     if ({}.toString.call(callback) != "[object Function]") {
+//       throw new TypeError(callback + " is not a function");
+//     }
+// 
+//     // 5. If thisArg was supplied, let T be thisArg; else let T be undefined.
+//     if (thisArg) {
+//       T = thisArg;
+//     }
+// 
+//     // 6. Let A be a new array created as if by the expression new Array(len) where Array is
+//     // the standard built-in constructor with that name and len is the value of len.
+//     A = new Array(len);
+// 
+//     // 7. Let k be 0
+//     k = 0;
+// 
+//     // 8. Repeat, while k < len
+//     while(k < len) {
+// 
+//       var kValue, mappedValue;
+// 
+//       // a. Let Pk be ToString(k).
+//       //   This is implicit for LHS operands of the in operator
+//       // b. Let kPresent be the result of calling the HasProperty internal method of O with argument Pk.
+//       //   This step can be combined with c
+//       // c. If kPresent is true, then
+//       if (k in O) {
+// 
+//         // i. Let kValue be the result of calling the Get internal method of O with argument Pk.
+//         kValue = O[ k ];
+// 
+//         // ii. Let mappedValue be the result of calling the Call internal method of callback
+//         // with T as the this value and argument list containing kValue, k, and O.
+//         mappedValue = callback.call(T, kValue, k, O);
+// 
+//         // iii. Call the DefineOwnProperty internal method of A with arguments
+//         // Pk, Property Descriptor {Value: mappedValue, Writable: true, Enumerable: true, Configurable: true},
+//         // and false.
+// 
+//         // In browsers that support Object.defineProperty, use the following:
+//         // Object.defineProperty(A, Pk, { value: mappedValue, writable: true, enumerable: true, configurable: true });
+// 
+//         // For best browser support, use the following:
+//         A[ k ] = mappedValue;
+//       }
+//       // d. Increase k by 1.
+//       k++;
+//     }
+// 
+//     // 9. return A
+//     return A;
+//   };      
+// }
+// Event System (J.Resig - Secrets of a JS Ninja http://jsninja.com/ [Go read it, really])
+// (Book version isn't completely usable, so fixed some things and borrowed from jQuery where it's working)
+// 
+// This should work very similarly to jQuery's events, however it's based off the book version which isn't as
+// robust as jquery's, so there's probably some differences.
+// 
+// When you add an event listener using _V_.addEvent, 
+//   it stores the handler function in seperate cache object, 
+//   and adds a generic handler to the element's event,
+//   along with a unique id (guid) to the element.
+
+_V_.extend({
+
+  // Add an event listener to element
+  // It stores the handler function in a separate cache object
+  // and adds a generic handler to the element's event,
+  // along with a unique id (guid) to the element.
+  addEvent: function(elem, type, fn){
+    var data = _V_.getData(elem), handlers;
+
+    // We only need to generate one handler per element
+    if (data && !data.handler) {
+      // Our new meta-handler that fixes the event object and the context
+      data.handler = function(event){
+        event = _V_.fixEvent(event);
+        var handlers = _V_.getData(elem).events[event.type];
+        // Go through and call all the real bound handlers
+        if (handlers) {
+          
+          // Copy handlers so if handlers are added/removed during the process it doesn't throw everything off.
+          var handlersCopy = [];
+          _V_.each(handlers, function(handler, i){
+            handlersCopy[i] = handler;
+          })
+          
+          for (var i = 0, l = handlersCopy.length; i < l; i++) {
+            handlersCopy[i].call(elem, event);
+          }
+        }
+      };
+    }
+
+    // We need a place to store all our event data
+    if (!data.events) { data.events = {}; }
+
+    // And a place to store the handlers for this event type
+    handlers = data.events[type];
+
+    if (!handlers) {
+      handlers = data.events[ type ] = [];
+
+      // Attach our meta-handler to the element, since one doesn't exist
+      if (document.addEventListener) {
+        elem.addEventListener(type, data.handler, false);
+      } else if (document.attachEvent) {
+        elem.attachEvent("on" + type, data.handler);
+      }
+    }
+
+    if (!fn.guid) { fn.guid = _V_.guid++; }
+
+    handlers.push(fn);
+  },
+
+  removeEvent: function(elem, type, fn) {
+    var data = _V_.getData(elem), handlers;
+    // If no events exist, nothing to unbind
+    if (!data.events) { return; }
+
+    // Are we removing all bound events?
+    if (!type) {
+      for (type in data.events) {
+        _V_.cleanUpEvents(elem, type);
+      }
+      return;
+    }
+
+    // And a place to store the handlers for this event type
+    handlers = data.events[type];
+
+    // If no handlers exist, nothing to unbind
+    if (!handlers) { return; }
+
+    // See if we're only removing a single handler
+    if (fn && fn.guid) {
+      for (var i = 0; i < handlers.length; i++) {
+        // We found a match (don't stop here, there could be a couple bound)
+        if (handlers[i].guid === fn.guid) {
+          // Remove the handler from the array of handlers
+          handlers.splice(i--, 1);
+        }
+      }
+    }
+
+    _V_.cleanUpEvents(elem, type);
+  },
+
+  cleanUpEvents: function(elem, type) {
+    var data = _V_.getData(elem);
+    // Remove the events of a particular type if there are none left
+
+    if (data.events[type].length === 0) {
+      delete data.events[type];
+
+      // Remove the meta-handler from the element
+      if (document.removeEventListener) {
+        elem.removeEventListener(type, data.handler, false);
+      } else if (document.detachEvent) {
+        elem.detachEvent("on" + type, data.handler);
+      }
+    }
+
+    // Remove the events object if there are no types left
+    if (_V_.isEmpty(data.events)) {
+      delete data.events;
+      delete data.handler;
+    }
+
+    // Finally remove the expando if there is no data left
+    if (_V_.isEmpty(data)) {
+      _V_.removeData(elem);
+    }
+  },
+
+  fixEvent: function(event) {
+    if (event[_V_.expando]) { return event; }
+    // store a copy of the original event object
+    // and "clone" to set read-only properties
+    var originalEvent = event;
+    event = new _V_.Event(originalEvent);
+
+    for ( var i = _V_.Event.props.length, prop; i; ) {
+      prop = _V_.Event.props[ --i ];
+      event[prop] = originalEvent[prop];
+    }
+
+    // Fix target property, if necessary
+    if (!event.target) { event.target = event.srcElement || document; }
+
+    // check if target is a textnode (safari)
+    if (event.target.nodeType === 3) { event.target = event.target.parentNode; }
+
+    // Add relatedTarget, if necessary
+    if (!event.relatedTarget && event.fromElement) {
+      event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
+    }
+
+    // Calculate pageX/Y if missing and clientX/Y available
+    if ( event.pageX == null && event.clientX != null ) {
+      var eventDocument = event.target.ownerDocument || document,
+        doc = eventDocument.documentElement,
+        body = eventDocument.body;
+
+      event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
+      event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
+    }
+
+    // Add which for key events
+    if (event.which == null && (event.charCode != null || event.keyCode != null)) {
+      event.which = event.charCode != null ? event.charCode : event.keyCode;
+    }
+
+    // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+    if ( !event.metaKey && event.ctrlKey ) {
+      event.metaKey = event.ctrlKey;
+    }
+
+    // Add which for click: 1 === left; 2 === middle; 3 === right
+    // Note: button is not normalized, so don't use it
+    if ( !event.which && event.button !== undefined ) {
+      event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+    }
+
+    return event;
+  },
+
+  triggerEvent: function(elem, event) {
+    var data = _V_.getData(elem),
+        parent = elem.parentNode || elem.ownerDocument,
+        type = event.type || event,
+        handler;
+
+    if (data) { handler = data.handler }
+
+    // Added in attion to book. Book code was broke.
+    event = typeof event === "object" ?
+      event[_V_.expando] ? 
+        event :
+        new _V_.Event(type, event) :
+      new _V_.Event(type);
+
+    event.type = type;
+    if (handler) {
+      handler.call(elem, event);
+    }
+
+    // Clean up the event in case it is being reused
+    event.result = undefined;
+    event.target = elem;
+
+    // Bubble the event up the tree to the document,
+    // Unless it's been explicitly stopped
+    // if (parent && !event.isPropagationStopped()) {
+    //   _V_.triggerEvent(parent, event);
+    // 
+    // // We're at the top document so trigger the default action
+    // } else if (!parent && !event.isDefaultPrevented()) {
+    //   // log(type);
+    //   var targetData = _V_.getData(event.target);
+    //   // log(targetData);
+    //   var targetHandler = targetData.handler;
+    //   // log("2");
+    //   if (event.target[event.type]) {
+    //     // Temporarily disable the bound handler,
+    //     // don't want to execute it twice
+    //     if (targetHandler) {
+    //       targetData.handler = function(){};
+    //     }
+    // 
+    //     // Trigger the native event (click, focus, blur)
+    //     event.target[event.type]();
+    // 
+    //     // Restore the handler
+    //     if (targetHandler) {
+    //       targetData.handler = targetHandler;
+    //     }
+    //   }
+    // }
+  },
+  
+  one: function(elem, type, fn) {
+    _V_.addEvent(elem, type, function(){
+      _V_.removeEvent(elem, type, arguments.callee)
+      fn.apply(this, arguments);
+    });
+  }
+});
+
+// Custom Event object for standardizing event objects between browsers.
+_V_.Event = function(src, props){
+  // Event object
+  if (src && src.type) {
+    this.originalEvent = src;
+    this.type = src.type;
+
+    // Events bubbling up the document may have been marked as prevented
+    // by a handler lower down the tree; reflect the correct value.
+    this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
+      src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
+
+  // Event type
+  } else {
+    this.type = src;
+  }
+
+  // Put explicitly provided properties onto the event object
+  if (props) { _V_.merge(this, props); }
+
+  this.timeStamp = (new Date).getTime();
+
+  // Mark it as fixed
+  this[_V_.expando] = true;
+};
+
+_V_.Event.prototype = {
+  preventDefault: function() {
+    this.isDefaultPrevented = returnTrue;
+
+    var e = this.originalEvent;
+    if (!e) { return; }
+
+    // if preventDefault exists run it on the original event
+    if (e.preventDefault) { 
+      e.preventDefault();
+    // otherwise set the returnValue property of the original event to false (IE)
+    } else {
+      e.returnValue = false;
+    }
+  },
+  stopPropagation: function() {
+    this.isPropagationStopped = returnTrue;
+
+    var e = this.originalEvent;
+    if (!e) { return; }
+    // if stopPropagation exists run it on the original event
+    if (e.stopPropagation) { e.stopPropagation(); }
+    // otherwise set the cancelBubble property of the original event to true (IE)
+    e.cancelBubble = true;
+  },
+  stopImmediatePropagation: function() {
+    this.isImmediatePropagationStopped = returnTrue;
+    this.stopPropagation();
+  },
+  isDefaultPrevented: returnFalse,
+  isPropagationStopped: returnFalse,
+  isImmediatePropagationStopped: returnFalse
+};
+_V_.Event.props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" ");
+
+function returnTrue(){ return true; }
+function returnFalse(){ return false; }
+
+// Javascript JSON implementation
+// (Parse Method Only)
+// https://github.com/douglascrockford/JSON-js/blob/master/json2.js
+
+var JSON;
+if (!JSON) { JSON = {}; }
+
+(function(){
+  var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+
+  if (typeof JSON.parse !== 'function') {
+      JSON.parse = function (text, reviver) {
+          var j;
+
+          function walk(holder, key) {
+              var k, v, value = holder[key];
+              if (value && typeof value === 'object') {
+                  for (k in value) {
+                      if (Object.prototype.hasOwnProperty.call(value, k)) {
+                          v = walk(value, k);
+                          if (v !== undefined) {
+                              value[k] = v;
+                          } else {
+                              delete value[k];
+                          }
+                      }
+                  }
+              }
+              return reviver.call(holder, key, value);
+          }
+          text = String(text);
+          cx.lastIndex = 0;
+          if (cx.test(text)) {
+              text = text.replace(cx, function (a) {
+                  return '\\u' +
+                      ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+              });
+          }
+
+          if (/^[\],:{}\s]*$/
+                  .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+                      .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+                      .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+              j = eval('(' + text + ')');
+
+              return typeof reviver === 'function' ?
+                  walk({'': j}, '') : j;
+          }
+
+          throw new SyntaxError('JSON.parse');
+      };
+  }
+}());
+/* UI Component- Base class for all UI objects
+================================================================================ */
+_V_.Player = _V_.Component.extend({
+
+  init: function(tag, addOptions, ready){
+
+    this.tag = tag; // Store the original tag used to set options
+
+    var el = this.el = _V_.createElement("div"), // Div to contain video and controls
+        options = this.options = {},
+        width = options.width = tag.getAttribute('width'),
+        height = options.height = tag.getAttribute('height'),
+
+        // Browsers default to 300x150 if there's no width/height or video size data.
+        initWidth = width || 300,
+        initHeight = height || 150;
+
+    // Make player findable on elements
+    tag.player = el.player = this;
+
+    // Add callback to ready queue
+    this.ready(ready);
+
+    // Wrap video tag in div (el/box) container
+    tag.parentNode.insertBefore(el, tag);
+    el.appendChild(tag); // Breaks iPhone, fixed in HTML5 setup.
+
+    // Give video tag properties to box
+    el.id = this.id = tag.id; // ID will now reference box, not the video tag
+    el.className = tag.className;
+    // Update tag id/class for use as HTML5 playback tech
+    tag.id += "_html5_api";
+    tag.className = "vjs-tech";
+
+    // Make player easily findable by ID
+    _V_.players[el.id] = this;
+
+    // Make box use width/height of tag, or default 300x150
+    el.setAttribute("width", initWidth);
+    el.setAttribute("height", initHeight);
+    // Enforce with CSS since width/height attrs don't work on divs
+    el.style.width = initWidth+"px";
+    el.style.height = initHeight+"px";
+    // Remove width/height attrs from tag so CSS can make it 100% width/height
+    tag.removeAttribute("width");
+    tag.removeAttribute("height");
+
+    // Set Options
+    _V_.merge(options, _V_.options); // Copy Global Defaults
+    _V_.merge(options, this.getVideoTagSettings()); // Override with Video Tag Options
+    _V_.merge(options, addOptions); // Override/extend with options from setup call
+
+    // Store controls setting, and then remove immediately so native controls don't flash.
+    tag.removeAttribute("controls");
+
+    // Poster will be handled by a manual <img>
+    tag.removeAttribute("poster");
+
+    // Empty video tag sources and tracks so the built in player doesn't use them also.
+    if (tag.hasChildNodes()) {
+      for (var i=0,j=tag.childNodes;i<j.length;i++) {
+        if (j[i].nodeName == "SOURCE" || j[i].nodeName == "TRACK") {
+          tag.removeChild(j[i]);
+        }
+      }
+    }
+
+    // Cache for video property values.
+    this.values = {};
+
+    this.addClass("vjs-paused");
+
+    this.addEvent("ended", this.onEnded);
+    this.addEvent("play", this.onPlay);
+    this.addEvent("pause", this.onPause);
+    this.addEvent("progress", this.onProgress);
+    this.addEvent("error", this.onError);
+
+    // When the API is ready, loop through the components and add to the player.
+    if (options.controls) {
+      this.ready(function(){
+        this.initComponents();
+      });
+    }
+
+    // Tracks defined in tracks.js
+    this.textTracks = [];
+    if (options.tracks && options.tracks.length > 0) {
+      this.addTextTracks(options.tracks);
+    }
+
+    // If there are no sources when the player is initialized,
+    // load the first supported playback technology.
+    if (!options.sources || options.sources.length == 0) {
+      for (var i=0,j=options.techOrder; i<j.length; i++) {
+        var techName = j[i],
+            tech = _V_[techName];
+
+        // Check if the browser supports this technology
+        if (tech.isSupported()) {
+          this.loadTech(techName);
+          break;
+        }
+      }
+    } else {
+      // Loop through playback technologies (HTML5, Flash) and check for support. Then load the best source.
+      // A few assumptions here:
+      //   All playback technologies respect preload false.
+      this.src(options.sources);
+    }
+  },
+
+  // Cache for video property values.
+  values: {},
+
+  destroy: function(){
+    // Ensure that tracking progress and time progress will stop and plater deleted
+    this.stopTrackingProgress();
+    this.stopTrackingCurrentTime();
+    _V_.players[this.id] = null;
+    delete _V_.players[this.id];
+    this.tech.destroy();
+    this.el.parentNode.removeChild(this.el);
+  },
+
+  createElement: function(type, options){},
+
+  getVideoTagSettings: function(){
+    var options = {
+      sources: [],
+      tracks: []
+    };
+
+    options.src = this.tag.getAttribute("src");
+    options.controls = this.tag.getAttribute("controls") !== null;
+    options.poster = this.tag.getAttribute("poster");
+    options.preload = this.tag.getAttribute("preload");
+    options.autoplay = this.tag.getAttribute("autoplay") !== null; // hasAttribute not IE <8 compatible
+    options.loop = this.tag.getAttribute("loop") !== null;
+    options.muted = this.tag.getAttribute("muted") !== null;
+
+    if (this.tag.hasChildNodes()) {
+      for (var c,i=0,j=this.tag.childNodes;i<j.length;i++) {
+        c = j[i];
+        if (c.nodeName == "SOURCE") {
+          options.sources.push({
+            src: c.getAttribute('src'),
+            type: c.getAttribute('type'),
+            media: c.getAttribute('media'),
+            title: c.getAttribute('title')
+          });
+        }
+        if (c.nodeName == "TRACK") {
+          options.tracks.push({
+            src: c.getAttribute("src"),
+            kind: c.getAttribute("kind"),
+            srclang: c.getAttribute("srclang"),
+            label: c.getAttribute("label"),
+            'default': c.getAttribute("default") !== null,
+            title: c.getAttribute("title")
+          });
+        }
+      }
+    }
+    return options;
+  },
+
+  /* PLayback Technology (tech)
+  ================================================================================ */
+  // Load/Create an instance of playback technlogy including element and API methods
+  // And append playback element in player div.
+  loadTech: function(techName, source){
+
+    // Pause and remove current playback technology
+    if (this.tech) {
+      this.unloadTech();
+
+    // If the first time loading, HTML5 tag will exist but won't be initialized
+    // So we need to remove it if we're not loading HTML5
+    } else if (techName != "html5" && this.tag) {
+      this.el.removeChild(this.tag);
+      this.tag = false;
+    }
+
+    this.techName = techName;
+
+    // Turn off API access because we're loading a new tech that might load asynchronously
+    this.isReady = false;
+
+    var techReady = function(){
+      this.player.triggerReady();
+
+      // Manually track progress in cases where the browser/flash player doesn't report it.
+      if (!this.support.progressEvent) {
+        this.player.manualProgressOn();
+      }
+
+      // Manually track timeudpates in cases where the browser/flash player doesn't report it.
+      if (!this.support.timeupdateEvent) {
+        this.player.manualTimeUpdatesOn();
+      }
+    }
+
+    // Grab tech-specific options from player options and add source and parent element to use.
+    var techOptions = _V_.merge({ source: source, parentEl: this.el }, this.options[techName])
+
+    if (source) {
+      if (source.src == this.values.src && this.values.currentTime > 0) {
+        techOptions.startTime = this.values.currentTime;
+      }
+
+      this.values.src = source.src;
+    }
+
+    // Initialize tech instance
+    this.tech = new _V_[techName](this, techOptions);
+    this.tech.ready(techReady);
+  },
+
+  unloadTech: function(){
+    this.tech.destroy();
+
+    // Turn off any manual progress or timeupdate tracking
+    if (this.manualProgress) { this.manualProgressOff(); }
+
+    if (this.manualTimeUpdates) { this.manualTimeUpdatesOff(); }
+
+    this.tech = false;
+  },
+
+  // There's many issues around changing the size of a Flash (or other plugin) object.
+  // First is a plugin reload issue in Firefox that has been around for 11 years: https://bugzilla.mozilla.org/show_bug.cgi?id=90268
+  // Then with the new fullscreen API, Mozilla and webkit browsers will reload the flash object after going to fullscreen.
+  // To get around this, we're unloading the tech, caching source and currentTime values, and reloading the tech once the plugin is resized.
+  // reloadTech: function(betweenFn){
+  //   _V_.log("unloadingTech")
+  //   this.unloadTech();
+  //   _V_.log("unloadedTech")
+  //   if (betweenFn) { betweenFn.call(); }
+  //   _V_.log("LoadingTech")
+  //   this.loadTech(this.techName, { src: this.values.src })
+  //   _V_.log("loadedTech")
+  // },
+
+  /* Fallbacks for unsupported event types
+  ================================================================================ */
+  // Manually trigger progress events based on changes to the buffered amount
+  // Many flash players and older HTML5 browsers don't send progress or progress-like events
+  manualProgressOn: function(){
+    this.manualProgress = true;
+
+    // Trigger progress watching when a source begins loading
+    this.trackProgress();
+
+    // Watch for a native progress event call on the tech element
+    // In HTML5, some older versions don't support the progress event
+    // So we're assuming they don't, and turning off manual progress if they do.
+    this.tech.addEvent("progress", function(){
+
+      // Remove this listener from the element
+      this.removeEvent("progress", arguments.callee);
+
+      // Update known progress support for this playback technology
+      this.support.progressEvent = true;
+
+      // Turn off manual progress tracking
+      this.player.manualProgressOff();
+    });
+  },
+
+  manualProgressOff: function(){
+    this.manualProgress = false;
+    this.stopTrackingProgress();
+  },
+
+  trackProgress: function(){
+    this.progressInterval = setInterval(_V_.proxy(this, function(){
+      // Don't trigger unless buffered amount is greater than last time
+      // log(this.values.bufferEnd, this.buffered().end(0), this.duration())
+      /* TODO: update for multiple buffered regions */
+      if (this.values.bufferEnd < this.buffered().end(0)) {
+        this.triggerEvent("progress");
+      } else if (this.bufferedPercent() == 1) {
+        this.stopTrackingProgress();
+        this.triggerEvent("progress"); // Last update
+      }
+    }), 500);
+  },
+  stopTrackingProgress: function(){ clearInterval(this.progressInterval); },
+
+  /* Time Tracking -------------------------------------------------------------- */
+  manualTimeUpdatesOn: function(){
+    this.manualTimeUpdates = true;
+
+    this.addEvent("play", this.trackCurrentTime);
+    this.addEvent("pause", this.stopTrackingCurrentTime);
+    // timeupdate is also called by .currentTime whenever current time is set
+
+    // Watch for native timeupdate event
+    this.tech.addEvent("timeupdate", function(){
+
+      // Remove this listener from the element
+      this.removeEvent("timeupdate", arguments.callee);
+
+      // Update known progress support for this playback technology
+      this.support.timeupdateEvent = true;
+
+      // Turn off manual progress tracking
+      this.player.manualTimeUpdatesOff();
+    });
+  },
+
+  manualTimeUpdatesOff: function(){
+    this.manualTimeUpdates = false;
+    this.stopTrackingCurrentTime();
+    this.removeEvent("play", this.trackCurrentTime);
+    this.removeEvent("pause", this.stopTrackingCurrentTime);
+  },
+
+  trackCurrentTime: function(){
+    if (this.currentTimeInterval) { this.stopTrackingCurrentTime(); }
+    this.currentTimeInterval = setInterval(_V_.proxy(this, function(){
+      this.triggerEvent("timeupdate");
+    }), 250); // 42 = 24 fps // 250 is what Webkit uses // FF uses 15
+  },
+
+  // Turn off play progress tracking (when paused or dragging)
+  stopTrackingCurrentTime: function(){ clearInterval(this.currentTimeInterval); },
+
+  /* Player event handlers (how the player reacts to certain events)
+  ================================================================================ */
+  onEnded: function(){
+    if (this.options.loop) {
+      this.currentTime(0);
+      this.play();
+    } else {
+      this.pause();
+      this.currentTime(0);
+      this.pause();
+    }
+  },
+
+  onPlay: function(){
+    _V_.removeClass(this.el, "vjs-paused");
+    _V_.addClass(this.el, "vjs-playing");
+  },
+
+  onPause: function(){
+    _V_.removeClass(this.el, "vjs-playing");
+    _V_.addClass(this.el, "vjs-paused");
+  },
+
+  onProgress: function(){
+    // Add custom event for when source is finished downloading.
+    if (this.bufferedPercent() == 1) {
+      this.triggerEvent("loadedalldata");
+    }
+  },
+
+  onError: function(e) {
+    _V_.log("Video Error", e);
+  },
+
+/* Player API
+================================================================================ */
+
+  // Pass values to the playback tech
+  techCall: function(method, arg){
+
+    // If it's not ready yet, call method when it is
+    if (!this.tech.isReady) {
+      this.tech.ready(function(){
+        this[method](arg);
+      });
+
+    // Otherwise call method now
+    } else {
+      try {
+        this.tech[method](arg);
+      } catch(e) {
+        _V_.log(e);
+      }
+    }
+  },
+
+  // Get calls can't wait for the tech, and sometimes don't need to.
+  techGet: function(method){
+
+    // Make sure tech is ready
+    if (this.tech.isReady) {
+
+      // Flash likes to die and reload when you hide or reposition it.
+      // In these cases the object methods go away and we get errors.
+      // When that happens we'll catch the errors and inform tech that it's not ready any more.
+      try {
+        return this.tech[method]();
+      } catch(e) {
+
+        // When building additional tech libs, an expected method may not be defined yet
+        if (this.tech[method] === undefined) {
+          _V_.log("Video.js: " + method + " method not defined for "+this.techName+" playback technology.", e);
+
+        } else {
+
+          // When a method isn't available on the object it throws a TypeError
+          if (e.name == "TypeError") {
+            _V_.log("Video.js: " + method + " unavailable on "+this.techName+" playback technology element.", e);
+            this.tech.isReady = false;
+
+          } else {
+            _V_.log(e);
+          }
+        }
+      }
+    }
+
+    return;
+  },
+
+  // Method for calling methods on the current playback technology
+  // techCall: function(method, arg){
+  // 
+  //   // if (this.isReady) {
+  //   //   
+  //   // } else {
+  //   //   _V_.log("The playback technology API is not ready yet. Use player.ready(myFunction)."+" ["+method+"]", arguments.callee.caller.arguments.callee.caller.arguments.callee.caller)
+  //   //   return false;
+  //   //   // throw new Error("The playback technology API is not ready yet. Use player.ready(myFunction)."+" ["+method+"]");
+  //   // }
+  // },
+
+  // http://dev.w3.org/html5/spec/video.html#dom-media-play
+  play: function(){
+    this.techCall("play");
+    return this;
+  },
+
+  // http://dev.w3.org/html5/spec/video.html#dom-media-pause
+  pause: function(){
+    this.techCall("pause");
+    return this;
+  },
+  
+  // http://dev.w3.org/html5/spec/video.html#dom-media-paused
+  // The initial state of paused should be true (in Safari it's actually false)
+  paused: function(){
+    return (this.techGet("paused") === false) ? false : true;
+  },
+
+  // http://dev.w3.org/html5/spec/video.html#dom-media-currenttime
+  currentTime: function(seconds){
+    if (seconds !== undefined) {
+
+      // Cache the last set value for smoother scrubbing.
+      this.values.lastSetCurrentTime = seconds;
+
+      this.techCall("setCurrentTime", seconds);
+
+      // Improve the accuracy of manual timeupdates
+      if (this.manualTimeUpdates) { this.triggerEvent("timeupdate"); }
+
+      return this;
+    }
+
+    // Cache last currentTime and return
+    // Default to 0 seconds
+    return this.values.currentTime = (this.techGet("currentTime") || 0);
+  },
+
+  // http://dev.w3.org/html5/spec/video.html#dom-media-duration
+  // Duration should return NaN if not available. ParseFloat will turn false-ish values to NaN.
+  duration: function(){
+    return parseFloat(this.techGet("duration"));
+  },
+
+  // Calculates how much time is left. Not in spec, but useful.
+  remainingTime: function(){
+    return this.duration() - this.currentTime();
+  },
+
+  // http://dev.w3.org/html5/spec/video.html#dom-media-buffered
+  // Buffered returns a timerange object. Kind of like an array of portions of the video that have been downloaded.
+  // So far no browsers return more than one range (portion)
+  buffered: function(){
+    var buffered = this.techGet("buffered"),
+        start = 0,
+        end = this.values.bufferEnd = this.values.bufferEnd || 0, // Default end to 0 and store in values
+        timeRange;
+
+    if (buffered && buffered.length > 0 && buffered.end(0) !== end) {
+      end = buffered.end(0);
+      // Storing values allows them be overridden by setBufferedFromProgress
+      this.values.bufferEnd = end;
+    }
+
+    return _V_.createTimeRange(start, end);
+  },
+
+  // Calculates amount of buffer is full. Not in spec but useful.
+  bufferedPercent: function(){
+    return (this.duration()) ? this.buffered().end(0) / this.duration() : 0;
+  },
+
+  // http://dev.w3.org/html5/spec/video.html#dom-media-volume
+  volume: function(percentAsDecimal){
+    var vol;
+
+    if (percentAsDecimal !== undefined) {
+      vol = Math.max(0, Math.min(1, parseFloat(percentAsDecimal))); // Force value to between 0 and 1
+      this.values.volume = vol;
+      this.techCall("setVolume", vol);
+      _V_.setLocalStorage("volume", vol);
+      return this;
+    }
+
+    // Default to 1 when returning current volume.
+    vol = parseFloat(this.techGet("volume"));
+    return (isNaN(vol)) ? 1 : vol;
+  },
+
+  // http://dev.w3.org/html5/spec/video.html#attr-media-muted
+  muted: function(muted){
+    if (muted !== undefined) {
+      this.techCall("setMuted", muted);
+      return this;
+    }
+    return this.techGet("muted") || false; // Default to false
+  },
+
+  // http://dev.w3.org/html5/spec/dimension-attributes.html#attr-dim-height
+  // Video tag width/height only work in pixels. No percents.
+  // We could potentially allow percents but won't for now until we can do testing around it.
+  width: function(width, skipListeners){
+    if (width !== undefined) {
+      this.el.width = width;
+      this.el.style.width = width+"px";
+
+      // skipListeners allows us to avoid triggering the resize event when setting both width and height
+      if (!skipListeners) { this.triggerEvent("resize"); }
+      return this;
+    }
+    return parseInt(this.el.getAttribute("width"));
+  },
+  height: function(height){
+    if (height !== undefined) {
+      this.el.height = height;
+      this.el.style.height = height+"px";
+      this.triggerEvent("resize");
+      return this;
+    }
+    return parseInt(this.el.getAttribute("height"));
+  },
+  // Set both width and height at the same time.
+  size: function(width, height){
+    // Skip resize listeners on width for optimization
+    return this.width(width, true).height(height);
+  },
+
+  // Check if current tech can support native fullscreen (e.g. with built in controls lik iOS, so not our flash swf)
+  supportsFullScreen: function(){ return this.techGet("supportsFullScreen") || false; },
+
+  // Turn on fullscreen (or window) mode
+  requestFullScreen: function(){
+    var requestFullScreen = _V_.support.requestFullScreen;
+
+    this.isFullScreen = true;
+
+    // Check for browser element fullscreen support
+    if (requestFullScreen) {
+
+      // Trigger fullscreenchange event after change
+      _V_.addEvent(document, requestFullScreen.eventName, this.proxy(function(){
+        this.isFullScreen = document[requestFullScreen.isFullScreen];
+
+        // If cancelling fullscreen, remove event listener.
+        if (this.isFullScreen == false) {
+          _V_.removeEvent(document, requestFullScreen.eventName, arguments.callee);
+        }
+
+        this.triggerEvent("fullscreenchange");
+      }));
+
+      // Flash and other plugins get reloaded when you take their parent to fullscreen.
+      // To fix that we'll remove the tech, and reload it after the resize has finished.
+      if (this.tech.support.fullscreenResize === false && this.options.flash.iFrameMode != true) {
+
+        this.pause();
+        this.unloadTech();
+
+        _V_.addEvent(document, requestFullScreen.eventName, this.proxy(function(){
+          _V_.removeEvent(document, requestFullScreen.eventName, arguments.callee);
+          this.loadTech(this.techName, { src: this.values.src });
+        }));
+
+        this.el[requestFullScreen.requestFn]();
+
+      } else {
+        this.el[requestFullScreen.requestFn]();
+      }
+
+    } else if (this.tech.supportsFullScreen()) {
+      this.triggerEvent("fullscreenchange");
+      this.techCall("enterFullScreen");
+
+    } else {
+      this.triggerEvent("fullscreenchange");
+      this.enterFullWindow();
+    }
+
+     return this;
+   },
+
+   cancelFullScreen: function(){
+    var requestFullScreen = _V_.support.requestFullScreen;
+
+    this.isFullScreen = false;
+
+    // Check for browser element fullscreen support
+    if (requestFullScreen) {
+
+     // Flash and other plugins get reloaded when you take their parent to fullscreen.
+     // To fix that we'll remove the tech, and reload it after the resize has finished.
+     if (this.tech.support.fullscreenResize === false && this.options.flash.iFrameMode != true) {
+
+       this.pause();
+       this.unloadTech();
+
+       _V_.addEvent(document, requestFullScreen.eventName, this.proxy(function(){
+         _V_.removeEvent(document, requestFullScreen.eventName, arguments.callee);
+         this.loadTech(this.techName, { src: this.values.src })
+       }));
+
+       document[requestFullScreen.cancelFn]();
+
+     } else {
+       document[requestFullScreen.cancelFn]();
+     }
+
+    } else if (this.tech.supportsFullScreen()) {
+     this.techCall("exitFullScreen");
+     this.triggerEvent("fullscreenchange");
+
+    } else {
+     this.exitFullWindow();
+     this.triggerEvent("fullscreenchange");
+    }
+
+    return this;
+  },
+
+  // When fullscreen isn't supported we can stretch the video container to as wide as the browser will let us.
+  enterFullWindow: function(){
+    this.isFullWindow = true;
+
+    // Storing original doc overflow value to return to when fullscreen is off
+    this.docOrigOverflow = document.documentElement.style.overflow;
+
+    // Add listener for esc key to exit fullscreen
+    _V_.addEvent(document, "keydown", _V_.proxy(this, this.fullWindowOnEscKey));
+
+    // Hide any scroll bars
+    document.documentElement.style.overflow = 'hidden';
+
+    // Apply fullscreen styles
+    _V_.addClass(document.body, "vjs-full-window");
+    _V_.addClass(this.el, "vjs-fullscreen");
+
+    this.triggerEvent("enterFullWindow");
+  },
+  fullWindowOnEscKey: function(event){
+    if (event.keyCode == 27) {
+      if (this.isFullScreen == true) {
+        this.cancelFullScreen();
+      } else {
+        this.exitFullWindow();
+      }
+    }
+  },
+
+  exitFullWindow: function(){
+    this.isFullWindow = false;
+    _V_.removeEvent(document, "keydown", this.fullWindowOnEscKey);
+
+    // Unhide scroll bars.
+    document.documentElement.style.overflow = this.docOrigOverflow;
+
+    // Remove fullscreen styles
+    _V_.removeClass(document.body, "vjs-full-window");
+    _V_.removeClass(this.el, "vjs-fullscreen");
+
+    // Resize the box, controller, and poster to original sizes
+    // this.positionAll();
+    this.triggerEvent("exitFullWindow");
+  },
+
+  selectSource: function(sources){
+
+    // Loop through each playback technology in the options order
+    for (var i=0,j=this.options.techOrder;i<j.length;i++) {
+      var techName = j[i],
+          tech = _V_[techName];
+          // tech = _V_.tech[techName];
+
+      // Check if the browser supports this technology
+      if (tech.isSupported()) {
+
+        // Loop through each source object
+        for (var a=0,b=sources;a<b.length;a++) {
+          var source = b[a];
+
+          // Check if source can be played with this technology
+          if (tech.canPlaySource.call(this, source)) {
+
+            return { source: source, tech: techName };
+
+          }
+        }
+      }
+    }
+
+    return false;
+  },
+
+  // src is a pretty powerful function
+  // If you pass it an array of source objects, it will find the best source to play and use that object.src
+  //   If the new source requires a new playback technology, it will switch to that.
+  // If you pass it an object, it will set the source to object.src
+  // If you pass it anything else (url string) it will set the video source to that
+  src: function(source){
+    // Case: Array of source objects to choose from and pick the best to play
+    if (source instanceof Array) {
+
+      var sourceTech = this.selectSource(source),
+          source,
+          techName;
+
+      if (sourceTech) {
+          source = sourceTech.source;
+          techName = sourceTech.tech;
+
+        // If this technology is already loaded, set source
+        if (techName == this.techName) {
+          this.src(source); // Passing the source object
+
+        // Otherwise load this technology with chosen source
+        } else {
+          this.loadTech(techName, source);
+        }
+      } else {
+        _V_.log("No compatible source and playback technology were found.")
+      }
+
+    // Case: Source object { src: "", type: "" ... }
+    } else if (source instanceof Object) {
+
+      if (_V_[this.techName].canPlaySource(source)) {
+        this.src(source.src);
+      } else {
+        // Send through tech loop to check for a compatible technology.
+        this.src([source]);
+      }
+
+    // Case: URL String (http://myvideo...)
+    } else {
+      // Cache for getting last set source
+      this.values.src = source;
+
+      if (!this.isReady) {
+        this.ready(function(){
+          this.src(source);
+        });
+      } else {
+        this.techCall("src", source);
+        if (this.options.preload == "auto") {
+          this.load();
+        }
+        if (this.options.autoplay) {
+          this.play();
+        }
+      }
+    }
+    return this;
+  },
+
+  // Begin loading the src data
+  // http://dev.w3.org/html5/spec/video.html#dom-media-load
+  load: function(){
+    this.techCall("load");
+    return this;
+  },
+
+  // http://dev.w3.org/html5/spec/video.html#dom-media-currentsrc
+  currentSrc: function(){
+    return this.techGet("currentSrc") || this.values.src || "";
+  },
+
+  // Attributes/Options
+  preload: function(value){
+    if (value !== undefined) {
+      this.techCall("setPreload", value);
+      this.options.preload = value;
+      return this;
+    }
+    return this.techGet("preload");
+  },
+  autoplay: function(value){
+    if (value !== undefined) {
+      this.techCall("setAutoplay", value);
+      this.options.autoplay = value;
+      return this;
+    }
+    return this.techGet("autoplay", value);
+  },
+  loop: function(value){
+    if (value !== undefined) {
+      this.techCall("setLoop", value);
+      this.options.loop = value;
+      return this;
+    }
+    return this.techGet("loop");
+  },
+
+  controls: function(){ return this.options.controls; },
+  poster: function(){ return this.techGet("poster"); },
+  error: function(){ return this.techGet("error"); },
+  ended: function(){ return this.techGet("ended"); }
+
+  // Methods to add support for
+  // networkState: function(){ return this.techCall("networkState"); },
+  // readyState: function(){ return this.techCall("readyState"); },
+  // seeking: function(){ return this.techCall("seeking"); },
+  // initialTime: function(){ return this.techCall("initialTime"); },
+  // startOffsetTime: function(){ return this.techCall("startOffsetTime"); },
+  // played: function(){ return this.techCall("played"); },
+  // seekable: function(){ return this.techCall("seekable"); },
+  // videoTracks: function(){ return this.techCall("videoTracks"); },
+  // audioTracks: function(){ return this.techCall("audioTracks"); },
+  // videoWidth: function(){ return this.techCall("videoWidth"); },
+  // videoHeight: function(){ return this.techCall("videoHeight"); },
+  // defaultPlaybackRate: function(){ return this.techCall("defaultPlaybackRate"); },
+  // playbackRate: function(){ return this.techCall("playbackRate"); },
+  // mediaGroup: function(){ return this.techCall("mediaGroup"); },
+  // controller: function(){ return this.techCall("controller"); },
+  // defaultMuted: function(){ return this.techCall("defaultMuted"); }
+});
+
+// RequestFullscreen API
+(function(){
+  var requestFn,
+      cancelFn,
+      eventName,
+      isFullScreen,
+      playerProto = _V_.Player.prototype;
+
+  // Current W3C Spec
+  // http://dvcs.w3.org/hg/fullscreen/raw-file/tip/Overview.html#api
+  // Mozilla Draft: https://wiki.mozilla.org/Gecko:FullScreenAPI#fullscreenchange_event
+  if (document.cancelFullscreen !== undefined) {
+    requestFn = "requestFullscreen";
+    cancelFn = "exitFullscreen";
+    eventName = "fullscreenchange";
+    isFullScreen = "fullScreen";
+
+  // Webkit (Chrome/Safari) and Mozilla (Firefox) have working implementaitons
+  // that use prefixes and vary slightly from the new W3C spec. Specifically, using 'exit' instead of 'cancel',
+  // and lowercasing the 'S' in Fullscreen.
+  // Other browsers don't have any hints of which version they might follow yet, so not going to try to predict by loopeing through all prefixes.
+  } else {
+
+    _V_.each(["moz", "webkit"], function(prefix){
+
+      // https://github.com/zencoder/video-js/pull/128
+      if ((prefix != "moz" || document.mozFullScreenEnabled) && document[prefix + "CancelFullScreen"] !== undefined) {
+        requestFn = prefix + "RequestFullScreen";
+        cancelFn = prefix + "CancelFullScreen";
+        eventName = prefix + "fullscreenchange";
+
+        if (prefix == "webkit") {
+          isFullScreen = prefix + "IsFullScreen";
+        } else {
+          isFullScreen = prefix + "FullScreen";
+        }
+      }
+
+    });
+
+  }
+
+  if (requestFn) {
+    _V_.support.requestFullScreen = {
+      requestFn: requestFn,
+      cancelFn: cancelFn,
+      eventName: eventName,
+      isFullScreen: isFullScreen
+    };
+  }
+
+})();/* Playback Technology - Base class for playback technologies
+================================================================================ */
+_V_.PlaybackTech = _V_.Component.extend({
+  init: function(player, options){
+    // this._super(player, options);
+
+    // Make playback element clickable
+    // _V_.addEvent(this.el, "click", _V_.proxy(this, _V_.PlayToggle.prototype.onClick));
+
+    // this.addEvent("click", this.proxy(this.onClick));
+
+    // player.triggerEvent("techready");
+  },
+  // destroy: function(){},
+  // createElement: function(){},
+  onClick: function(){
+    if (this.player.options.controls) {
+      _V_.PlayToggle.prototype.onClick.call(this);
+    }
+  }
+});
+
+// Create placeholder methods for each that warn when a method isn't supported by the current playback technology
+_V_.apiMethods = "play,pause,paused,currentTime,setCurrentTime,duration,buffered,volume,setVolume,muted,setMuted,width,height,supportsFullScreen,enterFullScreen,src,load,currentSrc,preload,setPreload,autoplay,setAutoplay,loop,setLoop,error,networkState,readyState,seeking,initialTime,startOffsetTime,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks,defaultPlaybackRate,playbackRate,mediaGroup,controller,controls,defaultMuted".split(",");
+_V_.each(_V_.apiMethods, function(methodName){
+  _V_.PlaybackTech.prototype[methodName] = function(){
+    throw new Error("The '"+methodName+"' method is not available on the playback technology's API");
+  }
+});
+
+/* HTML5 Playback Technology - Wrapper for HTML5 Media API
+================================================================================ */
+_V_.html5 = _V_.PlaybackTech.extend({
+
+  init: function(player, options, ready){
+    this.player = player;
+    this.el = this.createElement();
+    this.ready(ready);
+
+    this.addEvent("click", this.proxy(this.onClick));
+
+    var source = options.source;
+
+    // If the element source is already set, we may have missed the loadstart event, and want to trigger it.
+    // We don't want to set the source again and interrupt playback.
+    if (source && this.el.currentSrc == source.src) {
+      player.triggerEvent("loadstart");
+
+    // Otherwise set the source if one was provided.
+    } else if (source) {
+      this.el.src = source.src;
+    }
+
+    // Chrome and Safari both have issues with autoplay.
+    // In Safari (5.1.1), when we move the video element into the container div, autoplay doesn't work.
+    // In Chrome (15), if you have autoplay + a poster + no controls, the video gets hidden (but audio plays)
+    // This fixes both issues. Need to wait for API, so it updates displays correctly
+    player.ready(function(){
+      if (this.options.autoplay && this.paused()) {
+        this.tag.poster = null; // Chrome Fix. Fixed in Chrome v16.
+        this.play();
+      }
+    });
+
+    this.setupTriggers();
+
+    this.triggerReady();
+  },
+
+  destroy: function(){
+    this.player.tag = false;
+    this.removeTriggers();
+    this.el.parentNode.removeChild(this.el);
+  },
+
+  createElement: function(){
+    var html5 = _V_.html5,
+        player = this.player,
+
+        // If possible, reuse original tag for HTML5 playback technology element
+        el = player.tag,
+        newEl;
+
+    // Check if this browser supports moving the element into the box.
+    // On the iPhone video will break if you move the element,
+    // So we have to create a brand new element.
+    if (!el || this.support.movingElementInDOM === false) {
+
+      // If the original tag is still there, remove it.
+      if (el) {
+        player.el.removeChild(el);
+      }
+
+      newEl = _V_.createElement("video", {
+        id: el.id || player.el.id + "_html5_api",
+        className: el.className || "vjs-tech"
+      });
+
+      el = newEl;
+      _V_.insertFirst(el, player.el);
+    }
+
+    // Update tag settings, in case they were overridden
+    _V_.each(["autoplay","preload","loop","muted"], function(attr){ // ,"poster"
+      if (player.options[attr] !== null) {
+        el[attr] = player.options[attr];
+      }
+    }, this);
+
+    return el;
+  },
+
+  // Make video events trigger player events
+  // May seem verbose here, but makes other APIs possible.
+  setupTriggers: function(){
+    _V_.each.call(this, _V_.html5.events, function(type){
+      _V_.addEvent(this.el, type, _V_.proxy(this.player, this.eventHandler));
+    });
+  },
+  removeTriggers: function(){
+    _V_.each.call(this, _V_.html5.events, function(type){
+      _V_.removeEvent(this.el, type, _V_.proxy(this.player, this.eventHandler));
+    });
+  },
+  eventHandler: function(e){
+    e.stopPropagation();
+    this.triggerEvent(e);
+  },
+
+  play: function(){ this.el.play(); },
+  pause: function(){ this.el.pause(); },
+  paused: function(){ return this.el.paused; },
+
+  currentTime: function(){ return this.el.currentTime; },
+  setCurrentTime: function(seconds){
+    try {
+      this.el.currentTime = seconds;
+      } catch(e) {
+        _V_.log(e, "Video isn't ready. (VideoJS)");
+      // this.warning(VideoJS.warnings.videoNotReady);
+    }
+  },
+
+  duration: function(){ return this.el.duration || 0; },
+  buffered: function(){ return this.el.buffered; },
+
+  volume: function(){ return this.el.volume; },
+  setVolume: function(percentAsDecimal){ this.el.volume = percentAsDecimal; },
+  muted: function(){ return this.el.muted; },
+  setMuted: function(muted){ this.el.muted = muted },
+
+  width: function(){ return this.el.offsetWidth; },
+  height: function(){ return this.el.offsetHeight; },
+
+  supportsFullScreen: function(){
+    if (typeof this.el.webkitEnterFullScreen == 'function') {
+
+      // Seems to be broken in Chromium/Chrome && Safari in Leopard
+      if (!navigator.userAgent.match("Chrome") && !navigator.userAgent.match("Mac OS X 10.5")) {
+        return true;
+      }
+    }
+    return false;
+  },
+
+  enterFullScreen: function(){
+      try {
+        this.el.webkitEnterFullScreen();
+      } catch (e) {
+        if (e.code == 11) {
+          // this.warning(VideoJS.warnings.videoNotReady);
+          _V_.log("VideoJS: Video not ready.")
+        }
+      }
+  },
+  src: function(src){ this.el.src = src; },
+  load: function(){ this.el.load(); },
+  currentSrc: function(){ return this.el.currentSrc; },
+
+  preload: function(){ return this.el.preload; },
+  setPreload: function(val){ this.el.preload = val; },
+  autoplay: function(){ return this.el.autoplay; },
+  setAutoplay: function(val){ this.el.autoplay = val; },
+  loop: function(){ return this.el.loop; },
+  setLoop: function(val){ this.el.loop = val; },
+
+  error: function(){ return this.el.error; },
+  // networkState: function(){ return this.el.networkState; },
+  // readyState: function(){ return this.el.readyState; },
+  seeking: function(){ return this.el.seeking; },
+  // initialTime: function(){ return this.el.initialTime; },
+  // startOffsetTime: function(){ return this.el.startOffsetTime; },
+  // played: function(){ return this.el.played; },
+  // seekable: function(){ return this.el.seekable; },
+  ended: function(){ return this.el.ended; },
+  // videoTracks: function(){ return this.el.videoTracks; },
+  // audioTracks: function(){ return this.el.audioTracks; },
+  // videoWidth: function(){ return this.el.videoWidth; },
+  // videoHeight: function(){ return this.el.videoHeight; },
+  // textTracks: function(){ return this.el.textTracks; },
+  // defaultPlaybackRate: function(){ return this.el.defaultPlaybackRate; },
+  // playbackRate: function(){ return this.el.playbackRate; },
+  // mediaGroup: function(){ return this.el.mediaGroup; },
+  // controller: function(){ return this.el.controller; },
+  controls: function(){ return this.player.options.controls; },
+  defaultMuted: function(){ return this.el.defaultMuted; }
+});
+
+/* HTML5 Support Testing -------------------------------------------------------- */
+
+_V_.html5.isSupported = function(){
+  return !!document.createElement("video").canPlayType;
+};
+
+_V_.html5.canPlaySource = function(srcObj){
+  return !!document.createElement("video").canPlayType(srcObj.type);
+  // TODO: Check Type
+  // If no Type, check ext
+  // Check Media Type
+};
+
+// List of all HTML5 events (various uses).
+_V_.html5.events = "loadstart,suspend,abort,error,emptied,stalled,loadedmetadata,loadeddata,canplay,canplaythrough,playing,waiting,seeking,seeked,ended,durationchange,timeupdate,progress,play,pause,ratechange,volumechange".split(",");
+
+/* HTML5 Device Fixes ---------------------------------------------------------- */
+
+_V_.html5.prototype.support = {
+
+  // Support for tech specific full screen. (webkitEnterFullScreen, not requestFullscreen)
+  // http://developer.apple.com/library/safari/#documentation/AudioVideo/Reference/HTMLVideoElementClassReference/HTMLVideoElement/HTMLVideoElement.html
+  // Seems to be broken in Chromium/Chrome && Safari in Leopard
+  fullscreen: (typeof _V_.testVid.webkitEnterFullScreen !== undefined) ? (!_V_.ua.match("Chrome") && !_V_.ua.match("Mac OS X 10.5") ? true : false) : false,
+
+  // In iOS, if you move a video element in the DOM, it breaks video playback.
+  movingElementInDOM: !_V_.isIOS()
+
+};
+
+// Android
+if (_V_.isAndroid()) {
+
+  // Override Android 2.2 and less canPlayType method which is broken
+  if (_V_.androidVersion() < 3) {
+    document.createElement("video").constructor.prototype.canPlayType = function(type){
+      return (type && type.toLowerCase().indexOf("video/mp4") != -1) ? "maybe" : "";
+    };
+  }
+}
+
+
+/* VideoJS-SWF - Custom Flash Player with HTML5-ish API - https://github.com/zencoder/video-js-swf
+================================================================================ */
+_V_.flash = _V_.PlaybackTech.extend({
+
+  init: function(player, options){
+    this.player = player;
+
+    var source = options.source,
+
+        // Which element to embed in
+        parentEl = options.parentEl,
+
+        // Create a temporary element to be replaced by swf object
+        placeHolder = this.el = _V_.createElement("div", { id: parentEl.id + "_temp_flash" }),
+
+        // Generate ID for swf object
+        objId = player.el.id+"_flash_api",
+
+        // Store player options in local var for optimization
+        playerOptions = player.options,
+
+        // Merge default flashvars with ones passed in to init
+        flashVars = _V_.merge({
+
+          // SWF Callback Functions
+          readyFunction: "_V_.flash.onReady",
+          eventProxyFunction: "_V_.flash.onEvent",
+          errorEventProxyFunction: "_V_.flash.onError",
+
+          // Player Settings
+          autoplay: playerOptions.autoplay,
+          preload: playerOptions.preload,
+          loop: playerOptions.loop,
+          muted: playerOptions.muted
+
+        }, options.flashVars),
+
+        // Merge default parames with ones passed in
+        params = _V_.merge({
+          wmode: "opaque", // Opaque is needed to overlay controls, but can affect playback performance
+          bgcolor: "#000000" // Using bgcolor prevents a white flash when the object is loading
+        }, options.params),
+
+        // Merge default attributes with ones passed in
+        attributes = _V_.merge({
+          id: objId,
+          name: objId, // Both ID and Name needed or swf to identifty itself
+          'class': 'vjs-tech'
+        }, options.attributes)
+    ;
+
+    // If source was supplied pass as a flash var.
+    if (source) {
+      flashVars.src = encodeURIComponent(_V_.getAbsoluteURL(source.src));
+    }
+
+    // Add placeholder to player div
+    _V_.insertFirst(placeHolder, parentEl);
+
+    // Having issues with Flash reloading on certain page actions (hide/resize/fullscreen) in certain browsers
+    // This allows resetting the playhead when we catch the reload
+    if (options.startTime) {
+      this.ready(function(){
+        this.load();
+        this.play();
+        this.currentTime(options.startTime);
+      });
+    }
+
+    // Flash iFrame Mode
+    // In web browsers there are multiple instances where changing the parent element or visibility of a plugin causes the plugin to reload.
+    // - Firefox just about always. https://bugzilla.mozilla.org/show_bug.cgi?id=90268 (might be fixed by version 13)
+    // - Webkit when hiding the plugin
+    // - Webkit and Firefox when using requestFullScreen on a parent element
+    // Loading the flash plugin into a dynamically generated iFrame gets around most of these issues.
+    // Issues that remain include hiding the element and requestFullScreen in Firefox specifically
+
+    // There's on particularly annoying issue with this method which is that Firefox throws a security error on an offsite Flash object loaded into a dynamically created iFrame.
+    // Even though the iframe was inserted into a page on the web, Firefox + Flash considers it a local app trying to access an internet file.
+    // I tried mulitple ways of setting the iframe src attribute but couldn't find a src that worked well. Tried a real/fake source, in/out of domain.
+    // Also tried a method from stackoverflow that caused a security error in all browsers. http://stackoverflow.com/questions/2486901/how-to-set-document-domain-for-a-dynamically-generated-iframe
+    // In the end the solution I found to work was setting the iframe window.location.href right before doing a document.write of the Flash object.
+    // The only downside of this it seems to trigger another http request to the original page (no matter what's put in the href). Not sure why that is.
+
+    // NOTE (2012-01-29): Cannot get Firefox to load the remote hosted SWF into a dynamically created iFrame
+    // Firefox 9 throws a security error, unleess you call location.href right before doc.write.
+    //    Not sure why that even works, but it causes the browser to look like it's continuously trying to load the page.
+    // Firefox 3.6 keeps calling the iframe onload function anytime I write to it, causing an endless loop.
+
+    if (options.iFrameMode == true && !_V_.isFF) {
+
+      // Create iFrame with vjs-tech class so it's 100% width/height
+      var iFrm = _V_.createElement("iframe", {
+        id: objId + "_iframe",
+        name: objId + "_iframe",
+        className: "vjs-tech",
+        scrolling: "no",
+        marginWidth: 0,
+        marginHeight: 0,
+        frameBorder: 0
+      });
+
+      // Update ready function names in flash vars for iframe window
+      flashVars.readyFunction = "ready";
+      flashVars.eventProxyFunction = "events";
+      flashVars.errorEventProxyFunction = "errors";
+
+      // Tried multiple methods to get this to work in all browsers
+
+      // Tried embedding the flash object in the page first, and then adding a place holder to the iframe, then replacing the placeholder with the page object.
+      // The goal here was to try to load the swf URL in the parent page first and hope that got around the firefox security error
+      // var newObj = _V_.flash.embed(options.swf, placeHolder, flashVars, params, attributes);
+      // (in onload)
+      //  var temp = _V_.createElement("a", { id:"asdf", innerHTML: "asdf" } );
+      //  iDoc.body.appendChild(temp);
+
+      // Tried embedding the flash object through javascript in the iframe source.
+      // This works in webkit but still triggers the firefox security error
+      // iFrm.src = "javascript: document.write('"+_V_.flash.getEmbedCode(options.swf, flashVars, params, attributes)+"');";
+
+      // Tried an actual local iframe just to make sure that works, but it kills the easiness of the CDN version if you require the user to host an iframe
+      // We should add an option to host the iframe locally though, because it could help a lot of issues.
+      // iFrm.src = "iframe.html";
+
+      // Wait until iFrame has loaded to write into it.
+      _V_.addEvent(iFrm, "load", _V_.proxy(this, function(){
+
+        var iDoc, objTag, swfLoc,
+            iWin = iFrm.contentWindow,
+            varString = "";
+
+
+        // The one working method I found was to use the iframe's document.write() to create the swf object
+        // This got around the security issue in all browsers except firefox.
+        // I did find a hack where if I call the iframe's window.location.href="", it would get around the security error
+        // However, the main page would look like it was loading indefinitely (URL bar loading spinner would never stop)
+        // Plus Firefox 3.6 didn't work no matter what I tried.
+        // if (_V_.ua.match("Firefox")) {
+        //   iWin.location.href = "";
+        // }
+
+        // Get the iFrame's document depending on what the browser supports
+        iDoc = iFrm.contentDocument ? iFrm.contentDocument : iFrm.contentWindow.document;
+
+        // Tried ensuring both document domains were the same, but they already were, so that wasn't the issue.
+        // Even tried adding /. that was mentioned in a browser security writeup
+        // document.domain = document.domain+"/.";
+        // iDoc.domain = document.domain+"/.";
+
+        // Tried adding the object to the iframe doc's innerHTML. Security error in all browsers.
+        // iDoc.body.innerHTML = swfObjectHTML;
+
+        // Tried appending the object to the iframe doc's body. Security error in all browsers.
+        // iDoc.body.appendChild(swfObject);
+
+        // Using document.write actually got around the security error that browsers were throwing.
+        // Again, it's a dynamically generated (same domain) iframe, loading an external Flash swf.
+        // Not sure why that's a security issue, but apparently it is.
+        iDoc.write(_V_.flash.getEmbedCode(options.swf, flashVars, params, attributes));
+
+        // Setting variables on the window needs to come after the doc write because otherwise they can get reset in some browsers
+        // So far no issues with swf ready event being called before it's set on the window.
+        iWin.player = this.player;
+
+        // Create swf ready function for iFrame window
+        iWin.ready = _V_.proxy(this.player, function(currSwf){
+          var el = iDoc.getElementById(currSwf),
+              player = this,
+              tech = player.tech;
+
+          // Update reference to playback technology element
+          tech.el = el;
+
+          // Now that the element is ready, make a click on the swf play the video
+          _V_.addEvent(el, "click", tech.proxy(tech.onClick));
+
+          // Make sure swf is actually ready. Sometimes the API isn't actually yet.
+          _V_.flash.checkReady(tech);
+        });
+
+        // Create event listener for all swf events
+        iWin.events = _V_.proxy(this.player, function(swfID, eventName, other){
+          var player = this;
+          if (player && player.techName == "flash") {
+            player.triggerEvent(eventName);
+          }
+        });
+
+        // Create error listener for all swf errors
+        iWin.errors = _V_.proxy(this.player, function(swfID, eventName){
+          _V_.log("Flash Error", eventName);
+        });
+
+      }));
+
+      // Replace placeholder with iFrame (it will load now)
+      placeHolder.parentNode.replaceChild(iFrm, placeHolder);
+
+    // If not using iFrame mode, embed as normal object
+    } else {
+      _V_.flash.embed(options.swf, placeHolder, flashVars, params, attributes);
+    }
+  },
+
+  destroy: function(){
+    this.el.parentNode.removeChild(this.el);
+  },
+
+  // setupTriggers: function(){}, // Using global onEvent func to distribute events
+
+  play: function(){ this.el.vjs_play(); },
+  pause: function(){ this.el.vjs_pause(); },
+  src: function(src){
+    // Make sure source URL is abosolute.
+    src = _V_.getAbsoluteURL(src);
+
+    this.el.vjs_src(src);
+
+    // Currently the SWF doesn't autoplay if you load a source later.
+    // e.g. Load player w/ no source, wait 2s, set src.
+    if (this.player.autoplay()) {
+      var tech = this;
+      setTimeout(function(){ tech.play(); }, 0);
+    }
+  },
+  load: function(){ this.el.vjs_load(); },
+  poster: function(){ this.el.vjs_getProperty("poster"); },
+
+  buffered: function(){
+    return _V_.createTimeRange(0, this.el.vjs_getProperty("buffered"));
+  },
+
+  supportsFullScreen: function(){
+    return false; // Flash does not allow fullscreen through javascript
+  },
+  enterFullScreen: function(){
+    return false;
+  }
+});
+
+// Create setters and getters for attributes
+(function(){
+
+  var api = _V_.flash.prototype,
+      readWrite = "preload,currentTime,defaultPlaybackRate,playbackRate,autoplay,loop,mediaGroup,controller,controls,volume,muted,defaultMuted".split(","),
+      readOnly = "error,currentSrc,networkState,readyState,seeking,initialTime,duration,startOffsetTime,paused,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks".split(","),
+      callOnly = "load,play,pause".split(",");
+      // Overridden: buffered
+
+      createSetter = function(attr){
+        var attrUpper = attr.charAt(0).toUpperCase() + attr.slice(1);
+        api["set"+attrUpper] = function(val){ return this.el.vjs_setProperty(attr, val); };
+      },
+
+      createGetter = function(attr){
+        api[attr] = function(){ return this.el.vjs_getProperty(attr); };
+      }
+  ;
+
+  // Create getter and setters for all read/write attributes
+  _V_.each(readWrite, function(attr){
+    createGetter(attr);
+    createSetter(attr);
+  });
+
+  // Create getters for read-only attributes
+  _V_.each(readOnly, function(attr){
+    createGetter(attr);
+  });
+
+})();
+
+/* Flash Support Testing -------------------------------------------------------- */
+
+_V_.flash.isSupported = function(){
+  return _V_.flash.version()[0] >= 10;
+  // return swfobject.hasFlashPlayerVersion("10");
+};
+
+_V_.flash.canPlaySource = function(srcObj){
+  if (srcObj.type in _V_.flash.prototype.support.formats) { return "maybe"; }
+};
+
+_V_.flash.prototype.support = {
+  formats: {
+    "video/flv": "FLV",
+    "video/x-flv": "FLV",
+    "video/mp4": "MP4",
+    "video/m4v": "MP4"
+  },
+
+  // Optional events that we can manually mimic with timers
+  progressEvent: false,
+  timeupdateEvent: false,
+
+  // Resizing plugins using request fullscreen reloads the plugin
+  fullscreenResize: false,
+
+  // Resizing plugins in Firefox always reloads the plugin (e.g. full window mode)
+  parentResize: !(_V_.ua.match("Firefox"))
+};
+
+_V_.flash.onReady = function(currSwf){
+
+  var el = _V_.el(currSwf);
+
+  // Get player from box
+  // On firefox reloads, el might already have a player
+  var player = el.player || el.parentNode.player,
+      tech = player.tech;
+
+  // Reference player on tech element
+  el.player = player;
+
+  // Update reference to playback technology element
+  tech.el = el;
+
+  // Now that the element is ready, make a click on the swf play the video
+  tech.addEvent("click", tech.onClick);
+
+  _V_.flash.checkReady(tech);
+};
+
+// The SWF isn't alwasy ready when it says it is. Sometimes the API functions still need to be added to the object.
+// If it's not ready, we set a timeout to check again shortly.
+_V_.flash.checkReady = function(tech){
+
+  // Check if API property exists
+  if (tech.el.vjs_getProperty) {
+
+    // If so, tell tech it's ready
+    tech.triggerReady();
+
+  // Otherwise wait longer.
+  } else {
+
+    setTimeout(function(){
+      _V_.flash.checkReady(tech);
+    }, 50);
+
+  }
+};
+
+// Trigger events from the swf on the player
+_V_.flash.onEvent = function(swfID, eventName){
+  var player = _V_.el(swfID).player;
+  player.triggerEvent(eventName);
+};
+
+// Log errors from the swf
+_V_.flash.onError = function(swfID, err){
+  var player = _V_.el(swfID).player;
+  player.triggerEvent("error");
+  _V_.log("Flash Error", err, swfID);
+};
+
+// Flash Version Check
+_V_.flash.version = function(){
+  var version = '0,0,0'
+
+  // IE
+  try {
+    version = new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version').replace(/\D+/g, ',').match(/^,?(.+),?$/)[1];
+
+  // other browsers
+  } catch(e) {
+    try {
+      if (navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin){
+        version = (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g, ",").match(/^,?(.+),?$/)[1];
+      }
+    } catch(e) {}
+  }
+  return version.split(",");
+}
+
+// Flash embedding method. Only used in non-iframe mode
+_V_.flash.embed = function(swf, placeHolder, flashVars, params, attributes){
+  var code = _V_.flash.getEmbedCode(swf, flashVars, params, attributes),
+
+      // Get element by embedding code and retrieving created element
+      obj = _V_.createElement("div", { innerHTML: code }).childNodes[0],
+
+      par = placeHolder.parentNode
+  ;
+
+  placeHolder.parentNode.replaceChild(obj, placeHolder);
+
+  // IE6 seems to have an issue where it won't initialize the swf object after injecting it.
+  // This is a dumb temporary fix
+  if (_V_.isIE()) {
+    var newObj = par.childNodes[0];
+    setTimeout(function(){
+      newObj.style.display = "block";
+    }, 1000);
+  }
+
+  return obj;
+
+};
+
+_V_.flash.getEmbedCode = function(swf, flashVars, params, attributes){
+
+  var objTag = '<object type="application/x-shockwave-flash"',
+      flashVarsString = '',
+      paramsString = ''
+      attrsString = '';
+
+  // Convert flash vars to string
+  if (flashVars) {
+    _V_.eachProp(flashVars, function(key, val){
+      flashVarsString += (key + "=" + val + "&amp;");
+    });
+  }
+
+  // Add swf, flashVars, and other default params
+  params = _V_.merge({
+    movie: swf,
+    flashvars: flashVarsString,
+    allowScriptAccess: "always", // Required to talk to swf
+    allowNetworking: "all" // All should be default, but having security issues.
+  }, params);
+
+  // Create param tags string
+  _V_.eachProp(params, function(key, val){
+    paramsString += '<param name="'+key+'" value="'+val+'" />';
+  });
+
+  attributes = _V_.merge({
+    // Add swf to attributes (need both for IE and Others to work)
+    data: swf,
+
+    // Default to 100% width/height
+    width: "100%",
+    height: "100%"
+
+  }, attributes);
+
+  // Create Attributes string
+  _V_.eachProp(attributes, function(key, val){
+    attrsString += (key + '="' + val + '" ');
+  });
+
+  return objTag + attrsString + '>' + paramsString + '</object>';
+}
+// TEXT TRACKS
+// Text tracks are tracks of timed text events.
+//    Captions - text displayed over the video for the hearing impared
+//    Subtitles - text displayed over the video for those who don't understand langauge in the video
+//    Chapters - text displayed in a menu allowing the user to jump to particular points (chapters) in the video
+//    Descriptions (not supported yet) - audio descriptions that are read back to the user by a screen reading device
+
+// Player Track Functions - Functions add to the player object for easier access to tracks
+_V_.merge(_V_.Player.prototype, {
+
+  // Add an array of text tracks. captions, subtitles, chapters, descriptions
+  // Track objects will be stored in the player.textTracks array
+  addTextTracks: function(trackObjects){
+    var tracks = this.textTracks = (this.textTracks) ? this.textTracks : [],
+        i = 0, j = trackObjects.length, track, Kind;
+
+    for (;i<j;i++) {
+      // HTML5 Spec says default to subtitles.
+      // Uppercase (uc) first letter to match class names
+      Kind = _V_.uc(trackObjects[i].kind || "subtitles");
+
+      // Create correct texttrack class. CaptionsTrack, etc.
+      track = new _V_[Kind + "Track"](this, trackObjects[i]);
+
+      tracks.push(track);
+
+      // If track.default is set, start showing immediately
+      // TODO: Add a process to deterime the best track to show for the specific kind
+      // Incase there are mulitple defaulted tracks of the same kind
+      // Or the user has a set preference of a specific language that should override the default
+      if (track['default']) {
+        this.ready(_V_.proxy(track, track.show));
+      }
+    }
+
+    // Return the track so it can be appended to the display component
+    return this;
+  },
+
+  // Show a text track
+  // disableSameKind: disable all other tracks of the same kind. Value should be a track kind (captions, etc.)
+  showTextTrack: function(id, disableSameKind){
+    var tracks = this.textTracks,
+        i = 0,
+        j = tracks.length,
+        track, showTrack, kind;
+
+    // Find Track with same ID
+    for (;i<j;i++) {
+      track = tracks[i];
+      if (track.id === id) {
+        track.show();
+        showTrack = track;
+
+      // Disable tracks of the same kind
+      } else if (disableSameKind && track.kind == disableSameKind && track.mode > 0) {
+        track.disable();
+      }
+    }
+
+    // Get track kind from shown track or disableSameKind
+    kind = (showTrack) ? showTrack.kind : ((disableSameKind) ? disableSameKind : false);
+
+    // Trigger trackchange event, captionstrackchange, subtitlestrackchange, etc.
+    if (kind) {
+      this.triggerEvent(kind+"trackchange");
+    }
+
+    return this;
+  }
+
+});
+
+// Track Class
+// Contains track methods for loading, showing, parsing cues of tracks
+_V_.Track = _V_.Component.extend({
+
+  init: function(player, options){
+    this._super(player, options);
+
+    // Apply track info to track object
+    // Options will often be a track element
+    _V_.merge(this, {
+      // Build ID if one doesn't exist
+      id: options.id || ("vjs_" + options.kind + "_" + options.language + "_" + _V_.guid++),
+
+      src: options.src,
+
+      // If default is used, subtitles/captions to start showing
+      "default": options["default"], // 'default' is reserved-ish
+      title: options.title,
+
+      // Language - two letter string to represent track language, e.g. "en" for English
+      // readonly attribute DOMString language;
+      language: options.srclang,
+
+      // Track label e.g. "English"
+      // readonly attribute DOMString label;
+      label: options.label,
+
+      // All cues of the track. Cues have a startTime, endTime, text, and other properties.
+      // readonly attribute TextTrackCueList cues;
+      cues: [],
+
+      // ActiveCues is all cues that are currently showing
+      // readonly attribute TextTrackCueList activeCues;
+      activeCues: [],
+
+      // ReadyState describes if the text file has been loaded
+      // const unsigned short NONE = 0;
+      // const unsigned short LOADING = 1;
+      // const unsigned short LOADED = 2;
+      // const unsigned short ERROR = 3;
+      // readonly attribute unsigned short readyState;
+      readyState: 0,
+
+      // Mode describes if the track is showing, hidden, or disabled
+      // const unsigned short OFF = 0;
+      // const unsigned short HIDDEN = 1; (still triggering cuechange events, but not visible)
+      // const unsigned short SHOWING = 2;
+      // attribute unsigned short mode;
+      mode: 0
+    });
+  },
+
+  // Create basic div to hold cue text
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-" + this.kind + " vjs-text-track"
+    });
+  },
+
+  // Show: Mode Showing (2)
+  // Indicates that the text track is active. If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
+  // The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
+  // In addition, for text tracks whose kind is subtitles or captions, the cues are being displayed over the video as appropriate;
+  // for text tracks whose kind is descriptions, the user agent is making the cues available to the user in a non-visual fashion;
+  // and for text tracks whose kind is chapters, the user agent is making available to the user a mechanism by which the user can navigate to any point in the media resource by selecting a cue.
+  // The showing by default state is used in conjunction with the default attribute on track elements to indicate that the text track was enabled due to that attribute.
+  // This allows the user agent to override the state if a later track is discovered that is more appropriate per the user's preferences.
+  show: function(){
+    this.activate();
+
+    this.mode = 2;
+
+    // Show element.
+    this._super();
+  },
+
+  // Hide: Mode Hidden (1)
+  // Indicates that the text track is active, but that the user agent is not actively displaying the cues.
+  // If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
+  // The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
+  hide: function(){
+    // When hidden, cues are still triggered. Disable to stop triggering.
+    this.activate();
+
+    this.mode = 1;
+
+    // Hide element.
+    this._super();
+  },
+
+  // Disable: Mode Off/Disable (0)
+  // Indicates that the text track is not active. Other than for the purposes of exposing the track in the DOM, the user agent is ignoring the text track.
+  // No cues are active, no events are fired, and the user agent will not attempt to obtain the track's cues.
+  disable: function(){
+    // If showing, hide.
+    if (this.mode == 2) { this.hide(); }
+
+    // Stop triggering cues
+    this.deactivate();
+
+    // Switch Mode to Off
+    this.mode = 0;
+  },
+
+  // Turn on cue tracking. Tracks that are showing OR hidden are active.
+  activate: function(){
+    // Load text file if it hasn't been yet.
+    if (this.readyState == 0) { this.load(); }
+
+    // Only activate if not already active.
+    if (this.mode == 0) {
+      // Update current cue on timeupdate
+      // Using unique ID for proxy function so other tracks don't remove listener
+      this.player.addEvent("timeupdate", this.proxy(this.update, this.id));
+
+      // Reset cue time on media end
+      this.player.addEvent("ended", this.proxy(this.reset, this.id));
+
+      // Add to display
+      if (this.kind == "captions" || this.kind == "subtitles") {
+        this.player.textTrackDisplay.addComponent(this);
+      }
+    }
+  },
+
+  // Turn off cue tracking.
+  deactivate: function(){
+    // Using unique ID for proxy function so other tracks don't remove listener
+    this.player.removeEvent("timeupdate", this.proxy(this.update, this.id));
+    this.player.removeEvent("ended", this.proxy(this.reset, this.id));
+    this.reset(); // Reset
+
+    // Remove from display
+    this.player.textTrackDisplay.removeComponent(this);
+  },
+
+  // A readiness state
+  // One of the following:
+  //
+  // Not loaded
+  // Indicates that the text track is known to exist (e.g. it has been declared with a track element), but its cues have not been obtained.
+  //
+  // Loading
+  // Indicates that the text track is loading and there have been no fatal errors encountered so far. Further cues might still be added to the track.
+  //
+  // Loaded
+  // Indicates that the text track has been loaded with no fatal errors. No new cues will be added to the track except if the text track corresponds to a MutableTextTrack object.
+  //
+  // Failed to load
+  // Indicates that the text track was enabled, but when the user agent attempted to obtain it, this failed in some way (e.g. URL could not be resolved, network error, unknown text track format). Some or all of the cues are likely missing and will not be obtained.
+  load: function(){
+
+    // Only load if not loaded yet.
+    if (this.readyState == 0) {
+      this.readyState = 1;
+      _V_.get(this.src, this.proxy(this.parseCues), this.proxy(this.onError));
+    }
+
+  },
+
+  onError: function(err){
+    this.error = err;
+    this.readyState = 3;
+    this.triggerEvent("error");
+  },
+
+  // Parse the WebVTT text format for cue times.
+  // TODO: Separate parser into own class so alternative timed text formats can be used. (TTML, DFXP)
+  parseCues: function(srcContent) {
+    var cue, time, text,
+        lines = srcContent.split("\n"),
+        line = "", id;
+
+    for (var i=1, j=lines.length; i<j; i++) {
+      // Line 0 should be 'WEBVTT', so skipping i=0
+
+      line = _V_.trim(lines[i]); // Trim whitespace and linebreaks
+
+      if (line) { // Loop until a line with content
+
+        // First line could be an optional cue ID
+        // Check if line has the time separator
+        if (line.indexOf("-->") == -1) {
+          id = line;
+          // Advance to next line for timing.
+          line = _V_.trim(lines[++i]);
+        } else {
+          id = this.cues.length;
+        }
+
+        // First line - Number
+        cue = {
+          id: id, // Cue Number
+          index: this.cues.length // Position in Array
+        };
+
+        // Timing line
+        time = line.split(" --> ");
+        cue.startTime = this.parseCueTime(time[0]);
+        cue.endTime = this.parseCueTime(time[1]);
+
+        // Additional lines - Cue Text
+        text = [];
+
+        // Loop until a blank line or end of lines
+        // Assumeing trim("") returns false for blank lines
+        while (lines[++i] && (line = _V_.trim(lines[i]))) {
+          text.push(line);
+        }
+
+        cue.text = text.join('<br/>');
+
+        // Add this cue
+        this.cues.push(cue);
+      }
+    }
+
+    this.readyState = 2;
+    this.triggerEvent("loaded");
+  },
+
+  parseCueTime: function(timeText) {
+    var parts = timeText.split(':'),
+        time = 0,
+        hours, minutes, other, seconds, ms, flags;
+
+    // Check if optional hours place is included
+    // 00:00:00.000 vs. 00:00.000
+    if (parts.length == 3) {
+      hours = parts[0];
+      minutes = parts[1];
+      other = parts[2];
+    } else {
+      hours = 0;
+      minutes = parts[0];
+      other = parts[1];
+    }
+
+    // Break other (seconds, milliseconds, and flags) by spaces
+    // TODO: Make additional cue layout settings work with flags
+    other = other.split(/\s+/)
+    // Remove seconds. Seconds is the first part before any spaces.
+    seconds = other.splice(0,1)[0];
+    // Could use either . or , for decimal
+    seconds = seconds.split(/\.|,/);
+    // Get milliseconds
+    ms = parseFloat(seconds[1]);
+    seconds = seconds[0];
+
+    // hours => seconds
+    time += parseFloat(hours) * 3600;
+    // minutes => seconds
+    time += parseFloat(minutes) * 60;
+    // Add seconds
+    time += parseFloat(seconds);
+    // Add milliseconds
+    if (ms) { time += ms/1000; }
+
+    return time;
+  },
+
+  // Update active cues whenever timeupdate events are triggered on the player.
+  update: function(){
+    if (this.cues.length > 0) {
+
+      // Get curent player time
+      var time = this.player.currentTime();
+
+      // Check if the new time is outside the time box created by the the last update.
+      if (this.prevChange === undefined || time < this.prevChange || this.nextChange <= time) {
+        var cues = this.cues,
+
+            // Create a new time box for this state.
+            newNextChange = this.player.duration(), // Start at beginning of the timeline
+            newPrevChange = 0, // Start at end
+
+            reverse = false, // Set the direction of the loop through the cues. Optimized the cue check.
+            newCues = [], // Store new active cues.
+
+            // Store where in the loop the current active cues are, to provide a smart starting point for the next loop.
+            firstActiveIndex, lastActiveIndex,
+
+            html = "", // Create cue text HTML to add to the display
+            cue, i, j; // Loop vars
+
+        // Check if time is going forwards or backwards (scrubbing/rewinding)
+        // If we know the direction we can optimize the starting position and direction of the loop through the cues array.
+        if (time >= this.nextChange || this.nextChange === undefined) { // NextChange should happen
+          // Forwards, so start at the index of the first active cue and loop forward
+          i = (this.firstActiveIndex !== undefined) ? this.firstActiveIndex : 0;
+        } else {
+          // Backwards, so start at the index of the last active cue and loop backward
+          reverse = true;
+          i = (this.lastActiveIndex !== undefined) ? this.lastActiveIndex : cues.length - 1;
+        }
+
+        while (true) { // Loop until broken
+          cue = cues[i];
+
+          // Cue ended at this point
+          if (cue.endTime <= time) {
+            newPrevChange = Math.max(newPrevChange, cue.endTime);
+
+            if (cue.active) {
+              cue.active = false;
+            }
+
+            // No earlier cues should have an active start time.
+            // Nevermind. Assume first cue could have a duration the same as the video.
+            // In that case we need to loop all the way back to the beginning.
+            // if (reverse && cue.startTime) { break; }
+
+          // Cue hasn't started
+          } else if (time < cue.startTime) {
+            newNextChange = Math.min(newNextChange, cue.startTime);
+
+            if (cue.active) {
+              cue.active = false;
+            }
+
+            // No later cues should have an active start time.
+            if (!reverse) { break; }
+
+          // Cue is current
+          } else {
+
+            if (reverse) {
+              // Add cue to front of array to keep in time order
+              newCues.splice(0,0,cue);
+
+              // If in reverse, the first current cue is our lastActiveCue
+              if (lastActiveIndex === undefined) { lastActiveIndex = i; }
+              firstActiveIndex = i;
+            } else {
+              // Add cue to end of array
+              newCues.push(cue);
+
+              // If forward, the first current cue is our firstActiveIndex
+              if (firstActiveIndex === undefined) { firstActiveIndex = i; }
+              lastActiveIndex = i;
+            }
+
+            newNextChange = Math.min(newNextChange, cue.endTime);
+            newPrevChange = Math.max(newPrevChange, cue.startTime);
+
+            cue.active = true;
+          }
+
+          if (reverse) {
+            // Reverse down the array of cues, break if at first
+            if (i === 0) { break; } else { i--; }
+          } else {
+            // Walk up the array fo cues, break if at last
+            if (i === cues.length - 1) { break; } else { i++; }
+          }
+
+        }
+
+        this.activeCues = newCues;
+        this.nextChange = newNextChange;
+        this.prevChange = newPrevChange;
+        this.firstActiveIndex = firstActiveIndex;
+        this.lastActiveIndex = lastActiveIndex;
+
+        this.updateDisplay();
+
+        this.triggerEvent("cuechange");
+      }
+    }
+  },
+
+  // Add cue HTML to display
+  updateDisplay: function(){
+    var cues = this.activeCues,
+        html = "",
+        i=0,j=cues.length;
+
+    for (;i<j;i++) {
+      html += "<span class='vjs-tt-cue'>"+cues[i].text+"</span>";
+    }
+
+    this.el.innerHTML = html;
+  },
+
+  // Set all loop helper values back
+  reset: function(){
+    this.nextChange = 0;
+    this.prevChange = this.player.duration();
+    this.firstActiveIndex = 0;
+    this.lastActiveIndex = 0;
+  }
+
+});
+
+// Create specific track types
+_V_.CaptionsTrack = _V_.Track.extend({
+  kind: "captions"
+});
+
+_V_.SubtitlesTrack = _V_.Track.extend({
+  kind: "subtitles"
+});
+
+_V_.ChaptersTrack = _V_.Track.extend({
+  kind: "chapters"
+});
+
+
+/* Text Track Display
+================================================================================ */
+// Global container for both subtitle and captions text. Simple div container.
+_V_.TextTrackDisplay = _V_.Component.extend({
+
+  createElement: function(){
+    return this._super("div", {
+      className: "vjs-text-track-display"
+    });
+  }
+
+});
+
+/* Text Track Menu Items
+================================================================================ */
+_V_.TextTrackMenuItem = _V_.MenuItem.extend({
+
+  init: function(player, options){
+    var track = this.track = options.track;
+
+    // Modify options for parent MenuItem class's init.
+    options.label = track.label;
+    options.selected = track["default"];
+    this._super(player, options);
+
+    this.player.addEvent(track.kind + "trackchange", _V_.proxy(this, this.update));
+  },
+
+  onClick: function(){
+    this._super();
+    this.player.showTextTrack(this.track.id, this.track.kind);
+  },
+
+  update: function(){
+    if (this.track.mode == 2) {
+      this.selected(true);
+    } else {
+      this.selected(false);
+    }
+  }
+
+});
+
+_V_.OffTextTrackMenuItem = _V_.TextTrackMenuItem.extend({
+
+  init: function(player, options){
+    // Create pseudo track info
+    // Requires options.kind
+    options.track = { kind: options.kind, player: player, label: "Off" }
+    this._super(player, options);
+  },
+
+  onClick: function(){
+    this._super();
+    this.player.showTextTrack(this.track.id, this.track.kind);
+  },
+
+  update: function(){
+    var tracks = this.player.textTracks,
+        i=0, j=tracks.length, track,
+        off = true;
+
+    for (;i<j;i++) {
+      track = tracks[i];
+      if (track.kind == this.track.kind && track.mode == 2) {
+        off = false;
+      }
+    }
+
+    if (off) {
+      this.selected(true);
+    } else {
+      this.selected(false);
+    }
+  }
+
+});
+
+/* Captions Button
+================================================================================ */
+_V_.TextTrackButton = _V_.Button.extend({
+
+  init: function(player, options){
+    this._super(player, options);
+
+    this.menu = this.createMenu();
+
+    if (this.items.length === 0) {
+      this.hide();
+    }
+  },
+
+  createMenu: function(){
+    var menu = new _V_.Menu(this.player);
+
+    // Add a title list item to the top
+    menu.el.appendChild(_V_.createElement("li", {
+      className: "vjs-menu-title",
+      innerHTML: _V_.uc(this.kind)
+    }));
+
+    // Add an OFF menu item to turn all tracks off
+    menu.addItem(new _V_.OffTextTrackMenuItem(this.player, { kind: this.kind }))
+
+    this.items = this.createItems();
+
+    // Add menu items to the menu
+    this.each(this.items, function(item){
+      menu.addItem(item);
+    });
+
+    // Add list to element
+    this.addComponent(menu);
+
+    return menu;
+  },
+
+  // Create a menu item for each text track
+  createItems: function(){
+    var items = [];
+    this.each(this.player.textTracks, function(track){
+      if (track.kind === this.kind) {
+        items.push(new _V_.TextTrackMenuItem(this.player, {
+          track: track
+        }));
+      }
+    });
+    return items;
+  },
+
+  buildCSSClass: function(){
+    return this.className + " vjs-menu-button " + this._super();
+  },
+
+  // Focus - Add keyboard functionality to element
+  onFocus: function(){
+    // Show the menu, and keep showing when the menu items are in focus
+    this.menu.lockShowing();
+    // this.menu.el.style.display = "block";
+
+    // When tabbing through, the menu should hide when focus goes from the last menu item to the next tabbed element.
+    _V_.one(this.menu.el.childNodes[this.menu.el.childNodes.length - 1], "blur", this.proxy(function(){
+      this.menu.unlockShowing();
+    }));
+  },
+  // Can't turn off list display that we turned on with focus, because list would go away.
+  onBlur: function(){},
+
+  onClick: function(){
+    // When you click the button it adds focus, which will show the menu indefinitely.
+    // So we'll remove focus when the mouse leaves the button.
+    // Focus is needed for tab navigation.
+    this.one("mouseout", this.proxy(function(){
+      this.menu.unlockShowing();
+      this.el.blur();
+    }));
+  }
+
+});
+
+_V_.CaptionsButton = _V_.TextTrackButton.extend({
+  kind: "captions",
+  buttonText: "Captions",
+  className: "vjs-captions-button"
+});
+
+_V_.SubtitlesButton = _V_.TextTrackButton.extend({
+  kind: "subtitles",
+  buttonText: "Subtitles",
+  className: "vjs-subtitles-button"
+});
+
+// Chapters act much differently than other text tracks
+// Cues are navigation vs. other tracks of alternative languages
+_V_.ChaptersButton = _V_.TextTrackButton.extend({
+  kind: "chapters",
+  buttonText: "Chapters",
+  className: "vjs-chapters-button",
+
+  // Create a menu item for each text track
+  createItems: function(chaptersTrack){
+    var items = [];
+
+    this.each(this.player.textTracks, function(track){
+      if (track.kind === this.kind) {
+        items.push(new _V_.TextTrackMenuItem(this.player, {
+          track: track
+        }));
+      }
+    });
+
+    return items;
+  },
+
+  createMenu: function(){
+    var tracks = this.player.textTracks,
+        i = 0,
+        j = tracks.length,
+        track, chaptersTrack,
+        items = this.items = [];
+
+    for (;i<j;i++) {
+      track = tracks[i];
+      if (track.kind == this.kind && track["default"]) {
+        if (track.readyState < 2) {
+          this.chaptersTrack = track;
+          track.addEvent("loaded", this.proxy(this.createMenu));
+          return;
+        } else {
+          chaptersTrack = track;
+          break;
+        }
+      }
+    }
+
+    var menu = this.menu = new _V_.Menu(this.player);
+
+    menu.el.appendChild(_V_.createElement("li", {
+      className: "vjs-menu-title",
+      innerHTML: _V_.uc(this.kind)
+    }));
+
+    if (chaptersTrack) {
+      var cues = chaptersTrack.cues,
+          i = 0, j = cues.length, cue, mi;
+
+      for (;i<j;i++) {
+        cue = cues[i];
+
+        mi = new _V_.ChaptersTrackMenuItem(this.player, {
+          track: chaptersTrack,
+          cue: cue
+        });
+
+        items.push(mi);
+
+        menu.addComponent(mi);
+      }
+    }
+
+    // Add list to element
+    this.addComponent(menu);
+
+    if (this.items.length > 0) {
+      this.show();
+    }
+
+    return menu;
+  }
+
+});
+
+_V_.ChaptersTrackMenuItem = _V_.MenuItem.extend({
+
+  init: function(player, options){
+    var track = this.track = options.track,
+        cue = this.cue = options.cue,
+        currentTime = player.currentTime();
+
+    // Modify options for parent MenuItem class's init.
+    options.label = cue.text;
+    options.selected = (cue.startTime <= currentTime && currentTime < cue.endTime);
+    this._super(player, options);
+
+    track.addEvent("cuechange", _V_.proxy(this, this.update));
+  },
+
+  onClick: function(){
+    this._super();
+    this.player.currentTime(this.cue.startTime);
+    this.update(this.cue.startTime);
+  },
+
+  update: function(time){
+    var cue = this.cue,
+        currentTime = this.player.currentTime();
+
+    // _V_.log(currentTime, cue.startTime);
+    if (cue.startTime <= currentTime && currentTime < cue.endTime) {
+      this.selected(true);
+    } else {
+      this.selected(false);
+    }
+  }
+
+});
+
+// Add Buttons to controlBar
+_V_.merge(_V_.ControlBar.prototype.options.components, {
+  "subtitlesButton": {},
+  "captionsButton": {},
+  "chaptersButton": {}
+});
+
+// _V_.Cue = _V_.Component.extend({
+//   init: function(player, options){
+//     this._super(player, options);
+//   }
+// });// Automatically set up any tags that have a data-setup attribute
+_V_.autoSetup = function(){
+  var options, vid, player,
+      vids = document.getElementsByTagName("video");
+
+  // Check if any media elements exist
+  if (vids && vids.length > 0) {
+
+    for (var i=0,j=vids.length; i<j; i++) {
+      vid = vids[i];
+
+      // Check if element exists, has getAttribute func.
+      // IE seems to consider typeof el.getAttribute == "object" instead of "function" like expected, at least when loading the player immediately.
+      if (vid && vid.getAttribute) {
+
+        // Make sure this player hasn't already been set up.
+        if (vid.player === undefined) {
+          options = vid.getAttribute("data-setup");
+
+          // Check if data-setup attr exists. 
+          // We only auto-setup if they've added the data-setup attr.
+          if (options !== null) {
+
+            // Parse options JSON
+            // If empty string, make it a parsable json object.
+            options = JSON.parse(options || "{}");
+
+            // Create new video.js instance.
+            player = _V_(vid, options);
+          }
+        }
+
+      // If getAttribute isn't defined, we need to wait for the DOM.
+      } else {
+        _V_.autoSetupTimeout(1);
+        break;
+      }
+    }
+
+  // No videos were found, so keep looping unless page is finisehd loading.
+  } else if (!_V_.windowLoaded) {
+    _V_.autoSetupTimeout(1);
+  }
+};
+
+// Pause to let the DOM keep processing
+_V_.autoSetupTimeout = function(wait){
+  setTimeout(_V_.autoSetup, wait);
+};
+
+_V_.addEvent(window, "load", function(){
+  _V_.windowLoaded = true;
+});
+
+// Run Auto-load players
+_V_.autoSetup();
+// Expose to global
+window.VideoJS = window._V_ = VideoJS;
+
+// End self-executing function
+})(window);
diff --git a/library/video-js/video.min.js b/library/video-js/video.min.js
new file mode 100644
index 0000000000..74f349980d
--- /dev/null
+++ b/library/video-js/video.min.js
@@ -0,0 +1,21 @@
+/*!
+Video.js - HTML5 Video Player
+Version 3.2.0
+
+LGPL v3 LICENSE INFO
+This file is part of Video.js. Copyright 2011 Zencoder, Inc.
+
+Video.js is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Video.js is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with Video.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+(function(window,undefined){var document=window.document;document.createElement("video");document.createElement("audio");var VideoJS=function(id,addOptions,ready){var tag;if(typeof id=="string"){if(id.indexOf("#")===0){id=id.slice(1)}if(_V_.players[id]){return _V_.players[id]}else{tag=_V_.el(id)}}else{tag=id}if(!tag||!tag.nodeName){throw new TypeError("The element or ID supplied is not valid. (VideoJS)")}return tag.player||new _V_.Player(tag,addOptions,ready)},_V_=VideoJS,CDN_VERSION="3.2";VideoJS.players={};VideoJS.options={techOrder:["html5","flash"],html5:{},flash:{swf:"http://vjs.zencdn.net/c/video-js.swf"},width:"auto",height:"auto",defaultVolume:0,components:{posterImage:{},textTrackDisplay:{},loadingSpinner:{},bigPlayButton:{},controlBar:{}}};if(CDN_VERSION!="GENERATED_CDN_VSN"){_V_.options.flash.swf="http://vjs.zencdn.net/"+CDN_VERSION+"/video-js.swf"}_V_.merge=function(obj1,obj2,safe){if(!obj2){obj2={}}for(var attrname in obj2){if(obj2.hasOwnProperty(attrname)&&(!safe||!obj1.hasOwnProperty(attrname))){obj1[attrname]=obj2[attrname]}}return obj1};_V_.extend=function(obj){this.merge(this,obj,true)};_V_.extend({tech:{},controlSets:{},isIE:function(){return !+"\v1"},isFF:function(){return !!_V_.ua.match("Firefox")},isIPad:function(){return navigator.userAgent.match(/iPad/i)!==null},isIPhone:function(){return navigator.userAgent.match(/iPhone/i)!==null},isIOS:function(){return VideoJS.isIPhone()||VideoJS.isIPad()},iOSVersion:function(){var match=navigator.userAgent.match(/OS (\d+)_/i);if(match&&match[1]){return match[1]}},isAndroid:function(){return navigator.userAgent.match(/Android.*AppleWebKit/i)!==null},androidVersion:function(){var match=navigator.userAgent.match(/Android (\d+)\./i);if(match&&match[1]){return match[1]}},testVid:document.createElement("video"),ua:navigator.userAgent,support:{},each:function(arr,fn){if(!arr||arr.length===0){return}for(var i=0,j=arr.length;i<j;i++){fn.call(this,arr[i],i)}},eachProp:function(obj,fn){if(!obj){return}for(var name in obj){if(obj.hasOwnProperty(name)){fn.call(this,name,obj[name])}}},el:function(id){return document.getElementById(id)},createElement:function(tagName,attributes){var el=document.createElement(tagName),attrname;for(attrname in attributes){if(attributes.hasOwnProperty(attrname)){if(attrname.indexOf("-")!==-1){el.setAttribute(attrname,attributes[attrname])}else{el[attrname]=attributes[attrname]}}}return el},insertFirst:function(node,parent){if(parent.firstChild){parent.insertBefore(node,parent.firstChild)}else{parent.appendChild(node)}},addClass:function(element,classToAdd){if((" "+element.className+" ").indexOf(" "+classToAdd+" ")==-1){element.className=element.className===""?classToAdd:element.className+" "+classToAdd}},removeClass:function(element,classToRemove){if(element.className.indexOf(classToRemove)==-1){return}var classNames=element.className.split(" ");classNames.splice(classNames.indexOf(classToRemove),1);element.className=classNames.join(" ")},remove:function(item,array){if(!array){return}var i=array.indexOf(item);if(i!=-1){return array.splice(i,1)}},blockTextSelection:function(){document.body.focus();document.onselectstart=function(){return false}},unblockTextSelection:function(){document.onselectstart=function(){return true}},formatTime:function(seconds,guide){guide=guide||seconds;var s=Math.floor(seconds%60),m=Math.floor(seconds/60%60),h=Math.floor(seconds/3600),gm=Math.floor(guide/60%60),gh=Math.floor(guide/3600);h=(h>0||gh>0)?h+":":"";m=(((h||gm>=10)&&m<10)?"0"+m:m)+":";s=(s<10)?"0"+s:s;return h+m+s},uc:function(string){return string.charAt(0).toUpperCase()+string.slice(1)},getRelativePosition:function(x,relativeElement){return Math.max(0,Math.min(1,(x-_V_.findPosX(relativeElement))/relativeElement.offsetWidth))},getComputedStyleValue:function(element,style){return window.getComputedStyle(element,null).getPropertyValue(style)},trim:function(string){return string.toString().replace(/^\s+/,"").replace(/\s+$/,"")},round:function(num,dec){if(!dec){dec=0}return Math.round(num*Math.pow(10,dec))/Math.pow(10,dec)},isEmpty:function(object){for(var prop in object){return false}return true},createTimeRange:function(start,end){return{length:1,start:function(){return start},end:function(){return end}}},cache:{},guid:1,expando:"vdata"+(new Date).getTime(),getData:function(elem){var id=elem[_V_.expando];if(!id){id=elem[_V_.expando]=_V_.guid++;_V_.cache[id]={}}return _V_.cache[id]},removeData:function(elem){var id=elem[_V_.expando];if(!id){return}delete _V_.cache[id];try{delete elem[_V_.expando]}catch(e){if(elem.removeAttribute){elem.removeAttribute(_V_.expando)}else{elem[_V_.expando]=null}}},proxy:function(context,fn,uid){if(!fn.guid){fn.guid=_V_.guid++}var ret=function(){return fn.apply(context,arguments)};ret.guid=(uid)?uid+"_"+fn.guid:fn.guid;return ret},get:function(url,onSuccess,onError){var local=(url.indexOf("file:")==0||(window.location.href.indexOf("file:")==0&&url.indexOf("http:")==-1));if(typeof XMLHttpRequest=="undefined"){XMLHttpRequest=function(){try{return new ActiveXObject("Msxml2.XMLHTTP.6.0")}catch(e){}try{return new ActiveXObject("Msxml2.XMLHTTP.3.0")}catch(f){}try{return new ActiveXObject("Msxml2.XMLHTTP")}catch(g){}throw new Error("This browser does not support XMLHttpRequest.")}}var request=new XMLHttpRequest();try{request.open("GET",url)}catch(e){_V_.log("VideoJS XMLHttpRequest (open)",e);return false}request.onreadystatechange=_V_.proxy(this,function(){if(request.readyState==4){if(request.status==200||local&&request.status==0){onSuccess(request.responseText)}else{if(onError){onError()}}}});try{request.send()}catch(e){_V_.log("VideoJS XMLHttpRequest (send)",e);if(onError){onError(e)}}},setLocalStorage:function(key,value){var localStorage=window.localStorage||false;if(!localStorage){return}try{localStorage[key]=value}catch(e){if(e.code==22||e.code==1014){_V_.log("LocalStorage Full (VideoJS)",e)}else{_V_.log("LocalStorage Error (VideoJS)",e)}}},getAbsoluteURL:function(url){if(!url.match(/^https?:\/\//)){url=_V_.createElement("div",{innerHTML:'<a href="'+url+'">x</a>'}).firstChild.href}return url}});_V_.log=function(){_V_.log.history=_V_.log.history||[];_V_.log.history.push(arguments);if(window.console){arguments.callee=arguments.callee.caller;var newarr=[].slice.call(arguments);(typeof console.log==="object"?_V_.log.apply.call(console.log,console,newarr):console.log.apply(console,newarr))}};(function(b){function c(){}for(var d="assert,count,debug,dir,dirxml,error,exception,group,groupCollapsed,groupEnd,info,log,timeStamp,profile,profileEnd,time,timeEnd,trace,warn".split(","),a;a=d.pop();){b[a]=b[a]||c}})((function(){try{console.log();return window.console}catch(err){return window.console={}}})());if("getBoundingClientRect" in document.documentElement){_V_.findPosX=function(el){var box;try{box=el.getBoundingClientRect()}catch(e){}if(!box){return 0}var docEl=document.documentElement,body=document.body,clientLeft=docEl.clientLeft||body.clientLeft||0,scrollLeft=window.pageXOffset||body.scrollLeft,left=box.left+scrollLeft-clientLeft;return left}}else{_V_.findPosX=function(el){var curleft=el.offsetLeft;while(el=obj.offsetParent){if(el.className.indexOf("video-js")==-1){}else{}curleft+=el.offsetLeft}return curleft}}(function(){var initializing=false,fnTest=/xyz/.test(function(){xyz})?/\b_super\b/:/.*/;_V_.Class=function(){};_V_.Class.extend=function(prop){var _super=this.prototype;initializing=true;var prototype=new this();initializing=false;for(var name in prop){prototype[name]=typeof prop[name]=="function"&&typeof _super[name]=="function"&&fnTest.test(prop[name])?(function(name,fn){return function(){var tmp=this._super;this._super=_super[name];var ret=fn.apply(this,arguments);this._super=tmp;return ret}})(name,prop[name]):prop[name]}function Class(){if(!initializing&&this.init){return this.init.apply(this,arguments)}else{if(!initializing){return arguments.callee.prototype.init()}}}Class.prototype=prototype;Class.constructor=Class;Class.extend=arguments.callee;return Class}})();_V_.Component=_V_.Class.extend({init:function(player,options){this.player=player;options=this.options=_V_.merge(this.options||{},options);if(options.el){this.el=options.el}else{this.el=this.createElement()}this.initComponents()},destroy:function(){},createElement:function(type,attrs){return _V_.createElement(type||"div",attrs)},buildCSSClass:function(){return""},initComponents:function(){var options=this.options;if(options&&options.components){this.eachProp(options.components,function(name,opts){var tempAdd=this.proxy(function(){this[name]=this.addComponent(name,opts)});if(opts.loadEvent){this.one(opts.loadEvent,tempAdd)}else{tempAdd()}})}},addComponent:function(name,options){var component,componentClass;if(typeof name=="string"){options=options||{};componentClass=options.componentClass||_V_.uc(name);component=new _V_[componentClass](this.player||this,options)}else{component=name}this.el.appendChild(component.el);return component},removeComponent:function(component){this.el.removeChild(component.el)},show:function(){this.el.style.display="block"},hide:function(){this.el.style.display="none"},fadeIn:function(){this.removeClass("vjs-fade-out");this.addClass("vjs-fade-in")},fadeOut:function(){this.removeClass("vjs-fade-in");this.addClass("vjs-fade-out")},lockShowing:function(){var style=this.el.style;style.display="block";style.opacity=1;style.visiblity="visible"},unlockShowing:function(){var style=this.el.style;style.display="";style.opacity="";style.visiblity=""},addClass:function(classToAdd){_V_.addClass(this.el,classToAdd)},removeClass:function(classToRemove){_V_.removeClass(this.el,classToRemove)},addEvent:function(type,fn,uid){return _V_.addEvent(this.el,type,_V_.proxy(this,fn))},removeEvent:function(type,fn){return _V_.removeEvent(this.el,type,fn)},triggerEvent:function(type,e){return _V_.triggerEvent(this.el,type,e)},one:function(type,fn){_V_.one(this.el,type,_V_.proxy(this,fn))},ready:function(fn){if(!fn){return this}if(this.isReady){fn.call(this)}else{if(this.readyQueue===undefined){this.readyQueue=[]}this.readyQueue.push(fn)}return this},triggerReady:function(){this.isReady=true;if(this.readyQueue&&this.readyQueue.length>0){this.each(this.readyQueue,function(fn){fn.call(this)});this.readyQueue=[];this.triggerEvent("ready")}},each:function(arr,fn){_V_.each.call(this,arr,fn)},eachProp:function(obj,fn){_V_.eachProp.call(this,obj,fn)},extend:function(obj){_V_.merge(this,obj)},proxy:function(fn,uid){return _V_.proxy(this,fn,uid)}});_V_.Control=_V_.Component.extend({buildCSSClass:function(){return"vjs-control "+this._super()}});_V_.ControlBar=_V_.Component.extend({options:{loadEvent:"play",components:{playToggle:{},fullscreenToggle:{},currentTimeDisplay:{},timeDivider:{},durationDisplay:{},remainingTimeDisplay:{},progressControl:{},volumeControl:{},muteToggle:{}}},init:function(player,options){this._super(player,options);player.addEvent("play",this.proxy(function(){this.fadeIn();this.player.addEvent("mouseover",this.proxy(this.fadeIn));this.player.addEvent("mouseout",this.proxy(this.fadeOut))}))},createElement:function(){return _V_.createElement("div",{className:"vjs-controls"})},fadeIn:function(){this._super();this.player.triggerEvent("controlsvisible")},fadeOut:function(){this._super();this.player.triggerEvent("controlshidden")},lockShowing:function(){this.el.style.opacity="1"}});_V_.Button=_V_.Control.extend({init:function(player,options){this._super(player,options);this.addEvent("click",this.onClick);this.addEvent("focus",this.onFocus);this.addEvent("blur",this.onBlur)},createElement:function(type,attrs){attrs=_V_.merge({className:this.buildCSSClass(),innerHTML:'<div><span class="vjs-control-text">'+(this.buttonText||"Need Text")+"</span></div>",role:"button",tabIndex:0},attrs);return this._super(type,attrs)},onClick:function(){},onFocus:function(){_V_.addEvent(document,"keyup",_V_.proxy(this,this.onKeyPress))},onKeyPress:function(event){if(event.which==32||event.which==13){event.preventDefault();this.onClick()}},onBlur:function(){_V_.removeEvent(document,"keyup",_V_.proxy(this,this.onKeyPress))}});_V_.PlayButton=_V_.Button.extend({buttonText:"Play",buildCSSClass:function(){return"vjs-play-button "+this._super()},onClick:function(){this.player.play()}});_V_.PauseButton=_V_.Button.extend({buttonText:"Pause",buildCSSClass:function(){return"vjs-pause-button "+this._super()},onClick:function(){this.player.pause()}});_V_.PlayToggle=_V_.Button.extend({buttonText:"Play",init:function(player,options){this._super(player,options);player.addEvent("play",_V_.proxy(this,this.onPlay));player.addEvent("pause",_V_.proxy(this,this.onPause))},buildCSSClass:function(){return"vjs-play-control "+this._super()},onClick:function(){if(this.player.paused()){this.player.play()}else{this.player.pause()}},onPlay:function(){_V_.removeClass(this.el,"vjs-paused");_V_.addClass(this.el,"vjs-playing")},onPause:function(){_V_.removeClass(this.el,"vjs-playing");_V_.addClass(this.el,"vjs-paused")}});_V_.FullscreenToggle=_V_.Button.extend({buttonText:"Fullscreen",buildCSSClass:function(){return"vjs-fullscreen-control "+this._super()},onClick:function(){if(!this.player.isFullScreen){this.player.requestFullScreen()}else{this.player.cancelFullScreen()}}});_V_.BigPlayButton=_V_.Button.extend({init:function(player,options){this._super(player,options);player.addEvent("play",_V_.proxy(this,this.hide));player.addEvent("ended",_V_.proxy(this,this.show))},createElement:function(){return this._super("div",{className:"vjs-big-play-button",innerHTML:"<span></span>"})},onClick:function(){if(this.player.currentTime()){this.player.currentTime(0)}this.player.play()}});_V_.LoadingSpinner=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("canplay",_V_.proxy(this,this.hide));player.addEvent("canplaythrough",_V_.proxy(this,this.hide));player.addEvent("playing",_V_.proxy(this,this.hide));player.addEvent("seeking",_V_.proxy(this,this.show));player.addEvent("error",_V_.proxy(this,this.show));player.addEvent("waiting",_V_.proxy(this,this.show))},createElement:function(){var classNameSpinner,innerHtmlSpinner;if(typeof this.player.el.style.WebkitBorderRadius=="string"||typeof this.player.el.style.MozBorderRadius=="string"||typeof this.player.el.style.KhtmlBorderRadius=="string"||typeof this.player.el.style.borderRadius=="string"){classNameSpinner="vjs-loading-spinner";innerHtmlSpinner="<div class='ball1'></div><div class='ball2'></div><div class='ball3'></div><div class='ball4'></div><div class='ball5'></div><div class='ball6'></div><div class='ball7'></div><div class='ball8'></div>"}else{classNameSpinner="vjs-loading-spinner-fallback";innerHtmlSpinner=""}return this._super("div",{className:classNameSpinner,innerHTML:innerHtmlSpinner})}});_V_.CurrentTimeDisplay=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("timeupdate",_V_.proxy(this,this.updateContent))},createElement:function(){var el=this._super("div",{className:"vjs-current-time vjs-time-controls vjs-control"});this.content=_V_.createElement("div",{className:"vjs-current-time-display",innerHTML:"0:00"});el.appendChild(_V_.createElement("div").appendChild(this.content));return el},updateContent:function(){var time=(this.player.scrubbing)?this.player.values.currentTime:this.player.currentTime();this.content.innerHTML=_V_.formatTime(time,this.player.duration())}});_V_.DurationDisplay=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("timeupdate",_V_.proxy(this,this.updateContent))},createElement:function(){var el=this._super("div",{className:"vjs-duration vjs-time-controls vjs-control"});this.content=_V_.createElement("div",{className:"vjs-duration-display",innerHTML:"0:00"});el.appendChild(_V_.createElement("div").appendChild(this.content));return el},updateContent:function(){if(this.player.duration()){this.content.innerHTML=_V_.formatTime(this.player.duration())}}});_V_.TimeDivider=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-time-divider",innerHTML:"<div><span>/</span></div>"})}});_V_.RemainingTimeDisplay=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("timeupdate",_V_.proxy(this,this.updateContent))},createElement:function(){var el=this._super("div",{className:"vjs-remaining-time vjs-time-controls vjs-control"});this.content=_V_.createElement("div",{className:"vjs-remaining-time-display",innerHTML:"-0:00"});el.appendChild(_V_.createElement("div").appendChild(this.content));return el},updateContent:function(){if(this.player.duration()){this.content.innerHTML="-"+_V_.formatTime(this.player.remainingTime())}}});_V_.Slider=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent(this.playerEvent,_V_.proxy(this,this.update));this.addEvent("mousedown",this.onMouseDown);this.addEvent("focus",this.onFocus);this.addEvent("blur",this.onBlur);this.player.addEvent("controlsvisible",this.proxy(this.update));this.update()},createElement:function(type,attrs){attrs=_V_.merge({role:"slider","aria-valuenow":0,"aria-valuemin":0,"aria-valuemax":100,tabIndex:0},attrs);return this._super(type,attrs)},onMouseDown:function(event){event.preventDefault();_V_.blockTextSelection();_V_.addEvent(document,"mousemove",_V_.proxy(this,this.onMouseMove));_V_.addEvent(document,"mouseup",_V_.proxy(this,this.onMouseUp));this.onMouseMove(event)},onMouseUp:function(event){_V_.unblockTextSelection();_V_.removeEvent(document,"mousemove",this.onMouseMove,false);_V_.removeEvent(document,"mouseup",this.onMouseUp,false);this.update()},update:function(){var barProgress,progress=this.getPercent();handle=this.handle,bar=this.bar;if(isNaN(progress)){progress=0}barProgress=progress;if(handle){var box=this.el,boxWidth=box.offsetWidth,handleWidth=handle.el.offsetWidth,handlePercent=(handleWidth)?handleWidth/boxWidth:0,boxAdjustedPercent=1-handlePercent;adjustedProgress=progress*boxAdjustedPercent,barProgress=adjustedProgress+(handlePercent/2);handle.el.style.left=_V_.round(adjustedProgress*100,2)+"%"}bar.el.style.width=_V_.round(barProgress*100,2)+"%"},calculateDistance:function(event){var box=this.el,boxX=_V_.findPosX(box),boxW=box.offsetWidth,handle=this.handle;if(handle){var handleW=handle.el.offsetWidth;boxX=boxX+(handleW/2);boxW=boxW-handleW}return Math.max(0,Math.min(1,(event.pageX-boxX)/boxW))},onFocus:function(event){_V_.addEvent(document,"keyup",_V_.proxy(this,this.onKeyPress))},onKeyPress:function(event){if(event.which==37){event.preventDefault();this.stepBack()}else{if(event.which==39){event.preventDefault();this.stepForward()}}},onBlur:function(event){_V_.removeEvent(document,"keyup",_V_.proxy(this,this.onKeyPress))}});_V_.ProgressControl=_V_.Component.extend({options:{components:{seekBar:{}}},createElement:function(){return this._super("div",{className:"vjs-progress-control vjs-control"})}});_V_.SeekBar=_V_.Slider.extend({options:{components:{loadProgressBar:{},bar:{componentClass:"PlayProgressBar"},handle:{componentClass:"SeekHandle"}}},playerEvent:"timeupdate",init:function(player,options){this._super(player,options)},createElement:function(){return this._super("div",{className:"vjs-progress-holder"})},getPercent:function(){return this.player.currentTime()/this.player.duration()},onMouseDown:function(event){this._super(event);this.player.scrubbing=true;this.videoWasPlaying=!this.player.paused();this.player.pause()},onMouseMove:function(event){var newTime=this.calculateDistance(event)*this.player.duration();if(newTime==this.player.duration()){newTime=newTime-0.1}this.player.currentTime(newTime)},onMouseUp:function(event){this._super(event);this.player.scrubbing=false;if(this.videoWasPlaying){this.player.play()}},stepForward:function(){this.player.currentTime(this.player.currentTime()+1)},stepBack:function(){this.player.currentTime(this.player.currentTime()-1)}});_V_.LoadProgressBar=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("progress",_V_.proxy(this,this.update))},createElement:function(){return this._super("div",{className:"vjs-load-progress",innerHTML:'<span class="vjs-control-text">Loaded: 0%</span>'})},update:function(){if(this.el.style){this.el.style.width=_V_.round(this.player.bufferedPercent()*100,2)+"%"}}});_V_.PlayProgressBar=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-play-progress",innerHTML:'<span class="vjs-control-text">Progress: 0%</span>'})}});_V_.SeekHandle=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-seek-handle",innerHTML:'<span class="vjs-control-text">00:00</span>'})}});_V_.VolumeControl=_V_.Component.extend({options:{components:{volumeBar:{}}},createElement:function(){return this._super("div",{className:"vjs-volume-control vjs-control"})}});_V_.VolumeBar=_V_.Slider.extend({options:{components:{bar:{componentClass:"VolumeLevel"},handle:{componentClass:"VolumeHandle"}}},playerEvent:"volumechange",createElement:function(){return this._super("div",{className:"vjs-volume-bar"})},onMouseMove:function(event){this.player.volume(this.calculateDistance(event))},getPercent:function(){return this.player.volume()},stepForward:function(){this.player.volume(this.player.volume()+0.1)},stepBack:function(){this.player.volume(this.player.volume()-0.1)}});_V_.VolumeLevel=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-volume-level",innerHTML:'<span class="vjs-control-text"></span>'})}});_V_.VolumeHandle=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-volume-handle",innerHTML:'<span class="vjs-control-text"></span>'})}});_V_.MuteToggle=_V_.Button.extend({init:function(player,options){this._super(player,options);player.addEvent("volumechange",_V_.proxy(this,this.update))},createElement:function(){return this._super("div",{className:"vjs-mute-control vjs-control",innerHTML:'<div><span class="vjs-control-text">Mute</span></div>'})},onClick:function(event){this.player.muted(this.player.muted()?false:true)},update:function(event){var vol=this.player.volume(),level=3;if(vol==0||this.player.muted()){level=0}else{if(vol<0.33){level=1}else{if(vol<0.67){level=2}}}_V_.each.call(this,[0,1,2,3],function(i){_V_.removeClass(this.el,"vjs-vol-"+i)});_V_.addClass(this.el,"vjs-vol-"+level)}});_V_.PosterImage=_V_.Button.extend({init:function(player,options){this._super(player,options);if(!this.player.options.poster){this.hide()}player.addEvent("play",_V_.proxy(this,this.hide))},createElement:function(){return _V_.createElement("img",{className:"vjs-poster",src:this.player.options.poster,tabIndex:-1})},onClick:function(){this.player.play()}});_V_.Menu=_V_.Component.extend({init:function(player,options){this._super(player,options)},addItem:function(component){this.addComponent(component);component.addEvent("click",this.proxy(function(){this.unlockShowing()}))},createElement:function(){return this._super("ul",{className:"vjs-menu"})}});_V_.MenuItem=_V_.Button.extend({init:function(player,options){this._super(player,options);if(options.selected){this.addClass("vjs-selected")}},createElement:function(type,attrs){return this._super("li",_V_.merge({className:"vjs-menu-item",innerHTML:this.options.label},attrs))},onClick:function(){this.selected(true)},selected:function(selected){if(selected){this.addClass("vjs-selected")}else{this.removeClass("vjs-selected")}}});if(!Array.prototype.indexOf){Array.prototype.indexOf=function(searchElement){if(this===void 0||this===null){throw new TypeError()}var t=Object(this);var len=t.length>>>0;if(len===0){return -1}var n=0;if(arguments.length>0){n=Number(arguments[1]);if(n!==n){n=0}else{if(n!==0&&n!==(1/0)&&n!==-(1/0)){n=(n>0||-1)*Math.floor(Math.abs(n))}}}if(n>=len){return -1}var k=n>=0?n:Math.max(len-Math.abs(n),0);for(;k<len;k++){if(k in t&&t[k]===searchElement){return k}}return -1}}_V_.extend({addEvent:function(elem,type,fn){var data=_V_.getData(elem),handlers;if(data&&!data.handler){data.handler=function(event){event=_V_.fixEvent(event);var handlers=_V_.getData(elem).events[event.type];if(handlers){var handlersCopy=[];_V_.each(handlers,function(handler,i){handlersCopy[i]=handler});for(var i=0,l=handlersCopy.length;i<l;i++){handlersCopy[i].call(elem,event)}}}}if(!data.events){data.events={}}handlers=data.events[type];if(!handlers){handlers=data.events[type]=[];if(document.addEventListener){elem.addEventListener(type,data.handler,false)}else{if(document.attachEvent){elem.attachEvent("on"+type,data.handler)}}}if(!fn.guid){fn.guid=_V_.guid++}handlers.push(fn)},removeEvent:function(elem,type,fn){var data=_V_.getData(elem),handlers;if(!data.events){return}if(!type){for(type in data.events){_V_.cleanUpEvents(elem,type)}return}handlers=data.events[type];if(!handlers){return}if(fn&&fn.guid){for(var i=0;i<handlers.length;i++){if(handlers[i].guid===fn.guid){handlers.splice(i--,1)}}}_V_.cleanUpEvents(elem,type)},cleanUpEvents:function(elem,type){var data=_V_.getData(elem);if(data.events[type].length===0){delete data.events[type];if(document.removeEventListener){elem.removeEventListener(type,data.handler,false)}else{if(document.detachEvent){elem.detachEvent("on"+type,data.handler)}}}if(_V_.isEmpty(data.events)){delete data.events;delete data.handler}if(_V_.isEmpty(data)){_V_.removeData(elem)}},fixEvent:function(event){if(event[_V_.expando]){return event}var originalEvent=event;event=new _V_.Event(originalEvent);for(var i=_V_.Event.props.length,prop;i;){prop=_V_.Event.props[--i];event[prop]=originalEvent[prop]}if(!event.target){event.target=event.srcElement||document}if(event.target.nodeType===3){event.target=event.target.parentNode}if(!event.relatedTarget&&event.fromElement){event.relatedTarget=event.fromElement===event.target?event.toElement:event.fromElement}if(event.pageX==null&&event.clientX!=null){var eventDocument=event.target.ownerDocument||document,doc=eventDocument.documentElement,body=eventDocument.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc&&doc.clientLeft||body&&body.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc&&doc.clientTop||body&&body.clientTop||0)}if(event.which==null&&(event.charCode!=null||event.keyCode!=null)){event.which=event.charCode!=null?event.charCode:event.keyCode}if(!event.metaKey&&event.ctrlKey){event.metaKey=event.ctrlKey}if(!event.which&&event.button!==undefined){event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)))}return event},triggerEvent:function(elem,event){var data=_V_.getData(elem),parent=elem.parentNode||elem.ownerDocument,type=event.type||event,handler;if(data){handler=data.handler}event=typeof event==="object"?event[_V_.expando]?event:new _V_.Event(type,event):new _V_.Event(type);event.type=type;if(handler){handler.call(elem,event)}event.result=undefined;event.target=elem},one:function(elem,type,fn){_V_.addEvent(elem,type,function(){_V_.removeEvent(elem,type,arguments.callee);fn.apply(this,arguments)})}});_V_.Event=function(src,props){if(src&&src.type){this.originalEvent=src;this.type=src.type;this.isDefaultPrevented=(src.defaultPrevented||src.returnValue===false||src.getPreventDefault&&src.getPreventDefault())?returnTrue:returnFalse}else{this.type=src}if(props){_V_.merge(this,props)}this.timeStamp=(new Date).getTime();this[_V_.expando]=true};_V_.Event.prototype={preventDefault:function(){this.isDefaultPrevented=returnTrue;var e=this.originalEvent;if(!e){return}if(e.preventDefault){e.preventDefault()}else{e.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=returnTrue;var e=this.originalEvent;if(!e){return}if(e.stopPropagation){e.stopPropagation()}e.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=returnTrue;this.stopPropagation()},isDefaultPrevented:returnFalse,isPropagationStopped:returnFalse,isImmediatePropagationStopped:returnFalse};_V_.Event.props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" ");function returnTrue(){return true}function returnFalse(){return false}var JSON;if(!JSON){JSON={}}(function(){var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;if(typeof JSON.parse!=="function"){JSON.parse=function(text,reviver){var j;function walk(holder,key){var k,v,value=holder[key];if(value&&typeof value==="object"){for(k in value){if(Object.prototype.hasOwnProperty.call(value,k)){v=walk(value,k);if(v!==undefined){value[k]=v}else{delete value[k]}}}}return reviver.call(holder,key,value)}text=String(text);cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){j=eval("("+text+")");return typeof reviver==="function"?walk({"":j},""):j}throw new SyntaxError("JSON.parse")}}}());_V_.Player=_V_.Component.extend({init:function(tag,addOptions,ready){this.tag=tag;var el=this.el=_V_.createElement("div"),options=this.options={},width=options.width=tag.getAttribute("width"),height=options.height=tag.getAttribute("height"),initWidth=width||300,initHeight=height||150;tag.player=el.player=this;this.ready(ready);tag.parentNode.insertBefore(el,tag);el.appendChild(tag);el.id=this.id=tag.id;el.className=tag.className;tag.id+="_html5_api";tag.className="vjs-tech";_V_.players[el.id]=this;el.setAttribute("width",initWidth);el.setAttribute("height",initHeight);el.style.width=initWidth+"px";el.style.height=initHeight+"px";tag.removeAttribute("width");tag.removeAttribute("height");_V_.merge(options,_V_.options);_V_.merge(options,this.getVideoTagSettings());_V_.merge(options,addOptions);tag.removeAttribute("controls");tag.removeAttribute("poster");if(tag.hasChildNodes()){for(var i=0,j=tag.childNodes;i<j.length;i++){if(j[i].nodeName=="SOURCE"||j[i].nodeName=="TRACK"){tag.removeChild(j[i])}}}this.values={};this.addClass("vjs-paused");this.addEvent("ended",this.onEnded);this.addEvent("play",this.onPlay);this.addEvent("pause",this.onPause);this.addEvent("progress",this.onProgress);this.addEvent("error",this.onError);if(options.controls){this.ready(function(){this.initComponents()})}this.textTracks=[];if(options.tracks&&options.tracks.length>0){this.addTextTracks(options.tracks)}if(!options.sources||options.sources.length==0){for(var i=0,j=options.techOrder;i<j.length;i++){var techName=j[i],tech=_V_[techName];if(tech.isSupported()){this.loadTech(techName);break}}}else{this.src(options.sources)}},values:{},destroy:function(){this.stopTrackingProgress();this.stopTrackingCurrentTime();_V_.players[this.id]=null;delete _V_.players[this.id];this.tech.destroy();this.el.parentNode.removeChild(this.el)},createElement:function(type,options){},getVideoTagSettings:function(){var options={sources:[],tracks:[]};options.src=this.tag.getAttribute("src");options.controls=this.tag.getAttribute("controls")!==null;options.poster=this.tag.getAttribute("poster");options.preload=this.tag.getAttribute("preload");options.autoplay=this.tag.getAttribute("autoplay")!==null;options.loop=this.tag.getAttribute("loop")!==null;options.muted=this.tag.getAttribute("muted")!==null;if(this.tag.hasChildNodes()){for(var c,i=0,j=this.tag.childNodes;i<j.length;i++){c=j[i];if(c.nodeName=="SOURCE"){options.sources.push({src:c.getAttribute("src"),type:c.getAttribute("type"),media:c.getAttribute("media"),title:c.getAttribute("title")})}if(c.nodeName=="TRACK"){options.tracks.push({src:c.getAttribute("src"),kind:c.getAttribute("kind"),srclang:c.getAttribute("srclang"),label:c.getAttribute("label"),"default":c.getAttribute("default")!==null,title:c.getAttribute("title")})}}}return options},loadTech:function(techName,source){if(this.tech){this.unloadTech()}else{if(techName!="html5"&&this.tag){this.el.removeChild(this.tag);this.tag=false}}this.techName=techName;this.isReady=false;var techReady=function(){this.player.triggerReady();if(!this.support.progressEvent){this.player.manualProgressOn()}if(!this.support.timeupdateEvent){this.player.manualTimeUpdatesOn()}};var techOptions=_V_.merge({source:source,parentEl:this.el},this.options[techName]);if(source){if(source.src==this.values.src&&this.values.currentTime>0){techOptions.startTime=this.values.currentTime}this.values.src=source.src}this.tech=new _V_[techName](this,techOptions);this.tech.ready(techReady)},unloadTech:function(){this.tech.destroy();if(this.manualProgress){this.manualProgressOff()}if(this.manualTimeUpdates){this.manualTimeUpdatesOff()}this.tech=false},manualProgressOn:function(){this.manualProgress=true;this.trackProgress();this.tech.addEvent("progress",function(){this.removeEvent("progress",arguments.callee);this.support.progressEvent=true;this.player.manualProgressOff()})},manualProgressOff:function(){this.manualProgress=false;this.stopTrackingProgress()},trackProgress:function(){this.progressInterval=setInterval(_V_.proxy(this,function(){if(this.values.bufferEnd<this.buffered().end(0)){this.triggerEvent("progress")}else{if(this.bufferedPercent()==1){this.stopTrackingProgress();this.triggerEvent("progress")}}}),500)},stopTrackingProgress:function(){clearInterval(this.progressInterval)},manualTimeUpdatesOn:function(){this.manualTimeUpdates=true;this.addEvent("play",this.trackCurrentTime);this.addEvent("pause",this.stopTrackingCurrentTime);this.tech.addEvent("timeupdate",function(){this.removeEvent("timeupdate",arguments.callee);this.support.timeupdateEvent=true;this.player.manualTimeUpdatesOff()})},manualTimeUpdatesOff:function(){this.manualTimeUpdates=false;this.stopTrackingCurrentTime();this.removeEvent("play",this.trackCurrentTime);this.removeEvent("pause",this.stopTrackingCurrentTime)},trackCurrentTime:function(){if(this.currentTimeInterval){this.stopTrackingCurrentTime()}this.currentTimeInterval=setInterval(_V_.proxy(this,function(){this.triggerEvent("timeupdate")}),250)},stopTrackingCurrentTime:function(){clearInterval(this.currentTimeInterval)},onEnded:function(){if(this.options.loop){this.currentTime(0);this.play()}else{this.pause();this.currentTime(0);this.pause()}},onPlay:function(){_V_.removeClass(this.el,"vjs-paused");_V_.addClass(this.el,"vjs-playing")},onPause:function(){_V_.removeClass(this.el,"vjs-playing");_V_.addClass(this.el,"vjs-paused")},onProgress:function(){if(this.bufferedPercent()==1){this.triggerEvent("loadedalldata")}},onError:function(e){_V_.log("Video Error",e)},techCall:function(method,arg){if(!this.tech.isReady){this.tech.ready(function(){this[method](arg)})}else{try{this.tech[method](arg)}catch(e){_V_.log(e)}}},techGet:function(method){if(this.tech.isReady){try{return this.tech[method]()}catch(e){if(this.tech[method]===undefined){_V_.log("Video.js: "+method+" method not defined for "+this.techName+" playback technology.",e)}else{if(e.name=="TypeError"){_V_.log("Video.js: "+method+" unavailable on "+this.techName+" playback technology element.",e);this.tech.isReady=false}else{_V_.log(e)}}}}return},play:function(){this.techCall("play");return this},pause:function(){this.techCall("pause");return this},paused:function(){return(this.techGet("paused")===false)?false:true},currentTime:function(seconds){if(seconds!==undefined){this.values.lastSetCurrentTime=seconds;this.techCall("setCurrentTime",seconds);if(this.manualTimeUpdates){this.triggerEvent("timeupdate")}return this}return this.values.currentTime=(this.techGet("currentTime")||0)},duration:function(){return parseFloat(this.techGet("duration"))},remainingTime:function(){return this.duration()-this.currentTime()},buffered:function(){var buffered=this.techGet("buffered"),start=0,end=this.values.bufferEnd=this.values.bufferEnd||0,timeRange;if(buffered&&buffered.length>0&&buffered.end(0)!==end){end=buffered.end(0);this.values.bufferEnd=end}return _V_.createTimeRange(start,end)},bufferedPercent:function(){return(this.duration())?this.buffered().end(0)/this.duration():0},volume:function(percentAsDecimal){var vol;if(percentAsDecimal!==undefined){vol=Math.max(0,Math.min(1,parseFloat(percentAsDecimal)));this.values.volume=vol;this.techCall("setVolume",vol);_V_.setLocalStorage("volume",vol);return this}vol=parseFloat(this.techGet("volume"));return(isNaN(vol))?1:vol},muted:function(muted){if(muted!==undefined){this.techCall("setMuted",muted);return this}return this.techGet("muted")||false},width:function(width,skipListeners){if(width!==undefined){this.el.width=width;this.el.style.width=width+"px";if(!skipListeners){this.triggerEvent("resize")}return this}return parseInt(this.el.getAttribute("width"))},height:function(height){if(height!==undefined){this.el.height=height;this.el.style.height=height+"px";this.triggerEvent("resize");return this}return parseInt(this.el.getAttribute("height"))},size:function(width,height){return this.width(width,true).height(height)},supportsFullScreen:function(){return this.techGet("supportsFullScreen")||false},requestFullScreen:function(){var requestFullScreen=_V_.support.requestFullScreen;this.isFullScreen=true;if(requestFullScreen){_V_.addEvent(document,requestFullScreen.eventName,this.proxy(function(){this.isFullScreen=document[requestFullScreen.isFullScreen];if(this.isFullScreen==false){_V_.removeEvent(document,requestFullScreen.eventName,arguments.callee)}this.triggerEvent("fullscreenchange")}));if(this.tech.support.fullscreenResize===false&&this.options.flash.iFrameMode!=true){this.pause();this.unloadTech();_V_.addEvent(document,requestFullScreen.eventName,this.proxy(function(){_V_.removeEvent(document,requestFullScreen.eventName,arguments.callee);this.loadTech(this.techName,{src:this.values.src})}));this.el[requestFullScreen.requestFn]()}else{this.el[requestFullScreen.requestFn]()}}else{if(this.tech.supportsFullScreen()){this.triggerEvent("fullscreenchange");this.techCall("enterFullScreen")}else{this.triggerEvent("fullscreenchange");this.enterFullWindow()}}return this},cancelFullScreen:function(){var requestFullScreen=_V_.support.requestFullScreen;this.isFullScreen=false;if(requestFullScreen){if(this.tech.support.fullscreenResize===false&&this.options.flash.iFrameMode!=true){this.pause();this.unloadTech();_V_.addEvent(document,requestFullScreen.eventName,this.proxy(function(){_V_.removeEvent(document,requestFullScreen.eventName,arguments.callee);this.loadTech(this.techName,{src:this.values.src})}));document[requestFullScreen.cancelFn]()}else{document[requestFullScreen.cancelFn]()}}else{if(this.tech.supportsFullScreen()){this.techCall("exitFullScreen");this.triggerEvent("fullscreenchange")}else{this.exitFullWindow();this.triggerEvent("fullscreenchange")}}return this},enterFullWindow:function(){this.isFullWindow=true;this.docOrigOverflow=document.documentElement.style.overflow;_V_.addEvent(document,"keydown",_V_.proxy(this,this.fullWindowOnEscKey));document.documentElement.style.overflow="hidden";_V_.addClass(document.body,"vjs-full-window");_V_.addClass(this.el,"vjs-fullscreen");this.triggerEvent("enterFullWindow")},fullWindowOnEscKey:function(event){if(event.keyCode==27){if(this.isFullScreen==true){this.cancelFullScreen()}else{this.exitFullWindow()}}},exitFullWindow:function(){this.isFullWindow=false;_V_.removeEvent(document,"keydown",this.fullWindowOnEscKey);document.documentElement.style.overflow=this.docOrigOverflow;_V_.removeClass(document.body,"vjs-full-window");_V_.removeClass(this.el,"vjs-fullscreen");this.triggerEvent("exitFullWindow")},selectSource:function(sources){for(var i=0,j=this.options.techOrder;i<j.length;i++){var techName=j[i],tech=_V_[techName];if(tech.isSupported()){for(var a=0,b=sources;a<b.length;a++){var source=b[a];if(tech.canPlaySource.call(this,source)){return{source:source,tech:techName}}}}}return false},src:function(source){if(source instanceof Array){var sourceTech=this.selectSource(source),source,techName;if(sourceTech){source=sourceTech.source;techName=sourceTech.tech;if(techName==this.techName){this.src(source)}else{this.loadTech(techName,source)}}else{_V_.log("No compatible source and playback technology were found.")}}else{if(source instanceof Object){if(_V_[this.techName].canPlaySource(source)){this.src(source.src)}else{this.src([source])}}else{this.values.src=source;if(!this.isReady){this.ready(function(){this.src(source)})}else{this.techCall("src",source);if(this.options.preload=="auto"){this.load()}if(this.options.autoplay){this.play()}}}}return this},load:function(){this.techCall("load");return this},currentSrc:function(){return this.techGet("currentSrc")||this.values.src||""},preload:function(value){if(value!==undefined){this.techCall("setPreload",value);this.options.preload=value;return this}return this.techGet("preload")},autoplay:function(value){if(value!==undefined){this.techCall("setAutoplay",value);this.options.autoplay=value;return this}return this.techGet("autoplay",value)},loop:function(value){if(value!==undefined){this.techCall("setLoop",value);this.options.loop=value;return this}return this.techGet("loop")},controls:function(){return this.options.controls},poster:function(){return this.techGet("poster")},error:function(){return this.techGet("error")},ended:function(){return this.techGet("ended")}});(function(){var requestFn,cancelFn,eventName,isFullScreen,playerProto=_V_.Player.prototype;if(document.cancelFullscreen!==undefined){requestFn="requestFullscreen";cancelFn="exitFullscreen";eventName="fullscreenchange";isFullScreen="fullScreen"}else{_V_.each(["moz","webkit"],function(prefix){if((prefix!="moz"||document.mozFullScreenEnabled)&&document[prefix+"CancelFullScreen"]!==undefined){requestFn=prefix+"RequestFullScreen";cancelFn=prefix+"CancelFullScreen";eventName=prefix+"fullscreenchange";if(prefix=="webkit"){isFullScreen=prefix+"IsFullScreen"}else{isFullScreen=prefix+"FullScreen"}}})}if(requestFn){_V_.support.requestFullScreen={requestFn:requestFn,cancelFn:cancelFn,eventName:eventName,isFullScreen:isFullScreen}}})();_V_.PlaybackTech=_V_.Component.extend({init:function(player,options){},onClick:function(){if(this.player.options.controls){_V_.PlayToggle.prototype.onClick.call(this)}}});_V_.apiMethods="play,pause,paused,currentTime,setCurrentTime,duration,buffered,volume,setVolume,muted,setMuted,width,height,supportsFullScreen,enterFullScreen,src,load,currentSrc,preload,setPreload,autoplay,setAutoplay,loop,setLoop,error,networkState,readyState,seeking,initialTime,startOffsetTime,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks,defaultPlaybackRate,playbackRate,mediaGroup,controller,controls,defaultMuted".split(",");_V_.each(_V_.apiMethods,function(methodName){_V_.PlaybackTech.prototype[methodName]=function(){throw new Error("The '"+methodName+"' method is not available on the playback technology's API")}});_V_.html5=_V_.PlaybackTech.extend({init:function(player,options,ready){this.player=player;this.el=this.createElement();this.ready(ready);this.addEvent("click",this.proxy(this.onClick));var source=options.source;if(source&&this.el.currentSrc==source.src){player.triggerEvent("loadstart")}else{if(source){this.el.src=source.src}}player.ready(function(){if(this.options.autoplay&&this.paused()){this.tag.poster=null;this.play()}});this.setupTriggers();this.triggerReady()},destroy:function(){this.player.tag=false;this.removeTriggers();this.el.parentNode.removeChild(this.el)},createElement:function(){var html5=_V_.html5,player=this.player,el=player.tag,newEl;if(!el||this.support.movingElementInDOM===false){if(el){player.el.removeChild(el)}newEl=_V_.createElement("video",{id:el.id||player.el.id+"_html5_api",className:el.className||"vjs-tech"});el=newEl;_V_.insertFirst(el,player.el)}_V_.each(["autoplay","preload","loop","muted"],function(attr){if(player.options[attr]!==null){el[attr]=player.options[attr]}},this);return el},setupTriggers:function(){_V_.each.call(this,_V_.html5.events,function(type){_V_.addEvent(this.el,type,_V_.proxy(this.player,this.eventHandler))})},removeTriggers:function(){_V_.each.call(this,_V_.html5.events,function(type){_V_.removeEvent(this.el,type,_V_.proxy(this.player,this.eventHandler))})},eventHandler:function(e){e.stopPropagation();this.triggerEvent(e)},play:function(){this.el.play()},pause:function(){this.el.pause()},paused:function(){return this.el.paused},currentTime:function(){return this.el.currentTime},setCurrentTime:function(seconds){try{this.el.currentTime=seconds}catch(e){_V_.log(e,"Video isn't ready. (VideoJS)")}},duration:function(){return this.el.duration||0},buffered:function(){return this.el.buffered},volume:function(){return this.el.volume},setVolume:function(percentAsDecimal){this.el.volume=percentAsDecimal},muted:function(){return this.el.muted},setMuted:function(muted){this.el.muted=muted},width:function(){return this.el.offsetWidth},height:function(){return this.el.offsetHeight},supportsFullScreen:function(){if(typeof this.el.webkitEnterFullScreen=="function"){if(!navigator.userAgent.match("Chrome")&&!navigator.userAgent.match("Mac OS X 10.5")){return true}}return false},enterFullScreen:function(){try{this.el.webkitEnterFullScreen()}catch(e){if(e.code==11){_V_.log("VideoJS: Video not ready.")}}},src:function(src){this.el.src=src},load:function(){this.el.load()},currentSrc:function(){return this.el.currentSrc},preload:function(){return this.el.preload},setPreload:function(val){this.el.preload=val},autoplay:function(){return this.el.autoplay},setAutoplay:function(val){this.el.autoplay=val},loop:function(){return this.el.loop},setLoop:function(val){this.el.loop=val},error:function(){return this.el.error},seeking:function(){return this.el.seeking},ended:function(){return this.el.ended},controls:function(){return this.player.options.controls},defaultMuted:function(){return this.el.defaultMuted}});_V_.html5.isSupported=function(){return !!document.createElement("video").canPlayType};_V_.html5.canPlaySource=function(srcObj){return !!document.createElement("video").canPlayType(srcObj.type)};_V_.html5.events="loadstart,suspend,abort,error,emptied,stalled,loadedmetadata,loadeddata,canplay,canplaythrough,playing,waiting,seeking,seeked,ended,durationchange,timeupdate,progress,play,pause,ratechange,volumechange".split(",");_V_.html5.prototype.support={fullscreen:(typeof _V_.testVid.webkitEnterFullScreen!==undefined)?(!_V_.ua.match("Chrome")&&!_V_.ua.match("Mac OS X 10.5")?true:false):false,movingElementInDOM:!_V_.isIOS()};if(_V_.isAndroid()){if(_V_.androidVersion()<3){document.createElement("video").constructor.prototype.canPlayType=function(type){return(type&&type.toLowerCase().indexOf("video/mp4")!=-1)?"maybe":""}}}_V_.flash=_V_.PlaybackTech.extend({init:function(player,options){this.player=player;var source=options.source,parentEl=options.parentEl,placeHolder=this.el=_V_.createElement("div",{id:parentEl.id+"_temp_flash"}),objId=player.el.id+"_flash_api",playerOptions=player.options,flashVars=_V_.merge({readyFunction:"_V_.flash.onReady",eventProxyFunction:"_V_.flash.onEvent",errorEventProxyFunction:"_V_.flash.onError",autoplay:playerOptions.autoplay,preload:playerOptions.preload,loop:playerOptions.loop,muted:playerOptions.muted},options.flashVars),params=_V_.merge({wmode:"opaque",bgcolor:"#000000"},options.params),attributes=_V_.merge({id:objId,name:objId,"class":"vjs-tech"},options.attributes);if(source){flashVars.src=encodeURIComponent(_V_.getAbsoluteURL(source.src))}_V_.insertFirst(placeHolder,parentEl);if(options.startTime){this.ready(function(){this.load();this.play();this.currentTime(options.startTime)})}if(options.iFrameMode==true&&!_V_.isFF){var iFrm=_V_.createElement("iframe",{id:objId+"_iframe",name:objId+"_iframe",className:"vjs-tech",scrolling:"no",marginWidth:0,marginHeight:0,frameBorder:0});flashVars.readyFunction="ready";flashVars.eventProxyFunction="events";flashVars.errorEventProxyFunction="errors";_V_.addEvent(iFrm,"load",_V_.proxy(this,function(){var iDoc,objTag,swfLoc,iWin=iFrm.contentWindow,varString="";iDoc=iFrm.contentDocument?iFrm.contentDocument:iFrm.contentWindow.document;iDoc.write(_V_.flash.getEmbedCode(options.swf,flashVars,params,attributes));iWin.player=this.player;iWin.ready=_V_.proxy(this.player,function(currSwf){var el=iDoc.getElementById(currSwf),player=this,tech=player.tech;tech.el=el;_V_.addEvent(el,"click",tech.proxy(tech.onClick));_V_.flash.checkReady(tech)});iWin.events=_V_.proxy(this.player,function(swfID,eventName,other){var player=this;if(player&&player.techName=="flash"){player.triggerEvent(eventName)}});iWin.errors=_V_.proxy(this.player,function(swfID,eventName){_V_.log("Flash Error",eventName)})}));placeHolder.parentNode.replaceChild(iFrm,placeHolder)}else{_V_.flash.embed(options.swf,placeHolder,flashVars,params,attributes)}},destroy:function(){this.el.parentNode.removeChild(this.el)},play:function(){this.el.vjs_play()},pause:function(){this.el.vjs_pause()},src:function(src){src=_V_.getAbsoluteURL(src);this.el.vjs_src(src);if(this.player.autoplay()){var tech=this;setTimeout(function(){tech.play()},0)}},load:function(){this.el.vjs_load()},poster:function(){this.el.vjs_getProperty("poster")},buffered:function(){return _V_.createTimeRange(0,this.el.vjs_getProperty("buffered"))},supportsFullScreen:function(){return false},enterFullScreen:function(){return false}});(function(){var api=_V_.flash.prototype,readWrite="preload,currentTime,defaultPlaybackRate,playbackRate,autoplay,loop,mediaGroup,controller,controls,volume,muted,defaultMuted".split(","),readOnly="error,currentSrc,networkState,readyState,seeking,initialTime,duration,startOffsetTime,paused,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks".split(","),callOnly="load,play,pause".split(",");createSetter=function(attr){var attrUpper=attr.charAt(0).toUpperCase()+attr.slice(1);api["set"+attrUpper]=function(val){return this.el.vjs_setProperty(attr,val)}},createGetter=function(attr){api[attr]=function(){return this.el.vjs_getProperty(attr)}};_V_.each(readWrite,function(attr){createGetter(attr);createSetter(attr)});_V_.each(readOnly,function(attr){createGetter(attr)})})();_V_.flash.isSupported=function(){return _V_.flash.version()[0]>=10};_V_.flash.canPlaySource=function(srcObj){if(srcObj.type in _V_.flash.prototype.support.formats){return"maybe"}};_V_.flash.prototype.support={formats:{"video/flv":"FLV","video/x-flv":"FLV","video/mp4":"MP4","video/m4v":"MP4"},progressEvent:false,timeupdateEvent:false,fullscreenResize:false,parentResize:!(_V_.ua.match("Firefox"))};_V_.flash.onReady=function(currSwf){var el=_V_.el(currSwf);var player=el.player||el.parentNode.player,tech=player.tech;el.player=player;tech.el=el;tech.addEvent("click",tech.onClick);_V_.flash.checkReady(tech)};_V_.flash.checkReady=function(tech){if(tech.el.vjs_getProperty){tech.triggerReady()}else{setTimeout(function(){_V_.flash.checkReady(tech)},50)}};_V_.flash.onEvent=function(swfID,eventName){var player=_V_.el(swfID).player;player.triggerEvent(eventName)};_V_.flash.onError=function(swfID,err){var player=_V_.el(swfID).player;player.triggerEvent("error");_V_.log("Flash Error",err,swfID)};_V_.flash.version=function(){var version="0,0,0";try{version=new ActiveXObject("ShockwaveFlash.ShockwaveFlash").GetVariable("$version").replace(/\D+/g,",").match(/^,?(.+),?$/)[1]}catch(e){try{if(navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin){version=(navigator.plugins["Shockwave Flash 2.0"]||navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g,",").match(/^,?(.+),?$/)[1]}}catch(e){}}return version.split(",")};_V_.flash.embed=function(swf,placeHolder,flashVars,params,attributes){var code=_V_.flash.getEmbedCode(swf,flashVars,params,attributes),obj=_V_.createElement("div",{innerHTML:code}).childNodes[0],par=placeHolder.parentNode;placeHolder.parentNode.replaceChild(obj,placeHolder);if(_V_.isIE()){var newObj=par.childNodes[0];setTimeout(function(){newObj.style.display="block"},1000)}return obj};_V_.flash.getEmbedCode=function(swf,flashVars,params,attributes){var objTag='<object type="application/x-shockwave-flash"',flashVarsString="",paramsString="";attrsString="";if(flashVars){_V_.eachProp(flashVars,function(key,val){flashVarsString+=(key+"="+val+"&amp;")})}params=_V_.merge({movie:swf,flashvars:flashVarsString,allowScriptAccess:"always",allowNetworking:"all"},params);_V_.eachProp(params,function(key,val){paramsString+='<param name="'+key+'" value="'+val+'" />'});attributes=_V_.merge({data:swf,width:"100%",height:"100%"},attributes);_V_.eachProp(attributes,function(key,val){attrsString+=(key+'="'+val+'" ')});return objTag+attrsString+">"+paramsString+"</object>"};_V_.merge(_V_.Player.prototype,{addTextTracks:function(trackObjects){var tracks=this.textTracks=(this.textTracks)?this.textTracks:[],i=0,j=trackObjects.length,track,Kind;for(;i<j;i++){Kind=_V_.uc(trackObjects[i].kind||"subtitles");track=new _V_[Kind+"Track"](this,trackObjects[i]);tracks.push(track);if(track["default"]){this.ready(_V_.proxy(track,track.show))}}return this},showTextTrack:function(id,disableSameKind){var tracks=this.textTracks,i=0,j=tracks.length,track,showTrack,kind;for(;i<j;i++){track=tracks[i];if(track.id===id){track.show();showTrack=track}else{if(disableSameKind&&track.kind==disableSameKind&&track.mode>0){track.disable()}}}kind=(showTrack)?showTrack.kind:((disableSameKind)?disableSameKind:false);if(kind){this.triggerEvent(kind+"trackchange")}return this}});_V_.Track=_V_.Component.extend({init:function(player,options){this._super(player,options);_V_.merge(this,{id:options.id||("vjs_"+options.kind+"_"+options.language+"_"+_V_.guid++),src:options.src,"default":options["default"],title:options.title,language:options.srclang,label:options.label,cues:[],activeCues:[],readyState:0,mode:0})},createElement:function(){return this._super("div",{className:"vjs-"+this.kind+" vjs-text-track"})},show:function(){this.activate();this.mode=2;this._super()},hide:function(){this.activate();this.mode=1;this._super()},disable:function(){if(this.mode==2){this.hide()}this.deactivate();this.mode=0},activate:function(){if(this.readyState==0){this.load()}if(this.mode==0){this.player.addEvent("timeupdate",this.proxy(this.update,this.id));this.player.addEvent("ended",this.proxy(this.reset,this.id));if(this.kind=="captions"||this.kind=="subtitles"){this.player.textTrackDisplay.addComponent(this)}}},deactivate:function(){this.player.removeEvent("timeupdate",this.proxy(this.update,this.id));this.player.removeEvent("ended",this.proxy(this.reset,this.id));this.reset();this.player.textTrackDisplay.removeComponent(this)},load:function(){if(this.readyState==0){this.readyState=1;_V_.get(this.src,this.proxy(this.parseCues),this.proxy(this.onError))}},onError:function(err){this.error=err;this.readyState=3;this.triggerEvent("error")},parseCues:function(srcContent){var cue,time,text,lines=srcContent.split("\n"),line="",id;for(var i=1,j=lines.length;i<j;i++){line=_V_.trim(lines[i]);if(line){if(line.indexOf("-->")==-1){id=line;line=_V_.trim(lines[++i])}else{id=this.cues.length}cue={id:id,index:this.cues.length};time=line.split(" --> ");cue.startTime=this.parseCueTime(time[0]);cue.endTime=this.parseCueTime(time[1]);text=[];while(lines[++i]&&(line=_V_.trim(lines[i]))){text.push(line)}cue.text=text.join("<br/>");this.cues.push(cue)}}this.readyState=2;this.triggerEvent("loaded")},parseCueTime:function(timeText){var parts=timeText.split(":"),time=0,hours,minutes,other,seconds,ms,flags;if(parts.length==3){hours=parts[0];minutes=parts[1];other=parts[2]}else{hours=0;minutes=parts[0];other=parts[1]}other=other.split(/\s+/);seconds=other.splice(0,1)[0];seconds=seconds.split(/\.|,/);ms=parseFloat(seconds[1]);seconds=seconds[0];time+=parseFloat(hours)*3600;time+=parseFloat(minutes)*60;time+=parseFloat(seconds);if(ms){time+=ms/1000}return time},update:function(){if(this.cues.length>0){var time=this.player.currentTime();if(this.prevChange===undefined||time<this.prevChange||this.nextChange<=time){var cues=this.cues,newNextChange=this.player.duration(),newPrevChange=0,reverse=false,newCues=[],firstActiveIndex,lastActiveIndex,html="",cue,i,j;if(time>=this.nextChange||this.nextChange===undefined){i=(this.firstActiveIndex!==undefined)?this.firstActiveIndex:0}else{reverse=true;i=(this.lastActiveIndex!==undefined)?this.lastActiveIndex:cues.length-1}while(true){cue=cues[i];if(cue.endTime<=time){newPrevChange=Math.max(newPrevChange,cue.endTime);if(cue.active){cue.active=false}}else{if(time<cue.startTime){newNextChange=Math.min(newNextChange,cue.startTime);if(cue.active){cue.active=false}if(!reverse){break}}else{if(reverse){newCues.splice(0,0,cue);if(lastActiveIndex===undefined){lastActiveIndex=i}firstActiveIndex=i}else{newCues.push(cue);if(firstActiveIndex===undefined){firstActiveIndex=i}lastActiveIndex=i}newNextChange=Math.min(newNextChange,cue.endTime);newPrevChange=Math.max(newPrevChange,cue.startTime);cue.active=true}}if(reverse){if(i===0){break}else{i--}}else{if(i===cues.length-1){break}else{i++}}}this.activeCues=newCues;this.nextChange=newNextChange;this.prevChange=newPrevChange;this.firstActiveIndex=firstActiveIndex;this.lastActiveIndex=lastActiveIndex;this.updateDisplay();this.triggerEvent("cuechange")}}},updateDisplay:function(){var cues=this.activeCues,html="",i=0,j=cues.length;for(;i<j;i++){html+="<span class='vjs-tt-cue'>"+cues[i].text+"</span>"}this.el.innerHTML=html},reset:function(){this.nextChange=0;this.prevChange=this.player.duration();this.firstActiveIndex=0;this.lastActiveIndex=0}});_V_.CaptionsTrack=_V_.Track.extend({kind:"captions"});_V_.SubtitlesTrack=_V_.Track.extend({kind:"subtitles"});_V_.ChaptersTrack=_V_.Track.extend({kind:"chapters"});_V_.TextTrackDisplay=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-text-track-display"})}});_V_.TextTrackMenuItem=_V_.MenuItem.extend({init:function(player,options){var track=this.track=options.track;options.label=track.label;options.selected=track["default"];this._super(player,options);this.player.addEvent(track.kind+"trackchange",_V_.proxy(this,this.update))},onClick:function(){this._super();this.player.showTextTrack(this.track.id,this.track.kind)},update:function(){if(this.track.mode==2){this.selected(true)}else{this.selected(false)}}});_V_.OffTextTrackMenuItem=_V_.TextTrackMenuItem.extend({init:function(player,options){options.track={kind:options.kind,player:player,label:"Off"};this._super(player,options)},onClick:function(){this._super();this.player.showTextTrack(this.track.id,this.track.kind)},update:function(){var tracks=this.player.textTracks,i=0,j=tracks.length,track,off=true;for(;i<j;i++){track=tracks[i];if(track.kind==this.track.kind&&track.mode==2){off=false}}if(off){this.selected(true)}else{this.selected(false)}}});_V_.TextTrackButton=_V_.Button.extend({init:function(player,options){this._super(player,options);this.menu=this.createMenu();if(this.items.length===0){this.hide()}},createMenu:function(){var menu=new _V_.Menu(this.player);menu.el.appendChild(_V_.createElement("li",{className:"vjs-menu-title",innerHTML:_V_.uc(this.kind)}));menu.addItem(new _V_.OffTextTrackMenuItem(this.player,{kind:this.kind}));this.items=this.createItems();this.each(this.items,function(item){menu.addItem(item)});this.addComponent(menu);return menu},createItems:function(){var items=[];this.each(this.player.textTracks,function(track){if(track.kind===this.kind){items.push(new _V_.TextTrackMenuItem(this.player,{track:track}))}});return items},buildCSSClass:function(){return this.className+" vjs-menu-button "+this._super()},onFocus:function(){this.menu.lockShowing();_V_.one(this.menu.el.childNodes[this.menu.el.childNodes.length-1],"blur",this.proxy(function(){this.menu.unlockShowing()}))},onBlur:function(){},onClick:function(){this.one("mouseout",this.proxy(function(){this.menu.unlockShowing();this.el.blur()}))}});_V_.CaptionsButton=_V_.TextTrackButton.extend({kind:"captions",buttonText:"Captions",className:"vjs-captions-button"});_V_.SubtitlesButton=_V_.TextTrackButton.extend({kind:"subtitles",buttonText:"Subtitles",className:"vjs-subtitles-button"});_V_.ChaptersButton=_V_.TextTrackButton.extend({kind:"chapters",buttonText:"Chapters",className:"vjs-chapters-button",createItems:function(chaptersTrack){var items=[];this.each(this.player.textTracks,function(track){if(track.kind===this.kind){items.push(new _V_.TextTrackMenuItem(this.player,{track:track}))}});return items},createMenu:function(){var tracks=this.player.textTracks,i=0,j=tracks.length,track,chaptersTrack,items=this.items=[];for(;i<j;i++){track=tracks[i];if(track.kind==this.kind&&track["default"]){if(track.readyState<2){this.chaptersTrack=track;track.addEvent("loaded",this.proxy(this.createMenu));return}else{chaptersTrack=track;break}}}var menu=this.menu=new _V_.Menu(this.player);menu.el.appendChild(_V_.createElement("li",{className:"vjs-menu-title",innerHTML:_V_.uc(this.kind)}));if(chaptersTrack){var cues=chaptersTrack.cues,i=0,j=cues.length,cue,mi;for(;i<j;i++){cue=cues[i];mi=new _V_.ChaptersTrackMenuItem(this.player,{track:chaptersTrack,cue:cue});items.push(mi);menu.addComponent(mi)}}this.addComponent(menu);if(this.items.length>0){this.show()}return menu}});_V_.ChaptersTrackMenuItem=_V_.MenuItem.extend({init:function(player,options){var track=this.track=options.track,cue=this.cue=options.cue,currentTime=player.currentTime();options.label=cue.text;options.selected=(cue.startTime<=currentTime&&currentTime<cue.endTime);this._super(player,options);track.addEvent("cuechange",_V_.proxy(this,this.update))},onClick:function(){this._super();this.player.currentTime(this.cue.startTime);this.update(this.cue.startTime)},update:function(time){var cue=this.cue,currentTime=this.player.currentTime();if(cue.startTime<=currentTime&&currentTime<cue.endTime){this.selected(true)}else{this.selected(false)}}});_V_.merge(_V_.ControlBar.prototype.options.components,{subtitlesButton:{},captionsButton:{},chaptersButton:{}});_V_.autoSetup=function(){var options,vid,player,vids=document.getElementsByTagName("video");if(vids&&vids.length>0){for(var i=0,j=vids.length;i<j;i++){vid=vids[i];if(vid&&vid.getAttribute){if(vid.player===undefined){options=vid.getAttribute("data-setup");if(options!==null){options=JSON.parse(options||"{}");player=_V_(vid,options)}}}else{_V_.autoSetupTimeout(1);break}}}else{if(!_V_.windowLoaded){_V_.autoSetupTimeout(1)}}};_V_.autoSetupTimeout=function(wait){setTimeout(_V_.autoSetup,wait)};_V_.addEvent(window,"load",function(){_V_.windowLoaded=true});_V_.autoSetup();window.VideoJS=window._V_=VideoJS})(window);
diff --git a/mod/attach.php b/mod/attach.php
index 76d60a6907..03f850f0d1 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -37,7 +37,12 @@ function attach_init(&$a) {
 	// 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-length: ' . $r[0]['filesize']);
+	if(isset($_GET['attachment']) && $_GET['attachment'] === '0')
+		header('Content-disposition: filename="' . $r[0]['filename'] . '"');
+	else
+		header('Content-disposition: attachment; filename="' . $r[0]['filename'] . '"');
+
 	echo $r[0]['data'];
 	killme();
 	// NOTREACHED
diff --git a/mod/videos.php b/mod/videos.php
new file mode 100644
index 0000000000..9846e54fc2
--- /dev/null
+++ b/mod/videos.php
@@ -0,0 +1,323 @@
+<?php
+require_once('include/items.php');
+require_once('include/acl_selectors.php');
+require_once('include/bbcode.php');
+require_once('include/security.php');
+require_once('include/redir.php');
+
+
+function videos_init(&$a) {
+
+	if($a->argc > 1)
+		auto_redir($a, $a->argv[1]);
+
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		return;
+	}
+
+	$o = '';
+
+	if($a->argc > 1) {
+		$nick = $a->argv[1];
+		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
+			dbesc($nick)
+		);
+
+		if(! count($r))
+			return;
+
+		$a->data['user'] = $r[0];
+
+		$o .= '<div class="vcard">';
+		$o .= '<div class="fn">' . $a->data['user']['username'] . '</div>';
+		$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>';
+		$o .= '</div>';
+
+
+		/*$sql_extra = permissions_sql($a->data['user']['uid']);
+
+		$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra order by created desc",
+			intval($a->data['user']['uid'])
+		);
+
+		if(count($albums)) {
+			$a->data['albums'] = $albums;
+
+			$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);	
+
+			if($albums_visible) {
+				$o .= '<div id="side-bar-photos-albums" class="widget">';
+				$o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
+					
+				$o .= '<ul>';
+				foreach($albums as $album) {
+
+					// don't show contact photos. We once translated this name, but then you could still access it under
+					// a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
+
+					if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
+						continue;
+					$o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>'; 
+				}
+				$o .= '</ul>';
+			}
+			if(local_user() && $a->data['user']['uid'] == local_user()) {
+				$o .= '<div id="photo-albums-upload-link"><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>';
+			}
+
+			$o .= '</div>';
+		}*/
+
+		if(! x($a->page,'aside'))
+			$a->page['aside'] = '';
+		$a->page['aside'] .= $o;
+
+
+		$tpl = get_markup_template("videos_head.tpl");
+		$a->page['htmlhead'] .= replace_macros($tpl,array());
+
+		$tpl = get_markup_template("videos_end.tpl");
+		$a->page['end'] .= replace_macros($tpl,array());
+
+	}
+
+	return;
+}
+
+
+
+function videos_post(&$a) {
+
+	return;
+
+	// DELETED -- look at mod/photos.php if you want to implement
+}
+
+
+
+function videos_content(&$a) {
+
+	// URLs (most aren't currently implemented):
+	// videos/name
+	// videos/name/upload
+	// videos/name/upload/xxxxx (xxxxx is album name)
+	// videos/name/album/xxxxx
+	// videos/name/album/xxxxx/edit
+	// videos/name/video/xxxxx
+	// videos/name/video/xxxxx/edit
+
+
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		notice( t('Public access denied.') . EOL);
+		return;
+	}
+	
+	
+	require_once('include/bbcode.php');
+	require_once('include/security.php');
+	require_once('include/conversation.php');
+
+	if(! x($a->data,'user')) {
+		notice( t('No videos selected') . EOL );
+		return;
+	}
+
+	//$phototypes = Photo::supportedTypes();
+
+	$_SESSION['video_return'] = $a->cmd;
+
+	//
+	// Parse arguments 
+	//
+
+	if($a->argc > 3) {
+		$datatype = $a->argv[2];
+		$datum = $a->argv[3];
+	}
+	elseif(($a->argc > 2) && ($a->argv[2] === 'upload'))
+		$datatype = 'upload';
+	else
+		$datatype = 'summary';
+
+	if($a->argc > 4)
+		$cmd = $a->argv[4];
+	else
+		$cmd = 'view';
+
+	//
+	// Setup permissions structures
+	//
+
+	$can_post       = false;
+	$visitor        = 0;
+	$contact        = null;
+	$remote_contact = false;
+	$contact_id     = 0;
+
+	$owner_uid = $a->data['user']['uid'];
+
+	$community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
+
+	if((local_user()) && (local_user() == $owner_uid))
+		$can_post = true;
+	else {
+		if($community_page && remote_user()) {
+			if(is_array($_SESSION['remote'])) {
+				foreach($_SESSION['remote'] as $v) {
+					if($v['uid'] == $owner_uid) {
+						$contact_id = $v['cid'];
+						break;
+					}
+				}
+			}
+			if($contact_id) {
+
+				$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+					intval($contact_id),
+					intval($owner_uid)
+				);
+				if(count($r)) {
+					$can_post = true;
+					$contact = $r[0];
+					$remote_contact = true;
+					$visitor = $cid;
+				}
+			}
+		}
+	}
+
+	// perhaps they're visiting - but not a community page, so they wouldn't have write access
+
+	if(remote_user() && (! $visitor)) {
+		$contact_id = 0;
+		if(is_array($_SESSION['remote'])) {
+			foreach($_SESSION['remote'] as $v) {
+				if($v['uid'] == $owner_uid) {
+					$contact_id = $v['cid'];
+					break;
+				}
+			}
+		}
+		if($contact_id) {
+			$groups = init_groups_visitor($contact_id);
+			$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+				intval($contact_id),
+				intval($owner_uid)
+			);
+			if(count($r)) {
+				$contact = $r[0];
+				$remote_contact = true;
+			}
+		}
+	}
+
+	if(! $remote_contact) {
+		if(local_user()) {
+			$contact_id = $_SESSION['cid'];
+			$contact = $a->contact;
+		}
+	}
+
+	if($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) {
+		notice( t('Access to this item is restricted.') . EOL);
+		return;
+	}
+
+	$sql_extra = permissions_sql($owner_uid,$remote_contact,$groups);
+
+	$o = "";
+
+	// tabs
+	$_is_owner = (local_user() && (local_user() == $owner_uid));
+	$o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);	
+
+	//
+	// dispatch request
+	//
+
+
+	if($datatype === 'upload') {
+		return; // no uploading for now
+
+		// DELETED -- look at mod/photos.php if you want to implement
+	}
+
+	if($datatype === 'album') {
+
+		return; // no albums for now
+
+		// DELETED -- look at mod/photos.php if you want to implement
+	}	
+
+
+	if($datatype === 'video') {
+
+		return; // no single video view for now
+
+		// DELETED -- look at mod/photos.php if you want to implement
+	}
+
+	// Default - show recent videos (no upload link for now)
+	//$o = '';
+
+	$r = q("SELECT hash FROM `attach` WHERE `uid` = %d AND filetype LIKE '%%video%%'
+		$sql_extra GROUP BY hash",
+		intval($a->data['user']['uid'])
+	);
+	if(count($r)) {
+		$a->set_pager_total(count($r));
+		$a->set_pager_itemspage(20);
+	}
+
+	$r = q("SELECT hash, `id`, `filename`, filetype FROM `attach`
+		WHERE `uid` = %d AND filetype LIKE '%%video%%'
+		$sql_extra GROUP BY hash ORDER BY `created` DESC LIMIT %d , %d",
+		intval($a->data['user']['uid']),
+		intval($a->pager['start']),
+		intval($a->pager['itemspage'])
+	);
+
+
+
+	$videos = array();
+	if(count($r)) {
+		foreach($r as $rr) {
+			if($a->theme['template_engine'] === 'internal') {
+				$alt_e = template_escape($rr['filename']);
+				$name_e = template_escape($rr['album']);
+			}
+			else {
+				$alt_e = $rr['filename'];
+				$name_e = $rr['album'];
+			}
+
+			$videos[] = array(
+				'id'       => $rr['id'],
+				'link'  	=> $a->get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'],
+				'title' 	=> t('View Video'),
+				'src'     	=> $a->get_baseurl() . '/attach/' . $rr['id'] . '?attachment=0',
+				'alt'     	=> $alt_e,
+				'mime'		=> $rr['filetype'],
+				'album'	=> array(
+					'link'  => $a->get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+					'name'  => $name_e,
+					'alt'   => t('View Album'),
+				),
+				
+			);
+		}
+	}
+	
+	$tpl = get_markup_template('videos_recent.tpl'); 
+	$o .= replace_macros($tpl, array(
+		'$title' => t('Recent Videos'),
+		'$can_post' => $can_post,
+		'$upload' => array(t('Upload New Videos'), $a->get_baseurl().'/videos/'.$a->data['user']['nickname'].'/upload'),
+		'$videos' => $videos,
+	));
+
+	
+	$o .= paginate($a);
+	return $o;
+}
+
diff --git a/util/minifyjs.sh b/util/minifyjs.sh
index bd60436134..fecf62dce8 100755
--- a/util/minifyjs.sh
+++ b/util/minifyjs.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+command -v uglifyjs >/dev/null 2>&1 || { echo >&2 "I require UglifyJS but it's not installed.  Aborting."; exit 1; }
+
 MINIFY_CMD=uglifyjs
 
 JSFILES=(
diff --git a/view/templates/video_top.tpl b/view/templates/video_top.tpl
new file mode 100644
index 0000000000..dd0701e88d
--- /dev/null
+++ b/view/templates/video_top.tpl
@@ -0,0 +1,22 @@
+
+<div class="video-top-wrapper lframe" id="video-top-wrapper-{{$video.id}}">
+	{{*<!--<a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
+		<img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" />
+	</a>-->*}}
+
+	{{*<video id="video-{{$video.id}}" class="video-js vjs-default-skin"
+	  controls preload="auto" width="480" height="320"
+	  poster="http://video-js.zencoder.com/oceans-clip.png">*}}
+	{{* v3.2.0 of VideoJS requires that there be a "data-setup" tag in the
+	    <video> element for it to process the tag *}}
+	{{* set preloading to false to lessen the load on the server *}}
+	<video id="video-{{$video.id}}" class="video-js vjs-default-skin"
+	  controls preload="false" data-setup="" width="400" height="264">
+	 <source src="{{$video.src}}" type="{{$video.mime}}" />
+	 {{*<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
+	 <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />*}}
+	</video>
+
+	{{*<div class="video-top-album-name"><a href="{{$video.album.link}}" class="video-top-album-link" title="{{$video.album.alt}}" >{{$video.album.name}}</a></div>*}}
+</div>
+
diff --git a/view/templates/videos_end.tpl b/view/templates/videos_end.tpl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/view/templates/videos_head.tpl b/view/templates/videos_head.tpl
new file mode 100644
index 0000000000..d397dcc2d0
--- /dev/null
+++ b/view/templates/videos_head.tpl
@@ -0,0 +1,6 @@
+<link href="library/video-js/video-js.min.css" rel="stylesheet">
+<script src="library/video-js/video.min.js"></script>
+<script>
+   _V_.options.flash.swf = "https://f.shmuz.in/library/video-js/video-js.swf"
+</script>
+
diff --git a/view/templates/videos_recent.tpl b/view/templates/videos_recent.tpl
new file mode 100644
index 0000000000..12a1dc569b
--- /dev/null
+++ b/view/templates/videos_recent.tpl
@@ -0,0 +1,11 @@
+<h3>{{$title}}</h3>
+{{if $can_post}}
+{{*<a id="video-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>*}}
+{{/if}}
+
+<div class="videos">
+{{foreach $videos as $video}}
+	{{include file="video_top.tpl"}}
+{{/foreach}}
+</div>
+<div class="videos-end"></div>
diff --git a/view/theme/decaf-mobile/templates/videos_end.tpl b/view/theme/decaf-mobile/templates/videos_end.tpl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/view/theme/decaf-mobile/templates/videos_head.tpl b/view/theme/decaf-mobile/templates/videos_head.tpl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index de89ba919f..819b0019f9 100644
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -389,6 +389,9 @@
 			}
 			/* autocomplete @nicknames */
 			$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
+
+			// setup videos, since VideoJS won't take care of any loaded via AJAX
+			_V_.autoSetup();
 		});
 	}
 
diff --git a/view/theme/frost-mobile/js/main.min.js b/view/theme/frost-mobile/js/main.min.js
index 3f6100e442..425bcf62ea 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)});$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||typeof profile_uid=="undefined"||!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 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:10,top:cursor.y+20});$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,forced_root_block:"div",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||typeof profile_uid=="undefined"||!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");_V_.autoSetup()})}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 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:10,top:cursor.y+20});$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,forced_root_block:"div",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/templates/videos_end.tpl b/view/theme/frost-mobile/templates/videos_end.tpl
new file mode 100644
index 0000000000..1468b68ba4
--- /dev/null
+++ b/view/theme/frost-mobile/templates/videos_end.tpl
@@ -0,0 +1,5 @@
+<script src="library/video-js/video.min.js"></script>
+<script>
+   _V_.options.flash.swf = "https://f.shmuz.in/library/video-js/video-js.swf"
+</script>
+
diff --git a/view/theme/frost-mobile/templates/videos_head.tpl b/view/theme/frost-mobile/templates/videos_head.tpl
new file mode 100644
index 0000000000..0a460acaca
--- /dev/null
+++ b/view/theme/frost-mobile/templates/videos_head.tpl
@@ -0,0 +1,2 @@
+<link href="library/video-js/video-js.min.css" rel="stylesheet">
+
diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js
index 5964ed348b..741f611a52 100644
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -405,6 +405,8 @@
 		
 			collapseHeight();
 
+			// setup videos, since VideoJS won't take care of any loaded via AJAX
+			_V_.autoSetup();
 		});
 	}
 
diff --git a/view/theme/frost/js/main.min.js b/view/theme/frost/js/main.min.js
index 3fea1011be..1752563dcf 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)});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").colorbox({inline:true,transition:"elastic"});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||typeof profile_uid=="undefined"||!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")}$j("#"+ident+" .wall-item-body a img").each(function(){var aElem=$j(this).parent();var imgHref=aElem.attr("href");if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)){var cBoxClass=$j(this).closest(".wall-item-body").attr("id")+"-lightbox";$j(this).addClass(cBoxClass);aElem.colorbox({maxHeight:"90%",photo:true,rel:cBoxClass})}});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 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}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)});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").colorbox({inline:true,transition:"elastic"});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||typeof profile_uid=="undefined"||!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")}$j("#"+ident+" .wall-item-body a img").each(function(){var aElem=$j(this).parent();var imgHref=aElem.attr("href");if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)){var cBoxClass=$j(this).closest(".wall-item-body").attr("id")+"-lightbox";$j(this).addClass(cBoxClass);aElem.colorbox({maxHeight:"90%",photo:true,rel:cBoxClass})}});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();_V_.autoSetup()})}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 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}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/templates/videos_end.tpl b/view/theme/frost/templates/videos_end.tpl
new file mode 100644
index 0000000000..1468b68ba4
--- /dev/null
+++ b/view/theme/frost/templates/videos_end.tpl
@@ -0,0 +1,5 @@
+<script src="library/video-js/video.min.js"></script>
+<script>
+   _V_.options.flash.swf = "https://f.shmuz.in/library/video-js/video-js.swf"
+</script>
+
diff --git a/view/theme/frost/templates/videos_head.tpl b/view/theme/frost/templates/videos_head.tpl
new file mode 100644
index 0000000000..0a460acaca
--- /dev/null
+++ b/view/theme/frost/templates/videos_head.tpl
@@ -0,0 +1,2 @@
+<link href="library/video-js/video-js.min.css" rel="stylesheet">
+

From bd20f6ed9ae84181d7a6ac440b639c62b3b51ea2 Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Fri, 3 May 2013 19:09:12 -0600
Subject: [PATCH 45/67] add some styling for the video player

---
 view/theme/decaf-mobile/style.css | 9 +++++++++
 view/theme/duepuntozero/style.css | 9 +++++++++
 view/theme/frost-mobile/style.css | 9 +++++++++
 view/theme/frost/style.css        | 9 +++++++++
 4 files changed, 36 insertions(+)

diff --git a/view/theme/decaf-mobile/style.css b/view/theme/decaf-mobile/style.css
index 4cfdd805fb..b32523fdb8 100644
--- a/view/theme/decaf-mobile/style.css
+++ b/view/theme/decaf-mobile/style.css
@@ -2192,6 +2192,15 @@ input#profile-jot-email {
 	width: 587px;
 }
 
+.video-top-wrapper {
+	display: inline-block;
+	vertical-align: top;
+	margin-top: 15px;
+	margin-right: 15px;
+	margin-left: 15px;
+	margin-bottom: 15px;
+}
+
 #profile-jot-desc {
 	/*float: left;*/
 	width: 100%;
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index fce8618257..8561390ff2 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2137,6 +2137,15 @@ aside input[type='text'] {
 	margin-bottom: 15px;
 }
 
+.video-top-wrapper {
+	display: inline-block;
+	vertical-align: top;
+	margin-top: 15px;
+	margin-right: 15px;
+	margin-left: 15px;
+	margin-bottom: 15px;
+}
+
 #profile-jot-desc {
 	/*float: left;*/
 	width: 480px;
diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css
index 8c61a9f8b3..30c3e97c49 100644
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -2162,6 +2162,15 @@ input#profile-jot-email {
 	width: 587px;
 }
 
+.video-top-wrapper {
+	display: inline-block;
+	vertical-align: top;
+	margin-top: 15px;
+	margin-right: 15px;
+	margin-left: 15px;
+	margin-bottom: 15px;
+}
+
 #profile-jot-desc {
 	/*float: left;*/
 	width: 100%;
diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index 0e0ce6d71f..333f43c565 100644
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -2519,6 +2519,15 @@ aside input[type='text'] {
 	margin-bottom: 15px;
 }
 
+.video-top-wrapper {
+	display: inline-block;
+	vertical-align: top;
+	margin-top: 15px;
+	margin-right: 15px;
+	margin-left: 15px;
+	margin-bottom: 15px;
+}
+
 #profile-jot-desc {
 	/*float: left;*/
 	/*width: 480px;*/

From 5ac6e82e7d6857dc3d8c502eeac7aa080728e907 Mon Sep 17 00:00:00 2001
From: pixelroot <info@pixelbits.de>
Date: Tue, 7 May 2013 09:39:14 +0200
Subject: [PATCH 46/67] 	modified:   view/theme/smoothly/default.php 
 modified:   view/theme/smoothly/style.css 	modified:  
 view/theme/smoothly/theme.php

---
 view/theme/smoothly/default.php |  2 +-
 view/theme/smoothly/style.css   | 12 ++++++------
 view/theme/smoothly/theme.php   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php
index 867073f0c1..c8213bff7f 100644
--- a/view/theme/smoothly/default.php
+++ b/view/theme/smoothly/default.php
@@ -28,8 +28,8 @@
 	<footer id="footer">
 		<?php if(x($page, 'footer')) echo $page['footer']; ?>
 		<div id="scrollup" >
-		<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a>
 		<a href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/tobottom.png" alt="to bottom" title="to bottom" /></a>
+		<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a>
 		</div>
 	</footer>
 
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index bf7e639e0a..46f7894c1f 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -2,7 +2,7 @@
   	style.css
   	Theme: Smoothly
 	Maintainer: alex@friendica.pixelbits.de
-	last change: 2013-04-24
+	last change: 2013-05-07
 
 ** Colors ** 
 Blue links - #1873a2
@@ -574,14 +574,14 @@ ul#user-menu-popup li a.nav-sep {
 #lang-select-icon {
 	bottom: 5px;
 	cursor: pointer;
-	left: 915px;
+	left: 25px;
 	position: fixed;
 	z-index: 10;
 }
 #language-selector {
 	position: fixed;
 	bottom: 2px;
-	left: 945px;
+	left: 55px;
 	z-index: 10;
 }
 
@@ -1032,8 +1032,8 @@ ul .sidebar-group-li .icon {
 /* ================== */
 
 .contact-block-img {
-	width: 47px;
-	height: 47px;
+	width: 47px !important;
+	height: 47px !important;
 	margin-right: 2px;
 	border: 1px solid #7C7D7B;
 	border-radius: 3px;
@@ -3739,7 +3739,7 @@ margin-left: 0px;
 
 .field label {
     float: left;
-    width: 225px;
+    width: 230px;
 }
 
 .field checkbox {
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 76b3abc907..2500003499 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme optimized for iPad[2].
- * Version: Version 2013-04-24
+ * Version: Version 2013-05-07
  * Author: Anne Walk
  * Author: Devlon Duthied
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>

From 8c8d3913cca95975987815e64cb237636f399c5e Mon Sep 17 00:00:00 2001
From: pixelroot <info@pixelbits.de>
Date: Tue, 7 May 2013 14:01:54 +0200
Subject: [PATCH 47/67] 	modified:   view/theme/smoothly/style.css 
 modified:   view/theme/smoothly/theme.php

---
 view/theme/smoothly/style.css | 11 +++++++++++
 view/theme/smoothly/theme.php |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 46f7894c1f..e94a9d7ad9 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -639,6 +639,12 @@ aside h4 {
 	font-size: 1.3em;
 }
 
+.vcard  {
+	width: 205px;
+	padding-bottom: 10px;
+	/*border-bottom-style: dotted;*/
+}
+
 .vcard .title {
 	font-size: 1em;
 }
@@ -1061,11 +1067,13 @@ ul .sidebar-group-li .icon {
 .contact-block-h4,
 .contact-block-content {
 	margin: 0;
+	font-size: 1.2em;
 }
 
 #contact-block,
 #contact-block-end {
 	clear: both;
+	padding-top: 10px;
 }
 
 /* ======= */
@@ -4426,6 +4434,7 @@ hr.line-dots {
 	float: left;
 	text-align: left;
 	display: block;
+	line-height: 0.6em;
 }
 
 .adr, 
@@ -4435,6 +4444,8 @@ hr.line-dots {
 	float: left;
 	display: block;
 	margin-left: 8px;
+	line-height: 1em;
+	text-align: left;
 }
 
 #birthday-notice {}
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 2500003499..9c9af4e095 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme optimized for iPad[2].
- * Version: Version 2013-05-07
+ * Version: Version 2013-05-07.2
  * Author: Anne Walk
  * Author: Devlon Duthied
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>

From 258604f0365ea2ecdf4d016cb269ce71007611ec Mon Sep 17 00:00:00 2001
From: pixelroot <info@pixelbits.de>
Date: Tue, 7 May 2013 14:30:04 +0200
Subject: [PATCH 48/67] 	modified:   view/theme/smoothly/css/typography.css

---
 view/theme/smoothly/css/typography.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/smoothly/css/typography.css b/view/theme/smoothly/css/typography.css
index 074bd98163..d1895853e3 100644
--- a/view/theme/smoothly/css/typography.css
+++ b/view/theme/smoothly/css/typography.css
@@ -19,7 +19,7 @@ body {
 	padding-bottom: 3em;
 	width: 960px;
 	height: 100%;
-	font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif;
+	font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;
 	font-size: 15px;
 	font-size-adjust: none;
 	font-style: normal;

From bc57d7f64e12c3eaf26d9a9c062e6e010a058aed Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Tue, 7 May 2013 22:06:40 -0600
Subject: [PATCH 49/67] bug in main.js for VideoJS on initial page load

---
 js/main.js                             | 2 +-
 js/main.min.js                         | 2 +-
 view/theme/frost-mobile/js/main.js     | 2 +-
 view/theme/frost-mobile/js/main.min.js | 2 +-
 view/theme/frost/js/main.js            | 2 +-
 view/theme/frost/js/main.min.js        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/js/main.js b/js/main.js
index badad4edf5..f5cc6622a6 100644
--- a/js/main.js
+++ b/js/main.js
@@ -383,7 +383,7 @@
 			$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
 
 			// setup videos, since VideoJS won't take care of any loaded via AJAX
-			_V_.autoSetup();
+			if(typeof _V_ != 'undefined') _V_.autoSetup();
 		});
 	}
 
diff --git a/js/main.min.js b/js/main.min.js
index 698190ebbe..40ad867e9b 100644
--- a/js/main.min.js
+++ b/js/main.min.js
@@ -1 +1 @@
-function openClose(theID){if(document.getElementById(theID).style.display=="block"){document.getElementById(theID).style.display="none"}else{document.getElementById(theID).style.display="block"}}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;$(function(){$.ajaxSetup({cache:false});msie=$.browser.msie;$(".onoff input").each(function(){val=$(this).val();id=$(this).attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$(".onoff > a").click(function(event){event.preventDefault();var input=$(this).siblings("input");var val=1-input.val();var id=input.attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(){if(last_popup_menu){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}$("a[rel^=#]").click(function(e){close_last_popup_menu();menu=$($(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$(this).parent().toggleClass("selected");menu.toggle();if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$(this).parent()}return false});$("html").click(function(){close_last_popup_menu()});$("a.popupbox").colorbox({inline:true,transition:"elastic"});var notifications_tpl=unescape($("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($("<div>").append($("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($("<div>").append($("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,data){var invalid=$(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$(data).find("net").text();if(net==0){net="";$("#net-update").removeClass("show")}else{$("#net-update").addClass("show")}$("#net-update").html(net);var home=$(data).find("home").text();if(home==0){home="";$("#home-update").removeClass("show")}else{$("#home-update").addClass("show")}$("#home-update").html(home);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update").removeClass("show")}else{$("#intro-update").addClass("show")}$("#intro-update").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update").removeClass("show")}else{$("#mail-update").addClass("show")}$("#mail-update").html(mail);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update-li").removeClass("show")}else{$("#intro-update-li").addClass("show")}$("#intro-update-li").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update-li").removeClass("show")}else{$("#mail-update-li").addClass("show")}$("#mail-update-li").html(mail);var allevents=$(data).find("all-events").text();if(allevents==0){allevents="";$("#allevents-update").removeClass("show")}else{$("#allevents-update").addClass("show")}$("#allevents-update").html(allevents);var alleventstoday=$(data).find("all-events-today").text();if(alleventstoday==0){$("#allevents-update").removeClass("notif-allevents-today")}else{$("#allevents-update").addClass("notif-allevents-today")}var events=$(data).find("events").text();if(events==0){events="";$("#events-update").removeClass("show")}else{$("#events-update").addClass("show")}$("#events-update").html(events);var eventstoday=$(data).find("events-today").text();if(eventstoday==0){$("#events-update").removeClass("notif-events-today")}else{$("#events-update").addClass("notif-events-today")}var birthdays=$(data).find("birthdays").text();if(birthdays==0){birthdays="";$("#birthdays-update").removeClass("show")}else{$("#birthdays-update").addClass("show")}$("#birthdays-update").html(birthdays);var birthdaystoday=$(data).find("birthdays-today").text();if(birthdaystoday==0){$("#birthdays-update").removeClass("notif-birthdays-today")}else{$("#birthdays-update").addClass("notif-birthdays-today")}var eNotif=$(data).find("notif");if(eNotif.children("note").length==0){$("#nav-notifications-menu").html(notifications_empty)}else{nnm=$("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$(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)});$("img[data-src]",nnm).each(function(i,el){$(el).attr("src",$(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$("#nav-notifications-linkmenu").addClass("on")}else{$("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$("#notify-update").removeClass("show")}else{$("#notify-update").addClass("show")}$("#notify-update").html(notif);var eSysmsg=$(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$(this).text();$.jGrowl(text,{sticky:true,theme:"notice"})});eSysmsg.children("info").each(function(){text=$(this).text();$.jGrowl(text,{sticky:false,theme:"info",life:1e4})})});NavUpdate();$(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}$("#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:"");$.get(pingCmd,function(data){$(data).find("result").each(function(){$("nav").trigger("nav-update",this);if($("#live-network").length){src="network";liveUpdate()}if($("#live-profile").length){src="profile";liveUpdate()}if($("#live-community").length){src="community";liveUpdate()}if($("#live-notes").length){src="notes";liveUpdate()}if($("#live-display").length){src="display";liveUpdate()}if($("#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){$(".like-rotator").hide();return}if($(".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);$.get(update_url,function(data){in_progress=false;$(".toplevel_item",data).each(function(){var ident=$(this).attr("id");if($("#"+ident).length==0&&profile_page==1){$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("#"+prev).after($(this))}else{var id=$(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$("#collapsed-comments-"+id).is(":visible")}$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("html").height($("html").height());$("#"+ident).replaceWith($(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$("html").height("auto")}prev=ident});$(".like-rotator").hide();if(commentBusy){commentBusy=false;$("body").css("cursor","auto")}$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");_V_.autoSetup()})}function imgbright(node){$(node).removeClass("drophide").addClass("drop")}function imgdull(node){$(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$("#like-rotator-"+ident.toString()).show();$.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dosubthread(ident){unpause();$("#like-rotator-"+ident.toString()).show();$.get("subthread/"+ident.toString(),NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$("#like-rotator-"+ident).show();$.get("starred/"+ident,function(data){if(data.match(/1/)){$("#starred-"+ident).addClass("starred");$("#starred-"+ident).removeClass("unstarred");$("#star-"+ident).addClass("hidden");$("#unstar-"+ident).removeClass("hidden")}else{$("#starred-"+ident).addClass("unstarred");$("#starred-"+ident).removeClass("starred");$("#star-"+ident).removeClass("hidden");$("#unstar-"+ident).addClass("hidden")}$("#like-rotator-"+ident).hide()})}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;$.get("lockview/"+id,function(data){$("#panel").html(data);$("#panel").css({left:cursor.x+5,top:cursor.y+5});$("#panel").show()})}}function lockviewhide(){lockvisible=false;$("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$("body").css("cursor","wait");$("#comment-preview-inp-"+id).val("0");$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$("#comment-edit-wrapper-"+id).hide();$("#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){$("#comment-preview-inp-"+id).val("1");$("#comment-edit-preview-"+id).show();$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$("#comment-edit-preview-"+id).html(data.preview);$("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($("#collapsed-comments-"+id).is(":visible")){$("#collapsed-comments-"+id).hide();$("#hide-comments-"+id).html(window.showMore)}else{$("#collapsed-comments-"+id).show();$("#hide-comments-"+id).html(window.showFewer)}}function preview_post(){$("#jot-preview").val("1");$("#jot-preview-content").show();tinyMCE.triggerSave();$.post("item",$("#profile-jot-form").serialize(),function(data){if(data.preview){$("#jot-preview-content").html(data.preview);$("#jot-preview-content"+" a").click(function(){return false})}},"json");$("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$("#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){$("body .fakelink").css("cursor","wait");$.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$("#group-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$("body .fakelink").css("cursor","wait");$.get("profperm/"+gid+"/"+cid,function(data){$("#prof-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$("body").css("cursor","wait");$.get("contactgroup/"+gid+"/"+cid,function(data){$("body").css("cursor","auto")})}function checkboxhighlight(box){if($(box).is(":checked")){$(box).addClass("checkeditem")}else{$(box).removeClass("checkeditem")}}function notifyMarkAll(){$.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,forced_root_block:"div",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=$(elm).val();$.getJSON("pretheme?f=&theme="+theme,function(data){$("#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(theID){if(document.getElementById(theID).style.display=="block"){document.getElementById(theID).style.display="none"}else{document.getElementById(theID).style.display="block"}}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;$(function(){$.ajaxSetup({cache:false});msie=$.browser.msie;$(".onoff input").each(function(){val=$(this).val();id=$(this).attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$(".onoff > a").click(function(event){event.preventDefault();var input=$(this).siblings("input");var val=1-input.val();var id=input.attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(){if(last_popup_menu){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}$("a[rel^=#]").click(function(e){close_last_popup_menu();menu=$($(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$(this).parent().toggleClass("selected");menu.toggle();if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$(this).parent()}return false});$("html").click(function(){close_last_popup_menu()});$("a.popupbox").colorbox({inline:true,transition:"elastic"});var notifications_tpl=unescape($("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($("<div>").append($("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($("<div>").append($("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,data){var invalid=$(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$(data).find("net").text();if(net==0){net="";$("#net-update").removeClass("show")}else{$("#net-update").addClass("show")}$("#net-update").html(net);var home=$(data).find("home").text();if(home==0){home="";$("#home-update").removeClass("show")}else{$("#home-update").addClass("show")}$("#home-update").html(home);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update").removeClass("show")}else{$("#intro-update").addClass("show")}$("#intro-update").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update").removeClass("show")}else{$("#mail-update").addClass("show")}$("#mail-update").html(mail);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update-li").removeClass("show")}else{$("#intro-update-li").addClass("show")}$("#intro-update-li").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update-li").removeClass("show")}else{$("#mail-update-li").addClass("show")}$("#mail-update-li").html(mail);var allevents=$(data).find("all-events").text();if(allevents==0){allevents="";$("#allevents-update").removeClass("show")}else{$("#allevents-update").addClass("show")}$("#allevents-update").html(allevents);var alleventstoday=$(data).find("all-events-today").text();if(alleventstoday==0){$("#allevents-update").removeClass("notif-allevents-today")}else{$("#allevents-update").addClass("notif-allevents-today")}var events=$(data).find("events").text();if(events==0){events="";$("#events-update").removeClass("show")}else{$("#events-update").addClass("show")}$("#events-update").html(events);var eventstoday=$(data).find("events-today").text();if(eventstoday==0){$("#events-update").removeClass("notif-events-today")}else{$("#events-update").addClass("notif-events-today")}var birthdays=$(data).find("birthdays").text();if(birthdays==0){birthdays="";$("#birthdays-update").removeClass("show")}else{$("#birthdays-update").addClass("show")}$("#birthdays-update").html(birthdays);var birthdaystoday=$(data).find("birthdays-today").text();if(birthdaystoday==0){$("#birthdays-update").removeClass("notif-birthdays-today")}else{$("#birthdays-update").addClass("notif-birthdays-today")}var eNotif=$(data).find("notif");if(eNotif.children("note").length==0){$("#nav-notifications-menu").html(notifications_empty)}else{nnm=$("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$(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)});$("img[data-src]",nnm).each(function(i,el){$(el).attr("src",$(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$("#nav-notifications-linkmenu").addClass("on")}else{$("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$("#notify-update").removeClass("show")}else{$("#notify-update").addClass("show")}$("#notify-update").html(notif);var eSysmsg=$(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$(this).text();$.jGrowl(text,{sticky:true,theme:"notice"})});eSysmsg.children("info").each(function(){text=$(this).text();$.jGrowl(text,{sticky:false,theme:"info",life:1e4})})});NavUpdate();$(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}$("#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:"");$.get(pingCmd,function(data){$(data).find("result").each(function(){$("nav").trigger("nav-update",this);if($("#live-network").length){src="network";liveUpdate()}if($("#live-profile").length){src="profile";liveUpdate()}if($("#live-community").length){src="community";liveUpdate()}if($("#live-notes").length){src="notes";liveUpdate()}if($("#live-display").length){src="display";liveUpdate()}if($("#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){$(".like-rotator").hide();return}if($(".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);$.get(update_url,function(data){in_progress=false;$(".toplevel_item",data).each(function(){var ident=$(this).attr("id");if($("#"+ident).length==0&&profile_page==1){$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("#"+prev).after($(this))}else{var id=$(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$("#collapsed-comments-"+id).is(":visible")}$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("html").height($("html").height());$("#"+ident).replaceWith($(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$("html").height("auto")}prev=ident});$(".like-rotator").hide();if(commentBusy){commentBusy=false;$("body").css("cursor","auto")}$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");if(typeof _V_!="undefined")_V_.autoSetup()})}function imgbright(node){$(node).removeClass("drophide").addClass("drop")}function imgdull(node){$(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$("#like-rotator-"+ident.toString()).show();$.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dosubthread(ident){unpause();$("#like-rotator-"+ident.toString()).show();$.get("subthread/"+ident.toString(),NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$("#like-rotator-"+ident).show();$.get("starred/"+ident,function(data){if(data.match(/1/)){$("#starred-"+ident).addClass("starred");$("#starred-"+ident).removeClass("unstarred");$("#star-"+ident).addClass("hidden");$("#unstar-"+ident).removeClass("hidden")}else{$("#starred-"+ident).addClass("unstarred");$("#starred-"+ident).removeClass("starred");$("#star-"+ident).removeClass("hidden");$("#unstar-"+ident).addClass("hidden")}$("#like-rotator-"+ident).hide()})}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;$.get("lockview/"+id,function(data){$("#panel").html(data);$("#panel").css({left:cursor.x+5,top:cursor.y+5});$("#panel").show()})}}function lockviewhide(){lockvisible=false;$("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$("body").css("cursor","wait");$("#comment-preview-inp-"+id).val("0");$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$("#comment-edit-wrapper-"+id).hide();$("#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){$("#comment-preview-inp-"+id).val("1");$("#comment-edit-preview-"+id).show();$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$("#comment-edit-preview-"+id).html(data.preview);$("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($("#collapsed-comments-"+id).is(":visible")){$("#collapsed-comments-"+id).hide();$("#hide-comments-"+id).html(window.showMore)}else{$("#collapsed-comments-"+id).show();$("#hide-comments-"+id).html(window.showFewer)}}function preview_post(){$("#jot-preview").val("1");$("#jot-preview-content").show();tinyMCE.triggerSave();$.post("item",$("#profile-jot-form").serialize(),function(data){if(data.preview){$("#jot-preview-content").html(data.preview);$("#jot-preview-content"+" a").click(function(){return false})}},"json");$("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$("#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){$("body .fakelink").css("cursor","wait");$.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$("#group-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$("body .fakelink").css("cursor","wait");$.get("profperm/"+gid+"/"+cid,function(data){$("#prof-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$("body").css("cursor","wait");$.get("contactgroup/"+gid+"/"+cid,function(data){$("body").css("cursor","auto")})}function checkboxhighlight(box){if($(box).is(":checked")){$(box).addClass("checkeditem")}else{$(box).removeClass("checkeditem")}}function notifyMarkAll(){$.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,forced_root_block:"div",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=$(elm).val();$.getJSON("pretheme?f=&theme="+theme,function(data){$("#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-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index 819b0019f9..43782c8ecc 100644
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -391,7 +391,7 @@
 			$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
 
 			// setup videos, since VideoJS won't take care of any loaded via AJAX
-			_V_.autoSetup();
+			if(typeof _V_ != 'undefined') _V_.autoSetup();
 		});
 	}
 
diff --git a/view/theme/frost-mobile/js/main.min.js b/view/theme/frost-mobile/js/main.min.js
index 425bcf62ea..9d2dbb79aa 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)});$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||typeof profile_uid=="undefined"||!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");_V_.autoSetup()})}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 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:10,top:cursor.y+20});$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,forced_root_block:"div",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||typeof profile_uid=="undefined"||!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");if(typeof _V_!="undefined")_V_.autoSetup()})}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 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:10,top:cursor.y+20});$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,forced_root_block:"div",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/js/main.js b/view/theme/frost/js/main.js
index 741f611a52..fefd5e1fe4 100644
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -406,7 +406,7 @@
 			collapseHeight();
 
 			// setup videos, since VideoJS won't take care of any loaded via AJAX
-			_V_.autoSetup();
+			if(typeof _V_ != 'undefined') _V_.autoSetup();
 		});
 	}
 
diff --git a/view/theme/frost/js/main.min.js b/view/theme/frost/js/main.min.js
index 1752563dcf..6a77d62719 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)});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").colorbox({inline:true,transition:"elastic"});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||typeof profile_uid=="undefined"||!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")}$j("#"+ident+" .wall-item-body a img").each(function(){var aElem=$j(this).parent();var imgHref=aElem.attr("href");if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)){var cBoxClass=$j(this).closest(".wall-item-body").attr("id")+"-lightbox";$j(this).addClass(cBoxClass);aElem.colorbox({maxHeight:"90%",photo:true,rel:cBoxClass})}});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();_V_.autoSetup()})}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 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}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)});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").colorbox({inline:true,transition:"elastic"});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||typeof profile_uid=="undefined"||!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")}$j("#"+ident+" .wall-item-body a img").each(function(){var aElem=$j(this).parent();var imgHref=aElem.attr("href");if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)){var cBoxClass=$j(this).closest(".wall-item-body").attr("id")+"-lightbox";$j(this).addClass(cBoxClass);aElem.colorbox({maxHeight:"90%",photo:true,rel:cBoxClass})}});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();if(typeof _V_!="undefined")_V_.autoSetup()})}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 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}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

From 4bf41b8e5db7c933f1b8cd3738c32a375866d4b5 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 8 May 2013 03:26:20 -0400
Subject: [PATCH 50/67] check if view/smarty3 folder is writable by webserver

---
 include/friendica_smarty.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php
index 1326b0aca6..021feea2ac 100644
--- a/include/friendica_smarty.php
+++ b/include/friendica_smarty.php
@@ -45,6 +45,13 @@ class FriendicaSmarty extends Smarty {
 
 class FriendicaSmartyEngine implements ITemplateEngine {
 	static $name ="smarty3";
+   	
+    public function __construct(){
+		if(!is_writable('view/smarty3/')){
+			echo "<b>ERROR:</b> folder <tt>view/tpl/smarty3/</tt> must be writable by webserver."; killme();
+		}
+	} 
+    
 	// ITemplateEngine interface
 	public function replace_macros($s, $r) {
 		$template = '';

From 2da4f8268e74240212c557d3458a744f997c2eff Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 8 May 2013 11:34:30 +0300
Subject: [PATCH 51/67] fix smarty3 folder not writable message

---
 include/friendica_smarty.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php
index 021feea2ac..b516926754 100644
--- a/include/friendica_smarty.php
+++ b/include/friendica_smarty.php
@@ -48,7 +48,7 @@ class FriendicaSmartyEngine implements ITemplateEngine {
    	
     public function __construct(){
 		if(!is_writable('view/smarty3/')){
-			echo "<b>ERROR:</b> folder <tt>view/tpl/smarty3/</tt> must be writable by webserver."; killme();
+			echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver."; killme();
 		}
 	} 
     

From 523548ff2290bd746d69787043bc7a0f7dd8d10c Mon Sep 17 00:00:00 2001
From: pixelroot <info@pixelbits.de>
Date: Wed, 8 May 2013 11:08:21 +0200
Subject: [PATCH 52/67] 	modified:   view/theme/smoothly/default.php 
 modified:   view/theme/smoothly/images/down.png 	modified:  
 view/theme/smoothly/style.css 	modified:   view/theme/smoothly/theme.php 
 view/theme/smoothly/images/power.png 	view/theme/smoothly/images/up.png

---
 view/theme/smoothly/default.php     |   5 +++--
 view/theme/smoothly/images/down.png | Bin 537 -> 2060 bytes
 view/theme/smoothly/style.css       |  13 +++++++++----
 view/theme/smoothly/theme.php       |   2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php
index c8213bff7f..a437fa35a6 100644
--- a/view/theme/smoothly/default.php
+++ b/view/theme/smoothly/default.php
@@ -28,8 +28,9 @@
 	<footer id="footer">
 		<?php if(x($page, 'footer')) echo $page['footer']; ?>
 		<div id="scrollup" >
-		<a href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/tobottom.png" alt="to bottom" title="to bottom" /></a>
-		<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a>
+		<a class="item-scrollup" href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/down.png" alt="to bottom" title="to bottom" /></a>
+		<a class="item-scrollup" href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/up.png" alt="to top" title="to top" /></a>
+		<a class="item-scrollup" href="logout"><img src="view/theme/smoothly/images/power.png" alt="power" title="power" /></a>
 		</div>
 	</footer>
 
diff --git a/view/theme/smoothly/images/down.png b/view/theme/smoothly/images/down.png
index ab6f9fd49e9c7f10dfa75f0ef0ff255ff2871e6d..4c320184b4f6086d83f8ba39488708da36a43fa8 100644
GIT binary patch
delta 2055
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

delta 519
zcmV+i0{H!m5SavjiBL{Q4GJ0x0000DNk~Le0000H0000H2m=5B01UIY$N&HU0drDE
zLIAGL9O(c60J>02R7L;)|NsC0&(P4+)z#6`($3G%)6~@0*x1m~(bd-0($mw<&d%1?
z*VWb4{r&ye+1c6J+U@P_+}zyL)z#wT<JH&K-QM2d;o<y${QU6n@ZjL!_xJbb=;-<R
z`TqX?+}+*y`1s=D;_2z>&Cbrz)6?tg>+bIE(9+W5<mA-W*3;9|?e6aN_4Uuu(dp{y
z;o;%v=;+(r+~nls-{Il%^77^8=Irh5@bU51*4EkC+1=gU^7HfG;Na@&>ibq#a{vGU
z0d!JMQvg5^=GbNc0004EOGiWihy@);kw6}Q+zAd3Fe%bciWC3<0Lw{4K~xyiO_0}8
z13?S~S8>xNoQ-n;Y;w;0|8KE(2HXAEH6@K?Oas)I1JfVtR@{60cW|wO%nsvhurnjX
zK)KJArEF4Di|TDzm08X*uGLaFQ1#HNh{6p{(v%X{cen4eUia}VT*xvR;SIpahwT7v
zJazFD46NAB0qz$`>$)+{U2f-f!J%e~{bX9G<VPt%)`xhWc6~+8y&nw8rU(^v<&H45
zshxRs@ww?-Wa5-k8y8>xE-U&Xh#2{Ge?Cmc-=B-C!W?sW&o6Q93_jKQ{geOz002ov
JPDHLkV1gljE-L^4

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index e94a9d7ad9..70df846fe2 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -2,7 +2,7 @@
   	style.css
   	Theme: Smoothly
 	Maintainer: alex@friendica.pixelbits.de
-	last change: 2013-05-07
+	last change: 2013-05-08
 
 ** Colors ** 
 Blue links - #1873a2
@@ -3950,7 +3950,7 @@ footer {
 	display: block;
 	float: right;
 	font-size: 15px;
-	height: 2em;
+	height: 38px;
 	list-style: none outside none;
 	margin: 0 0 0 755px;
 	padding: 0;
@@ -4330,9 +4330,10 @@ ul.menu-popup {
 ----------------------------------------------------------- */
 #scrollup {
 	position: absolute;
-	right: 70px;
-	bottom: -4px;
+	right: 0px;
+	bottom: -1px;
 	z-index: 100;
+padding-right: 10px;
 }
 
 #scrollup a:hover {
@@ -4340,6 +4341,10 @@ ul.menu-popup {
 	border: 0;
 }
 
+.item-scrollup {
+	margin-left: 5px;
+}
+
 /* New posts and comments => background color
 ----------------------------------------------------------- */
 .shiny {
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 9c9af4e095..5c213a0e3e 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme optimized for iPad[2].
- * Version: Version 2013-05-07.2
+ * Version: Version 2013-05-08
  * Author: Anne Walk
  * Author: Devlon Duthied
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>

From e90c89f3fc8a976c5bab267ecba3b86fbc26576f Mon Sep 17 00:00:00 2001
From: pixelroot <info@pixelbits.de>
Date: Wed, 8 May 2013 11:09:08 +0200
Subject: [PATCH 53/67] 	new file:   view/theme/smoothly/images/power.png 
 new file:   view/theme/smoothly/images/up.png

---
 view/theme/smoothly/images/power.png | Bin 0 -> 3128 bytes
 view/theme/smoothly/images/up.png    | Bin 0 -> 2019 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 view/theme/smoothly/images/power.png
 create mode 100644 view/theme/smoothly/images/up.png

diff --git a/view/theme/smoothly/images/power.png b/view/theme/smoothly/images/power.png
new file mode 100644
index 0000000000000000000000000000000000000000..2541502c3f460ab5f93fcbc0872fbb097619aeb6
GIT binary patch
literal 3128
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
NJl5O_Q)Y^1{Rib4OYi^y

literal 0
HcmV?d00001

diff --git a/view/theme/smoothly/images/up.png b/view/theme/smoothly/images/up.png
new file mode 100644
index 0000000000000000000000000000000000000000..31a01644dfffe91c74805169587216837680e2ca
GIT binary patch
literal 2019
zcmV<92ORi`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*k-
z2ofz^7=O?J00(19L_t(o!@ZYjY*g13$A9;}Hw#`cWCkyTyn>g|8e@!bB&3$4*ccZu
zh9ISC)qH4_5+NZzR$UmdN~<o3N)kg`m53;6r67<9#3dmhj6+;O;$j?-3lg$RF&Nts
zwJm0Q%k78vW-?v~rmA|Sr>A@8%{l+G{qH$~xi1ay0)9XT#I)ZPU;;590a$YpD(3LJ
z2gm?2i;9Z!nwy)yo12@v$>Z^qE2Uh$&Zj~MEX(YVM52GWc=6&}-QC?|fRXmm69Ld%
z#ZRqTwW@l<h7AXNK3`c;Q6XhzODQQX!Rz;uot+H`qLBzjBF;bW+~M}%AUAK`#4wEh
zfq{W-M~)o1`6!P(3V;V#2;}eHy}K<K47SwP*73|U^>}?g5{U$fL>$w!ux%Tq6iO*{
zUB~P7k)4%^ZQJzr{+*9MzDP70J>1sT_KNF`#{%#GL7+Gs4!^&6aVXHbbsK)4pJ+5n
zA|A(b6(*HiN`YlL=eCWd6xo@X1OovK)8OQLCm9?Z7!HTSMbklOk5FE^XV0FKb#-;Y
zZQGv5GA*L97^Z1D)+Vz~%^q5%6!AoY2jk<+^ZTf;uSW=#RaRE|gU-&*HvoG!02=TV
zP#O-0-><8y3p6&aClZN}FbtG!JBnukFy%ZAl(KCmCMSu<<1DXUj;3kZWo2bAoj-s6
zcgeqLX`#pj3U}?=wXbT~vYM@}TZu#>j@8Ln3GwAyIMEYAIQukUsrV{|5>A4~5^-v3
zY8V<C%C4!Y$?xp!>_`XT1@fw^tLxURS@Wasyzl}jNEiu6kd)|}hOX=AQljY^nx-M$
zbE!G|^hda0ZPybIBN05hhZVIe`0Ue9>uOi7e5bp+`+@EP$N(0#w6yH6U%i@n85zW*
z@sx#{u5;qVd-V48A%&Qd!^!Oo_bbKIRaJar?Ke@TiI9?i-MPcpmOV{FV<R0M9VdWl
z-St9dFc{3s%E~HPUB4Q`FtL@Lij9<#YuB%{dDCX3l+KwZ(S$&_7VA=?dpvkF4b9`h
z<Iy>I==ZFBb}a~j6ave(xqJ5>D_5@Mqcdl|zH{f!`MT@=`5QNG+*DaviIh6F6-_hJ
zF;UlbEX#5^Ac0|+n3joY7?`GsVHoaX5|78({(LLCu20PgAs87OqqMk$niVUE#p5sO
zF1P1|LZOC=%1SKDno?fLdS70%oX!iK$g~7ZC1Kh-xemW|gsO_lDYBAz@x_BLC@m}F
z^5x4f>h8rd&+qq_mK2v@S=Nl2HcgWajg2%ntw-4kJ0(;hg~U?I@q}ezTNbtp+A>WH
zmpjryjE_&SWXTeQ5X+OdnpC!p*XJejFfxN!Y}<AOI~#1JQWfy(>jyx<&R2F|nodY;
z<$zR{L)Ft)EEYr8G?Y@v^t<${mU3xUDTNRMUDtW-!0R+Oujkv%8+fz*AiAz2gqZT}
z<7CPw=m(sVloFrM$8TSKjpn8%`ulHi^=cojEt_d?KZMuoaVkZKImwhyq+HYR`F#B9
z*T11*-8%aJaf4VaPBa?j%-M6av~1$wp+DgDdR-8YmnmKE+foYRvBa#%lghn5FKxg0
zCC@(h97A{SIaw_PQc5&U<Mind*wV6@_V$B#JRYRfW|imn`!Ovm1;7NNu~>ZI{{3O3
zoaq$ly1lLK=QMn49pnEV|1vMqu4RCu$Bwgo`_?oNaz@;9a<aK~>lR9>KHcr%#)pQ6
zKDu$^#>)i-1*t?zxBkaJ{TYpo>yc8jaNz=kQVzpO>9C^IkeX8&0(kNJ-{Xxp+u5<>
zhmIFqunGt)4AApg4@#-Gb+>_>=;-J;Ra;y8azjG{al?RV<x^W*%eixBU6+cq_=>5m
zP1?0wRaKcfOIn{B3?ihU_sSJUM@RppyS>`Ov9YoHBO@b&eSKF;DyyonO>+tnZP~nu
z)-5gIc0B2>x0OQK7MAUl-wYxGY`1(vp#pk)uaGc|Ywhjr6G^g;0Hdc)o%+e5MY(@2
zuc%0I|D%X#CIEZNJDrG<yiinFh!m0!KlqTz$;mD0{eTTvBO@b5Wo1Q?W!V)~RaIC?
z0ci=R<_I8_pzhg%g*g;1Ud+*>M;RF%{p0@q``?+~l39R#>C&aoD=RCu1_FV3`S}GY
z5b3dfTuY|XS~6QH7R=9~q@<X?b$8R#({nEz4zEl0h1#^qCIJ{-U0tX1^72{&fnY``
z6iRivN~t*kNO}OEAU}^#sDSQIKH==Sb9ckxaEV*`vv$Qc5C;-nU0r|8&(Ck2n3&91
zx^yXCkH-OGSu+46+pcuCXJ=&*Dk#9?^>F;yF?xD>hWGB>Tl~1TJRL;r!i5XR3knKC
zgM$NA8JU?B78c?0deJn^wc9C4U6U!A&d$yzFE^K*`SZDU?Q@R4`!2)7!-x0n+qZ76
zgUPI;SyNNffj}ToR$gAt((-cha`W-e^SNGdcs~)3bNlvf1_uYYe*HSJSge0=aPYqx
z&AxIt4F-doyk2kl^y}6cPObiE^nWv){$IxP{{Y=3Eos}Ko$3Gp002ovPDHLkV1nRZ
B-^Ks{

literal 0
HcmV?d00001


From b06dab97ba0f9bf1603e8ed350cd7851bb94a4c0 Mon Sep 17 00:00:00 2001
From: pixelroot <info@pixelbits.de>
Date: Wed, 8 May 2013 14:46:42 +0200
Subject: [PATCH 54/67] 	modified:   view/theme/smoothly/default.php 
 modified:   view/theme/smoothly/style.css 	new file:  
 view/theme/smoothly/templates/tools.tpl 	modified:  
 view/theme/smoothly/theme.php

---
 view/theme/smoothly/default.php         | 16 ++++++++++------
 view/theme/smoothly/style.css           |  9 +++++++--
 view/theme/smoothly/templates/tools.tpl | 11 +++++++++++
 view/theme/smoothly/theme.php           |  2 +-
 4 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 view/theme/smoothly/templates/tools.tpl

diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php
index a437fa35a6..9ac49820aa 100644
--- a/view/theme/smoothly/default.php
+++ b/view/theme/smoothly/default.php
@@ -26,14 +26,18 @@
 	<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
 
 	<footer id="footer">
-		<?php if(x($page, 'footer')) echo $page['footer']; ?>
-		<div id="scrollup" >
-		<a class="item-scrollup" href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/down.png" alt="to bottom" title="to bottom" /></a>
-		<a class="item-scrollup" href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/up.png" alt="to top" title="to top" /></a>
-		<a class="item-scrollup" href="logout"><img src="view/theme/smoothly/images/power.png" alt="power" title="power" /></a>
-		</div>
+	<?php if(x($page, 'footer')) echo $page['footer']; ?>
 	</footer>
 
+	<tools id="tools">
+	<?php if (x($page, 'tools')) echo $page['tools']; ?>
+	<div id="scrollup" >
+	<a class="item-scrollup" href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/down.png" alt="to bottom" title="to bottom" /></a>
+	<a class="item-scrollup" href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/up.png" alt="to top" title="to top" /></a>
+	<a class="item-scrollup" href="logout"><img src="view/theme/smoothly/images/power.png" alt="power" title="power" /></a>
+	</div>
+	</tools>
+
 	<?php if (x($page, 'bottom')) echo $page['bottom']; ?>
 </body>
 </html>
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 70df846fe2..476cd980e1 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -3933,7 +3933,13 @@ margin-left: 0px;
 	font-size: 0.7em; 
 }
 
-footer {
+footer { display: block; margin: 50px 20%; clear: both; }
+
+/* ========== */
+/* = Tools = */
+/* ========== */
+
+tools {
 	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f0edf0), color-stop(1, #e2e2e2) );
 	background: -moz-linear-gradient( center top, #f0edf0 5%, #e2e2e2 100% );
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f0edf0', endColorstr='#e2e2e2');
@@ -3961,7 +3967,6 @@ footer {
 	clear:both;
 }
 
-
 /* ======= */
 /* = ACL = */
 /* ======= */
diff --git a/view/theme/smoothly/templates/tools.tpl b/view/theme/smoothly/templates/tools.tpl
new file mode 100644
index 0000000000..fc7a68c5e6
--- /dev/null
+++ b/view/theme/smoothly/templates/tools.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+
+</nav>
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 5c213a0e3e..9c4c7ca330 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme optimized for iPad[2].
- * Version: Version 2013-05-08
+ * Version: Version 2013-05-08.2
  * Author: Anne Walk
  * Author: Devlon Duthied
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>

From 2c8d33a6e2b2225938a61295d823a0ffb42582c8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 9 May 2013 01:15:22 -0700
Subject: [PATCH 55/67] rev update

---
 boot.php            |   2 +-
 include/enotify.php |   8 ++-
 mod/item.php        |   5 +-
 util/messages.po    | 132 ++++++++++++++++++++++----------------------
 4 files changed, 78 insertions(+), 69 deletions(-)

diff --git a/boot.php b/boot.php
index cf4a7abfb6..4d2b5ccacd 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1688' );
+define ( 'FRIENDICA_VERSION',      '3.1.1695' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/include/enotify.php b/include/enotify.php
index c41f55a5d6..ab135a54b5 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -268,11 +268,17 @@ function notification($params) {
 	$datarray['type']  = $params['type'];
 	$datarray['verb']  = $params['verb'];
 	$datarray['otype'] = $params['otype'];
+	$datarray['abort'] = false;
  
 	call_hooks('enotify_store', $datarray);
 
-	// create notification entry in DB
+	if($datarray['abort']) {
+		pop_lang();
+		return;
+	}
 
+	// create notification entry in DB
+	if($datarray['store']) {
 	$r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype)
 		values('%s','%s','%s','%s','%s',%d,'%s',%d,%d,'%s','%s')",
 		dbesc($datarray['hash']),
diff --git a/mod/item.php b/mod/item.php
index ab4a989ecf..57a9680e96 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -44,6 +44,9 @@ function item_post(&$a) {
 	logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
 
 	$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
+
+	$message_id = ((x($_REQUEST,'message_id') && $api_source)  ? strip_tags($_REQUEST['message_id'])       : '');
+
 	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
 	$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
 
@@ -590,7 +593,7 @@ function item_post(&$a) {
 	
 	$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
 
-	$uri = item_new_uri($a->get_hostname(),$profile_uid);
+	$uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid));
 
 	// Fallback so that we alway have a thr-parent
 	if(!$thr_parent)
diff --git a/util/messages.po b/util/messages.po
index 9dd1731faa..d855f8a1a2 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1688\n"
+"Project-Id-Version: 3.1.1695\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-02 00:02-0700\n"
+"POT-Creation-Date: 2013-05-09 00:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
 #: ../../include/nav.php:77 ../../mod/profperm.php:103
 #: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88
-#: ../../boot.php:1945
+#: ../../boot.php:1946
 msgid "Profile"
 msgstr ""
 
@@ -30,7 +30,7 @@ msgid "Full Name:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
-#: ../../boot.php:1485
+#: ../../boot.php:1486
 msgid "Gender:"
 msgstr ""
 
@@ -51,7 +51,7 @@ msgid "Age:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
-#: ../../boot.php:1488
+#: ../../boot.php:1489
 msgid "Status:"
 msgstr ""
 
@@ -65,7 +65,7 @@ msgid "Sexual Preference:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
-#: ../../boot.php:1490
+#: ../../boot.php:1491
 msgid "Homepage:"
 msgstr ""
 
@@ -751,7 +751,7 @@ msgid "Finishes:"
 msgstr ""
 
 #: ../../include/bb2diaspora.php:415 ../../include/event.php:40
-#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1483
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1484
 msgid "Location:"
 msgstr ""
 
@@ -1001,7 +1001,7 @@ msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
 #: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
-#: ../../mod/match.php:58 ../../boot.php:1415
+#: ../../mod/match.php:58 ../../boot.php:1416
 msgid "Connect"
 msgstr ""
 
@@ -1078,7 +1078,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../include/contact_widgets.php:204 ../../mod/content.php:629
-#: ../../object/Item.php:365 ../../boot.php:669
+#: ../../object/Item.php:365 ../../boot.php:670
 msgid "show more"
 msgstr ""
 
@@ -1105,7 +1105,7 @@ msgstr ""
 msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/network.php:875
+#: ../../include/network.php:877
 msgid "view full size"
 msgstr ""
 
@@ -1289,7 +1289,7 @@ msgstr ""
 
 #: ../../include/items.php:4143 ../../mod/profiles.php:146
 #: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/display.php:242
-#: ../../mod/nogroup.php:25 ../../mod/item.php:140 ../../mod/item.php:156
+#: ../../mod/nogroup.php:25 ../../mod/item.php:143 ../../mod/item.php:159
 #: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
 #: ../../mod/contacts.php:147 ../../mod/settings.php:91
@@ -1978,7 +1978,7 @@ msgstr ""
 msgid "[no subject]"
 msgstr ""
 
-#: ../../include/message.php:144 ../../mod/item.php:443
+#: ../../include/message.php:144 ../../mod/item.php:446
 #: ../../mod/wall_upload.php:135 ../../mod/wall_upload.php:144
 #: ../../mod/wall_upload.php:151
 msgid "Wall Photos"
@@ -1992,7 +1992,7 @@ msgstr ""
 msgid "Clear notifications"
 msgstr ""
 
-#: ../../include/nav.php:73 ../../boot.php:1134
+#: ../../include/nav.php:73 ../../boot.php:1135
 msgid "Logout"
 msgstr ""
 
@@ -2000,7 +2000,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:76 ../../boot.php:1938
+#: ../../include/nav.php:76 ../../boot.php:1939
 msgid "Status"
 msgstr ""
 
@@ -2014,7 +2014,7 @@ msgid "Your profile page"
 msgstr ""
 
 #: ../../include/nav.php:78 ../../mod/fbrowser.php:25
-#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1952
+#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1953
 msgid "Photos"
 msgstr ""
 
@@ -2023,7 +2023,7 @@ msgid "Your photos"
 msgstr ""
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1962
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1963
 msgid "Events"
 msgstr ""
 
@@ -2039,7 +2039,7 @@ msgstr ""
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../include/nav.php:91 ../../boot.php:1135
+#: ../../include/nav.php:91 ../../boot.php:1136
 msgid "Login"
 msgstr ""
 
@@ -2056,7 +2056,7 @@ msgstr ""
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1110
+#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1111
 msgid "Register"
 msgstr ""
 
@@ -2185,7 +2185,7 @@ msgstr ""
 msgid "Account settings"
 msgstr ""
 
-#: ../../include/nav.php:169 ../../boot.php:1437
+#: ../../include/nav.php:169 ../../boot.php:1438
 msgid "Profiles"
 msgstr ""
 
@@ -2584,23 +2584,23 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:726 ../../boot.php:1443 ../../boot.php:1469
+#: ../../mod/profiles.php:726 ../../boot.php:1444 ../../boot.php:1470
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:727 ../../boot.php:1444
+#: ../../mod/profiles.php:727 ../../boot.php:1445
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:738 ../../boot.php:1454
+#: ../../mod/profiles.php:738 ../../boot.php:1455
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:740 ../../boot.php:1457
+#: ../../mod/profiles.php:740 ../../boot.php:1458
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:741 ../../boot.php:1458
+#: ../../mod/profiles.php:741 ../../boot.php:1459
 msgid "Edit visibility"
 msgstr ""
 
@@ -2628,7 +2628,7 @@ msgstr ""
 msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1969
+#: ../../mod/notes.php:44 ../../boot.php:1970
 msgid "Personal Notes"
 msgstr ""
 
@@ -3503,36 +3503,36 @@ msgstr ""
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/item.php:105
+#: ../../mod/item.php:108
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:307
+#: ../../mod/item.php:310
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:869
+#: ../../mod/item.php:872
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:894
+#: ../../mod/item.php:897
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:896
+#: ../../mod/item.php:899
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:897
+#: ../../mod/item.php:900
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:901
+#: ../../mod/item.php:904
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -5547,7 +5547,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:84 ../../boot.php:1149
+#: ../../mod/lostpass.php:84 ../../boot.php:1150
 msgid "Password Reset"
 msgstr ""
 
@@ -5933,7 +5933,7 @@ msgstr ""
 msgid "Home Notifications"
 msgstr ""
 
-#: ../../mod/photos.php:51 ../../boot.php:1955
+#: ../../mod/photos.php:51 ../../boot.php:1956
 msgid "Photo Albums"
 msgstr ""
 
@@ -6133,7 +6133,7 @@ msgstr ""
 
 #: ../../mod/photos.php:1551 ../../mod/photos.php:1595
 #: ../../mod/photos.php:1678 ../../mod/content.php:732
-#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:668
+#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:669
 msgid "Comment"
 msgstr ""
 
@@ -6326,7 +6326,7 @@ msgid ""
 "features and resources."
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:1323
+#: ../../mod/profile.php:21 ../../boot.php:1324
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -6965,124 +6965,124 @@ msgstr ""
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:667
+#: ../../boot.php:668
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:670
+#: ../../boot.php:671
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:997
+#: ../../boot.php:998
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:999
+#: ../../boot.php:1000
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1109
+#: ../../boot.php:1110
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:1137
+#: ../../boot.php:1138
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:1138
+#: ../../boot.php:1139
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:1139
+#: ../../boot.php:1140
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1142
+#: ../../boot.php:1143
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:1148
+#: ../../boot.php:1149
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1151
+#: ../../boot.php:1152
 msgid "Website Terms of Service"
 msgstr ""
 
-#: ../../boot.php:1152
+#: ../../boot.php:1153
 msgid "terms of service"
 msgstr ""
 
-#: ../../boot.php:1154
+#: ../../boot.php:1155
 msgid "Website Privacy Policy"
 msgstr ""
 
-#: ../../boot.php:1155
+#: ../../boot.php:1156
 msgid "privacy policy"
 msgstr ""
 
-#: ../../boot.php:1284
+#: ../../boot.php:1285
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1363 ../../boot.php:1467
+#: ../../boot.php:1364 ../../boot.php:1468
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1429
+#: ../../boot.php:1430
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1437
+#: ../../boot.php:1438
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../boot.php:1566 ../../boot.php:1652
+#: ../../boot.php:1567 ../../boot.php:1653
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1567 ../../boot.php:1653
+#: ../../boot.php:1568 ../../boot.php:1654
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1612 ../../boot.php:1693
+#: ../../boot.php:1613 ../../boot.php:1694
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1624
+#: ../../boot.php:1625
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1625
+#: ../../boot.php:1626
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1686
+#: ../../boot.php:1687
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1704
+#: ../../boot.php:1705
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1705
+#: ../../boot.php:1706
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1941
+#: ../../boot.php:1942
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1948
+#: ../../boot.php:1949
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1965
+#: ../../boot.php:1966
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1972
+#: ../../boot.php:1973
 msgid "Only You Can See This"
 msgstr ""

From ef4ebd85465939e527c864a875088b18410eee45 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 9 May 2013 01:17:11 -0700
Subject: [PATCH 56/67] remove stub code

---
 include/enotify.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/enotify.php b/include/enotify.php
index ab135a54b5..72365a762f 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -278,7 +278,7 @@ function notification($params) {
 	}
 
 	// create notification entry in DB
-	if($datarray['store']) {
+
 	$r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype)
 		values('%s','%s','%s','%s','%s',%d,'%s',%d,%d,'%s','%s')",
 		dbesc($datarray['hash']),

From ba6b2718cfe737a0d2bb35eb9a91e2aff86be75b Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 9 May 2013 18:38:57 +0200
Subject: [PATCH 57/67] DE: update to the strings

---
 view/de/friend_complete_eml.tpl |   2 +-
 view/de/intro_complete_eml.tpl  |   8 +-
 view/de/lostpass_eml.tpl        |  10 +-
 view/de/messages.po             | 356 ++++++++++++++++----------------
 view/de/request_notify_eml.tpl  |   2 +-
 5 files changed, 189 insertions(+), 189 deletions(-)

diff --git a/view/de/friend_complete_eml.tpl b/view/de/friend_complete_eml.tpl
index 39f2725ea9..2135f99750 100644
--- a/view/de/friend_complete_eml.tpl
+++ b/view/de/friend_complete_eml.tpl
@@ -4,7 +4,7 @@ Hallo $[username],
 	Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat 
 deine Kontaktanfrage auf '$[sitename]' bestätigt.
 
-Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
+Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und E-Mails
 ohne Einschränkungen austauschen.
 
 Rufe deine 'Kontakte' Seite auf $[sitename] auf, wenn du 
diff --git a/view/de/intro_complete_eml.tpl b/view/de/intro_complete_eml.tpl
index 9d47a6fb18..9039a7fca5 100644
--- a/view/de/intro_complete_eml.tpl
+++ b/view/de/intro_complete_eml.tpl
@@ -1,11 +1,11 @@
 
 Hallo $[username],
 
-	'$[fn]' auf '$[dfrn_url]' hat deine Verbindungsanfrage 
-auf '$[sitename]' akzeptiert.
+	'$[fn]' auf '$[dfrn_url]' akzeptierte 
+deine Verbindungsanfrage auf '$[sitename]'.
 
-	'$[fn]' hat entschieden Dich als "Fan" zu akzeptieren, was zu einigen 
-Einschränkungen bei der Kommunikation führt - wie zB das Schreiben von privaten Nachrichten und einige Profil
+	'$[fn]' hat entschieden dich als "Fan" zu akzeptieren, was zu einigen 
+Einschränkungen bei der Kommunikation führt - wie z.B. das Schreiben von privaten Nachrichten und einige Profil
 Interaktionen. Sollte dies ein Promi-Konto oder eine Forum-Seite sein, werden die Einstellungen
 automatisch angewandt.
 
diff --git a/view/de/lostpass_eml.tpl b/view/de/lostpass_eml.tpl
index 9f71bbfb1d..af91a0d467 100644
--- a/view/de/lostpass_eml.tpl
+++ b/view/de/lostpass_eml.tpl
@@ -5,23 +5,23 @@ Passworts empfangen. Um diese zu bestätigen folge bitte dem Link
 weiter unten oder kopiere ihn in die Adressleiste deines Browsers. 
 
 Wenn du die Anfrage NICHT gesendet haben solltest, dann IGNORIERE
-bitte diese Mail und den Link. 
+bitte diese E-Mail und den Link. 
 
-Dein Passwort wird nicht geändert werden solange wir nicht überprüfen
+Dein Passwort wird nicht geändert solange wir nicht überprüfen
 konnten, dass du die Anfrage gestellt hast. 
 
 Folge diesem Link um deine Identität zu verifizieren:
 
 $[reset_link]
 
-Du wirst eine weitere Email erhalten mit dem neuen Passwort.
+Du wirst eine weitere E-Mail erhalten mit dem neuen Passwort.
 
 Das Passwort kannst du anschließend wie gewohnt in deinen Account Einstellungen ändern.
 
 Die Login-Details sind die folgenden:
 
-Adresse der Seite:	$[siteurl]
-Login Name:	$[email]
+Adresse der Seite:»$[siteurl]
+Login Name:»$[email]
 
 
 
diff --git a/view/de/messages.po b/view/de/messages.po
index 4a864cbacb..829fb6bf40 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -25,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2013-04-25 00:02-0700\n"
-"PO-Revision-Date: 2013-04-26 17:47+0000\n"
+"POT-Creation-Date: 2013-05-09 00:02-0700\n"
+"PO-Revision-Date: 2013-05-09 16:17+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"
@@ -38,7 +38,7 @@ msgstr ""
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
 #: ../../include/nav.php:77 ../../mod/profperm.php:103
 #: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88
-#: ../../boot.php:1945
+#: ../../boot.php:1946
 msgid "Profile"
 msgstr "Profil"
 
@@ -47,7 +47,7 @@ msgid "Full Name:"
 msgstr "Kompletter Name:"
 
 #: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
-#: ../../boot.php:1485
+#: ../../boot.php:1486
 msgid "Gender:"
 msgstr "Geschlecht:"
 
@@ -68,7 +68,7 @@ msgid "Age:"
 msgstr "Alter:"
 
 #: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
-#: ../../boot.php:1488
+#: ../../boot.php:1489
 msgid "Status:"
 msgstr "Status:"
 
@@ -82,7 +82,7 @@ msgid "Sexual Preference:"
 msgstr "Sexuelle Vorlieben:"
 
 #: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
-#: ../../boot.php:1490
+#: ../../boot.php:1491
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -387,34 +387,34 @@ msgstr "Frag mich"
 msgid "stopped following"
 msgstr "wird nicht mehr gefolgt"
 
-#: ../../include/Contact.php:225 ../../include/conversation.php:838
+#: ../../include/Contact.php:225 ../../include/conversation.php:878
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: ../../include/Contact.php:226 ../../include/conversation.php:832
+#: ../../include/Contact.php:226 ../../include/conversation.php:872
 msgid "View Status"
 msgstr "Pinnwand anschauen"
 
-#: ../../include/Contact.php:227 ../../include/conversation.php:833
+#: ../../include/Contact.php:227 ../../include/conversation.php:873
 msgid "View Profile"
 msgstr "Profil anschauen"
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:834
+#: ../../include/Contact.php:228 ../../include/conversation.php:874
 msgid "View Photos"
 msgstr "Bilder anschauen"
 
 #: ../../include/Contact.php:229 ../../include/Contact.php:251
-#: ../../include/conversation.php:835
+#: ../../include/conversation.php:875
 msgid "Network Posts"
 msgstr "Netzwerkbeiträge"
 
 #: ../../include/Contact.php:230 ../../include/Contact.php:251
-#: ../../include/conversation.php:836
+#: ../../include/conversation.php:876
 msgid "Edit Contact"
 msgstr "Kontakt bearbeiten"
 
 #: ../../include/Contact.php:231 ../../include/Contact.php:251
-#: ../../include/conversation.php:837
+#: ../../include/conversation.php:877
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
@@ -710,8 +710,8 @@ msgstr "Aktivität"
 #: ../../object/Item.php:364 ../../object/Item.php:377
 msgid "comment"
 msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] "Kommentar"
+msgstr[0] "Kommentar"
+msgstr[1] "Kommentare"
 
 #: ../../include/text.php:1837
 msgid "post"
@@ -768,7 +768,7 @@ msgid "Finishes:"
 msgstr "Endet:"
 
 #: ../../include/bb2diaspora.php:415 ../../include/event.php:40
-#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1483
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1484
 msgid "Location:"
 msgstr "Ort:"
 
@@ -1018,7 +1018,7 @@ msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "Beispiel: bob@example.com, http://example.com/barbara"
 
 #: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
-#: ../../mod/match.php:58 ../../boot.php:1415
+#: ../../mod/match.php:58 ../../boot.php:1416
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1095,7 +1095,7 @@ msgstr[0] "%d gemeinsamer Kontakt"
 msgstr[1] "%d gemeinsame Kontakte"
 
 #: ../../include/contact_widgets.php:204 ../../mod/content.php:629
-#: ../../object/Item.php:365 ../../boot.php:669
+#: ../../object/Item.php:365 ../../boot.php:670
 msgid "show more"
 msgstr "mehr anzeigen"
 
@@ -1103,7 +1103,7 @@ msgstr "mehr anzeigen"
 msgid " on Last.fm"
 msgstr " bei Last.fm"
 
-#: ../../include/bbcode.php:210 ../../include/bbcode.php:545
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:549
 msgid "Image/photo"
 msgstr "Bild/Foto"
 
@@ -1114,15 +1114,15 @@ msgid ""
 "href=\"%s\" target=\"external-link\">post</a>"
 msgstr "<span><a href=\"%s\" target=\"external-link\">%s</a> schrieb den folgenden <a href=\"%s\" target=\"external-link\">Beitrag</a>"
 
-#: ../../include/bbcode.php:510 ../../include/bbcode.php:530
+#: ../../include/bbcode.php:514 ../../include/bbcode.php:534
 msgid "$1 wrote:"
 msgstr "$1 hat geschrieben:"
 
-#: ../../include/bbcode.php:553 ../../include/bbcode.php:554
+#: ../../include/bbcode.php:557 ../../include/bbcode.php:558
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
-#: ../../include/network.php:875
+#: ../../include/network.php:877
 msgid "view full size"
 msgstr "Volle Größe anzeigen"
 
@@ -1294,7 +1294,7 @@ msgstr "Möchtest du wirklich dieses Item löschen?"
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../include/items.php:4023 ../../include/conversation.php:1080
+#: ../../include/items.php:4023 ../../include/conversation.php:1120
 #: ../../mod/contacts.php:249 ../../mod/settings.php:585
 #: ../../mod/settings.php:611 ../../mod/dfrn_request.php:848
 #: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
@@ -1306,7 +1306,7 @@ msgstr "Abbrechen"
 
 #: ../../include/items.php:4143 ../../mod/profiles.php:146
 #: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/display.php:242
-#: ../../mod/nogroup.php:25 ../../mod/item.php:140 ../../mod/item.php:156
+#: ../../mod/nogroup.php:25 ../../mod/item.php:143 ../../mod/item.php:159
 #: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
 #: ../../mod/contacts.php:147 ../../mod/settings.php:91
@@ -1559,44 +1559,44 @@ 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:587 ../../mod/content.php:461
+#: ../../include/conversation.php:612 ../../mod/content.php:461
 #: ../../mod/content.php:763 ../../object/Item.php:126
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../../include/conversation.php:588 ../../mod/admin.php:770
+#: ../../include/conversation.php:613 ../../mod/admin.php:770
 #: ../../mod/settings.php:647 ../../mod/group.php:171
 #: ../../mod/photos.php:1637 ../../mod/content.php:462
 #: ../../mod/content.php:764 ../../object/Item.php:127
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../../include/conversation.php:627 ../../mod/content.php:495
+#: ../../include/conversation.php:652 ../../mod/content.php:495
 #: ../../mod/content.php:875 ../../mod/content.php:876
 #: ../../object/Item.php:306 ../../object/Item.php:307
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Das Profil von %s auf %s betrachten."
 
-#: ../../include/conversation.php:639 ../../object/Item.php:297
+#: ../../include/conversation.php:664 ../../object/Item.php:297
 msgid "Categories:"
-msgstr "Kategorien"
+msgstr "Kategorien:"
 
-#: ../../include/conversation.php:640 ../../object/Item.php:298
+#: ../../include/conversation.php:665 ../../object/Item.php:298
 msgid "Filed under:"
 msgstr "Abgelegt unter:"
 
-#: ../../include/conversation.php:647 ../../mod/content.php:505
+#: ../../include/conversation.php:672 ../../mod/content.php:505
 #: ../../mod/content.php:887 ../../object/Item.php:320
 #, php-format
 msgid "%s from %s"
 msgstr "%s von %s"
 
-#: ../../include/conversation.php:662 ../../mod/content.php:520
+#: ../../include/conversation.php:687 ../../mod/content.php:520
 msgid "View in context"
 msgstr "Im Zusammenhang betrachten"
 
-#: ../../include/conversation.php:664 ../../include/conversation.php:1060
+#: ../../include/conversation.php:689 ../../include/conversation.php:1100
 #: ../../mod/editpost.php:124 ../../mod/wallmessage.php:156
 #: ../../mod/message.php:334 ../../mod/message.php:565
 #: ../../mod/photos.php:1532 ../../mod/content.php:522
@@ -1604,205 +1604,205 @@ msgstr "Im Zusammenhang betrachten"
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: ../../include/conversation.php:728
+#: ../../include/conversation.php:768
 msgid "remove"
 msgstr "löschen"
 
-#: ../../include/conversation.php:732
+#: ../../include/conversation.php:772
 msgid "Delete Selected Items"
 msgstr "Lösche die markierten Beiträge"
 
-#: ../../include/conversation.php:831
+#: ../../include/conversation.php:871
 msgid "Follow Thread"
 msgstr "Folge der Unterhaltung"
 
-#: ../../include/conversation.php:900
+#: ../../include/conversation.php:940
 #, php-format
 msgid "%s likes this."
 msgstr "%s mag das."
 
-#: ../../include/conversation.php:900
+#: ../../include/conversation.php:940
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s mag das nicht."
 
-#: ../../include/conversation.php:905
+#: ../../include/conversation.php:945
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr "<span  %1$s>%2$d Personen</span> mögen das"
 
-#: ../../include/conversation.php:908
+#: ../../include/conversation.php:948
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr "<span  %1$s>%2$d Personen</span> mögen das nicht"
 
-#: ../../include/conversation.php:922
+#: ../../include/conversation.php:962
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:928
+#: ../../include/conversation.php:968
 #, php-format
 msgid ", and %d other people"
 msgstr " und %d andere"
 
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:970
 #, php-format
 msgid "%s like this."
 msgstr "%s mögen das."
 
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:970
 #, php-format
 msgid "%s don't like this."
 msgstr "%s mögen das nicht."
 
-#: ../../include/conversation.php:957 ../../include/conversation.php:975
+#: ../../include/conversation.php:997 ../../include/conversation.php:1015
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Für <strong>jedermann</strong> sichtbar"
 
-#: ../../include/conversation.php:958 ../../include/conversation.php:976
+#: ../../include/conversation.php:998 ../../include/conversation.php:1016
 #: ../../mod/wallmessage.php:127 ../../mod/wallmessage.php:135
 #: ../../mod/message.php:283 ../../mod/message.php:291
 #: ../../mod/message.php:466 ../../mod/message.php:474
 msgid "Please enter a link URL:"
 msgstr "Bitte gib die URL des Links ein:"
 
-#: ../../include/conversation.php:959 ../../include/conversation.php:977
+#: ../../include/conversation.php:999 ../../include/conversation.php:1017
 msgid "Please enter a video link/URL:"
 msgstr "Bitte Link/URL zum Video einfügen:"
 
-#: ../../include/conversation.php:960 ../../include/conversation.php:978
+#: ../../include/conversation.php:1000 ../../include/conversation.php:1018
 msgid "Please enter an audio link/URL:"
 msgstr "Bitte Link/URL zum Audio einfügen:"
 
-#: ../../include/conversation.php:961 ../../include/conversation.php:979
+#: ../../include/conversation.php:1001 ../../include/conversation.php:1019
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:962 ../../include/conversation.php:980
+#: ../../include/conversation.php:1002 ../../include/conversation.php:1020
 #: ../../mod/filer.php:30
 msgid "Save to Folder:"
-msgstr "In diesen Ordner verschieben:"
+msgstr "In diesem Ordner speichern:"
 
-#: ../../include/conversation.php:963 ../../include/conversation.php:981
+#: ../../include/conversation.php:1003 ../../include/conversation.php:1021
 msgid "Where are you right now?"
 msgstr "Wo hältst du dich jetzt gerade auf?"
 
-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:1004
 msgid "Delete item(s)?"
 msgstr "Einträge löschen?"
 
-#: ../../include/conversation.php:1006
+#: ../../include/conversation.php:1046
 msgid "Post to Email"
 msgstr "An E-Mail senden"
 
-#: ../../include/conversation.php:1041 ../../mod/photos.php:1531
+#: ../../include/conversation.php:1081 ../../mod/photos.php:1531
 msgid "Share"
 msgstr "Teilen"
 
-#: ../../include/conversation.php:1042 ../../mod/editpost.php:110
+#: ../../include/conversation.php:1082 ../../mod/editpost.php:110
 #: ../../mod/wallmessage.php:154 ../../mod/message.php:332
 #: ../../mod/message.php:562
 msgid "Upload photo"
 msgstr "Foto hochladen"
 
-#: ../../include/conversation.php:1043 ../../mod/editpost.php:111
+#: ../../include/conversation.php:1083 ../../mod/editpost.php:111
 msgid "upload photo"
 msgstr "Bild hochladen"
 
-#: ../../include/conversation.php:1044 ../../mod/editpost.php:112
+#: ../../include/conversation.php:1084 ../../mod/editpost.php:112
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: ../../include/conversation.php:1045 ../../mod/editpost.php:113
+#: ../../include/conversation.php:1085 ../../mod/editpost.php:113
 msgid "attach file"
 msgstr "Datei anhängen"
 
-#: ../../include/conversation.php:1046 ../../mod/editpost.php:114
+#: ../../include/conversation.php:1086 ../../mod/editpost.php:114
 #: ../../mod/wallmessage.php:155 ../../mod/message.php:333
 #: ../../mod/message.php:563
 msgid "Insert web link"
 msgstr "Einen Link einfügen"
 
-#: ../../include/conversation.php:1047 ../../mod/editpost.php:115
+#: ../../include/conversation.php:1087 ../../mod/editpost.php:115
 msgid "web link"
 msgstr "Weblink"
 
-#: ../../include/conversation.php:1048 ../../mod/editpost.php:116
+#: ../../include/conversation.php:1088 ../../mod/editpost.php:116
 msgid "Insert video link"
 msgstr "Video-Adresse einfügen"
 
-#: ../../include/conversation.php:1049 ../../mod/editpost.php:117
+#: ../../include/conversation.php:1089 ../../mod/editpost.php:117
 msgid "video link"
 msgstr "Video-Link"
 
-#: ../../include/conversation.php:1050 ../../mod/editpost.php:118
+#: ../../include/conversation.php:1090 ../../mod/editpost.php:118
 msgid "Insert audio link"
 msgstr "Audio-Adresse einfügen"
 
-#: ../../include/conversation.php:1051 ../../mod/editpost.php:119
+#: ../../include/conversation.php:1091 ../../mod/editpost.php:119
 msgid "audio link"
 msgstr "Audio-Link"
 
-#: ../../include/conversation.php:1052 ../../mod/editpost.php:120
+#: ../../include/conversation.php:1092 ../../mod/editpost.php:120
 msgid "Set your location"
 msgstr "Deinen Standort festlegen"
 
-#: ../../include/conversation.php:1053 ../../mod/editpost.php:121
+#: ../../include/conversation.php:1093 ../../mod/editpost.php:121
 msgid "set location"
 msgstr "Ort setzen"
 
-#: ../../include/conversation.php:1054 ../../mod/editpost.php:122
+#: ../../include/conversation.php:1094 ../../mod/editpost.php:122
 msgid "Clear browser location"
 msgstr "Browser-Standort leeren"
 
-#: ../../include/conversation.php:1055 ../../mod/editpost.php:123
+#: ../../include/conversation.php:1095 ../../mod/editpost.php:123
 msgid "clear location"
 msgstr "Ort löschen"
 
-#: ../../include/conversation.php:1057 ../../mod/editpost.php:137
+#: ../../include/conversation.php:1097 ../../mod/editpost.php:137
 msgid "Set title"
 msgstr "Titel setzen"
 
-#: ../../include/conversation.php:1059 ../../mod/editpost.php:139
+#: ../../include/conversation.php:1099 ../../mod/editpost.php:139
 msgid "Categories (comma-separated list)"
 msgstr "Kategorien (kommasepariert)"
 
-#: ../../include/conversation.php:1061 ../../mod/editpost.php:125
+#: ../../include/conversation.php:1101 ../../mod/editpost.php:125
 msgid "Permission settings"
 msgstr "Berechtigungseinstellungen"
 
-#: ../../include/conversation.php:1062
+#: ../../include/conversation.php:1102
 msgid "permissions"
 msgstr "Zugriffsrechte"
 
-#: ../../include/conversation.php:1070 ../../mod/editpost.php:133
+#: ../../include/conversation.php:1110 ../../mod/editpost.php:133
 msgid "CC: email addresses"
 msgstr "Cc: E-Mail-Addressen"
 
-#: ../../include/conversation.php:1071 ../../mod/editpost.php:134
+#: ../../include/conversation.php:1111 ../../mod/editpost.php:134
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: ../../include/conversation.php:1073 ../../mod/editpost.php:140
+#: ../../include/conversation.php:1113 ../../mod/editpost.php:140
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Z.B.: bob@example.com, mary@example.com"
 
-#: ../../include/conversation.php:1077 ../../mod/editpost.php:145
+#: ../../include/conversation.php:1117 ../../mod/editpost.php:145
 #: ../../mod/photos.php:1553 ../../mod/photos.php:1597
 #: ../../mod/photos.php:1680 ../../mod/content.php:742
 #: ../../object/Item.php:662
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../include/conversation.php:1086
+#: ../../include/conversation.php:1126
 msgid "Post to Groups"
 msgstr "Poste an Gruppe"
 
-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:1127
 msgid "Post to Contacts"
 msgstr "Poste an Kontakte"
 
-#: ../../include/conversation.php:1088
+#: ../../include/conversation.php:1128
 msgid "Private post"
 msgstr "Privater Beitrag"
 
@@ -1996,7 +1996,7 @@ msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."
 msgid "[no subject]"
 msgstr "[kein Betreff]"
 
-#: ../../include/message.php:144 ../../mod/item.php:443
+#: ../../include/message.php:144 ../../mod/item.php:446
 #: ../../mod/wall_upload.php:135 ../../mod/wall_upload.php:144
 #: ../../mod/wall_upload.php:151
 msgid "Wall Photos"
@@ -2004,13 +2004,13 @@ msgstr "Pinnwand-Bilder"
 
 #: ../../include/nav.php:34 ../../mod/navigation.php:20
 msgid "Nothing new here"
-msgstr "Keine Neuigkeiten."
+msgstr "Keine Neuigkeiten"
 
 #: ../../include/nav.php:38 ../../mod/navigation.php:24
 msgid "Clear notifications"
 msgstr "Bereinige Benachrichtigungen"
 
-#: ../../include/nav.php:73 ../../boot.php:1134
+#: ../../include/nav.php:73 ../../boot.php:1135
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -2018,7 +2018,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:76 ../../boot.php:1938
+#: ../../include/nav.php:76 ../../boot.php:1939
 msgid "Status"
 msgstr "Status"
 
@@ -2032,7 +2032,7 @@ msgid "Your profile page"
 msgstr "Deine Profilseite"
 
 #: ../../include/nav.php:78 ../../mod/fbrowser.php:25
-#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1952
+#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1953
 msgid "Photos"
 msgstr "Bilder"
 
@@ -2041,7 +2041,7 @@ msgid "Your photos"
 msgstr "Deine Fotos"
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1962
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1963
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -2057,7 +2057,7 @@ msgstr "Persönliche Notizen"
 msgid "Your personal photos"
 msgstr "Deine privaten Fotos"
 
-#: ../../include/nav.php:91 ../../boot.php:1135
+#: ../../include/nav.php:91 ../../boot.php:1136
 msgid "Login"
 msgstr "Anmeldung"
 
@@ -2074,7 +2074,7 @@ msgstr "Pinnwand"
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1110
+#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1111
 msgid "Register"
 msgstr "Registrieren"
 
@@ -2203,7 +2203,7 @@ msgstr "Einstellungen"
 msgid "Account settings"
 msgstr "Kontoeinstellungen"
 
-#: ../../include/nav.php:169 ../../boot.php:1437
+#: ../../include/nav.php:169 ../../boot.php:1438
 msgid "Profiles"
 msgstr "Profile"
 
@@ -2542,7 +2542,7 @@ msgstr "Beispiel: Fischen Fotografie Software"
 
 #: ../../mod/profiles.php:660
 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)"
+msgstr "(Wird verwendet, um potentielle Freunde zu finden, kann von Fremden eingesehen werden)"
 
 #: ../../mod/profiles.php:661
 msgid "(Used for searching profiles, never shown to others)"
@@ -2566,7 +2566,7 @@ msgstr "Musikalische Interessen"
 
 #: ../../mod/profiles.php:666
 msgid "Books, literature"
-msgstr "Literatur/Bücher"
+msgstr "Bücher, Literatur"
 
 #: ../../mod/profiles.php:667
 msgid "Television"
@@ -2578,11 +2578,11 @@ msgstr "Filme/Tänze/Kultur/Unterhaltung"
 
 #: ../../mod/profiles.php:669
 msgid "Love/romance"
-msgstr "Liebesleben"
+msgstr "Liebe/Romantik"
 
 #: ../../mod/profiles.php:670
 msgid "Work/employment"
-msgstr "Arbeit/Beschäftigung"
+msgstr "Arbeit/Anstellung"
 
 #: ../../mod/profiles.php:671
 msgid "School/education"
@@ -2600,25 +2600,25 @@ msgstr "Alter: "
 
 #: ../../mod/profiles.php:725
 msgid "Edit/Manage Profiles"
-msgstr "Verwalte/Editiere Profile"
+msgstr "Bearbeite/Verwalte Profile"
 
-#: ../../mod/profiles.php:726 ../../boot.php:1443 ../../boot.php:1469
+#: ../../mod/profiles.php:726 ../../boot.php:1444 ../../boot.php:1470
 msgid "Change profile photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:727 ../../boot.php:1444
+#: ../../mod/profiles.php:727 ../../boot.php:1445
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: ../../mod/profiles.php:738 ../../boot.php:1454
+#: ../../mod/profiles.php:738 ../../boot.php:1455
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: ../../mod/profiles.php:740 ../../boot.php:1457
+#: ../../mod/profiles.php:740 ../../boot.php:1458
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:741 ../../boot.php:1458
+#: ../../mod/profiles.php:741 ../../boot.php:1459
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
@@ -2628,7 +2628,7 @@ msgstr "Zugriff verweigert"
 
 #: ../../mod/profperm.php:25 ../../mod/profperm.php:55
 msgid "Invalid profile identifier."
-msgstr "Ungültiger Profil-Bezeichner"
+msgstr "Ungültiger Profil-Bezeichner."
 
 #: ../../mod/profperm.php:101
 msgid "Profile Visibility Editor"
@@ -2646,7 +2646,7 @@ msgstr "Sichtbar für"
 msgid "All Contacts (with secure profile access)"
 msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
 
-#: ../../mod/notes.php:44 ../../boot.php:1969
+#: ../../mod/notes.php:44 ../../boot.php:1970
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
@@ -2685,7 +2685,7 @@ msgstr "{0} möchte mit dir in Kontakt treten"
 
 #: ../../mod/ping.php:243
 msgid "{0} sent you a message"
-msgstr "{0} hat dir eine Nachricht geschickt"
+msgstr "{0} schickte dir eine Nachricht"
 
 #: ../../mod/ping.php:248
 msgid "{0} requested registration"
@@ -2778,7 +2778,7 @@ msgstr "Automatisches Freundekonto"
 
 #: ../../mod/admin.php:186
 msgid "Blog Account"
-msgstr "Blog Account"
+msgstr "Blog-Konto"
 
 #: ../../mod/admin.php:187
 msgid "Private Forum"
@@ -2888,7 +2888,7 @@ msgstr "Systemsprache"
 
 #: ../../mod/admin.php:503
 msgid "System theme"
-msgstr "Systemweites Thema"
+msgstr "Systemweites Theme"
 
 #: ../../mod/admin.php:503
 msgid ""
@@ -2898,7 +2898,7 @@ msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben
 
 #: ../../mod/admin.php:504
 msgid "Mobile system theme"
-msgstr "Systemweites mobiles Thema"
+msgstr "Systemweites mobiles Theme"
 
 #: ../../mod/admin.php:504
 msgid "Theme for mobile devices"
@@ -2940,17 +2940,17 @@ msgstr "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation o
 
 #: ../../mod/admin.php:509
 msgid "Maximum image size"
-msgstr "Maximale Größe von Bildern"
+msgstr "Maximale Bildgröße"
 
 #: ../../mod/admin.php:509
 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."
+msgstr "Maximale Uploadgröße von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."
 
 #: ../../mod/admin.php:510
 msgid "Maximum image length"
-msgstr "Maximale Länge von Bildern"
+msgstr "Maximale Bildlänge"
 
 #: ../../mod/admin.php:510
 msgid ""
@@ -2974,7 +2974,7 @@ msgstr "Registrierungsmethode"
 
 #: ../../mod/admin.php:514
 msgid "Maximum Daily Registrations"
-msgstr "Maximum täglicher Neuanmeldungen"
+msgstr "Maximum täglicher Registrierungen"
 
 #: ../../mod/admin.php:514
 msgid ""
@@ -3071,13 +3071,13 @@ msgstr "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als
 
 #: ../../mod/admin.php:524
 msgid "Don't include post content in email notifications"
-msgstr "Inhalte von Beiträgen nicht in Email Benachrichtigungen versenden"
+msgstr "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden"
 
 #: ../../mod/admin.php:524
 msgid ""
 "Don't include the content of a post/comment/private message/etc. in the "
 "email notifications that are sent out from this site, as a privacy measure."
-msgstr "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz, nicht in Email-Benachrichtigungen einbinden."
+msgstr "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden."
 
 #: ../../mod/admin.php:525
 msgid "Disallow public access to addons listed in the apps menu."
@@ -3522,37 +3522,37 @@ msgstr "FTP Nutzername"
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
-#: ../../mod/item.php:105
+#: ../../mod/item.php:108
 msgid "Unable to locate original post."
 msgstr "Konnte den Originalbeitrag nicht finden."
 
-#: ../../mod/item.php:307
+#: ../../mod/item.php:310
 msgid "Empty post discarded."
 msgstr "Leerer Beitrag wurde verworfen."
 
-#: ../../mod/item.php:869
+#: ../../mod/item.php:872
 msgid "System error. Post not saved."
 msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden."
 
-#: ../../mod/item.php:894
+#: ../../mod/item.php:897
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."
 
-#: ../../mod/item.php:896
+#: ../../mod/item.php:899
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "Du kannst sie online unter %s besuchen"
 
-#: ../../mod/item.php:897
+#: ../../mod/item.php:900
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem du auf diese Nachricht antwortest."
 
-#: ../../mod/item.php:901
+#: ../../mod/item.php:904
 #, php-format
 msgid "%s posted an update."
 msgstr "%s hat ein Update veröffentlicht."
@@ -3714,7 +3714,7 @@ msgstr "Quelle (bbcode) Text:"
 
 #: ../../mod/babel.php:23
 msgid "Source (Diaspora) text to convert to BBcode:"
-msgstr "Eingabe (Diaspora) Nach BBCode zu konvertierender Text:"
+msgstr "Eingabe (Diaspora) nach BBCode zu konvertierender Text:"
 
 #: ../../mod/babel.php:31
 msgid "Source input: "
@@ -3750,7 +3750,7 @@ msgstr "bb2md2html2bb: "
 
 #: ../../mod/babel.php:69
 msgid "Source input (Diaspora format): "
-msgstr "Texteingabe (Diaspora Format): "
+msgstr "Originaltext (Diaspora Format): "
 
 #: ../../mod/babel.php:74
 msgid "diaspora2bb: "
@@ -4721,7 +4721,7 @@ msgstr "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Sei
 
 #: ../../mod/delegate.php:124
 msgid "Existing Page Managers"
-msgstr "Vorhandene Seiten Manager"
+msgstr "Vorhandene Seitenmanager"
 
 #: ../../mod/delegate.php:126
 msgid "Existing Page Delegates"
@@ -4741,11 +4741,11 @@ msgstr "Hinzufügen"
 
 #: ../../mod/delegate.php:132
 msgid "No entries."
-msgstr "Keine Einträge"
+msgstr "Keine Einträge."
 
 #: ../../mod/poke.php:192
 msgid "Poke/Prod"
-msgstr "Anstupsen etc."
+msgstr "Anstupsen"
 
 #: ../../mod/poke.php:193
 msgid "poke, prod or do other things to somebody"
@@ -4855,7 +4855,7 @@ msgstr "Diese Kontaktanfrage wurde bereits akzeptiert."
 
 #: ../../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."
+msgstr "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung."
 
 #: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:518
 msgid "Warning: profile location has no identifiable owner name."
@@ -4863,7 +4863,7 @@ msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladr
 
 #: ../../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."
+msgstr "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse."
 
 #: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:523
 #, php-format
@@ -4903,7 +4903,7 @@ msgstr "Ungültiger Locator"
 
 #: ../../mod/dfrn_request.php:335
 msgid "Invalid email address."
-msgstr "Ungültige E-Mail Adresse."
+msgstr "Ungültige E-Mail-Adresse."
 
 #: ../../mod/dfrn_request.php:362
 msgid "This account has not been configured for email. Request failed."
@@ -4987,7 +4987,7 @@ msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jo
 
 #: ../../mod/dfrn_request.php:834
 msgid "Please answer the following:"
-msgstr "Bitte beantworte Folgendes:"
+msgstr "Bitte beantworte folgendes:"
 
 #: ../../mod/dfrn_request.php:835
 #, php-format
@@ -5050,7 +5050,7 @@ msgstr "Möchtest du wirklich diese Empfehlung löschen?"
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
-msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."
+msgstr "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."
 
 #: ../../mod/suggest.php:90
 msgid "Ignore/Hide"
@@ -5165,7 +5165,7 @@ msgstr "Account exportieren"
 msgid ""
 "Export your account info and contacts. Use this to make a backup of your "
 "account and/or to move it to another server."
-msgstr "Exportiere deine Account Informationen und die Kontakte. Verwende dies um ein Backup deines Accounts anzulegen und/oder ihn auf einen anderen Server umzuziehen."
+msgstr "Exportiere deine Accountinformationen und Kontakte. Verwende dies um ein Backup deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen."
 
 #: ../../mod/uexport.php:73
 msgid "Export all"
@@ -5176,7 +5176,7 @@ msgid ""
 "Export your accout info, contacts and all your items as json. Could be a "
 "very big file, and could take a lot of time. Use this to make a full backup "
 "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)."
+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 (Fotos werden nicht exportiert)."
 
 #: ../../mod/filer.php:30
 msgid "- select -"
@@ -5376,7 +5376,7 @@ msgstr "%s: Keine gültige Email Adresse."
 
 #: ../../mod/invite.php:73
 msgid "Please join us on Friendica"
-msgstr "Bitte trete bei uns auf Friendica bei"
+msgstr "Wir laden Dich zu unserem sozialen Netzwerk Friendica ein"
 
 #: ../../mod/invite.php:84
 msgid "Invitation limit exceeded. Please contact your site administrator."
@@ -5539,7 +5539,7 @@ msgstr "Umgerechnete lokale Zeit: %s"
 
 #: ../../mod/localtime.php:41
 msgid "Please select your timezone:"
-msgstr "Bitte wähle deine Zeitzone."
+msgstr "Bitte wähle deine Zeitzone:"
 
 #: ../../mod/lockview.php:31 ../../mod/lockview.php:39
 msgid "Remote privacy information not available."
@@ -5568,7 +5568,7 @@ msgid ""
 "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:84 ../../boot.php:1149
+#: ../../mod/lostpass.php:84 ../../boot.php:1150
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
@@ -5629,11 +5629,11 @@ msgstr "Verwalte Identitäten und/oder Seiten"
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
-msgstr "Zwischen verschiedenen Identitäten oder Foren wechseln, die deine Zugangsdaten (E-Mail und Passwort) teilen oder zu denen du „Verwalten“-Befugnisse bekommen hast."
+msgstr "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die deine Kontoinformationen teilen oder zu denen du „Verwalten“-Befugnisse bekommen hast."
 
 #: ../../mod/manage.php:108
 msgid "Select an identity to manage: "
-msgstr "Wähle eine Identität zum Verwalten: "
+msgstr "Wähle eine Identität zum Verwalten aus: "
 
 #: ../../mod/match.php:12
 msgid "Profile Match"
@@ -5954,7 +5954,7 @@ msgstr "Keine weiteren Pinnwand-Benachrichtigungen"
 msgid "Home Notifications"
 msgstr "Pinnwand Benachrichtigungen"
 
-#: ../../mod/photos.php:51 ../../boot.php:1955
+#: ../../mod/photos.php:51 ../../boot.php:1956
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
@@ -6155,7 +6155,7 @@ msgstr "Das bist du"
 
 #: ../../mod/photos.php:1551 ../../mod/photos.php:1595
 #: ../../mod/photos.php:1678 ../../mod/content.php:732
-#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:668
+#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:669
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -6348,7 +6348,7 @@ msgid ""
 " features and resources."
 msgstr "Unsere <strong>Hilfe</strong> Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten."
 
-#: ../../mod/profile.php:21 ../../boot.php:1323
+#: ../../mod/profile.php:21 ../../boot.php:1324
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
@@ -6362,11 +6362,11 @@ msgstr "Friendica-Server für soziale Netzwerke – Setup"
 
 #: ../../mod/install.php:123
 msgid "Could not connect to database."
-msgstr "Verbindung zur Datenbank gescheitert"
+msgstr "Verbindung zur Datenbank gescheitert."
 
 #: ../../mod/install.php:127
 msgid "Could not create table."
-msgstr "Konnte Tabelle nicht erstellen."
+msgstr "Tabelle konnte nicht angelegt werden."
 
 #: ../../mod/install.php:133
 msgid "Your Friendica site database has been installed."
@@ -6399,7 +6399,7 @@ msgstr "Datenbankverbindung"
 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."
+msgstr "Um Friendica installieren zu können, müssen wir wissen, wie wir mit deiner Datenbank Kontakt aufnehmen können."
 
 #: ../../mod/install.php:229
 msgid ""
@@ -6662,17 +6662,17 @@ msgstr "OpenID Protokollfehler. Keine ID zurückgegeben."
 #: ../../mod/openid.php:53
 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."
+msgstr "Nutzerkonto wurde nicht gefunden und OpenID-Registrierung ist auf diesem Server nicht gestattet."
 
 #: ../../mod/profile_photo.php:44
 msgid "Image uploaded but image cropping failed."
-msgstr "Bilder hochgeladen, aber das Zuschneiden ist fehlgeschlagen."
+msgstr "Bild hochgeladen, aber das Zuschneiden schlug fehl."
 
 #: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:84
 #: ../../mod/profile_photo.php:91 ../../mod/profile_photo.php:308
 #, php-format
 msgid "Image size reduction [%s] failed."
-msgstr "Verkleinern der Bildgröße von [%s] ist gescheitert."
+msgstr "Verkleinern der Bildgröße von [%s] scheiterte."
 
 #: ../../mod/profile_photo.php:118
 msgid ""
@@ -6690,7 +6690,7 @@ msgstr "Datei hochladen:"
 
 #: ../../mod/profile_photo.php:243
 msgid "Select a profile:"
-msgstr "Profil auswählen"
+msgstr "Profil auswählen:"
 
 #: ../../mod/profile_photo.php:245
 msgid "Upload"
@@ -6702,7 +6702,7 @@ msgstr "diesen Schritt überspringen"
 
 #: ../../mod/profile_photo.php:248
 msgid "select a photo from your photo albums"
-msgstr "wähle ein Foto von deinen Fotoalben"
+msgstr "wähle ein Foto aus deinen Fotoalben"
 
 #: ../../mod/profile_photo.php:262
 msgid "Crop Image"
@@ -6718,7 +6718,7 @@ msgstr "Bearbeitung abgeschlossen"
 
 #: ../../mod/profile_photo.php:299
 msgid "Image uploaded successfully."
-msgstr "Bild erfolgreich auf den Server geladen."
+msgstr "Bild erfolgreich hochgeladen."
 
 #: ../../mod/community.php:23
 msgid "Not available."
@@ -6773,7 +6773,7 @@ msgstr "Bild"
 
 #: ../../mod/content.php:740 ../../object/Item.php:660
 msgid "Link"
-msgstr "Verweis"
+msgstr "Link"
 
 #: ../../mod/content.php:741 ../../object/Item.php:661
 msgid "Video"
@@ -6988,124 +6988,124 @@ msgstr "Schriftgröße in Eingabefeldern"
 msgid "toggle mobile"
 msgstr "auf/von Mobile Ansicht wechseln"
 
-#: ../../boot.php:667
+#: ../../boot.php:668
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: ../../boot.php:670
+#: ../../boot.php:671
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: ../../boot.php:997
+#: ../../boot.php:998
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
 
-#: ../../boot.php:999
+#: ../../boot.php:1000
 #, php-format
 msgid "Update Error at %s"
 msgstr "Updatefehler bei %s"
 
-#: ../../boot.php:1109
+#: ../../boot.php:1110
 msgid "Create a New Account"
 msgstr "Neues Konto erstellen"
 
-#: ../../boot.php:1137
+#: ../../boot.php:1138
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder E-Mail-Adresse: "
 
-#: ../../boot.php:1138
+#: ../../boot.php:1139
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:1139
+#: ../../boot.php:1140
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: ../../boot.php:1142
+#: ../../boot.php:1143
 msgid "Or login using OpenID: "
 msgstr "Oder melde dich mit deiner OpenID an: "
 
-#: ../../boot.php:1148
+#: ../../boot.php:1149
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:1151
+#: ../../boot.php:1152
 msgid "Website Terms of Service"
 msgstr "Website Nutzungsbedingungen"
 
-#: ../../boot.php:1152
+#: ../../boot.php:1153
 msgid "terms of service"
 msgstr "Nutzungsbedingungen"
 
-#: ../../boot.php:1154
+#: ../../boot.php:1155
 msgid "Website Privacy Policy"
 msgstr "Website Datenschutzerklärung"
 
-#: ../../boot.php:1155
+#: ../../boot.php:1156
 msgid "privacy policy"
 msgstr "Datenschutzerklärung"
 
-#: ../../boot.php:1284
+#: ../../boot.php:1285
 msgid "Requested account is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../boot.php:1363 ../../boot.php:1467
+#: ../../boot.php:1364 ../../boot.php:1468
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: ../../boot.php:1429
+#: ../../boot.php:1430
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../boot.php:1437
+#: ../../boot.php:1438
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
 
-#: ../../boot.php:1566 ../../boot.php:1652
+#: ../../boot.php:1567 ../../boot.php:1653
 msgid "g A l F d"
 msgstr "l, d. F G \\U\\h\\r"
 
-#: ../../boot.php:1567 ../../boot.php:1653
+#: ../../boot.php:1568 ../../boot.php:1654
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1612 ../../boot.php:1693
+#: ../../boot.php:1613 ../../boot.php:1694
 msgid "[today]"
 msgstr "[heute]"
 
-#: ../../boot.php:1624
+#: ../../boot.php:1625
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:1625
+#: ../../boot.php:1626
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:1686
+#: ../../boot.php:1687
 msgid "[No description]"
 msgstr "[keine Beschreibung]"
 
-#: ../../boot.php:1704
+#: ../../boot.php:1705
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: ../../boot.php:1705
+#: ../../boot.php:1706
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1941
+#: ../../boot.php:1942
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:1948
+#: ../../boot.php:1949
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1965
+#: ../../boot.php:1966
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1972
+#: ../../boot.php:1973
 msgid "Only You Can See This"
 msgstr "Nur du kannst das sehen"
diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl
index 16a4f7abe5..da1fe5bdce 100644
--- a/view/de/request_notify_eml.tpl
+++ b/view/de/request_notify_eml.tpl
@@ -8,7 +8,7 @@ erhalten.
 Du kannst sein/ihr Profil unter $[url] finden.
 
 Bitte melde dich an um die komplette Anfrage einzusehen 
-und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
+und die Kontaktanfrage zu bestätigen oder zu ignorieren oder abzulehnen.
 
 $[siteurl]
 

From 218be8a3c050df2c092f2f630d3d193ad914215d Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 9 May 2013 18:40:11 +0200
Subject: [PATCH 58/67] DE: Update to the strings

---
 view/de/strings.php | 94 ++++++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/view/de/strings.php b/view/de/strings.php
index b849806cee..15d1eaad5b 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -172,8 +172,8 @@ $a->strings["event"] = "Veranstaltung";
 $a->strings["photo"] = "Foto";
 $a->strings["activity"] = "Aktivität";
 $a->strings["comment"] = array(
-	0 => "",
-	1 => "Kommentar",
+	0 => "Kommentar",
+	1 => "Kommentare",
 );
 $a->strings["post"] = "Beitrag";
 $a->strings["Item filed"] = "Beitrag abgelegt";
@@ -370,7 +370,7 @@ $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s hat %2\$s\\s %3\$
 $a->strings["Select"] = "Auswählen";
 $a->strings["Delete"] = "Löschen";
 $a->strings["View %s's profile @ %s"] = "Das Profil von %s auf %s betrachten.";
-$a->strings["Categories:"] = "Kategorien";
+$a->strings["Categories:"] = "Kategorien:";
 $a->strings["Filed under:"] = "Abgelegt unter:";
 $a->strings["%s from %s"] = "%s von %s";
 $a->strings["View in context"] = "Im Zusammenhang betrachten";
@@ -391,7 +391,7 @@ $a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:";
 $a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfügen:";
 $a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:";
 $a->strings["Tag term:"] = "Tag:";
-$a->strings["Save to Folder:"] = "In diesen Ordner verschieben:";
+$a->strings["Save to Folder:"] = "In diesem Ordner speichern:";
 $a->strings["Where are you right now?"] = "Wo hältst du dich jetzt gerade auf?";
 $a->strings["Delete item(s)?"] = "Einträge löschen?";
 $a->strings["Post to Email"] = "An E-Mail senden";
@@ -461,7 +461,7 @@ $a->strings["Photo:"] = "Foto:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen.";
 $a->strings["[no subject]"] = "[kein Betreff]";
 $a->strings["Wall Photos"] = "Pinnwand-Bilder";
-$a->strings["Nothing new here"] = "Keine Neuigkeiten.";
+$a->strings["Nothing new here"] = "Keine Neuigkeiten";
 $a->strings["Clear notifications"] = "Bereinige Benachrichtigungen";
 $a->strings["Logout"] = "Abmelden";
 $a->strings["End this session"] = "Diese Sitzung beenden";
@@ -587,28 +587,28 @@ $a->strings["Religious Views:"] = "Religiöse Ansichten:";
 $a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:";
 $a->strings["Private Keywords:"] = "Private Schlüsselwörter:";
 $a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software";
-$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Freunde zu finden, kann von Fremden eingesehen werden)";
 $a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)";
 $a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von dir …";
 $a->strings["Hobbies/Interests"] = "Hobbies/Interessen";
 $a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke";
 $a->strings["Musical interests"] = "Musikalische Interessen";
-$a->strings["Books, literature"] = "Literatur/Bücher";
+$a->strings["Books, literature"] = "Bücher, Literatur";
 $a->strings["Television"] = "Fernsehen";
 $a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung";
-$a->strings["Love/romance"] = "Liebesleben";
-$a->strings["Work/employment"] = "Arbeit/Beschäftigung";
+$a->strings["Love/romance"] = "Liebe/Romantik";
+$a->strings["Work/employment"] = "Arbeit/Anstellung";
 $a->strings["School/education"] = "Schule/Ausbildung";
 $a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein.";
 $a->strings["Age: "] = "Alter: ";
-$a->strings["Edit/Manage Profiles"] = "Verwalte/Editiere Profile";
+$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile";
 $a->strings["Change profile photo"] = "Profilbild ändern";
 $a->strings["Create New Profile"] = "Neues Profil anlegen";
 $a->strings["Profile Image"] = "Profilbild";
 $a->strings["visible to everybody"] = "sichtbar für jeden";
 $a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
 $a->strings["Permission denied"] = "Zugriff verweigert";
-$a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner";
+$a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner.";
 $a->strings["Profile Visibility Editor"] = "Editor für die Profil-Sichtbarkeit";
 $a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen";
 $a->strings["Visible To"] = "Sichtbar für";
@@ -621,7 +621,7 @@ $a->strings["Visit %s's profile [%s]"] = "Besuche %ss Profil [%s]";
 $a->strings["Edit contact"] = "Kontakt bearbeiten";
 $a->strings["Contacts who are not members of a group"] = "Kontakte, die keiner Gruppe zugewiesen sind";
 $a->strings["{0} wants to be your friend"] = "{0} möchte mit dir in Kontakt treten";
-$a->strings["{0} sent you a message"] = "{0} hat dir eine Nachricht geschickt";
+$a->strings["{0} sent you a message"] = "{0} schickte dir eine Nachricht";
 $a->strings["{0} requested registration"] = "{0} möchte sich registrieren";
 $a->strings["{0} commented %s's post"] = "{0} kommentierte einen Beitrag von %s";
 $a->strings["{0} liked %s's post"] = "{0} mag %ss Beitrag";
@@ -643,7 +643,7 @@ $a->strings["Normal Account"] = "Normales Konto";
 $a->strings["Soapbox Account"] = "Marktschreier-Konto";
 $a->strings["Community/Celebrity Account"] = "Forum/Promi-Konto";
 $a->strings["Automatic Friend Account"] = "Automatisches Freundekonto";
-$a->strings["Blog Account"] = "Blog Account";
+$a->strings["Blog Account"] = "Blog-Konto";
 $a->strings["Private Forum"] = "Privates Forum";
 $a->strings["Message queues"] = "Nachrichten-Warteschlangen";
 $a->strings["Administration"] = "Administration";
@@ -670,9 +670,9 @@ $a->strings["Performance"] = "Performance";
 $a->strings["Site name"] = "Seitenname";
 $a->strings["Banner/Logo"] = "Banner/Logo";
 $a->strings["System language"] = "Systemsprache";
-$a->strings["System theme"] = "Systemweites Thema";
+$a->strings["System theme"] = "Systemweites Theme";
 $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>";
-$a->strings["Mobile system theme"] = "Systemweites mobiles Thema";
+$a->strings["Mobile system theme"] = "Systemweites mobiles Theme";
 $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";
@@ -682,14 +682,14 @@ $a->strings["Hide help entry from navigation menu"] = "Verberge den Menüeintrag
 $a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden.";
 $a->strings["Single user instance"] = "Ein-Nutzer Instanz";
 $a->strings["Make this instance multi-user or single-user for the named user"] = "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt.";
-$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";
+$a->strings["Maximum image size"] = "Maximale Bildgröße";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Uploadgröße von Bildern in Bytes. Standard ist 0, d.h. ohne Limit.";
+$a->strings["Maximum image length"] = "Maximale Bildlänge";
 $a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet.";
 $a->strings["JPEG image quality"] = "Qualität des JPEG Bildes";
 $a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust.";
 $a->strings["Register policy"] = "Registrierungsmethode";
-$a->strings["Maximum Daily Registrations"] = "Maximum täglicher Neuanmeldungen";
+$a->strings["Maximum Daily Registrations"] = "Maximum täglicher Registrierungen";
 $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."] = "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.";
 $a->strings["Register text"] = "Registrierungstext";
 $a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungsseite angezeigt.";
@@ -709,8 +709,8 @@ $a->strings["Allow threaded items"] = "Erlaube Threads in Diskussionen";
 $a->strings["Allow infinite level threading for items on this site."] = "Erlaube ein unendliches Level für Threads auf dieser Seite.";
 $a->strings["Private posts by default for new users"] = "Private Beiträge als Standard für neue Nutzer";
 $a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen.";
-$a->strings["Don't include post content in email notifications"] = "Inhalte von Beiträgen nicht in Email Benachrichtigungen versenden";
-$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz, nicht in Email-Benachrichtigungen einbinden.";
+$a->strings["Don't include post content in email notifications"] = "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden";
+$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden.";
 $a->strings["Disallow public access to addons listed in the apps menu."] = "Öffentlichen Zugriff auf Addons im Apps Menü verbieten.";
 $a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt.";
 $a->strings["Don't embed private images in posts"] = "Private Bilder nicht in Beiträgen einbetten.";
@@ -855,7 +855,7 @@ $a->strings["Remove My Account"] = "Konto löschen";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen.";
 $a->strings["Please enter your password for verification:"] = "Bitte gib dein Passwort zur Verifikation ein:";
 $a->strings["Source (bbcode) text:"] = "Quelle (bbcode) Text:";
-$a->strings["Source (Diaspora) text to convert to BBcode:"] = "Eingabe (Diaspora) Nach BBCode zu konvertierender Text:";
+$a->strings["Source (Diaspora) text to convert to BBcode:"] = "Eingabe (Diaspora) nach BBCode zu konvertierender Text:";
 $a->strings["Source input: "] = "Originaltext:";
 $a->strings["bb2html (raw HTML): "] = "bb2html (reines HTML): ";
 $a->strings["bb2html: "] = "bb2html: ";
@@ -864,7 +864,7 @@ $a->strings["bb2md: "] = "bb2md: ";
 $a->strings["bb2md2html: "] = "bb2md2html: ";
 $a->strings["bb2dia2bb: "] = "bb2dia2bb: ";
 $a->strings["bb2md2html2bb: "] = "bb2md2html2bb: ";
-$a->strings["Source input (Diaspora format): "] = "Texteingabe (Diaspora Format): ";
+$a->strings["Source input (Diaspora format): "] = "Originaltext (Diaspora Format): ";
 $a->strings["diaspora2bb: "] = "diaspora2bb: ";
 $a->strings["Common Friends"] = "Gemeinsame Freunde";
 $a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte.";
@@ -1100,13 +1100,13 @@ $a->strings["Poll/Feed URL"] = "Pull/Feed-URL";
 $a->strings["New photo from this URL"] = "Neues Foto von dieser URL";
 $a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden.";
 $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."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!";
-$a->strings["Existing Page Managers"] = "Vorhandene Seiten Manager";
+$a->strings["Existing Page Managers"] = "Vorhandene Seitenmanager";
 $a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite";
 $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
 $a->strings["Remove"] = "Entfernen";
 $a->strings["Add"] = "Hinzufügen";
-$a->strings["No entries."] = "Keine Einträge";
-$a->strings["Poke/Prod"] = "Anstupsen etc.";
+$a->strings["No entries."] = "Keine Einträge.";
+$a->strings["Poke/Prod"] = "Anstupsen";
 $a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
 $a->strings["Recipient"] = "Empfänger";
 $a->strings["Choose what you wish to do to recipient"] = "Was willst du mit dem Empfänger machen:";
@@ -1131,9 +1131,9 @@ $a->strings["Connection accepted at %s"] = "Auf %s wurde die Verbindung akzeptie
 $a->strings["%1\$s has joined %2\$s"] = "%1\$s ist %2\$s beigetreten";
 $a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen";
 $a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert.";
-$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung.";
+$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung.";
 $a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden.";
-$a->strings["Warning: profile location has no profile photo."] = "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden.";
+$a->strings["Warning: profile location has no profile photo."] = "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse.";
 $a->strings["%d required parameter was not found at the given location"] = array(
 	0 => "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden",
 	1 => "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden",
@@ -1145,7 +1145,7 @@ $a->strings["%s has received too many connection requests today."] = "%s hat heu
 $a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen.";
 $a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen.";
 $a->strings["Invalid locator"] = "Ungültiger Locator";
-$a->strings["Invalid email address."] = "Ungültige E-Mail Adresse.";
+$a->strings["Invalid email address."] = "Ungültige E-Mail-Adresse.";
 $a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen.";
 $a->strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen an der angegebenen Stelle nicht finden.";
 $a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
@@ -1163,7 +1163,7 @@ $a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "<s
 $a->strings["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>."] = "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.";
 $a->strings["Friend/Connection Request"] = "Freundschafts-/Kontaktanfrage";
 $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
-$a->strings["Please answer the following:"] = "Bitte beantworte Folgendes:";
+$a->strings["Please answer the following:"] = "Bitte beantworte folgendes:";
 $a->strings["Does %s know you?"] = "Kennt %s dich?";
 $a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:";
 $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
@@ -1177,7 +1177,7 @@ $a->strings["Site Directory"] = "Verzeichnis";
 $a->strings["Gender: "] = "Geschlecht:";
 $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
 $a->strings["Do you really want to delete this suggestion?"] = "Möchtest du wirklich diese Empfehlung löschen?";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
 $a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
 $a->strings["People Search"] = "Personensuche";
 $a->strings["No matches"] = "Keine Übereinstimmungen";
@@ -1205,9 +1205,9 @@ $a->strings["Title:"] = "Titel:";
 $a->strings["Share this event"] = "Veranstaltung teilen";
 $a->strings["Files"] = "Dateien";
 $a->strings["Export account"] = "Account exportieren";
-$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportiere deine Account Informationen und die Kontakte. Verwende dies um ein Backup deines Accounts anzulegen und/oder ihn auf einen anderen Server umzuziehen.";
+$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportiere deine Accountinformationen und Kontakte. Verwende dies um ein Backup deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen.";
 $a->strings["Export all"] = "Alles exportieren";
-$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "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).";
+$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "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 (Fotos werden nicht exportiert).";
 $a->strings["- select -"] = "- auswählen -";
 $a->strings["Import"] = "Import";
 $a->strings["Move account"] = "Account umziehen";
@@ -1252,7 +1252,7 @@ $a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten.";
 $a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert.";
 $a->strings["Total invitation limit exceeded."] = "Limit für Einladungen erreicht.";
 $a->strings["%s : Not a valid email address."] = "%s: Keine gültige Email Adresse.";
-$a->strings["Please join us on Friendica"] = "Bitte trete bei uns auf Friendica bei";
+$a->strings["Please join us on Friendica"] = "Wir laden Dich zu unserem sozialen Netzwerk Friendica ein";
 $a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limit für Einladungen erreicht. Bitte kontaktiere des Administrator der Seite.";
 $a->strings["%s : Message delivery failed."] = "%s: Zustellung der Nachricht fehlgeschlagen.";
 $a->strings["%d message sent."] = array(
@@ -1287,7 +1287,7 @@ $a->strings["Friendica provides this service for sharing events with other netwo
 $a->strings["UTC time: %s"] = "UTC Zeit: %s";
 $a->strings["Current timezone: %s"] = "Aktuelle Zeitzone: %s";
 $a->strings["Converted localtime: %s"] = "Umgerechnete lokale Zeit: %s";
-$a->strings["Please select your timezone:"] = "Bitte wähle deine Zeitzone.";
+$a->strings["Please select your timezone:"] = "Bitte wähle deine Zeitzone:";
 $a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar.";
 $a->strings["Visible to:"] = "Sichtbar für:";
 $a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
@@ -1307,8 +1307,8 @@ $a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:";
 $a->strings["Reset"] = "Zurücksetzen";
 $a->strings["System down for maintenance"] = "System zur Wartung abgeschaltet";
 $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
-$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Zwischen verschiedenen Identitäten oder Foren wechseln, die deine Zugangsdaten (E-Mail und Passwort) teilen oder zu denen du „Verwalten“-Befugnisse bekommen hast.";
-$a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten: ";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die deine Kontoinformationen teilen oder zu denen du „Verwalten“-Befugnisse bekommen hast.";
+$a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten aus: ";
 $a->strings["Profile Match"] = "Profilübereinstimmungen";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu deinem Standardprofil hinzu.";
 $a->strings["is interested in:"] = "ist interessiert an:";
@@ -1475,15 +1475,15 @@ $a->strings["Our <strong>help</strong> pages may be consulted for detail on othe
 $a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden.";
 $a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
 $a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
-$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert";
-$a->strings["Could not create table."] = "Konnte Tabelle nicht erstellen.";
+$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert.";
+$a->strings["Could not create table."] = "Tabelle konnte nicht angelegt werden.";
 $a->strings["Your Friendica site database has been installed."] = "Die Datenbank deiner Friendicaseite wurde installiert.";
 $a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
 $a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
 $a->strings["System check"] = "Systemtest";
 $a->strings["Check again"] = "Noch einmal testen";
 $a->strings["Database connection"] = "Datenbankverbindung";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir zu deiner Datenbank Kontakt aufnehmen können.";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir mit deiner Datenbank Kontakt aufnehmen können.";
 $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls du Fragen zu diesen Einstellungen haben solltest.";
 $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "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.";
 $a->strings["Database Server Name"] = "Datenbank-Server";
@@ -1538,20 +1538,20 @@ $a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
 $a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Nutzerkonto wurde nicht gefunden, und OpenID-Registrierung ist auf diesem Server nicht gestattet.";
-$a->strings["Image uploaded but image cropping failed."] = "Bilder hochgeladen, aber das Zuschneiden ist fehlgeschlagen.";
-$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] ist gescheitert.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Nutzerkonto wurde nicht gefunden und OpenID-Registrierung ist auf diesem Server nicht gestattet.";
+$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl.";
+$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte.";
 $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird.";
 $a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden";
 $a->strings["Upload File:"] = "Datei hochladen:";
-$a->strings["Select a profile:"] = "Profil auswählen";
+$a->strings["Select a profile:"] = "Profil auswählen:";
 $a->strings["Upload"] = "Hochladen";
 $a->strings["skip this step"] = "diesen Schritt überspringen";
-$a->strings["select a photo from your photo albums"] = "wähle ein Foto von deinen Fotoalben";
+$a->strings["select a photo from your photo albums"] = "wähle ein Foto aus deinen Fotoalben";
 $a->strings["Crop Image"] = "Bild zurechtschneiden";
 $a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann.";
 $a->strings["Done Editing"] = "Bearbeitung abgeschlossen";
-$a->strings["Image uploaded successfully."] = "Bild erfolgreich auf den Server geladen.";
+$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen.";
 $a->strings["Not available."] = "Nicht verfügbar.";
 $a->strings["%d comment"] = array(
 	0 => "%d Kommentar",
@@ -1567,7 +1567,7 @@ $a->strings["Underline"] = "Unterstrichen";
 $a->strings["Quote"] = "Zitat";
 $a->strings["Code"] = "Code";
 $a->strings["Image"] = "Bild";
-$a->strings["Link"] = "Verweis";
+$a->strings["Link"] = "Link";
 $a->strings["Video"] = "Video";
 $a->strings["add star"] = "markieren";
 $a->strings["remove star"] = "Markierung entfernen";

From 06ab3eb44f2a3945aef30d4019ac98e2e41f144b Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 9 May 2013 19:07:20 +0200
Subject: [PATCH 59/67] DE: update to the strings

---
 view/de/messages.po | 4 ++--
 view/de/strings.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index 829fb6bf40..73b46035c2 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -26,7 +26,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
 "POT-Creation-Date: 2013-05-09 00:02-0700\n"
-"PO-Revision-Date: 2013-05-09 16:17+0000\n"
+"PO-Revision-Date: 2013-05-09 17:05+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"
@@ -5376,7 +5376,7 @@ msgstr "%s: Keine gültige Email Adresse."
 
 #: ../../mod/invite.php:73
 msgid "Please join us on Friendica"
-msgstr "Wir laden Dich zu unserem sozialen Netzwerk Friendica ein"
+msgstr "Ich lade Dich zu unserem sozialen Netzwerk Friendica ein"
 
 #: ../../mod/invite.php:84
 msgid "Invitation limit exceeded. Please contact your site administrator."
diff --git a/view/de/strings.php b/view/de/strings.php
index 15d1eaad5b..b3b066f84b 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -1252,7 +1252,7 @@ $a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten.";
 $a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert.";
 $a->strings["Total invitation limit exceeded."] = "Limit für Einladungen erreicht.";
 $a->strings["%s : Not a valid email address."] = "%s: Keine gültige Email Adresse.";
-$a->strings["Please join us on Friendica"] = "Wir laden Dich zu unserem sozialen Netzwerk Friendica ein";
+$a->strings["Please join us on Friendica"] = "Ich lade Dich zu unserem sozialen Netzwerk Friendica ein";
 $a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limit für Einladungen erreicht. Bitte kontaktiere des Administrator der Seite.";
 $a->strings["%s : Message delivery failed."] = "%s: Zustellung der Nachricht fehlgeschlagen.";
 $a->strings["%d message sent."] = array(

From 5d30008ab3d09a8e3be5b7dbc8bd46aa017aab8b Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Sat, 11 May 2013 09:43:21 -0600
Subject: [PATCH 60/67] don't set img src in notifications to blank

---
 js/main.js                             | 6 +++++-
 js/main.min.js                         | 2 +-
 view/theme/frost-mobile/js/main.js     | 6 +++++-
 view/theme/frost-mobile/js/main.min.js | 2 +-
 view/theme/frost/js/main.js            | 6 +++++-
 view/theme/frost/js/main.min.js        | 2 +-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/js/main.js b/js/main.js
index f5cc6622a6..7ad2b7e648 100644
--- a/js/main.js
+++ b/js/main.js
@@ -188,7 +188,11 @@
 
 				$("img[data-src]", nnm).each(function(i, el){
 					// Add src attribute for images with a data-src attribute
-					$(el).attr('src', $(el).data("src"));
+					// However, don't bother if the data-src attribute is empty, because
+					// an empty "src" tag for an image will cause some browsers
+					// to prefetch the root page of the Friendica hub, which will
+					// unnecessarily load an entire profile/ or network/ page
+					if($(el).data("src") != '') $(el).attr('src', $(el).data("src"));
 				});
 			}
 
diff --git a/js/main.min.js b/js/main.min.js
index 40ad867e9b..49de427c69 100644
--- a/js/main.min.js
+++ b/js/main.min.js
@@ -1 +1 @@
-function openClose(theID){if(document.getElementById(theID).style.display=="block"){document.getElementById(theID).style.display="none"}else{document.getElementById(theID).style.display="block"}}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;$(function(){$.ajaxSetup({cache:false});msie=$.browser.msie;$(".onoff input").each(function(){val=$(this).val();id=$(this).attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$(".onoff > a").click(function(event){event.preventDefault();var input=$(this).siblings("input");var val=1-input.val();var id=input.attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(){if(last_popup_menu){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}$("a[rel^=#]").click(function(e){close_last_popup_menu();menu=$($(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$(this).parent().toggleClass("selected");menu.toggle();if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$(this).parent()}return false});$("html").click(function(){close_last_popup_menu()});$("a.popupbox").colorbox({inline:true,transition:"elastic"});var notifications_tpl=unescape($("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($("<div>").append($("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($("<div>").append($("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,data){var invalid=$(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$(data).find("net").text();if(net==0){net="";$("#net-update").removeClass("show")}else{$("#net-update").addClass("show")}$("#net-update").html(net);var home=$(data).find("home").text();if(home==0){home="";$("#home-update").removeClass("show")}else{$("#home-update").addClass("show")}$("#home-update").html(home);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update").removeClass("show")}else{$("#intro-update").addClass("show")}$("#intro-update").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update").removeClass("show")}else{$("#mail-update").addClass("show")}$("#mail-update").html(mail);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update-li").removeClass("show")}else{$("#intro-update-li").addClass("show")}$("#intro-update-li").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update-li").removeClass("show")}else{$("#mail-update-li").addClass("show")}$("#mail-update-li").html(mail);var allevents=$(data).find("all-events").text();if(allevents==0){allevents="";$("#allevents-update").removeClass("show")}else{$("#allevents-update").addClass("show")}$("#allevents-update").html(allevents);var alleventstoday=$(data).find("all-events-today").text();if(alleventstoday==0){$("#allevents-update").removeClass("notif-allevents-today")}else{$("#allevents-update").addClass("notif-allevents-today")}var events=$(data).find("events").text();if(events==0){events="";$("#events-update").removeClass("show")}else{$("#events-update").addClass("show")}$("#events-update").html(events);var eventstoday=$(data).find("events-today").text();if(eventstoday==0){$("#events-update").removeClass("notif-events-today")}else{$("#events-update").addClass("notif-events-today")}var birthdays=$(data).find("birthdays").text();if(birthdays==0){birthdays="";$("#birthdays-update").removeClass("show")}else{$("#birthdays-update").addClass("show")}$("#birthdays-update").html(birthdays);var birthdaystoday=$(data).find("birthdays-today").text();if(birthdaystoday==0){$("#birthdays-update").removeClass("notif-birthdays-today")}else{$("#birthdays-update").addClass("notif-birthdays-today")}var eNotif=$(data).find("notif");if(eNotif.children("note").length==0){$("#nav-notifications-menu").html(notifications_empty)}else{nnm=$("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$(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)});$("img[data-src]",nnm).each(function(i,el){$(el).attr("src",$(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$("#nav-notifications-linkmenu").addClass("on")}else{$("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$("#notify-update").removeClass("show")}else{$("#notify-update").addClass("show")}$("#notify-update").html(notif);var eSysmsg=$(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$(this).text();$.jGrowl(text,{sticky:true,theme:"notice"})});eSysmsg.children("info").each(function(){text=$(this).text();$.jGrowl(text,{sticky:false,theme:"info",life:1e4})})});NavUpdate();$(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}$("#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:"");$.get(pingCmd,function(data){$(data).find("result").each(function(){$("nav").trigger("nav-update",this);if($("#live-network").length){src="network";liveUpdate()}if($("#live-profile").length){src="profile";liveUpdate()}if($("#live-community").length){src="community";liveUpdate()}if($("#live-notes").length){src="notes";liveUpdate()}if($("#live-display").length){src="display";liveUpdate()}if($("#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){$(".like-rotator").hide();return}if($(".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);$.get(update_url,function(data){in_progress=false;$(".toplevel_item",data).each(function(){var ident=$(this).attr("id");if($("#"+ident).length==0&&profile_page==1){$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("#"+prev).after($(this))}else{var id=$(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$("#collapsed-comments-"+id).is(":visible")}$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("html").height($("html").height());$("#"+ident).replaceWith($(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$("html").height("auto")}prev=ident});$(".like-rotator").hide();if(commentBusy){commentBusy=false;$("body").css("cursor","auto")}$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");if(typeof _V_!="undefined")_V_.autoSetup()})}function imgbright(node){$(node).removeClass("drophide").addClass("drop")}function imgdull(node){$(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$("#like-rotator-"+ident.toString()).show();$.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dosubthread(ident){unpause();$("#like-rotator-"+ident.toString()).show();$.get("subthread/"+ident.toString(),NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$("#like-rotator-"+ident).show();$.get("starred/"+ident,function(data){if(data.match(/1/)){$("#starred-"+ident).addClass("starred");$("#starred-"+ident).removeClass("unstarred");$("#star-"+ident).addClass("hidden");$("#unstar-"+ident).removeClass("hidden")}else{$("#starred-"+ident).addClass("unstarred");$("#starred-"+ident).removeClass("starred");$("#star-"+ident).removeClass("hidden");$("#unstar-"+ident).addClass("hidden")}$("#like-rotator-"+ident).hide()})}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;$.get("lockview/"+id,function(data){$("#panel").html(data);$("#panel").css({left:cursor.x+5,top:cursor.y+5});$("#panel").show()})}}function lockviewhide(){lockvisible=false;$("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$("body").css("cursor","wait");$("#comment-preview-inp-"+id).val("0");$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$("#comment-edit-wrapper-"+id).hide();$("#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){$("#comment-preview-inp-"+id).val("1");$("#comment-edit-preview-"+id).show();$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$("#comment-edit-preview-"+id).html(data.preview);$("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($("#collapsed-comments-"+id).is(":visible")){$("#collapsed-comments-"+id).hide();$("#hide-comments-"+id).html(window.showMore)}else{$("#collapsed-comments-"+id).show();$("#hide-comments-"+id).html(window.showFewer)}}function preview_post(){$("#jot-preview").val("1");$("#jot-preview-content").show();tinyMCE.triggerSave();$.post("item",$("#profile-jot-form").serialize(),function(data){if(data.preview){$("#jot-preview-content").html(data.preview);$("#jot-preview-content"+" a").click(function(){return false})}},"json");$("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$("#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){$("body .fakelink").css("cursor","wait");$.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$("#group-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$("body .fakelink").css("cursor","wait");$.get("profperm/"+gid+"/"+cid,function(data){$("#prof-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$("body").css("cursor","wait");$.get("contactgroup/"+gid+"/"+cid,function(data){$("body").css("cursor","auto")})}function checkboxhighlight(box){if($(box).is(":checked")){$(box).addClass("checkeditem")}else{$(box).removeClass("checkeditem")}}function notifyMarkAll(){$.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,forced_root_block:"div",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=$(elm).val();$.getJSON("pretheme?f=&theme="+theme,function(data){$("#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(theID){if(document.getElementById(theID).style.display=="block"){document.getElementById(theID).style.display="none"}else{document.getElementById(theID).style.display="block"}}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;$(function(){$.ajaxSetup({cache:false});msie=$.browser.msie;$(".onoff input").each(function(){val=$(this).val();id=$(this).attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$(".onoff > a").click(function(event){event.preventDefault();var input=$(this).siblings("input");var val=1-input.val();var id=input.attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(){if(last_popup_menu){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}$("a[rel^=#]").click(function(e){close_last_popup_menu();menu=$($(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$(this).parent().toggleClass("selected");menu.toggle();if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$(this).parent()}return false});$("html").click(function(){close_last_popup_menu()});$("a.popupbox").colorbox({inline:true,transition:"elastic"});var notifications_tpl=unescape($("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($("<div>").append($("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($("<div>").append($("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,data){var invalid=$(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$(data).find("net").text();if(net==0){net="";$("#net-update").removeClass("show")}else{$("#net-update").addClass("show")}$("#net-update").html(net);var home=$(data).find("home").text();if(home==0){home="";$("#home-update").removeClass("show")}else{$("#home-update").addClass("show")}$("#home-update").html(home);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update").removeClass("show")}else{$("#intro-update").addClass("show")}$("#intro-update").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update").removeClass("show")}else{$("#mail-update").addClass("show")}$("#mail-update").html(mail);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update-li").removeClass("show")}else{$("#intro-update-li").addClass("show")}$("#intro-update-li").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update-li").removeClass("show")}else{$("#mail-update-li").addClass("show")}$("#mail-update-li").html(mail);var allevents=$(data).find("all-events").text();if(allevents==0){allevents="";$("#allevents-update").removeClass("show")}else{$("#allevents-update").addClass("show")}$("#allevents-update").html(allevents);var alleventstoday=$(data).find("all-events-today").text();if(alleventstoday==0){$("#allevents-update").removeClass("notif-allevents-today")}else{$("#allevents-update").addClass("notif-allevents-today")}var events=$(data).find("events").text();if(events==0){events="";$("#events-update").removeClass("show")}else{$("#events-update").addClass("show")}$("#events-update").html(events);var eventstoday=$(data).find("events-today").text();if(eventstoday==0){$("#events-update").removeClass("notif-events-today")}else{$("#events-update").addClass("notif-events-today")}var birthdays=$(data).find("birthdays").text();if(birthdays==0){birthdays="";$("#birthdays-update").removeClass("show")}else{$("#birthdays-update").addClass("show")}$("#birthdays-update").html(birthdays);var birthdaystoday=$(data).find("birthdays-today").text();if(birthdaystoday==0){$("#birthdays-update").removeClass("notif-birthdays-today")}else{$("#birthdays-update").addClass("notif-birthdays-today")}var eNotif=$(data).find("notif");if(eNotif.children("note").length==0){$("#nav-notifications-menu").html(notifications_empty)}else{nnm=$("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$(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)});$("img[data-src]",nnm).each(function(i,el){if($(el).data("src")!="")$(el).attr("src",$(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$("#nav-notifications-linkmenu").addClass("on")}else{$("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$("#notify-update").removeClass("show")}else{$("#notify-update").addClass("show")}$("#notify-update").html(notif);var eSysmsg=$(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$(this).text();$.jGrowl(text,{sticky:true,theme:"notice"})});eSysmsg.children("info").each(function(){text=$(this).text();$.jGrowl(text,{sticky:false,theme:"info",life:1e4})})});NavUpdate();$(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}$("#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:"");$.get(pingCmd,function(data){$(data).find("result").each(function(){$("nav").trigger("nav-update",this);if($("#live-network").length){src="network";liveUpdate()}if($("#live-profile").length){src="profile";liveUpdate()}if($("#live-community").length){src="community";liveUpdate()}if($("#live-notes").length){src="notes";liveUpdate()}if($("#live-display").length){src="display";liveUpdate()}if($("#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){$(".like-rotator").hide();return}if($(".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);$.get(update_url,function(data){in_progress=false;$(".toplevel_item",data).each(function(){var ident=$(this).attr("id");if($("#"+ident).length==0&&profile_page==1){$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("#"+prev).after($(this))}else{var id=$(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$("#collapsed-comments-"+id).is(":visible")}$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("html").height($("html").height());$("#"+ident).replaceWith($(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$("html").height("auto")}prev=ident});$(".like-rotator").hide();if(commentBusy){commentBusy=false;$("body").css("cursor","auto")}$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");if(typeof _V_!="undefined")_V_.autoSetup()})}function imgbright(node){$(node).removeClass("drophide").addClass("drop")}function imgdull(node){$(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$("#like-rotator-"+ident.toString()).show();$.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dosubthread(ident){unpause();$("#like-rotator-"+ident.toString()).show();$.get("subthread/"+ident.toString(),NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$("#like-rotator-"+ident).show();$.get("starred/"+ident,function(data){if(data.match(/1/)){$("#starred-"+ident).addClass("starred");$("#starred-"+ident).removeClass("unstarred");$("#star-"+ident).addClass("hidden");$("#unstar-"+ident).removeClass("hidden")}else{$("#starred-"+ident).addClass("unstarred");$("#starred-"+ident).removeClass("starred");$("#star-"+ident).removeClass("hidden");$("#unstar-"+ident).addClass("hidden")}$("#like-rotator-"+ident).hide()})}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;$.get("lockview/"+id,function(data){$("#panel").html(data);$("#panel").css({left:cursor.x+5,top:cursor.y+5});$("#panel").show()})}}function lockviewhide(){lockvisible=false;$("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$("body").css("cursor","wait");$("#comment-preview-inp-"+id).val("0");$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$("#comment-edit-wrapper-"+id).hide();$("#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){$("#comment-preview-inp-"+id).val("1");$("#comment-edit-preview-"+id).show();$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$("#comment-edit-preview-"+id).html(data.preview);$("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($("#collapsed-comments-"+id).is(":visible")){$("#collapsed-comments-"+id).hide();$("#hide-comments-"+id).html(window.showMore)}else{$("#collapsed-comments-"+id).show();$("#hide-comments-"+id).html(window.showFewer)}}function preview_post(){$("#jot-preview").val("1");$("#jot-preview-content").show();tinyMCE.triggerSave();$.post("item",$("#profile-jot-form").serialize(),function(data){if(data.preview){$("#jot-preview-content").html(data.preview);$("#jot-preview-content"+" a").click(function(){return false})}},"json");$("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$("#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){$("body .fakelink").css("cursor","wait");$.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$("#group-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$("body .fakelink").css("cursor","wait");$.get("profperm/"+gid+"/"+cid,function(data){$("#prof-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$("body").css("cursor","wait");$.get("contactgroup/"+gid+"/"+cid,function(data){$("body").css("cursor","auto")})}function checkboxhighlight(box){if($(box).is(":checked")){$(box).addClass("checkeditem")}else{$(box).removeClass("checkeditem")}}function notifyMarkAll(){$.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,forced_root_block:"div",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=$(elm).val();$.getJSON("pretheme?f=&theme="+theme,function(data){$("#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-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index 43782c8ecc..dae0e42bbc 100644
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -190,7 +190,11 @@
 
 				$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"));
+					// However, don't bother if the data-src attribute is empty, because
+					// an empty "src" tag for an image will cause some browsers
+					// to prefetch the root page of the Friendica hub, which will
+					// unnecessarily load an entire profile/ or network/ page
+					if($j(el).data("src") != '') $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 9d2dbb79aa..3c72cc1562 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)});$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||typeof profile_uid=="undefined"||!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");if(typeof _V_!="undefined")_V_.autoSetup()})}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 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:10,top:cursor.y+20});$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,forced_root_block:"div",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){if($j(el).data("src")!="")$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||typeof profile_uid=="undefined"||!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");if(typeof _V_!="undefined")_V_.autoSetup()})}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 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:10,top:cursor.y+20});$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,forced_root_block:"div",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/js/main.js b/view/theme/frost/js/main.js
index fefd5e1fe4..d40780203a 100644
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -182,7 +182,11 @@
 
 				$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"));
+					// However, don't bother if the data-src attribute is empty, because
+					// an empty "src" tag for an image will cause some browsers
+					// to prefetch the root page of the Friendica hub, which will
+					// unnecessarily load an entire profile/ or network/ page
+					if($j(el).data("src") != '') $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 6a77d62719..ee7ad65394 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)});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").colorbox({inline:true,transition:"elastic"});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||typeof profile_uid=="undefined"||!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")}$j("#"+ident+" .wall-item-body a img").each(function(){var aElem=$j(this).parent();var imgHref=aElem.attr("href");if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)){var cBoxClass=$j(this).closest(".wall-item-body").attr("id")+"-lightbox";$j(this).addClass(cBoxClass);aElem.colorbox({maxHeight:"90%",photo:true,rel:cBoxClass})}});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();if(typeof _V_!="undefined")_V_.autoSetup()})}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 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}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)});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").colorbox({inline:true,transition:"elastic"});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){if($j(el).data("src")!="")$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||typeof profile_uid=="undefined"||!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")}$j("#"+ident+" .wall-item-body a img").each(function(){var aElem=$j(this).parent();var imgHref=aElem.attr("href");if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)){var cBoxClass=$j(this).closest(".wall-item-body").attr("id")+"-lightbox";$j(this).addClass(cBoxClass);aElem.colorbox({maxHeight:"90%",photo:true,rel:cBoxClass})}});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();if(typeof _V_!="undefined")_V_.autoSetup()})}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 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}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

From 35358baac9f72ce8733a08fe9f9f9c51510b3394 Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Sat, 11 May 2013 10:49:54 -0600
Subject: [PATCH 61/67] update to v4.0.0; point to local host of SWF

---
 include/text.php                              |    8 +-
 js/main.js                                    |    2 +-
 js/main.min.js                                |    2 +-
 .../{captions.vtt => demo.captions.vtt}       |    0
 library/video-js/demo.html                    |    2 +-
 library/video-js/font/vjs.eot                 |  Bin 0 -> 2900 bytes
 library/video-js/font/vjs.svg                 |   40 +
 library/video-js/font/vjs.ttf                 |  Bin 0 -> 2736 bytes
 library/video-js/font/vjs.woff                |  Bin 0 -> 2676 bytes
 library/video-js/video-js.css                 |  907 ++-
 library/video-js/video-js.min.css             |    1 -
 library/video-js/video-js.png                 |  Bin 8235 -> 0 bytes
 library/video-js/video-js.swf                 |  Bin 9612 -> 14059 bytes
 library/video-js/video.dev.js                 | 6079 +++++++++++++++++
 library/video-js/video.js                     | 4690 +------------
 library/video-js/video.min.js                 |   21 -
 mod/videos.php                                |    8 +-
 view/templates/videos_head.tpl                |    6 +-
 view/theme/frost-mobile/js/main.js            |    2 +-
 view/theme/frost-mobile/js/main.min.js        |    2 +-
 .../frost-mobile/templates/videos_end.tpl     |    4 +-
 .../frost-mobile/templates/videos_head.tpl    |    2 +-
 view/theme/frost/js/main.js                   |    2 +-
 view/theme/frost/js/main.min.js               |    2 +-
 view/theme/frost/templates/videos_end.tpl     |    4 +-
 view/theme/frost/templates/videos_head.tpl    |    2 +-
 26 files changed, 6837 insertions(+), 4949 deletions(-)
 rename library/video-js/{captions.vtt => demo.captions.vtt} (100%)
 create mode 100644 library/video-js/font/vjs.eot
 create mode 100644 library/video-js/font/vjs.svg
 create mode 100644 library/video-js/font/vjs.ttf
 create mode 100644 library/video-js/font/vjs.woff
 delete mode 100644 library/video-js/video-js.min.css
 delete mode 100644 library/video-js/video-js.png
 create mode 100644 library/video-js/video.dev.js
 delete mode 100644 library/video-js/video.min.js

diff --git a/include/text.php b/include/text.php
index 9374e624b0..7b27d8b86e 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1306,8 +1306,12 @@ function prepare_body($item,$attach = false) {
 					if(strpos($mime, 'video') !== false) {
 						if(!$vhead) {
 							$vhead = true;
-							$a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array());
-							$a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array());
+							$a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array(
+								'$baseurl' => $a->get_baseurl(),
+							));
+							$a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array(
+								'$baseurl' => $a->get_baseurl(),
+							));
 						}
 
 						$id = end(explode('/', $the_url));
diff --git a/js/main.js b/js/main.js
index 7ad2b7e648..a4a1c977ca 100644
--- a/js/main.js
+++ b/js/main.js
@@ -387,7 +387,7 @@
 			$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
 
 			// setup videos, since VideoJS won't take care of any loaded via AJAX
-			if(typeof _V_ != 'undefined') _V_.autoSetup();
+			if(typeof videojs != 'undefined') videojs.autoSetup();
 		});
 	}
 
diff --git a/js/main.min.js b/js/main.min.js
index 49de427c69..e1cad27fa8 100644
--- a/js/main.min.js
+++ b/js/main.min.js
@@ -1 +1 @@
-function openClose(theID){if(document.getElementById(theID).style.display=="block"){document.getElementById(theID).style.display="none"}else{document.getElementById(theID).style.display="block"}}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;$(function(){$.ajaxSetup({cache:false});msie=$.browser.msie;$(".onoff input").each(function(){val=$(this).val();id=$(this).attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$(".onoff > a").click(function(event){event.preventDefault();var input=$(this).siblings("input");var val=1-input.val();var id=input.attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(){if(last_popup_menu){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}$("a[rel^=#]").click(function(e){close_last_popup_menu();menu=$($(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$(this).parent().toggleClass("selected");menu.toggle();if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$(this).parent()}return false});$("html").click(function(){close_last_popup_menu()});$("a.popupbox").colorbox({inline:true,transition:"elastic"});var notifications_tpl=unescape($("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($("<div>").append($("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($("<div>").append($("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,data){var invalid=$(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$(data).find("net").text();if(net==0){net="";$("#net-update").removeClass("show")}else{$("#net-update").addClass("show")}$("#net-update").html(net);var home=$(data).find("home").text();if(home==0){home="";$("#home-update").removeClass("show")}else{$("#home-update").addClass("show")}$("#home-update").html(home);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update").removeClass("show")}else{$("#intro-update").addClass("show")}$("#intro-update").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update").removeClass("show")}else{$("#mail-update").addClass("show")}$("#mail-update").html(mail);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update-li").removeClass("show")}else{$("#intro-update-li").addClass("show")}$("#intro-update-li").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update-li").removeClass("show")}else{$("#mail-update-li").addClass("show")}$("#mail-update-li").html(mail);var allevents=$(data).find("all-events").text();if(allevents==0){allevents="";$("#allevents-update").removeClass("show")}else{$("#allevents-update").addClass("show")}$("#allevents-update").html(allevents);var alleventstoday=$(data).find("all-events-today").text();if(alleventstoday==0){$("#allevents-update").removeClass("notif-allevents-today")}else{$("#allevents-update").addClass("notif-allevents-today")}var events=$(data).find("events").text();if(events==0){events="";$("#events-update").removeClass("show")}else{$("#events-update").addClass("show")}$("#events-update").html(events);var eventstoday=$(data).find("events-today").text();if(eventstoday==0){$("#events-update").removeClass("notif-events-today")}else{$("#events-update").addClass("notif-events-today")}var birthdays=$(data).find("birthdays").text();if(birthdays==0){birthdays="";$("#birthdays-update").removeClass("show")}else{$("#birthdays-update").addClass("show")}$("#birthdays-update").html(birthdays);var birthdaystoday=$(data).find("birthdays-today").text();if(birthdaystoday==0){$("#birthdays-update").removeClass("notif-birthdays-today")}else{$("#birthdays-update").addClass("notif-birthdays-today")}var eNotif=$(data).find("notif");if(eNotif.children("note").length==0){$("#nav-notifications-menu").html(notifications_empty)}else{nnm=$("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$(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)});$("img[data-src]",nnm).each(function(i,el){if($(el).data("src")!="")$(el).attr("src",$(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$("#nav-notifications-linkmenu").addClass("on")}else{$("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$("#notify-update").removeClass("show")}else{$("#notify-update").addClass("show")}$("#notify-update").html(notif);var eSysmsg=$(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$(this).text();$.jGrowl(text,{sticky:true,theme:"notice"})});eSysmsg.children("info").each(function(){text=$(this).text();$.jGrowl(text,{sticky:false,theme:"info",life:1e4})})});NavUpdate();$(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}$("#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:"");$.get(pingCmd,function(data){$(data).find("result").each(function(){$("nav").trigger("nav-update",this);if($("#live-network").length){src="network";liveUpdate()}if($("#live-profile").length){src="profile";liveUpdate()}if($("#live-community").length){src="community";liveUpdate()}if($("#live-notes").length){src="notes";liveUpdate()}if($("#live-display").length){src="display";liveUpdate()}if($("#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){$(".like-rotator").hide();return}if($(".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);$.get(update_url,function(data){in_progress=false;$(".toplevel_item",data).each(function(){var ident=$(this).attr("id");if($("#"+ident).length==0&&profile_page==1){$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("#"+prev).after($(this))}else{var id=$(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$("#collapsed-comments-"+id).is(":visible")}$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("html").height($("html").height());$("#"+ident).replaceWith($(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$("html").height("auto")}prev=ident});$(".like-rotator").hide();if(commentBusy){commentBusy=false;$("body").css("cursor","auto")}$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");if(typeof _V_!="undefined")_V_.autoSetup()})}function imgbright(node){$(node).removeClass("drophide").addClass("drop")}function imgdull(node){$(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$("#like-rotator-"+ident.toString()).show();$.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dosubthread(ident){unpause();$("#like-rotator-"+ident.toString()).show();$.get("subthread/"+ident.toString(),NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$("#like-rotator-"+ident).show();$.get("starred/"+ident,function(data){if(data.match(/1/)){$("#starred-"+ident).addClass("starred");$("#starred-"+ident).removeClass("unstarred");$("#star-"+ident).addClass("hidden");$("#unstar-"+ident).removeClass("hidden")}else{$("#starred-"+ident).addClass("unstarred");$("#starred-"+ident).removeClass("starred");$("#star-"+ident).removeClass("hidden");$("#unstar-"+ident).addClass("hidden")}$("#like-rotator-"+ident).hide()})}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;$.get("lockview/"+id,function(data){$("#panel").html(data);$("#panel").css({left:cursor.x+5,top:cursor.y+5});$("#panel").show()})}}function lockviewhide(){lockvisible=false;$("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$("body").css("cursor","wait");$("#comment-preview-inp-"+id).val("0");$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$("#comment-edit-wrapper-"+id).hide();$("#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){$("#comment-preview-inp-"+id).val("1");$("#comment-edit-preview-"+id).show();$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$("#comment-edit-preview-"+id).html(data.preview);$("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($("#collapsed-comments-"+id).is(":visible")){$("#collapsed-comments-"+id).hide();$("#hide-comments-"+id).html(window.showMore)}else{$("#collapsed-comments-"+id).show();$("#hide-comments-"+id).html(window.showFewer)}}function preview_post(){$("#jot-preview").val("1");$("#jot-preview-content").show();tinyMCE.triggerSave();$.post("item",$("#profile-jot-form").serialize(),function(data){if(data.preview){$("#jot-preview-content").html(data.preview);$("#jot-preview-content"+" a").click(function(){return false})}},"json");$("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$("#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){$("body .fakelink").css("cursor","wait");$.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$("#group-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$("body .fakelink").css("cursor","wait");$.get("profperm/"+gid+"/"+cid,function(data){$("#prof-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$("body").css("cursor","wait");$.get("contactgroup/"+gid+"/"+cid,function(data){$("body").css("cursor","auto")})}function checkboxhighlight(box){if($(box).is(":checked")){$(box).addClass("checkeditem")}else{$(box).removeClass("checkeditem")}}function notifyMarkAll(){$.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,forced_root_block:"div",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=$(elm).val();$.getJSON("pretheme?f=&theme="+theme,function(data){$("#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(theID){if(document.getElementById(theID).style.display=="block"){document.getElementById(theID).style.display="none"}else{document.getElementById(theID).style.display="block"}}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;$(function(){$.ajaxSetup({cache:false});msie=$.browser.msie;$(".onoff input").each(function(){val=$(this).val();id=$(this).attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$(".onoff > a").click(function(event){event.preventDefault();var input=$(this).siblings("input");var val=1-input.val();var id=input.attr("id");$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(){if(last_popup_menu){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}$("a[rel^=#]").click(function(e){close_last_popup_menu();menu=$($(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$(this).parent().toggleClass("selected");menu.toggle();if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$(this).parent()}return false});$("html").click(function(){close_last_popup_menu()});$("a.popupbox").colorbox({inline:true,transition:"elastic"});var notifications_tpl=unescape($("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($("<div>").append($("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($("<div>").append($("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,data){var invalid=$(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$(data).find("net").text();if(net==0){net="";$("#net-update").removeClass("show")}else{$("#net-update").addClass("show")}$("#net-update").html(net);var home=$(data).find("home").text();if(home==0){home="";$("#home-update").removeClass("show")}else{$("#home-update").addClass("show")}$("#home-update").html(home);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update").removeClass("show")}else{$("#intro-update").addClass("show")}$("#intro-update").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update").removeClass("show")}else{$("#mail-update").addClass("show")}$("#mail-update").html(mail);var intro=$(data).find("intro").text();if(intro==0){intro="";$("#intro-update-li").removeClass("show")}else{$("#intro-update-li").addClass("show")}$("#intro-update-li").html(intro);var mail=$(data).find("mail").text();if(mail==0){mail="";$("#mail-update-li").removeClass("show")}else{$("#mail-update-li").addClass("show")}$("#mail-update-li").html(mail);var allevents=$(data).find("all-events").text();if(allevents==0){allevents="";$("#allevents-update").removeClass("show")}else{$("#allevents-update").addClass("show")}$("#allevents-update").html(allevents);var alleventstoday=$(data).find("all-events-today").text();if(alleventstoday==0){$("#allevents-update").removeClass("notif-allevents-today")}else{$("#allevents-update").addClass("notif-allevents-today")}var events=$(data).find("events").text();if(events==0){events="";$("#events-update").removeClass("show")}else{$("#events-update").addClass("show")}$("#events-update").html(events);var eventstoday=$(data).find("events-today").text();if(eventstoday==0){$("#events-update").removeClass("notif-events-today")}else{$("#events-update").addClass("notif-events-today")}var birthdays=$(data).find("birthdays").text();if(birthdays==0){birthdays="";$("#birthdays-update").removeClass("show")}else{$("#birthdays-update").addClass("show")}$("#birthdays-update").html(birthdays);var birthdaystoday=$(data).find("birthdays-today").text();if(birthdaystoday==0){$("#birthdays-update").removeClass("notif-birthdays-today")}else{$("#birthdays-update").addClass("notif-birthdays-today")}var eNotif=$(data).find("notif");if(eNotif.children("note").length==0){$("#nav-notifications-menu").html(notifications_empty)}else{nnm=$("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$(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)});$("img[data-src]",nnm).each(function(i,el){if($(el).data("src")!="")$(el).attr("src",$(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$("#nav-notifications-linkmenu").addClass("on")}else{$("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$("#notify-update").removeClass("show")}else{$("#notify-update").addClass("show")}$("#notify-update").html(notif);var eSysmsg=$(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$(this).text();$.jGrowl(text,{sticky:true,theme:"notice"})});eSysmsg.children("info").each(function(){text=$(this).text();$.jGrowl(text,{sticky:false,theme:"info",life:1e4})})});NavUpdate();$(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}$("#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:"");$.get(pingCmd,function(data){$(data).find("result").each(function(){$("nav").trigger("nav-update",this);if($("#live-network").length){src="network";liveUpdate()}if($("#live-profile").length){src="profile";liveUpdate()}if($("#live-community").length){src="community";liveUpdate()}if($("#live-notes").length){src="notes";liveUpdate()}if($("#live-display").length){src="display";liveUpdate()}if($("#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){$(".like-rotator").hide();return}if($(".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);$.get(update_url,function(data){in_progress=false;$(".toplevel_item",data).each(function(){var ident=$(this).attr("id");if($("#"+ident).length==0&&profile_page==1){$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("#"+prev).after($(this))}else{var id=$(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$("#collapsed-comments-"+id).is(":visible")}$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))});$("html").height($("html").height());$("#"+ident).replaceWith($(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$("html").height("auto")}prev=ident});$(".like-rotator").hide();if(commentBusy){commentBusy=false;$("body").css("cursor","auto")}$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");if(typeof videojs!="undefined")videojs.autoSetup()})}function imgbright(node){$(node).removeClass("drophide").addClass("drop")}function imgdull(node){$(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$("#like-rotator-"+ident.toString()).show();$.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dosubthread(ident){unpause();$("#like-rotator-"+ident.toString()).show();$.get("subthread/"+ident.toString(),NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$("#like-rotator-"+ident).show();$.get("starred/"+ident,function(data){if(data.match(/1/)){$("#starred-"+ident).addClass("starred");$("#starred-"+ident).removeClass("unstarred");$("#star-"+ident).addClass("hidden");$("#unstar-"+ident).removeClass("hidden")}else{$("#starred-"+ident).addClass("unstarred");$("#starred-"+ident).removeClass("starred");$("#star-"+ident).removeClass("hidden");$("#unstar-"+ident).addClass("hidden")}$("#like-rotator-"+ident).hide()})}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;$.get("lockview/"+id,function(data){$("#panel").html(data);$("#panel").css({left:cursor.x+5,top:cursor.y+5});$("#panel").show()})}}function lockviewhide(){lockvisible=false;$("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$("body").css("cursor","wait");$("#comment-preview-inp-"+id).val("0");$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$("#comment-edit-wrapper-"+id).hide();$("#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){$("#comment-preview-inp-"+id).val("1");$("#comment-edit-preview-"+id).show();$.post("item",$("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$("#comment-edit-preview-"+id).html(data.preview);$("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($("#collapsed-comments-"+id).is(":visible")){$("#collapsed-comments-"+id).hide();$("#hide-comments-"+id).html(window.showMore)}else{$("#collapsed-comments-"+id).show();$("#hide-comments-"+id).html(window.showFewer)}}function preview_post(){$("#jot-preview").val("1");$("#jot-preview-content").show();tinyMCE.triggerSave();$.post("item",$("#profile-jot-form").serialize(),function(data){if(data.preview){$("#jot-preview-content").html(data.preview);$("#jot-preview-content"+" a").click(function(){return false})}},"json");$("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$("#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){$("body .fakelink").css("cursor","wait");$.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$("#group-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$("body .fakelink").css("cursor","wait");$.get("profperm/"+gid+"/"+cid,function(data){$("#prof-update-wrapper").html(data);$("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$("body").css("cursor","wait");$.get("contactgroup/"+gid+"/"+cid,function(data){$("body").css("cursor","auto")})}function checkboxhighlight(box){if($(box).is(":checked")){$(box).addClass("checkeditem")}else{$(box).removeClass("checkeditem")}}function notifyMarkAll(){$.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,forced_root_block:"div",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=$(elm).val();$.getJSON("pretheme?f=&theme="+theme,function(data){$("#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/library/video-js/captions.vtt b/library/video-js/demo.captions.vtt
similarity index 100%
rename from library/video-js/captions.vtt
rename to library/video-js/demo.captions.vtt
diff --git a/library/video-js/demo.html b/library/video-js/demo.html
index b35cdc2838..5698849bf5 100644
--- a/library/video-js/demo.html
+++ b/library/video-js/demo.html
@@ -23,7 +23,7 @@
     <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
     <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
     <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
-    <track kind="captions" src="captions.vtt" srclang="en" label="English" />
+    <track kind="captions" src="demo.captions.vtt" srclang="en" label="English" />
   </video>
 
 </body>
diff --git a/library/video-js/font/vjs.eot b/library/video-js/font/vjs.eot
new file mode 100644
index 0000000000000000000000000000000000000000..1b8202af8b4ab714c19e3a9b2ff85ab77b12d8c9
GIT binary patch
literal 2900
zcmd@WOKcleaAw!`+D>D~_1bA0lQ?m*E~?}IC+R0~TE{K@x@i@)rBJ(#n+7Fuln-hO
zLXkj-1BXhWNT@=xI8lUXiYin<Lgqw^phZwl1Zgj*94kS^DK_(VUqTZ4;m%9mo9~-9
z`(`|Ej@JP!SOE|OU_$_-s3F9;j0`)N(`jhnkR&k2@cV(_%rfsEXoEo*fgvbD3HHM=
z64+pXs9~6aQ7FJ9aonU+By5T_OE3;zh(Hj+n(q4D#AJTd)0raVvf1N@hOeBw1z>%b
zxSqY4{w(x>iRfvfy+@9PqM@%AgS6=c(Szs43KMGQA3qWOC(VK3!qh~qMwY-jN^<k?
z=<NBOfmf~rh(sH1T__fYmI8kf4U06B7l>i_8s4Y9GSTf9#-=YmGmEE*ULZO%S~^!S
zd(3xe|2`%kD_op_=iw;HyNLFV7siTjz0*awIZnLSCrVS(-KTEQWm|5N{D$^z^nEkI
z!2L7!oe!Z-kHhz${PHTvL5H<PVF6Vl%{)wGivHEwA_RqN096ncG)rvD@^EMz2OOqd
zY%s&9@zRW>fr1?`gAvSl5YH36m&1p!8Qxf(3ru+>{DkMu_YXl@g$K+B6@uhj`<&(z
z30GW%k93?4&eKdY2Uez6!}H90F7qtQm<<{%583qaFFQyS%LES?v{W%K--f#30Z>e7
zFpn7K6&o7(F2)9={9s$zz;(yyOl|$YEX@#rG@O7p;ahCSIDUwq32q@O3<^Um7&TR(
zxYBQ`o^H$Km;5QeC^h;LjVS?g`EWj$%jbT`<x!=DsOo}7va5wWc(IISX2n^Lc}!O;
zSguq^CeVpqB#NRaku>J;v6(KH)iUj<&f#2jPP0J^s8|82OwOd+<&aGw^d(}qEjF8F
zHkZTCEk;}Qtj%bdt&k?2L<i?c-wsXm18h^`sbt)*#FNoRw=9XPETG3}lbV|)n^WrS
zJjKn8*_~3$V2k9mn**-}Ftge?%Ra!Hn(Y?Y_HXOTlTMqIZBis6*<`7=_k~BCoF+-+
z?TAEb=}*(j6Z|kRKZI89M+kO2-IFJJ_6;4G$uQ3b22MZ4ODAb%DjDYG!0!XffA*Pj
zp{7zUsO&e4ViO{iDbQ*SYT8eczKK^g5n3P#hX5R{j#dn!U-2uxHpwK}P-@0TH~l43
z$y5(^1ku-Ka>?#kG@0_5d~Jz%Eb4A-eKcFRwsce|q17(fJ$HWe*hRYq(P9@Gw%ohh
z)PQzt^;bhzG}P0R40IX$jo!es4q3pMp*s@l?M-g$Hf9Z+r!Fm_Vef8PsB^ijqTILd
zxjv^@CkujHCpveZN$fb%x99M#MCd?nlWPs3rO&Fo2Pb`Dnk70*cvj6lwHm5)M-pXk
zBi(}^LXd)9fQ_;{nv5%L?sd?_>1C*JT3E-gC~-xJpY2E}N+Ram;&g5~psiO{tv=6I
zk7w&XSF_92j9)N)<;6q?ZTXVvJFjT#0d4KjRy42;o~vwwi>2h+T9MLgMTcH1RINDR
z1Fbkz^irV{EdE-JsQ|sH8>4QSV(F)7Cwedu_Xla2zc)Ysk}NAHyFKj~h+*Z@$CpH<
zNwC!iHcL|T@$jI2x68GPJaJ&FKo23RRVJdb0p_(#V|7WQ=SzP81j4s+T!c1wnd1iH
zU*))wYR_$sn~47#dwC2N;@HTpjthiu;<yMIdXaR#f%xxn+(?bib&i{e|MU9RXmDhx
zSlUlL(z*s|pg24;TA)rTtF=ed8l0pSst8_)YORtNwiCX#S<-na=!68#DESnD7#S&z
zPiIS$!$og281`=W@>2;*btXEa;RxxhH3Tb;J*H0^EKW|1l*YZ0AT@1|+pE`REf$Yn
z9K@!^69p8}fJQW-gl4p$73**V)}syW(#-fse>fcGFv4M!!x)Eg4ig+EIZScb#bGyx
xeH`xQa1Vo7I)`~g9Rxjqgt2IEqRBEHDUK|MSS{Ax98Ckh+x5X+rm(tS`x~<ivHt)7

literal 0
HcmV?d00001

diff --git a/library/video-js/font/vjs.svg b/library/video-js/font/vjs.svg
new file mode 100644
index 0000000000..2059a1f2ea
--- /dev/null
+++ b/library/video-js/font/vjs.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG font generated by IcoMoon.
+<iconset grid="16"></iconset>
+</metadata>
+<defs>
+<font id="VideoJS" horiz-adv-x="512" >
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph unicode="&#xe000;" d="M 512.00,480.00 L 512.00,272.00 L 432.00,352.00 L 336.00,256.00 L 288.00,304.00 L 384.00,400.00 L 304.00,480.00 ZM 224.00,144.00 L 128.00,48.00 L 208.00-32.00 L 0.00-32.00 L 0.00,176.00 L 80.00,96.00 L 176.00,192.00 Z"  />
+<glyph unicode="&#xe001;" d="M 96.00,416.00L 416.00,224.00L 96.00,32.00 z"  />
+<glyph unicode="&#xe002;" d="M 64.00,416.00L 224.00,416.00L 224.00,32.00L 64.00,32.00zM 288.00,416.00L 448.00,416.00L 448.00,32.00L 288.00,32.00z"  />
+<glyph unicode="&#xe003;" d="M 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z"  />
+<glyph unicode="&#xe004;" d="M 274.51,109.49c-6.143,0.00-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0.00,33.941
+		c 40.55,40.55, 40.55,106.529,0.00,147.078c-9.373,9.373-9.373,24.569,0.00,33.941c 9.373,9.372, 24.568,9.372, 33.941,0.00
+		c 59.265-59.265, 59.265-155.696,0.00-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z"  />
+<glyph unicode="&#xe005;" d="M 359.765,64.235c-6.143,0.00-12.284,2.343-16.971,7.029c-9.372,9.372-9.372,24.568,0.00,33.941
+		c 65.503,65.503, 65.503,172.085,0.00,237.588c-9.372,9.373-9.372,24.569,0.00,33.941c 9.372,9.371, 24.569,9.372, 33.941,0.00
+		C 417.532,335.938, 440.00,281.696, 440.00,224.00c0.00-57.695-22.468-111.938-63.265-152.735C 372.049,66.578, 365.907,64.235, 359.765,64.235zM 274.51,109.49c-6.143,0.00-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0.00,33.941
+		c 40.55,40.55, 40.55,106.529,0.00,147.078c-9.373,9.373-9.373,24.569,0.00,33.941c 9.373,9.372, 24.568,9.372, 33.941,0.00
+		c 59.265-59.265, 59.265-155.696,0.00-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z"  />
+<glyph unicode="&#xe006;" d="M 445.02,18.98c-6.143,0.00-12.284,2.343-16.971,7.029c-9.372,9.373-9.372,24.568,0.00,33.941
+		C 471.868,103.771, 496.001,162.03, 496.001,224.00c0.00,61.969-24.133,120.229-67.952,164.049c-9.372,9.373-9.372,24.569,0.00,33.941
+		c 9.372,9.372, 24.569,9.372, 33.941,0.00c 52.885-52.886, 82.011-123.20, 82.011-197.99c0.00-74.791-29.126-145.104-82.011-197.99
+		C 457.304,21.323, 451.162,18.98, 445.02,18.98zM 359.765,64.235c-6.143,0.00-12.284,2.343-16.971,7.029c-9.372,9.372-9.372,24.568,0.00,33.941
+		c 65.503,65.503, 65.503,172.085,0.00,237.588c-9.372,9.373-9.372,24.569,0.00,33.941c 9.372,9.371, 24.569,9.372, 33.941,0.00
+		C 417.532,335.938, 440.00,281.696, 440.00,224.00c0.00-57.695-22.468-111.938-63.265-152.735C 372.049,66.578, 365.907,64.235, 359.765,64.235zM 274.51,109.49c-6.143,0.00-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0.00,33.941
+		c 40.55,40.55, 40.55,106.529,0.00,147.078c-9.373,9.373-9.373,24.569,0.00,33.941c 9.373,9.372, 24.568,9.372, 33.941,0.00
+		c 59.265-59.265, 59.265-155.696,0.00-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z" horiz-adv-x="544"  />
+<glyph unicode="&#xe007;" d="M 256.00,480.00L 96.00,224.00L 256.00-32.00L 416.00,224.00 z"  />
+<glyph unicode="&#xe008;" d="M 0.00,480.00 L 687.158,480.00 L 687.158-35.207 L 0.00-35.207 L 0.00,480.00 z M 622.731,224.638 C 621.878,314.664 618.46,353.922 597.131,381.656 C 593.291,387.629 586.038,391.042 580.065,395.304 C 559.158,410.669 460.593,416.211 346.247,416.211 C 231.896,416.211 128.642,410.669 108.162,395.304 C 101.762,391.042 94.504,387.629 90.242,381.656 C 69.331,353.922 66.349,314.664 65.069,224.638 C 66.349,134.607 69.331,95.353 90.242,67.62 C 94.504,61.22 101.762,58.233 108.162,53.967 C 128.642,38.18 231.896,33.06 346.247,32.207 C 460.593,33.06 559.158,38.18 580.065,53.967 C 586.038,58.233 593.291,61.22 597.131,67.62 C 618.46,95.353 621.878,134.607 622.731,224.638 z M 331.179,247.952 C 325.389,318.401 287.924,359.905 220.901,359.905 C 159.672,359.905 111.54,304.689 111.54,215.965 C 111.54,126.859 155.405,71.267 227.907,71.267 C 285.79,71.267 326.306,113.916 332.701,184.742 L 263.55,184.742 C 260.81,158.468 249.843,138.285 226.69,138.285 C 190.136,138.285 183.435,174.462 183.435,212.92 C 183.435,265.854 198.665,292.886 223.951,292.886 C 246.492,292.886 260.81,276.511 262.939,247.952 L 331.179,247.952 z M 570.013,247.952 C 564.228,318.401 526.758,359.905 459.74,359.905 C 398.507,359.905 350.379,304.689 350.379,215.965 C 350.379,126.859 394.244,71.267 466.746,71.267 C 524.625,71.267 565.14,113.916 571.536,184.742 L 502.384,184.742 C 499.649,158.468 488.682,138.285 465.529,138.285 C 428.971,138.285 422.27,174.462 422.27,212.92 C 422.27,265.854 437.504,292.886 462.785,292.886 C 485.327,292.886 499.649,276.511 501.778,247.952 L 570.013,247.952 z " horiz-adv-x="687.1578947368421"  />
+<glyph unicode="&#xe009;" d="M 64.00,416.00L 448.00,416.00L 448.00,32.00L 64.00,32.00z"  />
+<glyph unicode="&#xe00a;" d="M 192.00,416.00A64.00,64.00 12780.00 1 1 320.00,416A64.00,64.00 12780.00 1 1 192.00,416zM 327.765,359.765A64.00,64.00 12780.00 1 1 455.765,359.765A64.00,64.00 12780.00 1 1 327.765,359.765zM 416.00,224.00A32.00,32.00 12780.00 1 1 480.00,224A32.00,32.00 12780.00 1 1 416.00,224zM 359.765,88.235A32.00,32.00 12780.00 1 1 423.765,88.23500000000001A32.00,32.00 12780.00 1 1 359.765,88.23500000000001zM 224.001,32.00A32.00,32.00 12780.00 1 1 288.001,32A32.00,32.00 12780.00 1 1 224.001,32zM 88.236,88.235A32.00,32.00 12780.00 1 1 152.236,88.23500000000001A32.00,32.00 12780.00 1 1 88.236,88.23500000000001zM 72.236,359.765A48.00,48.00 12780.00 1 1 168.236,359.765A48.00,48.00 12780.00 1 1 72.236,359.765zM 28.00,224.00A36.00,36.00 12780.00 1 1 100.00,224A36.00,36.00 12780.00 1 1 28.00,224z"  />
+<glyph unicode="&#xe00b;" d="M 224.00,192.00 L 224.00-16.00 L 144.00,64.00 L 48.00-32.00 L 0.00,16.00 L 96.00,112.00 L 16.00,192.00 ZM 512.00,432.00 L 416.00,336.00 L 496.00,256.00 L 288.00,256.00 L 288.00,464.00 L 368.00,384.00 L 464.00,480.00 Z"  />
+<glyph unicode="&#xe00c;" d="M 256.00,448.00 C 397.385,448.00 512.00,354.875 512.00,240.00 C 512.00,125.124 397.385,32.00 256.00,32.00 C 242.422,32.00 229.095,32.867 216.088,34.522 C 161.099-20.467 95.463-30.328 32.00-31.776 L 32.00-18.318 C 66.268-1.529 96.00,29.052 96.00,64.00 C 96.00,68.877 95.621,73.665 94.918,78.348 C 37.02,116.48 0.00,174.725 0.00,240.00 C 0.00,354.875 114.615,448.00 256.00,448.00 Z"  />
+<glyph unicode="&#x20;" horiz-adv-x="256" />
+<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/library/video-js/font/vjs.ttf b/library/video-js/font/vjs.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a5ad4685e978865705998258d5bb1855223ba388
GIT binary patch
literal 2736
zcmd@WU2IcT`1|f{d)tk*E4}T2UAu1GZZUNI|JeYy4!VN;mO&aolonRT%(gE3F$|4a
zqA@=BV4_)Kh)Ls<7$d_FgPNH7Bp3yw_~cCPi_u3CB|fe7JGZB@A%gFo=A7^U=bZE1
z?-URKT3``G$YwIf4vt+qaRZ>~ZQ?3>(!&`T029%3M0*Y&4Mu`rtONk?IMKPYlZ9!m
z_xB%&{)6VoSYdX$RwGZ)G(mFn*u=uQo&FcE0*FK#Zk#U`MpylR5)CUf6X%Ix_!8bF
zTbbzY^OJKIo>;(BL@yJao+zCym=*Iavfs<(lZ6Y@@C+Owc^}c9slsIO^|$&6H^+$g
z%5-UVuK(mU0l;#d<kx`hjpls7|LbYn&U?^IA{yU*^wUfCVQocNMvZ7Q)Wy0DYPA&z
z2v-2AAS~;im`P*Ub&eelkrf-v5_MjRku*@S;hSItGakTmMDOA79&CnJnSqhcsWDm`
z2*K>R;ZaCwa2F^C4FZ%~_oAK?Q);9LAJlQ8^E6Y8|M&Fhc%Eg?WlBTFe9&OA*;M$>
z4iLpoO92Cf2$~zGp>4Pebf+{}Mhx?at*zXOu>q+*m?<0hK$tpHU;i(Q8~l)h<M0}M
zjolc-_wf_KB}9arFv>2YrU`Vf^i8$UX*qq8FX<DdHgCKwDL^(K%4f6r?04BbYP1kl
zUDio<w2%i6ma)vdI9f1|scHqwl?urOis(V2=oTfCM(tiUQ{}Q&CX4DKE>;(HAGCmm
z6=)`{gv)7{O+oa=qc<&9t7RdZ#ZN6pYxRuPXj!O`CPkvaS<<&bJAHs%YAl(E`P5h<
z(&mySag7I599GHgmaGn`xA!D>H)(T79k~w4VKe(*_G5ajbG`cUy6(FJw*Aw)`lx6#
zvQ-L)C95nA4nF&k$SIP9-v~>jmijoQJ|YhT+oRCQ^9aI@$7k}$%)X+K=`_o1WaQLi
zvUHGEx{_vDj{G*F{^y*j7HS&Rg2ujK6x$J@Oc$-ypr(I{v?t!xMCgD790ag;+B-3T
zKGmmsyCjojMahkAF8U>siR1wG1kl@Ma>}k~B$4!*yj}5FG~#OOd^lUUvU)@)VUta;
zDYw2?Y@*GAXt4>cTkhO$Z$(>E^=Ct0BsegT@b?*qjUNA#c3Hrvp+6iP987HMH)af+
zr>(A{Vb3mEXm&cAM0sfM(?briSr!DjS#<0=9p7<yX!oI~;=%pdP0n?MUYcv_9vrm8
z6f1OA@T`L=wHj)4MiNzT8=Zp>f{=tkfQ_;%l8C8Yt_Prr(+#L{T6ln8QDdqaJJS<a
z)p*pg#o^epUtce+S-r|uMcKO7>2^BZ_!-kzpNsd9$>&VpaY<kI>uZm`qJbGGmzjZ+
zmE`(fk*xQMo_ep)^yYwf_2y8iw~9K!?qBaQ6`(hDW5gxXUHa&@;{zCv`2w^o-C0_C
zUY6Ap{Yp3bqgc84;YCqx7pyJ*&64Ck7RuGnw$ZC76FYVa^bn#}Wg;3IU`eku)|Vt`
zyaxi|TRC5ZE_i|C2I61lxRH9#O^%z0{|kG03>M;8$!{GO2;anU5z_P`)%gbEzr%4O
zxZo<sO~n5Zaxe~~P=pffgQN8KWPG$(+DFI;@y1{tCZGT_L>9;9CkljQNOKD2bT~sA
zMeslb0u;>y+i9-%SLY?67veM{q!orJIVnxeWlA$+MNcFU@@)6;sDveZ<Gqnkm~_@V
zx}R8%Le9V}rOguYkV6(6a>be1@zRth9AL!1Y^vUy^}BfZVkb6&fC7qWKqHz^LNi*h
z37c^PwxAVl()`r;a3~bwFw9|u!zhO_4&xjqI81Wb$6-H*Lmckna5sY)io-IZe-QKl
i62@+O6HQj>NcYHUi1lLq&CxaBo2TBp%@o%DU;7L0!l9J_

literal 0
HcmV?d00001

diff --git a/library/video-js/font/vjs.woff b/library/video-js/font/vjs.woff
new file mode 100644
index 0000000000000000000000000000000000000000..375510e044395575f322eb0a9f4336d14cf09e14
GIT binary patch
literal 2676
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

literal 0
HcmV?d00001

diff --git a/library/video-js/video-js.css b/library/video-js/video-js.css
index 7956aeee28..4d3a1d2754 100644
--- a/library/video-js/video-js.css
+++ b/library/video-js/video-js.css
@@ -1,6 +1,6 @@
 /*
 VideoJS Default Styles (http://videojs.com)
-Version 3.2.0
+Version GENERATED_AT_BUILD
 */
 
 /*
@@ -14,29 +14,46 @@ REQUIRED STYLES (be careful overriding)
    Otherwise you risk messing up control positioning and full window mode. **
 */
 .video-js {
-  background-color: #000; position: relative; padding: 0;
-
+  background-color: #000;
+  position: relative;
+  padding: 0;
   /* Start with 10px for base font size so other dimensions can be em based and easily calculable. */
   font-size: 10px;
-
   /* Allow poster to be vertially aligned. */
   vertical-align: middle;
   /*  display: table-cell; */ /*This works in Safari but not Firefox.*/
 }
 
-/* Playback technology elements expand to the width/height of the containing div. <video> or <object> */
-.video-js .vjs-tech { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+/* Playback technology elements expand to the width/height of the containing div.
+    <video> or <object> */
+.video-js .vjs-tech {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
 
 /* Fix for Firefox 9 fullscreen (only if it is enabled). Not needed when checking fullScreenEnabled. */
 .video-js:-moz-full-screen { position: absolute; }
 
 /* Fullscreen Styles */
 body.vjs-full-window {
-  padding: 0; margin: 0;
-  height: 100%; overflow-y: auto; /* Fix for IE6 full-window. http://www.cssplay.co.uk/layouts/fixed.html */
+  padding: 0;
+  margin: 0;
+  height: 100%;
+  overflow-y: auto; /* Fix for IE6 full-window. http://www.cssplay.co.uk/layouts/fixed.html */
 }
 .video-js.vjs-fullscreen {
-  position: fixed; overflow: hidden; z-index: 1000; left: 0; top: 0; bottom: 0; right: 0; width: 100% !important; height: 100% !important;
+  position: fixed;
+  overflow: hidden;
+  z-index: 1000;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  width: 100% !important;
+  height: 100% !important;
   _position: absolute; /* IE6 Full-window (underscore hack) */
 }
 .video-js:-webkit-full-screen {
@@ -45,45 +62,84 @@ body.vjs-full-window {
 
 /* Poster Styles */
 .vjs-poster {
-  margin: 0 auto; padding: 0; cursor: pointer;
-
-  /* Scale with the size of the player div. Works when poster is vertically shorter, but stretches when it's less wide. */
-  position: relative; width: 100%; max-height: 100%;
+  background-repeat: no-repeat;
+  background-position: 50% 50%;
+  background-size: contain;
+  cursor: pointer;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  position: relative;
+  width: 100%;
+}
+.vjs-poster img {
+  display: block;
+  margin: 0 auto;
+  max-height: 100%;
+  padding: 0;
+  width: 100%;
 }
 
 /* Text Track Styles */
 /* Overall track holder for both captions and subtitles */
-.video-js .vjs-text-track-display { text-align: center; position: absolute; bottom: 4em; left: 1em; right: 1em; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; }
+.video-js .vjs-text-track-display {
+  text-align: center;
+  position: absolute;
+  bottom: 4em;
+  left: 1em; /* Leave padding on left and right */
+  right: 1em;
+  font-family: Arial, sans-serif;
+}
 /* Individual tracks */
 .video-js .vjs-text-track {
-  display: none; color: #fff; font-size: 1.4em; text-align: center; margin-bottom: 0.1em;
-  /* Transparent black background, or fallback to all black (IE6) */
+  display: none;
+  font-size: 1.4em;
+  text-align: center;
+  margin-bottom: 0.1em;
+  /* Transparent black background, or fallback to all black (oldIE) */
   background: rgb(0, 0, 0); background: rgba(0, 0, 0, 0.50);
 }
-.video-js .vjs-subtitles { color: #fff; }
-.video-js .vjs-captions { color: #fc6; }
+.video-js .vjs-subtitles { color: #fff; } /* Subtitles are white */
+.video-js .vjs-captions { color: #fc6; } /* Captions are yellow */
 .vjs-tt-cue { display: block; }
 
 /* Fading sytles, used to fade control bar. */
 .vjs-fade-in {
-  visibility: visible !important; /* Needed to make sure things hide in older browsers too. */
-  opacity: 1 !important;
+  display: block !important;
+  visibility: visible; /* Needed to make sure things hide in older browsers too. */
+  opacity: 1;
 
-  -webkit-transition: visibility 0s linear 0s, opacity 0.3s linear;
-  -moz-transition: visibility 0s linear 0s, opacity 0.3s linear;
-  -ms-transition: visibility 0s linear 0s, opacity 0.3s linear;
-  -o-transition: visibility 0s linear 0s, opacity 0.3s linear;
-  transition: visibility 0s linear 0s, opacity 0.3s linear;
+  -webkit-transition: visibility 0.1s, opacity 0.1s;
+     -moz-transition: visibility 0.1s, opacity 0.1s;
+      -ms-transition: visibility 0.1s, opacity 0.1s;
+       -o-transition: visibility 0.1s, opacity 0.1s;
+          transition: visibility 0.1s, opacity 0.1s;
 }
 .vjs-fade-out {
-  visibility: hidden !important;
-  opacity: 0 !important;
+  display: block !important;
+  visibility: hidden;
+  opacity: 0;
 
-  -webkit-transition: visibility 0s linear 1.5s,opacity 1.5s linear;
-  -moz-transition: visibility 0s linear 1.5s,opacity 1.5s linear;
-  -ms-transition: visibility 0s linear 1.5s,opacity 1.5s linear;
-  -o-transition: visibility 0s linear 1.5s,opacity 1.5s linear;
-  transition: visibility 0s linear 1.5s,opacity 1.5s linear;
+  -webkit-transition: visibility 1.5s, opacity 1.5s;
+     -moz-transition: visibility 1.5s, opacity 1.5s;
+      -ms-transition: visibility 1.5s, opacity 1.5s;
+       -o-transition: visibility 1.5s, opacity 1.5s;
+          transition: visibility 1.5s, opacity 1.5s;
+
+  /* Wait a moment before fading out the control bar */
+  -webkit-transition-delay: 2s;
+     -moz-transition-delay: 2s;
+      -ms-transition-delay: 2s;
+       -o-transition-delay: 2s;
+          transition-delay: 2s;
+}
+/* Hide disabled or unsupported controls */
+.vjs-default-skin .vjs-hidden { display: none; }
+
+.vjs-lock-showing {
+  display: block !important;
+  opacity: 1;
+  visibility: visible;
 }
 
 /* DEFAULT SKIN (override in another file to create new skins)
@@ -91,409 +147,584 @@ body.vjs-full-window {
 Instead of editing this file, I recommend creating your own skin CSS file to be included after this file,
 so you can upgrade to newer versions easier. You can remove all these styles by removing the 'vjs-default-skin' class from the tag. */
 
-/* The default control bar. Created by bar.js */
-.vjs-default-skin .vjs-controls {
+/* Base UI Component Classes
+-------------------------------------------------------------------------------- */
+@font-face{
+  font-family: 'VideoJS';
+  src: url('font/vjs.eot');
+  src: url('font/vjs.eot') format('embedded-opentype'),
+  url('font/vjs.woff') format('woff'),
+  url('font/vjs.ttf') format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
+
+.vjs-default-skin {
+  color: #ccc;
+}
+
+/* Slider - used for Volume bar and Seek bar */
+.vjs-default-skin .vjs-slider {
+  outline: 0; /* Replace browser focus hightlight with handle highlight */
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+
+  background: rgb(50, 50, 50); /* IE8- Fallback */
+  background: rgba(100, 100, 100, 0.5);
+}
+
+.vjs-default-skin .vjs-slider:focus {
+  background: rgb(70, 70, 70); /* IE8- Fallback */
+  background: rgba(100, 100, 100, 0.70);
+
+  -webkit-box-shadow: 0 0 2em rgba(255, 255, 255, 1);
+     -moz-box-shadow: 0 0 2em rgba(255, 255, 255, 1);
+          box-shadow: 0 0 2em rgba(255, 255, 255, 1);
+}
+
+.vjs-default-skin .vjs-slider-handle {
   position: absolute;
-  bottom: 0; /* Distance from the bottom of the box/video. Keep 0. Use height to add more bottom margin. */
-  left: 0; right: 0; /* 100% width of div */
-  margin: 0; padding: 0; /* Controls are absolutely position, so no padding necessary */
-  height: 2.6em; /* Including any margin you want above or below control items */
-  color: #fff; border-top: 1px solid #404040;
+  /* Needed for IE6 */
+  left: 0;
+  top: 0;
+}
 
-  /* CSS Gradient */
-  /* Can use the Ultimate CSS Gradient Generator: http://www.colorzilla.com/gradient-editor/ */
-  background: #242424; /* Old browsers */
-  background: -moz-linear-gradient(top, #242424 50%, #1f1f1f 50%, #171717 100%); /* FF3.6+ */
-  background: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(50%,#242424), color-stop(50%,#1f1f1f), color-stop(100%,#171717)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top, #242424 50%,#1f1f1f 50%,#171717 100%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top, #242424 50%,#1f1f1f 50%,#171717 100%); /* Opera11.10+ */
-  background: -ms-linear-gradient(top, #242424 50%,#1f1f1f 50%,#171717 100%); /* IE10+ */
-  /* Filter was causing a lot of weird issues in IE. Elements would stop showing up, or other styles would break. */
-  /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#242424', endColorstr='#171717',GradientType=0 );*/ /* IE6-9 */
-  background: linear-gradient(top, #242424 50%,#1f1f1f 50%,#171717 100%); /* W3C */
+.vjs-default-skin .vjs-slider-handle:before {
+  /*content: "\f111";*/ /* Circle icon = f111 */
+  content: "\e009"; /* Square icon */
+  font-family: VideoJS;
+  font-size: 1em;
+  line-height: 1;
+  text-align: center;
+  text-shadow: 0em 0em 1em #fff;
 
-  /* Start hidden and with 0 opacity. Opacity is used to fade in modern browsers. */
-  /* Can't use display block to hide initially because widths of slider handles aren't calculated and avaialbe for positioning correctly. */
-  visibility: hidden;
-  opacity: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+
+  /* Rotate the square icon to make a diamond */
+  -webkit-transform: rotate(-45deg);
+     -moz-transform: rotate(-45deg);
+      -ms-transform: rotate(-45deg);
+       -o-transform: rotate(-45deg);
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+}
+
+/* Control Bar
+-------------------------------------------------------------------------------- */
+/* The default control bar. Created by controls.js */
+.vjs-default-skin .vjs-control-bar {
+  display: none; /* Start hidden */
+  position: absolute;
+  /* Distance from the bottom of the box/video. Keep 0. Use height to add more bottom margin. */
+  bottom: 0;
+  /* 100% width of player div */
+  left: 0;
+  right: 0;
+  /* Controls are absolutely position, so no padding necessary */
+  padding: 0;
+  margin: 0;
+  /* Height includes any margin you want above or below control items */
+  height: 3.0em;
+  background-color: rgb(0, 0, 0);
+  /* Slight blue so it can be seen more easily on black. */
+  background-color: rgba(7, 40, 50, 0.7);
+  /* Default font settings */
+  font-style: normal;
+  font-weight: normal;
+  font-family: Arial, sans-serif;
 }
 
 /* General styles for individual controls. */
 .vjs-default-skin .vjs-control {
-  position: relative; float: left;
-  text-align: center; margin: 0; padding: 0;
-  height: 2.6em; width: 2.6em;
+  outline: none;
+  position: relative;
+  float: left;
+  text-align: center;
+  margin: 0;
+  padding: 0;
+  height: 3.0em;
+  width: 4em;
 }
 
-.vjs-default-skin .vjs-control:focus {
-  outline: 0;
-/*  background-color: #555;*/
+/* FontAwsome button icons */
+.vjs-default-skin .vjs-control:before {
+  font-family: VideoJS;
+  font-size: 1.5em;
+  line-height: 2;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  text-align: center;
+  text-shadow: 1px 1px 1px rgba(0,0,0,0.5);
 }
 
+/* Replacement for focus outline */
+.vjs-default-skin .vjs-control:focus:before,
+.vjs-default-skin .vjs-control:hover:before {
+  text-shadow: 0em 0em 1em rgba(255, 255, 255, 1);
+}
+
+.vjs-default-skin .vjs-control:focus { /*  outline: 0; */ /* keyboard-only users cannot see the focus on several of the UI elements when this is set to 0 */ }
+
 /* Hide control text visually, but have it available for screenreaders: h5bp.com/v */
 .vjs-default-skin .vjs-control-text { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
 
-
 /* Play/Pause
 -------------------------------------------------------------------------------- */
-.vjs-default-skin .vjs-play-control { width: 5em; cursor: pointer !important; }
-/* Play Icon */
-.vjs-default-skin.vjs-paused .vjs-play-control div { width: 15px; height: 17px; background: url('video-js.png'); margin: 0.5em auto 0; }
-.vjs-default-skin.vjs-playing .vjs-play-control div { width: 15px; height: 17px; background: url('video-js.png') -25px 0; margin: 0.5em auto 0; }
+.vjs-default-skin .vjs-play-control {
+  width: 5em;
+  cursor: pointer;
+}
+.vjs-default-skin .vjs-play-control:before {
+  content: "\e001"; /* Play Icon */
+}
+.vjs-default-skin.vjs-playing .vjs-play-control:before {
+  content: "\e002"; /* Pause Icon */
+}
 
 /* Rewind
 -------------------------------------------------------------------------------- */
-.vjs-default-skin .vjs-rewind-control { width: 5em; cursor: pointer !important; }
+/*.vjs-default-skin .vjs-rewind-control { width: 5em; cursor: pointer !important; }
 .vjs-default-skin .vjs-rewind-control div { width: 19px; height: 16px; background: url('video-js.png'); margin: 0.5em auto 0; }
+*/
 
 /* Volume/Mute
 -------------------------------------------------------------------------------- */
-.vjs-default-skin .vjs-mute-control { width: 3.8em; cursor: pointer !important; float: right; }
-.vjs-default-skin .vjs-mute-control div { width: 22px; height: 16px; background: url('video-js.png') -75px -25px; margin: 0.5em auto 0; }
-.vjs-default-skin .vjs-mute-control.vjs-vol-0 div { background: url('video-js.png') 0 -25px; }
-.vjs-default-skin .vjs-mute-control.vjs-vol-1 div { background: url('video-js.png') -25px -25px; }
-.vjs-default-skin .vjs-mute-control.vjs-vol-2 div { background: url('video-js.png') -50px -25px; }
+.vjs-default-skin .vjs-mute-control,
+.vjs-default-skin .vjs-volume-menu-button {
+  cursor: pointer;
+  float: right;
+}
+.vjs-default-skin .vjs-mute-control:before,
+.vjs-default-skin .vjs-volume-menu-button:before {
+  content: "\e006"; /* Full volume */
+}
+.vjs-default-skin .vjs-mute-control.vjs-vol-0:before,
+.vjs-default-skin .vjs-volume-menu-button.vjs-vol-0:before {
+  content: "\e003"; /* No volume */
+}
+.vjs-default-skin .vjs-mute-control.vjs-vol-1:before,
+.vjs-default-skin .vjs-volume-menu-button.vjs-vol-1:before {
+  content: "\e004"; /* Half volume */
+}
+.vjs-default-skin .vjs-mute-control.vjs-vol-2:before,
+.vjs-default-skin .vjs-volume-menu-button.vjs-vol-2:before {
+  content: "\e005"; /* Full volume */
+}
 
-
-.vjs-default-skin .vjs-volume-control { width: 5em; float: right; }
+.vjs-default-skin .vjs-volume-control {
+  width: 5em;
+  float: right;
+}
 .vjs-default-skin .vjs-volume-bar {
-  position: relative; width: 5em; height: 0.6em; margin: 1em auto 0; cursor: pointer !important;
-
-  -moz-border-radius: 0.3em; -webkit-border-radius: 0.3em; border-radius: 0.3em;
-
-  background: #666;
-  background: -moz-linear-gradient(top, #333, #666);
-  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#333), to(#666));
-  background: -webkit-linear-gradient(top, #333, #666);
-  background: -o-linear-gradient(top, #333, #666);
-  background: -ms-linear-gradient(top, #333, #666);
-  background: linear-gradient(top, #333, #666);
+  width: 5em;
+  height: 0.6em;
+  margin: 1.1em auto 0;
 }
+
+.vjs-default-skin .vjs-volume-menu-button .vjs-menu-content {
+  height: 2.9em;
+}
+
 .vjs-default-skin .vjs-volume-level {
-  position: absolute; top: 0; left: 0; height: 0.6em;
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 0.5em;
 
-  -moz-border-radius: 0.3em; -webkit-border-radius: 0.3em; border-radius: 0.3em;
+  background: #66A8CC
+    url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC)
+    -50% 0 repeat;
+}
+.vjs-default-skin .vjs-volume-bar .vjs-volume-handle {
+  width: 0.5em;
+  height: 0.5em;
+}
 
-  background: #fff;
-  background: -moz-linear-gradient(top, #fff, #ccc);
-  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#ccc));
-  background: -webkit-linear-gradient(top, #fff, #ccc);
-  background: -o-linear-gradient(top, #fff, #ccc);
-  background: -ms-linear-gradient(top, #fff, #ccc);
-  background: linear-gradient(top, #fff, #ccc);
+.vjs-default-skin .vjs-volume-handle:before {
+  font-size: 0.9em;
+  top: -0.2em;
+  left: -0.2em;
+
+  width: 1em;
+  height: 1em;
 }
-.vjs-default-skin .vjs-volume-handle {
-  position: absolute; top: -0.2em; width: 0.8em; height: 0.8em; background: #ccc; left: 0;
-  border: 1px solid #fff;
-  -moz-border-radius: 0.6em; -webkit-border-radius: 0.6em; border-radius: 0.6em;
+
+.vjs-default-skin .vjs-volume-menu-button .vjs-menu .vjs-menu-content {
+  width: 6em;
+  left: -4em;
 }
 
+/*.vjs-default-skin .vjs-menu-button .vjs-volume-control {
+  height: 1.5em;
+}*/
+
 /* Progress
 -------------------------------------------------------------------------------- */
-.vjs-default-skin div.vjs-progress-control {
+.vjs-default-skin .vjs-progress-control {
   position: absolute;
-  left: 4.8em; right: 4.8em; /* Leave room for time displays. */
-  height: 1.0em; width: auto;
-  top: -1.3em; /* Set above the rest of the controls. And leave room for 2px of borders (progress bottom and controls top). */
-  border-bottom: 1px solid #1F1F1F;
-  border-top: 1px solid #222;
+  left: 0;
+  right: 0;
+  width: auto;
+  font-size: 0.3em;
+  height: 1em;
+  /* Set above the rest of the controls. */
+  top: -1em;
 
-  /* CSS Gradient */
-  background: #333;
-  background: -moz-linear-gradient(top, #222, #333);
-  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#222), to(#333));
-  background: -webkit-linear-gradient(top, #222, #333);
-  background: -o-linear-gradient(top, #333, #222);
-  background: -ms-linear-gradient(top, #333, #222);
-  background: linear-gradient(top, #333, #222);
+  /* Shrink the bar slower than it grows. */
+  -webkit-transition: top 0.4s, height 0.4s, font-size 0.4s, -webkit-transform 0.4s;
+     -moz-transition: top 0.4s, height 0.4s, font-size 0.4s,    -moz-transform 0.4s;
+       -o-transition: top 0.4s, height 0.4s, font-size 0.4s,      -o-transform 0.4s;
+          transition: top 0.4s, height 0.4s, font-size 0.4s,         transform 0.4s;
 
+}
 
-  /* 1px top shadow */
-/*  -webkit-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.15); -moz-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.15); box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.15);*/
+/* On hover, make the progress bar grow to something that's more clickable.
+    This simply changes the overall font for the progress bar, and this
+    updates both the em-based widths and heights, as wells as the icon font */
+.vjs-default-skin:hover .vjs-progress-control {
+  font-size: .9em;
+
+  /* Even though we're not changing the top/height, we need to include them in
+      the transition so they're handled correctly. */
+  -webkit-transition: top 0.2s, height 0.2s, font-size 0.2s, -webkit-transform 0.2s;
+     -moz-transition: top 0.2s, height 0.2s, font-size 0.2s,    -moz-transform 0.2s;
+       -o-transition: top 0.2s, height 0.2s, font-size 0.2s,      -o-transform 0.2s;
+          transition: top 0.2s, height 0.2s, font-size 0.2s,         transform 0.2s;
 }
 
 /* Box containing play and load progresses. Also acts as seek scrubber. */
 .vjs-default-skin .vjs-progress-holder {
-  position: relative; cursor: pointer !important; /*overflow: hidden;*/
-  padding: 0; margin: 0; /* Placement within the progress control item */
-  height: 1.0em;
-  -moz-border-radius: 0.6em; -webkit-border-radius: 0.6em; border-radius: 0.6em;
-
-  /* CSS Gradient */
-  background: #111;
-  background: -moz-linear-gradient(top, #111, #262626);
-  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#111), to(#262626));
-  background: -webkit-linear-gradient(top, #111, #262626);
-  background: -o-linear-gradient(top, #111, #262626);
-  background: -ms-linear-gradient(top, #111, #262626);
-  background: linear-gradient(top, #111, #262626);
+  /* Placement within the progress control item */
+  height: 100%;
 }
-.vjs-default-skin .vjs-progress-holder .vjs-play-progress,
-.vjs-default-skin .vjs-progress-holder .vjs-load-progress { /* Progress Bars */
-  position: absolute; display: block; height: 1.0em; margin: 0; padding: 0;
-  left: 0; top: 0; /*Needed for IE6*/
-  -moz-border-radius: 0.6em; -webkit-border-radius: 0.6em; border-radius: 0.6em;
 
-  /*width: 0;*/
+/* Progress Bars */
+.vjs-default-skin .vjs-progress-holder .vjs-play-progress,
+.vjs-default-skin .vjs-progress-holder .vjs-load-progress {
+  position: absolute;
+  display: block;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  /* Needed for IE6 */
+  left: 0;
+  top: 0;
 }
 
 .vjs-default-skin .vjs-play-progress {
-  /* CSS Gradient. */
-  background: #fff; /* Old browsers */
-  background: -moz-linear-gradient(top, #fff 0%, #d6d6d6 50%, #fff 100%);
-  background: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%,#fff), color-stop(50%,#d6d6d6), color-stop(100%,#fff));
-  background: -webkit-linear-gradient(top, #fff 0%,#d6d6d6 50%,#fff 100%);
-  background: -o-linear-gradient(top, #fff 0%,#d6d6d6 50%,#fff 100%);
-  background: -ms-linear-gradient(top, #fff 0%,#d6d6d6 50%,#fff 100%);
-  background: linear-gradient(top, #fff 0%,#d6d6d6 50%,#fff 100%);
-
-  background: #efefef;
-  background: -moz-linear-gradient(top, #efefef 0%, #f5f5f5 50%, #dbdbdb 50%, #f1f1f1 100%);
-  background: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%,#efefef), color-stop(50%,#f5f5f5), color-stop(50%,#dbdbdb), color-stop(100%,#f1f1f1));
-  background: -webkit-linear-gradient(top, #efefef 0%,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);
-  background: -o-linear-gradient(top, #efefef 0%,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);
-  background: -ms-linear-gradient(top, #efefef 0%,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#efefef', endColorstr='#f1f1f1',GradientType=0 );
-  background: linear-gradient(top, #efefef 0%,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);
+  /*
+    Using a data URI to create the white diagonal lines with a transparent
+      background. Surprising works in IE8.
+      Created using http://www.patternify.com
+    Changing the first color value will change the bar color.
+    Also using a paralax effect to make the lines move backwards.
+      The -50% left position makes that happen.
+  */
+  background: #66A8CC
+    url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC)
+    -50% 0 repeat;
 }
 .vjs-default-skin .vjs-load-progress {
-  opacity: 0.8;
-
-  /* CSS Gradient */
-  background: #666;
-  background: -moz-linear-gradient(top, #666, #333);
-  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#666), to(#333));
-  background: -webkit-linear-gradient(top, #666, #333);
-  background: -o-linear-gradient(top, #666, #333);
-  background: -ms-linear-gradient(top, #666, #333);
-  background: linear-gradient(top, #666, #333);
+  background: rgb(100, 100, 100); /* IE8- Fallback */
+  background: rgba(255, 255, 255, 0.4);
 }
 
-.vjs-default-skin div.vjs-seek-handle {
-  position: absolute;
-  width: 16px; height: 16px; /* Match img pixles */
-  margin-top: -0.3em;
-  left: 0; top: 0; /*Needed for IE6*/
-
-  background: url('video-js.png') 0 -50px;
-  /* CSS Curved Corners. Needed to make shadows curved. */
-  -moz-border-radius: 0.8em; -webkit-border-radius: 0.8em; border-radius: 0.8em;
-  /* CSS Shadows */
-  -webkit-box-shadow: 0 2px 4px 0 #000; -moz-box-shadow: 0 2px 4px 0 #000; box-shadow: 0 2px 4px 0 #000;
+.vjs-default-skin .vjs-seek-handle {
+  width: 1.5em;
+  height: 100%;
 }
+
+.vjs-default-skin .vjs-seek-handle:before {
+  padding-top: 0.1em; /* Minor adjustment */
+}
+
 /* Time Display
 -------------------------------------------------------------------------------- */
 .vjs-default-skin .vjs-time-controls {
-  position: absolute;
-  right: 0;
-  height: 1.0em; width: 4.8em;
-  top: -1.3em;
-  border-bottom: 1px solid #1F1F1F;
-  border-top: 1px solid #222;
-  background-color: #333;
-
-  font-size: 1em; line-height: 1.0em; font-weight: normal; font-family: Helvetica, Arial, sans-serif;
-
-  background: #333;
-  background: -moz-linear-gradient(top, #222, #333);
-  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#222), to(#333));
-  background: -webkit-linear-gradient(top, #222, #333);
-  background: -o-linear-gradient(top, #333, #222);
-  background: -ms-linear-gradient(top, #333, #222);
-  background: linear-gradient(top, #333, #222);
-
-  /* 1px top shadow */
-/*  -webkit-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.15); -moz-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.15); box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.15);*/
+  font-size: 1em;
+  /* Align vertically by making the line height the same as the control bar */
+  line-height: 3em;
 }
-
-.vjs-default-skin .vjs-current-time { left: 0; }
-
-.vjs-default-skin .vjs-duration { right: 0; display: none; }
-.vjs-default-skin .vjs-remaining-time { right: 0; }
-
-.vjs-time-divider { display:none; }
-
-.vjs-default-skin .vjs-time-control { font-size: 1em; line-height: 1; font-weight: normal; font-family: Helvetica, Arial, sans-serif; }
-.vjs-default-skin .vjs-time-control span { line-height: 25px; /* Centering vertically */ }
+.vjs-default-skin .vjs-current-time { float: left; }
+.vjs-default-skin .vjs-duration { float: left; }
+/* Remaining time is in the HTML, but not included in default design */
+.vjs-default-skin .vjs-remaining-time { display: none; float: left; }
+.vjs-time-divider { float: left; line-height: 3em; }
 
 /* Fullscreen
 -------------------------------------------------------------------------------- */
-.vjs-secondary-controls { float: right; }
-
-.vjs-default-skin .vjs-fullscreen-control { width: 3.8em; cursor: pointer !important; float: right; }
-.vjs-default-skin .vjs-fullscreen-control div { width: 16px; height: 16px; background: url('video-js.png') -50px 0; margin: 0.5em auto 0; }
-
-.vjs-default-skin.vjs-fullscreen .vjs-fullscreen-control div { background: url('video-js.png') -75px 0; }
-
+.vjs-default-skin .vjs-fullscreen-control {
+  width: 3.8em;
+  cursor: pointer;
+  float: right;
+}
+.vjs-default-skin .vjs-fullscreen-control:before {
+  content: "\e000"; /* Enter full screen */
+}
+.vjs-default-skin.vjs-fullscreen .vjs-fullscreen-control:before {
+  content: "\e00b"; /* Exit full screen */
+}
 
 /* Big Play Button (at start)
 ---------------------------------------------------------*/
 .vjs-default-skin .vjs-big-play-button {
-  display: block; /* Start hidden */ z-index: 2;
-  position: absolute; top: 50%; left: 50%; width: 8.0em; height: 8.0em; margin: -42px 0 0 -42px; text-align: center; vertical-align: center; cursor: pointer !important;
-  border: 0.2em solid #fff; opacity: 0.95;
-  -webkit-border-radius: 25px; -moz-border-radius: 25px; border-radius: 25px;
+  display: block;
+  z-index: 2;
+  position: absolute;
+  top: 2em;
+  left: 2em;
+  width: 12.0em;
+  height: 8.0em;
+  margin: 0;
+  text-align: center;
+  vertical-align: middle;
+  cursor: pointer;
+  opacity: 1;
 
-  background: #454545;
-  background: -moz-linear-gradient(top, #454545 0%, #232323 50%, #161616 50%, #3f3f3f 100%);
-  background: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%,#454545), color-stop(50%,#232323), color-stop(50%,#161616), color-stop(100%,#3f3f3f));
-  background: -webkit-linear-gradient(top, #454545 0%,#232323 50%,#161616 50%,#3f3f3f 100%);
-  background: -o-linear-gradient(top, #454545 0%,#232323 50%,#161616 50%,#3f3f3f 100%);
-  background: -ms-linear-gradient(top, #454545 0%,#232323 50%,#161616 50%,#3f3f3f 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#454545', endColorstr='#3f3f3f',GradientType=0 );
-  background: linear-gradient(top, #454545 0%,#232323 50%,#161616 50%,#3f3f3f 100%);
+  /* Need a slightly gray bg so it can be seen on black backgrounds */
+  background-color: rgb(40, 40, 40);
+  background-color: rgba(7, 40, 50, 0.7);
 
-  /* CSS Shadows */
-  -webkit-box-shadow: 4px 4px 8px #000; -moz-box-shadow: 4px 4px 8px #000; box-shadow: 4px 4px 8px #000;
+  border: 0.3em solid rgb(50, 50, 50);
+  border-color: rgba(255, 255, 255, 0.25);
+
+  -webkit-border-radius: 25px;
+     -moz-border-radius: 25px;
+          border-radius: 25px;
+
+  -webkit-box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25);
+     -moz-box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25);
+          box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25);
+
+  -webkit-transition: border 0.4s, -webkit-box-shadow 0.4s, -webkit-transform 0.4s;
+     -moz-transition: border 0.4s,    -moz-box-shadow 0.4s,    -moz-transform 0.4s;
+       -o-transition: border 0.4s,      -o-box-shadow 0.4s,      -o-transform 0.4s;
+          transition: border 0.4s,         box-shadow 0.4s,         transform 0.4s;
 }
 
-.vjs-default-skin div.vjs-big-play-button:hover {
-  -webkit-box-shadow: 0 0 80px #fff; -moz-box-shadow: 0 0 80px #fff; box-shadow: 0 0 80px #fff;
+.vjs-default-skin:hover .vjs-big-play-button,
+.vjs-default-skin .vjs-big-play-button:focus {
+  outline: 0;
+  border-color: rgb(255, 255, 255);
+  border-color: rgba(255, 255, 255, 1);
+  /* IE8 needs a non-glow hover state */
+  background-color: rgb(80, 80, 80);
+  background-color: rgba(50, 50, 50, 0.75);
+
+  -webkit-box-shadow: 0 0 3em #fff;
+     -moz-box-shadow: 0 0 3em #fff;
+          box-shadow: 0 0 3em #fff;
+
+  -webkit-transition: border 0s, -webkit-box-shadow 0s, -webkit-transform 0s;
+     -moz-transition: border 0s,    -moz-box-shadow 0s,    -moz-transform 0s;
+       -o-transition: border 0s,      -o-box-shadow 0s,      -o-transform 0s;
+          transition: border 0s,         box-shadow 0s,         transform 0s;
 }
 
-.vjs-default-skin div.vjs-big-play-button span {
-  position: absolute; top: 50%; left: 50%;
-  display: block; width: 35px; height: 42px;
-  margin: -20px 0 0 -15px; /* Using negative margin to center image. */
-  background: url('video-js.png') -100px 0;
+.vjs-default-skin .vjs-big-play-button:before {
+  content: "\e001"; /* Play icon */
+  font-family: VideoJS;
+  font-size: 3em;
+  line-height: 2.66;
+  text-shadow: 0.05em 0.05em 0.1em #000;
+  text-align: center; /* Needed for IE8 */
+
+  position: absolute;
+  left: 0;
+  width: 100%;
+  height: 100%;
 }
 
 /* Loading Spinner
 ---------------------------------------------------------*/
-/* CSS Spinners by Kilian Valkhof - http://kilianvalkhof.com/2010/css-xhtml/css3-loading-spinners-without-images/ */
 .vjs-loading-spinner {
   display: none;
-  position: absolute; top: 50%; left: 50%; width: 55px; height: 55px;
-  margin: -28px 0 0 -28px;
-  -webkit-animation-name: rotatethis;
-  -webkit-animation-duration:1s;
-  -webkit-animation-iteration-count:infinite;
-  -webkit-animation-timing-function:linear;
-  -moz-animation-name: rotatethis;
-  -moz-animation-duration:1s;
-  -moz-animation-iteration-count:infinite;
-  -moz-animation-timing-function:linear;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+
+  font-size: 5em;
+  line-height: 1;
+
+  width: 1em;
+  height: 1em;
+
+  margin-left: -0.5em;
+  margin-top: -0.5em;
+
+  opacity: 0.75;
+
+  -webkit-animation: spin 1.5s infinite linear;
+     -moz-animation: spin 1.5s infinite linear;
+       -o-animation: spin 1.5s infinite linear;
+          animation: spin 1.5s infinite linear;
 }
 
-@-webkit-keyframes rotatethis {
-  0% {-webkit-transform:scale(0.6) rotate(0deg); }
-  12.5% {-webkit-transform:scale(0.6) rotate(0deg); }
-  12.51% {-webkit-transform:scale(0.6) rotate(45deg); }
-  25% {-webkit-transform:scale(0.6) rotate(45deg); }
-  25.01% {-webkit-transform:scale(0.6) rotate(90deg);}
-  37.5% {-webkit-transform:scale(0.6) rotate(90deg);}
-  37.51% {-webkit-transform:scale(0.6) rotate(135deg);}
-  50% {-webkit-transform:scale(0.6) rotate(135deg);}
-  50.01% {-webkit-transform:scale(0.6) rotate(180deg);}
-  62.5% {-webkit-transform:scale(0.6) rotate(180deg);}
-  62.51% {-webkit-transform:scale(0.6) rotate(225deg);}
-  75% {-webkit-transform:scale(0.6) rotate(225deg);}
-  75.01% {-webkit-transform:scale(0.6) rotate(270deg);}
-  87.5% {-webkit-transform:scale(0.6) rotate(270deg);}
-  87.51% {-webkit-transform:scale(0.6) rotate(315deg);}
-  100% {-webkit-transform:scale(0.6) rotate(315deg);}
+.vjs-default-skin .vjs-loading-spinner:before {
+  content: "\e00a"; /* Loading spinner icon */
+  font-family: VideoJS;
+
+  position: absolute;
+  width: 1em;
+  height: 1em;
+  text-align: center;
+  text-shadow: 0em 0em 0.1em #000;
 }
 
-@-moz-keyframes rotatethis {
-  0% {-moz-transform:scale(0.6) rotate(0deg);}
-  12.5% {-moz-transform:scale(0.6) rotate(0deg);}
-  12.51% {-moz-transform:scale(0.6) rotate(45deg);}
-  25% {-moz-transform:scale(0.6) rotate(45deg);}
-  25.01% {-moz-transform:scale(0.6) rotate(90deg);}
-  37.5% {-moz-transform:scale(0.6) rotate(90deg);}
-  37.51% {-moz-transform:scale(0.6) rotate(135deg);}
-  50% {-moz-transform:scale(0.6) rotate(135deg);}
-  50.01% {-moz-transform:scale(0.6) rotate(180deg);}
-  62.5% {-moz-transform:scale(0.6) rotate(180deg);}
-  62.51% {-moz-transform:scale(0.6) rotate(225deg);}
-  75% {-moz-transform:scale(0.6) rotate(225deg);}
-  75.01% {-moz-transform:scale(0.6) rotate(270deg);}
-  87.5% {-moz-transform:scale(0.6) rotate(270deg);}
-  87.51% {-moz-transform:scale(0.6) rotate(315deg);}
-  100% {-moz-transform:scale(0.6) rotate(315deg);}
+/* Add a gradient to the spinner by overlaying another copy.
+   Text gradient plus a text shadow doesn't work
+   and `background-clip: text` only works in Webkit. */
+.vjs-default-skin .vjs-loading-spinner:after {
+  content: "\e00a"; /* Loading spinner icon */
+  font-family: VideoJS;
+
+  position: absolute;
+  width: 1em;
+  height: 1em;
+  text-align: center;
+
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
 }
-/* Each circle */
-div.vjs-loading-spinner .ball1 { opacity: 0.12; position:absolute; left: 20px; top: 0px; width: 13px; height: 13px; background: #fff;
-  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
 
-div.vjs-loading-spinner .ball2 { opacity: 0.25; position:absolute; left: 34px; top: 6px; width: 13px; height: 13px; background: #fff;
-  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
-
-div.vjs-loading-spinner .ball3 { opacity: 0.37; position:absolute; left: 40px; top: 20px; width: 13px; height: 13px; background: #fff;
-  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
-
-div.vjs-loading-spinner .ball4 { opacity: 0.50; position:absolute; left: 34px; top: 34px; width: 13px; height: 13px; background: #fff;
-  border-radius: 10px; -webkit-border-radius: 10px; -moz-border-radius: 15px; border: 1px solid #ccc; }
-
-div.vjs-loading-spinner .ball5 { opacity: 0.62; position:absolute; left: 20px; top: 40px; width: 13px; height: 13px; background: #fff;
-  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
-
-div.vjs-loading-spinner .ball6 { opacity: 0.75; position:absolute; left: 6px; top: 34px; width: 13px; height: 13px; background: #fff;
-  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
-
-div.vjs-loading-spinner .ball7 { opacity: 0.87; position:absolute; left: 0px; top: 20px; width: 13px; height: 13px; background: #fff;
-  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
-
-div.vjs-loading-spinner .ball8 { opacity: 1.00; position:absolute; left: 6px; top: 6px; width: 13px; height: 13px; background: #fff;
-  border-radius: 13px; -webkit-border-radius: 13px; -moz-border-radius: 13px; border: 1px solid #ccc; }
+@-moz-keyframes spin {
+  0% { -moz-transform: rotate(0deg); }
+  100% { -moz-transform: rotate(359deg); }
+}
+@-webkit-keyframes spin {
+  0% { -webkit-transform: rotate(0deg); }
+  100% { -webkit-transform: rotate(359deg); }
+}
+@-o-keyframes spin {
+  0% { -o-transform: rotate(0deg); }
+  100% { -o-transform: rotate(359deg); }
+}
+@-ms-keyframes spin {
+  0% { -ms-transform: rotate(0deg); }
+  100% { -ms-transform: rotate(359deg); }
+}
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(359deg); }
+}
 
 /* Menu Buttons (Captions/Subtitles/etc.)
 -------------------------------------------------------------------------------- */
 .vjs-default-skin .vjs-menu-button {
-  float: right; margin: 0.2em 0.5em 0 0; padding: 0; width: 3em; height: 2em; cursor: pointer !important;
-
-  border: 1px solid #111; -moz-border-radius: 0.3em; -webkit-border-radius: 0.3em; border-radius: 0.3em;
-
-  background: #4d4d4d;
-  background: -moz-linear-gradient(top,  #4d4d4d 0%, #3f3f3f 50%, #333333 50%, #252525 100%);
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4d4d4d), color-stop(50%,#3f3f3f), color-stop(50%,#333333), color-stop(100%,#252525));
-  background: -webkit-linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
-  background: -o-linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
-  background: -ms-linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
-  background: linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
+  float: right;
+  cursor: pointer;
+}
+
+.vjs-default-skin .vjs-menu {
+  display: none;
+  position: absolute;
+  bottom: 0;
+  left: 0em; /* (Width of vjs-menu - width of button) / 2 */
+  width: 0em;
+  height: 0em;
+  margin-bottom: 3em;
+
+  border-left: 2em solid transparent;
+  border-right: 2em solid transparent;
+
+  border-top: 1.55em solid rgb(0, 0, 0); /* Same top as ul bottom */
+  border-top-color: rgba(7, 40, 50, 0.5); /* Same as ul background */
 }
-/* Button Icon */
-.vjs-default-skin .vjs-menu-button div { background: url('video-js.png') 0px -75px no-repeat; width: 16px; height: 16px; margin: 0.2em auto 0; padding: 0; }
 
 /* Button Pop-up Menu */
-.vjs-default-skin .vjs-menu-button ul {
-  display: none; /* Start hidden. Hover will show. */
-  opacity: 0.8;
+.vjs-default-skin .vjs-menu-button .vjs-menu .vjs-menu-content {
+  display: block;
   padding: 0; margin: 0;
-  position: absolute; width: 10em; bottom: 2em; max-height: 15em;
-  left: -3.5em; /* Width of menu - width of button / 2 */
-  background-color: #111;
-  border: 2px solid #333;
-  -moz-border-radius: 0.7em; -webkit-border-radius: 1em; border-radius: .5em;
-  -webkit-box-shadow: 0 2px 4px 0 #000; -moz-box-shadow: 0 2px 4px 0 #000; box-shadow: 0 2px 4px 0 #000;
+  position: absolute;
+  width: 10em;
+  bottom: 1.5em; /* Same bottom as vjs-menu border-top */
+  max-height: 15em;
   overflow: auto;
+
+  left: -5em; /* Width of menu - width of button / 2 */
+
+  background-color: rgb(0, 0, 0);
+  background-color: rgba(7, 40, 50, 0.7);
+
+  -webkit-box-shadow: -20px -20px 0px rgba(255, 255, 255, 0.5);
+     -moz-box-shadow: 0 0 1em rgba(255, 255, 255, 0.5);
+          box-shadow: -0.2em -0.2em 0.3em rgba(255, 255, 255, 0.2);
 }
 
-.vjs-default-skin .vjs-menu-button:focus ul,
-.vjs-default-skin .vjs-menu-button:hover ul { display: block; list-style: none; }
-.vjs-default-skin .vjs-menu-button ul li { list-style: none; margin: 0; padding: 0.3em 0 0.3em 20px; line-height: 1.4em; font-size: 1.2em; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; text-align: left; }
-.vjs-default-skin .vjs-menu-button ul li.vjs-selected { text-decoration: underline; background: url('video-js.png') -125px -50px no-repeat; }
+/*.vjs-default-skin .vjs-menu-button:focus ul,*/ /* This is not needed because keyboard accessibility for the caption button is not handled with the focus any more. */
+.vjs-default-skin .vjs-menu-button:hover .vjs-menu {
+  display: block;
+}
+.vjs-default-skin .vjs-menu-button ul li {
+  list-style: none;
+  margin: 0;
+  padding: 0.3em 0 0.3em 0;
+  line-height: 1.4em;
+  font-size: 1.2em;
+  font-weight: normal;
+  text-align: center;
+  text-transform: lowercase;
+}
+.vjs-default-skin .vjs-menu-button ul li.vjs-selected {
+  background-color: #000;
+}
 .vjs-default-skin .vjs-menu-button ul li:focus,
 .vjs-default-skin .vjs-menu-button ul li:hover,
 .vjs-default-skin .vjs-menu-button ul li.vjs-selected:focus,
-.vjs-default-skin .vjs-menu-button ul li.vjs-selected:hover { background-color: #ccc; color: #111; outline: 0; }
+.vjs-default-skin .vjs-menu-button ul li.vjs-selected:hover {
+  background-color: rgb(255, 255, 255);
+  background-color: rgba(255, 255, 255, 0.75);
+  color: #111;
+  outline: 0;
+
+  -webkit-box-shadow: 0 0 1em rgba(255, 255, 255, 1);
+     -moz-box-shadow: 0 0 1em rgba(255, 255, 255, 1);
+          box-shadow: 0 0 1em rgba(255, 255, 255, 1);
+}
 .vjs-default-skin .vjs-menu-button ul li.vjs-menu-title {
-  text-align: center; text-transform: uppercase; font-size: 1em; line-height: 2em; padding: 0; margin: 0 0 0.3em 0;
-
-  color: #fff; font-weight: bold;
-
+  text-align: center;
+  text-transform: uppercase;
+  font-size: 1em;
+  line-height: 2em;
+  padding: 0;
+  margin: 0 0 0.3em 0;
+  font-weight: bold;
   cursor: default;
-
-  background: #4d4d4d;
-  background: -moz-linear-gradient(top,  #4d4d4d 0%, #3f3f3f 50%, #333333 50%, #252525 100%);
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4d4d4d), color-stop(50%,#3f3f3f), color-stop(50%,#333333), color-stop(100%,#252525));
-  background: -webkit-linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
-  background: -o-linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
-  background: -ms-linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
-  background: linear-gradient(top,  #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
 }
 
 /* Subtitles Button */
-.vjs-default-skin .vjs-captions-button div { background-position: -25px -75px; }
-.vjs-default-skin .vjs-chapters-button div { background-position: -100px -75px; }
-.vjs-default-skin .vjs-chapters-button ul { width: 20em; left: -8.5em; /* Width of menu - width of button / 2 */ }
+.vjs-default-skin .vjs-subtitles-button:before { content: "\e00c"; }
+
+/* There's unfortunately no CC button in FontAwesome, so we need
+    to manually create one. Please +1 the fontawesome request.
+    https://github.com/FortAwesome/Font-Awesome/issues/968 */
+.vjs-default-skin .vjs-captions-button {
+  font-size: 1em; /* Font icons are 1.5em */
+}
+.vjs-default-skin .vjs-captions-button:before {
+  content: "\e008";
+  font-family: VideoJS;
+  font-size: 1.5em;
+  line-height: 2;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  text-align: center;
+  text-shadow: none;
+}
+
+
+/* Replacement for focus outline */
+.vjs-default-skin .vjs-captions-button:focus .vjs-control-content:before,
+.vjs-default-skin .vjs-captions-button:hover .vjs-control-content:before {
+  -webkit-box-shadow: 0 0 1em rgba(255, 255, 255, 1);
+     -moz-box-shadow: 0 0 1em rgba(255, 255, 255, 1);
+          box-shadow: 0 0 1em rgba(255, 255, 255, 1);
+}
diff --git a/library/video-js/video-js.min.css b/library/video-js/video-js.min.css
deleted file mode 100644
index 06c0e6b4f6..0000000000
--- a/library/video-js/video-js.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.video-js{background-color:#000;position:relative;padding:0;font-size:10px;vertical-align:middle}.video-js .vjs-tech{position:absolute;top:0;left:0;width:100%;height:100%}.video-js:-moz-full-screen{position:absolute}body.vjs-full-window{padding:0;margin:0;height:100%;overflow-y:auto}.video-js.vjs-fullscreen{position:fixed;overflow:hidden;z-index:1000;left:0;top:0;bottom:0;right:0;width:100%!important;height:100%!important;_position:absolute}.video-js:-webkit-full-screen{width:100%!important;height:100%!important}.vjs-poster{margin:0 auto;padding:0;cursor:pointer;position:relative;width:100%;max-height:100%}.video-js .vjs-text-track-display{text-align:center;position:absolute;bottom:4em;left:1em;right:1em;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}.video-js .vjs-text-track{display:none;color:#fff;font-size:1.4em;text-align:center;margin-bottom:.1em;background:#000;background:rgba(0,0,0,0.50)}.video-js .vjs-subtitles{color:#fff}.video-js .vjs-captions{color:#fc6}.vjs-tt-cue{display:block}.vjs-fade-in{visibility:visible!important;opacity:1!important;-webkit-transition:visibility 0s linear 0s,opacity .3s linear;-moz-transition:visibility 0s linear 0s,opacity .3s linear;-ms-transition:visibility 0s linear 0s,opacity .3s linear;-o-transition:visibility 0s linear 0s,opacity .3s linear;transition:visibility 0s linear 0s,opacity .3s linear}.vjs-fade-out{visibility:hidden!important;opacity:0!important;-webkit-transition:visibility 0s linear 1.5s,opacity 1.5s linear;-moz-transition:visibility 0s linear 1.5s,opacity 1.5s linear;-ms-transition:visibility 0s linear 1.5s,opacity 1.5s linear;-o-transition:visibility 0s linear 1.5s,opacity 1.5s linear;transition:visibility 0s linear 1.5s,opacity 1.5s linear}.vjs-default-skin .vjs-controls{position:absolute;bottom:0;left:0;right:0;margin:0;padding:0;height:2.6em;color:#fff;border-top:1px solid #404040;background:#242424;background:-moz-linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(50%,#242424),color-stop(50%,#1f1f1f),color-stop(100%,#171717));background:-webkit-linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);background:-o-linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);background:-ms-linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);background:linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);visibility:hidden;opacity:0}.vjs-default-skin .vjs-control{position:relative;float:left;text-align:center;margin:0;padding:0;height:2.6em;width:2.6em}.vjs-default-skin .vjs-control:focus{outline:0}.vjs-default-skin .vjs-control-text{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.vjs-default-skin .vjs-play-control{width:5em;cursor:pointer!important}.vjs-default-skin.vjs-paused .vjs-play-control div{width:15px;height:17px;background:url('video-js.png');margin:.5em auto 0}.vjs-default-skin.vjs-playing .vjs-play-control div{width:15px;height:17px;background:url('video-js.png') -25px 0;margin:.5em auto 0}.vjs-default-skin .vjs-rewind-control{width:5em;cursor:pointer!important}.vjs-default-skin .vjs-rewind-control div{width:19px;height:16px;background:url('video-js.png');margin:.5em auto 0}.vjs-default-skin .vjs-mute-control{width:3.8em;cursor:pointer!important;float:right}.vjs-default-skin .vjs-mute-control div{width:22px;height:16px;background:url('video-js.png') -75px -25px;margin:.5em auto 0}.vjs-default-skin .vjs-mute-control.vjs-vol-0 div{background:url('video-js.png') 0 -25px}.vjs-default-skin .vjs-mute-control.vjs-vol-1 div{background:url('video-js.png') -25px -25px}.vjs-default-skin .vjs-mute-control.vjs-vol-2 div{background:url('video-js.png') -50px -25px}.vjs-default-skin .vjs-volume-control{width:5em;float:right}.vjs-default-skin .vjs-volume-bar{position:relative;width:5em;height:.6em;margin:1em auto 0;cursor:pointer!important;-moz-border-radius:.3em;-webkit-border-radius:.3em;border-radius:.3em;background:#666;background:-moz-linear-gradient(top,#333,#666);background:-webkit-gradient(linear,0% 0,0% 100%,from(#333),to(#666));background:-webkit-linear-gradient(top,#333,#666);background:-o-linear-gradient(top,#333,#666);background:-ms-linear-gradient(top,#333,#666);background:linear-gradient(top,#333,#666)}.vjs-default-skin .vjs-volume-level{position:absolute;top:0;left:0;height:.6em;-moz-border-radius:.3em;-webkit-border-radius:.3em;border-radius:.3em;background:#fff;background:-moz-linear-gradient(top,#fff,#ccc);background:-webkit-gradient(linear,0% 0,0% 100%,from(#fff),to(#ccc));background:-webkit-linear-gradient(top,#fff,#ccc);background:-o-linear-gradient(top,#fff,#ccc);background:-ms-linear-gradient(top,#fff,#ccc);background:linear-gradient(top,#fff,#ccc)}.vjs-default-skin .vjs-volume-handle{position:absolute;top:-0.2em;width:.8em;height:.8em;background:#ccc;left:0;border:1px solid #fff;-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em}.vjs-default-skin div.vjs-progress-control{position:absolute;left:4.8em;right:4.8em;height:1.0em;width:auto;top:-1.3em;border-bottom:1px solid #1f1f1f;border-top:1px solid #222;background:#333;background:-moz-linear-gradient(top,#222,#333);background:-webkit-gradient(linear,0% 0,0% 100%,from(#222),to(#333));background:-webkit-linear-gradient(top,#222,#333);background:-o-linear-gradient(top,#333,#222);background:-ms-linear-gradient(top,#333,#222);background:linear-gradient(top,#333,#222)}.vjs-default-skin .vjs-progress-holder{position:relative;cursor:pointer!important;padding:0;margin:0;height:1.0em;-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em;background:#111;background:-moz-linear-gradient(top,#111,#262626);background:-webkit-gradient(linear,0% 0,0% 100%,from(#111),to(#262626));background:-webkit-linear-gradient(top,#111,#262626);background:-o-linear-gradient(top,#111,#262626);background:-ms-linear-gradient(top,#111,#262626);background:linear-gradient(top,#111,#262626)}.vjs-default-skin .vjs-progress-holder .vjs-play-progress,.vjs-default-skin .vjs-progress-holder .vjs-load-progress{position:absolute;display:block;height:1.0em;margin:0;padding:0;left:0;top:0;-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em}.vjs-default-skin .vjs-play-progress{background:#fff;background:-moz-linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(0%,#fff),color-stop(50%,#d6d6d6),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:-o-linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:-ms-linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:#efefef;background:-moz-linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(0%,#efefef),color-stop(50%,#f5f5f5),color-stop(50%,#dbdbdb),color-stop(100%,#f1f1f1));background:-webkit-linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);background:-o-linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);background:-ms-linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#efefef',endColorstr='#f1f1f1',GradientType=0);background:linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%)}.vjs-default-skin .vjs-load-progress{opacity:.8;background:#666;background:-moz-linear-gradient(top,#666,#333);background:-webkit-gradient(linear,0% 0,0% 100%,from(#666),to(#333));background:-webkit-linear-gradient(top,#666,#333);background:-o-linear-gradient(top,#666,#333);background:-ms-linear-gradient(top,#666,#333);background:linear-gradient(top,#666,#333)}.vjs-default-skin div.vjs-seek-handle{position:absolute;width:16px;height:16px;margin-top:-0.3em;left:0;top:0;background:url('video-js.png') 0 -50px;-moz-border-radius:.8em;-webkit-border-radius:.8em;border-radius:.8em;-webkit-box-shadow:0 2px 4px 0 #000;-moz-box-shadow:0 2px 4px 0 #000;box-shadow:0 2px 4px 0 #000}.vjs-default-skin .vjs-time-controls{position:absolute;right:0;height:1.0em;width:4.8em;top:-1.3em;border-bottom:1px solid #1f1f1f;border-top:1px solid #222;background-color:#333;font-size:1em;line-height:1.0em;font-weight:normal;font-family:Helvetica,Arial,sans-serif;background:#333;background:-moz-linear-gradient(top,#222,#333);background:-webkit-gradient(linear,0% 0,0% 100%,from(#222),to(#333));background:-webkit-linear-gradient(top,#222,#333);background:-o-linear-gradient(top,#333,#222);background:-ms-linear-gradient(top,#333,#222);background:linear-gradient(top,#333,#222)}.vjs-default-skin .vjs-current-time{left:0}.vjs-default-skin .vjs-duration{right:0;display:none}.vjs-default-skin .vjs-remaining-time{right:0}.vjs-time-divider{display:none}.vjs-default-skin .vjs-time-control{font-size:1em;line-height:1;font-weight:normal;font-family:Helvetica,Arial,sans-serif}.vjs-default-skin .vjs-time-control span{line-height:25px}.vjs-secondary-controls{float:right}.vjs-default-skin .vjs-fullscreen-control{width:3.8em;cursor:pointer!important;float:right}.vjs-default-skin .vjs-fullscreen-control div{width:16px;height:16px;background:url('video-js.png') -50px 0;margin:.5em auto 0}.vjs-default-skin.vjs-fullscreen .vjs-fullscreen-control div{background:url('video-js.png') -75px 0}.vjs-default-skin .vjs-big-play-button{display:block;z-index:2;position:absolute;top:50%;left:50%;width:8.0em;height:8.0em;margin:-42px 0 0 -42px;text-align:center;vertical-align:center;cursor:pointer!important;border:.2em solid #fff;opacity:.95;-webkit-border-radius:25px;-moz-border-radius:25px;border-radius:25px;background:#454545;background:-moz-linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(0%,#454545),color-stop(50%,#232323),color-stop(50%,#161616),color-stop(100%,#3f3f3f));background:-webkit-linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);background:-o-linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);background:-ms-linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545',endColorstr='#3f3f3f',GradientType=0);background:linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);-webkit-box-shadow:4px 4px 8px #000;-moz-box-shadow:4px 4px 8px #000;box-shadow:4px 4px 8px #000}.vjs-default-skin div.vjs-big-play-button:hover{-webkit-box-shadow:0 0 80px #fff;-moz-box-shadow:0 0 80px #fff;box-shadow:0 0 80px #fff}.vjs-default-skin div.vjs-big-play-button span{position:absolute;top:50%;left:50%;display:block;width:35px;height:42px;margin:-20px 0 0 -15px;background:url('video-js.png') -100px 0}.vjs-loading-spinner{display:none;position:absolute;top:50%;left:50%;width:55px;height:55px;margin:-28px 0 0 -28px;-webkit-animation-name:rotatethis;-webkit-animation-duration:1s;-webkit-animation-iteration-count:infinite;-webkit-animation-timing-function:linear;-moz-animation-name:rotatethis;-moz-animation-duration:1s;-moz-animation-iteration-count:infinite;-moz-animation-timing-function:linear}@-webkit-keyframes rotatethis{0%{-webkit-transform:scale(0.6) rotate(0deg)}12.5%{-webkit-transform:scale(0.6) rotate(0deg)}12.51%{-webkit-transform:scale(0.6) rotate(45deg)}25%{-webkit-transform:scale(0.6) rotate(45deg)}25.01%{-webkit-transform:scale(0.6) rotate(90deg)}37.5%{-webkit-transform:scale(0.6) rotate(90deg)}37.51%{-webkit-transform:scale(0.6) rotate(135deg)}50%{-webkit-transform:scale(0.6) rotate(135deg)}50.01%{-webkit-transform:scale(0.6) rotate(180deg)}62.5%{-webkit-transform:scale(0.6) rotate(180deg)}62.51%{-webkit-transform:scale(0.6) rotate(225deg)}75%{-webkit-transform:scale(0.6) rotate(225deg)}75.01%{-webkit-transform:scale(0.6) rotate(270deg)}87.5%{-webkit-transform:scale(0.6) rotate(270deg)}87.51%{-webkit-transform:scale(0.6) rotate(315deg)}100%{-webkit-transform:scale(0.6) rotate(315deg)}}@-moz-keyframes rotatethis{0%{-moz-transform:scale(0.6) rotate(0deg)}12.5%{-moz-transform:scale(0.6) rotate(0deg)}12.51%{-moz-transform:scale(0.6) rotate(45deg)}25%{-moz-transform:scale(0.6) rotate(45deg)}25.01%{-moz-transform:scale(0.6) rotate(90deg)}37.5%{-moz-transform:scale(0.6) rotate(90deg)}37.51%{-moz-transform:scale(0.6) rotate(135deg)}50%{-moz-transform:scale(0.6) rotate(135deg)}50.01%{-moz-transform:scale(0.6) rotate(180deg)}62.5%{-moz-transform:scale(0.6) rotate(180deg)}62.51%{-moz-transform:scale(0.6) rotate(225deg)}75%{-moz-transform:scale(0.6) rotate(225deg)}75.01%{-moz-transform:scale(0.6) rotate(270deg)}87.5%{-moz-transform:scale(0.6) rotate(270deg)}87.51%{-moz-transform:scale(0.6) rotate(315deg)}100%{-moz-transform:scale(0.6) rotate(315deg)}}div.vjs-loading-spinner .ball1{opacity:.12;position:absolute;left:20px;top:0;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball2{opacity:.25;position:absolute;left:34px;top:6px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball3{opacity:.37;position:absolute;left:40px;top:20px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball4{opacity:.50;position:absolute;left:34px;top:34px;width:13px;height:13px;background:#fff;border-radius:10px;-webkit-border-radius:10px;-moz-border-radius:15px;border:1px solid #ccc}div.vjs-loading-spinner .ball5{opacity:.62;position:absolute;left:20px;top:40px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball6{opacity:.75;position:absolute;left:6px;top:34px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball7{opacity:.87;position:absolute;left:0;top:20px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball8{opacity:1.00;position:absolute;left:6px;top:6px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}.vjs-default-skin .vjs-menu-button{float:right;margin:.2em .5em 0 0;padding:0;width:3em;height:2em;cursor:pointer!important;border:1px solid #111;-moz-border-radius:.3em;-webkit-border-radius:.3em;border-radius:.3em;background:#4d4d4d;background:-moz-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#4d4d4d),color-stop(50%,#3f3f3f),color-stop(50%,#333),color-stop(100%,#252525));background:-webkit-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-o-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-ms-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%)}.vjs-default-skin .vjs-menu-button div{background:url('video-js.png') 0 -75px no-repeat;width:16px;height:16px;margin:.2em auto 0;padding:0}.vjs-default-skin .vjs-menu-button ul{display:none;opacity:.8;padding:0;margin:0;position:absolute;width:10em;bottom:2em;max-height:15em;left:-3.5em;background-color:#111;border:2px solid #333;-moz-border-radius:.7em;-webkit-border-radius:1em;border-radius:.5em;-webkit-box-shadow:0 2px 4px 0 #000;-moz-box-shadow:0 2px 4px 0 #000;box-shadow:0 2px 4px 0 #000;overflow:auto}.vjs-default-skin .vjs-menu-button:focus ul,.vjs-default-skin .vjs-menu-button:hover ul{display:block;list-style:none}.vjs-default-skin .vjs-menu-button ul li{list-style:none;margin:0;padding:.3em 0 .3em 20px;line-height:1.4em;font-size:1.2em;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;text-align:left}.vjs-default-skin .vjs-menu-button ul li.vjs-selected{text-decoration:underline;background:url('video-js.png') -125px -50px no-repeat}.vjs-default-skin .vjs-menu-button ul li:focus,.vjs-default-skin .vjs-menu-button ul li:hover,.vjs-default-skin .vjs-menu-button ul li.vjs-selected:focus,.vjs-default-skin .vjs-menu-button ul li.vjs-selected:hover{background-color:#ccc;color:#111;outline:0}.vjs-default-skin .vjs-menu-button ul li.vjs-menu-title{text-align:center;text-transform:uppercase;font-size:1em;line-height:2em;padding:0;margin:0 0 .3em 0;color:#fff;font-weight:bold;cursor:default;background:#4d4d4d;background:-moz-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#4d4d4d),color-stop(50%,#3f3f3f),color-stop(50%,#333),color-stop(100%,#252525));background:-webkit-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-o-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-ms-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%)}.vjs-default-skin .vjs-captions-button div{background-position:-25px -75px}.vjs-default-skin .vjs-chapters-button div{background-position:-100px -75px}.vjs-default-skin .vjs-chapters-button ul{width:20em;left:-8.5em}
\ No newline at end of file
diff --git a/library/video-js/video-js.png b/library/video-js/video-js.png
deleted file mode 100644
index 100bc7f8ed1e56b3c61417dba339abc131898f66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8235
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

diff --git a/library/video-js/video-js.swf b/library/video-js/video-js.swf
index 3273af5ad7841e9aaa0106a61aaf7b832a7a321a..61a6e347f1163a96ecbdee58077eaa3e3484bfa8 100644
GIT binary patch
literal 14059
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

literal 9612
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
CtL;(%

diff --git a/library/video-js/video.dev.js b/library/video-js/video.dev.js
new file mode 100644
index 0000000000..06ffaec23c
--- /dev/null
+++ b/library/video-js/video.dev.js
@@ -0,0 +1,6079 @@
+/**
+ * @fileoverview Main function src.
+ */
+
+// HTML5 Shiv. Must be in <head> to support older browsers.
+document.createElement('video');document.createElement('audio');
+
+/**
+ * Doubles as the main function for users to create a player instance and also
+ * the main library object.
+ *
+ * @param  {String|Element} id      Video element or video element ID
+ * @param  {Object=} options        Optional options object for config/settings
+ * @param  {Function=} ready        Optional ready callback
+ * @return {vjs.Player}             A player instance
+ */
+var vjs = function(id, options, ready){
+  var tag; // Element of ID
+
+  // Allow for element or ID to be passed in
+  // String ID
+  if (typeof id === 'string') {
+
+    // Adjust for jQuery ID syntax
+    if (id.indexOf('#') === 0) {
+      id = id.slice(1);
+    }
+
+    // If a player instance has already been created for this ID return it.
+    if (vjs.players[id]) {
+      return vjs.players[id];
+
+    // Otherwise get element for ID
+    } else {
+      tag = vjs.el(id);
+    }
+
+  // ID is a media element
+  } else {
+    tag = id;
+  }
+
+  // Check for a useable element
+  if (!tag || !tag.nodeName) { // re: nodeName, could be a box div also
+    throw new TypeError('The element or ID supplied is not valid. (videojs)'); // Returns
+  }
+
+  // Element may have a player attr referring to an already created player instance.
+  // If not, set up a new player and return the instance.
+  return tag['player'] || new vjs.Player(tag, options, ready);
+};
+
+// Extended name, also available externally, window.videojs
+var videojs = vjs;
+window.videojs = window.vjs = vjs;
+
+// CDN Version. Used to target right flash swf.
+vjs.CDN_VERSION = 'GENERATED_CDN_VSN';
+vjs.ACCESS_PROTOCOL = ('https:' == document.location.protocol ? 'https://' : 'http://');
+
+/**
+ * Global Player instance options, surfaced from vjs.Player.prototype.options_
+ * vjs.options = vjs.Player.prototype.options_
+ * All options should use string keys so they avoid
+ * renaming by closure compiler
+ * @type {Object}
+ */
+vjs.options = {
+  // Default order of fallback technology
+  'techOrder': ['html5','flash'],
+  // techOrder: ['flash','html5'],
+
+  'html5': {},
+  'flash': { 'swf': vjs.ACCESS_PROTOCOL + 'vjs.zencdn.net/c/video-js.swf' },
+
+  // Default of web browser is 300x150. Should rely on source width/height.
+  'width': 300,
+  'height': 150,
+  // defaultVolume: 0.85,
+  'defaultVolume': 0.00, // The freakin seaguls are driving me crazy!
+
+  // Included control sets
+  'children': {
+    'mediaLoader': {},
+    'posterImage': {},
+    'textTrackDisplay': {},
+    'loadingSpinner': {},
+    'bigPlayButton': {},
+    'controlBar': {}
+  }
+};
+
+/**
+ * Global player list
+ * @type {Object}
+ */
+vjs.players = {};
+
+
+// Set CDN Version of swf
+if (vjs.CDN_VERSION != 'GENERATED_CDN_VSN') {
+  videojs.options['flash']['swf'] = vjs.ACCESS_PROTOCOL + 'vjs.zencdn.net/'+vjs.CDN_VERSION+'/video-js.swf';
+}
+/**
+ * Core Object/Class for objects that use inheritance + contstructors
+ * @constructor
+ */
+vjs.CoreObject = vjs['CoreObject'] = function(){};
+// Manually exporting vjs['CoreObject'] here for Closure Compiler
+// because of the use of the extend/create class methods
+// If we didn't do this, those functions would get flattend to something like
+// `a = ...` and `this.prototype` would refer to the global object instead of
+// CoreObject
+
+/**
+ * Create a new object that inherits from this Object
+ * @param {Object} props Functions and properties to be applied to the
+ *                       new object's prototype
+ * @return {vjs.CoreObject} Returns an object that inherits from CoreObject
+ * @this {*}
+ */
+vjs.CoreObject.extend = function(props){
+  var init, subObj;
+
+  props = props || {};
+  // Set up the constructor using the supplied init method
+  // or using the init of the parent object
+  // Make sure to check the unobfuscated version for external libs
+  init = props['init'] || props.init || this.prototype['init'] || this.prototype.init || function(){};
+  // In Resig's simple class inheritance (previously used) the constructor
+  //  is a function that calls `this.init.apply(arguments)`
+  // However that would prevent us from using `ParentObject.call(this);`
+  //  in a Child constuctor because the `this` in `this.init`
+  //  would still refer to the Child and cause an inifinite loop.
+  // We would instead have to do
+  //    `ParentObject.prototype.init.apply(this, argumnents);`
+  //  Bleh. We're not creating a _super() function, so it's good to keep
+  //  the parent constructor reference simple.
+  subObj = function(){
+    init.apply(this, arguments);
+  };
+
+  // Inherit from this object's prototype
+  subObj.prototype = vjs.obj.create(this.prototype);
+  // Reset the constructor property for subObj otherwise
+  // instances of subObj would have the constructor of the parent Object
+  subObj.prototype.constructor = subObj;
+
+  // Make the class extendable
+  subObj.extend = vjs.CoreObject.extend;
+  // Make a function for creating instances
+  subObj.create = vjs.CoreObject.create;
+
+  // Extend subObj's prototype with functions and other properties from props
+  for (var name in props) {
+    if (props.hasOwnProperty(name)) {
+      subObj.prototype[name] = props[name];
+    }
+  }
+
+  return subObj;
+};
+
+/**
+ * Create a new instace of this Object class
+ * @return {vjs.CoreObject} Returns an instance of a CoreObject subclass
+ * @this {*}
+ */
+vjs.CoreObject.create = function(){
+  // Create a new object that inherits from this object's prototype
+  var inst = vjs.obj.create(this.prototype);
+
+  // Apply this constructor function to the new object
+  this.apply(inst, arguments);
+
+  // Return the new object
+  return inst;
+};
+/**
+ * @fileoverview Event System (John Resig - Secrets of a JS Ninja http://jsninja.com/)
+ * (Original book version wasn't completely usable, so fixed some things and made Closure Compiler compatible)
+ * This should work very similarly to jQuery's events, however it's based off the book version which isn't as
+ * robust as jquery's, so there's probably some differences.
+ */
+
+/**
+ * Add an event listener to element
+ * It stores the handler function in a separate cache object
+ * and adds a generic handler to the element's event,
+ * along with a unique id (guid) to the element.
+ * @param  {Element|Object}   elem Element or object to bind listeners to
+ * @param  {String}   type Type of event to bind to.
+ * @param  {Function} fn   Event listener.
+ */
+vjs.on = function(elem, type, fn){
+  var data = vjs.getData(elem);
+
+  // We need a place to store all our handler data
+  if (!data.handlers) data.handlers = {};
+
+  if (!data.handlers[type]) data.handlers[type] = [];
+
+  if (!fn.guid) fn.guid = vjs.guid++;
+
+  data.handlers[type].push(fn);
+
+  if (!data.dispatcher) {
+    data.disabled = false;
+
+    data.dispatcher = function (event){
+
+      if (data.disabled) return;
+      event = vjs.fixEvent(event);
+
+      var handlers = data.handlers[event.type];
+
+      if (handlers) {
+        // Copy handlers so if handlers are added/removed during the process it doesn't throw everything off.
+        var handlersCopy = handlers.slice(0);
+
+        for (var m = 0, n = handlersCopy.length; m < n; m++) {
+          if (event.isImmediatePropagationStopped()) {
+            break;
+          } else {
+            handlersCopy[m].call(elem, event);
+          }
+        }
+      }
+    };
+  }
+
+  if (data.handlers[type].length == 1) {
+    if (document.addEventListener) {
+      elem.addEventListener(type, data.dispatcher, false);
+    } else if (document.attachEvent) {
+      elem.attachEvent('on' + type, data.dispatcher);
+    }
+  }
+};
+
+/**
+ * Removes event listeners from an element
+ * @param  {Element|Object}   elem Object to remove listeners from
+ * @param  {String=}   type Type of listener to remove. Don't include to remove all events from element.
+ * @param  {Function} fn   Specific listener to remove. Don't incldue to remove listeners for an event type.
+ */
+vjs.off = function(elem, type, fn) {
+  // Don't want to add a cache object through getData if not needed
+  if (!vjs.hasData(elem)) return;
+
+  var data = vjs.getData(elem);
+
+  // If no events exist, nothing to unbind
+  if (!data.handlers) { return; }
+
+  // Utility function
+  var removeType = function(t){
+     data.handlers[t] = [];
+     vjs.cleanUpEvents(elem,t);
+  };
+
+  // Are we removing all bound events?
+  if (!type) {
+    for (var t in data.handlers) removeType(t);
+    return;
+  }
+
+  var handlers = data.handlers[type];
+
+  // If no handlers exist, nothing to unbind
+  if (!handlers) return;
+
+  // If no listener was provided, remove all listeners for type
+  if (!fn) {
+    removeType(type);
+    return;
+  }
+
+  // We're only removing a single handler
+  if (fn.guid) {
+    for (var n = 0; n < handlers.length; n++) {
+      if (handlers[n].guid === fn.guid) {
+        handlers.splice(n--, 1);
+      }
+    }
+  }
+
+  vjs.cleanUpEvents(elem, type);
+};
+
+/**
+ * Clean up the listener cache and dispatchers
+ * @param  {Element|Object} elem Element to clean up
+ * @param  {String} type Type of event to clean up
+ */
+vjs.cleanUpEvents = function(elem, type) {
+  var data = vjs.getData(elem);
+
+  // Remove the events of a particular type if there are none left
+  if (data.handlers[type].length === 0) {
+    delete data.handlers[type];
+    // data.handlers[type] = null;
+    // Setting to null was causing an error with data.handlers
+
+    // Remove the meta-handler from the element
+    if (document.removeEventListener) {
+      elem.removeEventListener(type, data.dispatcher, false);
+    } else if (document.detachEvent) {
+      elem.detachEvent('on' + type, data.dispatcher);
+    }
+  }
+
+  // Remove the events object if there are no types left
+  if (vjs.isEmpty(data.handlers)) {
+    delete data.handlers;
+    delete data.dispatcher;
+    delete data.disabled;
+
+    // data.handlers = null;
+    // data.dispatcher = null;
+    // data.disabled = null;
+  }
+
+  // Finally remove the expando if there is no data left
+  if (vjs.isEmpty(data)) {
+    vjs.removeData(elem);
+  }
+};
+
+/**
+ * Fix a native event to have standard property values
+ * @param  {Object} event Event object to fix
+ * @return {Object}
+ */
+vjs.fixEvent = function(event) {
+
+  function returnTrue() { return true; }
+  function returnFalse() { return false; }
+
+  // Test if fixing up is needed
+  // Used to check if !event.stopPropagation instead of isPropagationStopped
+  // But native events return true for stopPropagation, but don't have
+  // other expected methods like isPropagationStopped. Seems to be a problem
+  // with the Javascript Ninja code. So we're just overriding all events now.
+  if (!event || !event.isPropagationStopped) {
+    var old = event || window.event;
+
+    event = {};
+    // Clone the old object so that we can modify the values event = {};
+    // IE8 Doesn't like when you mess with native event properties
+    // Firefox returns false for event.hasOwnProperty('type') and other props
+    //  which makes copying more difficult.
+    // TODO: Probably best to create a whitelist of event props
+    for (var key in old) {
+      event[key] = old[key];
+    }
+
+    // The event occurred on this element
+    if (!event.target) {
+      event.target = event.srcElement || document;
+    }
+
+    // Handle which other element the event is related to
+    event.relatedTarget = event.fromElement === event.target ?
+      event.toElement :
+      event.fromElement;
+
+    // Stop the default browser action
+    event.preventDefault = function () {
+      if (old.preventDefault) {
+        old.preventDefault();
+      }
+      event.returnValue = false;
+      event.isDefaultPrevented = returnTrue;
+    };
+
+    event.isDefaultPrevented = returnFalse;
+
+    // Stop the event from bubbling
+    event.stopPropagation = function () {
+      if (old.stopPropagation) {
+        old.stopPropagation();
+      }
+      event.cancelBubble = true;
+      event.isPropagationStopped = returnTrue;
+    };
+
+    event.isPropagationStopped = returnFalse;
+
+    // Stop the event from bubbling and executing other handlers
+    event.stopImmediatePropagation = function () {
+      if (old.stopImmediatePropagation) {
+        old.stopImmediatePropagation();
+      }
+      event.isImmediatePropagationStopped = returnTrue;
+      event.stopPropagation();
+    };
+
+    event.isImmediatePropagationStopped = returnFalse;
+
+    // Handle mouse position
+    if (event.clientX != null) {
+      var doc = document.documentElement, body = document.body;
+
+      event.pageX = event.clientX +
+        (doc && doc.scrollLeft || body && body.scrollLeft || 0) -
+        (doc && doc.clientLeft || body && body.clientLeft || 0);
+      event.pageY = event.clientY +
+        (doc && doc.scrollTop || body && body.scrollTop || 0) -
+        (doc && doc.clientTop || body && body.clientTop || 0);
+    }
+
+    // Handle key presses
+    event.which = event.charCode || event.keyCode;
+
+    // Fix button for mouse clicks:
+    // 0 == left; 1 == middle; 2 == right
+    if (event.button != null) {
+      event.button = (event.button & 1 ? 0 :
+        (event.button & 4 ? 1 :
+          (event.button & 2 ? 2 : 0)));
+    }
+  }
+
+  // Returns fixed-up instance
+  return event;
+};
+
+/**
+ * Trigger an event for an element
+ * @param  {Element|Object} elem  Element to trigger an event on
+ * @param  {String} event Type of event to trigger
+ */
+vjs.trigger = function(elem, event) {
+  // Fetches element data and a reference to the parent (for bubbling).
+  // Don't want to add a data object to cache for every parent,
+  // so checking hasData first.
+  var elemData = (vjs.hasData(elem)) ? vjs.getData(elem) : {};
+  var parent = elem.parentNode || elem.ownerDocument;
+      // type = event.type || event,
+      // handler;
+
+  // If an event name was passed as a string, creates an event out of it
+  if (typeof event === 'string') {
+    event = { type:event, target:elem };
+  }
+  // Normalizes the event properties.
+  event = vjs.fixEvent(event);
+
+  // If the passed element has a dispatcher, executes the established handlers.
+  if (elemData.dispatcher) {
+    elemData.dispatcher.call(elem, event);
+  }
+
+  // Unless explicitly stopped, recursively calls this function to bubble the event up the DOM.
+  if (parent && !event.isPropagationStopped()) {
+    vjs.trigger(parent, event);
+
+  // If at the top of the DOM, triggers the default action unless disabled.
+  } else if (!parent && !event.isDefaultPrevented()) {
+    var targetData = vjs.getData(event.target);
+
+    // Checks if the target has a default action for this event.
+    if (event.target[event.type]) {
+      // Temporarily disables event dispatching on the target as we have already executed the handler.
+      targetData.disabled = true;
+      // Executes the default action.
+      if (typeof event.target[event.type] === 'function') {
+        event.target[event.type]();
+      }
+      // Re-enables event dispatching.
+      targetData.disabled = false;
+    }
+  }
+
+  // Inform the triggerer if the default was prevented by returning false
+  return !event.isDefaultPrevented();
+  /* Original version of js ninja events wasn't complete.
+   * We've since updated to the latest version, but keeping this around
+   * for now just in case.
+   */
+  // // Added in attion to book. Book code was broke.
+  // event = typeof event === 'object' ?
+  //   event[vjs.expando] ?
+  //     event :
+  //     new vjs.Event(type, event) :
+  //   new vjs.Event(type);
+
+  // event.type = type;
+  // if (handler) {
+  //   handler.call(elem, event);
+  // }
+
+  // // Clean up the event in case it is being reused
+  // event.result = undefined;
+  // event.target = elem;
+};
+
+/**
+ * Trigger a listener only once for an event
+ * @param  {Element|Object}   elem Element or object to
+ * @param  {[type]}   type [description]
+ * @param  {Function} fn   [description]
+ * @return {[type]}
+ */
+vjs.one = function(elem, type, fn) {
+  vjs.on(elem, type, function(){
+    vjs.off(elem, type, arguments.callee);
+    fn.apply(this, arguments);
+  });
+};
+var hasOwnProp = Object.prototype.hasOwnProperty;
+
+/**
+ * Creates an element and applies properties.
+ * @param  {String=} tagName    Name of tag to be created.
+ * @param  {Object=} properties Element properties to be applied.
+ * @return {Element}
+ */
+vjs.createEl = function(tagName, properties){
+  var el = document.createElement(tagName || 'div');
+
+  for (var propName in properties){
+    if (hasOwnProp.call(properties, propName)) {
+      //el[propName] = properties[propName];
+      // Not remembering why we were checking for dash
+      // but using setAttribute means you have to use getAttribute
+
+      // The check for dash checks for the aria-* attributes, like aria-label, aria-valuemin.
+      // The additional check for "role" is because the default method for adding attributes does not
+      // add the attribute "role". My guess is because it's not a valid attribute in some namespaces, although
+      // browsers handle the attribute just fine. The W3C allows for aria-* attributes to be used in pre-HTML5 docs.
+      // http://www.w3.org/TR/wai-aria-primer/#ariahtml. Using setAttribute gets around this problem.
+
+       if (propName.indexOf('aria-') !== -1 || propName=='role') {
+         el.setAttribute(propName, properties[propName]);
+       } else {
+         el[propName] = properties[propName];
+       }
+    }
+  }
+  return el;
+};
+
+/**
+ * Uppercase the first letter of a string
+ * @param  {String} string String to be uppercased
+ * @return {String}
+ */
+vjs.capitalize = function(string){
+  return string.charAt(0).toUpperCase() + string.slice(1);
+};
+
+/**
+ * Object functions container
+ * @type {Object}
+ */
+vjs.obj = {};
+
+/**
+ * Object.create shim for prototypal inheritance.
+ * https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Object/create
+ * @param  {Object}   obj Object to use as prototype
+ */
+ vjs.obj.create = Object.create || function(obj){
+  //Create a new function called 'F' which is just an empty object.
+  function F() {}
+
+  //the prototype of the 'F' function should point to the
+  //parameter of the anonymous function.
+  F.prototype = obj;
+
+  //create a new constructor function based off of the 'F' function.
+  return new F();
+};
+
+/**
+ * Loop through each property in an object and call a function
+ * whose arguments are (key,value)
+ * @param  {Object}   obj Object of properties
+ * @param  {Function} fn  Function to be called on each property.
+ * @this {*}
+ */
+vjs.obj.each = function(obj, fn, context){
+  for (var key in obj) {
+    if (hasOwnProp.call(obj, key)) {
+      fn.call(context || this, key, obj[key]);
+    }
+  }
+};
+
+/**
+ * Merge two objects together and return the original.
+ * @param  {Object} obj1
+ * @param  {Object} obj2
+ * @return {Object}
+ */
+vjs.obj.merge = function(obj1, obj2){
+  if (!obj2) { return obj1; }
+  for (var key in obj2){
+    if (hasOwnProp.call(obj2, key)) {
+      obj1[key] = obj2[key];
+    }
+  }
+  return obj1;
+};
+
+/**
+ * Merge two objects, and merge any properties that are objects
+ * instead of just overwriting one. Uses to merge options hashes
+ * where deeper default settings are important.
+ * @param  {Object} obj1 Object to override
+ * @param  {Object} obj2 Overriding object
+ * @return {Object}      New object. Obj1 and Obj2 will be untouched.
+ */
+vjs.obj.deepMerge = function(obj1, obj2){
+  var key, val1, val2, objDef;
+  objDef = '[object Object]';
+
+  // Make a copy of obj1 so we're not ovewriting original values.
+  // like prototype.options_ and all sub options objects
+  obj1 = vjs.obj.copy(obj1);
+
+  for (key in obj2){
+    if (hasOwnProp.call(obj2, key)) {
+      val1 = obj1[key];
+      val2 = obj2[key];
+
+      // Check if both properties are pure objects and do a deep merge if so
+      if (vjs.obj.isPlain(val1) && vjs.obj.isPlain(val2)) {
+        obj1[key] = vjs.obj.deepMerge(val1, val2);
+      } else {
+        obj1[key] = obj2[key];
+      }
+    }
+  }
+  return obj1;
+};
+
+/**
+ * Make a copy of the supplied object
+ * @param  {Object} obj Object to copy
+ * @return {Object}     Copy of object
+ */
+vjs.obj.copy = function(obj){
+  return vjs.obj.merge({}, obj);
+};
+
+/**
+ * Check if an object is plain, and not a dom node or any object sub-instance
+ * @param  {Object} obj Object to check
+ * @return {Boolean}     True if plain, false otherwise
+ */
+vjs.obj.isPlain = function(obj){
+  return !!obj
+    && typeof obj === 'object'
+    && obj.toString() === '[object Object]'
+    && obj.constructor === Object;
+};
+
+/**
+ * Bind (a.k.a proxy or Context). A simple method for changing the context of a function
+   It also stores a unique id on the function so it can be easily removed from events
+ * @param  {*}   context The object to bind as scope
+ * @param  {Function} fn      The function to be bound to a scope
+ * @param  {Number=}   uid     An optional unique ID for the function to be set
+ * @return {Function}
+ */
+vjs.bind = function(context, fn, uid) {
+  // Make sure the function has a unique ID
+  if (!fn.guid) { fn.guid = vjs.guid++; }
+
+  // Create the new function that changes the context
+  var ret = function() {
+    return fn.apply(context, arguments);
+  };
+
+  // Allow for the ability to individualize this function
+  // Needed in the case where multiple objects might share the same prototype
+  // IF both items add an event listener with the same function, then you try to remove just one
+  // it will remove both because they both have the same guid.
+  // when using this, you need to use the bind method when you remove the listener as well.
+  // currently used in text tracks
+  ret.guid = (uid) ? uid + '_' + fn.guid : fn.guid;
+
+  return ret;
+};
+
+/**
+ * Element Data Store. Allows for binding data to an element without putting it directly on the element.
+ * Ex. Event listneres are stored here.
+ * (also from jsninja.com, slightly modified and updated for closure compiler)
+ * @type {Object}
+ */
+vjs.cache = {};
+
+/**
+ * Unique ID for an element or function
+ * @type {Number}
+ */
+vjs.guid = 1;
+
+/**
+ * Unique attribute name to store an element's guid in
+ * @type {String}
+ * @constant
+ */
+vjs.expando = 'vdata' + (new Date()).getTime();
+
+/**
+ * Returns the cache object where data for an element is stored
+ * @param  {Element} el Element to store data for.
+ * @return {Object}
+ */
+vjs.getData = function(el){
+  var id = el[vjs.expando];
+  if (!id) {
+    id = el[vjs.expando] = vjs.guid++;
+    vjs.cache[id] = {};
+  }
+  return vjs.cache[id];
+};
+
+/**
+ * Returns the cache object where data for an element is stored
+ * @param  {Element} el Element to store data for.
+ * @return {Object}
+ */
+vjs.hasData = function(el){
+  var id = el[vjs.expando];
+  return !(!id || vjs.isEmpty(vjs.cache[id]));
+};
+
+/**
+ * Delete data for the element from the cache and the guid attr from getElementById
+ * @param  {Element} el Remove data for an element
+ */
+vjs.removeData = function(el){
+  var id = el[vjs.expando];
+  if (!id) { return; }
+  // Remove all stored data
+  // Changed to = null
+  // http://coding.smashingmagazine.com/2012/11/05/writing-fast-memory-efficient-javascript/
+  // vjs.cache[id] = null;
+  delete vjs.cache[id];
+
+  // Remove the expando property from the DOM node
+  try {
+    delete el[vjs.expando];
+  } catch(e) {
+    if (el.removeAttribute) {
+      el.removeAttribute(vjs.expando);
+    } else {
+      // IE doesn't appear to support removeAttribute on the document element
+      el[vjs.expando] = null;
+    }
+  }
+};
+
+vjs.isEmpty = function(obj) {
+  for (var prop in obj) {
+    // Inlude null properties as empty.
+    if (obj[prop] !== null) {
+      return false;
+    }
+  }
+  return true;
+};
+
+/**
+ * Add a CSS class name to an element
+ * @param {Element} element    Element to add class name to
+ * @param {String} classToAdd Classname to add
+ */
+vjs.addClass = function(element, classToAdd){
+  if ((' '+element.className+' ').indexOf(' '+classToAdd+' ') == -1) {
+    element.className = element.className === '' ? classToAdd : element.className + ' ' + classToAdd;
+  }
+};
+
+/**
+ * Remove a CSS class name from an element
+ * @param {Element} element    Element to remove from class name
+ * @param {String} classToAdd Classname to remove
+ */
+vjs.removeClass = function(element, classToRemove){
+  if (element.className.indexOf(classToRemove) == -1) { return; }
+  var classNames = element.className.split(' ');
+  // IE8 Does not support array.indexOf so using a for loop
+  for (var i = classNames.length - 1; i >= 0; i--) {
+    if (classNames[i] === classToRemove) {
+      classNames.splice(i,1);
+    }
+  }
+  // classNames.splice(classNames.indexOf(classToRemove),1);
+  element.className = classNames.join(' ');
+};
+
+/**
+ * Element for testing browser HTML5 video capabilities
+ * @type {Element}
+ * @constant
+ */
+vjs.TEST_VID = vjs.createEl('video');
+
+/**
+ * Useragent for browser testing.
+ * @type {String}
+ * @constant
+ */
+vjs.USER_AGENT = navigator.userAgent;
+
+/**
+ * Device is an iPhone
+ * @type {Boolean}
+ * @constant
+ */
+vjs.IS_IPHONE = !!vjs.USER_AGENT.match(/iPhone/i);
+vjs.IS_IPAD = !!vjs.USER_AGENT.match(/iPad/i);
+vjs.IS_IPOD = !!vjs.USER_AGENT.match(/iPod/i);
+vjs.IS_IOS = vjs.IS_IPHONE || vjs.IS_IPAD || vjs.IS_IPOD;
+
+vjs.IOS_VERSION = (function(){
+  var match = vjs.USER_AGENT.match(/OS (\d+)_/i);
+  if (match && match[1]) { return match[1]; }
+})();
+
+vjs.IS_ANDROID = !!vjs.USER_AGENT.match(/Android.*AppleWebKit/i);
+vjs.ANDROID_VERSION = (function() {
+  var match = vjs.USER_AGENT.match(/Android (\d+)\./i);
+  if (match && match[1]) {
+    return match[1];
+  }
+  return null;
+})();
+
+vjs.IS_FIREFOX = function(){ return !!vjs.USER_AGENT.match('Firefox'); };
+
+
+/**
+ * Get an element's attribute values, as defined on the HTML tag
+ * Attributs are not the same as properties. They're defined on the tag
+ * or with setAttribute (which shouldn't be used with HTML)
+ * This will return true or false for boolean attributes.
+ * @param  {Element} tag Element from which to get tag attributes
+ * @return {Object}
+ */
+vjs.getAttributeValues = function(tag){
+  var obj = {};
+
+  // Known boolean attributes
+  // We can check for matching boolean properties, but older browsers
+  // won't know about HTML5 boolean attributes that we still read from.
+  // Bookending with commas to allow for an easy string search.
+  var knownBooleans = ','+'autoplay,controls,loop,muted,default'+',';
+
+  if (tag && tag.attributes && tag.attributes.length > 0) {
+    var attrs = tag.attributes;
+    var attrName, attrVal;
+
+    for (var i = attrs.length - 1; i >= 0; i--) {
+      attrName = attrs[i].name;
+      attrVal = attrs[i].value;
+
+      // Check for known booleans
+      // The matching element property will return a value for typeof
+      if (typeof tag[attrName] === 'boolean' || knownBooleans.indexOf(','+attrName+',') !== -1) {
+        // The value of an included boolean attribute is typically an empty string ('')
+        // which would equal false if we just check for a false value.
+        // We also don't want support bad code like autoplay='false'
+        attrVal = (attrVal !== null) ? true : false;
+      }
+
+      obj[attrName] = attrVal;
+    }
+  }
+
+  return obj;
+};
+
+/**
+ * Get the computed style value for an element
+ * From http://robertnyman.com/2006/04/24/get-the-rendered-style-of-an-element/
+ * @param  {Element} el        Element to get style value for
+ * @param  {String} strCssRule Style name
+ * @return {String}            Style value
+ */
+vjs.getComputedDimension = function(el, strCssRule){
+  var strValue = '';
+  if(document.defaultView && document.defaultView.getComputedStyle){
+    strValue = document.defaultView.getComputedStyle(el, '').getPropertyValue(strCssRule);
+
+  } else if(el.currentStyle){
+    // IE8 Width/Height support
+    strValue = el['client'+strCssRule.substr(0,1).toUpperCase() + strCssRule.substr(1)] + 'px';
+  }
+  return strValue;
+};
+
+/**
+ * Insert an element as the first child node of another
+ * @param  {Element} child   Element to insert
+ * @param  {[type]} parent Element to insert child into
+ */
+vjs.insertFirst = function(child, parent){
+  if (parent.firstChild) {
+    parent.insertBefore(child, parent.firstChild);
+  } else {
+    parent.appendChild(child);
+  }
+};
+
+/**
+ * Object to hold browser support information
+ * @type {Object}
+ */
+vjs.support = {};
+
+/**
+ * Shorthand for document.getElementById()
+ * Also allows for CSS (jQuery) ID syntax. But nothing other than IDs.
+ * @param  {String} id  Element ID
+ * @return {Element}    Element with supplied ID
+ */
+vjs.el = function(id){
+  if (id.indexOf('#') === 0) {
+    id = id.slice(1);
+  }
+
+  return document.getElementById(id);
+};
+
+/**
+ * Format seconds as a time string, H:MM:SS or M:SS
+ * Supplying a guide (in seconds) will force a number of leading zeros
+ * to cover the length of the guide
+ * @param  {Number} seconds Number of seconds to be turned into a string
+ * @param  {Number} guide   Number (in seconds) to model the string after
+ * @return {String}         Time formatted as H:MM:SS or M:SS
+ */
+vjs.formatTime = function(seconds, guide) {
+  guide = guide || seconds; // Default to using seconds as guide
+  var s = Math.floor(seconds % 60),
+      m = Math.floor(seconds / 60 % 60),
+      h = Math.floor(seconds / 3600),
+      gm = Math.floor(guide / 60 % 60),
+      gh = Math.floor(guide / 3600);
+
+  // Check if we need to show hours
+  h = (h > 0 || gh > 0) ? h + ':' : '';
+
+  // If hours are showing, we may need to add a leading zero.
+  // Always show at least one digit of minutes.
+  m = (((h || gm >= 10) && m < 10) ? '0' + m : m) + ':';
+
+  // Check if leading zero is need for seconds
+  s = (s < 10) ? '0' + s : s;
+
+  return h + m + s;
+};
+
+// Attempt to block the ability to select text while dragging controls
+vjs.blockTextSelection = function(){
+  document.body.focus();
+  document.onselectstart = function () { return false; };
+};
+// Turn off text selection blocking
+vjs.unblockTextSelection = function(){ document.onselectstart = function () { return true; }; };
+
+/**
+ * Trim whitespace from the ends of a string.
+ * @param  {String} string String to trim
+ * @return {String}        Trimmed string
+ */
+vjs.trim = function(string){
+  return string.toString().replace(/^\s+/, '').replace(/\s+$/, '');
+};
+
+/**
+ * Should round off a number to a decimal place
+ * @param  {Number} num Number to round
+ * @param  {Number} dec Number of decimal places to round to
+ * @return {Number}     Rounded number
+ */
+vjs.round = function(num, dec) {
+  if (!dec) { dec = 0; }
+  return Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);
+};
+
+/**
+ * Should create a fake TimeRange object
+ * Mimics an HTML5 time range instance, which has functions that
+ * return the start and end times for a range
+ * TimeRanges are returned by the buffered() method
+ * @param  {Number} start Start time in seconds
+ * @param  {Number} end   End time in seconds
+ * @return {Object}       Fake TimeRange object
+ */
+vjs.createTimeRange = function(start, end){
+  return {
+    length: 1,
+    start: function() { return start; },
+    end: function() { return end; }
+  };
+};
+
+/**
+ * Simple http request for retrieving external files (e.g. text tracks)
+ * @param  {String} url           URL of resource
+ * @param  {Function=} onSuccess  Success callback
+ * @param  {Function=} onError    Error callback
+ */
+vjs.get = function(url, onSuccess, onError){
+  var local = (url.indexOf('file:') === 0 || (window.location.href.indexOf('file:') === 0 && url.indexOf('http') === -1));
+
+  if (typeof XMLHttpRequest === 'undefined') {
+    window.XMLHttpRequest = function () {
+      try { return new window.ActiveXObject('Msxml2.XMLHTTP.6.0'); } catch (e) {}
+      try { return new window.ActiveXObject('Msxml2.XMLHTTP.3.0'); } catch (f) {}
+      try { return new window.ActiveXObject('Msxml2.XMLHTTP'); } catch (g) {}
+      throw new Error('This browser does not support XMLHttpRequest.');
+    };
+  }
+
+  var request = new XMLHttpRequest();
+
+  try {
+    request.open('GET', url);
+  } catch(e) {
+    onError(e);
+  }
+
+  request.onreadystatechange = function() {
+    if (request.readyState === 4) {
+      if (request.status === 200 || local && request.status === 0) {
+        onSuccess(request.responseText);
+      } else {
+        if (onError) {
+          onError();
+        }
+      }
+    }
+  };
+
+  try {
+    request.send();
+  } catch(e) {
+    if (onError) {
+      onError(e);
+    }
+  }
+};
+
+/* Local Storage
+================================================================================ */
+vjs.setLocalStorage = function(key, value){
+  try {
+    // IE was throwing errors referencing the var anywhere without this
+    var localStorage = window.localStorage || false;
+    if (!localStorage) { return; }
+    localStorage[key] = value;
+  } catch(e) {
+    if (e.code == 22 || e.code == 1014) { // Webkit == 22 / Firefox == 1014
+      vjs.log('LocalStorage Full (VideoJS)', e);
+    } else {
+      if (e.code == 18) {
+        vjs.log('LocalStorage not allowed (VideoJS)', e);
+      } else {
+        vjs.log('LocalStorage Error (VideoJS)', e);
+      }
+    }
+  }
+};
+
+/**
+ * Get abosolute version of relative URL. Used to tell flash correct URL.
+ * http://stackoverflow.com/questions/470832/getting-an-absolute-url-from-a-relative-one-ie6-issue
+ * @param  {String} url URL to make absolute
+ * @return {String}     Absolute URL
+ */
+vjs.getAbsoluteURL = function(url){
+
+  // Check if absolute URL
+  if (!url.match(/^https?:\/\//)) {
+    // Convert to absolute URL. Flash hosted off-site needs an absolute URL.
+    url = vjs.createEl('div', {
+      innerHTML: '<a href="'+url+'">x</a>'
+    }).firstChild.href;
+  }
+
+  return url;
+};
+
+// usage: log('inside coolFunc',this,arguments);
+// http://paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/
+vjs.log = function(){
+  vjs.log.history = vjs.log.history || [];   // store logs to an array for reference
+  vjs.log.history.push(arguments);
+  if(window.console){
+    window.console.log(Array.prototype.slice.call(arguments));
+  }
+};
+
+// Offset Left
+// getBoundingClientRect technique from John Resig http://ejohn.org/blog/getboundingclientrect-is-awesome/
+vjs.findPosition = function(el) {
+    var box, docEl, body, clientLeft, scrollLeft, left, clientTop, scrollTop, top;
+
+    if (el.getBoundingClientRect && el.parentNode) {
+      box = el.getBoundingClientRect();
+    }
+
+    if (!box) {
+      return {
+        left: 0,
+        top: 0
+      };
+    }
+
+    docEl = document.documentElement;
+    body = document.body;
+
+    clientLeft = docEl.clientLeft || body.clientLeft || 0;
+    scrollLeft = window.pageXOffset || body.scrollLeft;
+    left = box.left + scrollLeft - clientLeft;
+
+    clientTop = docEl.clientTop || body.clientTop || 0;
+    scrollTop = window.pageYOffset || body.scrollTop;
+    top = box.top + scrollTop - clientTop;
+
+    return {
+      left: left,
+      top: top
+    };
+};
+/**
+ * @fileoverview Player Component - Base class for all UI objects
+ *
+ */
+
+/**
+ * Base UI Component class
+ * @param {Object} player  Main Player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.Component = vjs.CoreObject.extend({
+  /** @constructor */
+  init: function(player, options, ready){
+    this.player_ = player;
+
+    // Make a copy of prototype.options_ to protect against overriding global defaults
+    this.options_ = vjs.obj.copy(this.options_);
+
+    // Updated options with supplied options
+    options = this.options(options);
+
+    // Get ID from options, element, or create using player ID and unique ID
+    this.id_ = options['id'] || ((options['el'] && options['el']['id']) ? options['el']['id'] : player.id() + '_component_' + vjs.guid++ );
+
+    this.name_ = options['name'] || null;
+
+    // Create element if one wasn't provided in options
+    this.el_ = options['el'] || this.createEl();
+
+    this.children_ = [];
+    this.childIndex_ = {};
+    this.childNameIndex_ = {};
+
+    // Add any child components in options
+    this.initChildren();
+
+    this.ready(ready);
+    // Don't want to trigger ready here or it will before init is actually
+    // finished for all children that run this constructor
+  }
+});
+
+/**
+ * Dispose of the component and all child components.
+ */
+vjs.Component.prototype.dispose = function(){
+  // Dispose all children.
+  if (this.children_) {
+    for (var i = this.children_.length - 1; i >= 0; i--) {
+      if (this.children_[i].dispose) {
+        this.children_[i].dispose();
+      }
+    }
+  }
+
+  // Delete child references
+  this.children_ = null;
+  this.childIndex_ = null;
+  this.childNameIndex_ = null;
+
+  // Remove all event listeners.
+  this.off();
+
+  // Remove element from DOM
+  if (this.el_.parentNode) {
+    this.el_.parentNode.removeChild(this.el_);
+  }
+
+  vjs.removeData(this.el_);
+  this.el_ = null;
+};
+
+/**
+ * Reference to main player instance.
+ * @type {vjs.Player}
+ * @private
+ */
+vjs.Component.prototype.player_;
+
+/**
+ * Return the component's player.
+ * @return {vjs.Player}
+ */
+vjs.Component.prototype.player = function(){
+  return this.player_;
+};
+
+/**
+ * Component options object.
+ * @type {Object}
+ * @private
+ */
+vjs.Component.prototype.options_;
+
+/**
+ * Deep merge of options objects
+ * Whenever a property is an object on both options objects
+ * the two properties will be merged using vjs.obj.deepMerge.
+ *
+ * This is used for merging options for child components. We
+ * want it to be easy to override individual options on a child
+ * component without having to rewrite all the other default options.
+ *
+ * Parent.prototype.options_ = {
+ *   children: {
+ *     'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
+ *     'childTwo': {},
+ *     'childThree': {}
+ *   }
+ * }
+ * newOptions = {
+ *   children: {
+ *     'childOne': { 'foo': 'baz', 'abc': '123' }
+ *     'childTwo': null,
+ *     'childFour': {}
+ *   }
+ * }
+ *
+ * this.options(newOptions);
+ *
+ * RESULT
+ *
+ * {
+ *   children: {
+ *     'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
+ *     'childTwo': null, // Disabled. Won't be initialized.
+ *     'childThree': {},
+ *     'childFour': {}
+ *   }
+ * }
+ *
+ * @param  {Object} obj Object whose values will be overwritten
+ * @return {Object}      NEW merged object. Does not return obj1.
+ */
+vjs.Component.prototype.options = function(obj){
+  if (obj === undefined) return this.options_;
+
+  return this.options_ = vjs.obj.deepMerge(this.options_, obj);
+};
+
+/**
+ * The DOM element for the component.
+ * @type {Element}
+ * @private
+ */
+vjs.Component.prototype.el_;
+
+/**
+ * Create the component's DOM element.
+ * @param  {String=} tagName  Element's node type. e.g. 'div'
+ * @param  {Object=} attributes An object of element attributes that should be set on the element.
+ * @return {Element}
+ */
+vjs.Component.prototype.createEl = function(tagName, attributes){
+  return vjs.createEl(tagName, attributes);
+};
+
+/**
+ * Return the component's DOM element.
+ * @return {Element}
+ */
+vjs.Component.prototype.el = function(){
+  return this.el_;
+};
+
+/**
+ * An optional element where, if defined, children will be inserted
+ *   instead of directly in el_
+ * @type {Element}
+ * @private
+ */
+vjs.Component.prototype.contentEl_;
+
+/**
+ * Return the component's DOM element for embedding content.
+ *   will either be el_ or a new element defined in createEl
+ * @return {Element}
+ */
+vjs.Component.prototype.contentEl = function(){
+  return this.contentEl_ || this.el_;
+};
+
+/**
+ * The ID for the component.
+ * @type {String}
+ * @private
+ */
+vjs.Component.prototype.id_;
+
+/**
+ * Return the component's ID.
+ * @return {String}
+ */
+vjs.Component.prototype.id = function(){
+  return this.id_;
+};
+
+/**
+ * The name for the component. Often used to reference the component.
+ * @type {String}
+ * @private
+ */
+vjs.Component.prototype.name_;
+
+/**
+ * Return the component's ID.
+ * @return {String}
+ */
+vjs.Component.prototype.name = function(){
+  return this.name_;
+};
+
+/**
+ * Array of child components
+ * @type {Array}
+ * @private
+ */
+vjs.Component.prototype.children_;
+
+/**
+ * Returns array of all child components.
+ * @return {Array}
+ */
+vjs.Component.prototype.children = function(){
+  return this.children_;
+};
+
+/**
+ * Object of child components by ID
+ * @type {Object}
+ * @private
+ */
+vjs.Component.prototype.childIndex_;
+
+/**
+ * Returns a child component with the provided ID.
+ * @return {Array}
+ */
+vjs.Component.prototype.getChildById = function(id){
+  return this.childIndex_[id];
+};
+
+/**
+ * Object of child components by Name
+ * @type {Object}
+ * @private
+ */
+vjs.Component.prototype.childNameIndex_;
+
+/**
+ * Returns a child component with the provided ID.
+ * @return {Array}
+ */
+vjs.Component.prototype.getChild = function(name){
+  return this.childNameIndex_[name];
+};
+
+/**
+ * Adds a child component inside this component.
+ * @param {String|vjs.Component} child The class name or instance of a child to add.
+ * @param {Object=} options Optional options, including options to be passed to
+ *  children of the child.
+ * @return {vjs.Component} The child component, because it might be created in this process.
+ * @suppress {accessControls|checkRegExp|checkTypes|checkVars|const|constantProperty|deprecated|duplicate|es5Strict|fileoverviewTags|globalThis|invalidCasts|missingProperties|nonStandardJsDocs|strictModuleDepCheck|undefinedNames|undefinedVars|unknownDefines|uselessCode|visibility}
+ */
+vjs.Component.prototype.addChild = function(child, options){
+  var component, componentClass, componentName, componentId;
+
+  // If string, create new component with options
+  if (typeof child === 'string') {
+
+    componentName = child;
+
+    // Make sure options is at least an empty object to protect against errors
+    options = options || {};
+
+    // Assume name of set is a lowercased name of the UI Class (PlayButton, etc.)
+    componentClass = options['componentClass'] || vjs.capitalize(componentName);
+
+    // Set name through options
+    options['name'] = componentName;
+
+    // Create a new object & element for this controls set
+    // If there's no .player_, this is a player
+    // Closure Compiler throws an 'incomplete alias' warning if we use the vjs variable directly.
+    // Every class should be exported, so this should never be a problem here.
+    component = new window['videojs'][componentClass](this.player_ || this, options);
+
+  // child is a component instance
+  } else {
+    component = child;
+  }
+
+  this.children_.push(component);
+
+  if (typeof component.id === 'function') {
+    this.childIndex_[component.id()] = component;
+  }
+
+  // If a name wasn't used to create the component, check if we can use the
+  // name function of the component
+  componentName = componentName || (component.name && component.name());
+
+  if (componentName) {
+    this.childNameIndex_[componentName] = component;
+  }
+
+  // Add the UI object's element to the container div (box)
+  // Having an element is not required
+  if (typeof component['el'] === 'function' && component['el']()) {
+    this.contentEl().appendChild(component['el']());
+  }
+
+  // Return so it can stored on parent object if desired.
+  return component;
+};
+
+vjs.Component.prototype.removeChild = function(component){
+  if (typeof component === 'string') {
+    component = this.getChild(component);
+  }
+
+  if (!component || !this.children_) return;
+
+  var childFound = false;
+  for (var i = this.children_.length - 1; i >= 0; i--) {
+    if (this.children_[i] === component) {
+      childFound = true;
+      this.children_.splice(i,1);
+      break;
+    }
+  }
+
+  if (!childFound) return;
+
+  this.childIndex_[component.id] = null;
+  this.childNameIndex_[component.name] = null;
+
+  var compEl = component.el();
+  if (compEl && compEl.parentNode === this.contentEl()) {
+    this.contentEl().removeChild(component.el());
+  }
+};
+
+/**
+ * Initialize default child components from options
+ */
+vjs.Component.prototype.initChildren = function(){
+  var options = this.options_;
+
+  if (options && options['children']) {
+    var self = this;
+
+    // Loop through components and add them to the player
+    vjs.obj.each(options['children'], function(name, opts){
+      // Allow for disabling default components
+      // e.g. vjs.options['children']['posterImage'] = false
+      if (opts === false) return;
+
+      // Allow waiting to add components until a specific event is called
+      var tempAdd = function(){
+        // Set property name on player. Could cause conflicts with other prop names, but it's worth making refs easy.
+        self[name] = self.addChild(name, opts);
+      };
+
+      if (opts['loadEvent']) {
+        // this.one(opts.loadEvent, tempAdd)
+      } else {
+        tempAdd();
+      }
+    });
+  }
+};
+
+vjs.Component.prototype.buildCSSClass = function(){
+    // Child classes can include a function that does:
+    // return 'CLASS NAME' + this._super();
+    return '';
+};
+
+/* Events
+============================================================================= */
+
+/**
+ * Add an event listener to this component's element. Context will be the component.
+ * @param  {String}   type Event type e.g. 'click'
+ * @param  {Function} fn   Event listener
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.on = function(type, fn){
+  vjs.on(this.el_, type, vjs.bind(this, fn));
+  return this;
+};
+
+/**
+ * Remove an event listener from the component's element
+ * @param  {String=}   type Optional event type. Without type it will remove all listeners.
+ * @param  {Function=} fn   Optional event listener. Without fn it will remove all listeners for a type.
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.off = function(type, fn){
+  vjs.off(this.el_, type, fn);
+  return this;
+};
+
+/**
+ * Add an event listener to be triggered only once and then removed
+ * @param  {String}   type Event type
+ * @param  {Function} fn   Event listener
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.one = function(type, fn) {
+  vjs.one(this.el_, type, vjs.bind(this, fn));
+  return this;
+};
+
+/**
+ * Trigger an event on an element
+ * @param  {String} type  Event type to trigger
+ * @param  {Event|Object} event Event object to be passed to the listener
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.trigger = function(type, event){
+  vjs.trigger(this.el_, type, event);
+  return this;
+};
+
+/* Ready
+================================================================================ */
+/**
+ * Is the component loaded.
+ * @type {Boolean}
+ * @private
+ */
+vjs.Component.prototype.isReady_;
+
+/**
+ * Trigger ready as soon as initialization is finished.
+ *   Allows for delaying ready. Override on a sub class prototype.
+ *   If you set this.isReadyOnInitFinish_ it will affect all components.
+ *   Specially used when waiting for the Flash player to asynchrnously load.
+ *   @type {Boolean}
+ *   @private
+ */
+vjs.Component.prototype.isReadyOnInitFinish_ = true;
+
+/**
+ * List of ready listeners
+ * @type {Array}
+ * @private
+ */
+vjs.Component.prototype.readyQueue_;
+
+/**
+ * Bind a listener to the component's ready state.
+ *   Different from event listeners in that if the ready event has already happend
+ *   it will trigger the function immediately.
+ * @param  {Function} fn Ready listener
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.ready = function(fn){
+  if (fn) {
+    if (this.isReady_) {
+      fn.call(this);
+    } else {
+      if (this.readyQueue_ === undefined) {
+        this.readyQueue_ = [];
+      }
+      this.readyQueue_.push(fn);
+    }
+  }
+  return this;
+};
+
+/**
+ * Trigger the ready listeners
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.triggerReady = function(){
+  this.isReady_ = true;
+
+  var readyQueue = this.readyQueue_;
+
+  if (readyQueue && readyQueue.length > 0) {
+
+    for (var i = 0, j = readyQueue.length; i < j; i++) {
+      readyQueue[i].call(this);
+    }
+
+    // Reset Ready Queue
+    this.readyQueue_ = [];
+
+    // Allow for using event listeners also, in case you want to do something everytime a source is ready.
+    this.trigger('ready');
+  }
+};
+
+/* Display
+============================================================================= */
+
+/**
+ * Add a CSS class name to the component's element
+ * @param {String} classToAdd Classname to add
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.addClass = function(classToAdd){
+  vjs.addClass(this.el_, classToAdd);
+  return this;
+};
+
+/**
+ * Remove a CSS class name from the component's element
+ * @param {String} classToRemove Classname to remove
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.removeClass = function(classToRemove){
+  vjs.removeClass(this.el_, classToRemove);
+  return this;
+};
+
+/**
+ * Show the component element if hidden
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.show = function(){
+  this.el_.style.display = 'block';
+  return this;
+};
+
+/**
+ * Hide the component element if hidden
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.hide = function(){
+  this.el_.style.display = 'none';
+  return this;
+};
+
+/**
+ * Fade a component in using CSS
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.fadeIn = function(){
+  this.removeClass('vjs-fade-out');
+  this.addClass('vjs-fade-in');
+  return this;
+};
+
+/**
+ * Fade a component out using CSS
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.fadeOut = function(){
+  this.removeClass('vjs-fade-in');
+  this.addClass('vjs-fade-out');
+  return this;
+};
+
+/**
+ * Lock an item in its visible state. To be used with fadeIn/fadeOut.
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.lockShowing = function(){
+  this.addClass('vjs-lock-showing');
+  return this;
+};
+
+/**
+ * Unlock an item to be hidden. To be used with fadeIn/fadeOut.
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.unlockShowing = function(){
+  this.removeClass('vjs-lock-showing');
+  return this;
+};
+
+/**
+ * Disable component by making it unshowable
+ */
+vjs.Component.prototype.disable = function(){
+  this.hide();
+  this.show = function(){};
+  this.fadeIn = function(){};
+};
+
+// TODO: Get enable working
+// vjs.Component.prototype.enable = function(){
+//   this.fadeIn = vjs.Component.prototype.fadeIn;
+//   this.show = vjs.Component.prototype.show;
+// };
+
+/**
+ * If a value is provided it will change the width of the player to that value
+ * otherwise the width is returned
+ * http://dev.w3.org/html5/spec/dimension-attributes.html#attr-dim-height
+ * Video tag width/height only work in pixels. No percents.
+ * But allowing limited percents use. e.g. width() will return number+%, not computed width
+ * @param  {Number|String=} num   Optional width number
+ * @param  {[type]} skipListeners Skip the 'resize' event trigger
+ * @return {vjs.Component|Number|String} Returns 'this' if dimension was set.
+ *   Otherwise it returns the dimension.
+ */
+vjs.Component.prototype.width = function(num, skipListeners){
+  return this.dimension('width', num, skipListeners);
+};
+
+/**
+ * Get or set the height of the player
+ * @param  {Number|String=} num     Optional new player height
+ * @param  {Boolean=} skipListeners Optional skip resize event trigger
+ * @return {vjs.Component|Number|String} The player, or the dimension
+ */
+vjs.Component.prototype.height = function(num, skipListeners){
+  return this.dimension('height', num, skipListeners);
+};
+
+/**
+ * Set both width and height at the same time.
+ * @param  {Number|String} width
+ * @param  {Number|String} height
+ * @return {vjs.Component}   The player.
+ */
+vjs.Component.prototype.dimensions = function(width, height){
+  // Skip resize listeners on width for optimization
+  return this.width(width, true).height(height);
+};
+
+/**
+ * Get or set width or height.
+ * All for an integer, integer + 'px' or integer + '%';
+ * Known issue: hidden elements. Hidden elements officially have a width of 0.
+ * So we're defaulting to the style.width value and falling back to computedStyle
+ * which has the hidden element issue.
+ * Info, but probably not an efficient fix:
+ * http://www.foliotek.com/devblog/getting-the-width-of-a-hidden-element-with-jquery-using-width/
+ * @param  {String=} widthOrHeight 'width' or 'height'
+ * @param  {Number|String=} num           New dimension
+ * @param  {Boolean=} skipListeners Skip resize event trigger
+ * @return {vjs.Component|Number|String} Return the player if setting a dimension.
+ *                                         Otherwise it returns the dimension.
+ */
+vjs.Component.prototype.dimension = function(widthOrHeight, num, skipListeners){
+  if (num !== undefined) {
+
+    // Check if using css width/height (% or px) and adjust
+    if ((''+num).indexOf('%') !== -1 || (''+num).indexOf('px') !== -1) {
+      this.el_.style[widthOrHeight] = num;
+    } else if (num === 'auto') {
+      this.el_.style[widthOrHeight] = '';
+    } else {
+      this.el_.style[widthOrHeight] = num+'px';
+    }
+
+    // skipListeners allows us to avoid triggering the resize event when setting both width and height
+    if (!skipListeners) { this.trigger('resize'); }
+
+    // Return component
+    return this;
+  }
+
+  // Not setting a value, so getting it
+  // Make sure element exists
+  if (!this.el_) return 0;
+
+  // Get dimension value from style
+  var val = this.el_.style[widthOrHeight];
+  var pxIndex = val.indexOf('px');
+  if (pxIndex !== -1) {
+    // Return the pixel value with no 'px'
+    return parseInt(val.slice(0,pxIndex), 10);
+
+  // No px so using % or no style was set, so falling back to offsetWidth/height
+  // If component has display:none, offset will return 0
+  // TODO: handle display:none and no dimension style using px
+  } else {
+
+    return parseInt(this.el_['offset'+vjs.capitalize(widthOrHeight)], 10);
+
+    // ComputedStyle version.
+    // Only difference is if the element is hidden it will return
+    // the percent value (e.g. '100%'')
+    // instead of zero like offsetWidth returns.
+    // var val = vjs.getComputedStyleValue(this.el_, widthOrHeight);
+    // var pxIndex = val.indexOf('px');
+
+    // if (pxIndex !== -1) {
+    //   return val.slice(0, pxIndex);
+    // } else {
+    //   return val;
+    // }
+  }
+};
+/* Button - Base class for all buttons
+================================================================================ */
+/**
+ * Base class for all buttons
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.Button = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+
+    var touchstart = false;
+    this.on('touchstart', function() {
+      touchstart = true;
+    });
+    this.on('touchmove', function() {
+      touchstart = false;
+    });
+    var self = this;
+    this.on('touchend', function(event) {
+      if (touchstart) {
+        self.onClick(event);
+      }
+      event.preventDefault();
+      event.stopPropagation();
+    });
+
+    this.on('click', this.onClick);
+    this.on('focus', this.onFocus);
+    this.on('blur', this.onBlur);
+  }
+});
+
+vjs.Button.prototype.createEl = function(type, props){
+  // Add standard Aria and Tabindex info
+  props = vjs.obj.merge({
+    className: this.buildCSSClass(),
+    innerHTML: '<div class="vjs-control-content"><span class="vjs-control-text">' + (this.buttonText || 'Need Text') + '</span></div>',
+    role: 'button',
+    'aria-live': 'polite', // let the screen reader user know that the text of the button may change
+    tabIndex: 0
+  }, props);
+
+  return vjs.Component.prototype.createEl.call(this, type, props);
+};
+
+vjs.Button.prototype.buildCSSClass = function(){
+  // TODO: Change vjs-control to vjs-button?
+  return 'vjs-control ' + vjs.Component.prototype.buildCSSClass.call(this);
+};
+
+  // Click - Override with specific functionality for button
+vjs.Button.prototype.onClick = function(){};
+
+  // Focus - Add keyboard functionality to element
+vjs.Button.prototype.onFocus = function(){
+  vjs.on(document, 'keyup', vjs.bind(this, this.onKeyPress));
+};
+
+  // KeyPress (document level) - Trigger click when keys are pressed
+vjs.Button.prototype.onKeyPress = function(event){
+  // Check for space bar (32) or enter (13) keys
+  if (event.which == 32 || event.which == 13) {
+    event.preventDefault();
+    this.onClick();
+  }
+};
+
+// Blur - Remove keyboard triggers
+vjs.Button.prototype.onBlur = function(){
+  vjs.off(document, 'keyup', vjs.bind(this, this.onKeyPress));
+};
+/* Slider
+================================================================================ */
+/**
+ * Parent for seek bar and volume slider
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.Slider = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+
+    // Set property names to bar and handle to match with the child Slider class is looking for
+    this.bar = this.getChild(this.options_['barName']);
+    this.handle = this.getChild(this.options_['handleName']);
+
+    player.on(this.playerEvent, vjs.bind(this, this.update));
+
+    this.on('mousedown', this.onMouseDown);
+    this.on('touchstart', this.onMouseDown);
+    this.on('focus', this.onFocus);
+    this.on('blur', this.onBlur);
+    this.on('click', this.onClick);
+
+    this.player_.on('controlsvisible', vjs.bind(this, this.update));
+
+    // This is actually to fix the volume handle position. http://twitter.com/#!/gerritvanaaken/status/159046254519787520
+    // this.player_.one('timeupdate', vjs.bind(this, this.update));
+
+    player.ready(vjs.bind(this, this.update));
+
+    this.boundEvents = {};
+  }
+});
+
+vjs.Slider.prototype.createEl = function(type, props) {
+  props = props || {};
+  // Add the slider element class to all sub classes
+  props.className = props.className + ' vjs-slider';
+  props = vjs.obj.merge({
+    role: 'slider',
+    'aria-valuenow': 0,
+    'aria-valuemin': 0,
+    'aria-valuemax': 100,
+    tabIndex: 0
+  }, props);
+
+  return vjs.Component.prototype.createEl.call(this, type, props);
+};
+
+vjs.Slider.prototype.onMouseDown = function(event){
+  event.preventDefault();
+  vjs.blockTextSelection();
+
+  this.boundEvents.move = vjs.bind(this, this.onMouseMove);
+  this.boundEvents.end = vjs.bind(this, this.onMouseUp);
+
+  vjs.on(document, 'mousemove', this.boundEvents.move);
+  vjs.on(document, 'mouseup', this.boundEvents.end);
+  vjs.on(document, 'touchmove', this.boundEvents.move);
+  vjs.on(document, 'touchend', this.boundEvents.end);
+
+  this.onMouseMove(event);
+};
+
+vjs.Slider.prototype.onMouseUp = function() {
+  vjs.unblockTextSelection();
+  vjs.off(document, 'mousemove', this.boundEvents.move, false);
+  vjs.off(document, 'mouseup', this.boundEvents.end, false);
+  vjs.off(document, 'touchmove', this.boundEvents.move, false);
+  vjs.off(document, 'touchend', this.boundEvents.end, false);
+
+  this.update();
+};
+
+vjs.Slider.prototype.update = function(){
+  // In VolumeBar init we have a setTimeout for update that pops and update to the end of the
+  // execution stack. The player is destroyed before then update will cause an error
+  if (!this.el_) return;
+
+  // If scrubbing, we could use a cached value to make the handle keep up with the user's mouse.
+  // On HTML5 browsers scrubbing is really smooth, but some flash players are slow, so we might want to utilize this later.
+  // var progress =  (this.player_.scrubbing) ? this.player_.getCache().currentTime / this.player_.duration() : this.player_.currentTime() / this.player_.duration();
+
+  var barProgress,
+      progress = this.getPercent(),
+      handle = this.handle,
+      bar = this.bar;
+
+  // Protect against no duration and other division issues
+  if (isNaN(progress)) { progress = 0; }
+
+  barProgress = progress;
+
+  // If there is a handle, we need to account for the handle in our calculation for progress bar
+  // so that it doesn't fall short of or extend past the handle.
+  if (handle) {
+
+    var box = this.el_,
+        boxWidth = box.offsetWidth,
+
+        handleWidth = handle.el().offsetWidth,
+
+        // The width of the handle in percent of the containing box
+        // In IE, widths may not be ready yet causing NaN
+        handlePercent = (handleWidth) ? handleWidth / boxWidth : 0,
+
+        // Get the adjusted size of the box, considering that the handle's center never touches the left or right side.
+        // There is a margin of half the handle's width on both sides.
+        boxAdjustedPercent = 1 - handlePercent,
+
+        // Adjust the progress that we'll use to set widths to the new adjusted box width
+        adjustedProgress = progress * boxAdjustedPercent;
+
+    // The bar does reach the left side, so we need to account for this in the bar's width
+    barProgress = adjustedProgress + (handlePercent / 2);
+
+    // Move the handle from the left based on the adjected progress
+    handle.el().style.left = vjs.round(adjustedProgress * 100, 2) + '%';
+  }
+
+  // Set the new bar width
+  bar.el().style.width = vjs.round(barProgress * 100, 2) + '%';
+};
+
+vjs.Slider.prototype.calculateDistance = function(event){
+  var el, box, boxX, boxY, boxW, boxH, handle, pageX, pageY;
+
+  el = this.el_;
+  box = vjs.findPosition(el);
+  boxW = boxH = el.offsetWidth;
+  handle = this.handle;
+
+  if (this.options_.vertical) {
+    boxY = box.top;
+
+    if (event.changedTouches) {
+      pageY = event.changedTouches[0].pageY;
+    } else {
+      pageY = event.pageY;
+    }
+
+    if (handle) {
+      var handleH = handle.el().offsetHeight;
+      // Adjusted X and Width, so handle doesn't go outside the bar
+      boxY = boxY + (handleH / 2);
+      boxH = boxH - handleH;
+    }
+
+    // Percent that the click is through the adjusted area
+    return Math.max(0, Math.min(1, ((boxY - pageY) + boxH) / boxH));
+
+  } else {
+    boxX = box.left;
+
+    if (event.changedTouches) {
+      pageX = event.changedTouches[0].pageX;
+    } else {
+      pageX = event.pageX;
+    }
+
+    if (handle) {
+      var handleW = handle.el().offsetWidth;
+
+      // Adjusted X and Width, so handle doesn't go outside the bar
+      boxX = boxX + (handleW / 2);
+      boxW = boxW - handleW;
+    }
+
+    // Percent that the click is through the adjusted area
+    return Math.max(0, Math.min(1, (pageX - boxX) / boxW));
+  }
+};
+
+vjs.Slider.prototype.onFocus = function(){
+  vjs.on(document, 'keyup', vjs.bind(this, this.onKeyPress));
+};
+
+vjs.Slider.prototype.onKeyPress = function(event){
+  if (event.which == 37) { // Left Arrow
+    event.preventDefault();
+    this.stepBack();
+  } else if (event.which == 39) { // Right Arrow
+    event.preventDefault();
+    this.stepForward();
+  }
+};
+
+vjs.Slider.prototype.onBlur = function(){
+  vjs.off(document, 'keyup', vjs.bind(this, this.onKeyPress));
+};
+
+/**
+ * Listener for click events on slider, used to prevent clicks
+ *   from bubbling up to parent elements like button menus.
+ * @param  {Object} event Event object
+ */
+vjs.Slider.prototype.onClick = function(event){
+  event.stopImmediatePropagation();
+  event.preventDefault();
+};
+
+/**
+ * SeekBar Behavior includes play progress bar, and seek handle
+ * Needed so it can determine seek position based on handle position/size
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.SliderHandle = vjs.Component.extend();
+
+/**
+ * Default value of the slider
+ * @type {Number}
+ */
+vjs.SliderHandle.prototype.defaultValue = 0;
+
+/** @inheritDoc */
+vjs.SliderHandle.prototype.createEl = function(type, props) {
+  props = props || {};
+  // Add the slider element class to all sub classes
+  props.className = props.className + ' vjs-slider-handle';
+  props = vjs.obj.merge({
+    innerHTML: '<span class="vjs-control-text">'+this.defaultValue+'</span>'
+  }, props);
+
+  return vjs.Component.prototype.createEl.call(this, 'div', props);
+};
+/* Menu
+================================================================================ */
+/**
+ * The base for text track and settings menu buttons.
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.Menu = vjs.Component.extend();
+
+/**
+ * Add a menu item to the menu
+ * @param {Object|String} component Component or component type to add
+ */
+vjs.Menu.prototype.addItem = function(component){
+  this.addChild(component);
+  component.on('click', vjs.bind(this, function(){
+    this.unlockShowing();
+  }));
+};
+
+/** @inheritDoc */
+vjs.Menu.prototype.createEl = function(){
+  var contentElType = this.options().contentElType || 'ul';
+  this.contentEl_ = vjs.createEl(contentElType, {
+    className: 'vjs-menu-content'
+  });
+  var el = vjs.Component.prototype.createEl.call(this, 'div', {
+    append: this.contentEl_,
+    className: 'vjs-menu'
+  });
+  el.appendChild(this.contentEl_);
+
+  // Prevent clicks from bubbling up. Needed for Menu Buttons,
+  // where a click on the parent is significant
+  vjs.on(el, 'click', function(event){
+    event.preventDefault();
+    event.stopImmediatePropagation();
+  });
+
+  return el;
+};
+
+/**
+ * Menu item
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.MenuItem = vjs.Button.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Button.call(this, player, options);
+    this.selected(options['selected']);
+  }
+});
+
+/** @inheritDoc */
+vjs.MenuItem.prototype.createEl = function(type, props){
+  return vjs.Button.prototype.createEl.call(this, 'li', vjs.obj.merge({
+    className: 'vjs-menu-item',
+    innerHTML: this.options_['label']
+  }, props));
+};
+
+/** @inheritDoc */
+vjs.MenuItem.prototype.onClick = function(){
+  this.selected(true);
+};
+
+/**
+ * Set this menu item as selected or not
+ * @param  {Boolean} selected
+ */
+vjs.MenuItem.prototype.selected = function(selected){
+  if (selected) {
+    this.addClass('vjs-selected');
+    this.el_.setAttribute('aria-selected',true);
+  } else {
+    this.removeClass('vjs-selected');
+    this.el_.setAttribute('aria-selected',false);
+  }
+};
+
+
+/**
+ * A button class with a popup menu
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.MenuButton = vjs.Button.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Button.call(this, player, options);
+
+    this.menu = this.createMenu();
+
+    // Add list to element
+    this.addChild(this.menu);
+
+    // Automatically hide empty menu buttons
+    if (this.items && this.items.length === 0) {
+      this.hide();
+    }
+
+    this.on('keyup', this.onKeyPress);
+    this.el_.setAttribute('aria-haspopup', true);
+    this.el_.setAttribute('role', 'button');
+  }
+});
+
+/**
+ * Track the state of the menu button
+ * @type {Boolean}
+ */
+vjs.MenuButton.prototype.buttonPressed_ = false;
+
+vjs.MenuButton.prototype.createMenu = function(){
+  var menu = new vjs.Menu(this.player_);
+
+  // Add a title list item to the top
+  if (this.options().title) {
+    menu.el().appendChild(vjs.createEl('li', {
+      className: 'vjs-menu-title',
+      innerHTML: vjs.capitalize(this.kind_),
+      tabindex: -1
+    }));
+  }
+
+  this.items = this.createItems();
+
+  if (this.items) {
+    // Add menu items to the menu
+    for (var i = 0; i < this.items.length; i++) {
+      menu.addItem(this.items[i]);
+    }
+  }
+
+  return menu;
+};
+
+/**
+ * Create the list of menu items. Specific to each subclass.
+ */
+vjs.MenuButton.prototype.createItems = function(){};
+
+/** @inheritDoc */
+vjs.MenuButton.prototype.buildCSSClass = function(){
+  return this.className + ' vjs-menu-button ' + vjs.Button.prototype.buildCSSClass.call(this);
+};
+
+// Focus - Add keyboard functionality to element
+// This function is not needed anymore. Instead, the keyboard functionality is handled by
+// treating the button as triggering a submenu. When the button is pressed, the submenu
+// appears. Pressing the button again makes the submenu disappear.
+vjs.MenuButton.prototype.onFocus = function(){};
+// Can't turn off list display that we turned on with focus, because list would go away.
+vjs.MenuButton.prototype.onBlur = function(){};
+
+vjs.MenuButton.prototype.onClick = function(){
+  // When you click the button it adds focus, which will show the menu indefinitely.
+  // So we'll remove focus when the mouse leaves the button.
+  // Focus is needed for tab navigation.
+  this.one('mouseout', vjs.bind(this, function(){
+    this.menu.unlockShowing();
+    this.el_.blur();
+  }));
+  if (this.buttonPressed_){
+    this.unpressButton();
+  } else {
+    this.pressButton();
+  }
+};
+
+vjs.MenuButton.prototype.onKeyPress = function(event){
+  event.preventDefault();
+
+  // Check for space bar (32) or enter (13) keys
+  if (event.which == 32 || event.which == 13) {
+    if (this.buttonPressed_){
+      this.unpressButton();
+    } else {
+      this.pressButton();
+    }
+  // Check for escape (27) key
+  } else if (event.which == 27){
+    if (this.buttonPressed_){
+      this.unpressButton();
+    }
+  }
+};
+
+vjs.MenuButton.prototype.pressButton = function(){
+  this.buttonPressed_ = true;
+  this.menu.lockShowing();
+  this.el_.setAttribute('aria-pressed', true);
+  if (this.items && this.items.length > 0) {
+    this.items[0].el().focus(); // set the focus to the title of the submenu
+  }
+};
+
+vjs.MenuButton.prototype.unpressButton = function(){
+  this.buttonPressed_ = false;
+  this.menu.unlockShowing();
+  this.el_.setAttribute('aria-pressed', false);
+};
+
+/**
+ * Main player class. A player instance is returned by _V_(id);
+ * @param {Element} tag        The original video tag used for configuring options
+ * @param {Object=} options    Player options
+ * @param {Function=} ready    Ready callback function
+ * @constructor
+ */
+vjs.Player = vjs.Component.extend({
+  /** @constructor */
+  init: function(tag, options, ready){
+    this.tag = tag; // Store the original tag used to set options
+
+    // Set Options
+    // The options argument overrides options set in the video tag
+    // which overrides globally set options.
+    // This latter part coincides with the load order
+    // (tag must exist before Player)
+    options = vjs.obj.merge(this.getTagSettings(tag), options);
+
+    // Cache for video property values.
+    this.cache_ = {};
+
+    // Set poster
+    this.poster_ = options['poster'];
+    // Set controls
+    this.controls_ = options['controls'];
+    // Use native controls for iOS and Android by default
+    //  until controls are more stable on those devices.
+    if (options['customControlsOnMobile'] !== true && (vjs.IS_IOS || vjs.IS_ANDROID)) {
+      tag.controls = options['controls'];
+      this.controls_ = false;
+    } else {
+      // Original tag settings stored in options
+      // now remove immediately so native controls don't flash.
+      tag.controls = false;
+    }
+
+    // Run base component initializing with new options.
+    // Builds the element through createEl()
+    // Inits and embeds any child components in opts
+    vjs.Component.call(this, this, options, ready);
+
+    // Firstplay event implimentation. Not sold on the event yet.
+    // Could probably just check currentTime==0?
+    this.one('play', function(e){
+      var fpEvent = { type: 'firstplay', target: this.el_ };
+      // Using vjs.trigger so we can check if default was prevented
+      var keepGoing = vjs.trigger(this.el_, fpEvent);
+
+      if (!keepGoing) {
+        e.preventDefault();
+        e.stopPropagation();
+        e.stopImmediatePropagation();
+      }
+    });
+
+    this.on('ended', this.onEnded);
+    this.on('play', this.onPlay);
+    this.on('firstplay', this.onFirstPlay);
+    this.on('pause', this.onPause);
+    this.on('progress', this.onProgress);
+    this.on('durationchange', this.onDurationChange);
+    this.on('error', this.onError);
+    this.on('fullscreenchange', this.onFullscreenChange);
+
+    // Make player easily findable by ID
+    vjs.players[this.id_] = this;
+
+    if (options['plugins']) {
+      vjs.obj.each(options['plugins'], function(key, val){
+        this[key](val);
+      }, this);
+    }
+  }
+});
+
+/**
+ * Player instance options, surfaced using vjs.options
+ * vjs.options = vjs.Player.prototype.options_
+ * Make changes in vjs.options, not here.
+ * All options should use string keys so they avoid
+ * renaming by closure compiler
+ * @type {Object}
+ * @private
+ */
+vjs.Player.prototype.options_ = vjs.options;
+
+vjs.Player.prototype.dispose = function(){
+  // this.isReady_ = false;
+
+  // Kill reference to this player
+  vjs.players[this.id_] = null;
+  if (this.tag && this.tag['player']) { this.tag['player'] = null; }
+  if (this.el_ && this.el_['player']) { this.el_['player'] = null; }
+
+  // Ensure that tracking progress and time progress will stop and plater deleted
+  this.stopTrackingProgress();
+  this.stopTrackingCurrentTime();
+
+  if (this.tech) { this.tech.dispose(); }
+
+  // Component dispose
+  vjs.Component.prototype.dispose.call(this);
+};
+
+vjs.Player.prototype.getTagSettings = function(tag){
+  var options = {
+    'sources': [],
+    'tracks': []
+  };
+
+  vjs.obj.merge(options, vjs.getAttributeValues(tag));
+
+  // Get tag children settings
+  if (tag.hasChildNodes()) {
+    var child, childName,
+        children = tag.childNodes,
+        i = 0,
+        j = children.length;
+
+    for (; i < j; i++) {
+      child = children[i];
+      // Change case needed: http://ejohn.org/blog/nodename-case-sensitivity/
+      childName = child.nodeName.toLowerCase();
+
+      if (childName === 'source') {
+        options['sources'].push(vjs.getAttributeValues(child));
+
+      } else if (childName === 'track') {
+        options['tracks'].push(vjs.getAttributeValues(child));
+
+      }
+    }
+  }
+
+  return options;
+};
+
+vjs.Player.prototype.createEl = function(){
+  var el = this.el_ = vjs.Component.prototype.createEl.call(this, 'div');
+  var tag = this.tag;
+
+  // Remove width/height attrs from tag so CSS can make it 100% width/height
+  tag.removeAttribute('width');
+  tag.removeAttribute('height');
+  // Empty video tag sources and tracks so the built-in player doesn't use them also.
+  // This may not be fast enough to stop HTML5 browsers from reading the tags
+  // so we'll need to turn off any default tracks if we're manually doing
+  // captions and subtitles. videoElement.textTracks
+  if (tag.hasChildNodes()) {
+    var nrOfChildNodes = tag.childNodes.length;
+    for (var i=0,j=tag.childNodes;i<nrOfChildNodes;i++) {
+      if (j[0].nodeName.toLowerCase() == 'source' || j[0].nodeName.toLowerCase() == 'track') {
+        tag.removeChild(j[0]);
+      }
+    }
+  }
+
+  // Make sure tag ID exists
+  tag.id = tag.id || 'vjs_video_' + vjs.guid++;
+
+  // Give video tag ID and class to player div
+  // ID will now reference player box, not the video tag
+  el.id = tag.id;
+  el.className = tag.className;
+
+  // Update tag id/class for use as HTML5 playback tech
+  // Might think we should do this after embedding in container so .vjs-tech class
+  // doesn't flash 100% width/height, but class only applies with .video-js parent
+  tag.id += '_html5_api';
+  tag.className = 'vjs-tech';
+
+  // Make player findable on elements
+  tag['player'] = el['player'] = this;
+  // Default state of video is paused
+  this.addClass('vjs-paused');
+
+  // Make box use width/height of tag, or rely on default implementation
+  // Enforce with CSS since width/height attrs don't work on divs
+  this.width(this.options_['width'], true); // (true) Skip resize listener on load
+  this.height(this.options_['height'], true);
+
+  // Wrap video tag in div (el/box) container
+  if (tag.parentNode) {
+    tag.parentNode.insertBefore(el, tag);
+  }
+  vjs.insertFirst(tag, el); // Breaks iPhone, fixed in HTML5 setup.
+
+  return el;
+};
+
+// /* Media Technology (tech)
+// ================================================================================ */
+// Load/Create an instance of playback technlogy including element and API methods
+// And append playback element in player div.
+vjs.Player.prototype.loadTech = function(techName, source){
+
+  // Pause and remove current playback technology
+  if (this.tech) {
+    this.unloadTech();
+
+  // If the first time loading, HTML5 tag will exist but won't be initialized
+  // So we need to remove it if we're not loading HTML5
+  } else if (techName !== 'Html5' && this.tag) {
+    this.el_.removeChild(this.tag);
+    this.tag.player = null;
+    this.tag = null;
+  }
+
+  this.techName = techName;
+
+  // Turn off API access because we're loading a new tech that might load asynchronously
+  this.isReady_ = false;
+
+  var techReady = function(){
+    this.player_.triggerReady();
+
+    // Manually track progress in cases where the browser/flash player doesn't report it.
+    if (!this.features.progressEvents) {
+      this.player_.manualProgressOn();
+    }
+
+    // Manually track timeudpates in cases where the browser/flash player doesn't report it.
+    if (!this.features.timeupdateEvents) {
+      this.player_.manualTimeUpdatesOn();
+    }
+  };
+
+  // Grab tech-specific options from player options and add source and parent element to use.
+  var techOptions = vjs.obj.merge({ 'source': source, 'parentEl': this.el_ }, this.options_[techName.toLowerCase()]);
+
+  if (source) {
+    if (source.src == this.cache_.src && this.cache_.currentTime > 0) {
+      techOptions['startTime'] = this.cache_.currentTime;
+    }
+
+    this.cache_.src = source.src;
+  }
+
+  // Initialize tech instance
+  this.tech = new window['videojs'][techName](this, techOptions);
+
+  this.tech.ready(techReady);
+};
+
+vjs.Player.prototype.unloadTech = function(){
+  this.isReady_ = false;
+  this.tech.dispose();
+
+  // Turn off any manual progress or timeupdate tracking
+  if (this.manualProgress) { this.manualProgressOff(); }
+
+  if (this.manualTimeUpdates) { this.manualTimeUpdatesOff(); }
+
+  this.tech = false;
+};
+
+// There's many issues around changing the size of a Flash (or other plugin) object.
+// First is a plugin reload issue in Firefox that has been around for 11 years: https://bugzilla.mozilla.org/show_bug.cgi?id=90268
+// Then with the new fullscreen API, Mozilla and webkit browsers will reload the flash object after going to fullscreen.
+// To get around this, we're unloading the tech, caching source and currentTime values, and reloading the tech once the plugin is resized.
+// reloadTech: function(betweenFn){
+//   vjs.log('unloadingTech')
+//   this.unloadTech();
+//   vjs.log('unloadedTech')
+//   if (betweenFn) { betweenFn.call(); }
+//   vjs.log('LoadingTech')
+//   this.loadTech(this.techName, { src: this.cache_.src })
+//   vjs.log('loadedTech')
+// },
+
+/* Fallbacks for unsupported event types
+================================================================================ */
+// Manually trigger progress events based on changes to the buffered amount
+// Many flash players and older HTML5 browsers don't send progress or progress-like events
+vjs.Player.prototype.manualProgressOn = function(){
+  this.manualProgress = true;
+
+  // Trigger progress watching when a source begins loading
+  this.trackProgress();
+
+  // Watch for a native progress event call on the tech element
+  // In HTML5, some older versions don't support the progress event
+  // So we're assuming they don't, and turning off manual progress if they do.
+  // As opposed to doing user agent detection
+  this.tech.one('progress', function(){
+
+    // Update known progress support for this playback technology
+    this.features.progressEvents = true;
+
+    // Turn off manual progress tracking
+    this.player_.manualProgressOff();
+  });
+};
+
+vjs.Player.prototype.manualProgressOff = function(){
+  this.manualProgress = false;
+  this.stopTrackingProgress();
+};
+
+vjs.Player.prototype.trackProgress = function(){
+
+  this.progressInterval = setInterval(vjs.bind(this, function(){
+    // Don't trigger unless buffered amount is greater than last time
+    // log(this.cache_.bufferEnd, this.buffered().end(0), this.duration())
+    /* TODO: update for multiple buffered regions */
+    if (this.cache_.bufferEnd < this.buffered().end(0)) {
+      this.trigger('progress');
+    } else if (this.bufferedPercent() == 1) {
+      this.stopTrackingProgress();
+      this.trigger('progress'); // Last update
+    }
+  }), 500);
+};
+vjs.Player.prototype.stopTrackingProgress = function(){ clearInterval(this.progressInterval); };
+
+/* Time Tracking -------------------------------------------------------------- */
+vjs.Player.prototype.manualTimeUpdatesOn = function(){
+  this.manualTimeUpdates = true;
+
+  this.on('play', this.trackCurrentTime);
+  this.on('pause', this.stopTrackingCurrentTime);
+  // timeupdate is also called by .currentTime whenever current time is set
+
+  // Watch for native timeupdate event
+  this.tech.one('timeupdate', function(){
+    // Update known progress support for this playback technology
+    this.features.timeupdateEvents = true;
+    // Turn off manual progress tracking
+    this.player_.manualTimeUpdatesOff();
+  });
+};
+
+vjs.Player.prototype.manualTimeUpdatesOff = function(){
+  this.manualTimeUpdates = false;
+  this.stopTrackingCurrentTime();
+  this.off('play', this.trackCurrentTime);
+  this.off('pause', this.stopTrackingCurrentTime);
+};
+
+vjs.Player.prototype.trackCurrentTime = function(){
+  if (this.currentTimeInterval) { this.stopTrackingCurrentTime(); }
+  this.currentTimeInterval = setInterval(vjs.bind(this, function(){
+    this.trigger('timeupdate');
+  }), 250); // 42 = 24 fps // 250 is what Webkit uses // FF uses 15
+};
+
+// Turn off play progress tracking (when paused or dragging)
+vjs.Player.prototype.stopTrackingCurrentTime = function(){ clearInterval(this.currentTimeInterval); };
+
+// /* Player event handlers (how the player reacts to certain events)
+// ================================================================================ */
+vjs.Player.prototype.onEnded = function(){
+  if (this.options_['loop']) {
+    this.currentTime(0);
+    this.play();
+  }
+};
+
+vjs.Player.prototype.onPlay = function(){
+  vjs.removeClass(this.el_, 'vjs-paused');
+  vjs.addClass(this.el_, 'vjs-playing');
+};
+
+vjs.Player.prototype.onFirstPlay = function(){
+    //If the first starttime attribute is specified
+    //then we will start at the given offset in seconds
+    if(this.options_['starttime']){
+      this.currentTime(this.options_['starttime']);
+    }
+};
+
+vjs.Player.prototype.onPause = function(){
+  vjs.removeClass(this.el_, 'vjs-playing');
+  vjs.addClass(this.el_, 'vjs-paused');
+};
+
+vjs.Player.prototype.onProgress = function(){
+  // Add custom event for when source is finished downloading.
+  if (this.bufferedPercent() == 1) {
+    this.trigger('loadedalldata');
+  }
+};
+
+// Update duration with durationchange event
+// Allows for cacheing value instead of asking player each time.
+vjs.Player.prototype.onDurationChange = function(){
+  this.duration(this.techGet('duration'));
+};
+
+vjs.Player.prototype.onError = function(e) {
+  vjs.log('Video Error', e);
+};
+
+vjs.Player.prototype.onFullscreenChange = function(e) {
+  if (this.isFullScreen) {
+    this.addClass('vjs-fullscreen');
+  } else {
+    this.removeClass('vjs-fullscreen');
+  }
+};
+
+// /* Player API
+// ================================================================================ */
+
+/**
+ * Object for cached values.
+ * @private
+ */
+vjs.Player.prototype.cache_;
+
+vjs.Player.prototype.getCache = function(){
+  return this.cache_;
+};
+
+// Pass values to the playback tech
+vjs.Player.prototype.techCall = function(method, arg){
+  // If it's not ready yet, call method when it is
+  if (this.tech && this.tech.isReady_) {
+    this.tech.ready(function(){
+      this[method](arg);
+    });
+
+  // Otherwise call method now
+  } else {
+    try {
+      this.tech[method](arg);
+    } catch(e) {
+      vjs.log(e);
+      throw e;
+    }
+  }
+};
+
+// Get calls can't wait for the tech, and sometimes don't need to.
+vjs.Player.prototype.techGet = function(method){
+
+  // Make sure there is a tech
+  // if (!this.tech) {
+  //   return;
+  // }
+
+  if (this.tech.isReady_) {
+
+    // Flash likes to die and reload when you hide or reposition it.
+    // In these cases the object methods go away and we get errors.
+    // When that happens we'll catch the errors and inform tech that it's not ready any more.
+    try {
+      return this.tech[method]();
+    } catch(e) {
+      // When building additional tech libs, an expected method may not be defined yet
+      if (this.tech[method] === undefined) {
+        vjs.log('Video.js: ' + method + ' method not defined for '+this.techName+' playback technology.', e);
+      } else {
+        // When a method isn't available on the object it throws a TypeError
+        if (e.name == 'TypeError') {
+          vjs.log('Video.js: ' + method + ' unavailable on '+this.techName+' playback technology element.', e);
+          this.tech.isReady_ = false;
+        } else {
+          vjs.log(e);
+        }
+      }
+      throw e;
+    }
+  }
+
+  return;
+};
+
+/**
+ * Start media playback
+ * http://dev.w3.org/html5/spec/video.html#dom-media-play
+ * We're triggering the 'play' event here instead of relying on the
+ * media element to allow using event.preventDefault() to stop
+ * play from happening if desired. Usecase: preroll ads.
+ */
+vjs.Player.prototype.play = function(){
+  this.techCall('play');
+  return this;
+};
+
+// http://dev.w3.org/html5/spec/video.html#dom-media-pause
+vjs.Player.prototype.pause = function(){
+  this.techCall('pause');
+  return this;
+};
+
+// http://dev.w3.org/html5/spec/video.html#dom-media-paused
+// The initial state of paused should be true (in Safari it's actually false)
+vjs.Player.prototype.paused = function(){
+  return (this.techGet('paused') === false) ? false : true;
+};
+
+// http://dev.w3.org/html5/spec/video.html#dom-media-currenttime
+vjs.Player.prototype.currentTime = function(seconds){
+  if (seconds !== undefined) {
+
+    // Cache the last set value for smoother scrubbing.
+    this.cache_.lastSetCurrentTime = seconds;
+
+    this.techCall('setCurrentTime', seconds);
+
+    // Improve the accuracy of manual timeupdates
+    if (this.manualTimeUpdates) { this.trigger('timeupdate'); }
+
+    return this;
+  }
+
+  // Cache last currentTime and return
+  // Default to 0 seconds
+  return this.cache_.currentTime = (this.techGet('currentTime') || 0);
+};
+
+// http://dev.w3.org/html5/spec/video.html#dom-media-duration
+// Duration should return NaN if not available. ParseFloat will turn false-ish values to NaN.
+vjs.Player.prototype.duration = function(seconds){
+  if (seconds !== undefined) {
+
+    // Cache the last set value for optimiized scrubbing (esp. Flash)
+    this.cache_.duration = parseFloat(seconds);
+
+    return this;
+  }
+
+  return this.cache_.duration;
+};
+
+// Calculates how much time is left. Not in spec, but useful.
+vjs.Player.prototype.remainingTime = function(){
+  return this.duration() - this.currentTime();
+};
+
+// http://dev.w3.org/html5/spec/video.html#dom-media-buffered
+// Buffered returns a timerange object.
+// Kind of like an array of portions of the video that have been downloaded.
+// So far no browsers return more than one range (portion)
+vjs.Player.prototype.buffered = function(){
+  var buffered = this.techGet('buffered'),
+      start = 0,
+      // Default end to 0 and store in values
+      end = this.cache_.bufferEnd = this.cache_.bufferEnd || 0;
+
+  if (buffered && buffered.length > 0 && buffered.end(0) !== end) {
+    end = buffered.end(0);
+    // Storing values allows them be overridden by setBufferedFromProgress
+    this.cache_.bufferEnd = end;
+  }
+
+  return vjs.createTimeRange(start, end);
+};
+
+// Calculates amount of buffer is full. Not in spec but useful.
+vjs.Player.prototype.bufferedPercent = function(){
+  return (this.duration()) ? this.buffered().end(0) / this.duration() : 0;
+};
+
+// http://dev.w3.org/html5/spec/video.html#dom-media-volume
+vjs.Player.prototype.volume = function(percentAsDecimal){
+  var vol;
+
+  if (percentAsDecimal !== undefined) {
+    vol = Math.max(0, Math.min(1, parseFloat(percentAsDecimal))); // Force value to between 0 and 1
+    this.cache_.volume = vol;
+    this.techCall('setVolume', vol);
+    vjs.setLocalStorage('volume', vol);
+    return this;
+  }
+
+  // Default to 1 when returning current volume.
+  vol = parseFloat(this.techGet('volume'));
+  return (isNaN(vol)) ? 1 : vol;
+};
+
+// http://dev.w3.org/html5/spec/video.html#attr-media-muted
+vjs.Player.prototype.muted = function(muted){
+  if (muted !== undefined) {
+    this.techCall('setMuted', muted);
+    return this;
+  }
+  return this.techGet('muted') || false; // Default to false
+};
+
+// Check if current tech can support native fullscreen (e.g. with built in controls lik iOS, so not our flash swf)
+vjs.Player.prototype.supportsFullScreen = function(){ return this.techGet('supportsFullScreen') || false; };
+
+// Turn on fullscreen (or window) mode
+vjs.Player.prototype.requestFullScreen = function(){
+  var requestFullScreen = vjs.support.requestFullScreen;
+  this.isFullScreen = true;
+
+  if (requestFullScreen) {
+    // the browser supports going fullscreen at the element level so we can
+    // take the controls fullscreen as well as the video
+
+    // Trigger fullscreenchange event after change
+    vjs.on(document, requestFullScreen.eventName, vjs.bind(this, function(){
+      this.isFullScreen = document[requestFullScreen.isFullScreen];
+
+      // If cancelling fullscreen, remove event listener.
+      if (this.isFullScreen === false) {
+        vjs.off(document, requestFullScreen.eventName, arguments.callee);
+      }
+
+    }));
+
+    // Flash and other plugins get reloaded when you take their parent to fullscreen.
+    // To fix that we'll remove the tech, and reload it after the resize has finished.
+    if (this.tech.features.fullscreenResize === false && this.options_['flash']['iFrameMode'] !== true) {
+
+      this.pause();
+      this.unloadTech();
+
+      vjs.on(document, requestFullScreen.eventName, vjs.bind(this, function(){
+        vjs.off(document, requestFullScreen.eventName, arguments.callee);
+        this.loadTech(this.techName, { src: this.cache_.src });
+      }));
+
+      this.el_[requestFullScreen.requestFn]();
+
+    } else {
+      this.el_[requestFullScreen.requestFn]();
+    }
+
+    this.trigger('fullscreenchange');
+
+  } else if (this.tech.supportsFullScreen()) {
+    // we can't take the video.js controls fullscreen but we can go fullscreen
+    // with native controls
+
+    this.techCall('enterFullScreen');
+  } else {
+    // fullscreen isn't supported so we'll just stretch the video element to
+    // fill the viewport
+
+    this.enterFullWindow();
+    this.trigger('fullscreenchange');
+  }
+
+  return this;
+};
+
+vjs.Player.prototype.cancelFullScreen = function(){
+  var requestFullScreen = vjs.support.requestFullScreen;
+
+  this.isFullScreen = false;
+
+  // Check for browser element fullscreen support
+  if (requestFullScreen) {
+
+   // Flash and other plugins get reloaded when you take their parent to fullscreen.
+   // To fix that we'll remove the tech, and reload it after the resize has finished.
+   if (this.tech.features.fullscreenResize === false && this.options_['flash']['iFrameMode'] !== true) {
+
+     this.pause();
+     this.unloadTech();
+
+     vjs.on(document, requestFullScreen.eventName, vjs.bind(this, function(){
+       vjs.off(document, requestFullScreen.eventName, arguments.callee);
+       this.loadTech(this.techName, { src: this.cache_.src });
+     }));
+
+     document[requestFullScreen.cancelFn]();
+   } else {
+     document[requestFullScreen.cancelFn]();
+   }
+
+   this.trigger('fullscreenchange');
+
+  } else if (this.tech.supportsFullScreen()) {
+   this.techCall('exitFullScreen');
+  } else {
+   this.exitFullWindow();
+   this.trigger('fullscreenchange');
+  }
+
+  return this;
+};
+
+// When fullscreen isn't supported we can stretch the video container to as wide as the browser will let us.
+vjs.Player.prototype.enterFullWindow = function(){
+  this.isFullWindow = true;
+
+  // Storing original doc overflow value to return to when fullscreen is off
+  this.docOrigOverflow = document.documentElement.style.overflow;
+
+  // Add listener for esc key to exit fullscreen
+  vjs.on(document, 'keydown', vjs.bind(this, this.fullWindowOnEscKey));
+
+  // Hide any scroll bars
+  document.documentElement.style.overflow = 'hidden';
+
+  // Apply fullscreen styles
+  vjs.addClass(document.body, 'vjs-full-window');
+
+  this.trigger('enterFullWindow');
+};
+vjs.Player.prototype.fullWindowOnEscKey = function(event){
+  if (event.keyCode === 27) {
+    if (this.isFullScreen === true) {
+      this.cancelFullScreen();
+    } else {
+      this.exitFullWindow();
+    }
+  }
+};
+
+vjs.Player.prototype.exitFullWindow = function(){
+  this.isFullWindow = false;
+  vjs.off(document, 'keydown', this.fullWindowOnEscKey);
+
+  // Unhide scroll bars.
+  document.documentElement.style.overflow = this.docOrigOverflow;
+
+  // Remove fullscreen styles
+  vjs.removeClass(document.body, 'vjs-full-window');
+
+  // Resize the box, controller, and poster to original sizes
+  // this.positionAll();
+  this.trigger('exitFullWindow');
+};
+
+vjs.Player.prototype.selectSource = function(sources){
+
+  // Loop through each playback technology in the options order
+  for (var i=0,j=this.options_['techOrder'];i<j.length;i++) {
+    var techName = vjs.capitalize(j[i]),
+        tech = window['videojs'][techName];
+
+    // Check if the browser supports this technology
+    if (tech.isSupported()) {
+      // Loop through each source object
+      for (var a=0,b=sources;a<b.length;a++) {
+        var source = b[a];
+
+        // Check if source can be played with this technology
+        if (tech['canPlaySource'](source)) {
+          return { source: source, tech: techName };
+        }
+      }
+    }
+  }
+
+  return false;
+};
+
+// src is a pretty powerful function
+// If you pass it an array of source objects, it will find the best source to play and use that object.src
+//   If the new source requires a new playback technology, it will switch to that.
+// If you pass it an object, it will set the source to object.src
+// If you pass it anything else (url string) it will set the video source to that
+vjs.Player.prototype.src = function(source){
+  // Case: Array of source objects to choose from and pick the best to play
+  if (source instanceof Array) {
+
+    var sourceTech = this.selectSource(source),
+        techName;
+
+    if (sourceTech) {
+        source = sourceTech.source;
+        techName = sourceTech.tech;
+
+      // If this technology is already loaded, set source
+      if (techName == this.techName) {
+        this.src(source); // Passing the source object
+      // Otherwise load this technology with chosen source
+      } else {
+        this.loadTech(techName, source);
+      }
+    } else {
+      this.el_.appendChild(vjs.createEl('p', {
+        innerHTML: 'Sorry, no compatible source and playback technology were found for this video. Try using another browser like <a href="http://bit.ly/ccMUEC">Chrome</a> or download the latest <a href="http://adobe.ly/mwfN1">Adobe Flash Player</a>.'
+      }));
+    }
+
+  // Case: Source object { src: '', type: '' ... }
+  } else if (source instanceof Object) {
+
+    if (window['videojs'][this.techName]['canPlaySource'](source)) {
+      this.src(source.src);
+    } else {
+      // Send through tech loop to check for a compatible technology.
+      this.src([source]);
+    }
+
+  // Case: URL String (http://myvideo...)
+  } else {
+    // Cache for getting last set source
+    this.cache_.src = source;
+
+    if (!this.isReady_) {
+      this.ready(function(){
+        this.src(source);
+      });
+    } else {
+      this.techCall('src', source);
+      if (this.options_['preload'] == 'auto') {
+        this.load();
+      }
+      if (this.options_['autoplay']) {
+        this.play();
+      }
+    }
+  }
+  return this;
+};
+
+// Begin loading the src data
+// http://dev.w3.org/html5/spec/video.html#dom-media-load
+vjs.Player.prototype.load = function(){
+  this.techCall('load');
+  return this;
+};
+
+// http://dev.w3.org/html5/spec/video.html#dom-media-currentsrc
+vjs.Player.prototype.currentSrc = function(){
+  return this.techGet('currentSrc') || this.cache_.src || '';
+};
+
+// Attributes/Options
+vjs.Player.prototype.preload = function(value){
+  if (value !== undefined) {
+    this.techCall('setPreload', value);
+    this.options_['preload'] = value;
+    return this;
+  }
+  return this.techGet('preload');
+};
+vjs.Player.prototype.autoplay = function(value){
+  if (value !== undefined) {
+    this.techCall('setAutoplay', value);
+    this.options_['autoplay'] = value;
+    return this;
+  }
+  return this.techGet('autoplay', value);
+};
+vjs.Player.prototype.loop = function(value){
+  if (value !== undefined) {
+    this.techCall('setLoop', value);
+    this.options_['loop'] = value;
+    return this;
+  }
+  return this.techGet('loop');
+};
+
+/**
+ * The url of the poster image source.
+ * @type {String}
+ * @private
+ */
+vjs.Player.prototype.poster_;
+
+/**
+ * Get or set the poster image source url.
+ * @param  {String} src Poster image source URL
+ * @return {String}    Poster image source URL or null
+ */
+vjs.Player.prototype.poster = function(src){
+  if (src !== undefined) {
+    this.poster_ = src;
+  }
+  return this.poster_;
+};
+
+/**
+ * Whether or not the controls are showing
+ * @type {Boolean}
+ * @private
+ */
+vjs.Player.prototype.controls_;
+
+/**
+ * Get or set whether or not the controls are showing.
+ * @param  {Boolean} controls Set controls to showing or not
+ * @return {Boolean}    Controls are showing
+ */
+vjs.Player.prototype.controls = function(controls){
+  if (controls !== undefined) {
+    // Don't trigger a change event unless it actually changed
+    if (this.controls_ !== controls) {
+      this.controls_ = !!controls; // force boolean
+      this.trigger('controlschange');
+    }
+  }
+  return this.controls_;
+};
+
+vjs.Player.prototype.error = function(){ return this.techGet('error'); };
+vjs.Player.prototype.ended = function(){ return this.techGet('ended'); };
+
+// Methods to add support for
+// networkState: function(){ return this.techCall('networkState'); },
+// readyState: function(){ return this.techCall('readyState'); },
+// seeking: function(){ return this.techCall('seeking'); },
+// initialTime: function(){ return this.techCall('initialTime'); },
+// startOffsetTime: function(){ return this.techCall('startOffsetTime'); },
+// played: function(){ return this.techCall('played'); },
+// seekable: function(){ return this.techCall('seekable'); },
+// videoTracks: function(){ return this.techCall('videoTracks'); },
+// audioTracks: function(){ return this.techCall('audioTracks'); },
+// videoWidth: function(){ return this.techCall('videoWidth'); },
+// videoHeight: function(){ return this.techCall('videoHeight'); },
+// defaultPlaybackRate: function(){ return this.techCall('defaultPlaybackRate'); },
+// playbackRate: function(){ return this.techCall('playbackRate'); },
+// mediaGroup: function(){ return this.techCall('mediaGroup'); },
+// controller: function(){ return this.techCall('controller'); },
+// defaultMuted: function(){ return this.techCall('defaultMuted'); }
+
+// TODO
+// currentSrcList: the array of sources including other formats and bitrates
+// playList: array of source lists in order of playback
+
+// RequestFullscreen API
+(function(){
+  var prefix, requestFS, div;
+
+  div = document.createElement('div');
+
+  requestFS = {};
+
+  // Current W3C Spec
+  // http://dvcs.w3.org/hg/fullscreen/raw-file/tip/Overview.html#api
+  // Mozilla Draft: https://wiki.mozilla.org/Gecko:FullScreenAPI#fullscreenchange_event
+  if (div.cancelFullscreen !== undefined) {
+    requestFS.requestFn = 'requestFullscreen';
+    requestFS.cancelFn = 'exitFullscreen';
+    requestFS.eventName = 'fullscreenchange';
+    requestFS.isFullScreen = 'fullScreen';
+
+  // Webkit (Chrome/Safari) and Mozilla (Firefox) have working implementations
+  // that use prefixes and vary slightly from the new W3C spec. Specifically,
+  // using 'exit' instead of 'cancel', and lowercasing the 'S' in Fullscreen.
+  // Other browsers don't have any hints of which version they might follow yet,
+  // so not going to try to predict by looping through all prefixes.
+  } else {
+
+    if (document.mozCancelFullScreen) {
+      prefix = 'moz';
+      requestFS.isFullScreen = prefix + 'FullScreen';
+    } else {
+      prefix = 'webkit';
+      requestFS.isFullScreen = prefix + 'IsFullScreen';
+    }
+
+    if (div[prefix + 'RequestFullScreen']) {
+      requestFS.requestFn = prefix + 'RequestFullScreen';
+      requestFS.cancelFn = prefix + 'CancelFullScreen';
+    }
+    requestFS.eventName = prefix + 'fullscreenchange';
+  }
+
+  if (document[requestFS.cancelFn]) {
+    vjs.support.requestFullScreen = requestFS;
+  }
+
+})();
+/**
+ * Container of main controls
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.ControlBar = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+
+    if (!player.controls()) {
+      this.disable();
+    }
+
+    player.one('play', vjs.bind(this, function(){
+      var touchstart,
+        fadeIn = vjs.bind(this, this.fadeIn),
+        fadeOut = vjs.bind(this, this.fadeOut);
+
+      this.fadeIn();
+
+      if ( !('ontouchstart' in window) ) {
+        this.player_.on('mouseover', fadeIn);
+        this.player_.on('mouseout', fadeOut);
+        this.player_.on('pause', vjs.bind(this, this.lockShowing));
+        this.player_.on('play', vjs.bind(this, this.unlockShowing));
+      }
+
+      touchstart = false;
+      this.player_.on('touchstart', function() {
+        touchstart = true;
+      });
+      this.player_.on('touchmove', function() {
+        touchstart = false;
+      });
+      this.player_.on('touchend', vjs.bind(this, function(event) {
+        var idx;
+        if (touchstart) {
+          idx = this.el().className.search('fade-in');
+          if (idx !== -1) {
+            this.fadeOut();
+          } else {
+            this.fadeIn();
+          }
+        }
+        touchstart = false;
+
+        if (!this.player_.paused()) {
+          event.preventDefault();
+        }
+      }));
+    }));
+  }
+});
+
+vjs.ControlBar.prototype.options_ = {
+  loadEvent: 'play',
+  children: {
+    'playToggle': {},
+    'currentTimeDisplay': {},
+    'timeDivider': {},
+    'durationDisplay': {},
+    'remainingTimeDisplay': {},
+    'progressControl': {},
+    'fullscreenToggle': {},
+    'volumeControl': {},
+    'muteToggle': {}
+    // 'volumeMenuButton': {}
+  }
+};
+
+vjs.ControlBar.prototype.createEl = function(){
+  return vjs.createEl('div', {
+    className: 'vjs-control-bar'
+  });
+};
+
+vjs.ControlBar.prototype.fadeIn = function(){
+  vjs.Component.prototype.fadeIn.call(this);
+  this.player_.trigger('controlsvisible');
+};
+
+vjs.ControlBar.prototype.fadeOut = function(){
+  vjs.Component.prototype.fadeOut.call(this);
+  this.player_.trigger('controlshidden');
+};/**
+ * Button to toggle between play and pause
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.PlayToggle = vjs.Button.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Button.call(this, player, options);
+
+    player.on('play', vjs.bind(this, this.onPlay));
+    player.on('pause', vjs.bind(this, this.onPause));
+  }
+});
+
+vjs.PlayToggle.prototype.buttonText = 'Play';
+
+vjs.PlayToggle.prototype.buildCSSClass = function(){
+  return 'vjs-play-control ' + vjs.Button.prototype.buildCSSClass.call(this);
+};
+
+  // OnClick - Toggle between play and pause
+vjs.PlayToggle.prototype.onClick = function(){
+  if (this.player_.paused()) {
+    this.player_.play();
+  } else {
+    this.player_.pause();
+  }
+};
+
+  // OnPlay - Add the vjs-playing class to the element so it can change appearance
+vjs.PlayToggle.prototype.onPlay = function(){
+  vjs.removeClass(this.el_, 'vjs-paused');
+  vjs.addClass(this.el_, 'vjs-playing');
+  this.el_.children[0].children[0].innerHTML = 'Pause'; // change the button text to "Pause"
+};
+
+  // OnPause - Add the vjs-paused class to the element so it can change appearance
+vjs.PlayToggle.prototype.onPause = function(){
+  vjs.removeClass(this.el_, 'vjs-playing');
+  vjs.addClass(this.el_, 'vjs-paused');
+  this.el_.children[0].children[0].innerHTML = 'Play'; // change the button text to "Play"
+};/**
+ * Displays the current time
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.CurrentTimeDisplay = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+
+    player.on('timeupdate', vjs.bind(this, this.updateContent));
+  }
+});
+
+vjs.CurrentTimeDisplay.prototype.createEl = function(){
+  var el = vjs.Component.prototype.createEl.call(this, 'div', {
+    className: 'vjs-current-time vjs-time-controls vjs-control'
+  });
+
+  this.content = vjs.createEl('div', {
+    className: 'vjs-current-time-display',
+    innerHTML: '<span class="vjs-control-text">Current Time </span>' + '0:00', // label the current time for screen reader users
+    'aria-live': 'off' // tell screen readers not to automatically read the time as it changes
+  });
+
+  el.appendChild(vjs.createEl('div').appendChild(this.content));
+  return el;
+};
+
+vjs.CurrentTimeDisplay.prototype.updateContent = function(){
+  // Allows for smooth scrubbing, when player can't keep up.
+  var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime();
+  this.content.innerHTML = '<span class="vjs-control-text">Current Time </span>' + vjs.formatTime(time, this.player_.duration());
+};
+
+/**
+ * Displays the duration
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.DurationDisplay = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+
+    player.on('timeupdate', vjs.bind(this, this.updateContent)); // this might need to be changes to 'durationchange' instead of 'timeupdate' eventually, however the durationchange event fires before this.player_.duration() is set, so the value cannot be written out using this method. Once the order of durationchange and this.player_.duration() being set is figured out, this can be updated.
+  }
+});
+
+vjs.DurationDisplay.prototype.createEl = function(){
+  var el = vjs.Component.prototype.createEl.call(this, 'div', {
+    className: 'vjs-duration vjs-time-controls vjs-control'
+  });
+
+  this.content = vjs.createEl('div', {
+    className: 'vjs-duration-display',
+    innerHTML: '<span class="vjs-control-text">Duration Time </span>' + '0:00', // label the duration time for screen reader users
+    'aria-live': 'off' // tell screen readers not to automatically read the time as it changes
+  });
+
+  el.appendChild(vjs.createEl('div').appendChild(this.content));
+  return el;
+};
+
+vjs.DurationDisplay.prototype.updateContent = function(){
+  if (this.player_.duration()) {
+      this.content.innerHTML = '<span class="vjs-control-text">Duration Time </span>' + vjs.formatTime(this.player_.duration()); // label the duration time for screen reader users
+  }
+};
+
+/**
+ * Time Separator (Not used in main skin, but still available, and could be used as a 'spare element')
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.TimeDivider = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+  }
+});
+
+vjs.TimeDivider.prototype.createEl = function(){
+  return vjs.Component.prototype.createEl.call(this, 'div', {
+    className: 'vjs-time-divider',
+    innerHTML: '<div><span>/</span></div>'
+  });
+};
+
+/**
+ * Displays the time left in the video
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.RemainingTimeDisplay = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+
+    player.on('timeupdate', vjs.bind(this, this.updateContent));
+  }
+});
+
+vjs.RemainingTimeDisplay.prototype.createEl = function(){
+  var el = vjs.Component.prototype.createEl.call(this, 'div', {
+    className: 'vjs-remaining-time vjs-time-controls vjs-control'
+  });
+
+  this.content = vjs.createEl('div', {
+    className: 'vjs-remaining-time-display',
+    innerHTML: '<span class="vjs-control-text">Remaining Time </span>' + '-0:00', // label the remaining time for screen reader users
+    'aria-live': 'off' // tell screen readers not to automatically read the time as it changes
+  });
+
+  el.appendChild(vjs.createEl('div').appendChild(this.content));
+  return el;
+};
+
+vjs.RemainingTimeDisplay.prototype.updateContent = function(){
+  if (this.player_.duration()) {
+      if (this.player_.duration()) {
+          this.content.innerHTML = '<span class="vjs-control-text">Remaining Time </span>' + '-'+ vjs.formatTime(this.player_.remainingTime());
+      }
+  }
+
+  // Allows for smooth scrubbing, when player can't keep up.
+  // var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime();
+  // this.content.innerHTML = vjs.formatTime(time, this.player_.duration());
+};/**
+ * Toggle fullscreen video
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.FullscreenToggle = vjs.Button.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Button.call(this, player, options);
+  }
+});
+
+vjs.FullscreenToggle.prototype.buttonText = 'Fullscreen';
+
+vjs.FullscreenToggle.prototype.buildCSSClass = function(){
+  return 'vjs-fullscreen-control ' + vjs.Button.prototype.buildCSSClass.call(this);
+};
+
+vjs.FullscreenToggle.prototype.onClick = function(){
+  if (!this.player_.isFullScreen) {
+    this.player_.requestFullScreen();
+    this.el_.children[0].children[0].innerHTML = 'Non-Fullscreen'; // change the button text to "Non-Fullscreen"
+  } else {
+    this.player_.cancelFullScreen();
+    this.el_.children[0].children[0].innerHTML = 'Fullscreen'; // change the button to "Fullscreen"
+  }
+};/**
+ * Seek, Load Progress, and Play Progress
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.ProgressControl = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+  }
+});
+
+vjs.ProgressControl.prototype.options_ = {
+  children: {
+    'seekBar': {}
+  }
+};
+
+vjs.ProgressControl.prototype.createEl = function(){
+  return vjs.Component.prototype.createEl.call(this, 'div', {
+    className: 'vjs-progress-control vjs-control'
+  });
+};
+
+/**
+ * Seek Bar and holder for the progress bars
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.SeekBar = vjs.Slider.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Slider.call(this, player, options);
+    player.on('timeupdate', vjs.bind(this, this.updateARIAAttributes));
+    player.ready(vjs.bind(this, this.updateARIAAttributes));
+  }
+});
+
+vjs.SeekBar.prototype.options_ = {
+  children: {
+    'loadProgressBar': {},
+    'playProgressBar': {},
+    'seekHandle': {}
+  },
+  'barName': 'playProgressBar',
+  'handleName': 'seekHandle'
+};
+
+vjs.SeekBar.prototype.playerEvent = 'timeupdate';
+
+vjs.SeekBar.prototype.createEl = function(){
+  return vjs.Slider.prototype.createEl.call(this, 'div', {
+    className: 'vjs-progress-holder',
+    'aria-label': 'video progress bar'
+  });
+};
+
+vjs.SeekBar.prototype.updateARIAAttributes = function(){
+    // Allows for smooth scrubbing, when player can't keep up.
+    var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime();
+    this.el_.setAttribute('aria-valuenow',vjs.round(this.getPercent()*100, 2)); // machine readable value of progress bar (percentage complete)
+    this.el_.setAttribute('aria-valuetext',vjs.formatTime(time, this.player_.duration())); // human readable value of progress bar (time complete)
+};
+
+vjs.SeekBar.prototype.getPercent = function(){
+  return this.player_.currentTime() / this.player_.duration();
+};
+
+vjs.SeekBar.prototype.onMouseDown = function(event){
+  vjs.Slider.prototype.onMouseDown.call(this, event);
+
+  this.player_.scrubbing = true;
+
+  this.videoWasPlaying = !this.player_.paused();
+  this.player_.pause();
+};
+
+vjs.SeekBar.prototype.onMouseMove = function(event){
+  var newTime = this.calculateDistance(event) * this.player_.duration();
+
+  // Don't let video end while scrubbing.
+  if (newTime == this.player_.duration()) { newTime = newTime - 0.1; }
+
+  // Set new time (tell player to seek to new time)
+  this.player_.currentTime(newTime);
+};
+
+vjs.SeekBar.prototype.onMouseUp = function(event){
+  vjs.Slider.prototype.onMouseUp.call(this, event);
+
+  this.player_.scrubbing = false;
+  if (this.videoWasPlaying) {
+    this.player_.play();
+  }
+};
+
+vjs.SeekBar.prototype.stepForward = function(){
+  this.player_.currentTime(this.player_.currentTime() + 5); // more quickly fast forward for keyboard-only users
+};
+
+vjs.SeekBar.prototype.stepBack = function(){
+  this.player_.currentTime(this.player_.currentTime() - 5); // more quickly rewind for keyboard-only users
+};
+
+
+/**
+ * Shows load progres
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.LoadProgressBar = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+    player.on('progress', vjs.bind(this, this.update));
+  }
+});
+
+vjs.LoadProgressBar.prototype.createEl = function(){
+  return vjs.Component.prototype.createEl.call(this, 'div', {
+    className: 'vjs-load-progress',
+    innerHTML: '<span class="vjs-control-text">Loaded: 0%</span>'
+  });
+};
+
+vjs.LoadProgressBar.prototype.update = function(){
+  if (this.el_.style) { this.el_.style.width = vjs.round(this.player_.bufferedPercent() * 100, 2) + '%'; }
+};
+
+
+/**
+ * Shows play progress
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.PlayProgressBar = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+  }
+});
+
+vjs.PlayProgressBar.prototype.createEl = function(){
+  return vjs.Component.prototype.createEl.call(this, 'div', {
+    className: 'vjs-play-progress',
+    innerHTML: '<span class="vjs-control-text">Progress: 0%</span>'
+  });
+};
+
+/**
+ * SeekBar component includes play progress bar, and seek handle
+ * Needed so it can determine seek position based on handle position/size
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.SeekHandle = vjs.SliderHandle.extend();
+
+/** @inheritDoc */
+vjs.SeekHandle.prototype.defaultValue = '00:00';
+
+/** @inheritDoc */
+vjs.SeekHandle.prototype.createEl = function(){
+  return vjs.SliderHandle.prototype.createEl.call(this, 'div', {
+    className: 'vjs-seek-handle'
+  });
+};/**
+ * Control the volume
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.VolumeControl = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+
+    // hide volume controls when they're not supported by the current tech
+    if (player.tech && player.tech.features && player.tech.features.volumeControl === false) {
+      this.addClass('vjs-hidden');
+    }
+    player.on('loadstart', vjs.bind(this, function(){
+      if (player.tech.features && player.tech.features.volumeControl === false) {
+        this.addClass('vjs-hidden');
+      } else {
+        this.removeClass('vjs-hidden');
+      }
+    }));
+  }
+});
+
+vjs.VolumeControl.prototype.options_ = {
+  children: {
+    'volumeBar': {}
+  }
+};
+
+vjs.VolumeControl.prototype.createEl = function(){
+  return vjs.Component.prototype.createEl.call(this, 'div', {
+    className: 'vjs-volume-control vjs-control'
+  });
+};
+
+/**
+ * Contains volume level
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.VolumeBar = vjs.Slider.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Slider.call(this, player, options);
+    player.on('volumechange', vjs.bind(this, this.updateARIAAttributes));
+    player.ready(vjs.bind(this, this.updateARIAAttributes));
+    setTimeout(vjs.bind(this, this.update), 0); // update when elements is in DOM
+  }
+});
+
+vjs.VolumeBar.prototype.updateARIAAttributes = function(){
+  // Current value of volume bar as a percentage
+  this.el_.setAttribute('aria-valuenow',vjs.round(this.player_.volume()*100, 2));
+  this.el_.setAttribute('aria-valuetext',vjs.round(this.player_.volume()*100, 2)+'%');
+};
+
+vjs.VolumeBar.prototype.options_ = {
+  children: {
+    'volumeLevel': {},
+    'volumeHandle': {}
+  },
+  'barName': 'volumeLevel',
+  'handleName': 'volumeHandle'
+};
+
+vjs.VolumeBar.prototype.playerEvent = 'volumechange';
+
+vjs.VolumeBar.prototype.createEl = function(){
+  return vjs.Slider.prototype.createEl.call(this, 'div', {
+    className: 'vjs-volume-bar',
+    'aria-label': 'volume level'
+  });
+};
+
+vjs.VolumeBar.prototype.onMouseMove = function(event) {
+  this.player_.volume(this.calculateDistance(event));
+};
+
+vjs.VolumeBar.prototype.getPercent = function(){
+  if (this.player_.muted()) {
+    return 0;
+  } else {
+    return this.player_.volume();
+  }
+};
+
+vjs.VolumeBar.prototype.stepForward = function(){
+  this.player_.volume(this.player_.volume() + 0.1);
+};
+
+vjs.VolumeBar.prototype.stepBack = function(){
+  this.player_.volume(this.player_.volume() - 0.1);
+};
+
+/**
+ * Shows volume level
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.VolumeLevel = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+  }
+});
+
+vjs.VolumeLevel.prototype.createEl = function(){
+  return vjs.Component.prototype.createEl.call(this, 'div', {
+    className: 'vjs-volume-level',
+    innerHTML: '<span class="vjs-control-text"></span>'
+  });
+};
+
+/**
+ * Change volume level
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+ vjs.VolumeHandle = vjs.SliderHandle.extend();
+
+ /** @inheritDoc */
+ vjs.VolumeHandle.prototype.defaultValue = '00:00';
+
+ /** @inheritDoc */
+ vjs.VolumeHandle.prototype.createEl = function(){
+   return vjs.SliderHandle.prototype.createEl.call(this, 'div', {
+     className: 'vjs-volume-handle'
+   });
+ };/**
+ * Mute the audio
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.MuteToggle = vjs.Button.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Button.call(this, player, options);
+
+    player.on('volumechange', vjs.bind(this, this.update));
+
+    // hide mute toggle if the current tech doesn't support volume control
+    if (player.tech && player.tech.features && player.tech.features.volumeControl === false) {
+      this.addClass('vjs-hidden');
+    }
+    player.on('loadstart', vjs.bind(this, function(){
+      if (player.tech.features && player.tech.features.volumeControl === false) {
+        this.addClass('vjs-hidden');
+      } else {
+        this.removeClass('vjs-hidden');
+      }
+    }));
+  }
+});
+
+vjs.MuteToggle.prototype.createEl = function(){
+  return vjs.Button.prototype.createEl.call(this, 'div', {
+    className: 'vjs-mute-control vjs-control',
+    innerHTML: '<div><span class="vjs-control-text">Mute</span></div>'
+  });
+};
+
+vjs.MuteToggle.prototype.onClick = function(){
+  this.player_.muted( this.player_.muted() ? false : true );
+};
+
+vjs.MuteToggle.prototype.update = function(){
+  var vol = this.player_.volume(),
+      level = 3;
+
+  if (vol === 0 || this.player_.muted()) {
+    level = 0;
+  } else if (vol < 0.33) {
+    level = 1;
+  } else if (vol < 0.67) {
+    level = 2;
+  }
+
+  // Don't rewrite the button text if the actual text doesn't change.
+  // This causes unnecessary and confusing information for screen reader users.
+  // This check is needed because this function gets called every time the volume level is changed.
+  if(this.player_.muted()){
+      if(this.el_.children[0].children[0].innerHTML!='Unmute'){
+          this.el_.children[0].children[0].innerHTML = 'Unmute'; // change the button text to "Unmute"
+      }
+  } else {
+      if(this.el_.children[0].children[0].innerHTML!='Mute'){
+          this.el_.children[0].children[0].innerHTML = 'Mute'; // change the button text to "Mute"
+      }
+  }
+
+  /* TODO improve muted icon classes */
+  for (var i = 0; i < 4; i++) {
+    vjs.removeClass(this.el_, 'vjs-vol-'+i);
+  }
+  vjs.addClass(this.el_, 'vjs-vol-'+level);
+};/**
+ * Menu button with a popup for showing the volume slider.
+ * @constructor
+ */
+vjs.VolumeMenuButton = vjs.MenuButton.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.MenuButton.call(this, player, options);
+
+    // Same listeners as MuteToggle
+    player.on('volumechange', vjs.bind(this, this.update));
+
+    // hide mute toggle if the current tech doesn't support volume control
+    if (player.tech && player.tech.features && player.tech.features.volumeControl === false) {
+      this.addClass('vjs-hidden');
+    }
+    player.on('loadstart', vjs.bind(this, function(){
+      if (player.tech.features && player.tech.features.volumeControl === false) {
+        this.addClass('vjs-hidden');
+      } else {
+        this.removeClass('vjs-hidden');
+      }
+    }));
+    this.addClass('vjs-menu-button');
+  }
+});
+
+vjs.VolumeMenuButton.prototype.createMenu = function(){
+  var menu = new vjs.Menu(this.player_, {
+    contentElType: 'div'
+  });
+  var vc = new vjs.VolumeBar(this.player_, vjs.obj.merge({vertical: true}, this.options_.volumeBar));
+  menu.addChild(vc);
+  return menu;
+};
+
+vjs.VolumeMenuButton.prototype.onClick = function(){
+  vjs.MuteToggle.prototype.onClick.call(this);
+  vjs.MenuButton.prototype.onClick.call(this);
+};
+
+vjs.VolumeMenuButton.prototype.createEl = function(){
+  return vjs.Button.prototype.createEl.call(this, 'div', {
+    className: 'vjs-volume-menu-button vjs-menu-button vjs-control',
+    innerHTML: '<div><span class="vjs-control-text">Mute</span></div>'
+  });
+};
+vjs.VolumeMenuButton.prototype.update = vjs.MuteToggle.prototype.update;
+/* Poster Image
+================================================================================ */
+/**
+ * Poster image. Shows before the video plays.
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.PosterImage = vjs.Button.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Button.call(this, player, options);
+
+    if (!player.poster() || !player.controls()) {
+      this.hide();
+    }
+
+    player.on('play', vjs.bind(this, this.hide));
+  }
+});
+
+vjs.PosterImage.prototype.createEl = function(){
+  var el = vjs.createEl('div', {
+        className: 'vjs-poster',
+
+        // Don't want poster to be tabbable.
+        tabIndex: -1
+      }),
+      poster = this.player_.poster();
+
+  if (poster) {
+    if ('backgroundSize' in el.style) {
+      el.style.backgroundImage = 'url("' + poster + '")';
+    } else {
+      el.appendChild(vjs.createEl('img', { src: poster }));
+    }
+  }
+
+  return el;
+};
+
+vjs.PosterImage.prototype.onClick = function(){
+  this.player_.play();
+};
+/* Loading Spinner
+================================================================================ */
+/**
+ * Loading spinner for waiting events
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.LoadingSpinner = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+
+    player.on('canplay', vjs.bind(this, this.hide));
+    player.on('canplaythrough', vjs.bind(this, this.hide));
+    player.on('playing', vjs.bind(this, this.hide));
+    player.on('seeked', vjs.bind(this, this.hide));
+
+    player.on('seeking', vjs.bind(this, this.show));
+
+    // in some browsers seeking does not trigger the 'playing' event,
+    // so we also need to trap 'seeked' if we are going to set a
+    // 'seeking' event
+    player.on('seeked', vjs.bind(this, this.hide));
+
+    player.on('error', vjs.bind(this, this.show));
+
+    // Not showing spinner on stalled any more. Browsers may stall and then not trigger any events that would remove the spinner.
+    // Checked in Chrome 16 and Safari 5.1.2. http://help.videojs.com/discussions/problems/883-why-is-the-download-progress-showing
+    // player.on('stalled', vjs.bind(this, this.show));
+
+    player.on('waiting', vjs.bind(this, this.show));
+  }
+});
+
+vjs.LoadingSpinner.prototype.createEl = function(){
+  return vjs.Component.prototype.createEl.call(this, 'div', {
+    className: 'vjs-loading-spinner'
+  });
+};
+/* Big Play Button
+================================================================================ */
+/**
+ * Initial play button. Shows before the video has played.
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.BigPlayButton = vjs.Button.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Button.call(this, player, options);
+
+    if (!player.controls()) {
+      this.hide();
+    }
+
+    player.on('play', vjs.bind(this, this.hide));
+    // player.on('ended', vjs.bind(this, this.show));
+  }
+});
+
+vjs.BigPlayButton.prototype.createEl = function(){
+  return vjs.Button.prototype.createEl.call(this, 'div', {
+    className: 'vjs-big-play-button',
+    innerHTML: '<span></span>',
+    'aria-label': 'play video'
+  });
+};
+
+vjs.BigPlayButton.prototype.onClick = function(){
+  // Go back to the beginning if big play button is showing at the end.
+  // Have to check for current time otherwise it might throw a 'not ready' error.
+  //if(this.player_.currentTime()) {
+    //this.player_.currentTime(0);
+  //}
+  this.player_.play();
+};
+/**
+ * @fileoverview Media Technology Controller - Base class for media playback technology controllers like Flash and HTML5
+ */
+
+/**
+ * Base class for media (HTML5 Video, Flash) controllers
+ * @param {vjs.Player|Object} player  Central player instance
+ * @param {Object=} options Options object
+ * @constructor
+ */
+vjs.MediaTechController = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options, ready){
+    vjs.Component.call(this, player, options, ready);
+
+    // Make playback element clickable
+    // this.addEvent('click', this.proxy(this.onClick));
+
+    // player.triggerEvent('techready');
+  }
+});
+
+// destroy: function(){},
+// createElement: function(){},
+
+/**
+ * Handle a click on the media element. By default will play the media.
+ *
+ * On android browsers, having this toggle play state interferes with being
+ * able to toggle the controls and toggling play state with the play button
+ */
+vjs.MediaTechController.prototype.onClick = (function(){
+  if (vjs.IS_ANDROID) {
+    return function () {};
+  } else {
+    return function () {
+      if (this.player_.controls()) {
+        if (this.player_.paused()) {
+          this.player_.play();
+        } else {
+          this.player_.pause();
+        }
+      }
+    };
+  }
+})();
+
+vjs.MediaTechController.prototype.features = {
+  volumeControl: true,
+
+  // Resizing plugins using request fullscreen reloads the plugin
+  fullscreenResize: false,
+
+  // Optional events that we can manually mimic with timers
+  // currently not triggered by video-js-swf
+  progressEvents: false,
+  timeupdateEvents: false
+};
+
+vjs.media = {};
+
+/**
+ * List of default API methods for any MediaTechController
+ * @type {String}
+ */
+vjs.media.ApiMethods = 'play,pause,paused,currentTime,setCurrentTime,duration,buffered,volume,setVolume,muted,setMuted,width,height,supportsFullScreen,enterFullScreen,src,load,currentSrc,preload,setPreload,autoplay,setAutoplay,loop,setLoop,error,networkState,readyState,seeking,initialTime,startOffsetTime,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks,defaultPlaybackRate,playbackRate,mediaGroup,controller,controls,defaultMuted'.split(',');
+// Create placeholder methods for each that warn when a method isn't supported by the current playback technology
+
+function createMethod(methodName){
+  return function(){
+    throw new Error('The "'+methodName+'" method is not available on the playback technology\'s API');
+  };
+}
+
+for (var i = vjs.media.ApiMethods.length - 1; i >= 0; i--) {
+  var methodName = vjs.media.ApiMethods[i];
+  vjs.MediaTechController.prototype[vjs.media.ApiMethods[i]] = createMethod(methodName);
+}
+/**
+ * @fileoverview HTML5 Media Controller - Wrapper for HTML5 Media API
+ */
+
+/**
+ * HTML5 Media Controller - Wrapper for HTML5 Media API
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @param {Function=} ready
+ * @constructor
+ */
+vjs.Html5 = vjs.MediaTechController.extend({
+  /** @constructor */
+  init: function(player, options, ready){
+    // volume cannot be changed from 1 on iOS
+    this.features.volumeControl = vjs.Html5.canControlVolume();
+
+    // In iOS, if you move a video element in the DOM, it breaks video playback.
+    this.features.movingMediaElementInDOM = !vjs.IS_IOS;
+
+    // HTML video is able to automatically resize when going to fullscreen
+    this.features.fullscreenResize = true;
+
+    vjs.MediaTechController.call(this, player, options, ready);
+
+    var source = options['source'];
+
+    // If the element source is already set, we may have missed the loadstart event, and want to trigger it.
+    // We don't want to set the source again and interrupt playback.
+    if (source && this.el_.currentSrc == source.src) {
+      player.trigger('loadstart');
+
+    // Otherwise set the source if one was provided.
+    } else if (source) {
+      this.el_.src = source.src;
+    }
+
+    // Chrome and Safari both have issues with autoplay.
+    // In Safari (5.1.1), when we move the video element into the container div, autoplay doesn't work.
+    // In Chrome (15), if you have autoplay + a poster + no controls, the video gets hidden (but audio plays)
+    // This fixes both issues. Need to wait for API, so it updates displays correctly
+    player.ready(function(){
+      if (this.options_['autoplay'] && this.paused()) {
+        this.tag.poster = null; // Chrome Fix. Fixed in Chrome v16.
+        this.play();
+      }
+    });
+
+    this.on('click', this.onClick);
+
+    this.setupTriggers();
+
+    this.triggerReady();
+  }
+});
+
+vjs.Html5.prototype.dispose = function(){
+  vjs.MediaTechController.prototype.dispose.call(this);
+};
+
+vjs.Html5.prototype.createEl = function(){
+  var player = this.player_,
+      // If possible, reuse original tag for HTML5 playback technology element
+      el = player.tag,
+      newEl;
+
+  // Check if this browser supports moving the element into the box.
+  // On the iPhone video will break if you move the element,
+  // So we have to create a brand new element.
+  if (!el || this.features.movingMediaElementInDOM === false) {
+
+    // If the original tag is still there, remove it.
+    if (el) {
+      player.el().removeChild(el);
+      el = el.cloneNode(false);
+    } else {
+      el = vjs.createEl('video', {
+        id:player.id() + '_html5_api',
+        className:'vjs-tech'
+      });
+    }
+    // associate the player with the new tag
+    el['player'] = player;
+
+    vjs.insertFirst(el, player.el());
+  }
+
+  // Update specific tag settings, in case they were overridden
+  var attrs = ['autoplay','preload','loop','muted'];
+  for (var i = attrs.length - 1; i >= 0; i--) {
+    var attr = attrs[i];
+    if (player.options_[attr] !== null) {
+      el[attr] = player.options_[attr];
+    }
+  }
+
+  return el;
+  // jenniisawesome = true;
+};
+
+// Make video events trigger player events
+// May seem verbose here, but makes other APIs possible.
+vjs.Html5.prototype.setupTriggers = function(){
+  for (var i = vjs.Html5.Events.length - 1; i >= 0; i--) {
+    vjs.on(this.el_, vjs.Html5.Events[i], vjs.bind(this.player_, this.eventHandler));
+  }
+};
+// Triggers removed using this.off when disposed
+
+vjs.Html5.prototype.eventHandler = function(e){
+  this.trigger(e);
+
+  // No need for media events to bubble up.
+  e.stopPropagation();
+};
+
+
+vjs.Html5.prototype.play = function(){ this.el_.play(); };
+vjs.Html5.prototype.pause = function(){ this.el_.pause(); };
+vjs.Html5.prototype.paused = function(){ return this.el_.paused; };
+
+vjs.Html5.prototype.currentTime = function(){ return this.el_.currentTime; };
+vjs.Html5.prototype.setCurrentTime = function(seconds){
+  try {
+    this.el_.currentTime = seconds;
+  } catch(e) {
+    vjs.log(e, 'Video is not ready. (Video.js)');
+    // this.warning(VideoJS.warnings.videoNotReady);
+  }
+};
+
+vjs.Html5.prototype.duration = function(){ return this.el_.duration || 0; };
+vjs.Html5.prototype.buffered = function(){ return this.el_.buffered; };
+
+vjs.Html5.prototype.volume = function(){ return this.el_.volume; };
+vjs.Html5.prototype.setVolume = function(percentAsDecimal){ this.el_.volume = percentAsDecimal; };
+vjs.Html5.prototype.muted = function(){ return this.el_.muted; };
+vjs.Html5.prototype.setMuted = function(muted){ this.el_.muted = muted; };
+
+vjs.Html5.prototype.width = function(){ return this.el_.offsetWidth; };
+vjs.Html5.prototype.height = function(){ return this.el_.offsetHeight; };
+
+vjs.Html5.prototype.supportsFullScreen = function(){
+  if (typeof this.el_.webkitEnterFullScreen == 'function') {
+
+    // Seems to be broken in Chromium/Chrome && Safari in Leopard
+    if (/Android/.test(vjs.USER_AGENT) || !/Chrome|Mac OS X 10.5/.test(vjs.USER_AGENT)) {
+      return true;
+    }
+  }
+  return false;
+};
+
+vjs.Html5.prototype.enterFullScreen = function(){
+  var video = this.el_;
+  if (video.paused && video.networkState <= video.HAVE_METADATA) {
+    // attempt to prime the video element for programmatic access
+    // this isn't necessary on the desktop but shouldn't hurt
+    this.el_.play();
+
+    // playing and pausing synchronously during the transition to fullscreen
+    // can get iOS ~6.1 devices into a play/pause loop
+    setTimeout(function(){
+      video.pause();
+      video.webkitEnterFullScreen();
+    }, 0);
+  } else {
+    video.webkitEnterFullScreen();
+  }
+};
+vjs.Html5.prototype.exitFullScreen = function(){
+  this.el_.webkitExitFullScreen();
+};
+vjs.Html5.prototype.src = function(src){ this.el_.src = src; };
+vjs.Html5.prototype.load = function(){ this.el_.load(); };
+vjs.Html5.prototype.currentSrc = function(){ return this.el_.currentSrc; };
+
+vjs.Html5.prototype.preload = function(){ return this.el_.preload; };
+vjs.Html5.prototype.setPreload = function(val){ this.el_.preload = val; };
+vjs.Html5.prototype.autoplay = function(){ return this.el_.autoplay; };
+vjs.Html5.prototype.setAutoplay = function(val){ this.el_.autoplay = val; };
+vjs.Html5.prototype.loop = function(){ return this.el_.loop; };
+vjs.Html5.prototype.setLoop = function(val){ this.el_.loop = val; };
+
+vjs.Html5.prototype.error = function(){ return this.el_.error; };
+  // networkState: function(){ return this.el_.networkState; },
+  // readyState: function(){ return this.el_.readyState; },
+vjs.Html5.prototype.seeking = function(){ return this.el_.seeking; };
+  // initialTime: function(){ return this.el_.initialTime; },
+  // startOffsetTime: function(){ return this.el_.startOffsetTime; },
+  // played: function(){ return this.el_.played; },
+  // seekable: function(){ return this.el_.seekable; },
+vjs.Html5.prototype.ended = function(){ return this.el_.ended; };
+  // videoTracks: function(){ return this.el_.videoTracks; },
+  // audioTracks: function(){ return this.el_.audioTracks; },
+  // videoWidth: function(){ return this.el_.videoWidth; },
+  // videoHeight: function(){ return this.el_.videoHeight; },
+  // textTracks: function(){ return this.el_.textTracks; },
+  // defaultPlaybackRate: function(){ return this.el_.defaultPlaybackRate; },
+  // playbackRate: function(){ return this.el_.playbackRate; },
+  // mediaGroup: function(){ return this.el_.mediaGroup; },
+  // controller: function(){ return this.el_.controller; },
+vjs.Html5.prototype.defaultMuted = function(){ return this.el_.defaultMuted; };
+
+/* HTML5 Support Testing ---------------------------------------------------- */
+
+vjs.Html5.isSupported = function(){
+  return !!document.createElement('video').canPlayType;
+};
+
+vjs.Html5.canPlaySource = function(srcObj){
+  return !!document.createElement('video').canPlayType(srcObj.type);
+  // TODO: Check Type
+  // If no Type, check ext
+  // Check Media Type
+};
+
+vjs.Html5.canControlVolume = function(){
+  var volume =  vjs.TEST_VID.volume;
+  vjs.TEST_VID.volume = (volume / 2) + 0.1;
+  return volume !== vjs.TEST_VID.volume;
+};
+
+// List of all HTML5 events (various uses).
+vjs.Html5.Events = 'loadstart,suspend,abort,error,emptied,stalled,loadedmetadata,loadeddata,canplay,canplaythrough,playing,waiting,seeking,seeked,ended,durationchange,timeupdate,progress,play,pause,ratechange,volumechange'.split(',');
+
+
+// HTML5 Feature detection and Device Fixes --------------------------------- //
+
+// Android
+if (vjs.IS_ANDROID) {
+
+  // Override Android 2.2 and less canPlayType method which is broken
+  if (vjs.ANDROID_VERSION < 3) {
+    document.createElement('video').constructor.prototype.canPlayType = function(type){
+      return (type && type.toLowerCase().indexOf('video/mp4') != -1) ? 'maybe' : '';
+    };
+  }
+}
+/**
+ * @fileoverview VideoJS-SWF - Custom Flash Player with HTML5-ish API
+ * https://github.com/zencoder/video-js-swf
+ * Not using setupTriggers. Using global onEvent func to distribute events
+ */
+
+/**
+ * HTML5 Media Controller - Wrapper for HTML5 Media API
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @param {Function=} ready
+ * @constructor
+ */
+vjs.Flash = vjs.MediaTechController.extend({
+  /** @constructor */
+  init: function(player, options, ready){
+    vjs.MediaTechController.call(this, player, options, ready);
+
+    var source = options['source'],
+
+        // Which element to embed in
+        parentEl = options['parentEl'],
+
+        // Create a temporary element to be replaced by swf object
+        placeHolder = this.el_ = vjs.createEl('div', { id: player.id() + '_temp_flash' }),
+
+        // Generate ID for swf object
+        objId = player.id()+'_flash_api',
+
+        // Store player options in local var for optimization
+        // TODO: switch to using player methods instead of options
+        // e.g. player.autoplay();
+        playerOptions = player.options_,
+
+        // Merge default flashvars with ones passed in to init
+        flashVars = vjs.obj.merge({
+
+          // SWF Callback Functions
+          'readyFunction': 'videojs.Flash.onReady',
+          'eventProxyFunction': 'videojs.Flash.onEvent',
+          'errorEventProxyFunction': 'videojs.Flash.onError',
+
+          // Player Settings
+          'autoplay': playerOptions.autoplay,
+          'preload': playerOptions.preload,
+          'loop': playerOptions.loop,
+          'muted': playerOptions.muted
+
+        }, options['flashVars']),
+
+        // Merge default parames with ones passed in
+        params = vjs.obj.merge({
+          'wmode': 'opaque', // Opaque is needed to overlay controls, but can affect playback performance
+          'bgcolor': '#000000' // Using bgcolor prevents a white flash when the object is loading
+        }, options['params']),
+
+        // Merge default attributes with ones passed in
+        attributes = vjs.obj.merge({
+          'id': objId,
+          'name': objId, // Both ID and Name needed or swf to identifty itself
+          'class': 'vjs-tech'
+        }, options['attributes'])
+    ;
+
+    // If source was supplied pass as a flash var.
+    if (source) {
+      flashVars['src'] = encodeURIComponent(vjs.getAbsoluteURL(source.src));
+    }
+
+    // Add placeholder to player div
+    vjs.insertFirst(placeHolder, parentEl);
+
+    // Having issues with Flash reloading on certain page actions (hide/resize/fullscreen) in certain browsers
+    // This allows resetting the playhead when we catch the reload
+    if (options['startTime']) {
+      this.ready(function(){
+        this.load();
+        this.play();
+        this.currentTime(options['startTime']);
+      });
+    }
+
+    // Flash iFrame Mode
+    // In web browsers there are multiple instances where changing the parent element or visibility of a plugin causes the plugin to reload.
+    // - Firefox just about always. https://bugzilla.mozilla.org/show_bug.cgi?id=90268 (might be fixed by version 13)
+    // - Webkit when hiding the plugin
+    // - Webkit and Firefox when using requestFullScreen on a parent element
+    // Loading the flash plugin into a dynamically generated iFrame gets around most of these issues.
+    // Issues that remain include hiding the element and requestFullScreen in Firefox specifically
+
+    // There's on particularly annoying issue with this method which is that Firefox throws a security error on an offsite Flash object loaded into a dynamically created iFrame.
+    // Even though the iframe was inserted into a page on the web, Firefox + Flash considers it a local app trying to access an internet file.
+    // I tried mulitple ways of setting the iframe src attribute but couldn't find a src that worked well. Tried a real/fake source, in/out of domain.
+    // Also tried a method from stackoverflow that caused a security error in all browsers. http://stackoverflow.com/questions/2486901/how-to-set-document-domain-for-a-dynamically-generated-iframe
+    // In the end the solution I found to work was setting the iframe window.location.href right before doing a document.write of the Flash object.
+    // The only downside of this it seems to trigger another http request to the original page (no matter what's put in the href). Not sure why that is.
+
+    // NOTE (2012-01-29): Cannot get Firefox to load the remote hosted SWF into a dynamically created iFrame
+    // Firefox 9 throws a security error, unleess you call location.href right before doc.write.
+    //    Not sure why that even works, but it causes the browser to look like it's continuously trying to load the page.
+    // Firefox 3.6 keeps calling the iframe onload function anytime I write to it, causing an endless loop.
+
+    if (options['iFrameMode'] === true && !vjs.IS_FIREFOX) {
+
+      // Create iFrame with vjs-tech class so it's 100% width/height
+      var iFrm = vjs.createEl('iframe', {
+        'id': objId + '_iframe',
+        'name': objId + '_iframe',
+        'className': 'vjs-tech',
+        'scrolling': 'no',
+        'marginWidth': 0,
+        'marginHeight': 0,
+        'frameBorder': 0
+      });
+
+      // Update ready function names in flash vars for iframe window
+      flashVars['readyFunction'] = 'ready';
+      flashVars['eventProxyFunction'] = 'events';
+      flashVars['errorEventProxyFunction'] = 'errors';
+
+      // Tried multiple methods to get this to work in all browsers
+
+      // Tried embedding the flash object in the page first, and then adding a place holder to the iframe, then replacing the placeholder with the page object.
+      // The goal here was to try to load the swf URL in the parent page first and hope that got around the firefox security error
+      // var newObj = vjs.Flash.embed(options['swf'], placeHolder, flashVars, params, attributes);
+      // (in onload)
+      //  var temp = vjs.createEl('a', { id:'asdf', innerHTML: 'asdf' } );
+      //  iDoc.body.appendChild(temp);
+
+      // Tried embedding the flash object through javascript in the iframe source.
+      // This works in webkit but still triggers the firefox security error
+      // iFrm.src = 'javascript: document.write('"+vjs.Flash.getEmbedCode(options['swf'], flashVars, params, attributes)+"');";
+
+      // Tried an actual local iframe just to make sure that works, but it kills the easiness of the CDN version if you require the user to host an iframe
+      // We should add an option to host the iframe locally though, because it could help a lot of issues.
+      // iFrm.src = "iframe.html";
+
+      // Wait until iFrame has loaded to write into it.
+      vjs.on(iFrm, 'load', vjs.bind(this, function(){
+
+        var iDoc,
+            iWin = iFrm.contentWindow;
+
+        // The one working method I found was to use the iframe's document.write() to create the swf object
+        // This got around the security issue in all browsers except firefox.
+        // I did find a hack where if I call the iframe's window.location.href='', it would get around the security error
+        // However, the main page would look like it was loading indefinitely (URL bar loading spinner would never stop)
+        // Plus Firefox 3.6 didn't work no matter what I tried.
+        // if (vjs.USER_AGENT.match('Firefox')) {
+        //   iWin.location.href = '';
+        // }
+
+        // Get the iFrame's document depending on what the browser supports
+        iDoc = iFrm.contentDocument ? iFrm.contentDocument : iFrm.contentWindow.document;
+
+        // Tried ensuring both document domains were the same, but they already were, so that wasn't the issue.
+        // Even tried adding /. that was mentioned in a browser security writeup
+        // document.domain = document.domain+'/.';
+        // iDoc.domain = document.domain+'/.';
+
+        // Tried adding the object to the iframe doc's innerHTML. Security error in all browsers.
+        // iDoc.body.innerHTML = swfObjectHTML;
+
+        // Tried appending the object to the iframe doc's body. Security error in all browsers.
+        // iDoc.body.appendChild(swfObject);
+
+        // Using document.write actually got around the security error that browsers were throwing.
+        // Again, it's a dynamically generated (same domain) iframe, loading an external Flash swf.
+        // Not sure why that's a security issue, but apparently it is.
+        iDoc.write(vjs.Flash.getEmbedCode(options['swf'], flashVars, params, attributes));
+
+        // Setting variables on the window needs to come after the doc write because otherwise they can get reset in some browsers
+        // So far no issues with swf ready event being called before it's set on the window.
+        iWin['player'] = this.player_;
+
+        // Create swf ready function for iFrame window
+        iWin['ready'] = vjs.bind(this.player_, function(currSwf){
+          var el = iDoc.getElementById(currSwf),
+              player = this,
+              tech = player.tech;
+
+          // Update reference to playback technology element
+          tech.el_ = el;
+
+          // Now that the element is ready, make a click on the swf play the video
+          vjs.on(el, 'click', tech.bind(tech.onClick));
+
+          // Make sure swf is actually ready. Sometimes the API isn't actually yet.
+          vjs.Flash.checkReady(tech);
+        });
+
+        // Create event listener for all swf events
+        iWin['events'] = vjs.bind(this.player_, function(swfID, eventName){
+          var player = this;
+          if (player && player.techName === 'flash') {
+            player.trigger(eventName);
+          }
+        });
+
+        // Create error listener for all swf errors
+        iWin['errors'] = vjs.bind(this.player_, function(swfID, eventName){
+          vjs.log('Flash Error', eventName);
+        });
+
+      }));
+
+      // Replace placeholder with iFrame (it will load now)
+      placeHolder.parentNode.replaceChild(iFrm, placeHolder);
+
+    // If not using iFrame mode, embed as normal object
+    } else {
+      vjs.Flash.embed(options['swf'], placeHolder, flashVars, params, attributes);
+    }
+  }
+});
+
+vjs.Flash.prototype.dispose = function(){
+  vjs.MediaTechController.prototype.dispose.call(this);
+};
+
+vjs.Flash.prototype.play = function(){
+  this.el_.vjs_play();
+};
+
+vjs.Flash.prototype.pause = function(){
+  this.el_.vjs_pause();
+};
+
+vjs.Flash.prototype.src = function(src){
+  // Make sure source URL is abosolute.
+  src = vjs.getAbsoluteURL(src);
+
+  this.el_.vjs_src(src);
+
+  // Currently the SWF doesn't autoplay if you load a source later.
+  // e.g. Load player w/ no source, wait 2s, set src.
+  if (this.player_.autoplay()) {
+    var tech = this;
+    setTimeout(function(){ tech.play(); }, 0);
+  }
+};
+
+vjs.Flash.prototype.load = function(){
+  this.el_.vjs_load();
+};
+
+vjs.Flash.prototype.poster = function(){
+  this.el_.vjs_getProperty('poster');
+};
+
+vjs.Flash.prototype.buffered = function(){
+  return vjs.createTimeRange(0, this.el_.vjs_getProperty('buffered'));
+};
+
+vjs.Flash.prototype.supportsFullScreen = function(){
+  return false; // Flash does not allow fullscreen through javascript
+};
+
+vjs.Flash.prototype.enterFullScreen = function(){
+  return false;
+};
+
+
+// Create setters and getters for attributes
+var api = vjs.Flash.prototype,
+    readWrite = 'preload,currentTime,defaultPlaybackRate,playbackRate,autoplay,loop,mediaGroup,controller,controls,volume,muted,defaultMuted'.split(','),
+    readOnly = 'error,currentSrc,networkState,readyState,seeking,initialTime,duration,startOffsetTime,paused,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks'.split(',');
+    // Overridden: buffered
+
+/**
+ * @this {*}
+ */
+var createSetter = function(attr){
+  var attrUpper = attr.charAt(0).toUpperCase() + attr.slice(1);
+  api['set'+attrUpper] = function(val){ return this.el_.vjs_setProperty(attr, val); };
+};
+
+/**
+ * @this {*}
+ */
+var createGetter = function(attr){
+  api[attr] = function(){ return this.el_.vjs_getProperty(attr); };
+};
+
+(function(){
+  var i;
+  // Create getter and setters for all read/write attributes
+  for (i = 0; i < readWrite.length; i++) {
+    createGetter(readWrite[i]);
+    createSetter(readWrite[i]);
+  }
+
+  // Create getters for read-only attributes
+  for (i = 0; i < readOnly.length; i++) {
+    createGetter(readOnly[i]);
+  }
+})();
+
+/* Flash Support Testing -------------------------------------------------------- */
+
+vjs.Flash.isSupported = function(){
+  return vjs.Flash.version()[0] >= 10;
+  // return swfobject.hasFlashPlayerVersion('10');
+};
+
+vjs.Flash.canPlaySource = function(srcObj){
+  if (srcObj.type in vjs.Flash.formats) { return 'maybe'; }
+};
+
+vjs.Flash.formats = {
+  'video/flv': 'FLV',
+  'video/x-flv': 'FLV',
+  'video/mp4': 'MP4',
+  'video/m4v': 'MP4'
+};
+
+vjs.Flash['onReady'] = function(currSwf){
+  var el = vjs.el(currSwf);
+
+  // Get player from box
+  // On firefox reloads, el might already have a player
+  var player = el['player'] || el.parentNode['player'],
+      tech = player.tech;
+
+  // Reference player on tech element
+  el['player'] = player;
+
+  // Update reference to playback technology element
+  tech.el_ = el;
+
+  // Now that the element is ready, make a click on the swf play the video
+  tech.on('click', tech.onClick);
+
+  vjs.Flash.checkReady(tech);
+};
+
+// The SWF isn't alwasy ready when it says it is. Sometimes the API functions still need to be added to the object.
+// If it's not ready, we set a timeout to check again shortly.
+vjs.Flash.checkReady = function(tech){
+
+  // Check if API property exists
+  if (tech.el().vjs_getProperty) {
+
+    // If so, tell tech it's ready
+    tech.triggerReady();
+
+  // Otherwise wait longer.
+  } else {
+
+    setTimeout(function(){
+      vjs.Flash.checkReady(tech);
+    }, 50);
+
+  }
+};
+
+// Trigger events from the swf on the player
+vjs.Flash['onEvent'] = function(swfID, eventName){
+  var player = vjs.el(swfID)['player'];
+  player.trigger(eventName);
+};
+
+// Log errors from the swf
+vjs.Flash['onError'] = function(swfID, err){
+  var player = vjs.el(swfID)['player'];
+  player.trigger('error');
+  vjs.log('Flash Error', err, swfID);
+};
+
+// Flash Version Check
+vjs.Flash.version = function(){
+  var version = '0,0,0';
+
+  // IE
+  try {
+    version = new window.ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version').replace(/\D+/g, ',').match(/^,?(.+),?$/)[1];
+
+  // other browsers
+  } catch(e) {
+    try {
+      if (navigator.mimeTypes['application/x-shockwave-flash'].enabledPlugin){
+        version = (navigator.plugins['Shockwave Flash 2.0'] || navigator.plugins['Shockwave Flash']).description.replace(/\D+/g, ',').match(/^,?(.+),?$/)[1];
+      }
+    } catch(err) {}
+  }
+  return version.split(',');
+};
+
+// Flash embedding method. Only used in non-iframe mode
+vjs.Flash.embed = function(swf, placeHolder, flashVars, params, attributes){
+  var code = vjs.Flash.getEmbedCode(swf, flashVars, params, attributes),
+
+      // Get element by embedding code and retrieving created element
+      obj = vjs.createEl('div', { innerHTML: code }).childNodes[0],
+
+      par = placeHolder.parentNode
+  ;
+
+  placeHolder.parentNode.replaceChild(obj, placeHolder);
+
+  // IE6 seems to have an issue where it won't initialize the swf object after injecting it.
+  // This is a dumb fix
+  var newObj = par.childNodes[0];
+  setTimeout(function(){
+    newObj.style.display = 'block';
+  }, 1000);
+
+  return obj;
+
+};
+
+vjs.Flash.getEmbedCode = function(swf, flashVars, params, attributes){
+
+  var objTag = '<object type="application/x-shockwave-flash"',
+      flashVarsString = '',
+      paramsString = '',
+      attrsString = '';
+
+  // Convert flash vars to string
+  if (flashVars) {
+    vjs.obj.each(flashVars, function(key, val){
+      flashVarsString += (key + '=' + val + '&amp;');
+    });
+  }
+
+  // Add swf, flashVars, and other default params
+  params = vjs.obj.merge({
+    'movie': swf,
+    'flashvars': flashVarsString,
+    'allowScriptAccess': 'always', // Required to talk to swf
+    'allowNetworking': 'all' // All should be default, but having security issues.
+  }, params);
+
+  // Create param tags string
+  vjs.obj.each(params, function(key, val){
+    paramsString += '<param name="'+key+'" value="'+val+'" />';
+  });
+
+  attributes = vjs.obj.merge({
+    // Add swf to attributes (need both for IE and Others to work)
+    'data': swf,
+
+    // Default to 100% width/height
+    'width': '100%',
+    'height': '100%'
+
+  }, attributes);
+
+  // Create Attributes string
+  vjs.obj.each(attributes, function(key, val){
+    attrsString += (key + '="' + val + '" ');
+  });
+
+  return objTag + attrsString + '>' + paramsString + '</object>';
+};
+/**
+ * @constructor
+ */
+vjs.MediaLoader = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options, ready){
+    vjs.Component.call(this, player, options, ready);
+
+    // If there are no sources when the player is initialized,
+    // load the first supported playback technology.
+    if (!player.options_['sources'] || player.options_['sources'].length === 0) {
+      for (var i=0,j=player.options_['techOrder']; i<j.length; i++) {
+        var techName = vjs.capitalize(j[i]),
+            tech = window['videojs'][techName];
+
+        // Check if the browser supports this technology
+        if (tech && tech.isSupported()) {
+          player.loadTech(techName);
+          break;
+        }
+      }
+    } else {
+      // // Loop through playback technologies (HTML5, Flash) and check for support.
+      // // Then load the best source.
+      // // A few assumptions here:
+      // //   All playback technologies respect preload false.
+      player.src(player.options_['sources']);
+    }
+  }
+});/**
+ * @fileoverview Text Tracks
+ * Text tracks are tracks of timed text events.
+ * Captions - text displayed over the video for the hearing impared
+ * Subtitles - text displayed over the video for those who don't understand langauge in the video
+ * Chapters - text displayed in a menu allowing the user to jump to particular points (chapters) in the video
+ * Descriptions (not supported yet) - audio descriptions that are read back to the user by a screen reading device
+ */
+
+// Player Additions - Functions add to the player object for easier access to tracks
+
+/**
+ * List of associated text tracks
+ * @type {Array}
+ * @private
+ */
+vjs.Player.prototype.textTracks_;
+
+/**
+ * Get an array of associated text tracks. captions, subtitles, chapters, descriptions
+ * http://www.w3.org/html/wg/drafts/html/master/embedded-content-0.html#dom-media-texttracks
+ * @return {Array}           Array of track objects
+ */
+vjs.Player.prototype.textTracks = function(){
+  this.textTracks_ = this.textTracks_ || [];
+  return this.textTracks_;
+};
+
+/**
+ * Add a text track
+ * In addition to the W3C settings we allow adding additional info through options.
+ * http://www.w3.org/html/wg/drafts/html/master/embedded-content-0.html#dom-media-addtexttrack
+ * @param {String}  kind        Captions, subtitles, chapters, descriptions, or metadata
+ * @param {String=} label       Optional label
+ * @param {String=} language    Optional language
+ * @param {Object=} options     Additional track options, like src
+ */
+vjs.Player.prototype.addTextTrack = function(kind, label, language, options){
+  var tracks = this.textTracks_ = this.textTracks_ || [];
+  options = options || {};
+
+  options['kind'] = kind;
+  options['label'] = label;
+  options['language'] = language;
+
+  // HTML5 Spec says default to subtitles.
+  // Uppercase first letter to match class names
+  var Kind = vjs.capitalize(kind || 'subtitles');
+
+  // Create correct texttrack class. CaptionsTrack, etc.
+  var track = new window['videojs'][Kind + 'Track'](this, options);
+
+  tracks.push(track);
+
+  // If track.dflt() is set, start showing immediately
+  // TODO: Add a process to deterime the best track to show for the specific kind
+  // Incase there are mulitple defaulted tracks of the same kind
+  // Or the user has a set preference of a specific language that should override the default
+  // if (track.dflt()) {
+  //   this.ready(vjs.bind(track, track.show));
+  // }
+
+  return track;
+};
+
+/**
+ * Add an array of text tracks. captions, subtitles, chapters, descriptions
+ * Track objects will be stored in the player.textTracks() array
+ * @param {Array} trackList Array of track elements or objects (fake track elements)
+ */
+vjs.Player.prototype.addTextTracks = function(trackList){
+  var trackObj;
+
+  for (var i = 0; i < trackList.length; i++) {
+    trackObj = trackList[i];
+    this.addTextTrack(trackObj['kind'], trackObj['label'], trackObj['language'], trackObj);
+  }
+
+  return this;
+};
+
+// Show a text track
+// disableSameKind: disable all other tracks of the same kind. Value should be a track kind (captions, etc.)
+vjs.Player.prototype.showTextTrack = function(id, disableSameKind){
+  var tracks = this.textTracks_,
+      i = 0,
+      j = tracks.length,
+      track, showTrack, kind;
+
+  // Find Track with same ID
+  for (;i<j;i++) {
+    track = tracks[i];
+    if (track.id() === id) {
+      track.show();
+      showTrack = track;
+
+    // Disable tracks of the same kind
+    } else if (disableSameKind && track.kind() == disableSameKind && track.mode() > 0) {
+      track.disable();
+    }
+  }
+
+  // Get track kind from shown track or disableSameKind
+  kind = (showTrack) ? showTrack.kind() : ((disableSameKind) ? disableSameKind : false);
+
+  // Trigger trackchange event, captionstrackchange, subtitlestrackchange, etc.
+  if (kind) {
+    this.trigger(kind+'trackchange');
+  }
+
+  return this;
+};
+
+/**
+ * Track Class
+ * Contains track methods for loading, showing, parsing cues of tracks
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.TextTrack = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.Component.call(this, player, options);
+
+    // Apply track info to track object
+    // Options will often be a track element
+
+    // Build ID if one doesn't exist
+    this.id_ = options['id'] || ('vjs_' + options['kind'] + '_' + options['language'] + '_' + vjs.guid++);
+    this.src_ = options['src'];
+    // 'default' is a reserved keyword in js so we use an abbreviated version
+    this.dflt_ = options['default'] || options['dflt'];
+    this.title_ = options['title'];
+    this.language_ = options['srclang'];
+    this.label_ = options['label'];
+    this.cues_ = [];
+    this.activeCues_ = [];
+    this.readyState_ = 0;
+    this.mode_ = 0;
+
+    this.player_.on('fullscreenchange', vjs.bind(this, this.adjustFontSize));
+  }
+});
+
+/**
+ * Track kind value. Captions, subtitles, etc.
+ * @private
+ */
+vjs.TextTrack.prototype.kind_;
+
+/**
+ * Get the track kind value
+ * @return {String}
+ */
+vjs.TextTrack.prototype.kind = function(){
+  return this.kind_;
+};
+
+/**
+ * Track src value
+ * @private
+ */
+vjs.TextTrack.prototype.src_;
+
+/**
+ * Get the track src value
+ * @return {String}
+ */
+vjs.TextTrack.prototype.src = function(){
+  return this.src_;
+};
+
+/**
+ * Track default value
+ * If default is used, subtitles/captions to start showing
+ * @private
+ */
+vjs.TextTrack.prototype.dflt_;
+
+/**
+ * Get the track default value
+ * 'default' is a reserved keyword
+ * @return {Boolean}
+ */
+vjs.TextTrack.prototype.dflt = function(){
+  return this.dflt_;
+};
+
+/**
+ * Track title value
+ * @private
+ */
+vjs.TextTrack.prototype.title_;
+
+/**
+ * Get the track title value
+ * @return {String}
+ */
+vjs.TextTrack.prototype.title = function(){
+  return this.title_;
+};
+
+/**
+ * Language - two letter string to represent track language, e.g. 'en' for English
+ * Spec def: readonly attribute DOMString language;
+ * @private
+ */
+vjs.TextTrack.prototype.language_;
+
+/**
+ * Get the track language value
+ * @return {String}
+ */
+vjs.TextTrack.prototype.language = function(){
+  return this.language_;
+};
+
+/**
+ * Track label e.g. 'English'
+ * Spec def: readonly attribute DOMString label;
+ * @private
+ */
+vjs.TextTrack.prototype.label_;
+
+/**
+ * Get the track label value
+ * @return {String}
+ */
+vjs.TextTrack.prototype.label = function(){
+  return this.label_;
+};
+
+/**
+ * All cues of the track. Cues have a startTime, endTime, text, and other properties.
+ * Spec def: readonly attribute TextTrackCueList cues;
+ * @private
+ */
+vjs.TextTrack.prototype.cues_;
+
+/**
+ * Get the track cues
+ * @return {Array}
+ */
+vjs.TextTrack.prototype.cues = function(){
+  return this.cues_;
+};
+
+/**
+ * ActiveCues is all cues that are currently showing
+ * Spec def: readonly attribute TextTrackCueList activeCues;
+ * @private
+ */
+vjs.TextTrack.prototype.activeCues_;
+
+/**
+ * Get the track active cues
+ * @return {Array}
+ */
+vjs.TextTrack.prototype.activeCues = function(){
+  return this.activeCues_;
+};
+
+/**
+ * ReadyState describes if the text file has been loaded
+ * const unsigned short NONE = 0;
+ * const unsigned short LOADING = 1;
+ * const unsigned short LOADED = 2;
+ * const unsigned short ERROR = 3;
+ * readonly attribute unsigned short readyState;
+ * @private
+ */
+vjs.TextTrack.prototype.readyState_;
+
+/**
+ * Get the track readyState
+ * @return {Number}
+ */
+vjs.TextTrack.prototype.readyState = function(){
+  return this.readyState_;
+};
+
+/**
+ * Mode describes if the track is showing, hidden, or disabled
+ * const unsigned short OFF = 0;
+ * const unsigned short HIDDEN = 1; (still triggering cuechange events, but not visible)
+ * const unsigned short SHOWING = 2;
+ * attribute unsigned short mode;
+ * @private
+ */
+vjs.TextTrack.prototype.mode_;
+
+/**
+ * Get the track mode
+ * @return {Number}
+ */
+vjs.TextTrack.prototype.mode = function(){
+  return this.mode_;
+};
+
+/**
+ * Change the font size of the text track to make it larger when playing in fullscreen mode
+ * and restore it to its normal size when not in fullscreen mode.
+ */
+vjs.TextTrack.prototype.adjustFontSize = function(){
+    if (this.player_.isFullScreen) {
+        // Scale the font by the same factor as increasing the video width to the full screen window width.
+        // Additionally, multiply that factor by 1.4, which is the default font size for
+        // the caption track (from the CSS)
+        this.el_.style.fontSize = screen.width / this.player_.width() * 1.4 * 100 + '%';
+    } else {
+        // Change the font size of the text track back to its original non-fullscreen size
+        this.el_.style.fontSize = '';
+    }
+};
+
+/**
+ * Create basic div to hold cue text
+ * @return {Element}
+ */
+vjs.TextTrack.prototype.createEl = function(){
+  return vjs.Component.prototype.createEl.call(this, 'div', {
+    className: 'vjs-' + this.kind_ + ' vjs-text-track'
+  });
+};
+
+/**
+ * Show: Mode Showing (2)
+ * Indicates that the text track is active. If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
+ * The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
+ * In addition, for text tracks whose kind is subtitles or captions, the cues are being displayed over the video as appropriate;
+ * for text tracks whose kind is descriptions, the user agent is making the cues available to the user in a non-visual fashion;
+ * and for text tracks whose kind is chapters, the user agent is making available to the user a mechanism by which the user can navigate to any point in the media resource by selecting a cue.
+ * The showing by default state is used in conjunction with the default attribute on track elements to indicate that the text track was enabled due to that attribute.
+ * This allows the user agent to override the state if a later track is discovered that is more appropriate per the user's preferences.
+ */
+vjs.TextTrack.prototype.show = function(){
+  this.activate();
+
+  this.mode_ = 2;
+
+  // Show element.
+  vjs.Component.prototype.show.call(this);
+};
+
+/**
+ * Hide: Mode Hidden (1)
+ * Indicates that the text track is active, but that the user agent is not actively displaying the cues.
+ * If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
+ * The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
+ */
+vjs.TextTrack.prototype.hide = function(){
+  // When hidden, cues are still triggered. Disable to stop triggering.
+  this.activate();
+
+  this.mode_ = 1;
+
+  // Hide element.
+  vjs.Component.prototype.hide.call(this);
+};
+
+/**
+ * Disable: Mode Off/Disable (0)
+ * Indicates that the text track is not active. Other than for the purposes of exposing the track in the DOM, the user agent is ignoring the text track.
+ * No cues are active, no events are fired, and the user agent will not attempt to obtain the track's cues.
+ */
+vjs.TextTrack.prototype.disable = function(){
+  // If showing, hide.
+  if (this.mode_ == 2) { this.hide(); }
+
+  // Stop triggering cues
+  this.deactivate();
+
+  // Switch Mode to Off
+  this.mode_ = 0;
+};
+
+/**
+ * Turn on cue tracking. Tracks that are showing OR hidden are active.
+ */
+vjs.TextTrack.prototype.activate = function(){
+  // Load text file if it hasn't been yet.
+  if (this.readyState_ === 0) { this.load(); }
+
+  // Only activate if not already active.
+  if (this.mode_ === 0) {
+    // Update current cue on timeupdate
+    // Using unique ID for bind function so other tracks don't remove listener
+    this.player_.on('timeupdate', vjs.bind(this, this.update, this.id_));
+
+    // Reset cue time on media end
+    this.player_.on('ended', vjs.bind(this, this.reset, this.id_));
+
+    // Add to display
+    if (this.kind_ === 'captions' || this.kind_ === 'subtitles') {
+      this.player_.getChild('textTrackDisplay').addChild(this);
+    }
+  }
+};
+
+/**
+ * Turn off cue tracking.
+ */
+vjs.TextTrack.prototype.deactivate = function(){
+  // Using unique ID for bind function so other tracks don't remove listener
+  this.player_.off('timeupdate', vjs.bind(this, this.update, this.id_));
+  this.player_.off('ended', vjs.bind(this, this.reset, this.id_));
+  this.reset(); // Reset
+
+  // Remove from display
+  this.player_.getChild('textTrackDisplay').removeChild(this);
+};
+
+// A readiness state
+// One of the following:
+//
+// Not loaded
+// Indicates that the text track is known to exist (e.g. it has been declared with a track element), but its cues have not been obtained.
+//
+// Loading
+// Indicates that the text track is loading and there have been no fatal errors encountered so far. Further cues might still be added to the track.
+//
+// Loaded
+// Indicates that the text track has been loaded with no fatal errors. No new cues will be added to the track except if the text track corresponds to a MutableTextTrack object.
+//
+// Failed to load
+// Indicates that the text track was enabled, but when the user agent attempted to obtain it, this failed in some way (e.g. URL could not be resolved, network error, unknown text track format). Some or all of the cues are likely missing and will not be obtained.
+vjs.TextTrack.prototype.load = function(){
+
+  // Only load if not loaded yet.
+  if (this.readyState_ === 0) {
+    this.readyState_ = 1;
+    vjs.get(this.src_, vjs.bind(this, this.parseCues), vjs.bind(this, this.onError));
+  }
+
+};
+
+vjs.TextTrack.prototype.onError = function(err){
+  this.error = err;
+  this.readyState_ = 3;
+  this.trigger('error');
+};
+
+// Parse the WebVTT text format for cue times.
+// TODO: Separate parser into own class so alternative timed text formats can be used. (TTML, DFXP)
+vjs.TextTrack.prototype.parseCues = function(srcContent) {
+  var cue, time, text,
+      lines = srcContent.split('\n'),
+      line = '', id;
+
+  for (var i=1, j=lines.length; i<j; i++) {
+    // Line 0 should be 'WEBVTT', so skipping i=0
+
+    line = vjs.trim(lines[i]); // Trim whitespace and linebreaks
+
+    if (line) { // Loop until a line with content
+
+      // First line could be an optional cue ID
+      // Check if line has the time separator
+      if (line.indexOf('-->') == -1) {
+        id = line;
+        // Advance to next line for timing.
+        line = vjs.trim(lines[++i]);
+      } else {
+        id = this.cues_.length;
+      }
+
+      // First line - Number
+      cue = {
+        id: id, // Cue Number
+        index: this.cues_.length // Position in Array
+      };
+
+      // Timing line
+      time = line.split(' --> ');
+      cue.startTime = this.parseCueTime(time[0]);
+      cue.endTime = this.parseCueTime(time[1]);
+
+      // Additional lines - Cue Text
+      text = [];
+
+      // Loop until a blank line or end of lines
+      // Assumeing trim('') returns false for blank lines
+      while (lines[++i] && (line = vjs.trim(lines[i]))) {
+        text.push(line);
+      }
+
+      cue.text = text.join('<br/>');
+
+      // Add this cue
+      this.cues_.push(cue);
+    }
+  }
+
+  this.readyState_ = 2;
+  this.trigger('loaded');
+};
+
+
+vjs.TextTrack.prototype.parseCueTime = function(timeText) {
+  var parts = timeText.split(':'),
+      time = 0,
+      hours, minutes, other, seconds, ms;
+
+  // Check if optional hours place is included
+  // 00:00:00.000 vs. 00:00.000
+  if (parts.length == 3) {
+    hours = parts[0];
+    minutes = parts[1];
+    other = parts[2];
+  } else {
+    hours = 0;
+    minutes = parts[0];
+    other = parts[1];
+  }
+
+  // Break other (seconds, milliseconds, and flags) by spaces
+  // TODO: Make additional cue layout settings work with flags
+  other = other.split(/\s+/);
+  // Remove seconds. Seconds is the first part before any spaces.
+  seconds = other.splice(0,1)[0];
+  // Could use either . or , for decimal
+  seconds = seconds.split(/\.|,/);
+  // Get milliseconds
+  ms = parseFloat(seconds[1]);
+  seconds = seconds[0];
+
+  // hours => seconds
+  time += parseFloat(hours) * 3600;
+  // minutes => seconds
+  time += parseFloat(minutes) * 60;
+  // Add seconds
+  time += parseFloat(seconds);
+  // Add milliseconds
+  if (ms) { time += ms/1000; }
+
+  return time;
+};
+
+// Update active cues whenever timeupdate events are triggered on the player.
+vjs.TextTrack.prototype.update = function(){
+  if (this.cues_.length > 0) {
+
+    // Get curent player time
+    var time = this.player_.currentTime();
+
+    // Check if the new time is outside the time box created by the the last update.
+    if (this.prevChange === undefined || time < this.prevChange || this.nextChange <= time) {
+      var cues = this.cues_,
+
+          // Create a new time box for this state.
+          newNextChange = this.player_.duration(), // Start at beginning of the timeline
+          newPrevChange = 0, // Start at end
+
+          reverse = false, // Set the direction of the loop through the cues. Optimized the cue check.
+          newCues = [], // Store new active cues.
+
+          // Store where in the loop the current active cues are, to provide a smart starting point for the next loop.
+          firstActiveIndex, lastActiveIndex,
+          cue, i; // Loop vars
+
+      // Check if time is going forwards or backwards (scrubbing/rewinding)
+      // If we know the direction we can optimize the starting position and direction of the loop through the cues array.
+      if (time >= this.nextChange || this.nextChange === undefined) { // NextChange should happen
+        // Forwards, so start at the index of the first active cue and loop forward
+        i = (this.firstActiveIndex !== undefined) ? this.firstActiveIndex : 0;
+      } else {
+        // Backwards, so start at the index of the last active cue and loop backward
+        reverse = true;
+        i = (this.lastActiveIndex !== undefined) ? this.lastActiveIndex : cues.length - 1;
+      }
+
+      while (true) { // Loop until broken
+        cue = cues[i];
+
+        // Cue ended at this point
+        if (cue.endTime <= time) {
+          newPrevChange = Math.max(newPrevChange, cue.endTime);
+
+          if (cue.active) {
+            cue.active = false;
+          }
+
+          // No earlier cues should have an active start time.
+          // Nevermind. Assume first cue could have a duration the same as the video.
+          // In that case we need to loop all the way back to the beginning.
+          // if (reverse && cue.startTime) { break; }
+
+        // Cue hasn't started
+        } else if (time < cue.startTime) {
+          newNextChange = Math.min(newNextChange, cue.startTime);
+
+          if (cue.active) {
+            cue.active = false;
+          }
+
+          // No later cues should have an active start time.
+          if (!reverse) { break; }
+
+        // Cue is current
+        } else {
+
+          if (reverse) {
+            // Add cue to front of array to keep in time order
+            newCues.splice(0,0,cue);
+
+            // If in reverse, the first current cue is our lastActiveCue
+            if (lastActiveIndex === undefined) { lastActiveIndex = i; }
+            firstActiveIndex = i;
+          } else {
+            // Add cue to end of array
+            newCues.push(cue);
+
+            // If forward, the first current cue is our firstActiveIndex
+            if (firstActiveIndex === undefined) { firstActiveIndex = i; }
+            lastActiveIndex = i;
+          }
+
+          newNextChange = Math.min(newNextChange, cue.endTime);
+          newPrevChange = Math.max(newPrevChange, cue.startTime);
+
+          cue.active = true;
+        }
+
+        if (reverse) {
+          // Reverse down the array of cues, break if at first
+          if (i === 0) { break; } else { i--; }
+        } else {
+          // Walk up the array fo cues, break if at last
+          if (i === cues.length - 1) { break; } else { i++; }
+        }
+
+      }
+
+      this.activeCues_ = newCues;
+      this.nextChange = newNextChange;
+      this.prevChange = newPrevChange;
+      this.firstActiveIndex = firstActiveIndex;
+      this.lastActiveIndex = lastActiveIndex;
+
+      this.updateDisplay();
+
+      this.trigger('cuechange');
+    }
+  }
+};
+
+// Add cue HTML to display
+vjs.TextTrack.prototype.updateDisplay = function(){
+  var cues = this.activeCues_,
+      html = '',
+      i=0,j=cues.length;
+
+  for (;i<j;i++) {
+    html += '<span class="vjs-tt-cue">'+cues[i].text+'</span>';
+  }
+
+  this.el_.innerHTML = html;
+};
+
+// Set all loop helper values back
+vjs.TextTrack.prototype.reset = function(){
+  this.nextChange = 0;
+  this.prevChange = this.player_.duration();
+  this.firstActiveIndex = 0;
+  this.lastActiveIndex = 0;
+};
+
+// Create specific track types
+/**
+ * @constructor
+ */
+vjs.CaptionsTrack = vjs.TextTrack.extend();
+vjs.CaptionsTrack.prototype.kind_ = 'captions';
+// Exporting here because Track creation requires the track kind
+// to be available on global object. e.g. new window['videojs'][Kind + 'Track']
+
+/**
+ * @constructor
+ */
+vjs.SubtitlesTrack = vjs.TextTrack.extend();
+vjs.SubtitlesTrack.prototype.kind_ = 'subtitles';
+
+/**
+ * @constructor
+ */
+vjs.ChaptersTrack = vjs.TextTrack.extend();
+vjs.ChaptersTrack.prototype.kind_ = 'chapters';
+
+
+/* Text Track Display
+============================================================================= */
+// Global container for both subtitle and captions text. Simple div container.
+
+/**
+ * @constructor
+ */
+vjs.TextTrackDisplay = vjs.Component.extend({
+  /** @constructor */
+  init: function(player, options, ready){
+    vjs.Component.call(this, player, options, ready);
+
+    // This used to be called during player init, but was causing an error
+    // if a track should show by default and the display hadn't loaded yet.
+    // Should probably be moved to an external track loader when we support
+    // tracks that don't need a display.
+    if (player.options_['tracks'] && player.options_['tracks'].length > 0) {
+      this.player_.addTextTracks(player.options_['tracks']);
+    }
+  }
+});
+
+vjs.TextTrackDisplay.prototype.createEl = function(){
+  return vjs.Component.prototype.createEl.call(this, 'div', {
+    className: 'vjs-text-track-display'
+  });
+};
+
+
+/* Text Track Menu Items
+============================================================================= */
+/**
+ * @constructor
+ */
+vjs.TextTrackMenuItem = vjs.MenuItem.extend({
+  /** @constructor */
+  init: function(player, options){
+    var track = this.track = options['track'];
+
+    // Modify options for parent MenuItem class's init.
+    options['label'] = track.label();
+    options['selected'] = track.dflt();
+    vjs.MenuItem.call(this, player, options);
+
+    this.player_.on(track.kind() + 'trackchange', vjs.bind(this, this.update));
+  }
+});
+
+vjs.TextTrackMenuItem.prototype.onClick = function(){
+  vjs.MenuItem.prototype.onClick.call(this);
+  this.player_.showTextTrack(this.track.id_, this.track.kind());
+};
+
+vjs.TextTrackMenuItem.prototype.update = function(){
+  if (this.track.mode() == 2) {
+    this.selected(true);
+  } else {
+    this.selected(false);
+  }
+};
+
+/**
+ * @constructor
+ */
+vjs.OffTextTrackMenuItem = vjs.TextTrackMenuItem.extend({
+  /** @constructor */
+  init: function(player, options){
+    // Create pseudo track info
+    // Requires options['kind']
+    options['track'] = {
+      kind: function() { return options['kind']; },
+      player: player,
+      label: function(){ return options['kind'] + ' off'; },
+      dflt: function(){ return false; },
+      mode: function(){ return false; }
+    };
+    vjs.TextTrackMenuItem.call(this, player, options);
+    this.selected(true);
+  }
+});
+
+vjs.OffTextTrackMenuItem.prototype.onClick = function(){
+  vjs.TextTrackMenuItem.prototype.onClick.call(this);
+  this.player_.showTextTrack(this.track.id_, this.track.kind());
+};
+
+vjs.OffTextTrackMenuItem.prototype.update = function(){
+  var tracks = this.player_.textTracks(),
+      i=0, j=tracks.length, track,
+      off = true;
+
+  for (;i<j;i++) {
+    track = tracks[i];
+    if (track.kind() == this.track.kind() && track.mode() == 2) {
+      off = false;
+    }
+  }
+
+  if (off) {
+    this.selected(true);
+  } else {
+    this.selected(false);
+  }
+};
+
+/* Captions Button
+================================================================================ */
+/**
+ * @constructor
+ */
+vjs.TextTrackButton = vjs.MenuButton.extend({
+  /** @constructor */
+  init: function(player, options){
+    vjs.MenuButton.call(this, player, options);
+
+    if (this.items.length <= 1) {
+      this.hide();
+    }
+  }
+});
+
+// vjs.TextTrackButton.prototype.buttonPressed = false;
+
+// vjs.TextTrackButton.prototype.createMenu = function(){
+//   var menu = new vjs.Menu(this.player_);
+
+//   // Add a title list item to the top
+//   // menu.el().appendChild(vjs.createEl('li', {
+//   //   className: 'vjs-menu-title',
+//   //   innerHTML: vjs.capitalize(this.kind_),
+//   //   tabindex: -1
+//   // }));
+
+//   this.items = this.createItems();
+
+//   // Add menu items to the menu
+//   for (var i = 0; i < this.items.length; i++) {
+//     menu.addItem(this.items[i]);
+//   }
+
+//   // Add list to element
+//   this.addChild(menu);
+
+//   return menu;
+// };
+
+// Create a menu item for each text track
+vjs.TextTrackButton.prototype.createItems = function(){
+  var items = [], track;
+
+  // Add an OFF menu item to turn all tracks off
+  items.push(new vjs.OffTextTrackMenuItem(this.player_, { 'kind': this.kind_ }));
+
+  for (var i = 0; i < this.player_.textTracks().length; i++) {
+    track = this.player_.textTracks()[i];
+    if (track.kind() === this.kind_) {
+      items.push(new vjs.TextTrackMenuItem(this.player_, {
+        'track': track
+      }));
+    }
+  }
+
+  return items;
+};
+
+/**
+ * @constructor
+ */
+vjs.CaptionsButton = vjs.TextTrackButton.extend({
+  /** @constructor */
+  init: function(player, options, ready){
+    vjs.TextTrackButton.call(this, player, options, ready);
+    this.el_.setAttribute('aria-label','Captions Menu');
+  }
+});
+vjs.CaptionsButton.prototype.kind_ = 'captions';
+vjs.CaptionsButton.prototype.buttonText = 'Captions';
+vjs.CaptionsButton.prototype.className = 'vjs-captions-button';
+
+/**
+ * @constructor
+ */
+vjs.SubtitlesButton = vjs.TextTrackButton.extend({
+  /** @constructor */
+  init: function(player, options, ready){
+    vjs.TextTrackButton.call(this, player, options, ready);
+    this.el_.setAttribute('aria-label','Subtitles Menu');
+  }
+});
+vjs.SubtitlesButton.prototype.kind_ = 'subtitles';
+vjs.SubtitlesButton.prototype.buttonText = 'Subtitles';
+vjs.SubtitlesButton.prototype.className = 'vjs-subtitles-button';
+
+// Chapters act much differently than other text tracks
+// Cues are navigation vs. other tracks of alternative languages
+/**
+ * @constructor
+ */
+vjs.ChaptersButton = vjs.TextTrackButton.extend({
+  /** @constructor */
+  init: function(player, options, ready){
+    vjs.TextTrackButton.call(this, player, options, ready);
+    this.el_.setAttribute('aria-label','Chapters Menu');
+  }
+});
+vjs.ChaptersButton.prototype.kind_ = 'chapters';
+vjs.ChaptersButton.prototype.buttonText = 'Chapters';
+vjs.ChaptersButton.prototype.className = 'vjs-chapters-button';
+
+// Create a menu item for each text track
+vjs.ChaptersButton.prototype.createItems = function(){
+  var items = [], track;
+
+  for (var i = 0; i < this.player_.textTracks().length; i++) {
+    track = this.player_.textTracks()[i];
+    if (track.kind() === this.kind_) {
+      items.push(new vjs.TextTrackMenuItem(this.player_, {
+        'track': track
+      }));
+    }
+  }
+
+  return items;
+};
+
+vjs.ChaptersButton.prototype.createMenu = function(){
+  var tracks = this.player_.textTracks(),
+      i = 0,
+      j = tracks.length,
+      track, chaptersTrack,
+      items = this.items = [];
+
+  for (;i<j;i++) {
+    track = tracks[i];
+    if (track.kind() == this.kind_ && track.dflt()) {
+      if (track.readyState() < 2) {
+        this.chaptersTrack = track;
+        track.on('loaded', vjs.bind(this, this.createMenu));
+        return;
+      } else {
+        chaptersTrack = track;
+        break;
+      }
+    }
+  }
+
+  var menu = this.menu = new vjs.Menu(this.player_);
+
+  menu.el_.appendChild(vjs.createEl('li', {
+    className: 'vjs-menu-title',
+    innerHTML: vjs.capitalize(this.kind_),
+    tabindex: -1
+  }));
+
+  if (chaptersTrack) {
+    var cues = chaptersTrack.cues_, cue, mi;
+    i = 0;
+    j = cues.length;
+
+    for (;i<j;i++) {
+      cue = cues[i];
+
+      mi = new vjs.ChaptersTrackMenuItem(this.player_, {
+        'track': chaptersTrack,
+        'cue': cue
+      });
+
+      items.push(mi);
+
+      menu.addChild(mi);
+    }
+  }
+
+  if (this.items.length > 0) {
+    this.show();
+  }
+
+  return menu;
+};
+
+
+/**
+ * @constructor
+ */
+vjs.ChaptersTrackMenuItem = vjs.MenuItem.extend({
+  /** @constructor */
+  init: function(player, options){
+    var track = this.track = options['track'],
+        cue = this.cue = options['cue'],
+        currentTime = player.currentTime();
+
+    // Modify options for parent MenuItem class's init.
+    options['label'] = cue.text;
+    options['selected'] = (cue.startTime <= currentTime && currentTime < cue.endTime);
+    vjs.MenuItem.call(this, player, options);
+
+    track.on('cuechange', vjs.bind(this, this.update));
+  }
+});
+
+vjs.ChaptersTrackMenuItem.prototype.onClick = function(){
+  vjs.MenuItem.prototype.onClick.call(this);
+  this.player_.currentTime(this.cue.startTime);
+  this.update(this.cue.startTime);
+};
+
+vjs.ChaptersTrackMenuItem.prototype.update = function(){
+  var cue = this.cue,
+      currentTime = this.player_.currentTime();
+
+  // vjs.log(currentTime, cue.startTime);
+  if (cue.startTime <= currentTime && currentTime < cue.endTime) {
+    this.selected(true);
+  } else {
+    this.selected(false);
+  }
+};
+
+// Add Buttons to controlBar
+vjs.obj.merge(vjs.ControlBar.prototype.options_['children'], {
+  'subtitlesButton': {},
+  'captionsButton': {},
+  'chaptersButton': {}
+});
+
+// vjs.Cue = vjs.Component.extend({
+//   /** @constructor */
+//   init: function(player, options){
+//     vjs.Component.call(this, player, options);
+//   }
+// });
+/**
+ * @fileoverview Add JSON support
+ * @suppress {undefinedVars}
+ * (Compiler doesn't like JSON not being declared)
+ */
+
+/**
+ * Javascript JSON implementation
+ * (Parse Method Only)
+ * https://github.com/douglascrockford/JSON-js/blob/master/json2.js
+ * Only using for parse method when parsing data-setup attribute JSON.
+ * @type {Object}
+ * @suppress {undefinedVars}
+ */
+vjs.JSON;
+
+/**
+ * @suppress {undefinedVars}
+ */
+if (typeof window.JSON !== 'undefined' && window.JSON.parse === 'function') {
+  vjs.JSON = window.JSON;
+
+} else {
+  vjs.JSON = {};
+
+  var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+
+  vjs.JSON.parse = function (text, reviver) {
+      var j;
+
+      function walk(holder, key) {
+          var k, v, value = holder[key];
+          if (value && typeof value === 'object') {
+              for (k in value) {
+                  if (Object.prototype.hasOwnProperty.call(value, k)) {
+                      v = walk(value, k);
+                      if (v !== undefined) {
+                          value[k] = v;
+                      } else {
+                          delete value[k];
+                      }
+                  }
+              }
+          }
+          return reviver.call(holder, key, value);
+      }
+      text = String(text);
+      cx.lastIndex = 0;
+      if (cx.test(text)) {
+          text = text.replace(cx, function (a) {
+              return '\\u' +
+                  ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+          });
+      }
+
+      if (/^[\],:{}\s]*$/
+              .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+                  .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+                  .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+          j = eval('(' + text + ')');
+
+          return typeof reviver === 'function' ?
+              walk({'': j}, '') : j;
+      }
+
+      throw new SyntaxError('JSON.parse(): invalid or malformed JSON data');
+  };
+}
+/**
+ * @fileoverview Functions for automatically setting up a player
+ * based on the data-setup attribute of the video tag
+ */
+
+// Automatically set up any tags that have a data-setup attribute
+vjs.autoSetup = function(){
+  var options, vid, player,
+      vids = document.getElementsByTagName('video');
+
+  // Check if any media elements exist
+  if (vids && vids.length > 0) {
+
+    for (var i=0,j=vids.length; i<j; i++) {
+      vid = vids[i];
+
+      // Check if element exists, has getAttribute func.
+      // IE seems to consider typeof el.getAttribute == 'object' instead of 'function' like expected, at least when loading the player immediately.
+      if (vid && vid.getAttribute) {
+
+        // Make sure this player hasn't already been set up.
+        if (vid['player'] === undefined) {
+          options = vid.getAttribute('data-setup');
+
+          // Check if data-setup attr exists.
+          // We only auto-setup if they've added the data-setup attr.
+          if (options !== null) {
+
+            // Parse options JSON
+            // If empty string, make it a parsable json object.
+            options = vjs.JSON.parse(options || '{}');
+
+            // Create new video.js instance.
+            player = videojs(vid, options);
+          }
+        }
+
+      // If getAttribute isn't defined, we need to wait for the DOM.
+      } else {
+        vjs.autoSetupTimeout(1);
+        break;
+      }
+    }
+
+  // No videos were found, so keep looping unless page is finisehd loading.
+  } else if (!vjs.windowLoaded) {
+    vjs.autoSetupTimeout(1);
+  }
+};
+
+// Pause to let the DOM keep processing
+vjs.autoSetupTimeout = function(wait){
+  setTimeout(vjs.autoSetup, wait);
+};
+
+vjs.one(window, 'load', function(){
+  vjs.windowLoaded = true;
+});
+
+// Run Auto-load players
+// You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version)
+vjs.autoSetupTimeout(1);
+vjs.plugin = function(name, init){
+  vjs.Player.prototype[name] = init;
+};
diff --git a/library/video-js/video.js b/library/video-js/video.js
index 80d9f56be7..d68ea245ef 100644
--- a/library/video-js/video.js
+++ b/library/video-js/video.js
@@ -1,4569 +1,121 @@
-/*!
-Video.js - HTML5 Video Player
-Version 3.2.0
-
-LGPL v3 LICENSE INFO
-This file is part of Video.js. Copyright 2011 Zencoder, Inc.
-
-Video.js is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Video.js is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with Video.js.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// Self-executing function to prevent global vars and help with minification
-;(function(window, undefined){
-  var document = window.document;// HTML5 Shiv. Must be in <head> to support older browsers.
-document.createElement("video");document.createElement("audio");
-
-var VideoJS = function(id, addOptions, ready){
-  var tag; // Element of ID
-
-  // Allow for element or ID to be passed in
-  // String ID
-  if (typeof id == "string") {
-
-    // Adjust for jQuery ID syntax
-    if (id.indexOf("#") === 0) {
-      id = id.slice(1);
-    }
-
-    // If a player instance has already been created for this ID return it.
-    if (_V_.players[id]) {
-      return _V_.players[id];
-
-    // Otherwise get element for ID
-    } else {
-      tag = _V_.el(id)
-    }
-
-  // ID is a media element
-  } else {
-    tag = id;
-  }
-
-  // Check for a useable element
-  if (!tag || !tag.nodeName) { // re: nodeName, could be a box div also
-    throw new TypeError("The element or ID supplied is not valid. (VideoJS)"); // Returns
-  }
-
-  // Element may have a player attr referring to an already created player instance.
-  // If not, set up a new player and return the instance.
-  return tag.player || new _V_.Player(tag, addOptions, ready);
-},
-
-// Shortcut
-_V_ = VideoJS,
-
-// CDN Version. Used to target right flash swf.
-CDN_VERSION = "3.2";
-
-VideoJS.players = {};
-
-VideoJS.options = {
-
-  // Default order of fallback technology
-  techOrder: ["html5","flash"],
-  // techOrder: ["flash","html5"],
-
-  html5: {},
-  flash: { swf: "http://vjs.zencdn.net/c/video-js.swf" },
-
-  // Default of web browser is 300x150. Should rely on source width/height.
-  width: "auto",
-  height: "auto",
-  
-  // defaultVolume: 0.85,
-  defaultVolume: 0.00, // The freakin seaguls are driving me crazy!
-
-  // Included control sets
-  components: {
-    "posterImage": {},
-    "textTrackDisplay": {},
-    "loadingSpinner": {},
-    "bigPlayButton": {},
-    "controlBar": {}
-  }
-
-  // components: [
-  //   "poster",
-  //   "loadingSpinner",
-  //   "bigPlayButton",
-  //   { name: "controlBar", options: {
-  //     components: [
-  //       "playToggle",
-  //       "fullscreenToggle",
-  //       "currentTimeDisplay",
-  //       "timeDivider",
-  //       "durationDisplay",
-  //       "remainingTimeDisplay",
-  //       { name: "progressControl", options: {
-  //         components: [
-  //           { name: "seekBar", options: {
-  //             components: [
-  //               "loadProgressBar",
-  //               "playProgressBar",
-  //               "seekHandle"
-  //             ]}
-  //           }
-  //         ]}
-  //       },
-  //       { name: "volumeControl", options: {
-  //         components: [
-  //           { name: "volumeBar", options: {
-  //             components: [
-  //               "volumeLevel",
-  //               "volumeHandle"
-  //             ]}
-  //           }
-  //         ]}
-  //       },
-  //       "muteToggle"
-  //     ]
-  //   }},
-  //   "subtitlesDisplay"/*, "replay"*/
-  // ]
-};
-
-// Set CDN Version of swf
-if (CDN_VERSION != "GENERATED_CDN_VSN") {
-  _V_.options.flash.swf = "http://vjs.zencdn.net/"+CDN_VERSION+"/video-js.swf"
-}_V_.merge = function(obj1, obj2, safe){
-  // Make sure second object exists
-  if (!obj2) { obj2 = {}; };
-
-  for (var attrname in obj2){
-    if (obj2.hasOwnProperty(attrname) && (!safe || !obj1.hasOwnProperty(attrname))) { obj1[attrname]=obj2[attrname]; }
-  }
-  return obj1;
-};
-_V_.extend = function(obj){ this.merge(this, obj, true); };
-
-_V_.extend({
-  tech: {}, // Holder for playback technology settings
-  controlSets: {}, // Holder for control set definitions
-
-  // Device Checks
-  isIE: function(){ return !+"\v1"; },
-  isFF: function(){ return !!_V_.ua.match("Firefox") },
-  isIPad: function(){ return navigator.userAgent.match(/iPad/i) !== null; },
-  isIPhone: function(){ return navigator.userAgent.match(/iPhone/i) !== null; },
-  isIOS: function(){ return VideoJS.isIPhone() || VideoJS.isIPad(); },
-  iOSVersion: function() {
-    var match = navigator.userAgent.match(/OS (\d+)_/i);
-    if (match && match[1]) { return match[1]; }
-  },
-  isAndroid: function(){ return navigator.userAgent.match(/Android.*AppleWebKit/i) !== null; },
-  androidVersion: function() {
-    var match = navigator.userAgent.match(/Android (\d+)\./i);
-    if (match && match[1]) { return match[1]; }
-  },
-
-  testVid: document.createElement("video"),
-  ua: navigator.userAgent,
-  support: {},
-
-  each: function(arr, fn){
-    if (!arr || arr.length === 0) { return; }
-    for (var i=0,j=arr.length; i<j; i++) {
-      fn.call(this, arr[i], i);
-    }
-  },
-
-  eachProp: function(obj, fn){
-    if (!obj) { return; }
-    for (var name in obj) {
-      if (obj.hasOwnProperty(name)) {
-        fn.call(this, name, obj[name]);
-      }
-    }
-  },
-
-  el: function(id){ return document.getElementById(id); },
-  createElement: function(tagName, attributes){
-    var el = document.createElement(tagName),
-        attrname;
-    for (attrname in attributes){
-      if (attributes.hasOwnProperty(attrname)) {
-        if (attrname.indexOf("-") !== -1) {
-          el.setAttribute(attrname, attributes[attrname]);
-        } else {
-          el[attrname] = attributes[attrname];
-        }
-      }
-    }
-    return el;
-  },
-
-  insertFirst: function(node, parent){
-    if (parent.firstChild) {
-      parent.insertBefore(node, parent.firstChild);
-    } else {
-      parent.appendChild(node);
-    }
-  },
-
-  addClass: function(element, classToAdd){
-    if ((" "+element.className+" ").indexOf(" "+classToAdd+" ") == -1) {
-      element.className = element.className === "" ? classToAdd : element.className + " " + classToAdd;
-    }
-  },
-
-  removeClass: function(element, classToRemove){
-    if (element.className.indexOf(classToRemove) == -1) { return; }
-    var classNames = element.className.split(" ");
-    classNames.splice(classNames.indexOf(classToRemove),1);
-    element.className = classNames.join(" ");
-  },
-  
-  remove: function(item, array){
-    if (!array) return;
-    var i = array.indexOf(item);
-    if (i != -1) { 
-      return array.splice(i, 1)
-    };
-  },
-
-  // Attempt to block the ability to select text while dragging controls
-  blockTextSelection: function(){
-    document.body.focus();
-    document.onselectstart = function () { return false; };
-  },
-  // Turn off text selection blocking
-  unblockTextSelection: function(){ document.onselectstart = function () { return true; }; },
-
-  // Return seconds as H:MM:SS or M:SS
-  // Supplying a guide (in seconds) will include enough leading zeros to cover the length of the guide
-  formatTime: function(seconds, guide) {
-    guide = guide || seconds; // Default to using seconds as guide
-    var s = Math.floor(seconds % 60),
-        m = Math.floor(seconds / 60 % 60),
-        h = Math.floor(seconds / 3600),
-        gm = Math.floor(guide / 60 % 60),
-        gh = Math.floor(guide / 3600);
-
-    // Check if we need to show hours
-    h = (h > 0 || gh > 0) ? h + ":" : "";
-
-    // If hours are showing, we may need to add a leading zero.
-    // Always show at least one digit of minutes.
-    m = (((h || gm >= 10) && m < 10) ? "0" + m : m) + ":";
-
-    // Check if leading zero is need for seconds
-    s = (s < 10) ? "0" + s : s;
-
-    return h + m + s;
-  },
-
-  uc: function(string){
-    return string.charAt(0).toUpperCase() + string.slice(1);
-  },
-
-  // Return the relative horizonal position of an event as a value from 0-1
-  getRelativePosition: function(x, relativeElement){
-    return Math.max(0, Math.min(1, (x - _V_.findPosX(relativeElement)) / relativeElement.offsetWidth));
-  },
-  
-  getComputedStyleValue: function(element, style){
-    return window.getComputedStyle(element, null).getPropertyValue(style);
-  },
-
-  trim: function(string){ return string.toString().replace(/^\s+/, "").replace(/\s+$/, ""); },
-  round: function(num, dec) {
-    if (!dec) { dec = 0; }
-    return Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);
-  },
-
-  isEmpty: function(object) {
-    for (var prop in object) {
-      return false;
-    }
-    return true;
-  },
-
-  // Mimic HTML5 TimeRange Spec.
-  createTimeRange: function(start, end){
-    return {
-      length: 1,
-      start: function() { return start; },
-      end: function() { return end; }
-    };
-  },
-
-  /* Element Data Store. Allows for binding data to an element without putting it directly on the element.
-     Ex. Event listneres are stored here.
-     (also from jsninja.com)
-  ================================================================================ */
-  cache: {}, // Where the data is stored
-  guid: 1, // Unique ID for the element
-  expando: "vdata" + (new Date).getTime(), // Unique attribute to store element's guid in
-
-  // Returns the cache object where data for the element is stored
-  getData: function(elem){
-    var id = elem[_V_.expando];
-    if (!id) {
-      id = elem[_V_.expando] = _V_.guid++;
-      _V_.cache[id] = {};
-    }
-    return _V_.cache[id];
-  },
-  // Delete data for the element from the cache and the guid attr from element
-  removeData: function(elem){
-    var id = elem[_V_.expando];
-    if (!id) { return; }
-    // Remove all stored data
-    delete _V_.cache[id];
-    // Remove the expando property from the DOM node
-    try {
-      delete elem[_V_.expando];
-    } catch(e) {
-      if (elem.removeAttribute) {
-        elem.removeAttribute(_V_.expando);
-      } else {
-        // IE doesn't appear to support removeAttribute on the document element
-        elem[_V_.expando] = null;
-      }
-    }
-  },
-
-  /* Proxy (a.k.a Bind or Context). A simple method for changing the context of a function
-     It also stores a unique id on the function so it can be easily removed from events
-  ================================================================================ */
-  proxy: function(context, fn, uid) {
-    // Make sure the function has a unique ID
-    if (!fn.guid) { fn.guid = _V_.guid++; }
-
-    // Create the new function that changes the context
-    var ret = function() {
-      return fn.apply(context, arguments);
-    }
-
-    // Allow for the ability to individualize this function
-    // Needed in the case where multiple objects might share the same prototype
-    // IF both items add an event listener with the same function, then you try to remove just one
-    // it will remove both because they both have the same guid.
-    // when using this, you need to use the proxy method when you remove the listener as well.
-    ret.guid = (uid) ? uid + "_" + fn.guid : fn.guid;
-
-    return ret;
-  },
-
-  get: function(url, onSuccess, onError){
-    // if (netscape.security.PrivilegeManager.enablePrivilege) {
-    //   netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    // }
-
-    var local = (url.indexOf("file:") == 0 || (window.location.href.indexOf("file:") == 0 && url.indexOf("http:") == -1));
-
-    if (typeof XMLHttpRequest == "undefined") {
-      XMLHttpRequest = function () {
-        try { return new ActiveXObject("Msxml2.XMLHTTP.6.0"); } catch (e) {}
-        try { return new ActiveXObject("Msxml2.XMLHTTP.3.0"); } catch (f) {}
-        try { return new ActiveXObject("Msxml2.XMLHTTP"); } catch (g) {}
-        throw new Error("This browser does not support XMLHttpRequest.");
-      };
-    }
-
-    var request = new XMLHttpRequest();
-
-    try {
-      request.open("GET", url);
-    } catch(e) {
-      _V_.log("VideoJS XMLHttpRequest (open)", e);
-      // onError(e);
-      return false;
-    }
-
-    request.onreadystatechange = _V_.proxy(this, function() {
-      if (request.readyState == 4) {
-        if (request.status == 200 || local && request.status == 0) {
-          onSuccess(request.responseText);
-        } else {
-          if (onError) {
-            onError();
-          }
-        }
-      }
-    });
-
-    try {
-      request.send();
-    } catch(e) {
-      _V_.log("VideoJS XMLHttpRequest (send)", e);
-      if (onError) {
-        onError(e);
-      }
-    }
-  },
-
-  /* Local Storage
-  ================================================================================ */
-  setLocalStorage: function(key, value){
-    // IE was throwing errors referencing the var anywhere without this
-    var localStorage = window.localStorage || false;
-    if (!localStorage) { return; }
-    try {
-      localStorage[key] = value;
-    } catch(e) {
-      if (e.code == 22 || e.code == 1014) { // Webkit == 22 / Firefox == 1014
-        _V_.log("LocalStorage Full (VideoJS)", e);
-      } else {
-        _V_.log("LocalStorage Error (VideoJS)", e);
-      }
-    }
-  },
-
-  // Get abosolute version of relative URL. Used to tell flash correct URL.
-  // http://stackoverflow.com/questions/470832/getting-an-absolute-url-from-a-relative-one-ie6-issue
-  getAbsoluteURL: function(url){
-
-    // Check if absolute URL
-    if (!url.match(/^https?:\/\//)) {
-      // Convert to absolute URL. Flash hosted off-site needs an absolute URL.
-      url = _V_.createElement('div', {
-        innerHTML: '<a href="'+url+'">x</a>'
-      }).firstChild.href;
-    }
-
-    return url;
-  }
-
-});
-
-// usage: log('inside coolFunc', this, arguments);
-// paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/
-_V_.log = function(){
-  _V_.log.history = _V_.log.history || [];// store logs to an array for reference
-  _V_.log.history.push(arguments);
-  if(window.console) {
-    arguments.callee = arguments.callee.caller;
-    var newarr = [].slice.call(arguments);
-    (typeof console.log === 'object' ? _V_.log.apply.call(console.log, console, newarr) : console.log.apply(console, newarr));
-  }
-};
-
-// make it safe to use console.log always
-(function(b){function c(){}for(var d="assert,count,debug,dir,dirxml,error,exception,group,groupCollapsed,groupEnd,info,log,timeStamp,profile,profileEnd,time,timeEnd,trace,warn".split(","),a;a=d.pop();){b[a]=b[a]||c}})((function(){try
-{console.log();return window.console;}catch(err){return window.console={};}})());
-
-// Offset Left
-// getBoundingClientRect technique from John Resig http://ejohn.org/blog/getboundingclientrect-is-awesome/
-if ("getBoundingClientRect" in document.documentElement) {
-  _V_.findPosX = function(el) {
-    var box;
-
-    try {
-      box = el.getBoundingClientRect();
-    } catch(e) {}
-
-    if (!box) { return 0; }
-
-    var docEl = document.documentElement,
-        body = document.body,
-        clientLeft = docEl.clientLeft || body.clientLeft || 0,
-        scrollLeft = window.pageXOffset || body.scrollLeft,
-        left = box.left + scrollLeft - clientLeft;
-
-    return left;
-  };
-} else {
-  _V_.findPosX = function(el) {
-    var curleft = el.offsetLeft;
-    // _V_.log(obj.className, obj.offsetLeft)
-    while(el = obj.offsetParent) {
-      if (el.className.indexOf("video-js") == -1) {
-        // _V_.log(el.offsetParent, "OFFSETLEFT", el.offsetLeft)
-        // _V_.log("-webkit-full-screen", el.webkitMatchesSelector("-webkit-full-screen"));
-        // _V_.log("-webkit-full-screen", el.querySelectorAll(".video-js:-webkit-full-screen"));
-      } else {
-      }
-      curleft += el.offsetLeft;
-    }
-    return curleft;
-  };
-}// Using John Resig's Class implementation http://ejohn.org/blog/simple-javascript-inheritance/
-// (function(){var initializing=false, fnTest=/xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/; _V_.Class = function(){}; _V_.Class.extend = function(prop) { var _super = this.prototype; initializing = true; var prototype = new this(); initializing = false; for (var name in prop) { prototype[name] = typeof prop[name] == "function" && typeof _super[name] == "function" && fnTest.test(prop[name]) ? (function(name, fn){ return function() { var tmp = this._super; this._super = _super[name]; var ret = fn.apply(this, arguments); this._super = tmp; return ret; }; })(name, prop[name]) : prop[name]; } function Class() { if ( !initializing && this.init ) this.init.apply(this, arguments); } Class.prototype = prototype; Class.constructor = Class; Class.extend = arguments.callee; return Class;};})();
-(function(){
-  var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
-  _V_.Class = function(){};
-  _V_.Class.extend = function(prop) {
-    var _super = this.prototype;
-    initializing = true;
-    var prototype = new this();
-    initializing = false;
-    for (var name in prop) {
-      prototype[name] = typeof prop[name] == "function" &&
-        typeof _super[name] == "function" && fnTest.test(prop[name]) ?
-        (function(name, fn){
-          return function() {
-            var tmp = this._super;
-            this._super = _super[name];
-            var ret = fn.apply(this, arguments);
-            this._super = tmp;
-            return ret;
-          };
-        })(name, prop[name]) :
-        prop[name];
-    }
-    function Class() {
-      if ( !initializing && this.init ) {
-        return this.init.apply(this, arguments);
-
-      // Attempting to recreate accessing function form of class.
-      } else if (!initializing) {
-        return arguments.callee.prototype.init()
-      }
-    }
-    Class.prototype = prototype;
-    Class.constructor = Class;
-    Class.extend = arguments.callee;
-    return Class;
-  };
-})();
-
-/* Player Component- Base class for all UI objects
-================================================================================ */
-_V_.Component = _V_.Class.extend({
-
-  init: function(player, options){
-    this.player = player;
-
-    // Allow for overridding default component options
-    options = this.options = _V_.merge(this.options || {}, options);
-
-    // Create element if one wasn't provided in options
-    if (options.el) {
-      this.el = options.el;
-    } else {
-      this.el = this.createElement();
-    }
-
-    // Add any components in options
-    this.initComponents();
-  },
-
-  destroy: function(){},
-
-  createElement: function(type, attrs){
-    return _V_.createElement(type || "div", attrs);
-  },
-
-  buildCSSClass: function(){
-    // Child classes can include a function that does:
-    // return "CLASS NAME" + this._super();
-    return "";
-  },
-
-  initComponents: function(){
-    var options = this.options;
-    if (options && options.components) {
-      // Loop through components and add them to the player
-      this.eachProp(options.components, function(name, opts){
-
-        // Allow waiting to add components until a specific event is called
-        var tempAdd = this.proxy(function(){
-          // Set property name on player. Could cause conflicts with other prop names, but it's worth making refs easy.
-          this[name] = this.addComponent(name, opts);
-        });
-
-        if (opts.loadEvent) {
-          this.one(opts.loadEvent, tempAdd)
-        } else {
-          tempAdd();
-        }
-      });
-    }
-  },
-
-  // Add child components to this component.
-  // Will generate a new child component and then append child component's element to this component's element.
-  // Takes either the name of the UI component class, or an object that contains a name, UI Class, and options.
-  addComponent: function(name, options){
-    var component, componentClass;
-
-    // If string, create new component with options
-    if (typeof name == "string") {
-
-      // Make sure options is at least an empty object to protect against errors
-      options = options || {};
-
-      // Assume name of set is a lowercased name of the UI Class (PlayButton, etc.)
-      componentClass = options.componentClass || _V_.uc(name);
-
-      // Create a new object & element for this controls set
-      // If there's no .player, this is a player
-      component = new _V_[componentClass](this.player || this, options);
-
-    } else {
-      component = name;
-    }
-
-    // Add the UI object's element to the container div (box)
-    this.el.appendChild(component.el);
-
-    // Return so it can stored on parent object if desired.
-    return component;
-  },
-
-  removeComponent: function(component){
-    this.el.removeChild(component.el);
-  },
-
-  /* Display
-  ================================================================================ */
-  show: function(){
-    this.el.style.display = "block";
-  },
-
-  hide: function(){
-    this.el.style.display = "none";
-  },
-  
-  fadeIn: function(){
-    this.removeClass("vjs-fade-out");
-    this.addClass("vjs-fade-in");
-  },
-
-  fadeOut: function(){
-    this.removeClass("vjs-fade-in");
-    this.addClass("vjs-fade-out");
-  },
-
-  lockShowing: function(){
-    var style = this.el.style;
-    style.display = "block";
-    style.opacity = 1;
-    style.visiblity = "visible";
-  },
-
-  unlockShowing: function(){
-    var style = this.el.style;
-    style.display = "";
-    style.opacity = "";
-    style.visiblity = "";
-  },
-
-  addClass: function(classToAdd){
-    _V_.addClass(this.el, classToAdd);
-  },
-
-  removeClass: function(classToRemove){
-    _V_.removeClass(this.el, classToRemove);
-  },
-
-  /* Events
-  ================================================================================ */
-  addEvent: function(type, fn, uid){
-    return _V_.addEvent(this.el, type, _V_.proxy(this, fn));
-  },
-  removeEvent: function(type, fn){
-    return _V_.removeEvent(this.el, type, fn);
-  },
-  triggerEvent: function(type, e){
-    return _V_.triggerEvent(this.el, type, e);
-  },
-  one: function(type, fn) {
-    _V_.one(this.el, type, _V_.proxy(this, fn));
-  },
-
-  /* Ready - Trigger functions when component is ready
-  ================================================================================ */
-  ready: function(fn){
-    if (!fn) return this;
-
-    if (this.isReady) {
-      fn.call(this);
-    } else {
-      if (this.readyQueue === undefined) {
-        this.readyQueue = [];
-      }
-      this.readyQueue.push(fn);
-    }
-
-    return this;
-  },
-
-  triggerReady: function(){
-    this.isReady = true;
-    if (this.readyQueue && this.readyQueue.length > 0) {
-      // Call all functions in ready queue
-      this.each(this.readyQueue, function(fn){
-        fn.call(this);
-      });
-
-      // Reset Ready Queue
-      this.readyQueue = [];
-
-      // Allow for using event listeners also, in case you want to do something everytime a source is ready.
-      this.triggerEvent("ready");
-    }
-  },
-
-  /* Utility
-  ================================================================================ */
-  each: function(arr, fn){ _V_.each.call(this, arr, fn); },
-
-  eachProp: function(obj, fn){ _V_.eachProp.call(this, obj, fn); },
-
-  extend: function(obj){ _V_.merge(this, obj) },
-
-  // More easily attach 'this' to functions
-  proxy: function(fn, uid){  return _V_.proxy(this, fn, uid); }
-
-});/* Control - Base class for all control elements
-================================================================================ */
-_V_.Control = _V_.Component.extend({
-
-  buildCSSClass: function(){
-    return "vjs-control " + this._super();
-  }
-
-});
-
-/* Control Bar
-================================================================================ */
-_V_.ControlBar = _V_.Component.extend({
-
-  options: {
-    loadEvent: "play",
-    components: {
-      "playToggle": {},
-      "fullscreenToggle": {},
-      "currentTimeDisplay": {},
-      "timeDivider": {},
-      "durationDisplay": {},
-      "remainingTimeDisplay": {},
-      "progressControl": {},
-      "volumeControl": {},
-      "muteToggle": {}
-    }
-  },
-
-  init: function(player, options){
-    this._super(player, options);
-
-    player.addEvent("play", this.proxy(function(){
-      this.fadeIn();
-      this.player.addEvent("mouseover", this.proxy(this.fadeIn));
-      this.player.addEvent("mouseout", this.proxy(this.fadeOut));
-    }));
-
-  },
-
-  createElement: function(){
-    return _V_.createElement("div", {
-      className: "vjs-controls"
-    });
-  },
-
-  fadeIn: function(){
-    this._super();
-    this.player.triggerEvent("controlsvisible");
-  },
-
-  fadeOut: function(){
-    this._super();
-    this.player.triggerEvent("controlshidden");
-  },
-
-  lockShowing: function(){
-    this.el.style.opacity = "1";
-  }
-
-});
-
-/* Button - Base class for all buttons
-================================================================================ */
-_V_.Button = _V_.Control.extend({
-
-  init: function(player, options){
-    this._super(player, options);
-
-    this.addEvent("click", this.onClick);
-    this.addEvent("focus", this.onFocus);
-    this.addEvent("blur", this.onBlur);
-  },
-
-  createElement: function(type, attrs){
-    // Add standard Aria and Tabindex info
-    attrs = _V_.merge({
-      className: this.buildCSSClass(),
-      innerHTML: '<div><span class="vjs-control-text">' + (this.buttonText || "Need Text") + '</span></div>',
-      role: "button",
-      tabIndex: 0
-    }, attrs);
-
-    return this._super(type, attrs);
-  },
-
-  // Click - Override with specific functionality for button
-  onClick: function(){},
-
-  // Focus - Add keyboard functionality to element
-  onFocus: function(){
-    _V_.addEvent(document, "keyup", _V_.proxy(this, this.onKeyPress));
-  },
-
-  // KeyPress (document level) - Trigger click when keys are pressed
-  onKeyPress: function(event){
-    // Check for space bar (32) or enter (13) keys
-    if (event.which == 32 || event.which == 13) {
-      event.preventDefault();
-      this.onClick();
-    }
-  },
-
-  // Blur - Remove keyboard triggers
-  onBlur: function(){
-    _V_.removeEvent(document, "keyup", _V_.proxy(this, this.onKeyPress));
-  }
-
-});
-
-/* Play Button
-================================================================================ */
-_V_.PlayButton = _V_.Button.extend({
-
-  buttonText: "Play",
-
-  buildCSSClass: function(){
-    return "vjs-play-button " + this._super();
-  },
-
-  onClick: function(){
-    this.player.play();
-  }
-
-});
-
-/* Pause Button
-================================================================================ */
-_V_.PauseButton = _V_.Button.extend({
-
-  buttonText: "Pause",
-
-  buildCSSClass: function(){
-    return "vjs-pause-button " + this._super();
-  },
-
-  onClick: function(){
-    this.player.pause();
-  }
-
-});
-
-/* Play Toggle - Play or Pause Media
-================================================================================ */
-_V_.PlayToggle = _V_.Button.extend({
-
-  buttonText: "Play",
-
-  init: function(player, options){
-    this._super(player, options);
-
-    player.addEvent("play", _V_.proxy(this, this.onPlay));
-    player.addEvent("pause", _V_.proxy(this, this.onPause));
-  },
-
-  buildCSSClass: function(){
-    return "vjs-play-control " + this._super();
-  },
-
-  // OnClick - Toggle between play and pause
-  onClick: function(){
-    if (this.player.paused()) {
-      this.player.play();
-    } else {
-      this.player.pause();
-    }
-  },
-
-  // OnPlay - Add the vjs-playing class to the element so it can change appearance
-  onPlay: function(){
-    _V_.removeClass(this.el, "vjs-paused");
-    _V_.addClass(this.el, "vjs-playing");
-  },
-
-  // OnPause - Add the vjs-paused class to the element so it can change appearance
-  onPause: function(){
-    _V_.removeClass(this.el, "vjs-playing");
-    _V_.addClass(this.el, "vjs-paused");
-  }
-
-});
-
-
-/* Fullscreen Toggle Behaviors
-================================================================================ */
-_V_.FullscreenToggle = _V_.Button.extend({
-
-  buttonText: "Fullscreen",
-
-  buildCSSClass: function(){
-    return "vjs-fullscreen-control " + this._super();
-  },
-
-  onClick: function(){
-    if (!this.player.isFullScreen) {
-      this.player.requestFullScreen();
-    } else {
-      this.player.cancelFullScreen();
-    }
-  }
-
-});
-
-/* Big Play Button
-================================================================================ */
-_V_.BigPlayButton = _V_.Button.extend({
-  init: function(player, options){
-    this._super(player, options);
-
-    player.addEvent("play", _V_.proxy(this, this.hide));
-    player.addEvent("ended", _V_.proxy(this, this.show));
-  },
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-big-play-button",
-      innerHTML: "<span></span>"
-    });
-  },
-
-  onClick: function(){
-    // Go back to the beginning if big play button is showing at the end.
-    // Have to check for current time otherwise it might throw a 'not ready' error.
-    if(this.player.currentTime()) {
-      this.player.currentTime(0);
-    }
-    this.player.play();
-  }
-});
-
-/* Loading Spinner
-================================================================================ */
-_V_.LoadingSpinner = _V_.Component.extend({
-  init: function(player, options){
-    this._super(player, options);
-
-    player.addEvent("canplay", _V_.proxy(this, this.hide));
-    player.addEvent("canplaythrough", _V_.proxy(this, this.hide));
-    player.addEvent("playing", _V_.proxy(this, this.hide));
-
-    player.addEvent("seeking", _V_.proxy(this, this.show));
-    player.addEvent("error", _V_.proxy(this, this.show));
-
-    // Not showing spinner on stalled any more. Browsers may stall and then not trigger any events that would remove the spinner.
-    // Checked in Chrome 16 and Safari 5.1.2. http://help.videojs.com/discussions/problems/883-why-is-the-download-progress-showing
-    // player.addEvent("stalled", _V_.proxy(this, this.show));
-
-    player.addEvent("waiting", _V_.proxy(this, this.show));
-  },
-
-  createElement: function(){
-
-    var classNameSpinner, innerHtmlSpinner;
-
-    if ( typeof this.player.el.style.WebkitBorderRadius == "string"
-         || typeof this.player.el.style.MozBorderRadius == "string"
-         || typeof this.player.el.style.KhtmlBorderRadius == "string"
-         || typeof this.player.el.style.borderRadius == "string")
-      {
-        classNameSpinner = "vjs-loading-spinner";
-        innerHtmlSpinner = "<div class='ball1'></div><div class='ball2'></div><div class='ball3'></div><div class='ball4'></div><div class='ball5'></div><div class='ball6'></div><div class='ball7'></div><div class='ball8'></div>";
-      } else {
-        classNameSpinner = "vjs-loading-spinner-fallback";
-        innerHtmlSpinner = "";
-      }
-
-    return this._super("div", {
-      className: classNameSpinner,
-      innerHTML: innerHtmlSpinner
-    });
-  }
-});
-
-/* Time
-================================================================================ */
-_V_.CurrentTimeDisplay = _V_.Component.extend({
-
-  init: function(player, options){
-    this._super(player, options);
-
-    player.addEvent("timeupdate", _V_.proxy(this, this.updateContent));
-  },
-
-  createElement: function(){
-    var el = this._super("div", {
-      className: "vjs-current-time vjs-time-controls vjs-control"
-    });
-
-    this.content = _V_.createElement("div", {
-      className: "vjs-current-time-display",
-      innerHTML: '0:00'
-    });
-
-    el.appendChild(_V_.createElement("div").appendChild(this.content));
-    return el;
-  },
-
-  updateContent: function(){
-    // Allows for smooth scrubbing, when player can't keep up.
-    var time = (this.player.scrubbing) ? this.player.values.currentTime : this.player.currentTime();
-    this.content.innerHTML = _V_.formatTime(time, this.player.duration());
-  }
-
-});
-
-_V_.DurationDisplay = _V_.Component.extend({
-
-  init: function(player, options){
-    this._super(player, options);
-
-    player.addEvent("timeupdate", _V_.proxy(this, this.updateContent));
-  },
-
-  createElement: function(){
-    var el = this._super("div", {
-      className: "vjs-duration vjs-time-controls vjs-control"
-    });
-
-    this.content = _V_.createElement("div", {
-      className: "vjs-duration-display",
-      innerHTML: '0:00'
-    });
-
-    el.appendChild(_V_.createElement("div").appendChild(this.content));
-    return el;
-  },
-
-  updateContent: function(){
-    if (this.player.duration()) { this.content.innerHTML = _V_.formatTime(this.player.duration()); }
-  }
-
-});
-
-// Time Separator (Not used in main skin, but still available, and could be used as a 'spare element')
-_V_.TimeDivider = _V_.Component.extend({
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-time-divider",
-      innerHTML: '<div><span>/</span></div>'
-    });
-  }
-
-});
-
-_V_.RemainingTimeDisplay = _V_.Component.extend({
-
-  init: function(player, options){
-    this._super(player, options);
-
-    player.addEvent("timeupdate", _V_.proxy(this, this.updateContent));
-  },
-
-  createElement: function(){
-    var el = this._super("div", {
-      className: "vjs-remaining-time vjs-time-controls vjs-control"
-    });
-
-    this.content = _V_.createElement("div", {
-      className: "vjs-remaining-time-display",
-      innerHTML: '-0:00'
-    });
-
-    el.appendChild(_V_.createElement("div").appendChild(this.content));
-    return el;
-  },
-
-  updateContent: function(){
-    if (this.player.duration()) { this.content.innerHTML = "-"+_V_.formatTime(this.player.remainingTime()); }
-
-    // Allows for smooth scrubbing, when player can't keep up.
-    // var time = (this.player.scrubbing) ? this.player.values.currentTime : this.player.currentTime();
-    // this.content.innerHTML = _V_.formatTime(time, this.player.duration());
-  }
-
-});
-
-/* Slider - Parent for seek bar and volume slider
-================================================================================ */
-_V_.Slider = _V_.Component.extend({
-
-  init: function(player, options){
-    this._super(player, options);
-
-    player.addEvent(this.playerEvent, _V_.proxy(this, this.update));
-
-    this.addEvent("mousedown", this.onMouseDown);
-    this.addEvent("focus", this.onFocus);
-    this.addEvent("blur", this.onBlur);
-
-    this.player.addEvent("controlsvisible", this.proxy(this.update));
-
-    // This is actually to fix the volume handle position. http://twitter.com/#!/gerritvanaaken/status/159046254519787520
-    // this.player.one("timeupdate", this.proxy(this.update));
-
-    this.update();
-  },
-
-  createElement: function(type, attrs) {
-    attrs = _V_.merge({
-      role: "slider",
-      "aria-valuenow": 0,
-      "aria-valuemin": 0,
-      "aria-valuemax": 100,
-      tabIndex: 0
-    }, attrs);
-
-    return this._super(type, attrs);
-  },
-
-  onMouseDown: function(event){
-    event.preventDefault();
-    _V_.blockTextSelection();
-
-    _V_.addEvent(document, "mousemove", _V_.proxy(this, this.onMouseMove));
-    _V_.addEvent(document, "mouseup", _V_.proxy(this, this.onMouseUp));
-
-    this.onMouseMove(event);
-  },
-
-  onMouseUp: function(event) {
-    _V_.unblockTextSelection();
-    _V_.removeEvent(document, "mousemove", this.onMouseMove, false);
-    _V_.removeEvent(document, "mouseup", this.onMouseUp, false);
-
-    this.update();
-  },
-
-  update: function(){
-    // If scrubbing, we could use a cached value to make the handle keep up with the user's mouse.
-    // On HTML5 browsers scrubbing is really smooth, but some flash players are slow, so we might want to utilize this later.
-    // var progress =  (this.player.scrubbing) ? this.player.values.currentTime / this.player.duration() : this.player.currentTime() / this.player.duration();
-
-    var barProgress,
-        progress = this.getPercent();
-        handle = this.handle,
-        bar = this.bar;
-
-    // Protect against no duration and other division issues
-    if (isNaN(progress)) { progress = 0; }
-
-    barProgress = progress;
-
-    // If there is a handle, we need to account for the handle in our calculation for progress bar
-    // so that it doesn't fall short of or extend past the handle.
-    if (handle) {
-
-      var box = this.el,
-          boxWidth = box.offsetWidth,
-
-          handleWidth = handle.el.offsetWidth,
-
-          // The width of the handle in percent of the containing box
-          // In IE, widths may not be ready yet causing NaN
-          handlePercent = (handleWidth) ? handleWidth / boxWidth : 0,
-
-          // Get the adjusted size of the box, considering that the handle's center never touches the left or right side.
-          // There is a margin of half the handle's width on both sides.
-          boxAdjustedPercent = 1 - handlePercent;
-
-          // Adjust the progress that we'll use to set widths to the new adjusted box width
-          adjustedProgress = progress * boxAdjustedPercent,
-
-          // The bar does reach the left side, so we need to account for this in the bar's width
-          barProgress = adjustedProgress + (handlePercent / 2);
-
-      // Move the handle from the left based on the adjected progress
-      handle.el.style.left = _V_.round(adjustedProgress * 100, 2) + "%";
-    }
-
-    // Set the new bar width
-    bar.el.style.width = _V_.round(barProgress * 100, 2) + "%";
-  },
-
-  calculateDistance: function(event){
-    var box = this.el,
-        boxX = _V_.findPosX(box),
-        boxW = box.offsetWidth,
-        handle = this.handle;
-
-    if (handle) {
-      var handleW = handle.el.offsetWidth;
-
-      // Adjusted X and Width, so handle doesn't go outside the bar
-      boxX = boxX + (handleW / 2);
-      boxW = boxW - handleW;
-    }
-
-    // Percent that the click is through the adjusted area
-    return Math.max(0, Math.min(1, (event.pageX - boxX) / boxW));
-  },
-
-  onFocus: function(event){
-    _V_.addEvent(document, "keyup", _V_.proxy(this, this.onKeyPress));
-  },
-
-  onKeyPress: function(event){
-    if (event.which == 37) { // Left Arrow
-      event.preventDefault();
-      this.stepBack();
-    } else if (event.which == 39) { // Right Arrow
-      event.preventDefault();
-      this.stepForward();
-    }
-  },
-
-  onBlur: function(event){
-    _V_.removeEvent(document, "keyup", _V_.proxy(this, this.onKeyPress));
-  }
-});
-
-
-/* Progress
-================================================================================ */
-
-// Progress Control: Seek, Load Progress, and Play Progress
-_V_.ProgressControl = _V_.Component.extend({
-
-  options: {
-    components: {
-      "seekBar": {}
-    }
-  },
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-progress-control vjs-control"
-    });
-  }
-
-});
-
-// Seek Bar and holder for the progress bars
-_V_.SeekBar = _V_.Slider.extend({
-
-  options: {
-    components: {
-      "loadProgressBar": {},
-
-      // Set property names to bar and handle to match with the parent Slider class is looking for
-      "bar": { componentClass: "PlayProgressBar" },
-      "handle": { componentClass: "SeekHandle" }
-    }
-  },
-
-  playerEvent: "timeupdate",
-
-  init: function(player, options){
-    this._super(player, options);
-  },
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-progress-holder"
-    });
-  },
-
-  getPercent: function(){
-    return this.player.currentTime() / this.player.duration();
-  },
-
-  onMouseDown: function(event){
-    this._super(event);
-
-    this.player.scrubbing = true;
-
-    this.videoWasPlaying = !this.player.paused();
-    this.player.pause();
-  },
-
-  onMouseMove: function(event){
-    var newTime = this.calculateDistance(event) * this.player.duration();
-
-    // Don't let video end while scrubbing.
-    if (newTime == this.player.duration()) { newTime = newTime - 0.1; }
-
-    // Set new time (tell player to seek to new time)
-    this.player.currentTime(newTime);
-  },
-
-  onMouseUp: function(event){
-    this._super(event);
-
-    this.player.scrubbing = false;
-    if (this.videoWasPlaying) {
-      this.player.play();
-    }
-  },
-
-  stepForward: function(){
-    this.player.currentTime(this.player.currentTime() + 1);
-  },
-
-  stepBack: function(){
-    this.player.currentTime(this.player.currentTime() - 1);
-  }
-
-});
-
-// Load Progress Bar
-_V_.LoadProgressBar = _V_.Component.extend({
-
-  init: function(player, options){
-    this._super(player, options);
-    player.addEvent("progress", _V_.proxy(this, this.update));
-  },
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-load-progress",
-      innerHTML: '<span class="vjs-control-text">Loaded: 0%</span>'
-    });
-  },
-
-  update: function(){
-    if (this.el.style) { this.el.style.width = _V_.round(this.player.bufferedPercent() * 100, 2) + "%"; }
-  }
-
-});
-
-// Play Progress Bar
-_V_.PlayProgressBar = _V_.Component.extend({
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-play-progress",
-      innerHTML: '<span class="vjs-control-text">Progress: 0%</span>'
-    });
-  }
-
-});
-
-// Seek Handle
-// SeekBar Behavior includes play progress bar, and seek handle
-// Needed so it can determine seek position based on handle position/size
-_V_.SeekHandle = _V_.Component.extend({
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-seek-handle",
-      innerHTML: '<span class="vjs-control-text">00:00</span>'
-    });
-  }
-
-});
-
-/* Volume Scrubber
-================================================================================ */
-// Progress Control: Seek, Load Progress, and Play Progress
-_V_.VolumeControl = _V_.Component.extend({
-
-  options: {
-    components: {
-      "volumeBar": {}
-    }
-  },
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-volume-control vjs-control"
-    });
-  }
-
-});
-
-_V_.VolumeBar = _V_.Slider.extend({
-
-  options: {
-    components: {
-      "bar": { componentClass: "VolumeLevel" },
-      "handle": { componentClass: "VolumeHandle" }
-    }
-  },
-
-  playerEvent: "volumechange",
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-volume-bar"
-    });
-  },
-
-  onMouseMove: function(event) {
-    this.player.volume(this.calculateDistance(event));
-  },
-
-  getPercent: function(){
-   return this.player.volume();
-  },
-
-  stepForward: function(){
-    this.player.volume(this.player.volume() + 0.1);
-  },
-
-  stepBack: function(){
-    this.player.volume(this.player.volume() - 0.1);
-  }
-});
-
-_V_.VolumeLevel = _V_.Component.extend({
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-volume-level",
-      innerHTML: '<span class="vjs-control-text"></span>'
-    });
-  }
-
-});
-
-_V_.VolumeHandle = _V_.Component.extend({
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-volume-handle",
-      innerHTML: '<span class="vjs-control-text"></span>'
-      // tabindex: 0,
-      // role: "slider", "aria-valuenow": 0, "aria-valuemin": 0, "aria-valuemax": 100
-    });
-  }
-
-});
-
-_V_.MuteToggle = _V_.Button.extend({
-
-  init: function(player, options){
-    this._super(player, options);
-
-    player.addEvent("volumechange", _V_.proxy(this, this.update));
-  },
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-mute-control vjs-control",
-      innerHTML: '<div><span class="vjs-control-text">Mute</span></div>'
-    });
-  },
-
-  onClick: function(event){
-    this.player.muted( this.player.muted() ? false : true );
-  },
-
-  update: function(event){
-    var vol = this.player.volume(),
-        level = 3;
-
-    if (vol == 0 || this.player.muted()) {
-      level = 0;
-    } else if (vol < 0.33) {
-      level = 1;
-    } else if (vol < 0.67) {
-      level = 2;
-    }
-
-    /* TODO improve muted icon classes */
-    _V_.each.call(this, [0,1,2,3], function(i){
-      _V_.removeClass(this.el, "vjs-vol-"+i);
-    });
-    _V_.addClass(this.el, "vjs-vol-"+level);
-  }
-
-});
-
-
-/* Poster Image
-================================================================================ */
-_V_.PosterImage = _V_.Button.extend({
-  init: function(player, options){
-    this._super(player, options);
-
-    if (!this.player.options.poster) {
-      this.hide();
-    }
-
-    player.addEvent("play", _V_.proxy(this, this.hide));
-  },
-
-  createElement: function(){
-    return _V_.createElement("img", {
-      className: "vjs-poster",
-      src: this.player.options.poster,
-
-      // Don't want poster to be tabbable.
-      tabIndex: -1
-    });
-  },
-
-  onClick: function(){
-    this.player.play();
-  }
-});
-
-/* Menu
-================================================================================ */
-// The base for text track and settings menu buttons.
-_V_.Menu = _V_.Component.extend({
-
-  init: function(player, options){
-    this._super(player, options);
-  },
-
-  addItem: function(component){
-    this.addComponent(component);
-    component.addEvent("click", this.proxy(function(){
-      this.unlockShowing();
-    }));
-  },
-
-  createElement: function(){
-    return this._super("ul", {
-      className: "vjs-menu"
-    });
-  }
-
-});
-
-_V_.MenuItem = _V_.Button.extend({
-
-  init: function(player, options){
-    this._super(player, options);
-
-    if (options.selected) {
-      this.addClass("vjs-selected");
-    }
-  },
-
-  createElement: function(type, attrs){
-    return this._super("li", _V_.merge({
-      className: "vjs-menu-item",
-      innerHTML: this.options.label
-    }, attrs));
-  },
-
-  onClick: function(){
-    this.selected(true);
-  },
-
-  selected: function(selected){
-    if (selected) {
-      this.addClass("vjs-selected");
-    } else {
-      this.removeClass("vjs-selected")
-    }
-  }
-
-});// ECMA-262 is the standard for javascript.
-// The following methods are impelemented EXACTLY as described in the standard (according to Mozilla Docs), and do not override the default method if one exists.
-// This may conflict with other libraries that modify the array prototype, but those libs should update to use the standard.
-
-// [].indexOf
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) {
-        "use strict";
-        if (this === void 0 || this === null) {
-            throw new TypeError();
-        }
-        var t = Object(this);
-        var len = t.length >>> 0;
-        if (len === 0) {
-            return -1;
-        }
-        var n = 0;
-        if (arguments.length > 0) {
-            n = Number(arguments[1]);
-            if (n !== n) { // shortcut for verifying if it's NaN
-                n = 0;
-            } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
-                n = (n > 0 || -1) * Math.floor(Math.abs(n));
-            }
-        }
-        if (n >= len) {
-            return -1;
-        }
-        var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0);
-        for (; k < len; k++) {
-            if (k in t && t[k] === searchElement) {
-                return k;
-            }
-        }
-        return -1;
-    }
-}
-
-// NOT NEEDED YET
-// [].lastIndexOf
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-// if (!Array.prototype.lastIndexOf)
-// {
-//   Array.prototype.lastIndexOf = function(searchElement /*, fromIndex*/)
-//   {
-//     "use strict";
-// 
-//     if (this === void 0 || this === null)
-//       throw new TypeError();
-// 
-//     var t = Object(this);
-//     var len = t.length >>> 0;
-//     if (len === 0)
-//       return -1;
-// 
-//     var n = len;
-//     if (arguments.length > 1)
-//     {
-//       n = Number(arguments[1]);
-//       if (n !== n)
-//         n = 0;
-//       else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0))
-//         n = (n > 0 || -1) * Math.floor(Math.abs(n));
-//     }
-// 
-//     var k = n >= 0
-//           ? Math.min(n, len - 1)
-//           : len - Math.abs(n);
-// 
-//     for (; k >= 0; k--)
-//     {
-//       if (k in t && t[k] === searchElement)
-//         return k;
-//     }
-//     return -1;
-//   };
-// }
-
-
-// NOT NEEDED YET
-// Array forEach per ECMA standard https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/foreach
-// Production steps of ECMA-262, Edition 5, 15.4.4.18
-// Reference: http://es5.github.com/#x15.4.4.18
-// if ( !Array.prototype.forEach ) {
-// 
-//   Array.prototype.forEach = function( callback, thisArg ) {
-// 
-//     var T, k;
-// 
-//     if ( this == null ) {
-//       throw new TypeError( " this is null or not defined" );
-//     }
-// 
-//     // 1. Let O be the result of calling ToObject passing the |this| value as the argument.
-//     var O = Object(this);
-// 
-//     // 2. Let lenValue be the result of calling the Get internal method of O with the argument "length".
-//     // 3. Let len be ToUint32(lenValue).
-//     var len = O.length >>> 0;
-// 
-//     // 4. If IsCallable(callback) is false, throw a TypeError exception.
-//     // See: http://es5.github.com/#x9.11
-//     if ( {}.toString.call(callback) != "[object Function]" ) {
-//       throw new TypeError( callback + " is not a function" );
-//     }
-// 
-//     // 5. If thisArg was supplied, let T be thisArg; else let T be undefined.
-//     if ( thisArg ) {
-//       T = thisArg;
-//     }
-// 
-//     // 6. Let k be 0
-//     k = 0;
-// 
-//     // 7. Repeat, while k < len
-//     while( k < len ) {
-// 
-//       var kValue;
-// 
-//       // a. Let Pk be ToString(k).
-//       //   This is implicit for LHS operands of the in operator
-//       // b. Let kPresent be the result of calling the HasProperty internal method of O with argument Pk.
-//       //   This step can be combined with c
-//       // c. If kPresent is true, then
-//       if ( k in O ) {
-// 
-//         // i. Let kValue be the result of calling the Get internal method of O with argument Pk.
-//         kValue = O[ Pk ];
-// 
-//         // ii. Call the Call internal method of callback with T as the this value and
-//         // argument list containing kValue, k, and O.
-//         callback.call( T, kValue, k, O );
-//       }
-//       // d. Increase k by 1.
-//       k++;
-//     }
-//     // 8. return undefined
-//   };
-// }
-
-
-// NOT NEEDED YET
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/map
-// Production steps of ECMA-262, Edition 5, 15.4.4.19
-// Reference: http://es5.github.com/#x15.4.4.19
-// if (!Array.prototype.map) {
-//   Array.prototype.map = function(callback, thisArg) {
-// 
-//     var T, A, k;
-// 
-//     if (this == null) {
-//       throw new TypeError(" this is null or not defined");
-//     }
-// 
-//     // 1. Let O be the result of calling ToObject passing the |this| value as the argument.
-//     var O = Object(this);
-// 
-//     // 2. Let lenValue be the result of calling the Get internal method of O with the argument "length".
-//     // 3. Let len be ToUint32(lenValue).
-//     var len = O.length >>> 0;
-// 
-//     // 4. If IsCallable(callback) is false, throw a TypeError exception.
-//     // See: http://es5.github.com/#x9.11
-//     if ({}.toString.call(callback) != "[object Function]") {
-//       throw new TypeError(callback + " is not a function");
-//     }
-// 
-//     // 5. If thisArg was supplied, let T be thisArg; else let T be undefined.
-//     if (thisArg) {
-//       T = thisArg;
-//     }
-// 
-//     // 6. Let A be a new array created as if by the expression new Array(len) where Array is
-//     // the standard built-in constructor with that name and len is the value of len.
-//     A = new Array(len);
-// 
-//     // 7. Let k be 0
-//     k = 0;
-// 
-//     // 8. Repeat, while k < len
-//     while(k < len) {
-// 
-//       var kValue, mappedValue;
-// 
-//       // a. Let Pk be ToString(k).
-//       //   This is implicit for LHS operands of the in operator
-//       // b. Let kPresent be the result of calling the HasProperty internal method of O with argument Pk.
-//       //   This step can be combined with c
-//       // c. If kPresent is true, then
-//       if (k in O) {
-// 
-//         // i. Let kValue be the result of calling the Get internal method of O with argument Pk.
-//         kValue = O[ k ];
-// 
-//         // ii. Let mappedValue be the result of calling the Call internal method of callback
-//         // with T as the this value and argument list containing kValue, k, and O.
-//         mappedValue = callback.call(T, kValue, k, O);
-// 
-//         // iii. Call the DefineOwnProperty internal method of A with arguments
-//         // Pk, Property Descriptor {Value: mappedValue, Writable: true, Enumerable: true, Configurable: true},
-//         // and false.
-// 
-//         // In browsers that support Object.defineProperty, use the following:
-//         // Object.defineProperty(A, Pk, { value: mappedValue, writable: true, enumerable: true, configurable: true });
-// 
-//         // For best browser support, use the following:
-//         A[ k ] = mappedValue;
-//       }
-//       // d. Increase k by 1.
-//       k++;
-//     }
-// 
-//     // 9. return A
-//     return A;
-//   };      
-// }
-// Event System (J.Resig - Secrets of a JS Ninja http://jsninja.com/ [Go read it, really])
-// (Book version isn't completely usable, so fixed some things and borrowed from jQuery where it's working)
-// 
-// This should work very similarly to jQuery's events, however it's based off the book version which isn't as
-// robust as jquery's, so there's probably some differences.
-// 
-// When you add an event listener using _V_.addEvent, 
-//   it stores the handler function in seperate cache object, 
-//   and adds a generic handler to the element's event,
-//   along with a unique id (guid) to the element.
-
-_V_.extend({
-
-  // Add an event listener to element
-  // It stores the handler function in a separate cache object
-  // and adds a generic handler to the element's event,
-  // along with a unique id (guid) to the element.
-  addEvent: function(elem, type, fn){
-    var data = _V_.getData(elem), handlers;
-
-    // We only need to generate one handler per element
-    if (data && !data.handler) {
-      // Our new meta-handler that fixes the event object and the context
-      data.handler = function(event){
-        event = _V_.fixEvent(event);
-        var handlers = _V_.getData(elem).events[event.type];
-        // Go through and call all the real bound handlers
-        if (handlers) {
-          
-          // Copy handlers so if handlers are added/removed during the process it doesn't throw everything off.
-          var handlersCopy = [];
-          _V_.each(handlers, function(handler, i){
-            handlersCopy[i] = handler;
-          })
-          
-          for (var i = 0, l = handlersCopy.length; i < l; i++) {
-            handlersCopy[i].call(elem, event);
-          }
-        }
-      };
-    }
-
-    // We need a place to store all our event data
-    if (!data.events) { data.events = {}; }
-
-    // And a place to store the handlers for this event type
-    handlers = data.events[type];
-
-    if (!handlers) {
-      handlers = data.events[ type ] = [];
-
-      // Attach our meta-handler to the element, since one doesn't exist
-      if (document.addEventListener) {
-        elem.addEventListener(type, data.handler, false);
-      } else if (document.attachEvent) {
-        elem.attachEvent("on" + type, data.handler);
-      }
-    }
-
-    if (!fn.guid) { fn.guid = _V_.guid++; }
-
-    handlers.push(fn);
-  },
-
-  removeEvent: function(elem, type, fn) {
-    var data = _V_.getData(elem), handlers;
-    // If no events exist, nothing to unbind
-    if (!data.events) { return; }
-
-    // Are we removing all bound events?
-    if (!type) {
-      for (type in data.events) {
-        _V_.cleanUpEvents(elem, type);
-      }
-      return;
-    }
-
-    // And a place to store the handlers for this event type
-    handlers = data.events[type];
-
-    // If no handlers exist, nothing to unbind
-    if (!handlers) { return; }
-
-    // See if we're only removing a single handler
-    if (fn && fn.guid) {
-      for (var i = 0; i < handlers.length; i++) {
-        // We found a match (don't stop here, there could be a couple bound)
-        if (handlers[i].guid === fn.guid) {
-          // Remove the handler from the array of handlers
-          handlers.splice(i--, 1);
-        }
-      }
-    }
-
-    _V_.cleanUpEvents(elem, type);
-  },
-
-  cleanUpEvents: function(elem, type) {
-    var data = _V_.getData(elem);
-    // Remove the events of a particular type if there are none left
-
-    if (data.events[type].length === 0) {
-      delete data.events[type];
-
-      // Remove the meta-handler from the element
-      if (document.removeEventListener) {
-        elem.removeEventListener(type, data.handler, false);
-      } else if (document.detachEvent) {
-        elem.detachEvent("on" + type, data.handler);
-      }
-    }
-
-    // Remove the events object if there are no types left
-    if (_V_.isEmpty(data.events)) {
-      delete data.events;
-      delete data.handler;
-    }
-
-    // Finally remove the expando if there is no data left
-    if (_V_.isEmpty(data)) {
-      _V_.removeData(elem);
-    }
-  },
-
-  fixEvent: function(event) {
-    if (event[_V_.expando]) { return event; }
-    // store a copy of the original event object
-    // and "clone" to set read-only properties
-    var originalEvent = event;
-    event = new _V_.Event(originalEvent);
-
-    for ( var i = _V_.Event.props.length, prop; i; ) {
-      prop = _V_.Event.props[ --i ];
-      event[prop] = originalEvent[prop];
-    }
-
-    // Fix target property, if necessary
-    if (!event.target) { event.target = event.srcElement || document; }
-
-    // check if target is a textnode (safari)
-    if (event.target.nodeType === 3) { event.target = event.target.parentNode; }
-
-    // Add relatedTarget, if necessary
-    if (!event.relatedTarget && event.fromElement) {
-      event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
-    }
-
-    // Calculate pageX/Y if missing and clientX/Y available
-    if ( event.pageX == null && event.clientX != null ) {
-      var eventDocument = event.target.ownerDocument || document,
-        doc = eventDocument.documentElement,
-        body = eventDocument.body;
-
-      event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
-      event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
-    }
-
-    // Add which for key events
-    if (event.which == null && (event.charCode != null || event.keyCode != null)) {
-      event.which = event.charCode != null ? event.charCode : event.keyCode;
-    }
-
-    // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
-    if ( !event.metaKey && event.ctrlKey ) {
-      event.metaKey = event.ctrlKey;
-    }
-
-    // Add which for click: 1 === left; 2 === middle; 3 === right
-    // Note: button is not normalized, so don't use it
-    if ( !event.which && event.button !== undefined ) {
-      event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
-    }
-
-    return event;
-  },
-
-  triggerEvent: function(elem, event) {
-    var data = _V_.getData(elem),
-        parent = elem.parentNode || elem.ownerDocument,
-        type = event.type || event,
-        handler;
-
-    if (data) { handler = data.handler }
-
-    // Added in attion to book. Book code was broke.
-    event = typeof event === "object" ?
-      event[_V_.expando] ? 
-        event :
-        new _V_.Event(type, event) :
-      new _V_.Event(type);
-
-    event.type = type;
-    if (handler) {
-      handler.call(elem, event);
-    }
-
-    // Clean up the event in case it is being reused
-    event.result = undefined;
-    event.target = elem;
-
-    // Bubble the event up the tree to the document,
-    // Unless it's been explicitly stopped
-    // if (parent && !event.isPropagationStopped()) {
-    //   _V_.triggerEvent(parent, event);
-    // 
-    // // We're at the top document so trigger the default action
-    // } else if (!parent && !event.isDefaultPrevented()) {
-    //   // log(type);
-    //   var targetData = _V_.getData(event.target);
-    //   // log(targetData);
-    //   var targetHandler = targetData.handler;
-    //   // log("2");
-    //   if (event.target[event.type]) {
-    //     // Temporarily disable the bound handler,
-    //     // don't want to execute it twice
-    //     if (targetHandler) {
-    //       targetData.handler = function(){};
-    //     }
-    // 
-    //     // Trigger the native event (click, focus, blur)
-    //     event.target[event.type]();
-    // 
-    //     // Restore the handler
-    //     if (targetHandler) {
-    //       targetData.handler = targetHandler;
-    //     }
-    //   }
-    // }
-  },
-  
-  one: function(elem, type, fn) {
-    _V_.addEvent(elem, type, function(){
-      _V_.removeEvent(elem, type, arguments.callee)
-      fn.apply(this, arguments);
-    });
-  }
-});
-
-// Custom Event object for standardizing event objects between browsers.
-_V_.Event = function(src, props){
-  // Event object
-  if (src && src.type) {
-    this.originalEvent = src;
-    this.type = src.type;
-
-    // Events bubbling up the document may have been marked as prevented
-    // by a handler lower down the tree; reflect the correct value.
-    this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
-      src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
-
-  // Event type
-  } else {
-    this.type = src;
-  }
-
-  // Put explicitly provided properties onto the event object
-  if (props) { _V_.merge(this, props); }
-
-  this.timeStamp = (new Date).getTime();
-
-  // Mark it as fixed
-  this[_V_.expando] = true;
-};
-
-_V_.Event.prototype = {
-  preventDefault: function() {
-    this.isDefaultPrevented = returnTrue;
-
-    var e = this.originalEvent;
-    if (!e) { return; }
-
-    // if preventDefault exists run it on the original event
-    if (e.preventDefault) { 
-      e.preventDefault();
-    // otherwise set the returnValue property of the original event to false (IE)
-    } else {
-      e.returnValue = false;
-    }
-  },
-  stopPropagation: function() {
-    this.isPropagationStopped = returnTrue;
-
-    var e = this.originalEvent;
-    if (!e) { return; }
-    // if stopPropagation exists run it on the original event
-    if (e.stopPropagation) { e.stopPropagation(); }
-    // otherwise set the cancelBubble property of the original event to true (IE)
-    e.cancelBubble = true;
-  },
-  stopImmediatePropagation: function() {
-    this.isImmediatePropagationStopped = returnTrue;
-    this.stopPropagation();
-  },
-  isDefaultPrevented: returnFalse,
-  isPropagationStopped: returnFalse,
-  isImmediatePropagationStopped: returnFalse
-};
-_V_.Event.props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" ");
-
-function returnTrue(){ return true; }
-function returnFalse(){ return false; }
-
-// Javascript JSON implementation
-// (Parse Method Only)
-// https://github.com/douglascrockford/JSON-js/blob/master/json2.js
-
-var JSON;
-if (!JSON) { JSON = {}; }
-
-(function(){
-  var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
-
-  if (typeof JSON.parse !== 'function') {
-      JSON.parse = function (text, reviver) {
-          var j;
-
-          function walk(holder, key) {
-              var k, v, value = holder[key];
-              if (value && typeof value === 'object') {
-                  for (k in value) {
-                      if (Object.prototype.hasOwnProperty.call(value, k)) {
-                          v = walk(value, k);
-                          if (v !== undefined) {
-                              value[k] = v;
-                          } else {
-                              delete value[k];
-                          }
-                      }
-                  }
-              }
-              return reviver.call(holder, key, value);
-          }
-          text = String(text);
-          cx.lastIndex = 0;
-          if (cx.test(text)) {
-              text = text.replace(cx, function (a) {
-                  return '\\u' +
-                      ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-              });
-          }
-
-          if (/^[\],:{}\s]*$/
-                  .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
-                      .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
-                      .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-              j = eval('(' + text + ')');
-
-              return typeof reviver === 'function' ?
-                  walk({'': j}, '') : j;
-          }
-
-          throw new SyntaxError('JSON.parse');
-      };
-  }
-}());
-/* UI Component- Base class for all UI objects
-================================================================================ */
-_V_.Player = _V_.Component.extend({
-
-  init: function(tag, addOptions, ready){
-
-    this.tag = tag; // Store the original tag used to set options
-
-    var el = this.el = _V_.createElement("div"), // Div to contain video and controls
-        options = this.options = {},
-        width = options.width = tag.getAttribute('width'),
-        height = options.height = tag.getAttribute('height'),
-
-        // Browsers default to 300x150 if there's no width/height or video size data.
-        initWidth = width || 300,
-        initHeight = height || 150;
-
-    // Make player findable on elements
-    tag.player = el.player = this;
-
-    // Add callback to ready queue
-    this.ready(ready);
-
-    // Wrap video tag in div (el/box) container
-    tag.parentNode.insertBefore(el, tag);
-    el.appendChild(tag); // Breaks iPhone, fixed in HTML5 setup.
-
-    // Give video tag properties to box
-    el.id = this.id = tag.id; // ID will now reference box, not the video tag
-    el.className = tag.className;
-    // Update tag id/class for use as HTML5 playback tech
-    tag.id += "_html5_api";
-    tag.className = "vjs-tech";
-
-    // Make player easily findable by ID
-    _V_.players[el.id] = this;
-
-    // Make box use width/height of tag, or default 300x150
-    el.setAttribute("width", initWidth);
-    el.setAttribute("height", initHeight);
-    // Enforce with CSS since width/height attrs don't work on divs
-    el.style.width = initWidth+"px";
-    el.style.height = initHeight+"px";
-    // Remove width/height attrs from tag so CSS can make it 100% width/height
-    tag.removeAttribute("width");
-    tag.removeAttribute("height");
-
-    // Set Options
-    _V_.merge(options, _V_.options); // Copy Global Defaults
-    _V_.merge(options, this.getVideoTagSettings()); // Override with Video Tag Options
-    _V_.merge(options, addOptions); // Override/extend with options from setup call
-
-    // Store controls setting, and then remove immediately so native controls don't flash.
-    tag.removeAttribute("controls");
-
-    // Poster will be handled by a manual <img>
-    tag.removeAttribute("poster");
-
-    // Empty video tag sources and tracks so the built in player doesn't use them also.
-    if (tag.hasChildNodes()) {
-      for (var i=0,j=tag.childNodes;i<j.length;i++) {
-        if (j[i].nodeName == "SOURCE" || j[i].nodeName == "TRACK") {
-          tag.removeChild(j[i]);
-        }
-      }
-    }
-
-    // Cache for video property values.
-    this.values = {};
-
-    this.addClass("vjs-paused");
-
-    this.addEvent("ended", this.onEnded);
-    this.addEvent("play", this.onPlay);
-    this.addEvent("pause", this.onPause);
-    this.addEvent("progress", this.onProgress);
-    this.addEvent("error", this.onError);
-
-    // When the API is ready, loop through the components and add to the player.
-    if (options.controls) {
-      this.ready(function(){
-        this.initComponents();
-      });
-    }
-
-    // Tracks defined in tracks.js
-    this.textTracks = [];
-    if (options.tracks && options.tracks.length > 0) {
-      this.addTextTracks(options.tracks);
-    }
-
-    // If there are no sources when the player is initialized,
-    // load the first supported playback technology.
-    if (!options.sources || options.sources.length == 0) {
-      for (var i=0,j=options.techOrder; i<j.length; i++) {
-        var techName = j[i],
-            tech = _V_[techName];
-
-        // Check if the browser supports this technology
-        if (tech.isSupported()) {
-          this.loadTech(techName);
-          break;
-        }
-      }
-    } else {
-      // Loop through playback technologies (HTML5, Flash) and check for support. Then load the best source.
-      // A few assumptions here:
-      //   All playback technologies respect preload false.
-      this.src(options.sources);
-    }
-  },
-
-  // Cache for video property values.
-  values: {},
-
-  destroy: function(){
-    // Ensure that tracking progress and time progress will stop and plater deleted
-    this.stopTrackingProgress();
-    this.stopTrackingCurrentTime();
-    _V_.players[this.id] = null;
-    delete _V_.players[this.id];
-    this.tech.destroy();
-    this.el.parentNode.removeChild(this.el);
-  },
-
-  createElement: function(type, options){},
-
-  getVideoTagSettings: function(){
-    var options = {
-      sources: [],
-      tracks: []
-    };
-
-    options.src = this.tag.getAttribute("src");
-    options.controls = this.tag.getAttribute("controls") !== null;
-    options.poster = this.tag.getAttribute("poster");
-    options.preload = this.tag.getAttribute("preload");
-    options.autoplay = this.tag.getAttribute("autoplay") !== null; // hasAttribute not IE <8 compatible
-    options.loop = this.tag.getAttribute("loop") !== null;
-    options.muted = this.tag.getAttribute("muted") !== null;
-
-    if (this.tag.hasChildNodes()) {
-      for (var c,i=0,j=this.tag.childNodes;i<j.length;i++) {
-        c = j[i];
-        if (c.nodeName == "SOURCE") {
-          options.sources.push({
-            src: c.getAttribute('src'),
-            type: c.getAttribute('type'),
-            media: c.getAttribute('media'),
-            title: c.getAttribute('title')
-          });
-        }
-        if (c.nodeName == "TRACK") {
-          options.tracks.push({
-            src: c.getAttribute("src"),
-            kind: c.getAttribute("kind"),
-            srclang: c.getAttribute("srclang"),
-            label: c.getAttribute("label"),
-            'default': c.getAttribute("default") !== null,
-            title: c.getAttribute("title")
-          });
-        }
-      }
-    }
-    return options;
-  },
-
-  /* PLayback Technology (tech)
-  ================================================================================ */
-  // Load/Create an instance of playback technlogy including element and API methods
-  // And append playback element in player div.
-  loadTech: function(techName, source){
-
-    // Pause and remove current playback technology
-    if (this.tech) {
-      this.unloadTech();
-
-    // If the first time loading, HTML5 tag will exist but won't be initialized
-    // So we need to remove it if we're not loading HTML5
-    } else if (techName != "html5" && this.tag) {
-      this.el.removeChild(this.tag);
-      this.tag = false;
-    }
-
-    this.techName = techName;
-
-    // Turn off API access because we're loading a new tech that might load asynchronously
-    this.isReady = false;
-
-    var techReady = function(){
-      this.player.triggerReady();
-
-      // Manually track progress in cases where the browser/flash player doesn't report it.
-      if (!this.support.progressEvent) {
-        this.player.manualProgressOn();
-      }
-
-      // Manually track timeudpates in cases where the browser/flash player doesn't report it.
-      if (!this.support.timeupdateEvent) {
-        this.player.manualTimeUpdatesOn();
-      }
-    }
-
-    // Grab tech-specific options from player options and add source and parent element to use.
-    var techOptions = _V_.merge({ source: source, parentEl: this.el }, this.options[techName])
-
-    if (source) {
-      if (source.src == this.values.src && this.values.currentTime > 0) {
-        techOptions.startTime = this.values.currentTime;
-      }
-
-      this.values.src = source.src;
-    }
-
-    // Initialize tech instance
-    this.tech = new _V_[techName](this, techOptions);
-    this.tech.ready(techReady);
-  },
-
-  unloadTech: function(){
-    this.tech.destroy();
-
-    // Turn off any manual progress or timeupdate tracking
-    if (this.manualProgress) { this.manualProgressOff(); }
-
-    if (this.manualTimeUpdates) { this.manualTimeUpdatesOff(); }
-
-    this.tech = false;
-  },
-
-  // There's many issues around changing the size of a Flash (or other plugin) object.
-  // First is a plugin reload issue in Firefox that has been around for 11 years: https://bugzilla.mozilla.org/show_bug.cgi?id=90268
-  // Then with the new fullscreen API, Mozilla and webkit browsers will reload the flash object after going to fullscreen.
-  // To get around this, we're unloading the tech, caching source and currentTime values, and reloading the tech once the plugin is resized.
-  // reloadTech: function(betweenFn){
-  //   _V_.log("unloadingTech")
-  //   this.unloadTech();
-  //   _V_.log("unloadedTech")
-  //   if (betweenFn) { betweenFn.call(); }
-  //   _V_.log("LoadingTech")
-  //   this.loadTech(this.techName, { src: this.values.src })
-  //   _V_.log("loadedTech")
-  // },
-
-  /* Fallbacks for unsupported event types
-  ================================================================================ */
-  // Manually trigger progress events based on changes to the buffered amount
-  // Many flash players and older HTML5 browsers don't send progress or progress-like events
-  manualProgressOn: function(){
-    this.manualProgress = true;
-
-    // Trigger progress watching when a source begins loading
-    this.trackProgress();
-
-    // Watch for a native progress event call on the tech element
-    // In HTML5, some older versions don't support the progress event
-    // So we're assuming they don't, and turning off manual progress if they do.
-    this.tech.addEvent("progress", function(){
-
-      // Remove this listener from the element
-      this.removeEvent("progress", arguments.callee);
-
-      // Update known progress support for this playback technology
-      this.support.progressEvent = true;
-
-      // Turn off manual progress tracking
-      this.player.manualProgressOff();
-    });
-  },
-
-  manualProgressOff: function(){
-    this.manualProgress = false;
-    this.stopTrackingProgress();
-  },
-
-  trackProgress: function(){
-    this.progressInterval = setInterval(_V_.proxy(this, function(){
-      // Don't trigger unless buffered amount is greater than last time
-      // log(this.values.bufferEnd, this.buffered().end(0), this.duration())
-      /* TODO: update for multiple buffered regions */
-      if (this.values.bufferEnd < this.buffered().end(0)) {
-        this.triggerEvent("progress");
-      } else if (this.bufferedPercent() == 1) {
-        this.stopTrackingProgress();
-        this.triggerEvent("progress"); // Last update
-      }
-    }), 500);
-  },
-  stopTrackingProgress: function(){ clearInterval(this.progressInterval); },
-
-  /* Time Tracking -------------------------------------------------------------- */
-  manualTimeUpdatesOn: function(){
-    this.manualTimeUpdates = true;
-
-    this.addEvent("play", this.trackCurrentTime);
-    this.addEvent("pause", this.stopTrackingCurrentTime);
-    // timeupdate is also called by .currentTime whenever current time is set
-
-    // Watch for native timeupdate event
-    this.tech.addEvent("timeupdate", function(){
-
-      // Remove this listener from the element
-      this.removeEvent("timeupdate", arguments.callee);
-
-      // Update known progress support for this playback technology
-      this.support.timeupdateEvent = true;
-
-      // Turn off manual progress tracking
-      this.player.manualTimeUpdatesOff();
-    });
-  },
-
-  manualTimeUpdatesOff: function(){
-    this.manualTimeUpdates = false;
-    this.stopTrackingCurrentTime();
-    this.removeEvent("play", this.trackCurrentTime);
-    this.removeEvent("pause", this.stopTrackingCurrentTime);
-  },
-
-  trackCurrentTime: function(){
-    if (this.currentTimeInterval) { this.stopTrackingCurrentTime(); }
-    this.currentTimeInterval = setInterval(_V_.proxy(this, function(){
-      this.triggerEvent("timeupdate");
-    }), 250); // 42 = 24 fps // 250 is what Webkit uses // FF uses 15
-  },
-
-  // Turn off play progress tracking (when paused or dragging)
-  stopTrackingCurrentTime: function(){ clearInterval(this.currentTimeInterval); },
-
-  /* Player event handlers (how the player reacts to certain events)
-  ================================================================================ */
-  onEnded: function(){
-    if (this.options.loop) {
-      this.currentTime(0);
-      this.play();
-    } else {
-      this.pause();
-      this.currentTime(0);
-      this.pause();
-    }
-  },
-
-  onPlay: function(){
-    _V_.removeClass(this.el, "vjs-paused");
-    _V_.addClass(this.el, "vjs-playing");
-  },
-
-  onPause: function(){
-    _V_.removeClass(this.el, "vjs-playing");
-    _V_.addClass(this.el, "vjs-paused");
-  },
-
-  onProgress: function(){
-    // Add custom event for when source is finished downloading.
-    if (this.bufferedPercent() == 1) {
-      this.triggerEvent("loadedalldata");
-    }
-  },
-
-  onError: function(e) {
-    _V_.log("Video Error", e);
-  },
-
-/* Player API
-================================================================================ */
-
-  // Pass values to the playback tech
-  techCall: function(method, arg){
-
-    // If it's not ready yet, call method when it is
-    if (!this.tech.isReady) {
-      this.tech.ready(function(){
-        this[method](arg);
-      });
-
-    // Otherwise call method now
-    } else {
-      try {
-        this.tech[method](arg);
-      } catch(e) {
-        _V_.log(e);
-      }
-    }
-  },
-
-  // Get calls can't wait for the tech, and sometimes don't need to.
-  techGet: function(method){
-
-    // Make sure tech is ready
-    if (this.tech.isReady) {
-
-      // Flash likes to die and reload when you hide or reposition it.
-      // In these cases the object methods go away and we get errors.
-      // When that happens we'll catch the errors and inform tech that it's not ready any more.
-      try {
-        return this.tech[method]();
-      } catch(e) {
-
-        // When building additional tech libs, an expected method may not be defined yet
-        if (this.tech[method] === undefined) {
-          _V_.log("Video.js: " + method + " method not defined for "+this.techName+" playback technology.", e);
-
-        } else {
-
-          // When a method isn't available on the object it throws a TypeError
-          if (e.name == "TypeError") {
-            _V_.log("Video.js: " + method + " unavailable on "+this.techName+" playback technology element.", e);
-            this.tech.isReady = false;
-
-          } else {
-            _V_.log(e);
-          }
-        }
-      }
-    }
-
-    return;
-  },
-
-  // Method for calling methods on the current playback technology
-  // techCall: function(method, arg){
-  // 
-  //   // if (this.isReady) {
-  //   //   
-  //   // } else {
-  //   //   _V_.log("The playback technology API is not ready yet. Use player.ready(myFunction)."+" ["+method+"]", arguments.callee.caller.arguments.callee.caller.arguments.callee.caller)
-  //   //   return false;
-  //   //   // throw new Error("The playback technology API is not ready yet. Use player.ready(myFunction)."+" ["+method+"]");
-  //   // }
-  // },
-
-  // http://dev.w3.org/html5/spec/video.html#dom-media-play
-  play: function(){
-    this.techCall("play");
-    return this;
-  },
-
-  // http://dev.w3.org/html5/spec/video.html#dom-media-pause
-  pause: function(){
-    this.techCall("pause");
-    return this;
-  },
-  
-  // http://dev.w3.org/html5/spec/video.html#dom-media-paused
-  // The initial state of paused should be true (in Safari it's actually false)
-  paused: function(){
-    return (this.techGet("paused") === false) ? false : true;
-  },
-
-  // http://dev.w3.org/html5/spec/video.html#dom-media-currenttime
-  currentTime: function(seconds){
-    if (seconds !== undefined) {
-
-      // Cache the last set value for smoother scrubbing.
-      this.values.lastSetCurrentTime = seconds;
-
-      this.techCall("setCurrentTime", seconds);
-
-      // Improve the accuracy of manual timeupdates
-      if (this.manualTimeUpdates) { this.triggerEvent("timeupdate"); }
-
-      return this;
-    }
-
-    // Cache last currentTime and return
-    // Default to 0 seconds
-    return this.values.currentTime = (this.techGet("currentTime") || 0);
-  },
-
-  // http://dev.w3.org/html5/spec/video.html#dom-media-duration
-  // Duration should return NaN if not available. ParseFloat will turn false-ish values to NaN.
-  duration: function(){
-    return parseFloat(this.techGet("duration"));
-  },
-
-  // Calculates how much time is left. Not in spec, but useful.
-  remainingTime: function(){
-    return this.duration() - this.currentTime();
-  },
-
-  // http://dev.w3.org/html5/spec/video.html#dom-media-buffered
-  // Buffered returns a timerange object. Kind of like an array of portions of the video that have been downloaded.
-  // So far no browsers return more than one range (portion)
-  buffered: function(){
-    var buffered = this.techGet("buffered"),
-        start = 0,
-        end = this.values.bufferEnd = this.values.bufferEnd || 0, // Default end to 0 and store in values
-        timeRange;
-
-    if (buffered && buffered.length > 0 && buffered.end(0) !== end) {
-      end = buffered.end(0);
-      // Storing values allows them be overridden by setBufferedFromProgress
-      this.values.bufferEnd = end;
-    }
-
-    return _V_.createTimeRange(start, end);
-  },
-
-  // Calculates amount of buffer is full. Not in spec but useful.
-  bufferedPercent: function(){
-    return (this.duration()) ? this.buffered().end(0) / this.duration() : 0;
-  },
-
-  // http://dev.w3.org/html5/spec/video.html#dom-media-volume
-  volume: function(percentAsDecimal){
-    var vol;
-
-    if (percentAsDecimal !== undefined) {
-      vol = Math.max(0, Math.min(1, parseFloat(percentAsDecimal))); // Force value to between 0 and 1
-      this.values.volume = vol;
-      this.techCall("setVolume", vol);
-      _V_.setLocalStorage("volume", vol);
-      return this;
-    }
-
-    // Default to 1 when returning current volume.
-    vol = parseFloat(this.techGet("volume"));
-    return (isNaN(vol)) ? 1 : vol;
-  },
-
-  // http://dev.w3.org/html5/spec/video.html#attr-media-muted
-  muted: function(muted){
-    if (muted !== undefined) {
-      this.techCall("setMuted", muted);
-      return this;
-    }
-    return this.techGet("muted") || false; // Default to false
-  },
-
-  // http://dev.w3.org/html5/spec/dimension-attributes.html#attr-dim-height
-  // Video tag width/height only work in pixels. No percents.
-  // We could potentially allow percents but won't for now until we can do testing around it.
-  width: function(width, skipListeners){
-    if (width !== undefined) {
-      this.el.width = width;
-      this.el.style.width = width+"px";
-
-      // skipListeners allows us to avoid triggering the resize event when setting both width and height
-      if (!skipListeners) { this.triggerEvent("resize"); }
-      return this;
-    }
-    return parseInt(this.el.getAttribute("width"));
-  },
-  height: function(height){
-    if (height !== undefined) {
-      this.el.height = height;
-      this.el.style.height = height+"px";
-      this.triggerEvent("resize");
-      return this;
-    }
-    return parseInt(this.el.getAttribute("height"));
-  },
-  // Set both width and height at the same time.
-  size: function(width, height){
-    // Skip resize listeners on width for optimization
-    return this.width(width, true).height(height);
-  },
-
-  // Check if current tech can support native fullscreen (e.g. with built in controls lik iOS, so not our flash swf)
-  supportsFullScreen: function(){ return this.techGet("supportsFullScreen") || false; },
-
-  // Turn on fullscreen (or window) mode
-  requestFullScreen: function(){
-    var requestFullScreen = _V_.support.requestFullScreen;
-
-    this.isFullScreen = true;
-
-    // Check for browser element fullscreen support
-    if (requestFullScreen) {
-
-      // Trigger fullscreenchange event after change
-      _V_.addEvent(document, requestFullScreen.eventName, this.proxy(function(){
-        this.isFullScreen = document[requestFullScreen.isFullScreen];
-
-        // If cancelling fullscreen, remove event listener.
-        if (this.isFullScreen == false) {
-          _V_.removeEvent(document, requestFullScreen.eventName, arguments.callee);
-        }
-
-        this.triggerEvent("fullscreenchange");
-      }));
-
-      // Flash and other plugins get reloaded when you take their parent to fullscreen.
-      // To fix that we'll remove the tech, and reload it after the resize has finished.
-      if (this.tech.support.fullscreenResize === false && this.options.flash.iFrameMode != true) {
-
-        this.pause();
-        this.unloadTech();
-
-        _V_.addEvent(document, requestFullScreen.eventName, this.proxy(function(){
-          _V_.removeEvent(document, requestFullScreen.eventName, arguments.callee);
-          this.loadTech(this.techName, { src: this.values.src });
-        }));
-
-        this.el[requestFullScreen.requestFn]();
-
-      } else {
-        this.el[requestFullScreen.requestFn]();
-      }
-
-    } else if (this.tech.supportsFullScreen()) {
-      this.triggerEvent("fullscreenchange");
-      this.techCall("enterFullScreen");
-
-    } else {
-      this.triggerEvent("fullscreenchange");
-      this.enterFullWindow();
-    }
-
-     return this;
-   },
-
-   cancelFullScreen: function(){
-    var requestFullScreen = _V_.support.requestFullScreen;
-
-    this.isFullScreen = false;
-
-    // Check for browser element fullscreen support
-    if (requestFullScreen) {
-
-     // Flash and other plugins get reloaded when you take their parent to fullscreen.
-     // To fix that we'll remove the tech, and reload it after the resize has finished.
-     if (this.tech.support.fullscreenResize === false && this.options.flash.iFrameMode != true) {
-
-       this.pause();
-       this.unloadTech();
-
-       _V_.addEvent(document, requestFullScreen.eventName, this.proxy(function(){
-         _V_.removeEvent(document, requestFullScreen.eventName, arguments.callee);
-         this.loadTech(this.techName, { src: this.values.src })
-       }));
-
-       document[requestFullScreen.cancelFn]();
-
-     } else {
-       document[requestFullScreen.cancelFn]();
-     }
-
-    } else if (this.tech.supportsFullScreen()) {
-     this.techCall("exitFullScreen");
-     this.triggerEvent("fullscreenchange");
-
-    } else {
-     this.exitFullWindow();
-     this.triggerEvent("fullscreenchange");
-    }
-
-    return this;
-  },
-
-  // When fullscreen isn't supported we can stretch the video container to as wide as the browser will let us.
-  enterFullWindow: function(){
-    this.isFullWindow = true;
-
-    // Storing original doc overflow value to return to when fullscreen is off
-    this.docOrigOverflow = document.documentElement.style.overflow;
-
-    // Add listener for esc key to exit fullscreen
-    _V_.addEvent(document, "keydown", _V_.proxy(this, this.fullWindowOnEscKey));
-
-    // Hide any scroll bars
-    document.documentElement.style.overflow = 'hidden';
-
-    // Apply fullscreen styles
-    _V_.addClass(document.body, "vjs-full-window");
-    _V_.addClass(this.el, "vjs-fullscreen");
-
-    this.triggerEvent("enterFullWindow");
-  },
-  fullWindowOnEscKey: function(event){
-    if (event.keyCode == 27) {
-      if (this.isFullScreen == true) {
-        this.cancelFullScreen();
-      } else {
-        this.exitFullWindow();
-      }
-    }
-  },
-
-  exitFullWindow: function(){
-    this.isFullWindow = false;
-    _V_.removeEvent(document, "keydown", this.fullWindowOnEscKey);
-
-    // Unhide scroll bars.
-    document.documentElement.style.overflow = this.docOrigOverflow;
-
-    // Remove fullscreen styles
-    _V_.removeClass(document.body, "vjs-full-window");
-    _V_.removeClass(this.el, "vjs-fullscreen");
-
-    // Resize the box, controller, and poster to original sizes
-    // this.positionAll();
-    this.triggerEvent("exitFullWindow");
-  },
-
-  selectSource: function(sources){
-
-    // Loop through each playback technology in the options order
-    for (var i=0,j=this.options.techOrder;i<j.length;i++) {
-      var techName = j[i],
-          tech = _V_[techName];
-          // tech = _V_.tech[techName];
-
-      // Check if the browser supports this technology
-      if (tech.isSupported()) {
-
-        // Loop through each source object
-        for (var a=0,b=sources;a<b.length;a++) {
-          var source = b[a];
-
-          // Check if source can be played with this technology
-          if (tech.canPlaySource.call(this, source)) {
-
-            return { source: source, tech: techName };
-
-          }
-        }
-      }
-    }
-
-    return false;
-  },
-
-  // src is a pretty powerful function
-  // If you pass it an array of source objects, it will find the best source to play and use that object.src
-  //   If the new source requires a new playback technology, it will switch to that.
-  // If you pass it an object, it will set the source to object.src
-  // If you pass it anything else (url string) it will set the video source to that
-  src: function(source){
-    // Case: Array of source objects to choose from and pick the best to play
-    if (source instanceof Array) {
-
-      var sourceTech = this.selectSource(source),
-          source,
-          techName;
-
-      if (sourceTech) {
-          source = sourceTech.source;
-          techName = sourceTech.tech;
-
-        // If this technology is already loaded, set source
-        if (techName == this.techName) {
-          this.src(source); // Passing the source object
-
-        // Otherwise load this technology with chosen source
-        } else {
-          this.loadTech(techName, source);
-        }
-      } else {
-        _V_.log("No compatible source and playback technology were found.")
-      }
-
-    // Case: Source object { src: "", type: "" ... }
-    } else if (source instanceof Object) {
-
-      if (_V_[this.techName].canPlaySource(source)) {
-        this.src(source.src);
-      } else {
-        // Send through tech loop to check for a compatible technology.
-        this.src([source]);
-      }
-
-    // Case: URL String (http://myvideo...)
-    } else {
-      // Cache for getting last set source
-      this.values.src = source;
-
-      if (!this.isReady) {
-        this.ready(function(){
-          this.src(source);
-        });
-      } else {
-        this.techCall("src", source);
-        if (this.options.preload == "auto") {
-          this.load();
-        }
-        if (this.options.autoplay) {
-          this.play();
-        }
-      }
-    }
-    return this;
-  },
-
-  // Begin loading the src data
-  // http://dev.w3.org/html5/spec/video.html#dom-media-load
-  load: function(){
-    this.techCall("load");
-    return this;
-  },
-
-  // http://dev.w3.org/html5/spec/video.html#dom-media-currentsrc
-  currentSrc: function(){
-    return this.techGet("currentSrc") || this.values.src || "";
-  },
-
-  // Attributes/Options
-  preload: function(value){
-    if (value !== undefined) {
-      this.techCall("setPreload", value);
-      this.options.preload = value;
-      return this;
-    }
-    return this.techGet("preload");
-  },
-  autoplay: function(value){
-    if (value !== undefined) {
-      this.techCall("setAutoplay", value);
-      this.options.autoplay = value;
-      return this;
-    }
-    return this.techGet("autoplay", value);
-  },
-  loop: function(value){
-    if (value !== undefined) {
-      this.techCall("setLoop", value);
-      this.options.loop = value;
-      return this;
-    }
-    return this.techGet("loop");
-  },
-
-  controls: function(){ return this.options.controls; },
-  poster: function(){ return this.techGet("poster"); },
-  error: function(){ return this.techGet("error"); },
-  ended: function(){ return this.techGet("ended"); }
-
-  // Methods to add support for
-  // networkState: function(){ return this.techCall("networkState"); },
-  // readyState: function(){ return this.techCall("readyState"); },
-  // seeking: function(){ return this.techCall("seeking"); },
-  // initialTime: function(){ return this.techCall("initialTime"); },
-  // startOffsetTime: function(){ return this.techCall("startOffsetTime"); },
-  // played: function(){ return this.techCall("played"); },
-  // seekable: function(){ return this.techCall("seekable"); },
-  // videoTracks: function(){ return this.techCall("videoTracks"); },
-  // audioTracks: function(){ return this.techCall("audioTracks"); },
-  // videoWidth: function(){ return this.techCall("videoWidth"); },
-  // videoHeight: function(){ return this.techCall("videoHeight"); },
-  // defaultPlaybackRate: function(){ return this.techCall("defaultPlaybackRate"); },
-  // playbackRate: function(){ return this.techCall("playbackRate"); },
-  // mediaGroup: function(){ return this.techCall("mediaGroup"); },
-  // controller: function(){ return this.techCall("controller"); },
-  // defaultMuted: function(){ return this.techCall("defaultMuted"); }
-});
-
-// RequestFullscreen API
-(function(){
-  var requestFn,
-      cancelFn,
-      eventName,
-      isFullScreen,
-      playerProto = _V_.Player.prototype;
-
-  // Current W3C Spec
-  // http://dvcs.w3.org/hg/fullscreen/raw-file/tip/Overview.html#api
-  // Mozilla Draft: https://wiki.mozilla.org/Gecko:FullScreenAPI#fullscreenchange_event
-  if (document.cancelFullscreen !== undefined) {
-    requestFn = "requestFullscreen";
-    cancelFn = "exitFullscreen";
-    eventName = "fullscreenchange";
-    isFullScreen = "fullScreen";
-
-  // Webkit (Chrome/Safari) and Mozilla (Firefox) have working implementaitons
-  // that use prefixes and vary slightly from the new W3C spec. Specifically, using 'exit' instead of 'cancel',
-  // and lowercasing the 'S' in Fullscreen.
-  // Other browsers don't have any hints of which version they might follow yet, so not going to try to predict by loopeing through all prefixes.
-  } else {
-
-    _V_.each(["moz", "webkit"], function(prefix){
-
-      // https://github.com/zencoder/video-js/pull/128
-      if ((prefix != "moz" || document.mozFullScreenEnabled) && document[prefix + "CancelFullScreen"] !== undefined) {
-        requestFn = prefix + "RequestFullScreen";
-        cancelFn = prefix + "CancelFullScreen";
-        eventName = prefix + "fullscreenchange";
-
-        if (prefix == "webkit") {
-          isFullScreen = prefix + "IsFullScreen";
-        } else {
-          isFullScreen = prefix + "FullScreen";
-        }
-      }
-
-    });
-
-  }
-
-  if (requestFn) {
-    _V_.support.requestFullScreen = {
-      requestFn: requestFn,
-      cancelFn: cancelFn,
-      eventName: eventName,
-      isFullScreen: isFullScreen
-    };
-  }
-
-})();/* Playback Technology - Base class for playback technologies
-================================================================================ */
-_V_.PlaybackTech = _V_.Component.extend({
-  init: function(player, options){
-    // this._super(player, options);
-
-    // Make playback element clickable
-    // _V_.addEvent(this.el, "click", _V_.proxy(this, _V_.PlayToggle.prototype.onClick));
-
-    // this.addEvent("click", this.proxy(this.onClick));
-
-    // player.triggerEvent("techready");
-  },
-  // destroy: function(){},
-  // createElement: function(){},
-  onClick: function(){
-    if (this.player.options.controls) {
-      _V_.PlayToggle.prototype.onClick.call(this);
-    }
-  }
-});
-
-// Create placeholder methods for each that warn when a method isn't supported by the current playback technology
-_V_.apiMethods = "play,pause,paused,currentTime,setCurrentTime,duration,buffered,volume,setVolume,muted,setMuted,width,height,supportsFullScreen,enterFullScreen,src,load,currentSrc,preload,setPreload,autoplay,setAutoplay,loop,setLoop,error,networkState,readyState,seeking,initialTime,startOffsetTime,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks,defaultPlaybackRate,playbackRate,mediaGroup,controller,controls,defaultMuted".split(",");
-_V_.each(_V_.apiMethods, function(methodName){
-  _V_.PlaybackTech.prototype[methodName] = function(){
-    throw new Error("The '"+methodName+"' method is not available on the playback technology's API");
-  }
-});
-
-/* HTML5 Playback Technology - Wrapper for HTML5 Media API
-================================================================================ */
-_V_.html5 = _V_.PlaybackTech.extend({
-
-  init: function(player, options, ready){
-    this.player = player;
-    this.el = this.createElement();
-    this.ready(ready);
-
-    this.addEvent("click", this.proxy(this.onClick));
-
-    var source = options.source;
-
-    // If the element source is already set, we may have missed the loadstart event, and want to trigger it.
-    // We don't want to set the source again and interrupt playback.
-    if (source && this.el.currentSrc == source.src) {
-      player.triggerEvent("loadstart");
-
-    // Otherwise set the source if one was provided.
-    } else if (source) {
-      this.el.src = source.src;
-    }
-
-    // Chrome and Safari both have issues with autoplay.
-    // In Safari (5.1.1), when we move the video element into the container div, autoplay doesn't work.
-    // In Chrome (15), if you have autoplay + a poster + no controls, the video gets hidden (but audio plays)
-    // This fixes both issues. Need to wait for API, so it updates displays correctly
-    player.ready(function(){
-      if (this.options.autoplay && this.paused()) {
-        this.tag.poster = null; // Chrome Fix. Fixed in Chrome v16.
-        this.play();
-      }
-    });
-
-    this.setupTriggers();
-
-    this.triggerReady();
-  },
-
-  destroy: function(){
-    this.player.tag = false;
-    this.removeTriggers();
-    this.el.parentNode.removeChild(this.el);
-  },
-
-  createElement: function(){
-    var html5 = _V_.html5,
-        player = this.player,
-
-        // If possible, reuse original tag for HTML5 playback technology element
-        el = player.tag,
-        newEl;
-
-    // Check if this browser supports moving the element into the box.
-    // On the iPhone video will break if you move the element,
-    // So we have to create a brand new element.
-    if (!el || this.support.movingElementInDOM === false) {
-
-      // If the original tag is still there, remove it.
-      if (el) {
-        player.el.removeChild(el);
-      }
-
-      newEl = _V_.createElement("video", {
-        id: el.id || player.el.id + "_html5_api",
-        className: el.className || "vjs-tech"
-      });
-
-      el = newEl;
-      _V_.insertFirst(el, player.el);
-    }
-
-    // Update tag settings, in case they were overridden
-    _V_.each(["autoplay","preload","loop","muted"], function(attr){ // ,"poster"
-      if (player.options[attr] !== null) {
-        el[attr] = player.options[attr];
-      }
-    }, this);
-
-    return el;
-  },
-
-  // Make video events trigger player events
-  // May seem verbose here, but makes other APIs possible.
-  setupTriggers: function(){
-    _V_.each.call(this, _V_.html5.events, function(type){
-      _V_.addEvent(this.el, type, _V_.proxy(this.player, this.eventHandler));
-    });
-  },
-  removeTriggers: function(){
-    _V_.each.call(this, _V_.html5.events, function(type){
-      _V_.removeEvent(this.el, type, _V_.proxy(this.player, this.eventHandler));
-    });
-  },
-  eventHandler: function(e){
-    e.stopPropagation();
-    this.triggerEvent(e);
-  },
-
-  play: function(){ this.el.play(); },
-  pause: function(){ this.el.pause(); },
-  paused: function(){ return this.el.paused; },
-
-  currentTime: function(){ return this.el.currentTime; },
-  setCurrentTime: function(seconds){
-    try {
-      this.el.currentTime = seconds;
-      } catch(e) {
-        _V_.log(e, "Video isn't ready. (VideoJS)");
-      // this.warning(VideoJS.warnings.videoNotReady);
-    }
-  },
-
-  duration: function(){ return this.el.duration || 0; },
-  buffered: function(){ return this.el.buffered; },
-
-  volume: function(){ return this.el.volume; },
-  setVolume: function(percentAsDecimal){ this.el.volume = percentAsDecimal; },
-  muted: function(){ return this.el.muted; },
-  setMuted: function(muted){ this.el.muted = muted },
-
-  width: function(){ return this.el.offsetWidth; },
-  height: function(){ return this.el.offsetHeight; },
-
-  supportsFullScreen: function(){
-    if (typeof this.el.webkitEnterFullScreen == 'function') {
-
-      // Seems to be broken in Chromium/Chrome && Safari in Leopard
-      if (!navigator.userAgent.match("Chrome") && !navigator.userAgent.match("Mac OS X 10.5")) {
-        return true;
-      }
-    }
-    return false;
-  },
-
-  enterFullScreen: function(){
-      try {
-        this.el.webkitEnterFullScreen();
-      } catch (e) {
-        if (e.code == 11) {
-          // this.warning(VideoJS.warnings.videoNotReady);
-          _V_.log("VideoJS: Video not ready.")
-        }
-      }
-  },
-  src: function(src){ this.el.src = src; },
-  load: function(){ this.el.load(); },
-  currentSrc: function(){ return this.el.currentSrc; },
-
-  preload: function(){ return this.el.preload; },
-  setPreload: function(val){ this.el.preload = val; },
-  autoplay: function(){ return this.el.autoplay; },
-  setAutoplay: function(val){ this.el.autoplay = val; },
-  loop: function(){ return this.el.loop; },
-  setLoop: function(val){ this.el.loop = val; },
-
-  error: function(){ return this.el.error; },
-  // networkState: function(){ return this.el.networkState; },
-  // readyState: function(){ return this.el.readyState; },
-  seeking: function(){ return this.el.seeking; },
-  // initialTime: function(){ return this.el.initialTime; },
-  // startOffsetTime: function(){ return this.el.startOffsetTime; },
-  // played: function(){ return this.el.played; },
-  // seekable: function(){ return this.el.seekable; },
-  ended: function(){ return this.el.ended; },
-  // videoTracks: function(){ return this.el.videoTracks; },
-  // audioTracks: function(){ return this.el.audioTracks; },
-  // videoWidth: function(){ return this.el.videoWidth; },
-  // videoHeight: function(){ return this.el.videoHeight; },
-  // textTracks: function(){ return this.el.textTracks; },
-  // defaultPlaybackRate: function(){ return this.el.defaultPlaybackRate; },
-  // playbackRate: function(){ return this.el.playbackRate; },
-  // mediaGroup: function(){ return this.el.mediaGroup; },
-  // controller: function(){ return this.el.controller; },
-  controls: function(){ return this.player.options.controls; },
-  defaultMuted: function(){ return this.el.defaultMuted; }
-});
-
-/* HTML5 Support Testing -------------------------------------------------------- */
-
-_V_.html5.isSupported = function(){
-  return !!document.createElement("video").canPlayType;
-};
-
-_V_.html5.canPlaySource = function(srcObj){
-  return !!document.createElement("video").canPlayType(srcObj.type);
-  // TODO: Check Type
-  // If no Type, check ext
-  // Check Media Type
-};
-
-// List of all HTML5 events (various uses).
-_V_.html5.events = "loadstart,suspend,abort,error,emptied,stalled,loadedmetadata,loadeddata,canplay,canplaythrough,playing,waiting,seeking,seeked,ended,durationchange,timeupdate,progress,play,pause,ratechange,volumechange".split(",");
-
-/* HTML5 Device Fixes ---------------------------------------------------------- */
-
-_V_.html5.prototype.support = {
-
-  // Support for tech specific full screen. (webkitEnterFullScreen, not requestFullscreen)
-  // http://developer.apple.com/library/safari/#documentation/AudioVideo/Reference/HTMLVideoElementClassReference/HTMLVideoElement/HTMLVideoElement.html
-  // Seems to be broken in Chromium/Chrome && Safari in Leopard
-  fullscreen: (typeof _V_.testVid.webkitEnterFullScreen !== undefined) ? (!_V_.ua.match("Chrome") && !_V_.ua.match("Mac OS X 10.5") ? true : false) : false,
-
-  // In iOS, if you move a video element in the DOM, it breaks video playback.
-  movingElementInDOM: !_V_.isIOS()
-
-};
-
-// Android
-if (_V_.isAndroid()) {
-
-  // Override Android 2.2 and less canPlayType method which is broken
-  if (_V_.androidVersion() < 3) {
-    document.createElement("video").constructor.prototype.canPlayType = function(type){
-      return (type && type.toLowerCase().indexOf("video/mp4") != -1) ? "maybe" : "";
-    };
-  }
-}
-
-
-/* VideoJS-SWF - Custom Flash Player with HTML5-ish API - https://github.com/zencoder/video-js-swf
-================================================================================ */
-_V_.flash = _V_.PlaybackTech.extend({
-
-  init: function(player, options){
-    this.player = player;
-
-    var source = options.source,
-
-        // Which element to embed in
-        parentEl = options.parentEl,
-
-        // Create a temporary element to be replaced by swf object
-        placeHolder = this.el = _V_.createElement("div", { id: parentEl.id + "_temp_flash" }),
-
-        // Generate ID for swf object
-        objId = player.el.id+"_flash_api",
-
-        // Store player options in local var for optimization
-        playerOptions = player.options,
-
-        // Merge default flashvars with ones passed in to init
-        flashVars = _V_.merge({
-
-          // SWF Callback Functions
-          readyFunction: "_V_.flash.onReady",
-          eventProxyFunction: "_V_.flash.onEvent",
-          errorEventProxyFunction: "_V_.flash.onError",
-
-          // Player Settings
-          autoplay: playerOptions.autoplay,
-          preload: playerOptions.preload,
-          loop: playerOptions.loop,
-          muted: playerOptions.muted
-
-        }, options.flashVars),
-
-        // Merge default parames with ones passed in
-        params = _V_.merge({
-          wmode: "opaque", // Opaque is needed to overlay controls, but can affect playback performance
-          bgcolor: "#000000" // Using bgcolor prevents a white flash when the object is loading
-        }, options.params),
-
-        // Merge default attributes with ones passed in
-        attributes = _V_.merge({
-          id: objId,
-          name: objId, // Both ID and Name needed or swf to identifty itself
-          'class': 'vjs-tech'
-        }, options.attributes)
-    ;
-
-    // If source was supplied pass as a flash var.
-    if (source) {
-      flashVars.src = encodeURIComponent(_V_.getAbsoluteURL(source.src));
-    }
-
-    // Add placeholder to player div
-    _V_.insertFirst(placeHolder, parentEl);
-
-    // Having issues with Flash reloading on certain page actions (hide/resize/fullscreen) in certain browsers
-    // This allows resetting the playhead when we catch the reload
-    if (options.startTime) {
-      this.ready(function(){
-        this.load();
-        this.play();
-        this.currentTime(options.startTime);
-      });
-    }
-
-    // Flash iFrame Mode
-    // In web browsers there are multiple instances where changing the parent element or visibility of a plugin causes the plugin to reload.
-    // - Firefox just about always. https://bugzilla.mozilla.org/show_bug.cgi?id=90268 (might be fixed by version 13)
-    // - Webkit when hiding the plugin
-    // - Webkit and Firefox when using requestFullScreen on a parent element
-    // Loading the flash plugin into a dynamically generated iFrame gets around most of these issues.
-    // Issues that remain include hiding the element and requestFullScreen in Firefox specifically
-
-    // There's on particularly annoying issue with this method which is that Firefox throws a security error on an offsite Flash object loaded into a dynamically created iFrame.
-    // Even though the iframe was inserted into a page on the web, Firefox + Flash considers it a local app trying to access an internet file.
-    // I tried mulitple ways of setting the iframe src attribute but couldn't find a src that worked well. Tried a real/fake source, in/out of domain.
-    // Also tried a method from stackoverflow that caused a security error in all browsers. http://stackoverflow.com/questions/2486901/how-to-set-document-domain-for-a-dynamically-generated-iframe
-    // In the end the solution I found to work was setting the iframe window.location.href right before doing a document.write of the Flash object.
-    // The only downside of this it seems to trigger another http request to the original page (no matter what's put in the href). Not sure why that is.
-
-    // NOTE (2012-01-29): Cannot get Firefox to load the remote hosted SWF into a dynamically created iFrame
-    // Firefox 9 throws a security error, unleess you call location.href right before doc.write.
-    //    Not sure why that even works, but it causes the browser to look like it's continuously trying to load the page.
-    // Firefox 3.6 keeps calling the iframe onload function anytime I write to it, causing an endless loop.
-
-    if (options.iFrameMode == true && !_V_.isFF) {
-
-      // Create iFrame with vjs-tech class so it's 100% width/height
-      var iFrm = _V_.createElement("iframe", {
-        id: objId + "_iframe",
-        name: objId + "_iframe",
-        className: "vjs-tech",
-        scrolling: "no",
-        marginWidth: 0,
-        marginHeight: 0,
-        frameBorder: 0
-      });
-
-      // Update ready function names in flash vars for iframe window
-      flashVars.readyFunction = "ready";
-      flashVars.eventProxyFunction = "events";
-      flashVars.errorEventProxyFunction = "errors";
-
-      // Tried multiple methods to get this to work in all browsers
-
-      // Tried embedding the flash object in the page first, and then adding a place holder to the iframe, then replacing the placeholder with the page object.
-      // The goal here was to try to load the swf URL in the parent page first and hope that got around the firefox security error
-      // var newObj = _V_.flash.embed(options.swf, placeHolder, flashVars, params, attributes);
-      // (in onload)
-      //  var temp = _V_.createElement("a", { id:"asdf", innerHTML: "asdf" } );
-      //  iDoc.body.appendChild(temp);
-
-      // Tried embedding the flash object through javascript in the iframe source.
-      // This works in webkit but still triggers the firefox security error
-      // iFrm.src = "javascript: document.write('"+_V_.flash.getEmbedCode(options.swf, flashVars, params, attributes)+"');";
-
-      // Tried an actual local iframe just to make sure that works, but it kills the easiness of the CDN version if you require the user to host an iframe
-      // We should add an option to host the iframe locally though, because it could help a lot of issues.
-      // iFrm.src = "iframe.html";
-
-      // Wait until iFrame has loaded to write into it.
-      _V_.addEvent(iFrm, "load", _V_.proxy(this, function(){
-
-        var iDoc, objTag, swfLoc,
-            iWin = iFrm.contentWindow,
-            varString = "";
-
-
-        // The one working method I found was to use the iframe's document.write() to create the swf object
-        // This got around the security issue in all browsers except firefox.
-        // I did find a hack where if I call the iframe's window.location.href="", it would get around the security error
-        // However, the main page would look like it was loading indefinitely (URL bar loading spinner would never stop)
-        // Plus Firefox 3.6 didn't work no matter what I tried.
-        // if (_V_.ua.match("Firefox")) {
-        //   iWin.location.href = "";
-        // }
-
-        // Get the iFrame's document depending on what the browser supports
-        iDoc = iFrm.contentDocument ? iFrm.contentDocument : iFrm.contentWindow.document;
-
-        // Tried ensuring both document domains were the same, but they already were, so that wasn't the issue.
-        // Even tried adding /. that was mentioned in a browser security writeup
-        // document.domain = document.domain+"/.";
-        // iDoc.domain = document.domain+"/.";
-
-        // Tried adding the object to the iframe doc's innerHTML. Security error in all browsers.
-        // iDoc.body.innerHTML = swfObjectHTML;
-
-        // Tried appending the object to the iframe doc's body. Security error in all browsers.
-        // iDoc.body.appendChild(swfObject);
-
-        // Using document.write actually got around the security error that browsers were throwing.
-        // Again, it's a dynamically generated (same domain) iframe, loading an external Flash swf.
-        // Not sure why that's a security issue, but apparently it is.
-        iDoc.write(_V_.flash.getEmbedCode(options.swf, flashVars, params, attributes));
-
-        // Setting variables on the window needs to come after the doc write because otherwise they can get reset in some browsers
-        // So far no issues with swf ready event being called before it's set on the window.
-        iWin.player = this.player;
-
-        // Create swf ready function for iFrame window
-        iWin.ready = _V_.proxy(this.player, function(currSwf){
-          var el = iDoc.getElementById(currSwf),
-              player = this,
-              tech = player.tech;
-
-          // Update reference to playback technology element
-          tech.el = el;
-
-          // Now that the element is ready, make a click on the swf play the video
-          _V_.addEvent(el, "click", tech.proxy(tech.onClick));
-
-          // Make sure swf is actually ready. Sometimes the API isn't actually yet.
-          _V_.flash.checkReady(tech);
-        });
-
-        // Create event listener for all swf events
-        iWin.events = _V_.proxy(this.player, function(swfID, eventName, other){
-          var player = this;
-          if (player && player.techName == "flash") {
-            player.triggerEvent(eventName);
-          }
-        });
-
-        // Create error listener for all swf errors
-        iWin.errors = _V_.proxy(this.player, function(swfID, eventName){
-          _V_.log("Flash Error", eventName);
-        });
-
-      }));
-
-      // Replace placeholder with iFrame (it will load now)
-      placeHolder.parentNode.replaceChild(iFrm, placeHolder);
-
-    // If not using iFrame mode, embed as normal object
-    } else {
-      _V_.flash.embed(options.swf, placeHolder, flashVars, params, attributes);
-    }
-  },
-
-  destroy: function(){
-    this.el.parentNode.removeChild(this.el);
-  },
-
-  // setupTriggers: function(){}, // Using global onEvent func to distribute events
-
-  play: function(){ this.el.vjs_play(); },
-  pause: function(){ this.el.vjs_pause(); },
-  src: function(src){
-    // Make sure source URL is abosolute.
-    src = _V_.getAbsoluteURL(src);
-
-    this.el.vjs_src(src);
-
-    // Currently the SWF doesn't autoplay if you load a source later.
-    // e.g. Load player w/ no source, wait 2s, set src.
-    if (this.player.autoplay()) {
-      var tech = this;
-      setTimeout(function(){ tech.play(); }, 0);
-    }
-  },
-  load: function(){ this.el.vjs_load(); },
-  poster: function(){ this.el.vjs_getProperty("poster"); },
-
-  buffered: function(){
-    return _V_.createTimeRange(0, this.el.vjs_getProperty("buffered"));
-  },
-
-  supportsFullScreen: function(){
-    return false; // Flash does not allow fullscreen through javascript
-  },
-  enterFullScreen: function(){
-    return false;
-  }
-});
-
-// Create setters and getters for attributes
-(function(){
-
-  var api = _V_.flash.prototype,
-      readWrite = "preload,currentTime,defaultPlaybackRate,playbackRate,autoplay,loop,mediaGroup,controller,controls,volume,muted,defaultMuted".split(","),
-      readOnly = "error,currentSrc,networkState,readyState,seeking,initialTime,duration,startOffsetTime,paused,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks".split(","),
-      callOnly = "load,play,pause".split(",");
-      // Overridden: buffered
-
-      createSetter = function(attr){
-        var attrUpper = attr.charAt(0).toUpperCase() + attr.slice(1);
-        api["set"+attrUpper] = function(val){ return this.el.vjs_setProperty(attr, val); };
-      },
-
-      createGetter = function(attr){
-        api[attr] = function(){ return this.el.vjs_getProperty(attr); };
-      }
-  ;
-
-  // Create getter and setters for all read/write attributes
-  _V_.each(readWrite, function(attr){
-    createGetter(attr);
-    createSetter(attr);
-  });
-
-  // Create getters for read-only attributes
-  _V_.each(readOnly, function(attr){
-    createGetter(attr);
-  });
-
-})();
-
-/* Flash Support Testing -------------------------------------------------------- */
-
-_V_.flash.isSupported = function(){
-  return _V_.flash.version()[0] >= 10;
-  // return swfobject.hasFlashPlayerVersion("10");
-};
-
-_V_.flash.canPlaySource = function(srcObj){
-  if (srcObj.type in _V_.flash.prototype.support.formats) { return "maybe"; }
-};
-
-_V_.flash.prototype.support = {
-  formats: {
-    "video/flv": "FLV",
-    "video/x-flv": "FLV",
-    "video/mp4": "MP4",
-    "video/m4v": "MP4"
-  },
-
-  // Optional events that we can manually mimic with timers
-  progressEvent: false,
-  timeupdateEvent: false,
-
-  // Resizing plugins using request fullscreen reloads the plugin
-  fullscreenResize: false,
-
-  // Resizing plugins in Firefox always reloads the plugin (e.g. full window mode)
-  parentResize: !(_V_.ua.match("Firefox"))
-};
-
-_V_.flash.onReady = function(currSwf){
-
-  var el = _V_.el(currSwf);
-
-  // Get player from box
-  // On firefox reloads, el might already have a player
-  var player = el.player || el.parentNode.player,
-      tech = player.tech;
-
-  // Reference player on tech element
-  el.player = player;
-
-  // Update reference to playback technology element
-  tech.el = el;
-
-  // Now that the element is ready, make a click on the swf play the video
-  tech.addEvent("click", tech.onClick);
-
-  _V_.flash.checkReady(tech);
-};
-
-// The SWF isn't alwasy ready when it says it is. Sometimes the API functions still need to be added to the object.
-// If it's not ready, we set a timeout to check again shortly.
-_V_.flash.checkReady = function(tech){
-
-  // Check if API property exists
-  if (tech.el.vjs_getProperty) {
-
-    // If so, tell tech it's ready
-    tech.triggerReady();
-
-  // Otherwise wait longer.
-  } else {
-
-    setTimeout(function(){
-      _V_.flash.checkReady(tech);
-    }, 50);
-
-  }
-};
-
-// Trigger events from the swf on the player
-_V_.flash.onEvent = function(swfID, eventName){
-  var player = _V_.el(swfID).player;
-  player.triggerEvent(eventName);
-};
-
-// Log errors from the swf
-_V_.flash.onError = function(swfID, err){
-  var player = _V_.el(swfID).player;
-  player.triggerEvent("error");
-  _V_.log("Flash Error", err, swfID);
-};
-
-// Flash Version Check
-_V_.flash.version = function(){
-  var version = '0,0,0'
-
-  // IE
-  try {
-    version = new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version').replace(/\D+/g, ',').match(/^,?(.+),?$/)[1];
-
-  // other browsers
-  } catch(e) {
-    try {
-      if (navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin){
-        version = (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g, ",").match(/^,?(.+),?$/)[1];
-      }
-    } catch(e) {}
-  }
-  return version.split(",");
-}
-
-// Flash embedding method. Only used in non-iframe mode
-_V_.flash.embed = function(swf, placeHolder, flashVars, params, attributes){
-  var code = _V_.flash.getEmbedCode(swf, flashVars, params, attributes),
-
-      // Get element by embedding code and retrieving created element
-      obj = _V_.createElement("div", { innerHTML: code }).childNodes[0],
-
-      par = placeHolder.parentNode
-  ;
-
-  placeHolder.parentNode.replaceChild(obj, placeHolder);
-
-  // IE6 seems to have an issue where it won't initialize the swf object after injecting it.
-  // This is a dumb temporary fix
-  if (_V_.isIE()) {
-    var newObj = par.childNodes[0];
-    setTimeout(function(){
-      newObj.style.display = "block";
-    }, 1000);
-  }
-
-  return obj;
-
-};
-
-_V_.flash.getEmbedCode = function(swf, flashVars, params, attributes){
-
-  var objTag = '<object type="application/x-shockwave-flash"',
-      flashVarsString = '',
-      paramsString = ''
-      attrsString = '';
-
-  // Convert flash vars to string
-  if (flashVars) {
-    _V_.eachProp(flashVars, function(key, val){
-      flashVarsString += (key + "=" + val + "&amp;");
-    });
-  }
-
-  // Add swf, flashVars, and other default params
-  params = _V_.merge({
-    movie: swf,
-    flashvars: flashVarsString,
-    allowScriptAccess: "always", // Required to talk to swf
-    allowNetworking: "all" // All should be default, but having security issues.
-  }, params);
-
-  // Create param tags string
-  _V_.eachProp(params, function(key, val){
-    paramsString += '<param name="'+key+'" value="'+val+'" />';
-  });
-
-  attributes = _V_.merge({
-    // Add swf to attributes (need both for IE and Others to work)
-    data: swf,
-
-    // Default to 100% width/height
-    width: "100%",
-    height: "100%"
-
-  }, attributes);
-
-  // Create Attributes string
-  _V_.eachProp(attributes, function(key, val){
-    attrsString += (key + '="' + val + '" ');
-  });
-
-  return objTag + attrsString + '>' + paramsString + '</object>';
-}
-// TEXT TRACKS
-// Text tracks are tracks of timed text events.
-//    Captions - text displayed over the video for the hearing impared
-//    Subtitles - text displayed over the video for those who don't understand langauge in the video
-//    Chapters - text displayed in a menu allowing the user to jump to particular points (chapters) in the video
-//    Descriptions (not supported yet) - audio descriptions that are read back to the user by a screen reading device
-
-// Player Track Functions - Functions add to the player object for easier access to tracks
-_V_.merge(_V_.Player.prototype, {
-
-  // Add an array of text tracks. captions, subtitles, chapters, descriptions
-  // Track objects will be stored in the player.textTracks array
-  addTextTracks: function(trackObjects){
-    var tracks = this.textTracks = (this.textTracks) ? this.textTracks : [],
-        i = 0, j = trackObjects.length, track, Kind;
-
-    for (;i<j;i++) {
-      // HTML5 Spec says default to subtitles.
-      // Uppercase (uc) first letter to match class names
-      Kind = _V_.uc(trackObjects[i].kind || "subtitles");
-
-      // Create correct texttrack class. CaptionsTrack, etc.
-      track = new _V_[Kind + "Track"](this, trackObjects[i]);
-
-      tracks.push(track);
-
-      // If track.default is set, start showing immediately
-      // TODO: Add a process to deterime the best track to show for the specific kind
-      // Incase there are mulitple defaulted tracks of the same kind
-      // Or the user has a set preference of a specific language that should override the default
-      if (track['default']) {
-        this.ready(_V_.proxy(track, track.show));
-      }
-    }
-
-    // Return the track so it can be appended to the display component
-    return this;
-  },
-
-  // Show a text track
-  // disableSameKind: disable all other tracks of the same kind. Value should be a track kind (captions, etc.)
-  showTextTrack: function(id, disableSameKind){
-    var tracks = this.textTracks,
-        i = 0,
-        j = tracks.length,
-        track, showTrack, kind;
-
-    // Find Track with same ID
-    for (;i<j;i++) {
-      track = tracks[i];
-      if (track.id === id) {
-        track.show();
-        showTrack = track;
-
-      // Disable tracks of the same kind
-      } else if (disableSameKind && track.kind == disableSameKind && track.mode > 0) {
-        track.disable();
-      }
-    }
-
-    // Get track kind from shown track or disableSameKind
-    kind = (showTrack) ? showTrack.kind : ((disableSameKind) ? disableSameKind : false);
-
-    // Trigger trackchange event, captionstrackchange, subtitlestrackchange, etc.
-    if (kind) {
-      this.triggerEvent(kind+"trackchange");
-    }
-
-    return this;
-  }
-
-});
-
-// Track Class
-// Contains track methods for loading, showing, parsing cues of tracks
-_V_.Track = _V_.Component.extend({
-
-  init: function(player, options){
-    this._super(player, options);
-
-    // Apply track info to track object
-    // Options will often be a track element
-    _V_.merge(this, {
-      // Build ID if one doesn't exist
-      id: options.id || ("vjs_" + options.kind + "_" + options.language + "_" + _V_.guid++),
-
-      src: options.src,
-
-      // If default is used, subtitles/captions to start showing
-      "default": options["default"], // 'default' is reserved-ish
-      title: options.title,
-
-      // Language - two letter string to represent track language, e.g. "en" for English
-      // readonly attribute DOMString language;
-      language: options.srclang,
-
-      // Track label e.g. "English"
-      // readonly attribute DOMString label;
-      label: options.label,
-
-      // All cues of the track. Cues have a startTime, endTime, text, and other properties.
-      // readonly attribute TextTrackCueList cues;
-      cues: [],
-
-      // ActiveCues is all cues that are currently showing
-      // readonly attribute TextTrackCueList activeCues;
-      activeCues: [],
-
-      // ReadyState describes if the text file has been loaded
-      // const unsigned short NONE = 0;
-      // const unsigned short LOADING = 1;
-      // const unsigned short LOADED = 2;
-      // const unsigned short ERROR = 3;
-      // readonly attribute unsigned short readyState;
-      readyState: 0,
-
-      // Mode describes if the track is showing, hidden, or disabled
-      // const unsigned short OFF = 0;
-      // const unsigned short HIDDEN = 1; (still triggering cuechange events, but not visible)
-      // const unsigned short SHOWING = 2;
-      // attribute unsigned short mode;
-      mode: 0
-    });
-  },
-
-  // Create basic div to hold cue text
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-" + this.kind + " vjs-text-track"
-    });
-  },
-
-  // Show: Mode Showing (2)
-  // Indicates that the text track is active. If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
-  // The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
-  // In addition, for text tracks whose kind is subtitles or captions, the cues are being displayed over the video as appropriate;
-  // for text tracks whose kind is descriptions, the user agent is making the cues available to the user in a non-visual fashion;
-  // and for text tracks whose kind is chapters, the user agent is making available to the user a mechanism by which the user can navigate to any point in the media resource by selecting a cue.
-  // The showing by default state is used in conjunction with the default attribute on track elements to indicate that the text track was enabled due to that attribute.
-  // This allows the user agent to override the state if a later track is discovered that is more appropriate per the user's preferences.
-  show: function(){
-    this.activate();
-
-    this.mode = 2;
-
-    // Show element.
-    this._super();
-  },
-
-  // Hide: Mode Hidden (1)
-  // Indicates that the text track is active, but that the user agent is not actively displaying the cues.
-  // If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
-  // The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
-  hide: function(){
-    // When hidden, cues are still triggered. Disable to stop triggering.
-    this.activate();
-
-    this.mode = 1;
-
-    // Hide element.
-    this._super();
-  },
-
-  // Disable: Mode Off/Disable (0)
-  // Indicates that the text track is not active. Other than for the purposes of exposing the track in the DOM, the user agent is ignoring the text track.
-  // No cues are active, no events are fired, and the user agent will not attempt to obtain the track's cues.
-  disable: function(){
-    // If showing, hide.
-    if (this.mode == 2) { this.hide(); }
-
-    // Stop triggering cues
-    this.deactivate();
-
-    // Switch Mode to Off
-    this.mode = 0;
-  },
-
-  // Turn on cue tracking. Tracks that are showing OR hidden are active.
-  activate: function(){
-    // Load text file if it hasn't been yet.
-    if (this.readyState == 0) { this.load(); }
-
-    // Only activate if not already active.
-    if (this.mode == 0) {
-      // Update current cue on timeupdate
-      // Using unique ID for proxy function so other tracks don't remove listener
-      this.player.addEvent("timeupdate", this.proxy(this.update, this.id));
-
-      // Reset cue time on media end
-      this.player.addEvent("ended", this.proxy(this.reset, this.id));
-
-      // Add to display
-      if (this.kind == "captions" || this.kind == "subtitles") {
-        this.player.textTrackDisplay.addComponent(this);
-      }
-    }
-  },
-
-  // Turn off cue tracking.
-  deactivate: function(){
-    // Using unique ID for proxy function so other tracks don't remove listener
-    this.player.removeEvent("timeupdate", this.proxy(this.update, this.id));
-    this.player.removeEvent("ended", this.proxy(this.reset, this.id));
-    this.reset(); // Reset
-
-    // Remove from display
-    this.player.textTrackDisplay.removeComponent(this);
-  },
-
-  // A readiness state
-  // One of the following:
-  //
-  // Not loaded
-  // Indicates that the text track is known to exist (e.g. it has been declared with a track element), but its cues have not been obtained.
-  //
-  // Loading
-  // Indicates that the text track is loading and there have been no fatal errors encountered so far. Further cues might still be added to the track.
-  //
-  // Loaded
-  // Indicates that the text track has been loaded with no fatal errors. No new cues will be added to the track except if the text track corresponds to a MutableTextTrack object.
-  //
-  // Failed to load
-  // Indicates that the text track was enabled, but when the user agent attempted to obtain it, this failed in some way (e.g. URL could not be resolved, network error, unknown text track format). Some or all of the cues are likely missing and will not be obtained.
-  load: function(){
-
-    // Only load if not loaded yet.
-    if (this.readyState == 0) {
-      this.readyState = 1;
-      _V_.get(this.src, this.proxy(this.parseCues), this.proxy(this.onError));
-    }
-
-  },
-
-  onError: function(err){
-    this.error = err;
-    this.readyState = 3;
-    this.triggerEvent("error");
-  },
-
-  // Parse the WebVTT text format for cue times.
-  // TODO: Separate parser into own class so alternative timed text formats can be used. (TTML, DFXP)
-  parseCues: function(srcContent) {
-    var cue, time, text,
-        lines = srcContent.split("\n"),
-        line = "", id;
-
-    for (var i=1, j=lines.length; i<j; i++) {
-      // Line 0 should be 'WEBVTT', so skipping i=0
-
-      line = _V_.trim(lines[i]); // Trim whitespace and linebreaks
-
-      if (line) { // Loop until a line with content
-
-        // First line could be an optional cue ID
-        // Check if line has the time separator
-        if (line.indexOf("-->") == -1) {
-          id = line;
-          // Advance to next line for timing.
-          line = _V_.trim(lines[++i]);
-        } else {
-          id = this.cues.length;
-        }
-
-        // First line - Number
-        cue = {
-          id: id, // Cue Number
-          index: this.cues.length // Position in Array
-        };
-
-        // Timing line
-        time = line.split(" --> ");
-        cue.startTime = this.parseCueTime(time[0]);
-        cue.endTime = this.parseCueTime(time[1]);
-
-        // Additional lines - Cue Text
-        text = [];
-
-        // Loop until a blank line or end of lines
-        // Assumeing trim("") returns false for blank lines
-        while (lines[++i] && (line = _V_.trim(lines[i]))) {
-          text.push(line);
-        }
-
-        cue.text = text.join('<br/>');
-
-        // Add this cue
-        this.cues.push(cue);
-      }
-    }
-
-    this.readyState = 2;
-    this.triggerEvent("loaded");
-  },
-
-  parseCueTime: function(timeText) {
-    var parts = timeText.split(':'),
-        time = 0,
-        hours, minutes, other, seconds, ms, flags;
-
-    // Check if optional hours place is included
-    // 00:00:00.000 vs. 00:00.000
-    if (parts.length == 3) {
-      hours = parts[0];
-      minutes = parts[1];
-      other = parts[2];
-    } else {
-      hours = 0;
-      minutes = parts[0];
-      other = parts[1];
-    }
-
-    // Break other (seconds, milliseconds, and flags) by spaces
-    // TODO: Make additional cue layout settings work with flags
-    other = other.split(/\s+/)
-    // Remove seconds. Seconds is the first part before any spaces.
-    seconds = other.splice(0,1)[0];
-    // Could use either . or , for decimal
-    seconds = seconds.split(/\.|,/);
-    // Get milliseconds
-    ms = parseFloat(seconds[1]);
-    seconds = seconds[0];
-
-    // hours => seconds
-    time += parseFloat(hours) * 3600;
-    // minutes => seconds
-    time += parseFloat(minutes) * 60;
-    // Add seconds
-    time += parseFloat(seconds);
-    // Add milliseconds
-    if (ms) { time += ms/1000; }
-
-    return time;
-  },
-
-  // Update active cues whenever timeupdate events are triggered on the player.
-  update: function(){
-    if (this.cues.length > 0) {
-
-      // Get curent player time
-      var time = this.player.currentTime();
-
-      // Check if the new time is outside the time box created by the the last update.
-      if (this.prevChange === undefined || time < this.prevChange || this.nextChange <= time) {
-        var cues = this.cues,
-
-            // Create a new time box for this state.
-            newNextChange = this.player.duration(), // Start at beginning of the timeline
-            newPrevChange = 0, // Start at end
-
-            reverse = false, // Set the direction of the loop through the cues. Optimized the cue check.
-            newCues = [], // Store new active cues.
-
-            // Store where in the loop the current active cues are, to provide a smart starting point for the next loop.
-            firstActiveIndex, lastActiveIndex,
-
-            html = "", // Create cue text HTML to add to the display
-            cue, i, j; // Loop vars
-
-        // Check if time is going forwards or backwards (scrubbing/rewinding)
-        // If we know the direction we can optimize the starting position and direction of the loop through the cues array.
-        if (time >= this.nextChange || this.nextChange === undefined) { // NextChange should happen
-          // Forwards, so start at the index of the first active cue and loop forward
-          i = (this.firstActiveIndex !== undefined) ? this.firstActiveIndex : 0;
-        } else {
-          // Backwards, so start at the index of the last active cue and loop backward
-          reverse = true;
-          i = (this.lastActiveIndex !== undefined) ? this.lastActiveIndex : cues.length - 1;
-        }
-
-        while (true) { // Loop until broken
-          cue = cues[i];
-
-          // Cue ended at this point
-          if (cue.endTime <= time) {
-            newPrevChange = Math.max(newPrevChange, cue.endTime);
-
-            if (cue.active) {
-              cue.active = false;
-            }
-
-            // No earlier cues should have an active start time.
-            // Nevermind. Assume first cue could have a duration the same as the video.
-            // In that case we need to loop all the way back to the beginning.
-            // if (reverse && cue.startTime) { break; }
-
-          // Cue hasn't started
-          } else if (time < cue.startTime) {
-            newNextChange = Math.min(newNextChange, cue.startTime);
-
-            if (cue.active) {
-              cue.active = false;
-            }
-
-            // No later cues should have an active start time.
-            if (!reverse) { break; }
-
-          // Cue is current
-          } else {
-
-            if (reverse) {
-              // Add cue to front of array to keep in time order
-              newCues.splice(0,0,cue);
-
-              // If in reverse, the first current cue is our lastActiveCue
-              if (lastActiveIndex === undefined) { lastActiveIndex = i; }
-              firstActiveIndex = i;
-            } else {
-              // Add cue to end of array
-              newCues.push(cue);
-
-              // If forward, the first current cue is our firstActiveIndex
-              if (firstActiveIndex === undefined) { firstActiveIndex = i; }
-              lastActiveIndex = i;
-            }
-
-            newNextChange = Math.min(newNextChange, cue.endTime);
-            newPrevChange = Math.max(newPrevChange, cue.startTime);
-
-            cue.active = true;
-          }
-
-          if (reverse) {
-            // Reverse down the array of cues, break if at first
-            if (i === 0) { break; } else { i--; }
-          } else {
-            // Walk up the array fo cues, break if at last
-            if (i === cues.length - 1) { break; } else { i++; }
-          }
-
-        }
-
-        this.activeCues = newCues;
-        this.nextChange = newNextChange;
-        this.prevChange = newPrevChange;
-        this.firstActiveIndex = firstActiveIndex;
-        this.lastActiveIndex = lastActiveIndex;
-
-        this.updateDisplay();
-
-        this.triggerEvent("cuechange");
-      }
-    }
-  },
-
-  // Add cue HTML to display
-  updateDisplay: function(){
-    var cues = this.activeCues,
-        html = "",
-        i=0,j=cues.length;
-
-    for (;i<j;i++) {
-      html += "<span class='vjs-tt-cue'>"+cues[i].text+"</span>";
-    }
-
-    this.el.innerHTML = html;
-  },
-
-  // Set all loop helper values back
-  reset: function(){
-    this.nextChange = 0;
-    this.prevChange = this.player.duration();
-    this.firstActiveIndex = 0;
-    this.lastActiveIndex = 0;
-  }
-
-});
-
-// Create specific track types
-_V_.CaptionsTrack = _V_.Track.extend({
-  kind: "captions"
-});
-
-_V_.SubtitlesTrack = _V_.Track.extend({
-  kind: "subtitles"
-});
-
-_V_.ChaptersTrack = _V_.Track.extend({
-  kind: "chapters"
-});
-
-
-/* Text Track Display
-================================================================================ */
-// Global container for both subtitle and captions text. Simple div container.
-_V_.TextTrackDisplay = _V_.Component.extend({
-
-  createElement: function(){
-    return this._super("div", {
-      className: "vjs-text-track-display"
-    });
-  }
-
-});
-
-/* Text Track Menu Items
-================================================================================ */
-_V_.TextTrackMenuItem = _V_.MenuItem.extend({
-
-  init: function(player, options){
-    var track = this.track = options.track;
-
-    // Modify options for parent MenuItem class's init.
-    options.label = track.label;
-    options.selected = track["default"];
-    this._super(player, options);
-
-    this.player.addEvent(track.kind + "trackchange", _V_.proxy(this, this.update));
-  },
-
-  onClick: function(){
-    this._super();
-    this.player.showTextTrack(this.track.id, this.track.kind);
-  },
-
-  update: function(){
-    if (this.track.mode == 2) {
-      this.selected(true);
-    } else {
-      this.selected(false);
-    }
-  }
-
-});
-
-_V_.OffTextTrackMenuItem = _V_.TextTrackMenuItem.extend({
-
-  init: function(player, options){
-    // Create pseudo track info
-    // Requires options.kind
-    options.track = { kind: options.kind, player: player, label: "Off" }
-    this._super(player, options);
-  },
-
-  onClick: function(){
-    this._super();
-    this.player.showTextTrack(this.track.id, this.track.kind);
-  },
-
-  update: function(){
-    var tracks = this.player.textTracks,
-        i=0, j=tracks.length, track,
-        off = true;
-
-    for (;i<j;i++) {
-      track = tracks[i];
-      if (track.kind == this.track.kind && track.mode == 2) {
-        off = false;
-      }
-    }
-
-    if (off) {
-      this.selected(true);
-    } else {
-      this.selected(false);
-    }
-  }
-
-});
-
-/* Captions Button
-================================================================================ */
-_V_.TextTrackButton = _V_.Button.extend({
-
-  init: function(player, options){
-    this._super(player, options);
-
-    this.menu = this.createMenu();
-
-    if (this.items.length === 0) {
-      this.hide();
-    }
-  },
-
-  createMenu: function(){
-    var menu = new _V_.Menu(this.player);
-
-    // Add a title list item to the top
-    menu.el.appendChild(_V_.createElement("li", {
-      className: "vjs-menu-title",
-      innerHTML: _V_.uc(this.kind)
-    }));
-
-    // Add an OFF menu item to turn all tracks off
-    menu.addItem(new _V_.OffTextTrackMenuItem(this.player, { kind: this.kind }))
-
-    this.items = this.createItems();
-
-    // Add menu items to the menu
-    this.each(this.items, function(item){
-      menu.addItem(item);
-    });
-
-    // Add list to element
-    this.addComponent(menu);
-
-    return menu;
-  },
-
-  // Create a menu item for each text track
-  createItems: function(){
-    var items = [];
-    this.each(this.player.textTracks, function(track){
-      if (track.kind === this.kind) {
-        items.push(new _V_.TextTrackMenuItem(this.player, {
-          track: track
-        }));
-      }
-    });
-    return items;
-  },
-
-  buildCSSClass: function(){
-    return this.className + " vjs-menu-button " + this._super();
-  },
-
-  // Focus - Add keyboard functionality to element
-  onFocus: function(){
-    // Show the menu, and keep showing when the menu items are in focus
-    this.menu.lockShowing();
-    // this.menu.el.style.display = "block";
-
-    // When tabbing through, the menu should hide when focus goes from the last menu item to the next tabbed element.
-    _V_.one(this.menu.el.childNodes[this.menu.el.childNodes.length - 1], "blur", this.proxy(function(){
-      this.menu.unlockShowing();
-    }));
-  },
-  // Can't turn off list display that we turned on with focus, because list would go away.
-  onBlur: function(){},
-
-  onClick: function(){
-    // When you click the button it adds focus, which will show the menu indefinitely.
-    // So we'll remove focus when the mouse leaves the button.
-    // Focus is needed for tab navigation.
-    this.one("mouseout", this.proxy(function(){
-      this.menu.unlockShowing();
-      this.el.blur();
-    }));
-  }
-
-});
-
-_V_.CaptionsButton = _V_.TextTrackButton.extend({
-  kind: "captions",
-  buttonText: "Captions",
-  className: "vjs-captions-button"
-});
-
-_V_.SubtitlesButton = _V_.TextTrackButton.extend({
-  kind: "subtitles",
-  buttonText: "Subtitles",
-  className: "vjs-subtitles-button"
-});
-
-// Chapters act much differently than other text tracks
-// Cues are navigation vs. other tracks of alternative languages
-_V_.ChaptersButton = _V_.TextTrackButton.extend({
-  kind: "chapters",
-  buttonText: "Chapters",
-  className: "vjs-chapters-button",
-
-  // Create a menu item for each text track
-  createItems: function(chaptersTrack){
-    var items = [];
-
-    this.each(this.player.textTracks, function(track){
-      if (track.kind === this.kind) {
-        items.push(new _V_.TextTrackMenuItem(this.player, {
-          track: track
-        }));
-      }
-    });
-
-    return items;
-  },
-
-  createMenu: function(){
-    var tracks = this.player.textTracks,
-        i = 0,
-        j = tracks.length,
-        track, chaptersTrack,
-        items = this.items = [];
-
-    for (;i<j;i++) {
-      track = tracks[i];
-      if (track.kind == this.kind && track["default"]) {
-        if (track.readyState < 2) {
-          this.chaptersTrack = track;
-          track.addEvent("loaded", this.proxy(this.createMenu));
-          return;
-        } else {
-          chaptersTrack = track;
-          break;
-        }
-      }
-    }
-
-    var menu = this.menu = new _V_.Menu(this.player);
-
-    menu.el.appendChild(_V_.createElement("li", {
-      className: "vjs-menu-title",
-      innerHTML: _V_.uc(this.kind)
-    }));
-
-    if (chaptersTrack) {
-      var cues = chaptersTrack.cues,
-          i = 0, j = cues.length, cue, mi;
-
-      for (;i<j;i++) {
-        cue = cues[i];
-
-        mi = new _V_.ChaptersTrackMenuItem(this.player, {
-          track: chaptersTrack,
-          cue: cue
-        });
-
-        items.push(mi);
-
-        menu.addComponent(mi);
-      }
-    }
-
-    // Add list to element
-    this.addComponent(menu);
-
-    if (this.items.length > 0) {
-      this.show();
-    }
-
-    return menu;
-  }
-
-});
-
-_V_.ChaptersTrackMenuItem = _V_.MenuItem.extend({
-
-  init: function(player, options){
-    var track = this.track = options.track,
-        cue = this.cue = options.cue,
-        currentTime = player.currentTime();
-
-    // Modify options for parent MenuItem class's init.
-    options.label = cue.text;
-    options.selected = (cue.startTime <= currentTime && currentTime < cue.endTime);
-    this._super(player, options);
-
-    track.addEvent("cuechange", _V_.proxy(this, this.update));
-  },
-
-  onClick: function(){
-    this._super();
-    this.player.currentTime(this.cue.startTime);
-    this.update(this.cue.startTime);
-  },
-
-  update: function(time){
-    var cue = this.cue,
-        currentTime = this.player.currentTime();
-
-    // _V_.log(currentTime, cue.startTime);
-    if (cue.startTime <= currentTime && currentTime < cue.endTime) {
-      this.selected(true);
-    } else {
-      this.selected(false);
-    }
-  }
-
-});
-
-// Add Buttons to controlBar
-_V_.merge(_V_.ControlBar.prototype.options.components, {
-  "subtitlesButton": {},
-  "captionsButton": {},
-  "chaptersButton": {}
-});
-
-// _V_.Cue = _V_.Component.extend({
-//   init: function(player, options){
-//     this._super(player, options);
-//   }
-// });// Automatically set up any tags that have a data-setup attribute
-_V_.autoSetup = function(){
-  var options, vid, player,
-      vids = document.getElementsByTagName("video");
-
-  // Check if any media elements exist
-  if (vids && vids.length > 0) {
-
-    for (var i=0,j=vids.length; i<j; i++) {
-      vid = vids[i];
-
-      // Check if element exists, has getAttribute func.
-      // IE seems to consider typeof el.getAttribute == "object" instead of "function" like expected, at least when loading the player immediately.
-      if (vid && vid.getAttribute) {
-
-        // Make sure this player hasn't already been set up.
-        if (vid.player === undefined) {
-          options = vid.getAttribute("data-setup");
-
-          // Check if data-setup attr exists. 
-          // We only auto-setup if they've added the data-setup attr.
-          if (options !== null) {
-
-            // Parse options JSON
-            // If empty string, make it a parsable json object.
-            options = JSON.parse(options || "{}");
-
-            // Create new video.js instance.
-            player = _V_(vid, options);
-          }
-        }
-
-      // If getAttribute isn't defined, we need to wait for the DOM.
-      } else {
-        _V_.autoSetupTimeout(1);
-        break;
-      }
-    }
-
-  // No videos were found, so keep looping unless page is finisehd loading.
-  } else if (!_V_.windowLoaded) {
-    _V_.autoSetupTimeout(1);
-  }
-};
-
-// Pause to let the DOM keep processing
-_V_.autoSetupTimeout = function(wait){
-  setTimeout(_V_.autoSetup, wait);
-};
-
-_V_.addEvent(window, "load", function(){
-  _V_.windowLoaded = true;
-});
-
-// Run Auto-load players
-_V_.autoSetup();
-// Expose to global
-window.VideoJS = window._V_ = VideoJS;
-
-// End self-executing function
-})(window);
+/*! Copyright 2013 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */
+ (function() {var b=void 0,f=!0,h=null,l=!1;function m(){return function(){}}function p(a){return function(){return this[a]}}function r(a){return function(){return a}}var t;document.createElement("video");document.createElement("audio");function u(a,c,d){if("string"===typeof a){0===a.indexOf("#")&&(a=a.slice(1));if(u.Na[a])return u.Na[a];a=u.s(a)}if(!a||!a.nodeName)throw new TypeError("The element or ID supplied is not valid. (videojs)");return a.player||new u.ga(a,c,d)}var v=u;window.xd=window.yd=u;u.Qb="GENERATED_CDN_VSN";
+u.Pb="https:"==document.location.protocol?"https://":"http://";u.options={techOrder:["html5","flash"],html5:{},flash:{swf:u.Pb+"vjs.zencdn.net/c/video-js.swf"},width:300,height:150,defaultVolume:0,children:{mediaLoader:{},posterImage:{},textTrackDisplay:{},loadingSpinner:{},bigPlayButton:{},controlBar:{}}};u.Na={};"GENERATED_CDN_VSN"!=u.Qb&&(v.options.flash.swf=u.Pb+"vjs.zencdn.net/"+u.Qb+"/video-js.swf");u.ma=u.CoreObject=m();
+u.ma.extend=function(a){var c,d;a=a||{};c=a.init||a.g||this.prototype.init||this.prototype.g||m();d=function(){c.apply(this,arguments)};d.prototype=u.i.create(this.prototype);d.prototype.constructor=d;d.extend=u.ma.extend;d.create=u.ma.create;for(var e in a)a.hasOwnProperty(e)&&(d.prototype[e]=a[e]);return d};u.ma.create=function(){var a=u.i.create(this.prototype);this.apply(a,arguments);return a};
+u.d=function(a,c,d){var e=u.getData(a);e.z||(e.z={});e.z[c]||(e.z[c]=[]);d.u||(d.u=u.u++);e.z[c].push(d);e.S||(e.disabled=l,e.S=function(c){if(!e.disabled){c=u.hc(c);var d=e.z[c.type];if(d)for(var d=d.slice(0),k=0,q=d.length;k<q&&!c.mc();k++)d[k].call(a,c)}});1==e.z[c].length&&(document.addEventListener?a.addEventListener(c,e.S,l):document.attachEvent&&a.attachEvent("on"+c,e.S))};
+u.t=function(a,c,d){if(u.lc(a)){var e=u.getData(a);if(e.z)if(c){var g=e.z[c];if(g){if(d){if(d.u)for(e=0;e<g.length;e++)g[e].u===d.u&&g.splice(e--,1)}else e.z[c]=[];u.ec(a,c)}}else for(g in e.z)c=g,e.z[c]=[],u.ec(a,c)}};u.ec=function(a,c){var d=u.getData(a);0===d.z[c].length&&(delete d.z[c],document.removeEventListener?a.removeEventListener(c,d.S,l):document.detachEvent&&a.detachEvent("on"+c,d.S));u.Ab(d.z)&&(delete d.z,delete d.S,delete d.disabled);u.Ab(d)&&u.sc(a)};
+u.hc=function(a){function c(){return f}function d(){return l}if(!a||!a.Bb){var e=a||window.event;a={};for(var g in e)a[g]=e[g];a.target||(a.target=a.srcElement||document);a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;a.preventDefault=function(){e.preventDefault&&e.preventDefault();a.returnValue=l;a.zb=c};a.zb=d;a.stopPropagation=function(){e.stopPropagation&&e.stopPropagation();a.cancelBubble=f;a.Bb=c};a.Bb=d;a.stopImmediatePropagation=function(){e.stopImmediatePropagation&&e.stopImmediatePropagation();
+a.mc=c;a.stopPropagation()};a.mc=d;if(a.clientX!=h){g=document.documentElement;var j=document.body;a.pageX=a.clientX+(g&&g.scrollLeft||j&&j.scrollLeft||0)-(g&&g.clientLeft||j&&j.clientLeft||0);a.pageY=a.clientY+(g&&g.scrollTop||j&&j.scrollTop||0)-(g&&g.clientTop||j&&j.clientTop||0)}a.which=a.charCode||a.keyCode;a.button!=h&&(a.button=a.button&1?0:a.button&4?1:a.button&2?2:0)}return a};
+u.k=function(a,c){var d=u.lc(a)?u.getData(a):{},e=a.parentNode||a.ownerDocument;"string"===typeof c&&(c={type:c,target:a});c=u.hc(c);d.S&&d.S.call(a,c);if(e&&!c.Bb())u.k(e,c);else if(!e&&!c.zb()&&(d=u.getData(c.target),c.target[c.type])){d.disabled=f;if("function"===typeof c.target[c.type])c.target[c.type]();d.disabled=l}return!c.zb()};u.Q=function(a,c,d){u.d(a,c,function(){u.t(a,c,arguments.callee);d.apply(this,arguments)})};var w=Object.prototype.hasOwnProperty;
+u.e=function(a,c){var d=document.createElement(a||"div"),e;for(e in c)w.call(c,e)&&(-1!==e.indexOf("aria-")||"role"==e?d.setAttribute(e,c[e]):d[e]=c[e]);return d};u.Y=function(a){return a.charAt(0).toUpperCase()+a.slice(1)};u.i={};u.i.create=Object.create||function(a){function c(){}c.prototype=a;return new c};u.i.sa=function(a,c,d){for(var e in a)w.call(a,e)&&c.call(d||this,e,a[e])};u.i.B=function(a,c){if(!c)return a;for(var d in c)w.call(c,d)&&(a[d]=c[d]);return a};
+u.i.gc=function(a,c){var d,e,g;a=u.i.copy(a);for(d in c)w.call(c,d)&&(e=a[d],g=c[d],a[d]=u.i.nc(e)&&u.i.nc(g)?u.i.gc(e,g):c[d]);return a};u.i.copy=function(a){return u.i.B({},a)};u.i.nc=function(a){return!!a&&"object"===typeof a&&"[object Object]"===a.toString()&&a.constructor===Object};u.bind=function(a,c,d){function e(){return c.apply(a,arguments)}c.u||(c.u=u.u++);e.u=d?d+"_"+c.u:c.u;return e};u.qa={};u.u=1;u.expando="vdata"+(new Date).getTime();
+u.getData=function(a){var c=a[u.expando];c||(c=a[u.expando]=u.u++,u.qa[c]={});return u.qa[c]};u.lc=function(a){a=a[u.expando];return!(!a||u.Ab(u.qa[a]))};u.sc=function(a){var c=a[u.expando];if(c){delete u.qa[c];try{delete a[u.expando]}catch(d){a.removeAttribute?a.removeAttribute(u.expando):a[u.expando]=h}}};u.Ab=function(a){for(var c in a)if(a[c]!==h)return l;return f};u.p=function(a,c){-1==(" "+a.className+" ").indexOf(" "+c+" ")&&(a.className=""===a.className?c:a.className+" "+c)};
+u.w=function(a,c){if(-1!=a.className.indexOf(c)){for(var d=a.className.split(" "),e=d.length-1;0<=e;e--)d[e]===c&&d.splice(e,1);a.className=d.join(" ")}};u.ib=u.e("video");u.O=navigator.userAgent;u.Bc=!!u.O.match(/iPhone/i);u.Ac=!!u.O.match(/iPad/i);u.Cc=!!u.O.match(/iPod/i);u.Ub=u.Bc||u.Ac||u.Cc;var aa=u,x;var y=u.O.match(/OS (\d+)_/i);x=y&&y[1]?y[1]:b;aa.qd=x;u.ab=!!u.O.match(/Android.*AppleWebKit/i);var ba=u,z=u.O.match(/Android (\d+)\./i);ba.yc=z&&z[1]?z[1]:h;u.zc=function(){return!!u.O.match("Firefox")};
+u.wb=function(a){var c={};if(a&&a.attributes&&0<a.attributes.length)for(var d=a.attributes,e,g,j=d.length-1;0<=j;j--){e=d[j].name;g=d[j].value;if("boolean"===typeof a[e]||-1!==",autoplay,controls,loop,muted,default,".indexOf(","+e+","))g=g!==h?f:l;c[e]=g}return c};u.td=function(a,c){var d="";document.defaultView&&document.defaultView.getComputedStyle?d=document.defaultView.getComputedStyle(a,"").getPropertyValue(c):a.currentStyle&&(d=a["client"+c.substr(0,1).toUpperCase()+c.substr(1)]+"px");return d};
+u.yb=function(a,c){c.firstChild?c.insertBefore(a,c.firstChild):c.appendChild(a)};u.Nb={};u.s=function(a){0===a.indexOf("#")&&(a=a.slice(1));return document.getElementById(a)};u.Ha=function(a,c){c=c||a;var d=Math.floor(a%60),e=Math.floor(a/60%60),g=Math.floor(a/3600),j=Math.floor(c/60%60),k=Math.floor(c/3600),g=0<g||0<k?g+":":"";return g+(((g||10<=j)&&10>e?"0"+e:e)+":")+(10>d?"0"+d:d)};u.Gc=function(){document.body.focus();document.onselectstart=r(l)};u.ld=function(){document.onselectstart=r(f)};
+u.trim=function(a){return a.toString().replace(/^\s+/,"").replace(/\s+$/,"")};u.round=function(a,c){c||(c=0);return Math.round(a*Math.pow(10,c))/Math.pow(10,c)};u.tb=function(a,c){return{length:1,start:function(){return a},end:function(){return c}}};
+u.get=function(a,c,d){var e=0===a.indexOf("file:")||0===window.location.href.indexOf("file:")&&-1===a.indexOf("http");"undefined"===typeof XMLHttpRequest&&(window.XMLHttpRequest=function(){try{return new window.ActiveXObject("Msxml2.XMLHTTP.6.0")}catch(a){}try{return new window.ActiveXObject("Msxml2.XMLHTTP.3.0")}catch(c){}try{return new window.ActiveXObject("Msxml2.XMLHTTP")}catch(d){}throw Error("This browser does not support XMLHttpRequest.");});var g=new XMLHttpRequest;try{g.open("GET",a)}catch(j){d(j)}g.onreadystatechange=
+function(){4===g.readyState&&(200===g.status||e&&0===g.status?c(g.responseText):d&&d())};try{g.send()}catch(k){d&&d(k)}};u.dd=function(a){try{var c=window.localStorage||l;c&&(c.volume=a)}catch(d){22==d.code||1014==d.code?u.log("LocalStorage Full (VideoJS)",d):18==d.code?u.log("LocalStorage not allowed (VideoJS)",d):u.log("LocalStorage Error (VideoJS)",d)}};u.jc=function(a){a.match(/^https?:\/\//)||(a=u.e("div",{innerHTML:'<a href="'+a+'">x</a>'}).firstChild.href);return a};
+u.log=function(){u.log.history=u.log.history||[];u.log.history.push(arguments);window.console&&window.console.log(Array.prototype.slice.call(arguments))};u.Oc=function(a){var c,d;a.getBoundingClientRect&&a.parentNode&&(c=a.getBoundingClientRect());if(!c)return{left:0,top:0};a=document.documentElement;d=document.body;return{left:c.left+(window.pageXOffset||d.scrollLeft)-(a.clientLeft||d.clientLeft||0),top:c.top+(window.pageYOffset||d.scrollTop)-(a.clientTop||d.clientTop||0)}};
+u.c=u.ma.extend({g:function(a,c,d){this.a=a;this.f=u.i.copy(this.f);c=this.options(c);this.L=c.id||(c.el&&c.el.id?c.el.id:a.id()+"_component_"+u.u++);this.Tc=c.name||h;this.b=c.el||this.e();this.D=[];this.rb={};this.R={};if((a=this.f)&&a.children){var e=this;u.i.sa(a.children,function(a,c){c!==l&&!c.loadEvent&&(e[a]=e.X(a,c))})}this.M(d)}});t=u.c.prototype;
+t.C=function(){if(this.D)for(var a=this.D.length-1;0<=a;a--)this.D[a].C&&this.D[a].C();this.R=this.rb=this.D=h;this.t();this.b.parentNode&&this.b.parentNode.removeChild(this.b);u.sc(this.b);this.b=h};t.pc=p("a");t.options=function(a){return a===b?this.f:this.f=u.i.gc(this.f,a)};t.e=function(a,c){return u.e(a,c)};t.s=p("b");t.id=p("L");t.name=p("Tc");t.children=p("D");
+t.X=function(a,c){var d,e;"string"===typeof a?(e=a,c=c||{},d=c.componentClass||u.Y(e),c.name=e,d=new window.videojs[d](this.a||this,c)):d=a;this.D.push(d);"function"===typeof d.id&&(this.rb[d.id()]=d);(e=e||d.name&&d.name())&&(this.R[e]=d);"function"===typeof d.el&&d.el()&&(this.ra||this.b).appendChild(d.el());return d};
+t.removeChild=function(a){"string"===typeof a&&(a=this.R[a]);if(a&&this.D){for(var c=l,d=this.D.length-1;0<=d;d--)if(this.D[d]===a){c=f;this.D.splice(d,1);break}c&&(this.rb[a.id]=h,this.R[a.name]=h,(c=a.s())&&c.parentNode===(this.ra||this.b)&&(this.ra||this.b).removeChild(a.s()))}};t.P=r("");t.d=function(a,c){u.d(this.b,a,u.bind(this,c));return this};t.t=function(a,c){u.t(this.b,a,c);return this};t.Q=function(a,c){u.Q(this.b,a,u.bind(this,c));return this};t.k=function(a,c){u.k(this.b,a,c);return this};
+t.M=function(a){a&&(this.$?a.call(this):(this.Qa===b&&(this.Qa=[]),this.Qa.push(a)));return this};t.Ta=function(){this.$=f;var a=this.Qa;if(a&&0<a.length){for(var c=0,d=a.length;c<d;c++)a[c].call(this);this.Qa=[];this.k("ready")}};t.p=function(a){u.p(this.b,a);return this};t.w=function(a){u.w(this.b,a);return this};t.show=function(){this.b.style.display="block";return this};t.v=function(){this.b.style.display="none";return this};t.ja=function(){this.w("vjs-fade-out");this.p("vjs-fade-in");return this};
+t.Ga=function(){this.w("vjs-fade-in");this.p("vjs-fade-out");return this};t.oc=function(){this.p("vjs-lock-showing");return this};t.Ua=function(){this.w("vjs-lock-showing");return this};t.disable=function(){this.v();this.show=m();this.ja=m()};t.width=function(a,c){return A(this,"width",a,c)};t.height=function(a,c){return A(this,"height",a,c)};t.Kc=function(a,c){return this.width(a,f).height(c)};
+function A(a,c,d,e){if(d!==b)return a.b.style[c]=-1!==(""+d).indexOf("%")||-1!==(""+d).indexOf("px")?d:"auto"===d?"":d+"px",e||a.k("resize"),a;if(!a.b)return 0;d=a.b.style[c];e=d.indexOf("px");return-1!==e?parseInt(d.slice(0,e),10):parseInt(a.b["offset"+u.Y(c)],10)}
+u.o=u.c.extend({g:function(a,c){u.c.call(this,a,c);var d=l;this.d("touchstart",function(){d=f});this.d("touchmove",function(){d=l});var e=this;this.d("touchend",function(a){d&&e.n(a);a.preventDefault();a.stopPropagation()});this.d("click",this.n);this.d("focus",this.La);this.d("blur",this.Ka)}});t=u.o.prototype;
+t.e=function(a,c){c=u.i.B({className:this.P(),innerHTML:'<div class="vjs-control-content"><span class="vjs-control-text">'+(this.pa||"Need Text")+"</span></div>",ad:"button","aria-live":"polite",tabIndex:0},c);return u.c.prototype.e.call(this,a,c)};t.P=function(){return"vjs-control "+u.c.prototype.P.call(this)};t.n=m();t.La=function(){u.d(document,"keyup",u.bind(this,this.aa))};t.aa=function(a){if(32==a.which||13==a.which)a.preventDefault(),this.n()};
+t.Ka=function(){u.t(document,"keyup",u.bind(this,this.aa))};u.J=u.c.extend({g:function(a,c){u.c.call(this,a,c);this.Fc=this.R[this.f.barName];this.handle=this.R[this.f.handleName];a.d(this.qc,u.bind(this,this.update));this.d("mousedown",this.Ma);this.d("touchstart",this.Ma);this.d("focus",this.La);this.d("blur",this.Ka);this.d("click",this.n);this.a.d("controlsvisible",u.bind(this,this.update));a.M(u.bind(this,this.update));this.K={}}});t=u.J.prototype;
+t.e=function(a,c){c=c||{};c.className+=" vjs-slider";c=u.i.B({ad:"slider","aria-valuenow":0,"aria-valuemin":0,"aria-valuemax":100,tabIndex:0},c);return u.c.prototype.e.call(this,a,c)};t.Ma=function(a){a.preventDefault();u.Gc();this.K.move=u.bind(this,this.Gb);this.K.end=u.bind(this,this.Hb);u.d(document,"mousemove",this.K.move);u.d(document,"mouseup",this.K.end);u.d(document,"touchmove",this.K.move);u.d(document,"touchend",this.K.end);this.Gb(a)};
+t.Hb=function(){u.ld();u.t(document,"mousemove",this.K.move,l);u.t(document,"mouseup",this.K.end,l);u.t(document,"touchmove",this.K.move,l);u.t(document,"touchend",this.K.end,l);this.update()};t.update=function(){if(this.b){var a,c=this.xb(),d=this.handle,e=this.Fc;isNaN(c)&&(c=0);a=c;if(d){a=this.b.offsetWidth;var g=d.s().offsetWidth;a=g?g/a:0;c*=1-a;a=c+a/2;d.s().style.left=u.round(100*c,2)+"%"}e.s().style.width=u.round(100*a,2)+"%"}};
+function B(a,c){var d,e,g,j;d=a.b;e=u.Oc(d);j=g=d.offsetWidth;d=a.handle;if(a.f.md)return j=e.top,e=c.changedTouches?c.changedTouches[0].pageY:c.pageY,d&&(d=d.s().offsetHeight,j+=d/2,g-=d),Math.max(0,Math.min(1,(j-e+g)/g));g=e.left;e=c.changedTouches?c.changedTouches[0].pageX:c.pageX;d&&(d=d.s().offsetWidth,g+=d/2,j-=d);return Math.max(0,Math.min(1,(e-g)/j))}t.La=function(){u.d(document,"keyup",u.bind(this,this.aa))};
+t.aa=function(a){37==a.which?(a.preventDefault(),this.vc()):39==a.which&&(a.preventDefault(),this.wc())};t.Ka=function(){u.t(document,"keyup",u.bind(this,this.aa))};t.n=function(a){a.stopImmediatePropagation();a.preventDefault()};u.ha=u.c.extend();u.ha.prototype.defaultValue=0;u.ha.prototype.e=function(a,c){c=c||{};c.className+=" vjs-slider-handle";c=u.i.B({innerHTML:'<span class="vjs-control-text">'+this.defaultValue+"</span>"},c);return u.c.prototype.e.call(this,"div",c)};u.na=u.c.extend();
+function ca(a,c){a.X(c);c.d("click",u.bind(a,function(){this.Ua()}))}u.na.prototype.e=function(){var a=this.options().Ic||"ul";this.ra=u.e(a,{className:"vjs-menu-content"});a=u.c.prototype.e.call(this,"div",{append:this.ra,className:"vjs-menu"});a.appendChild(this.ra);u.d(a,"click",function(a){a.preventDefault();a.stopImmediatePropagation()});return a};u.I=u.o.extend({g:function(a,c){u.o.call(this,a,c);this.selected(c.selected)}});
+u.I.prototype.e=function(a,c){return u.o.prototype.e.call(this,"li",u.i.B({className:"vjs-menu-item",innerHTML:this.f.label},c))};u.I.prototype.n=function(){this.selected(f)};u.I.prototype.selected=function(a){a?(this.p("vjs-selected"),this.b.setAttribute("aria-selected",f)):(this.w("vjs-selected"),this.b.setAttribute("aria-selected",l))};
+u.ea=u.o.extend({g:function(a,c){u.o.call(this,a,c);this.ua=this.Fa();this.X(this.ua);this.G&&0===this.G.length&&this.v();this.d("keyup",this.aa);this.b.setAttribute("aria-haspopup",f);this.b.setAttribute("role","button")}});t=u.ea.prototype;t.oa=l;t.Fa=function(){var a=new u.na(this.a);this.options().title&&a.s().appendChild(u.e("li",{className:"vjs-menu-title",innerHTML:u.Y(this.A),jd:-1}));if(this.G=this.sb())for(var c=0;c<this.G.length;c++)ca(a,this.G[c]);return a};t.sb=m();
+t.P=function(){return this.className+" vjs-menu-button "+u.o.prototype.P.call(this)};t.La=m();t.Ka=m();t.n=function(){this.Q("mouseout",u.bind(this,function(){this.ua.Ua();this.b.blur()}));this.oa?C(this):D(this)};t.aa=function(a){a.preventDefault();32==a.which||13==a.which?this.oa?C(this):D(this):27==a.which&&this.oa&&C(this)};function D(a){a.oa=f;a.ua.oc();a.b.setAttribute("aria-pressed",f);a.G&&0<a.G.length&&a.G[0].s().focus()}function C(a){a.oa=l;a.ua.Ua();a.b.setAttribute("aria-pressed",l)}
+u.ga=u.c.extend({g:function(a,c,d){this.N=a;c=u.i.B(da(a),c);this.r={};this.rc=c.poster;this.Ea=c.controls;c.customControlsOnMobile!==f&&(u.Ub||u.ab)?(a.controls=c.controls,this.Ea=l):a.controls=l;u.c.call(this,this,c,d);this.Q("play",function(a){u.k(this.b,{type:"firstplay",target:this.b})||(a.preventDefault(),a.stopPropagation(),a.stopImmediatePropagation())});this.d("ended",this.Vc);this.d("play",this.Jb);this.d("firstplay",this.Wc);this.d("pause",this.Ib);this.d("progress",this.Yc);this.d("durationchange",
+this.Uc);this.d("error",this.Fb);this.d("fullscreenchange",this.Xc);u.Na[this.L]=this;c.plugins&&u.i.sa(c.plugins,function(a,c){this[a](c)},this)}});t=u.ga.prototype;t.f=u.options;t.C=function(){u.Na[this.L]=h;this.N&&this.N.player&&(this.N.player=h);this.b&&this.b.player&&(this.b.player=h);clearInterval(this.Pa);this.va();this.h&&this.h.C();u.c.prototype.C.call(this)};
+function da(a){var c={sources:[],tracks:[]};u.i.B(c,u.wb(a));if(a.hasChildNodes())for(var d,e=a.childNodes,g=0,j=e.length;g<j;g++)a=e[g],d=a.nodeName.toLowerCase(),"source"===d?c.sources.push(u.wb(a)):"track"===d&&c.tracks.push(u.wb(a));return c}
+t.e=function(){var a=this.b=u.c.prototype.e.call(this,"div"),c=this.N;c.removeAttribute("width");c.removeAttribute("height");if(c.hasChildNodes())for(var d=c.childNodes.length,e=0,g=c.childNodes;e<d;e++)("source"==g[0].nodeName.toLowerCase()||"track"==g[0].nodeName.toLowerCase())&&c.removeChild(g[0]);c.id=c.id||"vjs_video_"+u.u++;a.id=c.id;a.className=c.className;c.id+="_html5_api";c.className="vjs-tech";c.player=a.player=this;this.p("vjs-paused");this.width(this.f.width,f);this.height(this.f.height,
+f);c.parentNode&&c.parentNode.insertBefore(a,c);u.yb(c,a);return a};
+function E(a,c,d){a.h?F(a):"Html5"!==c&&a.N&&(a.b.removeChild(a.N),a.N.pc=h,a.N=h);a.ba=c;a.$=l;var e=u.i.B({source:d,parentEl:a.b},a.f[c.toLowerCase()]);d&&(d.src==a.r.src&&0<a.r.currentTime&&(e.startTime=a.r.currentTime),a.r.src=d.src);a.h=new window.videojs[c](a,e);a.h.M(function(){this.a.Ta();if(!this.j.Lb){var a=this.a;a.Db=f;a.Pa=setInterval(u.bind(a,function(){this.r.nb<this.buffered().end(0)?this.k("progress"):1==G(this)&&(clearInterval(this.Pa),this.k("progress"))}),500);a.h.Q("progress",
+function(){this.j.Lb=f;var a=this.a;a.Db=l;clearInterval(a.Pa)})}this.j.Ob||(a=this.a,a.Eb=f,a.d("play",a.xc),a.d("pause",a.va),a.h.Q("timeupdate",function(){this.j.Ob=f;H(this.a)}))})}function F(a){a.$=l;a.h.C();a.Db&&(a.Db=l,clearInterval(a.Pa));a.Eb&&H(a);a.h=l}function H(a){a.Eb=l;a.va();a.t("play",a.xc);a.t("pause",a.va)}t.xc=function(){this.fc&&this.va();this.fc=setInterval(u.bind(this,function(){this.k("timeupdate")}),250)};t.va=function(){clearInterval(this.fc)};
+t.Vc=function(){this.f.loop&&(this.currentTime(0),this.play())};t.Jb=function(){u.w(this.b,"vjs-paused");u.p(this.b,"vjs-playing")};t.Wc=function(){this.f.starttime&&this.currentTime(this.f.starttime)};t.Ib=function(){u.w(this.b,"vjs-playing");u.p(this.b,"vjs-paused")};t.Yc=function(){1==G(this)&&this.k("loadedalldata")};t.Uc=function(){this.duration(I(this,"duration"))};t.Fb=function(a){u.log("Video Error",a)};t.Xc=function(){this.F?this.p("vjs-fullscreen"):this.w("vjs-fullscreen")};
+function J(a,c,d){if(a.h&&a.h.$)a.h.M(function(){this[c](d)});else try{a.h[c](d)}catch(e){throw u.log(e),e;}}function I(a,c){if(a.h.$)try{return a.h[c]()}catch(d){throw a.h[c]===b?u.log("Video.js: "+c+" method not defined for "+a.ba+" playback technology.",d):"TypeError"==d.name?(u.log("Video.js: "+c+" unavailable on "+a.ba+" playback technology element.",d),a.h.$=l):u.log(d),d;}}t.play=function(){J(this,"play");return this};t.pause=function(){J(this,"pause");return this};
+t.paused=function(){return I(this,"paused")===l?l:f};t.currentTime=function(a){return a!==b?(this.r.vd=a,J(this,"setCurrentTime",a),this.Eb&&this.k("timeupdate"),this):this.r.currentTime=I(this,"currentTime")||0};t.duration=function(a){return a!==b?(this.r.duration=parseFloat(a),this):this.r.duration};t.buffered=function(){var a=I(this,"buffered"),c=this.r.nb=this.r.nb||0;a&&(0<a.length&&a.end(0)!==c)&&(c=a.end(0),this.r.nb=c);return u.tb(0,c)};
+function G(a){return a.duration()?a.buffered().end(0)/a.duration():0}t.volume=function(a){if(a!==b)return a=Math.max(0,Math.min(1,parseFloat(a))),this.r.volume=a,J(this,"setVolume",a),u.dd(a),this;a=parseFloat(I(this,"volume"));return isNaN(a)?1:a};t.muted=function(a){return a!==b?(J(this,"setMuted",a),this):I(this,"muted")||l};t.Sa=function(){return I(this,"supportsFullScreen")||l};
+t.Ra=function(){var a=u.Nb.Ra;this.F=f;a?(u.d(document,a.Z,u.bind(this,function(){this.F=document[a.F];this.F===l&&u.t(document,a.Z,arguments.callee)})),this.h.j.Ia===l&&this.f.flash.iFrameMode!==f&&(this.pause(),F(this),u.d(document,a.Z,u.bind(this,function(){u.t(document,a.Z,arguments.callee);E(this,this.ba,{src:this.r.src})}))),this.b[a.tc](),this.k("fullscreenchange")):this.h.Sa()?J(this,"enterFullScreen"):(this.Qc=f,this.Lc=document.documentElement.style.overflow,u.d(document,"keydown",u.bind(this,
+this.ic)),document.documentElement.style.overflow="hidden",u.p(document.body,"vjs-full-window"),this.k("enterFullWindow"),this.k("fullscreenchange"));return this};function K(a){var c=u.Nb.Ra;a.F=l;c?(a.h.j.Ia===l&&a.f.flash.iFrameMode!==f&&(a.pause(),F(a),u.d(document,c.Z,u.bind(a,function(){u.t(document,c.Z,arguments.callee);E(this,this.ba,{src:this.r.src})}))),document[c.pb](),a.k("fullscreenchange")):a.h.Sa()?J(a,"exitFullScreen"):(L(a),a.k("fullscreenchange"))}
+t.ic=function(a){27===a.keyCode&&(this.F===f?K(this):L(this))};function L(a){a.Qc=l;u.t(document,"keydown",a.ic);document.documentElement.style.overflow=a.Lc;u.w(document.body,"vjs-full-window");a.k("exitFullWindow")}
+t.src=function(a){if(a instanceof Array){var c;a:{c=a;for(var d=0,e=this.f.techOrder;d<e.length;d++){var g=u.Y(e[d]),j=window.videojs[g];if(j.isSupported())for(var k=0,q=c;k<q.length;k++){var n=q[k];if(j.canPlaySource(n)){c={source:n,h:g};break a}}}c=l}c?(a=c.source,c=c.h,c==this.ba?this.src(a):E(this,c,a)):this.b.appendChild(u.e("p",{innerHTML:'Sorry, no compatible source and playback technology were found for this video. Try using another browser like <a href="http://bit.ly/ccMUEC">Chrome</a> or download the latest <a href="http://adobe.ly/mwfN1">Adobe Flash Player</a>.'}))}else a instanceof
+Object?window.videojs[this.ba].canPlaySource(a)?this.src(a.src):this.src([a]):(this.r.src=a,this.$?(J(this,"src",a),"auto"==this.f.preload&&this.load(),this.f.autoplay&&this.play()):this.M(function(){this.src(a)}));return this};t.load=function(){J(this,"load");return this};t.currentSrc=function(){return I(this,"currentSrc")||this.r.src||""};t.Oa=function(a){return a!==b?(J(this,"setPreload",a),this.f.preload=a,this):I(this,"preload")};
+t.autoplay=function(a){return a!==b?(J(this,"setAutoplay",a),this.f.autoplay=a,this):I(this,"autoplay")};t.loop=function(a){return a!==b?(J(this,"setLoop",a),this.f.loop=a,this):I(this,"loop")};t.poster=function(a){a!==b&&(this.rc=a);return this.rc};t.controls=function(a){a!==b&&this.Ea!==a&&(this.Ea=!!a,this.k("controlschange"));return this.Ea};t.error=function(){return I(this,"error")};var M,N,O;O=document.createElement("div");N={};
+O.rd!==b?(N.tc="requestFullscreen",N.pb="exitFullscreen",N.Z="fullscreenchange",N.F="fullScreen"):(document.mozCancelFullScreen?(M="moz",N.F=M+"FullScreen"):(M="webkit",N.F=M+"IsFullScreen"),O[M+"RequestFullScreen"]&&(N.tc=M+"RequestFullScreen",N.pb=M+"CancelFullScreen"),N.Z=M+"fullscreenchange");document[N.pb]&&(u.Nb.Ra=N);
+u.da=u.c.extend({g:function(a,c){u.c.call(this,a,c);a.controls()||this.disable();a.Q("play",u.bind(this,function(){var a,c=u.bind(this,this.ja),g=u.bind(this,this.Ga);this.ja();"ontouchstart"in window||(this.a.d("mouseover",c),this.a.d("mouseout",g),this.a.d("pause",u.bind(this,this.oc)),this.a.d("play",u.bind(this,this.Ua)));a=l;this.a.d("touchstart",function(){a=f});this.a.d("touchmove",function(){a=l});this.a.d("touchend",u.bind(this,function(c){var e;a&&(e=this.s().className.search("fade-in"),
+-1!==e?this.Ga():this.ja());a=l;this.a.paused()||c.preventDefault()}))}))}});u.da.prototype.f={wd:"play",children:{playToggle:{},currentTimeDisplay:{},timeDivider:{},durationDisplay:{},remainingTimeDisplay:{},progressControl:{},fullscreenToggle:{},volumeControl:{},muteToggle:{}}};u.da.prototype.e=function(){return u.e("div",{className:"vjs-control-bar"})};u.da.prototype.ja=function(){u.c.prototype.ja.call(this);this.a.k("controlsvisible")};
+u.da.prototype.Ga=function(){u.c.prototype.Ga.call(this);this.a.k("controlshidden")};u.Xb=u.o.extend({g:function(a,c){u.o.call(this,a,c);a.d("play",u.bind(this,this.Jb));a.d("pause",u.bind(this,this.Ib))}});t=u.Xb.prototype;t.pa="Play";t.P=function(){return"vjs-play-control "+u.o.prototype.P.call(this)};t.n=function(){this.a.paused()?this.a.play():this.a.pause()};t.Jb=function(){u.w(this.b,"vjs-paused");u.p(this.b,"vjs-playing");this.b.children[0].children[0].innerHTML="Pause"};
+t.Ib=function(){u.w(this.b,"vjs-playing");u.p(this.b,"vjs-paused");this.b.children[0].children[0].innerHTML="Play"};u.Ya=u.c.extend({g:function(a,c){u.c.call(this,a,c);a.d("timeupdate",u.bind(this,this.ya))}});
+u.Ya.prototype.e=function(){var a=u.c.prototype.e.call(this,"div",{className:"vjs-current-time vjs-time-controls vjs-control"});this.content=u.e("div",{className:"vjs-current-time-display",innerHTML:'<span class="vjs-control-text">Current Time </span>0:00',"aria-live":"off"});a.appendChild(u.e("div").appendChild(this.content));return a};
+u.Ya.prototype.ya=function(){var a=this.a.Mb?this.a.r.currentTime:this.a.currentTime();this.content.innerHTML='<span class="vjs-control-text">Current Time </span>'+u.Ha(a,this.a.duration())};u.Za=u.c.extend({g:function(a,c){u.c.call(this,a,c);a.d("timeupdate",u.bind(this,this.ya))}});
+u.Za.prototype.e=function(){var a=u.c.prototype.e.call(this,"div",{className:"vjs-duration vjs-time-controls vjs-control"});this.content=u.e("div",{className:"vjs-duration-display",innerHTML:'<span class="vjs-control-text">Duration Time </span>0:00',"aria-live":"off"});a.appendChild(u.e("div").appendChild(this.content));return a};u.Za.prototype.ya=function(){this.a.duration()&&(this.content.innerHTML='<span class="vjs-control-text">Duration Time </span>'+u.Ha(this.a.duration()))};
+u.ac=u.c.extend({g:function(a,c){u.c.call(this,a,c)}});u.ac.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-time-divider",innerHTML:"<div><span>/</span></div>"})};u.gb=u.c.extend({g:function(a,c){u.c.call(this,a,c);a.d("timeupdate",u.bind(this,this.ya))}});
+u.gb.prototype.e=function(){var a=u.c.prototype.e.call(this,"div",{className:"vjs-remaining-time vjs-time-controls vjs-control"});this.content=u.e("div",{className:"vjs-remaining-time-display",innerHTML:'<span class="vjs-control-text">Remaining Time </span>-0:00',"aria-live":"off"});a.appendChild(u.e("div").appendChild(this.content));return a};
+u.gb.prototype.ya=function(){this.a.duration()&&this.a.duration()&&(this.content.innerHTML='<span class="vjs-control-text">Remaining Time </span>-'+u.Ha(this.a.duration()-this.a.currentTime()))};u.Aa=u.o.extend({g:function(a,c){u.o.call(this,a,c)}});u.Aa.prototype.pa="Fullscreen";u.Aa.prototype.P=function(){return"vjs-fullscreen-control "+u.o.prototype.P.call(this)};
+u.Aa.prototype.n=function(){this.a.F?(K(this.a),this.b.children[0].children[0].innerHTML="Fullscreen"):(this.a.Ra(),this.b.children[0].children[0].innerHTML="Non-Fullscreen")};u.fb=u.c.extend({g:function(a,c){u.c.call(this,a,c)}});u.fb.prototype.f={children:{seekBar:{}}};u.fb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-progress-control vjs-control"})};u.Yb=u.J.extend({g:function(a,c){u.J.call(this,a,c);a.d("timeupdate",u.bind(this,this.xa));a.M(u.bind(this,this.xa))}});
+t=u.Yb.prototype;t.f={children:{loadProgressBar:{},playProgressBar:{},seekHandle:{}},barName:"playProgressBar",handleName:"seekHandle"};t.qc="timeupdate";t.e=function(){return u.J.prototype.e.call(this,"div",{className:"vjs-progress-holder","aria-label":"video progress bar"})};t.xa=function(){var a=this.a.Mb?this.a.r.currentTime:this.a.currentTime();this.b.setAttribute("aria-valuenow",u.round(100*this.xb(),2));this.b.setAttribute("aria-valuetext",u.Ha(a,this.a.duration()))};
+t.xb=function(){return this.a.currentTime()/this.a.duration()};t.Ma=function(a){u.J.prototype.Ma.call(this,a);this.a.Mb=f;this.nd=!this.a.paused();this.a.pause()};t.Gb=function(a){a=B(this,a)*this.a.duration();a==this.a.duration()&&(a-=0.1);this.a.currentTime(a)};t.Hb=function(a){u.J.prototype.Hb.call(this,a);this.a.Mb=l;this.nd&&this.a.play()};t.wc=function(){this.a.currentTime(this.a.currentTime()+5)};t.vc=function(){this.a.currentTime(this.a.currentTime()-5)};
+u.bb=u.c.extend({g:function(a,c){u.c.call(this,a,c);a.d("progress",u.bind(this,this.update))}});u.bb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-load-progress",innerHTML:'<span class="vjs-control-text">Loaded: 0%</span>'})};u.bb.prototype.update=function(){this.b.style&&(this.b.style.width=u.round(100*G(this.a),2)+"%")};u.Wb=u.c.extend({g:function(a,c){u.c.call(this,a,c)}});
+u.Wb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-play-progress",innerHTML:'<span class="vjs-control-text">Progress: 0%</span>'})};u.hb=u.ha.extend();u.hb.prototype.defaultValue="00:00";u.hb.prototype.e=function(){return u.ha.prototype.e.call(this,"div",{className:"vjs-seek-handle"})};u.kb=u.c.extend({g:function(a,c){u.c.call(this,a,c);a.h&&(a.h.j&&a.h.j.T===l)&&this.p("vjs-hidden");a.d("loadstart",u.bind(this,function(){a.h.j&&a.h.j.T===l?this.p("vjs-hidden"):this.w("vjs-hidden")}))}});
+u.kb.prototype.f={children:{volumeBar:{}}};u.kb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-volume-control vjs-control"})};u.jb=u.J.extend({g:function(a,c){u.J.call(this,a,c);a.d("volumechange",u.bind(this,this.xa));a.M(u.bind(this,this.xa));setTimeout(u.bind(this,this.update),0)}});t=u.jb.prototype;t.xa=function(){this.b.setAttribute("aria-valuenow",u.round(100*this.a.volume(),2));this.b.setAttribute("aria-valuetext",u.round(100*this.a.volume(),2)+"%")};
+t.f={children:{volumeLevel:{},volumeHandle:{}},barName:"volumeLevel",handleName:"volumeHandle"};t.qc="volumechange";t.e=function(){return u.J.prototype.e.call(this,"div",{className:"vjs-volume-bar","aria-label":"volume level"})};t.Gb=function(a){this.a.volume(B(this,a))};t.xb=function(){return this.a.muted()?0:this.a.volume()};t.wc=function(){this.a.volume(this.a.volume()+0.1)};t.vc=function(){this.a.volume(this.a.volume()-0.1)};u.bc=u.c.extend({g:function(a,c){u.c.call(this,a,c)}});
+u.bc.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-volume-level",innerHTML:'<span class="vjs-control-text"></span>'})};u.lb=u.ha.extend();u.lb.prototype.defaultValue="00:00";u.lb.prototype.e=function(){return u.ha.prototype.e.call(this,"div",{className:"vjs-volume-handle"})};
+u.fa=u.o.extend({g:function(a,c){u.o.call(this,a,c);a.d("volumechange",u.bind(this,this.update));a.h&&(a.h.j&&a.h.j.T===l)&&this.p("vjs-hidden");a.d("loadstart",u.bind(this,function(){a.h.j&&a.h.j.T===l?this.p("vjs-hidden"):this.w("vjs-hidden")}))}});u.fa.prototype.e=function(){return u.o.prototype.e.call(this,"div",{className:"vjs-mute-control vjs-control",innerHTML:'<div><span class="vjs-control-text">Mute</span></div>'})};u.fa.prototype.n=function(){this.a.muted(this.a.muted()?l:f)};
+u.fa.prototype.update=function(){var a=this.a.volume(),c=3;0===a||this.a.muted()?c=0:0.33>a?c=1:0.67>a&&(c=2);this.a.muted()?"Unmute"!=this.b.children[0].children[0].innerHTML&&(this.b.children[0].children[0].innerHTML="Unmute"):"Mute"!=this.b.children[0].children[0].innerHTML&&(this.b.children[0].children[0].innerHTML="Mute");for(a=0;4>a;a++)u.w(this.b,"vjs-vol-"+a);u.p(this.b,"vjs-vol-"+c)};
+u.Ca=u.ea.extend({g:function(a,c){u.ea.call(this,a,c);a.d("volumechange",u.bind(this,this.update));a.h&&(a.h.j&&a.h.j.T===l)&&this.p("vjs-hidden");a.d("loadstart",u.bind(this,function(){a.h.j&&a.h.j.T===l?this.p("vjs-hidden"):this.w("vjs-hidden")}));this.p("vjs-menu-button")}});u.Ca.prototype.Fa=function(){var a=new u.na(this.a,{Ic:"div"}),c=new u.jb(this.a,u.i.B({md:f},this.f.zd));a.X(c);return a};u.Ca.prototype.n=function(){u.fa.prototype.n.call(this);u.ea.prototype.n.call(this)};
+u.Ca.prototype.e=function(){return u.o.prototype.e.call(this,"div",{className:"vjs-volume-menu-button vjs-menu-button vjs-control",innerHTML:'<div><span class="vjs-control-text">Mute</span></div>'})};u.Ca.prototype.update=u.fa.prototype.update;u.eb=u.o.extend({g:function(a,c){u.o.call(this,a,c);(!a.poster()||!a.controls())&&this.v();a.d("play",u.bind(this,this.v))}});
+u.eb.prototype.e=function(){var a=u.e("div",{className:"vjs-poster",tabIndex:-1}),c=this.a.poster();c&&("backgroundSize"in a.style?a.style.backgroundImage='url("'+c+'")':a.appendChild(u.e("img",{src:c})));return a};u.eb.prototype.n=function(){this.a.play()};
+u.Vb=u.c.extend({g:function(a,c){u.c.call(this,a,c);a.d("canplay",u.bind(this,this.v));a.d("canplaythrough",u.bind(this,this.v));a.d("playing",u.bind(this,this.v));a.d("seeked",u.bind(this,this.v));a.d("seeking",u.bind(this,this.show));a.d("seeked",u.bind(this,this.v));a.d("error",u.bind(this,this.show));a.d("waiting",u.bind(this,this.show))}});u.Vb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-loading-spinner"})};
+u.Wa=u.o.extend({g:function(a,c){u.o.call(this,a,c);a.controls()||this.v();a.d("play",u.bind(this,this.v))}});u.Wa.prototype.e=function(){return u.o.prototype.e.call(this,"div",{className:"vjs-big-play-button",innerHTML:"<span></span>","aria-label":"play video"})};u.Wa.prototype.n=function(){this.a.play()};u.q=u.c.extend({g:function(a,c,d){u.c.call(this,a,c,d)}});u.q.prototype.n=u.ab?m():function(){this.a.controls()&&(this.a.paused()?this.a.play():this.a.pause())};u.q.prototype.j={T:f,Ia:l,Lb:l,Ob:l};
+u.media={};u.media.Va="play pause paused currentTime setCurrentTime duration buffered volume setVolume muted setMuted width height supportsFullScreen enterFullScreen src load currentSrc preload setPreload autoplay setAutoplay loop setLoop error networkState readyState seeking initialTime startOffsetTime played seekable ended videoTracks audioTracks videoWidth videoHeight textTracks defaultPlaybackRate playbackRate mediaGroup controller controls defaultMuted".split(" ");
+function ea(){var a=u.media.Va[i];return function(){throw Error('The "'+a+"\" method is not available on the playback technology's API");}}for(var i=u.media.Va.length-1;0<=i;i--)u.q.prototype[u.media.Va[i]]=ea();
+u.m=u.q.extend({g:function(a,c,d){this.j.T=u.m.Hc();this.j.Sc=!u.Ub;this.j.Ia=f;u.q.call(this,a,c,d);(c=c.source)&&this.b.currentSrc==c.src?a.k("loadstart"):c&&(this.b.src=c.src);a.M(function(){this.f.autoplay&&this.paused()&&(this.N.poster=h,this.play())});this.d("click",this.n);for(a=u.m.$a.length-1;0<=a;a--)u.d(this.b,u.m.$a[a],u.bind(this.a,this.Nc));this.Ta()}});t=u.m.prototype;t.C=function(){u.q.prototype.C.call(this)};
+t.e=function(){var a=this.a,c=a.N;if(!c||this.j.Sc===l)c?(a.s().removeChild(c),c=c.cloneNode(l)):c=u.e("video",{id:a.id()+"_html5_api",className:"vjs-tech"}),c.player=a,u.yb(c,a.s());for(var d=["autoplay","preload","loop","muted"],e=d.length-1;0<=e;e--){var g=d[e];a.f[g]!==h&&(c[g]=a.f[g])}return c};t.Nc=function(a){this.k(a);a.stopPropagation()};t.play=function(){this.b.play()};t.pause=function(){this.b.pause()};t.paused=function(){return this.b.paused};t.currentTime=function(){return this.b.currentTime};
+t.cd=function(a){try{this.b.currentTime=a}catch(c){u.log(c,"Video is not ready. (Video.js)")}};t.duration=function(){return this.b.duration||0};t.buffered=function(){return this.b.buffered};t.volume=function(){return this.b.volume};t.hd=function(a){this.b.volume=a};t.muted=function(){return this.b.muted};t.fd=function(a){this.b.muted=a};t.width=function(){return this.b.offsetWidth};t.height=function(){return this.b.offsetHeight};
+t.Sa=function(){return"function"==typeof this.b.webkitEnterFullScreen&&(/Android/.test(u.O)||!/Chrome|Mac OS X 10.5/.test(u.O))?f:l};t.src=function(a){this.b.src=a};t.load=function(){this.b.load()};t.currentSrc=function(){return this.b.currentSrc};t.Oa=function(){return this.b.Oa};t.gd=function(a){this.b.Oa=a};t.autoplay=function(){return this.b.autoplay};t.bd=function(a){this.b.autoplay=a};t.loop=function(){return this.b.loop};t.ed=function(a){this.b.loop=a};t.error=function(){return this.b.error};
+u.m.isSupported=function(){return!!document.createElement("video").canPlayType};u.m.ob=function(a){return!!document.createElement("video").canPlayType(a.type)};u.m.Hc=function(){var a=u.ib.volume;u.ib.volume=a/2+0.1;return a!==u.ib.volume};u.m.$a="loadstart suspend abort error emptied stalled loadedmetadata loadeddata canplay canplaythrough playing waiting seeking seeked ended durationchange timeupdate progress play pause ratechange volumechange".split(" ");
+u.ab&&3>u.yc&&(document.createElement("video").constructor.prototype.canPlayType=function(a){return a&&-1!=a.toLowerCase().indexOf("video/mp4")?"maybe":""});
+u.l=u.q.extend({g:function(a,c,d){u.q.call(this,a,c,d);d=c.source;var e=c.parentEl,g=this.b=u.e("div",{id:a.id()+"_temp_flash"}),j=a.id()+"_flash_api";a=a.f;var k=u.i.B({readyFunction:"videojs.Flash.onReady",eventProxyFunction:"videojs.Flash.onEvent",errorEventProxyFunction:"videojs.Flash.onError",autoplay:a.autoplay,preload:a.Oa,loop:a.loop,muted:a.muted},c.flashVars),q=u.i.B({wmode:"opaque",bgcolor:"#000000"},c.params),n=u.i.B({id:j,name:j,"class":"vjs-tech"},c.attributes);d&&(k.src=encodeURIComponent(u.jc(d.src)));
+u.yb(g,e);c.startTime&&this.M(function(){this.load();this.play();this.currentTime(c.startTime)});if(c.iFrameMode===f&&!u.zc){var s=u.e("iframe",{id:j+"_iframe",name:j+"_iframe",className:"vjs-tech",scrolling:"no",marginWidth:0,marginHeight:0,frameBorder:0});k.readyFunction="ready";k.eventProxyFunction="events";k.errorEventProxyFunction="errors";u.d(s,"load",u.bind(this,function(){var a,d=s.contentWindow;a=s.contentDocument?s.contentDocument:s.contentWindow.document;a.write(u.l.kc(c.swf,k,q,n));d.player=
+this.a;d.ready=u.bind(this.a,function(c){c=a.getElementById(c);var d=this.h;d.b=c;u.d(c,"click",d.bind(d.n));u.l.qb(d)});d.events=u.bind(this.a,function(a,c){this&&"flash"===this.ba&&this.k(c)});d.errors=u.bind(this.a,function(a,c){u.log("Flash Error",c)})}));g.parentNode.replaceChild(s,g)}else u.l.Mc(c.swf,g,k,q,n)}});t=u.l.prototype;t.C=function(){u.q.prototype.C.call(this)};t.play=function(){this.b.vjs_play()};t.pause=function(){this.b.vjs_pause()};
+t.src=function(a){a=u.jc(a);this.b.vjs_src(a);if(this.a.autoplay()){var c=this;setTimeout(function(){c.play()},0)}};t.load=function(){this.b.vjs_load()};t.poster=function(){this.b.vjs_getProperty("poster")};t.buffered=function(){return u.tb(0,this.b.vjs_getProperty("buffered"))};t.Sa=r(l);var P=u.l.prototype,Q="preload currentTime defaultPlaybackRate playbackRate autoplay loop mediaGroup controller controls volume muted defaultMuted".split(" "),R="error currentSrc networkState readyState seeking initialTime duration startOffsetTime paused played seekable ended videoTracks audioTracks videoWidth videoHeight textTracks".split(" ");
+function fa(){var a=Q[S],c=a.charAt(0).toUpperCase()+a.slice(1);P["set"+c]=function(c){return this.b.vjs_setProperty(a,c)}}function T(a){P[a]=function(){return this.b.vjs_getProperty(a)}}var S;for(S=0;S<Q.length;S++)T(Q[S]),fa();for(S=0;S<R.length;S++)T(R[S]);u.l.isSupported=function(){return 10<=u.l.version()[0]};u.l.ob=function(a){if(a.type in u.l.Pc)return"maybe"};u.l.Pc={"video/flv":"FLV","video/x-flv":"FLV","video/mp4":"MP4","video/m4v":"MP4"};
+u.l.onReady=function(a){a=u.s(a);var c=a.player||a.parentNode.player,d=c.h;a.player=c;d.b=a;d.d("click",d.n);u.l.qb(d)};u.l.qb=function(a){a.s().vjs_getProperty?a.Ta():setTimeout(function(){u.l.qb(a)},50)};u.l.onEvent=function(a,c){u.s(a).player.k(c)};u.l.onError=function(a,c){u.s(a).player.k("error");u.log("Flash Error",c,a)};
+u.l.version=function(){var a="0,0,0";try{a=(new window.ActiveXObject("ShockwaveFlash.ShockwaveFlash")).GetVariable("$version").replace(/\D+/g,",").match(/^,?(.+),?$/)[1]}catch(c){try{navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin&&(a=(navigator.plugins["Shockwave Flash 2.0"]||navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g,",").match(/^,?(.+),?$/)[1])}catch(d){}}return a.split(",")};
+u.l.Mc=function(a,c,d,e,g){a=u.l.kc(a,d,e,g);a=u.e("div",{innerHTML:a}).childNodes[0];d=c.parentNode;c.parentNode.replaceChild(a,c);var j=d.childNodes[0];setTimeout(function(){j.style.display="block"},1E3)};
+u.l.kc=function(a,c,d,e){var g="",j="",k="";c&&u.i.sa(c,function(a,c){g+=a+"="+c+"&amp;"});d=u.i.B({movie:a,flashvars:g,allowScriptAccess:"always",allowNetworking:"all"},d);u.i.sa(d,function(a,c){j+='<param name="'+a+'" value="'+c+'" />'});e=u.i.B({data:a,width:"100%",height:"100%"},e);u.i.sa(e,function(a,c){k+=a+'="'+c+'" '});return'<object type="application/x-shockwave-flash"'+k+">"+j+"</object>"};
+u.Dc=u.c.extend({g:function(a,c,d){u.c.call(this,a,c,d);if(!a.f.sources||0===a.f.sources.length){c=0;for(d=a.f.techOrder;c<d.length;c++){var e=u.Y(d[c]),g=window.videojs[e];if(g&&g.isSupported()){E(a,e);break}}}else a.src(a.f.sources)}});function U(a){a.wa=a.wa||[];return a.wa}function V(a,c,d){for(var e=a.wa,g=0,j=e.length,k,q;g<j;g++)k=e[g],k.id()===c?(k.show(),q=k):d&&(k.H()==d&&0<k.mode())&&k.disable();(c=q?q.H():d?d:l)&&a.k(c+"trackchange")}
+u.U=u.c.extend({g:function(a,c){u.c.call(this,a,c);this.L=c.id||"vjs_"+c.kind+"_"+c.language+"_"+u.u++;this.uc=c.src;this.Jc=c["default"]||c.dflt;this.kd=c.title;this.ud=c.srclang;this.Rc=c.label;this.ia=[];this.cc=[];this.ka=this.la=0;this.a.d("fullscreenchange",u.bind(this,this.Ec))}});t=u.U.prototype;t.H=p("A");t.src=p("uc");t.ub=p("Jc");t.title=p("kd");t.label=p("Rc");t.readyState=p("la");t.mode=p("ka");t.Ec=function(){this.b.style.fontSize=this.a.F?140*(screen.width/this.a.width())+"%":""};
+t.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-"+this.A+" vjs-text-track"})};t.show=function(){W(this);this.ka=2;u.c.prototype.show.call(this)};t.v=function(){W(this);this.ka=1;u.c.prototype.v.call(this)};t.disable=function(){2==this.ka&&this.v();this.a.t("timeupdate",u.bind(this,this.update,this.L));this.a.t("ended",u.bind(this,this.reset,this.L));this.reset();this.a.R.textTrackDisplay.removeChild(this);this.ka=0};
+function W(a){0===a.la&&a.load();0===a.ka&&(a.a.d("timeupdate",u.bind(a,a.update,a.L)),a.a.d("ended",u.bind(a,a.reset,a.L)),("captions"===a.A||"subtitles"===a.A)&&a.a.R.textTrackDisplay.X(a))}t.load=function(){0===this.la&&(this.la=1,u.get(this.uc,u.bind(this,this.Zc),u.bind(this,this.Fb)))};t.Fb=function(a){this.error=a;this.la=3;this.k("error")};
+t.Zc=function(a){var c,d;a=a.split("\n");for(var e="",g=1,j=a.length;g<j;g++)if(e=u.trim(a[g])){-1==e.indexOf("--\x3e")?(c=e,e=u.trim(a[++g])):c=this.ia.length;c={id:c,index:this.ia.length};d=e.split(" --\x3e ");c.startTime=X(d[0]);c.ta=X(d[1]);for(d=[];a[++g]&&(e=u.trim(a[g]));)d.push(e);c.text=d.join("<br/>");this.ia.push(c)}this.la=2;this.k("loaded")};
+function X(a){var c=a.split(":");a=0;var d,e,g;3==c.length?(d=c[0],e=c[1],c=c[2]):(d=0,e=c[0],c=c[1]);c=c.split(/\s+/);c=c.splice(0,1)[0];c=c.split(/\.|,/);g=parseFloat(c[1]);c=c[0];a+=3600*parseFloat(d);a+=60*parseFloat(e);a+=parseFloat(c);g&&(a+=g/1E3);return a}
+t.update=function(){if(0<this.ia.length){var a=this.a.currentTime();if(this.Kb===b||a<this.Kb||this.Ja<=a){var c=this.ia,d=this.a.duration(),e=0,g=l,j=[],k,q,n,s;a>=this.Ja||this.Ja===b?s=this.vb!==b?this.vb:0:(g=f,s=this.Cb!==b?this.Cb:c.length-1);for(;;){n=c[s];if(n.ta<=a)e=Math.max(e,n.ta),n.Da&&(n.Da=l);else if(a<n.startTime){if(d=Math.min(d,n.startTime),n.Da&&(n.Da=l),!g)break}else g?(j.splice(0,0,n),q===b&&(q=s),k=s):(j.push(n),k===b&&(k=s),q=s),d=Math.min(d,n.ta),e=Math.max(e,n.startTime),
+n.Da=f;if(g)if(0===s)break;else s--;else if(s===c.length-1)break;else s++}this.cc=j;this.Ja=d;this.Kb=e;this.vb=k;this.Cb=q;a=this.cc;c="";d=0;for(e=a.length;d<e;d++)c+='<span class="vjs-tt-cue">'+a[d].text+"</span>";this.b.innerHTML=c;this.k("cuechange")}}};t.reset=function(){this.Ja=0;this.Kb=this.a.duration();this.Cb=this.vb=0};u.Rb=u.U.extend();u.Rb.prototype.A="captions";u.Zb=u.U.extend();u.Zb.prototype.A="subtitles";u.Tb=u.U.extend();u.Tb.prototype.A="chapters";
+u.$b=u.c.extend({g:function(a,c,d){u.c.call(this,a,c,d);if(a.f.tracks&&0<a.f.tracks.length){c=this.a;a=a.f.tracks;var e;for(d=0;d<a.length;d++){e=a[d];var g=c,j=e.kind,k=e.label,q=e.language,n=e;e=g.wa=g.wa||[];n=n||{};n.kind=j;n.label=k;n.language=q;j=u.Y(j||"subtitles");g=new window.videojs[j+"Track"](g,n);e.push(g)}}}});u.$b.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-text-track-display"})};
+u.W=u.I.extend({g:function(a,c){var d=this.ca=c.track;c.label=d.label();c.selected=d.ub();u.I.call(this,a,c);this.a.d(d.H()+"trackchange",u.bind(this,this.update))}});u.W.prototype.n=function(){u.I.prototype.n.call(this);V(this.a,this.ca.L,this.ca.H())};u.W.prototype.update=function(){2==this.ca.mode()?this.selected(f):this.selected(l)};u.cb=u.W.extend({g:function(a,c){c.track={H:function(){return c.kind},pc:a,label:function(){return c.kind+" off"},ub:r(l),mode:r(l)};u.W.call(this,a,c);this.selected(f)}});
+u.cb.prototype.n=function(){u.W.prototype.n.call(this);V(this.a,this.ca.L,this.ca.H())};u.cb.prototype.update=function(){for(var a=U(this.a),c=0,d=a.length,e,g=f;c<d;c++)e=a[c],e.H()==this.ca.H()&&2==e.mode()&&(g=l);g?this.selected(f):this.selected(l)};u.V=u.ea.extend({g:function(a,c){u.ea.call(this,a,c);1>=this.G.length&&this.v()}});
+u.V.prototype.sb=function(){var a=[],c;a.push(new u.cb(this.a,{kind:this.A}));for(var d=0;d<U(this.a).length;d++)c=U(this.a)[d],c.H()===this.A&&a.push(new u.W(this.a,{track:c}));return a};u.za=u.V.extend({g:function(a,c,d){u.V.call(this,a,c,d);this.b.setAttribute("aria-label","Captions Menu")}});u.za.prototype.A="captions";u.za.prototype.pa="Captions";u.za.prototype.className="vjs-captions-button";u.Ba=u.V.extend({g:function(a,c,d){u.V.call(this,a,c,d);this.b.setAttribute("aria-label","Subtitles Menu")}});
+u.Ba.prototype.A="subtitles";u.Ba.prototype.pa="Subtitles";u.Ba.prototype.className="vjs-subtitles-button";u.Sb=u.V.extend({g:function(a,c,d){u.V.call(this,a,c,d);this.b.setAttribute("aria-label","Chapters Menu")}});t=u.Sb.prototype;t.A="chapters";t.pa="Chapters";t.className="vjs-chapters-button";t.sb=function(){for(var a=[],c,d=0;d<U(this.a).length;d++)c=U(this.a)[d],c.H()===this.A&&a.push(new u.W(this.a,{track:c}));return a};
+t.Fa=function(){for(var a=U(this.a),c=0,d=a.length,e,g,j=this.G=[];c<d;c++)if(e=a[c],e.H()==this.A&&e.ub()){if(2>e.readyState()){this.sd=e;e.d("loaded",u.bind(this,this.Fa));return}g=e;break}a=this.ua=new u.na(this.a);a.b.appendChild(u.e("li",{className:"vjs-menu-title",innerHTML:u.Y(this.A),jd:-1}));if(g){e=g.ia;for(var k,c=0,d=e.length;c<d;c++)k=e[c],k=new u.Xa(this.a,{track:g,cue:k}),j.push(k),a.X(k)}0<this.G.length&&this.show();return a};
+u.Xa=u.I.extend({g:function(a,c){var d=this.ca=c.track,e=this.cue=c.cue,g=a.currentTime();c.label=e.text;c.selected=e.startTime<=g&&g<e.ta;u.I.call(this,a,c);d.d("cuechange",u.bind(this,this.update))}});u.Xa.prototype.n=function(){u.I.prototype.n.call(this);this.a.currentTime(this.cue.startTime);this.update(this.cue.startTime)};u.Xa.prototype.update=function(){var a=this.cue,c=this.a.currentTime();a.startTime<=c&&c<a.ta?this.selected(f):this.selected(l)};
+u.i.B(u.da.prototype.f.children,{subtitlesButton:{},captionsButton:{},chaptersButton:{}});
+if("undefined"!==typeof window.JSON&&"function"===window.JSON.parse)u.JSON=window.JSON;else{u.JSON={};var Y=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;u.JSON.parse=function(a,c){function d(a,e){var k,q,n=a[e];if(n&&"object"===typeof n)for(k in n)Object.prototype.hasOwnProperty.call(n,k)&&(q=d(n,k),q!==b?n[k]=q:delete n[k]);return c.call(a,e,n)}var e;a=String(a);Y.lastIndex=0;Y.test(a)&&(a=a.replace(Y,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}));
+if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return e=eval("("+a+")"),"function"===typeof c?d({"":e},""):e;throw new SyntaxError("JSON.parse(): invalid or malformed JSON data");}}
+u.dc=function(){var a,c,d=document.getElementsByTagName("video");if(d&&0<d.length)for(var e=0,g=d.length;e<g;e++)if((c=d[e])&&c.getAttribute)c.player===b&&(a=c.getAttribute("data-setup"),a!==h&&(a=u.JSON.parse(a||"{}"),v(c,a)));else{u.mb();break}else u.od||u.mb()};u.mb=function(){setTimeout(u.dc,1)};u.Q(window,"load",function(){u.od=f});u.mb();u.$c=function(a,c){u.ga.prototype[a]=c};var Z=this;Z.pd=f;function $(a,c){var d=a.split("."),e=Z;!(d[0]in e)&&e.execScript&&e.execScript("var "+d[0]);for(var g;d.length&&(g=d.shift());)!d.length&&c!==b?e[g]=c:e=e[g]?e[g]:e[g]={}};$("videojs",u);$("_V_",u);$("videojs.options",u.options);$("videojs.cache",u.qa);$("videojs.Component",u.c);u.c.prototype.dispose=u.c.prototype.C;u.c.prototype.createEl=u.c.prototype.e;u.c.prototype.el=u.c.prototype.s;u.c.prototype.addChild=u.c.prototype.X;u.c.prototype.children=u.c.prototype.children;u.c.prototype.on=u.c.prototype.d;u.c.prototype.off=u.c.prototype.t;u.c.prototype.one=u.c.prototype.Q;u.c.prototype.trigger=u.c.prototype.k;u.c.prototype.triggerReady=u.c.prototype.Ta;
+u.c.prototype.show=u.c.prototype.show;u.c.prototype.hide=u.c.prototype.v;u.c.prototype.width=u.c.prototype.width;u.c.prototype.height=u.c.prototype.height;u.c.prototype.dimensions=u.c.prototype.Kc;u.c.prototype.ready=u.c.prototype.M;$("videojs.Player",u.ga);u.ga.prototype.dispose=u.ga.prototype.C;$("videojs.MediaLoader",u.Dc);$("videojs.TextTrackDisplay",u.$b);$("videojs.ControlBar",u.da);$("videojs.Button",u.o);$("videojs.PlayToggle",u.Xb);$("videojs.FullscreenToggle",u.Aa);
+$("videojs.BigPlayButton",u.Wa);$("videojs.LoadingSpinner",u.Vb);$("videojs.CurrentTimeDisplay",u.Ya);$("videojs.DurationDisplay",u.Za);$("videojs.TimeDivider",u.ac);$("videojs.RemainingTimeDisplay",u.gb);$("videojs.Slider",u.J);$("videojs.ProgressControl",u.fb);$("videojs.SeekBar",u.Yb);$("videojs.LoadProgressBar",u.bb);$("videojs.PlayProgressBar",u.Wb);$("videojs.SeekHandle",u.hb);$("videojs.VolumeControl",u.kb);$("videojs.VolumeBar",u.jb);$("videojs.VolumeLevel",u.bc);
+$("videojs.VolumeHandle",u.lb);$("videojs.MuteToggle",u.fa);$("videojs.PosterImage",u.eb);$("videojs.Menu",u.na);$("videojs.MenuItem",u.I);$("videojs.SubtitlesButton",u.Ba);$("videojs.CaptionsButton",u.za);$("videojs.ChaptersButton",u.Sb);$("videojs.MediaTechController",u.q);u.q.prototype.features=u.q.prototype.j;u.q.prototype.j.volumeControl=u.q.prototype.j.T;u.q.prototype.j.fullscreenResize=u.q.prototype.j.Ia;u.q.prototype.j.progressEvents=u.q.prototype.j.Lb;u.q.prototype.j.timeupdateEvents=u.q.prototype.j.Ob;
+$("videojs.Html5",u.m);u.m.Events=u.m.$a;u.m.isSupported=u.m.isSupported;u.m.canPlaySource=u.m.ob;u.m.prototype.setCurrentTime=u.m.prototype.cd;u.m.prototype.setVolume=u.m.prototype.hd;u.m.prototype.setMuted=u.m.prototype.fd;u.m.prototype.setPreload=u.m.prototype.gd;u.m.prototype.setAutoplay=u.m.prototype.bd;u.m.prototype.setLoop=u.m.prototype.ed;$("videojs.Flash",u.l);u.l.isSupported=u.l.isSupported;u.l.canPlaySource=u.l.ob;u.l.onReady=u.l.onReady;$("videojs.TextTrack",u.U);u.U.prototype.label=u.U.prototype.label;
+$("videojs.CaptionsTrack",u.Rb);$("videojs.SubtitlesTrack",u.Zb);$("videojs.ChaptersTrack",u.Tb);$("videojs.autoSetup",u.dc);$("videojs.plugin",u.$c);$("videojs.createTimeRange",u.tb);})();//@ sourceMappingURL=video.js.map
diff --git a/library/video-js/video.min.js b/library/video-js/video.min.js
deleted file mode 100644
index 74f349980d..0000000000
--- a/library/video-js/video.min.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
-Video.js - HTML5 Video Player
-Version 3.2.0
-
-LGPL v3 LICENSE INFO
-This file is part of Video.js. Copyright 2011 Zencoder, Inc.
-
-Video.js is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Video.js is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with Video.js.  If not, see <http://www.gnu.org/licenses/>.
-*/
-(function(window,undefined){var document=window.document;document.createElement("video");document.createElement("audio");var VideoJS=function(id,addOptions,ready){var tag;if(typeof id=="string"){if(id.indexOf("#")===0){id=id.slice(1)}if(_V_.players[id]){return _V_.players[id]}else{tag=_V_.el(id)}}else{tag=id}if(!tag||!tag.nodeName){throw new TypeError("The element or ID supplied is not valid. (VideoJS)")}return tag.player||new _V_.Player(tag,addOptions,ready)},_V_=VideoJS,CDN_VERSION="3.2";VideoJS.players={};VideoJS.options={techOrder:["html5","flash"],html5:{},flash:{swf:"http://vjs.zencdn.net/c/video-js.swf"},width:"auto",height:"auto",defaultVolume:0,components:{posterImage:{},textTrackDisplay:{},loadingSpinner:{},bigPlayButton:{},controlBar:{}}};if(CDN_VERSION!="GENERATED_CDN_VSN"){_V_.options.flash.swf="http://vjs.zencdn.net/"+CDN_VERSION+"/video-js.swf"}_V_.merge=function(obj1,obj2,safe){if(!obj2){obj2={}}for(var attrname in obj2){if(obj2.hasOwnProperty(attrname)&&(!safe||!obj1.hasOwnProperty(attrname))){obj1[attrname]=obj2[attrname]}}return obj1};_V_.extend=function(obj){this.merge(this,obj,true)};_V_.extend({tech:{},controlSets:{},isIE:function(){return !+"\v1"},isFF:function(){return !!_V_.ua.match("Firefox")},isIPad:function(){return navigator.userAgent.match(/iPad/i)!==null},isIPhone:function(){return navigator.userAgent.match(/iPhone/i)!==null},isIOS:function(){return VideoJS.isIPhone()||VideoJS.isIPad()},iOSVersion:function(){var match=navigator.userAgent.match(/OS (\d+)_/i);if(match&&match[1]){return match[1]}},isAndroid:function(){return navigator.userAgent.match(/Android.*AppleWebKit/i)!==null},androidVersion:function(){var match=navigator.userAgent.match(/Android (\d+)\./i);if(match&&match[1]){return match[1]}},testVid:document.createElement("video"),ua:navigator.userAgent,support:{},each:function(arr,fn){if(!arr||arr.length===0){return}for(var i=0,j=arr.length;i<j;i++){fn.call(this,arr[i],i)}},eachProp:function(obj,fn){if(!obj){return}for(var name in obj){if(obj.hasOwnProperty(name)){fn.call(this,name,obj[name])}}},el:function(id){return document.getElementById(id)},createElement:function(tagName,attributes){var el=document.createElement(tagName),attrname;for(attrname in attributes){if(attributes.hasOwnProperty(attrname)){if(attrname.indexOf("-")!==-1){el.setAttribute(attrname,attributes[attrname])}else{el[attrname]=attributes[attrname]}}}return el},insertFirst:function(node,parent){if(parent.firstChild){parent.insertBefore(node,parent.firstChild)}else{parent.appendChild(node)}},addClass:function(element,classToAdd){if((" "+element.className+" ").indexOf(" "+classToAdd+" ")==-1){element.className=element.className===""?classToAdd:element.className+" "+classToAdd}},removeClass:function(element,classToRemove){if(element.className.indexOf(classToRemove)==-1){return}var classNames=element.className.split(" ");classNames.splice(classNames.indexOf(classToRemove),1);element.className=classNames.join(" ")},remove:function(item,array){if(!array){return}var i=array.indexOf(item);if(i!=-1){return array.splice(i,1)}},blockTextSelection:function(){document.body.focus();document.onselectstart=function(){return false}},unblockTextSelection:function(){document.onselectstart=function(){return true}},formatTime:function(seconds,guide){guide=guide||seconds;var s=Math.floor(seconds%60),m=Math.floor(seconds/60%60),h=Math.floor(seconds/3600),gm=Math.floor(guide/60%60),gh=Math.floor(guide/3600);h=(h>0||gh>0)?h+":":"";m=(((h||gm>=10)&&m<10)?"0"+m:m)+":";s=(s<10)?"0"+s:s;return h+m+s},uc:function(string){return string.charAt(0).toUpperCase()+string.slice(1)},getRelativePosition:function(x,relativeElement){return Math.max(0,Math.min(1,(x-_V_.findPosX(relativeElement))/relativeElement.offsetWidth))},getComputedStyleValue:function(element,style){return window.getComputedStyle(element,null).getPropertyValue(style)},trim:function(string){return string.toString().replace(/^\s+/,"").replace(/\s+$/,"")},round:function(num,dec){if(!dec){dec=0}return Math.round(num*Math.pow(10,dec))/Math.pow(10,dec)},isEmpty:function(object){for(var prop in object){return false}return true},createTimeRange:function(start,end){return{length:1,start:function(){return start},end:function(){return end}}},cache:{},guid:1,expando:"vdata"+(new Date).getTime(),getData:function(elem){var id=elem[_V_.expando];if(!id){id=elem[_V_.expando]=_V_.guid++;_V_.cache[id]={}}return _V_.cache[id]},removeData:function(elem){var id=elem[_V_.expando];if(!id){return}delete _V_.cache[id];try{delete elem[_V_.expando]}catch(e){if(elem.removeAttribute){elem.removeAttribute(_V_.expando)}else{elem[_V_.expando]=null}}},proxy:function(context,fn,uid){if(!fn.guid){fn.guid=_V_.guid++}var ret=function(){return fn.apply(context,arguments)};ret.guid=(uid)?uid+"_"+fn.guid:fn.guid;return ret},get:function(url,onSuccess,onError){var local=(url.indexOf("file:")==0||(window.location.href.indexOf("file:")==0&&url.indexOf("http:")==-1));if(typeof XMLHttpRequest=="undefined"){XMLHttpRequest=function(){try{return new ActiveXObject("Msxml2.XMLHTTP.6.0")}catch(e){}try{return new ActiveXObject("Msxml2.XMLHTTP.3.0")}catch(f){}try{return new ActiveXObject("Msxml2.XMLHTTP")}catch(g){}throw new Error("This browser does not support XMLHttpRequest.")}}var request=new XMLHttpRequest();try{request.open("GET",url)}catch(e){_V_.log("VideoJS XMLHttpRequest (open)",e);return false}request.onreadystatechange=_V_.proxy(this,function(){if(request.readyState==4){if(request.status==200||local&&request.status==0){onSuccess(request.responseText)}else{if(onError){onError()}}}});try{request.send()}catch(e){_V_.log("VideoJS XMLHttpRequest (send)",e);if(onError){onError(e)}}},setLocalStorage:function(key,value){var localStorage=window.localStorage||false;if(!localStorage){return}try{localStorage[key]=value}catch(e){if(e.code==22||e.code==1014){_V_.log("LocalStorage Full (VideoJS)",e)}else{_V_.log("LocalStorage Error (VideoJS)",e)}}},getAbsoluteURL:function(url){if(!url.match(/^https?:\/\//)){url=_V_.createElement("div",{innerHTML:'<a href="'+url+'">x</a>'}).firstChild.href}return url}});_V_.log=function(){_V_.log.history=_V_.log.history||[];_V_.log.history.push(arguments);if(window.console){arguments.callee=arguments.callee.caller;var newarr=[].slice.call(arguments);(typeof console.log==="object"?_V_.log.apply.call(console.log,console,newarr):console.log.apply(console,newarr))}};(function(b){function c(){}for(var d="assert,count,debug,dir,dirxml,error,exception,group,groupCollapsed,groupEnd,info,log,timeStamp,profile,profileEnd,time,timeEnd,trace,warn".split(","),a;a=d.pop();){b[a]=b[a]||c}})((function(){try{console.log();return window.console}catch(err){return window.console={}}})());if("getBoundingClientRect" in document.documentElement){_V_.findPosX=function(el){var box;try{box=el.getBoundingClientRect()}catch(e){}if(!box){return 0}var docEl=document.documentElement,body=document.body,clientLeft=docEl.clientLeft||body.clientLeft||0,scrollLeft=window.pageXOffset||body.scrollLeft,left=box.left+scrollLeft-clientLeft;return left}}else{_V_.findPosX=function(el){var curleft=el.offsetLeft;while(el=obj.offsetParent){if(el.className.indexOf("video-js")==-1){}else{}curleft+=el.offsetLeft}return curleft}}(function(){var initializing=false,fnTest=/xyz/.test(function(){xyz})?/\b_super\b/:/.*/;_V_.Class=function(){};_V_.Class.extend=function(prop){var _super=this.prototype;initializing=true;var prototype=new this();initializing=false;for(var name in prop){prototype[name]=typeof prop[name]=="function"&&typeof _super[name]=="function"&&fnTest.test(prop[name])?(function(name,fn){return function(){var tmp=this._super;this._super=_super[name];var ret=fn.apply(this,arguments);this._super=tmp;return ret}})(name,prop[name]):prop[name]}function Class(){if(!initializing&&this.init){return this.init.apply(this,arguments)}else{if(!initializing){return arguments.callee.prototype.init()}}}Class.prototype=prototype;Class.constructor=Class;Class.extend=arguments.callee;return Class}})();_V_.Component=_V_.Class.extend({init:function(player,options){this.player=player;options=this.options=_V_.merge(this.options||{},options);if(options.el){this.el=options.el}else{this.el=this.createElement()}this.initComponents()},destroy:function(){},createElement:function(type,attrs){return _V_.createElement(type||"div",attrs)},buildCSSClass:function(){return""},initComponents:function(){var options=this.options;if(options&&options.components){this.eachProp(options.components,function(name,opts){var tempAdd=this.proxy(function(){this[name]=this.addComponent(name,opts)});if(opts.loadEvent){this.one(opts.loadEvent,tempAdd)}else{tempAdd()}})}},addComponent:function(name,options){var component,componentClass;if(typeof name=="string"){options=options||{};componentClass=options.componentClass||_V_.uc(name);component=new _V_[componentClass](this.player||this,options)}else{component=name}this.el.appendChild(component.el);return component},removeComponent:function(component){this.el.removeChild(component.el)},show:function(){this.el.style.display="block"},hide:function(){this.el.style.display="none"},fadeIn:function(){this.removeClass("vjs-fade-out");this.addClass("vjs-fade-in")},fadeOut:function(){this.removeClass("vjs-fade-in");this.addClass("vjs-fade-out")},lockShowing:function(){var style=this.el.style;style.display="block";style.opacity=1;style.visiblity="visible"},unlockShowing:function(){var style=this.el.style;style.display="";style.opacity="";style.visiblity=""},addClass:function(classToAdd){_V_.addClass(this.el,classToAdd)},removeClass:function(classToRemove){_V_.removeClass(this.el,classToRemove)},addEvent:function(type,fn,uid){return _V_.addEvent(this.el,type,_V_.proxy(this,fn))},removeEvent:function(type,fn){return _V_.removeEvent(this.el,type,fn)},triggerEvent:function(type,e){return _V_.triggerEvent(this.el,type,e)},one:function(type,fn){_V_.one(this.el,type,_V_.proxy(this,fn))},ready:function(fn){if(!fn){return this}if(this.isReady){fn.call(this)}else{if(this.readyQueue===undefined){this.readyQueue=[]}this.readyQueue.push(fn)}return this},triggerReady:function(){this.isReady=true;if(this.readyQueue&&this.readyQueue.length>0){this.each(this.readyQueue,function(fn){fn.call(this)});this.readyQueue=[];this.triggerEvent("ready")}},each:function(arr,fn){_V_.each.call(this,arr,fn)},eachProp:function(obj,fn){_V_.eachProp.call(this,obj,fn)},extend:function(obj){_V_.merge(this,obj)},proxy:function(fn,uid){return _V_.proxy(this,fn,uid)}});_V_.Control=_V_.Component.extend({buildCSSClass:function(){return"vjs-control "+this._super()}});_V_.ControlBar=_V_.Component.extend({options:{loadEvent:"play",components:{playToggle:{},fullscreenToggle:{},currentTimeDisplay:{},timeDivider:{},durationDisplay:{},remainingTimeDisplay:{},progressControl:{},volumeControl:{},muteToggle:{}}},init:function(player,options){this._super(player,options);player.addEvent("play",this.proxy(function(){this.fadeIn();this.player.addEvent("mouseover",this.proxy(this.fadeIn));this.player.addEvent("mouseout",this.proxy(this.fadeOut))}))},createElement:function(){return _V_.createElement("div",{className:"vjs-controls"})},fadeIn:function(){this._super();this.player.triggerEvent("controlsvisible")},fadeOut:function(){this._super();this.player.triggerEvent("controlshidden")},lockShowing:function(){this.el.style.opacity="1"}});_V_.Button=_V_.Control.extend({init:function(player,options){this._super(player,options);this.addEvent("click",this.onClick);this.addEvent("focus",this.onFocus);this.addEvent("blur",this.onBlur)},createElement:function(type,attrs){attrs=_V_.merge({className:this.buildCSSClass(),innerHTML:'<div><span class="vjs-control-text">'+(this.buttonText||"Need Text")+"</span></div>",role:"button",tabIndex:0},attrs);return this._super(type,attrs)},onClick:function(){},onFocus:function(){_V_.addEvent(document,"keyup",_V_.proxy(this,this.onKeyPress))},onKeyPress:function(event){if(event.which==32||event.which==13){event.preventDefault();this.onClick()}},onBlur:function(){_V_.removeEvent(document,"keyup",_V_.proxy(this,this.onKeyPress))}});_V_.PlayButton=_V_.Button.extend({buttonText:"Play",buildCSSClass:function(){return"vjs-play-button "+this._super()},onClick:function(){this.player.play()}});_V_.PauseButton=_V_.Button.extend({buttonText:"Pause",buildCSSClass:function(){return"vjs-pause-button "+this._super()},onClick:function(){this.player.pause()}});_V_.PlayToggle=_V_.Button.extend({buttonText:"Play",init:function(player,options){this._super(player,options);player.addEvent("play",_V_.proxy(this,this.onPlay));player.addEvent("pause",_V_.proxy(this,this.onPause))},buildCSSClass:function(){return"vjs-play-control "+this._super()},onClick:function(){if(this.player.paused()){this.player.play()}else{this.player.pause()}},onPlay:function(){_V_.removeClass(this.el,"vjs-paused");_V_.addClass(this.el,"vjs-playing")},onPause:function(){_V_.removeClass(this.el,"vjs-playing");_V_.addClass(this.el,"vjs-paused")}});_V_.FullscreenToggle=_V_.Button.extend({buttonText:"Fullscreen",buildCSSClass:function(){return"vjs-fullscreen-control "+this._super()},onClick:function(){if(!this.player.isFullScreen){this.player.requestFullScreen()}else{this.player.cancelFullScreen()}}});_V_.BigPlayButton=_V_.Button.extend({init:function(player,options){this._super(player,options);player.addEvent("play",_V_.proxy(this,this.hide));player.addEvent("ended",_V_.proxy(this,this.show))},createElement:function(){return this._super("div",{className:"vjs-big-play-button",innerHTML:"<span></span>"})},onClick:function(){if(this.player.currentTime()){this.player.currentTime(0)}this.player.play()}});_V_.LoadingSpinner=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("canplay",_V_.proxy(this,this.hide));player.addEvent("canplaythrough",_V_.proxy(this,this.hide));player.addEvent("playing",_V_.proxy(this,this.hide));player.addEvent("seeking",_V_.proxy(this,this.show));player.addEvent("error",_V_.proxy(this,this.show));player.addEvent("waiting",_V_.proxy(this,this.show))},createElement:function(){var classNameSpinner,innerHtmlSpinner;if(typeof this.player.el.style.WebkitBorderRadius=="string"||typeof this.player.el.style.MozBorderRadius=="string"||typeof this.player.el.style.KhtmlBorderRadius=="string"||typeof this.player.el.style.borderRadius=="string"){classNameSpinner="vjs-loading-spinner";innerHtmlSpinner="<div class='ball1'></div><div class='ball2'></div><div class='ball3'></div><div class='ball4'></div><div class='ball5'></div><div class='ball6'></div><div class='ball7'></div><div class='ball8'></div>"}else{classNameSpinner="vjs-loading-spinner-fallback";innerHtmlSpinner=""}return this._super("div",{className:classNameSpinner,innerHTML:innerHtmlSpinner})}});_V_.CurrentTimeDisplay=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("timeupdate",_V_.proxy(this,this.updateContent))},createElement:function(){var el=this._super("div",{className:"vjs-current-time vjs-time-controls vjs-control"});this.content=_V_.createElement("div",{className:"vjs-current-time-display",innerHTML:"0:00"});el.appendChild(_V_.createElement("div").appendChild(this.content));return el},updateContent:function(){var time=(this.player.scrubbing)?this.player.values.currentTime:this.player.currentTime();this.content.innerHTML=_V_.formatTime(time,this.player.duration())}});_V_.DurationDisplay=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("timeupdate",_V_.proxy(this,this.updateContent))},createElement:function(){var el=this._super("div",{className:"vjs-duration vjs-time-controls vjs-control"});this.content=_V_.createElement("div",{className:"vjs-duration-display",innerHTML:"0:00"});el.appendChild(_V_.createElement("div").appendChild(this.content));return el},updateContent:function(){if(this.player.duration()){this.content.innerHTML=_V_.formatTime(this.player.duration())}}});_V_.TimeDivider=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-time-divider",innerHTML:"<div><span>/</span></div>"})}});_V_.RemainingTimeDisplay=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("timeupdate",_V_.proxy(this,this.updateContent))},createElement:function(){var el=this._super("div",{className:"vjs-remaining-time vjs-time-controls vjs-control"});this.content=_V_.createElement("div",{className:"vjs-remaining-time-display",innerHTML:"-0:00"});el.appendChild(_V_.createElement("div").appendChild(this.content));return el},updateContent:function(){if(this.player.duration()){this.content.innerHTML="-"+_V_.formatTime(this.player.remainingTime())}}});_V_.Slider=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent(this.playerEvent,_V_.proxy(this,this.update));this.addEvent("mousedown",this.onMouseDown);this.addEvent("focus",this.onFocus);this.addEvent("blur",this.onBlur);this.player.addEvent("controlsvisible",this.proxy(this.update));this.update()},createElement:function(type,attrs){attrs=_V_.merge({role:"slider","aria-valuenow":0,"aria-valuemin":0,"aria-valuemax":100,tabIndex:0},attrs);return this._super(type,attrs)},onMouseDown:function(event){event.preventDefault();_V_.blockTextSelection();_V_.addEvent(document,"mousemove",_V_.proxy(this,this.onMouseMove));_V_.addEvent(document,"mouseup",_V_.proxy(this,this.onMouseUp));this.onMouseMove(event)},onMouseUp:function(event){_V_.unblockTextSelection();_V_.removeEvent(document,"mousemove",this.onMouseMove,false);_V_.removeEvent(document,"mouseup",this.onMouseUp,false);this.update()},update:function(){var barProgress,progress=this.getPercent();handle=this.handle,bar=this.bar;if(isNaN(progress)){progress=0}barProgress=progress;if(handle){var box=this.el,boxWidth=box.offsetWidth,handleWidth=handle.el.offsetWidth,handlePercent=(handleWidth)?handleWidth/boxWidth:0,boxAdjustedPercent=1-handlePercent;adjustedProgress=progress*boxAdjustedPercent,barProgress=adjustedProgress+(handlePercent/2);handle.el.style.left=_V_.round(adjustedProgress*100,2)+"%"}bar.el.style.width=_V_.round(barProgress*100,2)+"%"},calculateDistance:function(event){var box=this.el,boxX=_V_.findPosX(box),boxW=box.offsetWidth,handle=this.handle;if(handle){var handleW=handle.el.offsetWidth;boxX=boxX+(handleW/2);boxW=boxW-handleW}return Math.max(0,Math.min(1,(event.pageX-boxX)/boxW))},onFocus:function(event){_V_.addEvent(document,"keyup",_V_.proxy(this,this.onKeyPress))},onKeyPress:function(event){if(event.which==37){event.preventDefault();this.stepBack()}else{if(event.which==39){event.preventDefault();this.stepForward()}}},onBlur:function(event){_V_.removeEvent(document,"keyup",_V_.proxy(this,this.onKeyPress))}});_V_.ProgressControl=_V_.Component.extend({options:{components:{seekBar:{}}},createElement:function(){return this._super("div",{className:"vjs-progress-control vjs-control"})}});_V_.SeekBar=_V_.Slider.extend({options:{components:{loadProgressBar:{},bar:{componentClass:"PlayProgressBar"},handle:{componentClass:"SeekHandle"}}},playerEvent:"timeupdate",init:function(player,options){this._super(player,options)},createElement:function(){return this._super("div",{className:"vjs-progress-holder"})},getPercent:function(){return this.player.currentTime()/this.player.duration()},onMouseDown:function(event){this._super(event);this.player.scrubbing=true;this.videoWasPlaying=!this.player.paused();this.player.pause()},onMouseMove:function(event){var newTime=this.calculateDistance(event)*this.player.duration();if(newTime==this.player.duration()){newTime=newTime-0.1}this.player.currentTime(newTime)},onMouseUp:function(event){this._super(event);this.player.scrubbing=false;if(this.videoWasPlaying){this.player.play()}},stepForward:function(){this.player.currentTime(this.player.currentTime()+1)},stepBack:function(){this.player.currentTime(this.player.currentTime()-1)}});_V_.LoadProgressBar=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("progress",_V_.proxy(this,this.update))},createElement:function(){return this._super("div",{className:"vjs-load-progress",innerHTML:'<span class="vjs-control-text">Loaded: 0%</span>'})},update:function(){if(this.el.style){this.el.style.width=_V_.round(this.player.bufferedPercent()*100,2)+"%"}}});_V_.PlayProgressBar=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-play-progress",innerHTML:'<span class="vjs-control-text">Progress: 0%</span>'})}});_V_.SeekHandle=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-seek-handle",innerHTML:'<span class="vjs-control-text">00:00</span>'})}});_V_.VolumeControl=_V_.Component.extend({options:{components:{volumeBar:{}}},createElement:function(){return this._super("div",{className:"vjs-volume-control vjs-control"})}});_V_.VolumeBar=_V_.Slider.extend({options:{components:{bar:{componentClass:"VolumeLevel"},handle:{componentClass:"VolumeHandle"}}},playerEvent:"volumechange",createElement:function(){return this._super("div",{className:"vjs-volume-bar"})},onMouseMove:function(event){this.player.volume(this.calculateDistance(event))},getPercent:function(){return this.player.volume()},stepForward:function(){this.player.volume(this.player.volume()+0.1)},stepBack:function(){this.player.volume(this.player.volume()-0.1)}});_V_.VolumeLevel=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-volume-level",innerHTML:'<span class="vjs-control-text"></span>'})}});_V_.VolumeHandle=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-volume-handle",innerHTML:'<span class="vjs-control-text"></span>'})}});_V_.MuteToggle=_V_.Button.extend({init:function(player,options){this._super(player,options);player.addEvent("volumechange",_V_.proxy(this,this.update))},createElement:function(){return this._super("div",{className:"vjs-mute-control vjs-control",innerHTML:'<div><span class="vjs-control-text">Mute</span></div>'})},onClick:function(event){this.player.muted(this.player.muted()?false:true)},update:function(event){var vol=this.player.volume(),level=3;if(vol==0||this.player.muted()){level=0}else{if(vol<0.33){level=1}else{if(vol<0.67){level=2}}}_V_.each.call(this,[0,1,2,3],function(i){_V_.removeClass(this.el,"vjs-vol-"+i)});_V_.addClass(this.el,"vjs-vol-"+level)}});_V_.PosterImage=_V_.Button.extend({init:function(player,options){this._super(player,options);if(!this.player.options.poster){this.hide()}player.addEvent("play",_V_.proxy(this,this.hide))},createElement:function(){return _V_.createElement("img",{className:"vjs-poster",src:this.player.options.poster,tabIndex:-1})},onClick:function(){this.player.play()}});_V_.Menu=_V_.Component.extend({init:function(player,options){this._super(player,options)},addItem:function(component){this.addComponent(component);component.addEvent("click",this.proxy(function(){this.unlockShowing()}))},createElement:function(){return this._super("ul",{className:"vjs-menu"})}});_V_.MenuItem=_V_.Button.extend({init:function(player,options){this._super(player,options);if(options.selected){this.addClass("vjs-selected")}},createElement:function(type,attrs){return this._super("li",_V_.merge({className:"vjs-menu-item",innerHTML:this.options.label},attrs))},onClick:function(){this.selected(true)},selected:function(selected){if(selected){this.addClass("vjs-selected")}else{this.removeClass("vjs-selected")}}});if(!Array.prototype.indexOf){Array.prototype.indexOf=function(searchElement){if(this===void 0||this===null){throw new TypeError()}var t=Object(this);var len=t.length>>>0;if(len===0){return -1}var n=0;if(arguments.length>0){n=Number(arguments[1]);if(n!==n){n=0}else{if(n!==0&&n!==(1/0)&&n!==-(1/0)){n=(n>0||-1)*Math.floor(Math.abs(n))}}}if(n>=len){return -1}var k=n>=0?n:Math.max(len-Math.abs(n),0);for(;k<len;k++){if(k in t&&t[k]===searchElement){return k}}return -1}}_V_.extend({addEvent:function(elem,type,fn){var data=_V_.getData(elem),handlers;if(data&&!data.handler){data.handler=function(event){event=_V_.fixEvent(event);var handlers=_V_.getData(elem).events[event.type];if(handlers){var handlersCopy=[];_V_.each(handlers,function(handler,i){handlersCopy[i]=handler});for(var i=0,l=handlersCopy.length;i<l;i++){handlersCopy[i].call(elem,event)}}}}if(!data.events){data.events={}}handlers=data.events[type];if(!handlers){handlers=data.events[type]=[];if(document.addEventListener){elem.addEventListener(type,data.handler,false)}else{if(document.attachEvent){elem.attachEvent("on"+type,data.handler)}}}if(!fn.guid){fn.guid=_V_.guid++}handlers.push(fn)},removeEvent:function(elem,type,fn){var data=_V_.getData(elem),handlers;if(!data.events){return}if(!type){for(type in data.events){_V_.cleanUpEvents(elem,type)}return}handlers=data.events[type];if(!handlers){return}if(fn&&fn.guid){for(var i=0;i<handlers.length;i++){if(handlers[i].guid===fn.guid){handlers.splice(i--,1)}}}_V_.cleanUpEvents(elem,type)},cleanUpEvents:function(elem,type){var data=_V_.getData(elem);if(data.events[type].length===0){delete data.events[type];if(document.removeEventListener){elem.removeEventListener(type,data.handler,false)}else{if(document.detachEvent){elem.detachEvent("on"+type,data.handler)}}}if(_V_.isEmpty(data.events)){delete data.events;delete data.handler}if(_V_.isEmpty(data)){_V_.removeData(elem)}},fixEvent:function(event){if(event[_V_.expando]){return event}var originalEvent=event;event=new _V_.Event(originalEvent);for(var i=_V_.Event.props.length,prop;i;){prop=_V_.Event.props[--i];event[prop]=originalEvent[prop]}if(!event.target){event.target=event.srcElement||document}if(event.target.nodeType===3){event.target=event.target.parentNode}if(!event.relatedTarget&&event.fromElement){event.relatedTarget=event.fromElement===event.target?event.toElement:event.fromElement}if(event.pageX==null&&event.clientX!=null){var eventDocument=event.target.ownerDocument||document,doc=eventDocument.documentElement,body=eventDocument.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc&&doc.clientLeft||body&&body.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc&&doc.clientTop||body&&body.clientTop||0)}if(event.which==null&&(event.charCode!=null||event.keyCode!=null)){event.which=event.charCode!=null?event.charCode:event.keyCode}if(!event.metaKey&&event.ctrlKey){event.metaKey=event.ctrlKey}if(!event.which&&event.button!==undefined){event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)))}return event},triggerEvent:function(elem,event){var data=_V_.getData(elem),parent=elem.parentNode||elem.ownerDocument,type=event.type||event,handler;if(data){handler=data.handler}event=typeof event==="object"?event[_V_.expando]?event:new _V_.Event(type,event):new _V_.Event(type);event.type=type;if(handler){handler.call(elem,event)}event.result=undefined;event.target=elem},one:function(elem,type,fn){_V_.addEvent(elem,type,function(){_V_.removeEvent(elem,type,arguments.callee);fn.apply(this,arguments)})}});_V_.Event=function(src,props){if(src&&src.type){this.originalEvent=src;this.type=src.type;this.isDefaultPrevented=(src.defaultPrevented||src.returnValue===false||src.getPreventDefault&&src.getPreventDefault())?returnTrue:returnFalse}else{this.type=src}if(props){_V_.merge(this,props)}this.timeStamp=(new Date).getTime();this[_V_.expando]=true};_V_.Event.prototype={preventDefault:function(){this.isDefaultPrevented=returnTrue;var e=this.originalEvent;if(!e){return}if(e.preventDefault){e.preventDefault()}else{e.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=returnTrue;var e=this.originalEvent;if(!e){return}if(e.stopPropagation){e.stopPropagation()}e.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=returnTrue;this.stopPropagation()},isDefaultPrevented:returnFalse,isPropagationStopped:returnFalse,isImmediatePropagationStopped:returnFalse};_V_.Event.props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" ");function returnTrue(){return true}function returnFalse(){return false}var JSON;if(!JSON){JSON={}}(function(){var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;if(typeof JSON.parse!=="function"){JSON.parse=function(text,reviver){var j;function walk(holder,key){var k,v,value=holder[key];if(value&&typeof value==="object"){for(k in value){if(Object.prototype.hasOwnProperty.call(value,k)){v=walk(value,k);if(v!==undefined){value[k]=v}else{delete value[k]}}}}return reviver.call(holder,key,value)}text=String(text);cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){j=eval("("+text+")");return typeof reviver==="function"?walk({"":j},""):j}throw new SyntaxError("JSON.parse")}}}());_V_.Player=_V_.Component.extend({init:function(tag,addOptions,ready){this.tag=tag;var el=this.el=_V_.createElement("div"),options=this.options={},width=options.width=tag.getAttribute("width"),height=options.height=tag.getAttribute("height"),initWidth=width||300,initHeight=height||150;tag.player=el.player=this;this.ready(ready);tag.parentNode.insertBefore(el,tag);el.appendChild(tag);el.id=this.id=tag.id;el.className=tag.className;tag.id+="_html5_api";tag.className="vjs-tech";_V_.players[el.id]=this;el.setAttribute("width",initWidth);el.setAttribute("height",initHeight);el.style.width=initWidth+"px";el.style.height=initHeight+"px";tag.removeAttribute("width");tag.removeAttribute("height");_V_.merge(options,_V_.options);_V_.merge(options,this.getVideoTagSettings());_V_.merge(options,addOptions);tag.removeAttribute("controls");tag.removeAttribute("poster");if(tag.hasChildNodes()){for(var i=0,j=tag.childNodes;i<j.length;i++){if(j[i].nodeName=="SOURCE"||j[i].nodeName=="TRACK"){tag.removeChild(j[i])}}}this.values={};this.addClass("vjs-paused");this.addEvent("ended",this.onEnded);this.addEvent("play",this.onPlay);this.addEvent("pause",this.onPause);this.addEvent("progress",this.onProgress);this.addEvent("error",this.onError);if(options.controls){this.ready(function(){this.initComponents()})}this.textTracks=[];if(options.tracks&&options.tracks.length>0){this.addTextTracks(options.tracks)}if(!options.sources||options.sources.length==0){for(var i=0,j=options.techOrder;i<j.length;i++){var techName=j[i],tech=_V_[techName];if(tech.isSupported()){this.loadTech(techName);break}}}else{this.src(options.sources)}},values:{},destroy:function(){this.stopTrackingProgress();this.stopTrackingCurrentTime();_V_.players[this.id]=null;delete _V_.players[this.id];this.tech.destroy();this.el.parentNode.removeChild(this.el)},createElement:function(type,options){},getVideoTagSettings:function(){var options={sources:[],tracks:[]};options.src=this.tag.getAttribute("src");options.controls=this.tag.getAttribute("controls")!==null;options.poster=this.tag.getAttribute("poster");options.preload=this.tag.getAttribute("preload");options.autoplay=this.tag.getAttribute("autoplay")!==null;options.loop=this.tag.getAttribute("loop")!==null;options.muted=this.tag.getAttribute("muted")!==null;if(this.tag.hasChildNodes()){for(var c,i=0,j=this.tag.childNodes;i<j.length;i++){c=j[i];if(c.nodeName=="SOURCE"){options.sources.push({src:c.getAttribute("src"),type:c.getAttribute("type"),media:c.getAttribute("media"),title:c.getAttribute("title")})}if(c.nodeName=="TRACK"){options.tracks.push({src:c.getAttribute("src"),kind:c.getAttribute("kind"),srclang:c.getAttribute("srclang"),label:c.getAttribute("label"),"default":c.getAttribute("default")!==null,title:c.getAttribute("title")})}}}return options},loadTech:function(techName,source){if(this.tech){this.unloadTech()}else{if(techName!="html5"&&this.tag){this.el.removeChild(this.tag);this.tag=false}}this.techName=techName;this.isReady=false;var techReady=function(){this.player.triggerReady();if(!this.support.progressEvent){this.player.manualProgressOn()}if(!this.support.timeupdateEvent){this.player.manualTimeUpdatesOn()}};var techOptions=_V_.merge({source:source,parentEl:this.el},this.options[techName]);if(source){if(source.src==this.values.src&&this.values.currentTime>0){techOptions.startTime=this.values.currentTime}this.values.src=source.src}this.tech=new _V_[techName](this,techOptions);this.tech.ready(techReady)},unloadTech:function(){this.tech.destroy();if(this.manualProgress){this.manualProgressOff()}if(this.manualTimeUpdates){this.manualTimeUpdatesOff()}this.tech=false},manualProgressOn:function(){this.manualProgress=true;this.trackProgress();this.tech.addEvent("progress",function(){this.removeEvent("progress",arguments.callee);this.support.progressEvent=true;this.player.manualProgressOff()})},manualProgressOff:function(){this.manualProgress=false;this.stopTrackingProgress()},trackProgress:function(){this.progressInterval=setInterval(_V_.proxy(this,function(){if(this.values.bufferEnd<this.buffered().end(0)){this.triggerEvent("progress")}else{if(this.bufferedPercent()==1){this.stopTrackingProgress();this.triggerEvent("progress")}}}),500)},stopTrackingProgress:function(){clearInterval(this.progressInterval)},manualTimeUpdatesOn:function(){this.manualTimeUpdates=true;this.addEvent("play",this.trackCurrentTime);this.addEvent("pause",this.stopTrackingCurrentTime);this.tech.addEvent("timeupdate",function(){this.removeEvent("timeupdate",arguments.callee);this.support.timeupdateEvent=true;this.player.manualTimeUpdatesOff()})},manualTimeUpdatesOff:function(){this.manualTimeUpdates=false;this.stopTrackingCurrentTime();this.removeEvent("play",this.trackCurrentTime);this.removeEvent("pause",this.stopTrackingCurrentTime)},trackCurrentTime:function(){if(this.currentTimeInterval){this.stopTrackingCurrentTime()}this.currentTimeInterval=setInterval(_V_.proxy(this,function(){this.triggerEvent("timeupdate")}),250)},stopTrackingCurrentTime:function(){clearInterval(this.currentTimeInterval)},onEnded:function(){if(this.options.loop){this.currentTime(0);this.play()}else{this.pause();this.currentTime(0);this.pause()}},onPlay:function(){_V_.removeClass(this.el,"vjs-paused");_V_.addClass(this.el,"vjs-playing")},onPause:function(){_V_.removeClass(this.el,"vjs-playing");_V_.addClass(this.el,"vjs-paused")},onProgress:function(){if(this.bufferedPercent()==1){this.triggerEvent("loadedalldata")}},onError:function(e){_V_.log("Video Error",e)},techCall:function(method,arg){if(!this.tech.isReady){this.tech.ready(function(){this[method](arg)})}else{try{this.tech[method](arg)}catch(e){_V_.log(e)}}},techGet:function(method){if(this.tech.isReady){try{return this.tech[method]()}catch(e){if(this.tech[method]===undefined){_V_.log("Video.js: "+method+" method not defined for "+this.techName+" playback technology.",e)}else{if(e.name=="TypeError"){_V_.log("Video.js: "+method+" unavailable on "+this.techName+" playback technology element.",e);this.tech.isReady=false}else{_V_.log(e)}}}}return},play:function(){this.techCall("play");return this},pause:function(){this.techCall("pause");return this},paused:function(){return(this.techGet("paused")===false)?false:true},currentTime:function(seconds){if(seconds!==undefined){this.values.lastSetCurrentTime=seconds;this.techCall("setCurrentTime",seconds);if(this.manualTimeUpdates){this.triggerEvent("timeupdate")}return this}return this.values.currentTime=(this.techGet("currentTime")||0)},duration:function(){return parseFloat(this.techGet("duration"))},remainingTime:function(){return this.duration()-this.currentTime()},buffered:function(){var buffered=this.techGet("buffered"),start=0,end=this.values.bufferEnd=this.values.bufferEnd||0,timeRange;if(buffered&&buffered.length>0&&buffered.end(0)!==end){end=buffered.end(0);this.values.bufferEnd=end}return _V_.createTimeRange(start,end)},bufferedPercent:function(){return(this.duration())?this.buffered().end(0)/this.duration():0},volume:function(percentAsDecimal){var vol;if(percentAsDecimal!==undefined){vol=Math.max(0,Math.min(1,parseFloat(percentAsDecimal)));this.values.volume=vol;this.techCall("setVolume",vol);_V_.setLocalStorage("volume",vol);return this}vol=parseFloat(this.techGet("volume"));return(isNaN(vol))?1:vol},muted:function(muted){if(muted!==undefined){this.techCall("setMuted",muted);return this}return this.techGet("muted")||false},width:function(width,skipListeners){if(width!==undefined){this.el.width=width;this.el.style.width=width+"px";if(!skipListeners){this.triggerEvent("resize")}return this}return parseInt(this.el.getAttribute("width"))},height:function(height){if(height!==undefined){this.el.height=height;this.el.style.height=height+"px";this.triggerEvent("resize");return this}return parseInt(this.el.getAttribute("height"))},size:function(width,height){return this.width(width,true).height(height)},supportsFullScreen:function(){return this.techGet("supportsFullScreen")||false},requestFullScreen:function(){var requestFullScreen=_V_.support.requestFullScreen;this.isFullScreen=true;if(requestFullScreen){_V_.addEvent(document,requestFullScreen.eventName,this.proxy(function(){this.isFullScreen=document[requestFullScreen.isFullScreen];if(this.isFullScreen==false){_V_.removeEvent(document,requestFullScreen.eventName,arguments.callee)}this.triggerEvent("fullscreenchange")}));if(this.tech.support.fullscreenResize===false&&this.options.flash.iFrameMode!=true){this.pause();this.unloadTech();_V_.addEvent(document,requestFullScreen.eventName,this.proxy(function(){_V_.removeEvent(document,requestFullScreen.eventName,arguments.callee);this.loadTech(this.techName,{src:this.values.src})}));this.el[requestFullScreen.requestFn]()}else{this.el[requestFullScreen.requestFn]()}}else{if(this.tech.supportsFullScreen()){this.triggerEvent("fullscreenchange");this.techCall("enterFullScreen")}else{this.triggerEvent("fullscreenchange");this.enterFullWindow()}}return this},cancelFullScreen:function(){var requestFullScreen=_V_.support.requestFullScreen;this.isFullScreen=false;if(requestFullScreen){if(this.tech.support.fullscreenResize===false&&this.options.flash.iFrameMode!=true){this.pause();this.unloadTech();_V_.addEvent(document,requestFullScreen.eventName,this.proxy(function(){_V_.removeEvent(document,requestFullScreen.eventName,arguments.callee);this.loadTech(this.techName,{src:this.values.src})}));document[requestFullScreen.cancelFn]()}else{document[requestFullScreen.cancelFn]()}}else{if(this.tech.supportsFullScreen()){this.techCall("exitFullScreen");this.triggerEvent("fullscreenchange")}else{this.exitFullWindow();this.triggerEvent("fullscreenchange")}}return this},enterFullWindow:function(){this.isFullWindow=true;this.docOrigOverflow=document.documentElement.style.overflow;_V_.addEvent(document,"keydown",_V_.proxy(this,this.fullWindowOnEscKey));document.documentElement.style.overflow="hidden";_V_.addClass(document.body,"vjs-full-window");_V_.addClass(this.el,"vjs-fullscreen");this.triggerEvent("enterFullWindow")},fullWindowOnEscKey:function(event){if(event.keyCode==27){if(this.isFullScreen==true){this.cancelFullScreen()}else{this.exitFullWindow()}}},exitFullWindow:function(){this.isFullWindow=false;_V_.removeEvent(document,"keydown",this.fullWindowOnEscKey);document.documentElement.style.overflow=this.docOrigOverflow;_V_.removeClass(document.body,"vjs-full-window");_V_.removeClass(this.el,"vjs-fullscreen");this.triggerEvent("exitFullWindow")},selectSource:function(sources){for(var i=0,j=this.options.techOrder;i<j.length;i++){var techName=j[i],tech=_V_[techName];if(tech.isSupported()){for(var a=0,b=sources;a<b.length;a++){var source=b[a];if(tech.canPlaySource.call(this,source)){return{source:source,tech:techName}}}}}return false},src:function(source){if(source instanceof Array){var sourceTech=this.selectSource(source),source,techName;if(sourceTech){source=sourceTech.source;techName=sourceTech.tech;if(techName==this.techName){this.src(source)}else{this.loadTech(techName,source)}}else{_V_.log("No compatible source and playback technology were found.")}}else{if(source instanceof Object){if(_V_[this.techName].canPlaySource(source)){this.src(source.src)}else{this.src([source])}}else{this.values.src=source;if(!this.isReady){this.ready(function(){this.src(source)})}else{this.techCall("src",source);if(this.options.preload=="auto"){this.load()}if(this.options.autoplay){this.play()}}}}return this},load:function(){this.techCall("load");return this},currentSrc:function(){return this.techGet("currentSrc")||this.values.src||""},preload:function(value){if(value!==undefined){this.techCall("setPreload",value);this.options.preload=value;return this}return this.techGet("preload")},autoplay:function(value){if(value!==undefined){this.techCall("setAutoplay",value);this.options.autoplay=value;return this}return this.techGet("autoplay",value)},loop:function(value){if(value!==undefined){this.techCall("setLoop",value);this.options.loop=value;return this}return this.techGet("loop")},controls:function(){return this.options.controls},poster:function(){return this.techGet("poster")},error:function(){return this.techGet("error")},ended:function(){return this.techGet("ended")}});(function(){var requestFn,cancelFn,eventName,isFullScreen,playerProto=_V_.Player.prototype;if(document.cancelFullscreen!==undefined){requestFn="requestFullscreen";cancelFn="exitFullscreen";eventName="fullscreenchange";isFullScreen="fullScreen"}else{_V_.each(["moz","webkit"],function(prefix){if((prefix!="moz"||document.mozFullScreenEnabled)&&document[prefix+"CancelFullScreen"]!==undefined){requestFn=prefix+"RequestFullScreen";cancelFn=prefix+"CancelFullScreen";eventName=prefix+"fullscreenchange";if(prefix=="webkit"){isFullScreen=prefix+"IsFullScreen"}else{isFullScreen=prefix+"FullScreen"}}})}if(requestFn){_V_.support.requestFullScreen={requestFn:requestFn,cancelFn:cancelFn,eventName:eventName,isFullScreen:isFullScreen}}})();_V_.PlaybackTech=_V_.Component.extend({init:function(player,options){},onClick:function(){if(this.player.options.controls){_V_.PlayToggle.prototype.onClick.call(this)}}});_V_.apiMethods="play,pause,paused,currentTime,setCurrentTime,duration,buffered,volume,setVolume,muted,setMuted,width,height,supportsFullScreen,enterFullScreen,src,load,currentSrc,preload,setPreload,autoplay,setAutoplay,loop,setLoop,error,networkState,readyState,seeking,initialTime,startOffsetTime,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks,defaultPlaybackRate,playbackRate,mediaGroup,controller,controls,defaultMuted".split(",");_V_.each(_V_.apiMethods,function(methodName){_V_.PlaybackTech.prototype[methodName]=function(){throw new Error("The '"+methodName+"' method is not available on the playback technology's API")}});_V_.html5=_V_.PlaybackTech.extend({init:function(player,options,ready){this.player=player;this.el=this.createElement();this.ready(ready);this.addEvent("click",this.proxy(this.onClick));var source=options.source;if(source&&this.el.currentSrc==source.src){player.triggerEvent("loadstart")}else{if(source){this.el.src=source.src}}player.ready(function(){if(this.options.autoplay&&this.paused()){this.tag.poster=null;this.play()}});this.setupTriggers();this.triggerReady()},destroy:function(){this.player.tag=false;this.removeTriggers();this.el.parentNode.removeChild(this.el)},createElement:function(){var html5=_V_.html5,player=this.player,el=player.tag,newEl;if(!el||this.support.movingElementInDOM===false){if(el){player.el.removeChild(el)}newEl=_V_.createElement("video",{id:el.id||player.el.id+"_html5_api",className:el.className||"vjs-tech"});el=newEl;_V_.insertFirst(el,player.el)}_V_.each(["autoplay","preload","loop","muted"],function(attr){if(player.options[attr]!==null){el[attr]=player.options[attr]}},this);return el},setupTriggers:function(){_V_.each.call(this,_V_.html5.events,function(type){_V_.addEvent(this.el,type,_V_.proxy(this.player,this.eventHandler))})},removeTriggers:function(){_V_.each.call(this,_V_.html5.events,function(type){_V_.removeEvent(this.el,type,_V_.proxy(this.player,this.eventHandler))})},eventHandler:function(e){e.stopPropagation();this.triggerEvent(e)},play:function(){this.el.play()},pause:function(){this.el.pause()},paused:function(){return this.el.paused},currentTime:function(){return this.el.currentTime},setCurrentTime:function(seconds){try{this.el.currentTime=seconds}catch(e){_V_.log(e,"Video isn't ready. (VideoJS)")}},duration:function(){return this.el.duration||0},buffered:function(){return this.el.buffered},volume:function(){return this.el.volume},setVolume:function(percentAsDecimal){this.el.volume=percentAsDecimal},muted:function(){return this.el.muted},setMuted:function(muted){this.el.muted=muted},width:function(){return this.el.offsetWidth},height:function(){return this.el.offsetHeight},supportsFullScreen:function(){if(typeof this.el.webkitEnterFullScreen=="function"){if(!navigator.userAgent.match("Chrome")&&!navigator.userAgent.match("Mac OS X 10.5")){return true}}return false},enterFullScreen:function(){try{this.el.webkitEnterFullScreen()}catch(e){if(e.code==11){_V_.log("VideoJS: Video not ready.")}}},src:function(src){this.el.src=src},load:function(){this.el.load()},currentSrc:function(){return this.el.currentSrc},preload:function(){return this.el.preload},setPreload:function(val){this.el.preload=val},autoplay:function(){return this.el.autoplay},setAutoplay:function(val){this.el.autoplay=val},loop:function(){return this.el.loop},setLoop:function(val){this.el.loop=val},error:function(){return this.el.error},seeking:function(){return this.el.seeking},ended:function(){return this.el.ended},controls:function(){return this.player.options.controls},defaultMuted:function(){return this.el.defaultMuted}});_V_.html5.isSupported=function(){return !!document.createElement("video").canPlayType};_V_.html5.canPlaySource=function(srcObj){return !!document.createElement("video").canPlayType(srcObj.type)};_V_.html5.events="loadstart,suspend,abort,error,emptied,stalled,loadedmetadata,loadeddata,canplay,canplaythrough,playing,waiting,seeking,seeked,ended,durationchange,timeupdate,progress,play,pause,ratechange,volumechange".split(",");_V_.html5.prototype.support={fullscreen:(typeof _V_.testVid.webkitEnterFullScreen!==undefined)?(!_V_.ua.match("Chrome")&&!_V_.ua.match("Mac OS X 10.5")?true:false):false,movingElementInDOM:!_V_.isIOS()};if(_V_.isAndroid()){if(_V_.androidVersion()<3){document.createElement("video").constructor.prototype.canPlayType=function(type){return(type&&type.toLowerCase().indexOf("video/mp4")!=-1)?"maybe":""}}}_V_.flash=_V_.PlaybackTech.extend({init:function(player,options){this.player=player;var source=options.source,parentEl=options.parentEl,placeHolder=this.el=_V_.createElement("div",{id:parentEl.id+"_temp_flash"}),objId=player.el.id+"_flash_api",playerOptions=player.options,flashVars=_V_.merge({readyFunction:"_V_.flash.onReady",eventProxyFunction:"_V_.flash.onEvent",errorEventProxyFunction:"_V_.flash.onError",autoplay:playerOptions.autoplay,preload:playerOptions.preload,loop:playerOptions.loop,muted:playerOptions.muted},options.flashVars),params=_V_.merge({wmode:"opaque",bgcolor:"#000000"},options.params),attributes=_V_.merge({id:objId,name:objId,"class":"vjs-tech"},options.attributes);if(source){flashVars.src=encodeURIComponent(_V_.getAbsoluteURL(source.src))}_V_.insertFirst(placeHolder,parentEl);if(options.startTime){this.ready(function(){this.load();this.play();this.currentTime(options.startTime)})}if(options.iFrameMode==true&&!_V_.isFF){var iFrm=_V_.createElement("iframe",{id:objId+"_iframe",name:objId+"_iframe",className:"vjs-tech",scrolling:"no",marginWidth:0,marginHeight:0,frameBorder:0});flashVars.readyFunction="ready";flashVars.eventProxyFunction="events";flashVars.errorEventProxyFunction="errors";_V_.addEvent(iFrm,"load",_V_.proxy(this,function(){var iDoc,objTag,swfLoc,iWin=iFrm.contentWindow,varString="";iDoc=iFrm.contentDocument?iFrm.contentDocument:iFrm.contentWindow.document;iDoc.write(_V_.flash.getEmbedCode(options.swf,flashVars,params,attributes));iWin.player=this.player;iWin.ready=_V_.proxy(this.player,function(currSwf){var el=iDoc.getElementById(currSwf),player=this,tech=player.tech;tech.el=el;_V_.addEvent(el,"click",tech.proxy(tech.onClick));_V_.flash.checkReady(tech)});iWin.events=_V_.proxy(this.player,function(swfID,eventName,other){var player=this;if(player&&player.techName=="flash"){player.triggerEvent(eventName)}});iWin.errors=_V_.proxy(this.player,function(swfID,eventName){_V_.log("Flash Error",eventName)})}));placeHolder.parentNode.replaceChild(iFrm,placeHolder)}else{_V_.flash.embed(options.swf,placeHolder,flashVars,params,attributes)}},destroy:function(){this.el.parentNode.removeChild(this.el)},play:function(){this.el.vjs_play()},pause:function(){this.el.vjs_pause()},src:function(src){src=_V_.getAbsoluteURL(src);this.el.vjs_src(src);if(this.player.autoplay()){var tech=this;setTimeout(function(){tech.play()},0)}},load:function(){this.el.vjs_load()},poster:function(){this.el.vjs_getProperty("poster")},buffered:function(){return _V_.createTimeRange(0,this.el.vjs_getProperty("buffered"))},supportsFullScreen:function(){return false},enterFullScreen:function(){return false}});(function(){var api=_V_.flash.prototype,readWrite="preload,currentTime,defaultPlaybackRate,playbackRate,autoplay,loop,mediaGroup,controller,controls,volume,muted,defaultMuted".split(","),readOnly="error,currentSrc,networkState,readyState,seeking,initialTime,duration,startOffsetTime,paused,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks".split(","),callOnly="load,play,pause".split(",");createSetter=function(attr){var attrUpper=attr.charAt(0).toUpperCase()+attr.slice(1);api["set"+attrUpper]=function(val){return this.el.vjs_setProperty(attr,val)}},createGetter=function(attr){api[attr]=function(){return this.el.vjs_getProperty(attr)}};_V_.each(readWrite,function(attr){createGetter(attr);createSetter(attr)});_V_.each(readOnly,function(attr){createGetter(attr)})})();_V_.flash.isSupported=function(){return _V_.flash.version()[0]>=10};_V_.flash.canPlaySource=function(srcObj){if(srcObj.type in _V_.flash.prototype.support.formats){return"maybe"}};_V_.flash.prototype.support={formats:{"video/flv":"FLV","video/x-flv":"FLV","video/mp4":"MP4","video/m4v":"MP4"},progressEvent:false,timeupdateEvent:false,fullscreenResize:false,parentResize:!(_V_.ua.match("Firefox"))};_V_.flash.onReady=function(currSwf){var el=_V_.el(currSwf);var player=el.player||el.parentNode.player,tech=player.tech;el.player=player;tech.el=el;tech.addEvent("click",tech.onClick);_V_.flash.checkReady(tech)};_V_.flash.checkReady=function(tech){if(tech.el.vjs_getProperty){tech.triggerReady()}else{setTimeout(function(){_V_.flash.checkReady(tech)},50)}};_V_.flash.onEvent=function(swfID,eventName){var player=_V_.el(swfID).player;player.triggerEvent(eventName)};_V_.flash.onError=function(swfID,err){var player=_V_.el(swfID).player;player.triggerEvent("error");_V_.log("Flash Error",err,swfID)};_V_.flash.version=function(){var version="0,0,0";try{version=new ActiveXObject("ShockwaveFlash.ShockwaveFlash").GetVariable("$version").replace(/\D+/g,",").match(/^,?(.+),?$/)[1]}catch(e){try{if(navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin){version=(navigator.plugins["Shockwave Flash 2.0"]||navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g,",").match(/^,?(.+),?$/)[1]}}catch(e){}}return version.split(",")};_V_.flash.embed=function(swf,placeHolder,flashVars,params,attributes){var code=_V_.flash.getEmbedCode(swf,flashVars,params,attributes),obj=_V_.createElement("div",{innerHTML:code}).childNodes[0],par=placeHolder.parentNode;placeHolder.parentNode.replaceChild(obj,placeHolder);if(_V_.isIE()){var newObj=par.childNodes[0];setTimeout(function(){newObj.style.display="block"},1000)}return obj};_V_.flash.getEmbedCode=function(swf,flashVars,params,attributes){var objTag='<object type="application/x-shockwave-flash"',flashVarsString="",paramsString="";attrsString="";if(flashVars){_V_.eachProp(flashVars,function(key,val){flashVarsString+=(key+"="+val+"&amp;")})}params=_V_.merge({movie:swf,flashvars:flashVarsString,allowScriptAccess:"always",allowNetworking:"all"},params);_V_.eachProp(params,function(key,val){paramsString+='<param name="'+key+'" value="'+val+'" />'});attributes=_V_.merge({data:swf,width:"100%",height:"100%"},attributes);_V_.eachProp(attributes,function(key,val){attrsString+=(key+'="'+val+'" ')});return objTag+attrsString+">"+paramsString+"</object>"};_V_.merge(_V_.Player.prototype,{addTextTracks:function(trackObjects){var tracks=this.textTracks=(this.textTracks)?this.textTracks:[],i=0,j=trackObjects.length,track,Kind;for(;i<j;i++){Kind=_V_.uc(trackObjects[i].kind||"subtitles");track=new _V_[Kind+"Track"](this,trackObjects[i]);tracks.push(track);if(track["default"]){this.ready(_V_.proxy(track,track.show))}}return this},showTextTrack:function(id,disableSameKind){var tracks=this.textTracks,i=0,j=tracks.length,track,showTrack,kind;for(;i<j;i++){track=tracks[i];if(track.id===id){track.show();showTrack=track}else{if(disableSameKind&&track.kind==disableSameKind&&track.mode>0){track.disable()}}}kind=(showTrack)?showTrack.kind:((disableSameKind)?disableSameKind:false);if(kind){this.triggerEvent(kind+"trackchange")}return this}});_V_.Track=_V_.Component.extend({init:function(player,options){this._super(player,options);_V_.merge(this,{id:options.id||("vjs_"+options.kind+"_"+options.language+"_"+_V_.guid++),src:options.src,"default":options["default"],title:options.title,language:options.srclang,label:options.label,cues:[],activeCues:[],readyState:0,mode:0})},createElement:function(){return this._super("div",{className:"vjs-"+this.kind+" vjs-text-track"})},show:function(){this.activate();this.mode=2;this._super()},hide:function(){this.activate();this.mode=1;this._super()},disable:function(){if(this.mode==2){this.hide()}this.deactivate();this.mode=0},activate:function(){if(this.readyState==0){this.load()}if(this.mode==0){this.player.addEvent("timeupdate",this.proxy(this.update,this.id));this.player.addEvent("ended",this.proxy(this.reset,this.id));if(this.kind=="captions"||this.kind=="subtitles"){this.player.textTrackDisplay.addComponent(this)}}},deactivate:function(){this.player.removeEvent("timeupdate",this.proxy(this.update,this.id));this.player.removeEvent("ended",this.proxy(this.reset,this.id));this.reset();this.player.textTrackDisplay.removeComponent(this)},load:function(){if(this.readyState==0){this.readyState=1;_V_.get(this.src,this.proxy(this.parseCues),this.proxy(this.onError))}},onError:function(err){this.error=err;this.readyState=3;this.triggerEvent("error")},parseCues:function(srcContent){var cue,time,text,lines=srcContent.split("\n"),line="",id;for(var i=1,j=lines.length;i<j;i++){line=_V_.trim(lines[i]);if(line){if(line.indexOf("-->")==-1){id=line;line=_V_.trim(lines[++i])}else{id=this.cues.length}cue={id:id,index:this.cues.length};time=line.split(" --> ");cue.startTime=this.parseCueTime(time[0]);cue.endTime=this.parseCueTime(time[1]);text=[];while(lines[++i]&&(line=_V_.trim(lines[i]))){text.push(line)}cue.text=text.join("<br/>");this.cues.push(cue)}}this.readyState=2;this.triggerEvent("loaded")},parseCueTime:function(timeText){var parts=timeText.split(":"),time=0,hours,minutes,other,seconds,ms,flags;if(parts.length==3){hours=parts[0];minutes=parts[1];other=parts[2]}else{hours=0;minutes=parts[0];other=parts[1]}other=other.split(/\s+/);seconds=other.splice(0,1)[0];seconds=seconds.split(/\.|,/);ms=parseFloat(seconds[1]);seconds=seconds[0];time+=parseFloat(hours)*3600;time+=parseFloat(minutes)*60;time+=parseFloat(seconds);if(ms){time+=ms/1000}return time},update:function(){if(this.cues.length>0){var time=this.player.currentTime();if(this.prevChange===undefined||time<this.prevChange||this.nextChange<=time){var cues=this.cues,newNextChange=this.player.duration(),newPrevChange=0,reverse=false,newCues=[],firstActiveIndex,lastActiveIndex,html="",cue,i,j;if(time>=this.nextChange||this.nextChange===undefined){i=(this.firstActiveIndex!==undefined)?this.firstActiveIndex:0}else{reverse=true;i=(this.lastActiveIndex!==undefined)?this.lastActiveIndex:cues.length-1}while(true){cue=cues[i];if(cue.endTime<=time){newPrevChange=Math.max(newPrevChange,cue.endTime);if(cue.active){cue.active=false}}else{if(time<cue.startTime){newNextChange=Math.min(newNextChange,cue.startTime);if(cue.active){cue.active=false}if(!reverse){break}}else{if(reverse){newCues.splice(0,0,cue);if(lastActiveIndex===undefined){lastActiveIndex=i}firstActiveIndex=i}else{newCues.push(cue);if(firstActiveIndex===undefined){firstActiveIndex=i}lastActiveIndex=i}newNextChange=Math.min(newNextChange,cue.endTime);newPrevChange=Math.max(newPrevChange,cue.startTime);cue.active=true}}if(reverse){if(i===0){break}else{i--}}else{if(i===cues.length-1){break}else{i++}}}this.activeCues=newCues;this.nextChange=newNextChange;this.prevChange=newPrevChange;this.firstActiveIndex=firstActiveIndex;this.lastActiveIndex=lastActiveIndex;this.updateDisplay();this.triggerEvent("cuechange")}}},updateDisplay:function(){var cues=this.activeCues,html="",i=0,j=cues.length;for(;i<j;i++){html+="<span class='vjs-tt-cue'>"+cues[i].text+"</span>"}this.el.innerHTML=html},reset:function(){this.nextChange=0;this.prevChange=this.player.duration();this.firstActiveIndex=0;this.lastActiveIndex=0}});_V_.CaptionsTrack=_V_.Track.extend({kind:"captions"});_V_.SubtitlesTrack=_V_.Track.extend({kind:"subtitles"});_V_.ChaptersTrack=_V_.Track.extend({kind:"chapters"});_V_.TextTrackDisplay=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-text-track-display"})}});_V_.TextTrackMenuItem=_V_.MenuItem.extend({init:function(player,options){var track=this.track=options.track;options.label=track.label;options.selected=track["default"];this._super(player,options);this.player.addEvent(track.kind+"trackchange",_V_.proxy(this,this.update))},onClick:function(){this._super();this.player.showTextTrack(this.track.id,this.track.kind)},update:function(){if(this.track.mode==2){this.selected(true)}else{this.selected(false)}}});_V_.OffTextTrackMenuItem=_V_.TextTrackMenuItem.extend({init:function(player,options){options.track={kind:options.kind,player:player,label:"Off"};this._super(player,options)},onClick:function(){this._super();this.player.showTextTrack(this.track.id,this.track.kind)},update:function(){var tracks=this.player.textTracks,i=0,j=tracks.length,track,off=true;for(;i<j;i++){track=tracks[i];if(track.kind==this.track.kind&&track.mode==2){off=false}}if(off){this.selected(true)}else{this.selected(false)}}});_V_.TextTrackButton=_V_.Button.extend({init:function(player,options){this._super(player,options);this.menu=this.createMenu();if(this.items.length===0){this.hide()}},createMenu:function(){var menu=new _V_.Menu(this.player);menu.el.appendChild(_V_.createElement("li",{className:"vjs-menu-title",innerHTML:_V_.uc(this.kind)}));menu.addItem(new _V_.OffTextTrackMenuItem(this.player,{kind:this.kind}));this.items=this.createItems();this.each(this.items,function(item){menu.addItem(item)});this.addComponent(menu);return menu},createItems:function(){var items=[];this.each(this.player.textTracks,function(track){if(track.kind===this.kind){items.push(new _V_.TextTrackMenuItem(this.player,{track:track}))}});return items},buildCSSClass:function(){return this.className+" vjs-menu-button "+this._super()},onFocus:function(){this.menu.lockShowing();_V_.one(this.menu.el.childNodes[this.menu.el.childNodes.length-1],"blur",this.proxy(function(){this.menu.unlockShowing()}))},onBlur:function(){},onClick:function(){this.one("mouseout",this.proxy(function(){this.menu.unlockShowing();this.el.blur()}))}});_V_.CaptionsButton=_V_.TextTrackButton.extend({kind:"captions",buttonText:"Captions",className:"vjs-captions-button"});_V_.SubtitlesButton=_V_.TextTrackButton.extend({kind:"subtitles",buttonText:"Subtitles",className:"vjs-subtitles-button"});_V_.ChaptersButton=_V_.TextTrackButton.extend({kind:"chapters",buttonText:"Chapters",className:"vjs-chapters-button",createItems:function(chaptersTrack){var items=[];this.each(this.player.textTracks,function(track){if(track.kind===this.kind){items.push(new _V_.TextTrackMenuItem(this.player,{track:track}))}});return items},createMenu:function(){var tracks=this.player.textTracks,i=0,j=tracks.length,track,chaptersTrack,items=this.items=[];for(;i<j;i++){track=tracks[i];if(track.kind==this.kind&&track["default"]){if(track.readyState<2){this.chaptersTrack=track;track.addEvent("loaded",this.proxy(this.createMenu));return}else{chaptersTrack=track;break}}}var menu=this.menu=new _V_.Menu(this.player);menu.el.appendChild(_V_.createElement("li",{className:"vjs-menu-title",innerHTML:_V_.uc(this.kind)}));if(chaptersTrack){var cues=chaptersTrack.cues,i=0,j=cues.length,cue,mi;for(;i<j;i++){cue=cues[i];mi=new _V_.ChaptersTrackMenuItem(this.player,{track:chaptersTrack,cue:cue});items.push(mi);menu.addComponent(mi)}}this.addComponent(menu);if(this.items.length>0){this.show()}return menu}});_V_.ChaptersTrackMenuItem=_V_.MenuItem.extend({init:function(player,options){var track=this.track=options.track,cue=this.cue=options.cue,currentTime=player.currentTime();options.label=cue.text;options.selected=(cue.startTime<=currentTime&&currentTime<cue.endTime);this._super(player,options);track.addEvent("cuechange",_V_.proxy(this,this.update))},onClick:function(){this._super();this.player.currentTime(this.cue.startTime);this.update(this.cue.startTime)},update:function(time){var cue=this.cue,currentTime=this.player.currentTime();if(cue.startTime<=currentTime&&currentTime<cue.endTime){this.selected(true)}else{this.selected(false)}}});_V_.merge(_V_.ControlBar.prototype.options.components,{subtitlesButton:{},captionsButton:{},chaptersButton:{}});_V_.autoSetup=function(){var options,vid,player,vids=document.getElementsByTagName("video");if(vids&&vids.length>0){for(var i=0,j=vids.length;i<j;i++){vid=vids[i];if(vid&&vid.getAttribute){if(vid.player===undefined){options=vid.getAttribute("data-setup");if(options!==null){options=JSON.parse(options||"{}");player=_V_(vid,options)}}}else{_V_.autoSetupTimeout(1);break}}}else{if(!_V_.windowLoaded){_V_.autoSetupTimeout(1)}}};_V_.autoSetupTimeout=function(wait){setTimeout(_V_.autoSetup,wait)};_V_.addEvent(window,"load",function(){_V_.windowLoaded=true});_V_.autoSetup();window.VideoJS=window._V_=VideoJS})(window);
diff --git a/mod/videos.php b/mod/videos.php
index 9846e54fc2..0f29e631bd 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -74,10 +74,14 @@ function videos_init(&$a) {
 
 
 		$tpl = get_markup_template("videos_head.tpl");
-		$a->page['htmlhead'] .= replace_macros($tpl,array());
+		$a->page['htmlhead'] .= replace_macros($tpl,array(
+			'$baseurl' => $a->get_baseurl(),
+		));
 
 		$tpl = get_markup_template("videos_end.tpl");
-		$a->page['end'] .= replace_macros($tpl,array());
+		$a->page['end'] .= replace_macros($tpl,array(
+			'$baseurl' => $a->get_baseurl(),
+		));
 
 	}
 
diff --git a/view/templates/videos_head.tpl b/view/templates/videos_head.tpl
index d397dcc2d0..bdb0ff9e70 100644
--- a/view/templates/videos_head.tpl
+++ b/view/templates/videos_head.tpl
@@ -1,6 +1,6 @@
-<link href="library/video-js/video-js.min.css" rel="stylesheet">
-<script src="library/video-js/video.min.js"></script>
+<link href="library/video-js/video-js.css" rel="stylesheet">
+<script src="library/video-js/video.js"></script>
 <script>
-   _V_.options.flash.swf = "https://f.shmuz.in/library/video-js/video-js.swf"
+   videojs.options.flash.swf = "{{$baseurl}}/library/video-js/video-js.swf"
 </script>
 
diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index dae0e42bbc..f486eaf518 100644
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -395,7 +395,7 @@
 			$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
 
 			// setup videos, since VideoJS won't take care of any loaded via AJAX
-			if(typeof _V_ != 'undefined') _V_.autoSetup();
+			if(typeof videojs != 'undefined') videojs.autoSetup();
 		});
 	}
 
diff --git a/view/theme/frost-mobile/js/main.min.js b/view/theme/frost-mobile/js/main.min.js
index 3c72cc1562..f19daa71af 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)});$j("img[data-src]",nnm).each(function(i,el){if($j(el).data("src")!="")$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||typeof profile_uid=="undefined"||!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");if(typeof _V_!="undefined")_V_.autoSetup()})}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 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:10,top:cursor.y+20});$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,forced_root_block:"div",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){if($j(el).data("src")!="")$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||typeof profile_uid=="undefined"||!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");if(typeof videojs!="undefined")videojs.autoSetup()})}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 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:10,top:cursor.y+20});$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,forced_root_block:"div",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/templates/videos_end.tpl b/view/theme/frost-mobile/templates/videos_end.tpl
index 1468b68ba4..858cbc5720 100644
--- a/view/theme/frost-mobile/templates/videos_end.tpl
+++ b/view/theme/frost-mobile/templates/videos_end.tpl
@@ -1,5 +1,5 @@
-<script src="library/video-js/video.min.js"></script>
+<script src="library/video-js/video.js"></script>
 <script>
-   _V_.options.flash.swf = "https://f.shmuz.in/library/video-js/video-js.swf"
+   videojs.options.flash.swf = "{{$baseurl}}/library/video-js/video-js.swf"
 </script>
 
diff --git a/view/theme/frost-mobile/templates/videos_head.tpl b/view/theme/frost-mobile/templates/videos_head.tpl
index 0a460acaca..41e4424600 100644
--- a/view/theme/frost-mobile/templates/videos_head.tpl
+++ b/view/theme/frost-mobile/templates/videos_head.tpl
@@ -1,2 +1,2 @@
-<link href="library/video-js/video-js.min.css" rel="stylesheet">
+<link href="library/video-js/video-js.css" rel="stylesheet">
 
diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js
index d40780203a..ca549011ea 100644
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -410,7 +410,7 @@
 			collapseHeight();
 
 			// setup videos, since VideoJS won't take care of any loaded via AJAX
-			if(typeof _V_ != 'undefined') _V_.autoSetup();
+			if(typeof videojs != 'undefined') videojs.autoSetup();
 		});
 	}
 
diff --git a/view/theme/frost/js/main.min.js b/view/theme/frost/js/main.min.js
index ee7ad65394..ed00bc3a1c 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)});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").colorbox({inline:true,transition:"elastic"});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){if($j(el).data("src")!="")$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||typeof profile_uid=="undefined"||!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")}$j("#"+ident+" .wall-item-body a img").each(function(){var aElem=$j(this).parent();var imgHref=aElem.attr("href");if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)){var cBoxClass=$j(this).closest(".wall-item-body").attr("id")+"-lightbox";$j(this).addClass(cBoxClass);aElem.colorbox({maxHeight:"90%",photo:true,rel:cBoxClass})}});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();if(typeof _V_!="undefined")_V_.autoSetup()})}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 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}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)});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").colorbox({inline:true,transition:"elastic"});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){if($j(el).data("src")!="")$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||typeof profile_uid=="undefined"||!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")}$j("#"+ident+" .wall-item-body a img").each(function(){var aElem=$j(this).parent();var imgHref=aElem.attr("href");if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)){var cBoxClass=$j(this).closest(".wall-item-body").attr("id")+"-lightbox";$j(this).addClass(cBoxClass);aElem.colorbox({maxHeight:"90%",photo:true,rel:cBoxClass})}});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();if(typeof videojs!="undefined")videojs.autoSetup()})}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 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}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/templates/videos_end.tpl b/view/theme/frost/templates/videos_end.tpl
index 1468b68ba4..858cbc5720 100644
--- a/view/theme/frost/templates/videos_end.tpl
+++ b/view/theme/frost/templates/videos_end.tpl
@@ -1,5 +1,5 @@
-<script src="library/video-js/video.min.js"></script>
+<script src="library/video-js/video.js"></script>
 <script>
-   _V_.options.flash.swf = "https://f.shmuz.in/library/video-js/video-js.swf"
+   videojs.options.flash.swf = "{{$baseurl}}/library/video-js/video-js.swf"
 </script>
 
diff --git a/view/theme/frost/templates/videos_head.tpl b/view/theme/frost/templates/videos_head.tpl
index 0a460acaca..41e4424600 100644
--- a/view/theme/frost/templates/videos_head.tpl
+++ b/view/theme/frost/templates/videos_head.tpl
@@ -1,2 +1,2 @@
-<link href="library/video-js/video-js.min.css" rel="stylesheet">
+<link href="library/video-js/video-js.css" rel="stylesheet">
 

From db0a891a974b7b90e0036df487df4ca0ad5eccc1 Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Sat, 11 May 2013 12:40:09 -0600
Subject: [PATCH 62/67] fix preloading

---
 view/templates/video_top.tpl | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/view/templates/video_top.tpl b/view/templates/video_top.tpl
index dd0701e88d..3a8680fd9d 100644
--- a/view/templates/video_top.tpl
+++ b/view/templates/video_top.tpl
@@ -1,20 +1,11 @@
 
 <div class="video-top-wrapper lframe" id="video-top-wrapper-{{$video.id}}">
-	{{*<!--<a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
-		<img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" />
-	</a>-->*}}
-
-	{{*<video id="video-{{$video.id}}" class="video-js vjs-default-skin"
-	  controls preload="auto" width="480" height="320"
-	  poster="http://video-js.zencoder.com/oceans-clip.png">*}}
-	{{* v3.2.0 of VideoJS requires that there be a "data-setup" tag in the
+	{{* v4.0.0 of VideoJS requires that there be a "data-setup" tag in the
 	    <video> element for it to process the tag *}}
-	{{* set preloading to false to lessen the load on the server *}}
+	{{* set preloading to none to lessen the load on the server *}}
 	<video id="video-{{$video.id}}" class="video-js vjs-default-skin"
-	  controls preload="false" data-setup="" width="400" height="264">
+	  controls preload="none" data-setup="" width="400" height="264">
 	 <source src="{{$video.src}}" type="{{$video.mime}}" />
-	 {{*<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
-	 <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />*}}
 	</video>
 
 	{{*<div class="video-top-album-name"><a href="{{$video.album.link}}" class="video-top-album-link" title="{{$video.album.alt}}" >{{$video.album.name}}</a></div>*}}

From e8fc26e74e851acbedd7a5f4e4d0904a32e06130 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 11 May 2013 17:04:23 -0700
Subject: [PATCH 63/67] rev update

---
 boot.php         | 2 +-
 util/messages.po | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boot.php b/boot.php
index 4d2b5ccacd..7e29f4afba 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1695' );
+define ( 'FRIENDICA_VERSION',      '3.1.1697' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/util/messages.po b/util/messages.po
index d855f8a1a2..1ef893ac7c 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1695\n"
+"Project-Id-Version: 3.1.1697\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 00:02-0700\n"
+"POT-Creation-Date: 2013-05-11 00:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

From 0ce68665c6f2fa68809c82ee5e8493326cbda1c7 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 13 May 2013 17:22:07 -0700
Subject: [PATCH 64/67] check_config is gone - use check_db

---
 boot.php           |   2 +-
 util/db_update.php |   2 +-
 util/messages.po   | 658 +++++++++++++++++++++++----------------------
 3 files changed, 341 insertions(+), 321 deletions(-)

diff --git a/boot.php b/boot.php
index 65e3d1384d..3c55c377c8 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1697' );
+define ( 'FRIENDICA_VERSION',      '3.1.1699' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/util/db_update.php b/util/db_update.php
index ef85606ccb..32b44e6d00 100644
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -26,7 +26,7 @@ echo "New DB VERSION: " . DB_UPDATE_VERSION . "\n";
 
 if($build != DB_UPDATE_VERSION) {
 	echo "Updating database...";
-	check_config($a);
+	check_db($a);
 	echo "Done\n";
 }
 
diff --git a/util/messages.po b/util/messages.po
index 1ef893ac7c..f5528e1577 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1697\n"
+"Project-Id-Version: 3.1.1699\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-11 00:02-0700\n"
+"POT-Creation-Date: 2013-05-13 00:03-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -401,309 +401,6 @@ msgstr ""
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/text.php:294
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:296
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:325
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:328
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:352
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:356
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:807
-msgid "No contacts"
-msgstr ""
-
-#: ../../include/text.php:816
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
-msgid "View Contacts"
-msgstr ""
-
-#: ../../include/text.php:905 ../../include/text.php:906
-#: ../../include/nav.php:118 ../../mod/search.php:99
-msgid "Search"
-msgstr ""
-
-#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
-msgid "Save"
-msgstr ""
-
-#: ../../include/text.php:957
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:957 ../../include/conversation.php:211
-msgid "poked"
-msgstr ""
-
-#: ../../include/text.php:958
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:958
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:959
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:959
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:960
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:960
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:961
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:961
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:962
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:962
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:976
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:977
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:978
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:979
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:980
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:981
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:982
-msgid "stupified"
-msgstr ""
-
-#: ../../include/text.php:983
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:984
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:985
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:986
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:987
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:988
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:989
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:990
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:991
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:992
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:993
-msgid "motivated"
-msgstr ""
-
-#: ../../include/text.php:994
-msgid "relaxed"
-msgstr ""
-
-#: ../../include/text.php:995
-msgid "surprised"
-msgstr ""
-
-#: ../../include/text.php:1161
-msgid "Monday"
-msgstr ""
-
-#: ../../include/text.php:1161
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/text.php:1161
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/text.php:1161
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/text.php:1161
-msgid "Friday"
-msgstr ""
-
-#: ../../include/text.php:1161
-msgid "Saturday"
-msgstr ""
-
-#: ../../include/text.php:1161
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "January"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "February"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "March"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "April"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "June"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "July"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "August"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "September"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "October"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "November"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "December"
-msgstr ""
-
-#: ../../include/text.php:1322
-msgid "bytes"
-msgstr ""
-
-#: ../../include/text.php:1349 ../../include/text.php:1361
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/text.php:1523 ../../mod/events.php:335
-msgid "link to source"
-msgstr ""
-
-#: ../../include/text.php:1566 ../../include/user.php:237
-msgid "default"
-msgstr ""
-
-#: ../../include/text.php:1578
-msgid "Select an alternate language"
-msgstr ""
-
-#: ../../include/text.php:1830 ../../include/conversation.php:118
-#: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
-msgid "event"
-msgstr ""
-
-#: ../../include/text.php:1832 ../../include/diaspora.php:1874
-#: ../../include/conversation.php:126 ../../include/conversation.php:254
-#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
-#: ../../view/theme/diabook/theme.php:464
-msgid "photo"
-msgstr ""
-
-#: ../../include/text.php:1834
-msgid "activity"
-msgstr ""
-
-#: ../../include/text.php:1836 ../../mod/content.php:628
-#: ../../object/Item.php:364 ../../object/Item.php:377
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:1837
-msgid "post"
-msgstr ""
-
-#: ../../include/text.php:1992
-msgid "Item filed"
-msgstr ""
-
 #: ../../include/acl_selectors.php:325
 msgid "Visible to everybody"
 msgstr ""
@@ -878,6 +575,10 @@ msgstr ""
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
+#: ../../include/user.php:237 ../../include/text.php:1594
+msgid "default"
+msgstr ""
+
 #: ../../include/user.php:247
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
@@ -1223,6 +924,13 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
+#: ../../include/diaspora.php:1874 ../../include/text.php:1860
+#: ../../include/conversation.php:126 ../../include/conversation.php:254
+#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
+#: ../../view/theme/diabook/theme.php:464
+msgid "photo"
+msgstr ""
+
 #: ../../include/diaspora.php:1874 ../../include/conversation.php:121
 #: ../../include/conversation.php:130 ../../include/conversation.php:249
 #: ../../include/conversation.php:258 ../../mod/subthread.php:87
@@ -1474,6 +1182,302 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
+#: ../../include/text.php:294
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:296
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:325
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:328
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:352
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:356
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:807
+msgid "No contacts"
+msgstr ""
+
+#: ../../include/text.php:816
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
+msgid "View Contacts"
+msgstr ""
+
+#: ../../include/text.php:905 ../../include/text.php:906
+#: ../../include/nav.php:118 ../../mod/search.php:99
+msgid "Search"
+msgstr ""
+
+#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
+msgid "Save"
+msgstr ""
+
+#: ../../include/text.php:957
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:957 ../../include/conversation.php:211
+msgid "poked"
+msgstr ""
+
+#: ../../include/text.php:958
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:958
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:959
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:959
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:960
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:960
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:961
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:961
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:962
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:962
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:976
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:977
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:978
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:979
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:980
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:981
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:982
+msgid "stupified"
+msgstr ""
+
+#: ../../include/text.php:983
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:984
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:985
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:986
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:987
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:988
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:989
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:990
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:991
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:993
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:994
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:995
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1161
+msgid "Monday"
+msgstr ""
+
+#: ../../include/text.php:1161
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/text.php:1161
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/text.php:1161
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/text.php:1161
+msgid "Friday"
+msgstr ""
+
+#: ../../include/text.php:1161
+msgid "Saturday"
+msgstr ""
+
+#: ../../include/text.php:1161
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/text.php:1165
+msgid "January"
+msgstr ""
+
+#: ../../include/text.php:1165
+msgid "February"
+msgstr ""
+
+#: ../../include/text.php:1165
+msgid "March"
+msgstr ""
+
+#: ../../include/text.php:1165
+msgid "April"
+msgstr ""
+
+#: ../../include/text.php:1165
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1165
+msgid "June"
+msgstr ""
+
+#: ../../include/text.php:1165
+msgid "July"
+msgstr ""
+
+#: ../../include/text.php:1165
+msgid "August"
+msgstr ""
+
+#: ../../include/text.php:1165
+msgid "September"
+msgstr ""
+
+#: ../../include/text.php:1165
+msgid "October"
+msgstr ""
+
+#: ../../include/text.php:1165
+msgid "November"
+msgstr ""
+
+#: ../../include/text.php:1165
+msgid "December"
+msgstr ""
+
+#: ../../include/text.php:1321 ../../mod/videos.php:301
+msgid "View Video"
+msgstr ""
+
+#: ../../include/text.php:1353
+msgid "bytes"
+msgstr ""
+
+#: ../../include/text.php:1377 ../../include/text.php:1389
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1551 ../../mod/events.php:335
+msgid "link to source"
+msgstr ""
+
+#: ../../include/text.php:1606
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1858 ../../include/conversation.php:118
+#: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
+msgid "event"
+msgstr ""
+
+#: ../../include/text.php:1862
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:1864 ../../mod/content.php:628
+#: ../../object/Item.php:364 ../../object/Item.php:377
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:1865
+msgid "post"
+msgstr ""
+
+#: ../../include/text.php:2020
+msgid "Item filed"
+msgstr ""
+
 #: ../../include/group.php:25
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -2023,7 +2027,7 @@ msgid "Your photos"
 msgstr ""
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1963
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1970
 msgid "Events"
 msgstr ""
 
@@ -2628,14 +2632,14 @@ msgstr ""
 msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1970
+#: ../../mod/notes.php:44 ../../boot.php:1977
 msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/display.php:19 ../../mod/search.php:89
 #: ../../mod/dfrn_request.php:761 ../../mod/directory.php:31
-#: ../../mod/viewcontacts.php:17 ../../mod/photos.php:914
-#: ../../mod/community.php:18
+#: ../../mod/videos.php:115 ../../mod/viewcontacts.php:17
+#: ../../mod/photos.php:914 ../../mod/community.php:18
 msgid "Public access denied."
 msgstr ""
 
@@ -5043,6 +5047,26 @@ msgstr ""
 msgid "No matches"
 msgstr ""
 
+#: ../../mod/videos.php:125
+msgid "No videos selected"
+msgstr ""
+
+#: ../../mod/videos.php:226 ../../mod/photos.php:1025
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../mod/videos.php:308 ../../mod/photos.php:1784
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/videos.php:317
+msgid "Recent Videos"
+msgstr ""
+
+#: ../../mod/videos.php:319
+msgid "Upload New Videos"
+msgstr ""
+
 #: ../../mod/tagrm.php:41
 msgid "Tag removed"
 msgstr ""
@@ -5993,10 +6017,6 @@ msgstr ""
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:1025
-msgid "Access to this item is restricted."
-msgstr ""
-
 #: ../../mod/photos.php:1088
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
@@ -6137,10 +6157,6 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1784
-msgid "View Album"
-msgstr ""
-
 #: ../../mod/photos.php:1793
 msgid "Recent Photos"
 msgstr ""
@@ -7079,10 +7095,14 @@ msgstr ""
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1966
-msgid "Events and Calendar"
+#: ../../boot.php:1960 ../../boot.php:1963
+msgid "Videos"
 msgstr ""
 
 #: ../../boot.php:1973
+msgid "Events and Calendar"
+msgstr ""
+
+#: ../../boot.php:1980
 msgid "Only You Can See This"
 msgstr ""

From 636fef1ffa7e445019334f8f09049a8d92aa8871 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 14 May 2013 19:17:44 +0200
Subject: [PATCH 65/67] DE: update to the strings

---
 view/de/messages.po | 658 +++++++++++++++++++++++---------------------
 view/de/strings.php | 167 +++++------
 2 files changed, 425 insertions(+), 400 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index 73b46035c2..54f9fbd946 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -25,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2013-05-09 00:02-0700\n"
-"PO-Revision-Date: 2013-05-09 17:05+0000\n"
+"POT-Creation-Date: 2013-05-13 00:03-0700\n"
+"PO-Revision-Date: 2013-05-14 17:16+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"
@@ -418,309 +418,6 @@ msgstr "Kontakt bearbeiten"
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
-#: ../../include/text.php:294
-msgid "prev"
-msgstr "vorige"
-
-#: ../../include/text.php:296
-msgid "first"
-msgstr "erste"
-
-#: ../../include/text.php:325
-msgid "last"
-msgstr "letzte"
-
-#: ../../include/text.php:328
-msgid "next"
-msgstr "nächste"
-
-#: ../../include/text.php:352
-msgid "newer"
-msgstr "neuer"
-
-#: ../../include/text.php:356
-msgid "older"
-msgstr "älter"
-
-#: ../../include/text.php:807
-msgid "No contacts"
-msgstr "Keine Kontakte"
-
-#: ../../include/text.php:816
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] "%d Kontakt"
-msgstr[1] "%d Kontakte"
-
-#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
-msgid "View Contacts"
-msgstr "Kontakte anzeigen"
-
-#: ../../include/text.php:905 ../../include/text.php:906
-#: ../../include/nav.php:118 ../../mod/search.php:99
-msgid "Search"
-msgstr "Suche"
-
-#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
-msgid "Save"
-msgstr "Speichern"
-
-#: ../../include/text.php:957
-msgid "poke"
-msgstr "anstupsen"
-
-#: ../../include/text.php:957 ../../include/conversation.php:211
-msgid "poked"
-msgstr "stupste"
-
-#: ../../include/text.php:958
-msgid "ping"
-msgstr "anpingen"
-
-#: ../../include/text.php:958
-msgid "pinged"
-msgstr "pingte"
-
-#: ../../include/text.php:959
-msgid "prod"
-msgstr "knuffen"
-
-#: ../../include/text.php:959
-msgid "prodded"
-msgstr "knuffte"
-
-#: ../../include/text.php:960
-msgid "slap"
-msgstr "ohrfeigen"
-
-#: ../../include/text.php:960
-msgid "slapped"
-msgstr "ohrfeigte"
-
-#: ../../include/text.php:961
-msgid "finger"
-msgstr "befummeln"
-
-#: ../../include/text.php:961
-msgid "fingered"
-msgstr "befummelte"
-
-#: ../../include/text.php:962
-msgid "rebuff"
-msgstr "eine Abfuhr erteilen"
-
-#: ../../include/text.php:962
-msgid "rebuffed"
-msgstr "abfuhrerteilte"
-
-#: ../../include/text.php:976
-msgid "happy"
-msgstr "glücklich"
-
-#: ../../include/text.php:977
-msgid "sad"
-msgstr "traurig"
-
-#: ../../include/text.php:978
-msgid "mellow"
-msgstr "sanft"
-
-#: ../../include/text.php:979
-msgid "tired"
-msgstr "müde"
-
-#: ../../include/text.php:980
-msgid "perky"
-msgstr "frech"
-
-#: ../../include/text.php:981
-msgid "angry"
-msgstr "sauer"
-
-#: ../../include/text.php:982
-msgid "stupified"
-msgstr "verblüfft"
-
-#: ../../include/text.php:983
-msgid "puzzled"
-msgstr "verwirrt"
-
-#: ../../include/text.php:984
-msgid "interested"
-msgstr "interessiert"
-
-#: ../../include/text.php:985
-msgid "bitter"
-msgstr "verbittert"
-
-#: ../../include/text.php:986
-msgid "cheerful"
-msgstr "fröhlich"
-
-#: ../../include/text.php:987
-msgid "alive"
-msgstr "lebendig"
-
-#: ../../include/text.php:988
-msgid "annoyed"
-msgstr "verärgert"
-
-#: ../../include/text.php:989
-msgid "anxious"
-msgstr "unruhig"
-
-#: ../../include/text.php:990
-msgid "cranky"
-msgstr "schrullig"
-
-#: ../../include/text.php:991
-msgid "disturbed"
-msgstr "verstört"
-
-#: ../../include/text.php:992
-msgid "frustrated"
-msgstr "frustriert"
-
-#: ../../include/text.php:993
-msgid "motivated"
-msgstr "motiviert"
-
-#: ../../include/text.php:994
-msgid "relaxed"
-msgstr "entspannt"
-
-#: ../../include/text.php:995
-msgid "surprised"
-msgstr "überrascht"
-
-#: ../../include/text.php:1161
-msgid "Monday"
-msgstr "Montag"
-
-#: ../../include/text.php:1161
-msgid "Tuesday"
-msgstr "Dienstag"
-
-#: ../../include/text.php:1161
-msgid "Wednesday"
-msgstr "Mittwoch"
-
-#: ../../include/text.php:1161
-msgid "Thursday"
-msgstr "Donnerstag"
-
-#: ../../include/text.php:1161
-msgid "Friday"
-msgstr "Freitag"
-
-#: ../../include/text.php:1161
-msgid "Saturday"
-msgstr "Samstag"
-
-#: ../../include/text.php:1161
-msgid "Sunday"
-msgstr "Sonntag"
-
-#: ../../include/text.php:1165
-msgid "January"
-msgstr "Januar"
-
-#: ../../include/text.php:1165
-msgid "February"
-msgstr "Februar"
-
-#: ../../include/text.php:1165
-msgid "March"
-msgstr "März"
-
-#: ../../include/text.php:1165
-msgid "April"
-msgstr "April"
-
-#: ../../include/text.php:1165
-msgid "May"
-msgstr "Mai"
-
-#: ../../include/text.php:1165
-msgid "June"
-msgstr "Juni"
-
-#: ../../include/text.php:1165
-msgid "July"
-msgstr "Juli"
-
-#: ../../include/text.php:1165
-msgid "August"
-msgstr "August"
-
-#: ../../include/text.php:1165
-msgid "September"
-msgstr "September"
-
-#: ../../include/text.php:1165
-msgid "October"
-msgstr "Oktober"
-
-#: ../../include/text.php:1165
-msgid "November"
-msgstr "November"
-
-#: ../../include/text.php:1165
-msgid "December"
-msgstr "Dezember"
-
-#: ../../include/text.php:1322
-msgid "bytes"
-msgstr "Byte"
-
-#: ../../include/text.php:1349 ../../include/text.php:1361
-msgid "Click to open/close"
-msgstr "Zum öffnen/schließen klicken"
-
-#: ../../include/text.php:1523 ../../mod/events.php:335
-msgid "link to source"
-msgstr "Link zum Originalbeitrag"
-
-#: ../../include/text.php:1566 ../../include/user.php:237
-msgid "default"
-msgstr "Standard"
-
-#: ../../include/text.php:1578
-msgid "Select an alternate language"
-msgstr "Alternative Sprache auswählen"
-
-#: ../../include/text.php:1830 ../../include/conversation.php:118
-#: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
-msgid "event"
-msgstr "Veranstaltung"
-
-#: ../../include/text.php:1832 ../../include/diaspora.php:1874
-#: ../../include/conversation.php:126 ../../include/conversation.php:254
-#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
-#: ../../view/theme/diabook/theme.php:464
-msgid "photo"
-msgstr "Foto"
-
-#: ../../include/text.php:1834
-msgid "activity"
-msgstr "Aktivität"
-
-#: ../../include/text.php:1836 ../../mod/content.php:628
-#: ../../object/Item.php:364 ../../object/Item.php:377
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Kommentar"
-msgstr[1] "Kommentare"
-
-#: ../../include/text.php:1837
-msgid "post"
-msgstr "Beitrag"
-
-#: ../../include/text.php:1992
-msgid "Item filed"
-msgstr "Beitrag abgelegt"
-
 #: ../../include/acl_selectors.php:325
 msgid "Visible to everybody"
 msgstr "Für jeden sichtbar"
@@ -895,6 +592,10 @@ msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."
 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:237 ../../include/text.php:1594
+msgid "default"
+msgstr "Standard"
+
 #: ../../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."
@@ -1240,6 +941,13 @@ msgstr "%1$s ist nun mit %2$s befreundet"
 msgid "Sharing notification from Diaspora network"
 msgstr "Freigabe-Benachrichtigung von Diaspora"
 
+#: ../../include/diaspora.php:1874 ../../include/text.php:1860
+#: ../../include/conversation.php:126 ../../include/conversation.php:254
+#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
+#: ../../view/theme/diabook/theme.php:464
+msgid "photo"
+msgstr "Foto"
+
 #: ../../include/diaspora.php:1874 ../../include/conversation.php:121
 #: ../../include/conversation.php:130 ../../include/conversation.php:249
 #: ../../include/conversation.php:258 ../../mod/subthread.php:87
@@ -1491,6 +1199,302 @@ msgstr "Erlaubt es Beiträge mit einem Stern-Indikator zu  markieren"
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln."
 
+#: ../../include/text.php:294
+msgid "prev"
+msgstr "vorige"
+
+#: ../../include/text.php:296
+msgid "first"
+msgstr "erste"
+
+#: ../../include/text.php:325
+msgid "last"
+msgstr "letzte"
+
+#: ../../include/text.php:328
+msgid "next"
+msgstr "nächste"
+
+#: ../../include/text.php:352
+msgid "newer"
+msgstr "neuer"
+
+#: ../../include/text.php:356
+msgid "older"
+msgstr "älter"
+
+#: ../../include/text.php:807
+msgid "No contacts"
+msgstr "Keine Kontakte"
+
+#: ../../include/text.php:816
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d Kontakt"
+msgstr[1] "%d Kontakte"
+
+#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
+msgid "View Contacts"
+msgstr "Kontakte anzeigen"
+
+#: ../../include/text.php:905 ../../include/text.php:906
+#: ../../include/nav.php:118 ../../mod/search.php:99
+msgid "Search"
+msgstr "Suche"
+
+#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
+msgid "Save"
+msgstr "Speichern"
+
+#: ../../include/text.php:957
+msgid "poke"
+msgstr "anstupsen"
+
+#: ../../include/text.php:957 ../../include/conversation.php:211
+msgid "poked"
+msgstr "stupste"
+
+#: ../../include/text.php:958
+msgid "ping"
+msgstr "anpingen"
+
+#: ../../include/text.php:958
+msgid "pinged"
+msgstr "pingte"
+
+#: ../../include/text.php:959
+msgid "prod"
+msgstr "knuffen"
+
+#: ../../include/text.php:959
+msgid "prodded"
+msgstr "knuffte"
+
+#: ../../include/text.php:960
+msgid "slap"
+msgstr "ohrfeigen"
+
+#: ../../include/text.php:960
+msgid "slapped"
+msgstr "ohrfeigte"
+
+#: ../../include/text.php:961
+msgid "finger"
+msgstr "befummeln"
+
+#: ../../include/text.php:961
+msgid "fingered"
+msgstr "befummelte"
+
+#: ../../include/text.php:962
+msgid "rebuff"
+msgstr "eine Abfuhr erteilen"
+
+#: ../../include/text.php:962
+msgid "rebuffed"
+msgstr "abfuhrerteilte"
+
+#: ../../include/text.php:976
+msgid "happy"
+msgstr "glücklich"
+
+#: ../../include/text.php:977
+msgid "sad"
+msgstr "traurig"
+
+#: ../../include/text.php:978
+msgid "mellow"
+msgstr "sanft"
+
+#: ../../include/text.php:979
+msgid "tired"
+msgstr "müde"
+
+#: ../../include/text.php:980
+msgid "perky"
+msgstr "frech"
+
+#: ../../include/text.php:981
+msgid "angry"
+msgstr "sauer"
+
+#: ../../include/text.php:982
+msgid "stupified"
+msgstr "verblüfft"
+
+#: ../../include/text.php:983
+msgid "puzzled"
+msgstr "verwirrt"
+
+#: ../../include/text.php:984
+msgid "interested"
+msgstr "interessiert"
+
+#: ../../include/text.php:985
+msgid "bitter"
+msgstr "verbittert"
+
+#: ../../include/text.php:986
+msgid "cheerful"
+msgstr "fröhlich"
+
+#: ../../include/text.php:987
+msgid "alive"
+msgstr "lebendig"
+
+#: ../../include/text.php:988
+msgid "annoyed"
+msgstr "verärgert"
+
+#: ../../include/text.php:989
+msgid "anxious"
+msgstr "unruhig"
+
+#: ../../include/text.php:990
+msgid "cranky"
+msgstr "schrullig"
+
+#: ../../include/text.php:991
+msgid "disturbed"
+msgstr "verstört"
+
+#: ../../include/text.php:992
+msgid "frustrated"
+msgstr "frustriert"
+
+#: ../../include/text.php:993
+msgid "motivated"
+msgstr "motiviert"
+
+#: ../../include/text.php:994
+msgid "relaxed"
+msgstr "entspannt"
+
+#: ../../include/text.php:995
+msgid "surprised"
+msgstr "überrascht"
+
+#: ../../include/text.php:1161
+msgid "Monday"
+msgstr "Montag"
+
+#: ../../include/text.php:1161
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: ../../include/text.php:1161
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: ../../include/text.php:1161
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: ../../include/text.php:1161
+msgid "Friday"
+msgstr "Freitag"
+
+#: ../../include/text.php:1161
+msgid "Saturday"
+msgstr "Samstag"
+
+#: ../../include/text.php:1161
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: ../../include/text.php:1165
+msgid "January"
+msgstr "Januar"
+
+#: ../../include/text.php:1165
+msgid "February"
+msgstr "Februar"
+
+#: ../../include/text.php:1165
+msgid "March"
+msgstr "März"
+
+#: ../../include/text.php:1165
+msgid "April"
+msgstr "April"
+
+#: ../../include/text.php:1165
+msgid "May"
+msgstr "Mai"
+
+#: ../../include/text.php:1165
+msgid "June"
+msgstr "Juni"
+
+#: ../../include/text.php:1165
+msgid "July"
+msgstr "Juli"
+
+#: ../../include/text.php:1165
+msgid "August"
+msgstr "August"
+
+#: ../../include/text.php:1165
+msgid "September"
+msgstr "September"
+
+#: ../../include/text.php:1165
+msgid "October"
+msgstr "Oktober"
+
+#: ../../include/text.php:1165
+msgid "November"
+msgstr "November"
+
+#: ../../include/text.php:1165
+msgid "December"
+msgstr "Dezember"
+
+#: ../../include/text.php:1321 ../../mod/videos.php:301
+msgid "View Video"
+msgstr "Video ansehen"
+
+#: ../../include/text.php:1353
+msgid "bytes"
+msgstr "Byte"
+
+#: ../../include/text.php:1377 ../../include/text.php:1389
+msgid "Click to open/close"
+msgstr "Zum öffnen/schließen klicken"
+
+#: ../../include/text.php:1551 ../../mod/events.php:335
+msgid "link to source"
+msgstr "Link zum Originalbeitrag"
+
+#: ../../include/text.php:1606
+msgid "Select an alternate language"
+msgstr "Alternative Sprache auswählen"
+
+#: ../../include/text.php:1858 ../../include/conversation.php:118
+#: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
+msgid "event"
+msgstr "Veranstaltung"
+
+#: ../../include/text.php:1862
+msgid "activity"
+msgstr "Aktivität"
+
+#: ../../include/text.php:1864 ../../mod/content.php:628
+#: ../../object/Item.php:364 ../../object/Item.php:377
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Kommentar"
+msgstr[1] "Kommentare"
+
+#: ../../include/text.php:1865
+msgid "post"
+msgstr "Beitrag"
+
+#: ../../include/text.php:2020
+msgid "Item filed"
+msgstr "Beitrag abgelegt"
+
 #: ../../include/group.php:25
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -2041,7 +2045,7 @@ msgid "Your photos"
 msgstr "Deine Fotos"
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1963
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1970
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -2646,14 +2650,14 @@ msgstr "Sichtbar für"
 msgid "All Contacts (with secure profile access)"
 msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
 
-#: ../../mod/notes.php:44 ../../boot.php:1970
+#: ../../mod/notes.php:44 ../../boot.php:1977
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
 #: ../../mod/display.php:19 ../../mod/search.php:89
 #: ../../mod/dfrn_request.php:761 ../../mod/directory.php:31
-#: ../../mod/viewcontacts.php:17 ../../mod/photos.php:914
-#: ../../mod/community.php:18
+#: ../../mod/videos.php:115 ../../mod/viewcontacts.php:17
+#: ../../mod/photos.php:914 ../../mod/community.php:18
 msgid "Public access denied."
 msgstr "Öffentlicher Zugriff verweigert."
 
@@ -5064,6 +5068,26 @@ msgstr "Personensuche"
 msgid "No matches"
 msgstr "Keine Übereinstimmungen"
 
+#: ../../mod/videos.php:125
+msgid "No videos selected"
+msgstr "Keine Videos  ausgewählt"
+
+#: ../../mod/videos.php:226 ../../mod/photos.php:1025
+msgid "Access to this item is restricted."
+msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt."
+
+#: ../../mod/videos.php:308 ../../mod/photos.php:1784
+msgid "View Album"
+msgstr "Album betrachten"
+
+#: ../../mod/videos.php:317
+msgid "Recent Videos"
+msgstr "Neueste Videos"
+
+#: ../../mod/videos.php:319
+msgid "Upload New Videos"
+msgstr "Neues Video hochladen"
+
 #: ../../mod/tagrm.php:41
 msgid "Tag removed"
 msgstr "Tag entfernt"
@@ -6014,10 +6038,6 @@ msgstr "Bilddatei ist leer."
 msgid "No photos selected"
 msgstr "Keine Bilder ausgewählt"
 
-#: ../../mod/photos.php:1025
-msgid "Access to this item is restricted."
-msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt."
-
 #: ../../mod/photos.php:1088
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
@@ -6159,10 +6179,6 @@ msgstr "Das bist du"
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../mod/photos.php:1784
-msgid "View Album"
-msgstr "Album betrachten"
-
 #: ../../mod/photos.php:1793
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
@@ -7102,10 +7118,14 @@ msgstr "Statusnachrichten und Beiträge"
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1966
+#: ../../boot.php:1960 ../../boot.php:1963
+msgid "Videos"
+msgstr "Videos"
+
+#: ../../boot.php:1973
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1973
+#: ../../boot.php:1980
 msgid "Only You Can See This"
 msgstr "Nur du kannst das sehen"
diff --git a/view/de/strings.php b/view/de/strings.php
index b3b066f84b..841ea22864 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -98,85 +98,6 @@ $a->strings["View Photos"] = "Bilder anschauen";
 $a->strings["Network Posts"] = "Netzwerkbeiträge";
 $a->strings["Edit Contact"] = "Kontakt bearbeiten";
 $a->strings["Send PM"] = "Private Nachricht senden";
-$a->strings["prev"] = "vorige";
-$a->strings["first"] = "erste";
-$a->strings["last"] = "letzte";
-$a->strings["next"] = "nächste";
-$a->strings["newer"] = "neuer";
-$a->strings["older"] = "älter";
-$a->strings["No contacts"] = "Keine Kontakte";
-$a->strings["%d Contact"] = array(
-	0 => "%d Kontakt",
-	1 => "%d Kontakte",
-);
-$a->strings["View Contacts"] = "Kontakte anzeigen";
-$a->strings["Search"] = "Suche";
-$a->strings["Save"] = "Speichern";
-$a->strings["poke"] = "anstupsen";
-$a->strings["poked"] = "stupste";
-$a->strings["ping"] = "anpingen";
-$a->strings["pinged"] = "pingte";
-$a->strings["prod"] = "knuffen";
-$a->strings["prodded"] = "knuffte";
-$a->strings["slap"] = "ohrfeigen";
-$a->strings["slapped"] = "ohrfeigte";
-$a->strings["finger"] = "befummeln";
-$a->strings["fingered"] = "befummelte";
-$a->strings["rebuff"] = "eine Abfuhr erteilen";
-$a->strings["rebuffed"] = "abfuhrerteilte";
-$a->strings["happy"] = "glücklich";
-$a->strings["sad"] = "traurig";
-$a->strings["mellow"] = "sanft";
-$a->strings["tired"] = "müde";
-$a->strings["perky"] = "frech";
-$a->strings["angry"] = "sauer";
-$a->strings["stupified"] = "verblüfft";
-$a->strings["puzzled"] = "verwirrt";
-$a->strings["interested"] = "interessiert";
-$a->strings["bitter"] = "verbittert";
-$a->strings["cheerful"] = "fröhlich";
-$a->strings["alive"] = "lebendig";
-$a->strings["annoyed"] = "verärgert";
-$a->strings["anxious"] = "unruhig";
-$a->strings["cranky"] = "schrullig";
-$a->strings["disturbed"] = "verstört";
-$a->strings["frustrated"] = "frustriert";
-$a->strings["motivated"] = "motiviert";
-$a->strings["relaxed"] = "entspannt";
-$a->strings["surprised"] = "überrascht";
-$a->strings["Monday"] = "Montag";
-$a->strings["Tuesday"] = "Dienstag";
-$a->strings["Wednesday"] = "Mittwoch";
-$a->strings["Thursday"] = "Donnerstag";
-$a->strings["Friday"] = "Freitag";
-$a->strings["Saturday"] = "Samstag";
-$a->strings["Sunday"] = "Sonntag";
-$a->strings["January"] = "Januar";
-$a->strings["February"] = "Februar";
-$a->strings["March"] = "März";
-$a->strings["April"] = "April";
-$a->strings["May"] = "Mai";
-$a->strings["June"] = "Juni";
-$a->strings["July"] = "Juli";
-$a->strings["August"] = "August";
-$a->strings["September"] = "September";
-$a->strings["October"] = "Oktober";
-$a->strings["November"] = "November";
-$a->strings["December"] = "Dezember";
-$a->strings["bytes"] = "Byte";
-$a->strings["Click to open/close"] = "Zum öffnen/schließen klicken";
-$a->strings["link to source"] = "Link zum Originalbeitrag";
-$a->strings["default"] = "Standard";
-$a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
-$a->strings["event"] = "Veranstaltung";
-$a->strings["photo"] = "Foto";
-$a->strings["activity"] = "Aktivität";
-$a->strings["comment"] = array(
-	0 => "Kommentar",
-	1 => "Kommentare",
-);
-$a->strings["post"] = "Beitrag";
-$a->strings["Item filed"] = "Beitrag abgelegt";
 $a->strings["Visible to everybody"] = "Für jeden sichtbar";
 $a->strings["show"] = "zeigen";
 $a->strings["don't show"] = "nicht zeigen";
@@ -216,6 +137,7 @@ $a->strings["Nickname is already registered. Please choose another."] = "Dieser
 $a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
 $a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
+$a->strings["default"] = "Standard";
 $a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
 $a->strings["Profile Photos"] = "Profilbilder";
 $a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert";
@@ -301,6 +223,7 @@ $a->strings["(no subject)"] = "(kein Betreff)";
 $a->strings["noreply"] = "noreply";
 $a->strings["%1\$s is now friends with %2\$s"] = "%1\$s ist nun mit %2\$s befreundet";
 $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
+$a->strings["photo"] = "Foto";
 $a->strings["status"] = "Status";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s";
 $a->strings["Attachments:"] = "Anhänge:";
@@ -352,6 +275,84 @@ $a->strings["Ability to dislike posts/comments"] = "Ermöglicht es Beiträge mit
 $a->strings["Star Posts"] = "Beiträge Markieren";
 $a->strings["Ability to mark special posts with a star indicator"] = "Erlaubt es Beiträge mit einem Stern-Indikator zu  markieren";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln.";
+$a->strings["prev"] = "vorige";
+$a->strings["first"] = "erste";
+$a->strings["last"] = "letzte";
+$a->strings["next"] = "nächste";
+$a->strings["newer"] = "neuer";
+$a->strings["older"] = "älter";
+$a->strings["No contacts"] = "Keine Kontakte";
+$a->strings["%d Contact"] = array(
+	0 => "%d Kontakt",
+	1 => "%d Kontakte",
+);
+$a->strings["View Contacts"] = "Kontakte anzeigen";
+$a->strings["Search"] = "Suche";
+$a->strings["Save"] = "Speichern";
+$a->strings["poke"] = "anstupsen";
+$a->strings["poked"] = "stupste";
+$a->strings["ping"] = "anpingen";
+$a->strings["pinged"] = "pingte";
+$a->strings["prod"] = "knuffen";
+$a->strings["prodded"] = "knuffte";
+$a->strings["slap"] = "ohrfeigen";
+$a->strings["slapped"] = "ohrfeigte";
+$a->strings["finger"] = "befummeln";
+$a->strings["fingered"] = "befummelte";
+$a->strings["rebuff"] = "eine Abfuhr erteilen";
+$a->strings["rebuffed"] = "abfuhrerteilte";
+$a->strings["happy"] = "glücklich";
+$a->strings["sad"] = "traurig";
+$a->strings["mellow"] = "sanft";
+$a->strings["tired"] = "müde";
+$a->strings["perky"] = "frech";
+$a->strings["angry"] = "sauer";
+$a->strings["stupified"] = "verblüfft";
+$a->strings["puzzled"] = "verwirrt";
+$a->strings["interested"] = "interessiert";
+$a->strings["bitter"] = "verbittert";
+$a->strings["cheerful"] = "fröhlich";
+$a->strings["alive"] = "lebendig";
+$a->strings["annoyed"] = "verärgert";
+$a->strings["anxious"] = "unruhig";
+$a->strings["cranky"] = "schrullig";
+$a->strings["disturbed"] = "verstört";
+$a->strings["frustrated"] = "frustriert";
+$a->strings["motivated"] = "motiviert";
+$a->strings["relaxed"] = "entspannt";
+$a->strings["surprised"] = "überrascht";
+$a->strings["Monday"] = "Montag";
+$a->strings["Tuesday"] = "Dienstag";
+$a->strings["Wednesday"] = "Mittwoch";
+$a->strings["Thursday"] = "Donnerstag";
+$a->strings["Friday"] = "Freitag";
+$a->strings["Saturday"] = "Samstag";
+$a->strings["Sunday"] = "Sonntag";
+$a->strings["January"] = "Januar";
+$a->strings["February"] = "Februar";
+$a->strings["March"] = "März";
+$a->strings["April"] = "April";
+$a->strings["May"] = "Mai";
+$a->strings["June"] = "Juni";
+$a->strings["July"] = "Juli";
+$a->strings["August"] = "August";
+$a->strings["September"] = "September";
+$a->strings["October"] = "Oktober";
+$a->strings["November"] = "November";
+$a->strings["December"] = "Dezember";
+$a->strings["View Video"] = "Video ansehen";
+$a->strings["bytes"] = "Byte";
+$a->strings["Click to open/close"] = "Zum öffnen/schließen klicken";
+$a->strings["link to source"] = "Link zum Originalbeitrag";
+$a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
+$a->strings["event"] = "Veranstaltung";
+$a->strings["activity"] = "Aktivität";
+$a->strings["comment"] = array(
+	0 => "Kommentar",
+	1 => "Kommentare",
+);
+$a->strings["post"] = "Beitrag";
+$a->strings["Item filed"] = "Beitrag abgelegt";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
 $a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte";
 $a->strings["Everybody"] = "Alle Kontakte";
@@ -1181,6 +1182,11 @@ $a->strings["No suggestions available. If this is a new site, please try again i
 $a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
 $a->strings["People Search"] = "Personensuche";
 $a->strings["No matches"] = "Keine Übereinstimmungen";
+$a->strings["No videos selected"] = "Keine Videos  ausgewählt";
+$a->strings["Access to this item is restricted."] = "Zugriff zu diesem Eintrag wurde eingeschränkt.";
+$a->strings["View Album"] = "Album betrachten";
+$a->strings["Recent Videos"] = "Neueste Videos";
+$a->strings["Upload New Videos"] = "Neues Video hochladen";
 $a->strings["Tag removed"] = "Tag entfernt";
 $a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen";
 $a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: ";
@@ -1403,7 +1409,6 @@ $a->strings["a photo"] = "einem Foto";
 $a->strings["Image exceeds size limit of "] = "Die Bildgröße übersteigt das Limit von ";
 $a->strings["Image file is empty."] = "Bilddatei ist leer.";
 $a->strings["No photos selected"] = "Keine Bilder ausgewählt";
-$a->strings["Access to this item is restricted."] = "Zugriff zu diesem Eintrag wurde eingeschränkt.";
 $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers.";
 $a->strings["Upload Photos"] = "Bilder hochladen";
 $a->strings["New album name: "] = "Name des neuen Albums: ";
@@ -1437,7 +1442,6 @@ $a->strings["I like this (toggle)"] = "Ich mag das (toggle)";
 $a->strings["I don't like this (toggle)"] = "Ich mag das nicht (toggle)";
 $a->strings["This is you"] = "Das bist du";
 $a->strings["Comment"] = "Kommentar";
-$a->strings["View Album"] = "Album betrachten";
 $a->strings["Recent Photos"] = "Neueste Fotos";
 $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica";
 $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder";
@@ -1642,5 +1646,6 @@ $a->strings["Event Reminders"] = "Veranstaltungserinnerungen";
 $a->strings["Events this week:"] = "Veranstaltungen diese Woche";
 $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
 $a->strings["Profile Details"] = "Profildetails";
+$a->strings["Videos"] = "Videos";
 $a->strings["Events and Calendar"] = "Ereignisse und Kalender";
 $a->strings["Only You Can See This"] = "Nur du kannst das sehen";

From 4d105f06e8f2d831cc756ee27eab7db442b9edbe Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 16 May 2013 06:42:13 +0200
Subject: [PATCH 66/67] CA: update to the strings

---
 view/ca/messages.po | 15081 +++++++++++++++++-------------------------
 view/ca/strings.php |  3414 ++++------
 2 files changed, 7576 insertions(+), 10919 deletions(-)

diff --git a/view/ca/messages.po b/view/ca/messages.po
index 628f6c4de4..be8e65857f 100644
--- a/view/ca/messages.po
+++ b/view/ca/messages.po
@@ -1,16 +1,16 @@
 # FRIENDICA Distributed Social Network
-# Copyright (C) 2010, 2011 the Friendica Project
+# Copyright (C) 2010, 2011, 2012, 2013 the Friendica Project
 # This file is distributed under the same license as the Friendica package.
 # 
 # Translators:
-# Rafael GARAU ESPINÓS <transifex@macadamia.es>, 2012.
-# Rafael GARAU <transifex@macadamia.es>, 2012-2013.
+# Rafael GARAU <transifex@macadamia.es>, 2012
+# Rafael GARAU <transifex@macadamia.es>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2013-02-07 10:00-0800\n"
-"PO-Revision-Date: 2013-02-08 22:44+0000\n"
+"POT-Creation-Date: 2013-05-13 00:03-0700\n"
+"PO-Revision-Date: 2013-05-15 21:23+0000\n"
 "Last-Translator: Rafael GARAU <transifex@macadamia.es>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/friendica/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -19,8083 +19,22 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../mod/oexchange.php:25
-msgid "Post successful."
-msgstr "Publicat amb éxit."
-
-#: ../../mod/update_notes.php:41 ../../mod/update_community.php:18
-#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
-#: ../../mod/update_display.php:22
-msgid "[Embedded content - reload page to view]"
-msgstr "[Contingut embegut - recarrega la pàgina per a veure-ho]"
-
-#: ../../mod/crepair.php:102
-msgid "Contact settings applied."
-msgstr "Ajustos de Contacte aplicats."
-
-#: ../../mod/crepair.php:104
-msgid "Contact update failed."
-msgstr "Fracassà l'actualització de Contacte"
-
-#: ../../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:1041
-#: ../../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:542
-#: ../../mod/settings.php:547 ../../mod/manage.php:96 ../../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: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:174
-#: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
-#: ../../mod/wall_upload.php:66 ../../mod/follow.php:9
-#: ../../mod/display.php:180 ../../mod/profiles.php:146
-#: ../../mod/profiles.php:567 ../../mod/delegate.php:6
-#: ../../mod/suggest.php:56 ../../mod/invite.php:15 ../../mod/invite.php:101
-#: ../../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:4015
-#: ../../index.php:341 ../../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
-msgid "Permission denied."
-msgstr "Permís denegat."
-
-#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20
-#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:118
-msgid "Contact not found."
-msgstr "Contacte no trobat"
-
-#: ../../mod/crepair.php:135
-msgid "Repair Contact Settings"
-msgstr "Reposar els ajustos de Contacte"
-
-#: ../../mod/crepair.php:137
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
-" information your communications with this contact may stop working."
-msgstr "<strong>ADVERTÈNCIA: Això és molt avançat </strong> i si s'introdueix informació incorrecta la seva comunicació amb aquest contacte pot deixar de funcionar."
-
-#: ../../mod/crepair.php:138
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
-msgstr "Si us plau, prem el botó 'Tornar' <strong>ara</strong> si no saps segur que has de fer aqui."
-
-#: ../../mod/crepair.php:144
-msgid "Return to contact editor"
-msgstr "Tornar al editor de contactes"
-
-#: ../../mod/crepair.php:148 ../../mod/settings.php:562
-#: ../../mod/settings.php:588 ../../mod/admin.php:731 ../../mod/admin.php:741
-msgid "Name"
-msgstr "Nom"
-
-#: ../../mod/crepair.php:149
-msgid "Account Nickname"
-msgstr "Àlies del Compte"
-
-#: ../../mod/crepair.php:150
-msgid "@Tagname - overrides Name/Nickname"
-msgstr "@Tagname - té prel·lació sobre Nom/Àlies"
-
-#: ../../mod/crepair.php:151
-msgid "Account URL"
-msgstr "Adreça URL del Compte"
-
-#: ../../mod/crepair.php:152
-msgid "Friend Request URL"
-msgstr "Adreça URL de sol·licitud d'Amistat"
-
-#: ../../mod/crepair.php:153
-msgid "Friend Confirm URL"
-msgstr "Adreça URL de confirmació d'Amic"
-
-#: ../../mod/crepair.php:154
-msgid "Notification Endpoint URL"
-msgstr "Adreça URL de Notificació"
-
-#: ../../mod/crepair.php:155
-msgid "Poll/Feed URL"
-msgstr "Adreça de Enquesta/Alimentador"
-
-#: ../../mod/crepair.php:156
-msgid "New photo from this URL"
-msgstr "Nova foto d'aquesta URL"
-
-#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:478 ../../mod/photos.php:1075
-#: ../../mod/photos.php:1196 ../../mod/photos.php:1498
-#: ../../mod/photos.php:1549 ../../mod/photos.php:1593
-#: ../../mod/photos.php:1676 ../../mod/install.php:248
-#: ../../mod/install.php:286 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:710 ../../mod/contacts.php:386
-#: ../../mod/settings.php:560 ../../mod/settings.php:670
-#: ../../mod/settings.php:739 ../../mod/settings.php:811
-#: ../../mod/settings.php:1037 ../../mod/manage.php:110 ../../mod/group.php:87
-#: ../../mod/mood.php:137 ../../mod/message.php:335 ../../mod/message.php:564
-#: ../../mod/admin.php:461 ../../mod/admin.php:728 ../../mod/admin.php:865
-#: ../../mod/admin.php:1068 ../../mod/admin.php:1155
-#: ../../mod/profiles.php:626 ../../mod/invite.php:140
-#: ../../addon/fromgplus/fromgplus.php:44
-#: ../../addon/facebook/facebook.php:621
-#: ../../addon/snautofollow/snautofollow.php:64
-#: ../../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:48
-#: ../../addon/remote_permissions/remote_permissions.php:196
-#: ../../addon/startpage/startpage.php:92
-#: ../../addon/geonames/geonames.php:187
-#: ../../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:94
-#: ../../addon/group_text/group_text.php:84
-#: ../../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: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: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:191
-#: ../../addon/twitter/twitter.php:229 ../../addon/twitter/twitter.php:556
-#: ../../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: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
-#: ../../addon.old/yourls/yourls.php:76 ../../addon.old/ljpost/ljpost.php:93
-#: ../../addon.old/nsfw/nsfw.php:88 ../../addon.old/page/page.php:211
-#: ../../addon.old/planets/planets.php:158
-#: ../../addon.old/uhremotestorage/uhremotestorage.php:89
-#: ../../addon.old/randplace/randplace.php:177
-#: ../../addon.old/dwpost/dwpost.php:93 ../../addon.old/drpost/drpost.php:110
-#: ../../addon.old/startpage/startpage.php:92
-#: ../../addon.old/geonames/geonames.php:187
-#: ../../addon.old/oembed.old/oembed.php:41
-#: ../../addon.old/forumlist/forumlist.php:175
-#: ../../addon.old/impressum/impressum.php:83
-#: ../../addon.old/notimeline/notimeline.php:64
-#: ../../addon.old/blockem/blockem.php:57
-#: ../../addon.old/qcomment/qcomment.php:61
-#: ../../addon.old/openstreetmap/openstreetmap.php:70
-#: ../../addon.old/group_text/group_text.php:84
-#: ../../addon.old/libravatar/libravatar.php:99
-#: ../../addon.old/libertree/libertree.php:90
-#: ../../addon.old/altpager/altpager.php:87
-#: ../../addon.old/mathjax/mathjax.php:42
-#: ../../addon.old/editplain/editplain.php:84
-#: ../../addon.old/blackout/blackout.php:98
-#: ../../addon.old/gravatar/gravatar.php:95
-#: ../../addon.old/pageheader/pageheader.php:55
-#: ../../addon.old/ijpost/ijpost.php:93
-#: ../../addon.old/jappixmini/jappixmini.php:307
-#: ../../addon.old/statusnet/statusnet.php:278
-#: ../../addon.old/statusnet/statusnet.php:292
-#: ../../addon.old/statusnet/statusnet.php:318
-#: ../../addon.old/statusnet/statusnet.php:325
-#: ../../addon.old/statusnet/statusnet.php:353
-#: ../../addon.old/statusnet/statusnet.php:576
-#: ../../addon.old/tumblr/tumblr.php:90
-#: ../../addon.old/numfriends/numfriends.php:85
-#: ../../addon.old/gnot/gnot.php:88 ../../addon.old/wppost/wppost.php:110
-#: ../../addon.old/showmore/showmore.php:48 ../../addon.old/piwik/piwik.php:89
-#: ../../addon.old/twitter/twitter.php:180
-#: ../../addon.old/twitter/twitter.php:209
-#: ../../addon.old/twitter/twitter.php:394 ../../addon.old/irc/irc.php:55
-#: ../../addon.old/fromapp/fromapp.php:77
-#: ../../addon.old/blogger/blogger.php:102
-#: ../../addon.old/posterous/posterous.php:103
-msgid "Submit"
-msgstr "Enviar"
-
-#: ../../mod/help.php:79
-msgid "Help:"
-msgstr "Ajuda:"
-
-#: ../../mod/help.php:84 ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../include/nav.php:113 ../../addon.old/dav/friendica/layout.fnk.php:225
-msgid "Help"
-msgstr "Ajuda"
-
-#: ../../mod/help.php:90 ../../index.php:226
-msgid "Not Found"
-msgstr "No trobat"
-
-#: ../../mod/help.php:93 ../../index.php:229
-msgid "Page not found."
-msgstr "Pàgina no trobada."
-
-#: ../../mod/wall_attach.php:69
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "L'arxiu excedeix la mida límit de %d"
-
-#: ../../mod/wall_attach.php:110 ../../mod/wall_attach.php:121
-msgid "File upload failed."
-msgstr "La càrrega de fitxers ha fallat."
-
-#: ../../mod/fsuggest.php:63
-msgid "Friend suggestion sent."
-msgstr "Enviat suggeriment d'amic."
-
-#: ../../mod/fsuggest.php:97
-msgid "Suggest Friends"
-msgstr "Suggerir Amics"
-
-#: ../../mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Suggerir un amic per a %s"
-
-#: ../../mod/events.php:66
-msgid "Event title and start time are required."
-msgstr "Títol d'esdeveniment i hora d'inici requerits."
-
-#: ../../mod/events.php:291
-msgid "l, F j"
-msgstr "l, F j"
-
-#: ../../mod/events.php:313
-msgid "Edit event"
-msgstr "Editar esdeveniment"
-
-#: ../../mod/events.php:335 ../../include/text.php:1258
-msgid "link to source"
-msgstr "Enllaç al origen"
-
-#: ../../mod/events.php:370 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:79 ../../boot.php:1857
-msgid "Events"
-msgstr "Esdeveniments"
-
-#: ../../mod/events.php:371
-msgid "Create New Event"
-msgstr "Crear un nou esdeveniment"
-
-#: ../../mod/events.php:372 ../../addon/dav/friendica/layout.fnk.php:263
-#: ../../addon.old/dav/friendica/layout.fnk.php:263
-msgid "Previous"
-msgstr "Previ"
-
-#: ../../mod/events.php:373 ../../mod/install.php:207
-#: ../../addon/dav/friendica/layout.fnk.php:266
-#: ../../addon.old/dav/friendica/layout.fnk.php:266
-msgid "Next"
-msgstr "Següent"
-
-#: ../../mod/events.php:446
-msgid "hour:minute"
-msgstr "hora:minut"
-
-#: ../../mod/events.php:456
-msgid "Event details"
-msgstr "Detalls del esdeveniment"
-
-#: ../../mod/events.php:457
-#, php-format
-msgid "Format is %s %s. Starting date and Title are required."
-msgstr "El Format és %s %s. Data d'inici i títol requerits."
-
-#: ../../mod/events.php:459
-msgid "Event Starts:"
-msgstr "Inici d'Esdeveniment:"
-
-#: ../../mod/events.php:459 ../../mod/events.php:473
-msgid "Required"
-msgstr "Requerit"
-
-#: ../../mod/events.php:462
-msgid "Finish date/time is not known or not relevant"
-msgstr "La data/hora de finalització no es coneixen o no són relevants"
-
-#: ../../mod/events.php:464
-msgid "Event Finishes:"
-msgstr "L'esdeveniment Finalitza:"
-
-#: ../../mod/events.php:467
-msgid "Adjust for viewer timezone"
-msgstr "Ajustar a la zona horaria de l'espectador"
-
-#: ../../mod/events.php:469
-msgid "Description:"
-msgstr "Descripció:"
-
-#: ../../mod/events.php:471 ../../mod/directory.php:134
-#: ../../addon/forumdirectory/forumdirectory.php:156
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:415
-#: ../../boot.php:1379
-msgid "Location:"
-msgstr "Ubicació:"
-
-#: ../../mod/events.php:473
-msgid "Title:"
-msgstr "Títol:"
-
-#: ../../mod/events.php:475
-msgid "Share this event"
-msgstr "Compartir aquest esdeveniment"
-
-#: ../../mod/maintenance.php:5
-msgid "System down for maintenance"
-msgstr ""
-
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/photos.php:202
-#: ../../mod/photos.php:289 ../../mod/editpost.php:148
-#: ../../mod/dfrn_request.php:848 ../../mod/contacts.php:249
-#: ../../mod/settings.php:561 ../../mod/settings.php:587
-#: ../../mod/fbrowser.php:81 ../../mod/fbrowser.php:116
-#: ../../mod/message.php:212 ../../mod/suggest.php:32
-#: ../../addon/js_upload/js_upload.php:45 ../../include/items.php:3897
-#: ../../include/conversation.php:1062
-#: ../../addon.old/js_upload/js_upload.php:45
-msgid "Cancel"
-msgstr "Cancel·lar"
-
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
-msgstr "Etiqueta eliminada"
-
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr "Esborrar etiqueta del element"
-
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr "Selecciona etiqueta a esborrar:"
-
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
-#: ../../addon/dav/common/wdcal_edit.inc.php:468
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:468
-msgid "Remove"
-msgstr "Esborrar"
-
-#: ../../mod/dfrn_poll.php:101 ../../mod/dfrn_poll.php:534
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr ""
-
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
-msgstr "Autoritzi la connexió de aplicacions"
-
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Torni a la seva aplicació i inserti aquest Codi de Seguretat:"
-
-#: ../../mod/api.php:89
-msgid "Please login to continue."
-msgstr "Per favor, accedeixi per a continuar."
-
-#: ../../mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "Vol autoritzar a aquesta aplicació per accedir als teus missatges i contactes, i/o crear nous enviaments per a vostè?"
-
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:836
-#: ../../mod/contacts.php:246 ../../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/message.php:209
-#: ../../mod/profiles.php:606 ../../mod/suggest.php:29
-#: ../../include/items.php:3894
-msgid "Yes"
-msgstr "Si"
-
-#: ../../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:607
-msgid "No"
-msgstr "No"
-
-#: ../../mod/photos.php:51 ../../boot.php:1850
-msgid "Photo Albums"
-msgstr "Àlbum de Fotos"
-
-#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1055
-#: ../../mod/photos.php:1180 ../../mod/photos.php:1203
-#: ../../mod/photos.php:1733 ../../mod/photos.php:1745
-#: ../../addon/communityhome/communityhome.php:115
-#: ../../view/theme/diabook/theme.php:492
-#: ../../addon.old/communityhome/communityhome.php:110
-msgid "Contact Photos"
-msgstr "Fotos de Contacte"
-
-#: ../../mod/photos.php:66 ../../mod/photos.php:1219 ../../mod/photos.php:1792
-msgid "Upload New Photos"
-msgstr "Actualitzar Noves Fotos"
-
-#: ../../mod/photos.php:79 ../../mod/settings.php:23
-msgid "everybody"
-msgstr "tothom"
-
-#: ../../mod/photos.php:143
-msgid "Contact information unavailable"
-msgstr "Informació del Contacte no disponible"
-
-#: ../../mod/photos.php:154 ../../mod/photos.php:722 ../../mod/photos.php:1180
-#: ../../mod/photos.php:1203 ../../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: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 "Fotos del Perfil"
-
-#: ../../mod/photos.php:164
-msgid "Album not found."
-msgstr "Àlbum no trobat."
-
-#: ../../mod/photos.php:187 ../../mod/photos.php:199 ../../mod/photos.php:1197
-msgid "Delete Album"
-msgstr "Eliminar Àlbum"
-
-#: ../../mod/photos.php:197
-msgid "Do you really want to delete this photo album and all its photos?"
-msgstr ""
-
-#: ../../mod/photos.php:275 ../../mod/photos.php:286 ../../mod/photos.php:1499
-msgid "Delete Photo"
-msgstr "Eliminar Foto"
-
-#: ../../mod/photos.php:284
-msgid "Do you really want to delete this photo?"
-msgstr ""
-
-#: ../../mod/photos.php:653
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
-msgstr ""
-
-#: ../../mod/photos.php:653
-msgid "a photo"
-msgstr ""
-
-#: ../../mod/photos.php:758 ../../addon/js_upload/js_upload.php:321
-#: ../../addon.old/js_upload/js_upload.php:315
-msgid "Image exceeds size limit of "
-msgstr "La imatge excedeix el límit de "
-
-#: ../../mod/photos.php:766
-msgid "Image file is empty."
-msgstr "El fitxer de imatge és buit."
-
-#: ../../mod/photos.php:798 ../../mod/profile_photo.php:153
-#: ../../mod/wall_upload.php:112
-msgid "Unable to process image."
-msgstr "Incapaç de processar la imatge."
-
-#: ../../mod/photos.php:825 ../../mod/profile_photo.php:301
-#: ../../mod/wall_upload.php:138
-msgid "Image upload failed."
-msgstr "Actualització de la imatge fracassada."
-
-#: ../../mod/photos.php:911 ../../mod/community.php:18
-#: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:19 ../../mod/search.php:89 ../../mod/directory.php:31
-#: ../../addon/forumdirectory/forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Accés públic denegat."
-
-#: ../../mod/photos.php:921
-msgid "No photos selected"
-msgstr "No s'han seleccionat fotos"
-
-#: ../../mod/photos.php:1022
-msgid "Access to this item is restricted."
-msgstr "L'accés a aquest element està restringit."
-
-#: ../../mod/photos.php:1085
-#, php-format
-msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
-msgstr "Has emprat %1$.2f Mbytes de %2$.2f Mbytes del magatzem de fotos."
-
-#: ../../mod/photos.php:1120
-msgid "Upload Photos"
-msgstr "Carregar Fotos"
-
-#: ../../mod/photos.php:1124 ../../mod/photos.php:1192
-msgid "New album name: "
-msgstr "Nou nom d'àlbum:"
-
-#: ../../mod/photos.php:1125
-msgid "or existing album name: "
-msgstr "o nom d'àlbum existent:"
-
-#: ../../mod/photos.php:1126
-msgid "Do not show a status post for this upload"
-msgstr "No tornis a mostrar un missatge d'estat d'aquesta pujada"
-
-#: ../../mod/photos.php:1128 ../../mod/photos.php:1494
-msgid "Permissions"
-msgstr "Permisos"
-
-#: ../../mod/photos.php:1137 ../../mod/photos.php:1503
-#: ../../mod/settings.php:1070
-msgid "Show to Groups"
-msgstr ""
-
-#: ../../mod/photos.php:1138 ../../mod/photos.php:1504
-#: ../../mod/settings.php:1071
-msgid "Show to Contacts"
-msgstr ""
-
-#: ../../mod/photos.php:1139
-msgid "Private Photo"
-msgstr ""
-
-#: ../../mod/photos.php:1140
-msgid "Public Photo"
-msgstr ""
-
-#: ../../mod/photos.php:1207
-msgid "Edit Album"
-msgstr "Editar Àlbum"
-
-#: ../../mod/photos.php:1213
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../mod/photos.php:1215
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../mod/photos.php:1248 ../../mod/photos.php:1775
-msgid "View Photo"
-msgstr "Veure Foto"
-
-#: ../../mod/photos.php:1283
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Permís denegat. L'accés a aquest element pot estar restringit."
-
-#: ../../mod/photos.php:1285
-msgid "Photo not available"
-msgstr "Foto no disponible"
-
-#: ../../mod/photos.php:1341
-msgid "View photo"
-msgstr "Veure foto"
-
-#: ../../mod/photos.php:1341
-msgid "Edit photo"
-msgstr "Editar foto"
-
-#: ../../mod/photos.php:1342
-msgid "Use as profile photo"
-msgstr "Emprar com a foto del perfil"
-
-#: ../../mod/photos.php:1348 ../../mod/content.php:620
-#: ../../object/Item.php:106
-msgid "Private Message"
-msgstr "Missatge Privat"
-
-#: ../../mod/photos.php:1367
-msgid "View Full Size"
-msgstr "Veure'l a Mida Completa"
-
-#: ../../mod/photos.php:1441
-msgid "Tags: "
-msgstr "Etiquetes:"
-
-#: ../../mod/photos.php:1444
-msgid "[Remove any tag]"
-msgstr "Treure etiquetes"
-
-#: ../../mod/photos.php:1484
-msgid "Rotate CW (right)"
-msgstr "Rotar CW (dreta)"
-
-#: ../../mod/photos.php:1485
-msgid "Rotate CCW (left)"
-msgstr "Rotar CCW (esquerra)"
-
-#: ../../mod/photos.php:1487
-msgid "New album name"
-msgstr "Nou nom d'àlbum"
-
-#: ../../mod/photos.php:1490
-msgid "Caption"
-msgstr "Títol"
-
-#: ../../mod/photos.php:1492
-msgid "Add a Tag"
-msgstr "Afegir una etiqueta"
-
-#: ../../mod/photos.php:1496
-msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr "Exemple: @bob, @Barbara_jensen, @jim@example.com,  #California, #camping"
-
-#: ../../mod/photos.php:1505
-msgid "Private photo"
-msgstr ""
-
-#: ../../mod/photos.php:1506
-msgid "Public photo"
-msgstr ""
-
-#: ../../mod/photos.php:1526 ../../mod/content.php:684
-#: ../../object/Item.php:204
-msgid "I like this (toggle)"
-msgstr "M'agrada això (canviar)"
-
-#: ../../mod/photos.php:1527 ../../mod/content.php:685
-#: ../../object/Item.php:205
-msgid "I don't like this (toggle)"
-msgstr "No m'agrada això (canviar)"
-
-#: ../../mod/photos.php:1528 ../../include/conversation.php:1023
-msgid "Share"
-msgstr "Compartir"
-
-#: ../../mod/photos.php:1529 ../../mod/editpost.php:124
-#: ../../mod/content.php:499 ../../mod/content.php:883
-#: ../../mod/wallmessage.php:156 ../../mod/message.php:334
-#: ../../mod/message.php:565 ../../include/conversation.php:646
-#: ../../include/conversation.php:1042 ../../object/Item.php:293
-msgid "Please wait"
-msgstr "Si us plau esperi"
-
-#: ../../mod/photos.php:1546 ../../mod/photos.php:1590
-#: ../../mod/photos.php:1673 ../../mod/content.php:707
-#: ../../object/Item.php:601
-msgid "This is you"
-msgstr "Aquest ets tu"
-
-#: ../../mod/photos.php:1548 ../../mod/photos.php:1592
-#: ../../mod/photos.php:1675 ../../mod/content.php:709 ../../boot.php:641
-#: ../../object/Item.php:290 ../../object/Item.php:603
-msgid "Comment"
-msgstr "Comentari"
-
-#: ../../mod/photos.php:1550 ../../mod/photos.php:1594
-#: ../../mod/photos.php:1677 ../../mod/editpost.php:145
-#: ../../mod/content.php:719 ../../include/conversation.php:1059
-#: ../../object/Item.php:613
-msgid "Preview"
-msgstr "Vista prèvia"
-
-#: ../../mod/photos.php:1634 ../../mod/content.php:439
-#: ../../mod/content.php:741 ../../mod/settings.php:623
-#: ../../mod/group.php:171 ../../mod/admin.php:735
-#: ../../include/conversation.php:570 ../../object/Item.php:120
-msgid "Delete"
-msgstr "Esborrar"
-
-#: ../../mod/photos.php:1781
-msgid "View Album"
-msgstr "Veure Àlbum"
-
-#: ../../mod/photos.php:1790
-msgid "Recent Photos"
-msgstr "Fotos Recents"
-
-#: ../../mod/community.php:23
-msgid "Not available."
-msgstr "No disponible."
-
-#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
-#: ../../include/nav.php:128
-msgid "Community"
-msgstr "Comunitat"
-
-#: ../../mod/community.php:61 ../../mod/community.php:86
-#: ../../mod/search.php:162 ../../mod/search.php:188
-msgid "No results."
-msgstr "Sense resultats."
-
-#: ../../mod/friendica.php:55
-msgid "This is Friendica, version"
-msgstr "Això és Friendica, versió"
-
-#: ../../mod/friendica.php:56
-msgid "running at web location"
-msgstr "funcionant en la ubicació web"
-
-#: ../../mod/friendica.php:58
-msgid ""
-"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
-"more about the Friendica project."
-msgstr "Si us plau, visiteu <a href=\"http://friendica.com\">Friendica.com</a> per obtenir més informació sobre el projecte Friendica."
-
-#: ../../mod/friendica.php:60
-msgid "Bug reports and issues: please visit"
-msgstr "Pels informes d'error i problemes: si us plau, visiteu"
-
-#: ../../mod/friendica.php:61
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
-msgstr "Suggeriments, elogis, donacions, etc si us plau escrigui a \"Info\" en Friendica - dot com"
-
-#: ../../mod/friendica.php:75
-msgid "Installed plugins/addons/apps:"
-msgstr "plugins/addons/apps instal·lats:"
-
-#: ../../mod/friendica.php:88
-msgid "No installed plugins/addons/apps"
-msgstr "plugins/addons/apps no instal·lats"
-
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
-msgid "Item not found"
-msgstr "Element no trobat"
-
-#: ../../mod/editpost.php:39
-msgid "Edit post"
-msgstr "Editar Enviament"
-
-#: ../../mod/editpost.php:109 ../../mod/content.php:728
-#: ../../mod/settings.php:622 ../../object/Item.php:110
-msgid "Edit"
-msgstr "Editar"
-
-#: ../../mod/editpost.php:110 ../../mod/wallmessage.php:154
-#: ../../mod/message.php:332 ../../mod/message.php:562
-#: ../../include/conversation.php:1024
-msgid "Upload photo"
-msgstr "Carregar foto"
-
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1025
-msgid "upload photo"
-msgstr "carregar fotos"
-
-#: ../../mod/editpost.php:112 ../../include/conversation.php:1026
-msgid "Attach file"
-msgstr "Adjunta fitxer"
-
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1027
-msgid "attach file"
-msgstr "adjuntar arxiu"
-
-#: ../../mod/editpost.php:114 ../../mod/wallmessage.php:155
-#: ../../mod/message.php:333 ../../mod/message.php:563
-#: ../../include/conversation.php:1028
-msgid "Insert web link"
-msgstr "Inserir enllaç web"
-
-#: ../../mod/editpost.php:115 ../../include/conversation.php:1029
-msgid "web link"
-msgstr "enllaç de web"
-
-#: ../../mod/editpost.php:116 ../../include/conversation.php:1030
-msgid "Insert video link"
-msgstr "Insertar enllaç de video"
-
-#: ../../mod/editpost.php:117 ../../include/conversation.php:1031
-msgid "video link"
-msgstr "enllaç de video"
-
-#: ../../mod/editpost.php:118 ../../include/conversation.php:1032
-msgid "Insert audio link"
-msgstr "Insertar enllaç de audio"
-
-#: ../../mod/editpost.php:119 ../../include/conversation.php:1033
-msgid "audio link"
-msgstr "enllaç de audio"
-
-#: ../../mod/editpost.php:120 ../../include/conversation.php:1034
-msgid "Set your location"
-msgstr "Canvia la teva ubicació"
-
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1035
-msgid "set location"
-msgstr "establir la ubicació"
-
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1036
-msgid "Clear browser location"
-msgstr "neteja adreçes del navegador"
-
-#: ../../mod/editpost.php:123 ../../include/conversation.php:1037
-msgid "clear location"
-msgstr "netejar ubicació"
-
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1043
-msgid "Permission settings"
-msgstr "Configuració de permisos"
-
-#: ../../mod/editpost.php:133 ../../include/conversation.php:1052
-msgid "CC: email addresses"
-msgstr "CC: Adreça de correu"
-
-#: ../../mod/editpost.php:134 ../../include/conversation.php:1053
-msgid "Public post"
-msgstr "Enviament públic"
-
-#: ../../mod/editpost.php:137 ../../include/conversation.php:1039
-msgid "Set title"
-msgstr "Canviar títol"
-
-#: ../../mod/editpost.php:139 ../../include/conversation.php:1041
-msgid "Categories (comma-separated list)"
-msgstr "Categories (lista separada per comes)"
-
-#: ../../mod/editpost.php:140 ../../include/conversation.php:1055
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Exemple: bob@example.com, mary@example.com"
-
-#: ../../mod/dfrn_request.php:93
-msgid "This introduction has already been accepted."
-msgstr "Aquesta presentació ha estat acceptada."
-
-#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:513
-msgid "Profile location is not valid or does not contain profile information."
-msgstr "El perfil de situació no és vàlid o no contè informació de perfil"
-
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:518
-msgid "Warning: profile location has no identifiable owner name."
-msgstr "Atenció: El perfil de situació no te nom de propietari identificable."
-
-#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:520
-msgid "Warning: profile location has no profile photo."
-msgstr "Atenció: El perfil de situació no te foto de perfil"
-
-#: ../../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"
-msgstr[0] "%d el paràmetre requerit no es va trobar al lloc indicat"
-msgstr[1] "%d els paràmetres requerits no es van trobar allloc indicat"
-
-#: ../../mod/dfrn_request.php:170
-msgid "Introduction complete."
-msgstr "Completada la presentació."
-
-#: ../../mod/dfrn_request.php:209
-msgid "Unrecoverable protocol error."
-msgstr "Error de protocol irrecuperable."
-
-#: ../../mod/dfrn_request.php:237
-msgid "Profile unavailable."
-msgstr "Perfil no disponible"
-
-#: ../../mod/dfrn_request.php:262
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr "%s avui ha rebut excesives peticions de connexió. "
-
-#: ../../mod/dfrn_request.php:263
-msgid "Spam protection measures have been invoked."
-msgstr "Mesures de protecció contra spam han estat invocades."
-
-#: ../../mod/dfrn_request.php:264
-msgid "Friends are advised to please try again in 24 hours."
-msgstr "S'aconsellà els amics que probin pasades 24 hores."
-
-#: ../../mod/dfrn_request.php:326
-msgid "Invalid locator"
-msgstr "Localitzador no vàlid"
-
-#: ../../mod/dfrn_request.php:335
-msgid "Invalid email address."
-msgstr "Adreça de correu no vàlida."
-
-#: ../../mod/dfrn_request.php:362
-msgid "This account has not been configured for email. Request failed."
-msgstr "Aquest compte no s'ha configurat per al correu electrònic. Ha fallat la sol·licitud."
-
-#: ../../mod/dfrn_request.php:458
-msgid "Unable to resolve your name at the provided location."
-msgstr "Incapaç de resoldre el teu nom al lloc facilitat."
-
-#: ../../mod/dfrn_request.php:471
-msgid "You have already introduced yourself here."
-msgstr "Has fer la teva presentació aquí."
-
-#: ../../mod/dfrn_request.php:475
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr "Aparentment, ja tens amistat amb %s"
-
-#: ../../mod/dfrn_request.php:496
-msgid "Invalid profile URL."
-msgstr "Perfil URL no vàlid."
-
-#: ../../mod/dfrn_request.php:502 ../../include/follow.php:27
-msgid "Disallowed profile URL."
-msgstr "Perfil URL no permès."
-
-#: ../../mod/dfrn_request.php:571 ../../mod/contacts.php:124
-msgid "Failed to update contact record."
-msgstr "Error en actualitzar registre de contacte."
-
-#: ../../mod/dfrn_request.php:592
-msgid "Your introduction has been sent."
-msgstr "La teva presentació ha estat enviada."
-
-#: ../../mod/dfrn_request.php:645
-msgid "Please login to confirm introduction."
-msgstr "Si us plau, entri per confirmar la presentació."
-
-#: ../../mod/dfrn_request.php:659
-msgid ""
-"Incorrect identity currently logged in. Please login to "
-"<strong>this</strong> profile."
-msgstr "Sesió iniciada amb la identificació incorrecta. Entra en <strong>aquest</strong> perfil."
-
-#: ../../mod/dfrn_request.php:670
-msgid "Hide this contact"
-msgstr "Amaga aquest contacte"
-
-#: ../../mod/dfrn_request.php:673
-#, php-format
-msgid "Welcome home %s."
-msgstr "Benvingut de nou %s"
-
-#: ../../mod/dfrn_request.php:674
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr "Si us plau, confirmi la seva sol·licitud de Presentació/Amistat a %s."
-
-#: ../../mod/dfrn_request.php:675
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: ../../mod/dfrn_request.php:716 ../../include/items.php:3366
-msgid "[Name Withheld]"
-msgstr "[Nom Amagat]"
-
-#: ../../mod/dfrn_request.php:811
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
-msgstr "Si us plau, introdueixi la seva \"Adreça Identificativa\" d'una de les següents xarxes socials suportades:"
-
-#: ../../mod/dfrn_request.php:827
-msgid "<strike>Connect as an email follower</strike> (Coming soon)"
-msgstr "<strike>Connectar com un seguidor de correu</strike> (Disponible aviat)"
-
-#: ../../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 "Si encara no ets membre de la web social lliure, <a href=\"http://dir.friendica.com/siteinfo\">segueix aquest enllaç per a trobar un lloc Friendica públic i uneix-te  avui</a>."
-
-#: ../../mod/dfrn_request.php:832
-msgid "Friend/Connection Request"
-msgstr "Sol·licitud d'Amistat"
-
-#: ../../mod/dfrn_request.php:833
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
-msgstr "Exemples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
-
-#: ../../mod/dfrn_request.php:834
-msgid "Please answer the following:"
-msgstr "Si us plau, contesti les següents preguntes:"
-
-#: ../../mod/dfrn_request.php:835
-#, php-format
-msgid "Does %s know you?"
-msgstr "%s et coneix?"
-
-#: ../../mod/dfrn_request.php:838
-msgid "Add a personal note:"
-msgstr "Afegir una nota personal:"
-
-#: ../../mod/dfrn_request.php:840 ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../mod/dfrn_request.php:841
-msgid "StatusNet/Federated Social Web"
-msgstr "Web Social StatusNet/Federated "
-
-#: ../../mod/dfrn_request.php:842 ../../mod/settings.php:681
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../mod/dfrn_request.php:843
-#, php-format
-msgid ""
-" - please do not use this form.  Instead, enter %s into your Diaspora search"
-" bar."
-msgstr " - per favor no utilitzi aquest formulari.  Al contrari, entra %s en la barra de cerques de Diaspora."
-
-#: ../../mod/dfrn_request.php:844
-msgid "Your Identity Address:"
-msgstr "La Teva Adreça Identificativa:"
-
-#: ../../mod/dfrn_request.php:847
-msgid "Submit Request"
-msgstr "Sol·licitud Enviada"
-
-#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:167
-msgid "Account settings"
-msgstr "Configuració del compte"
-
-#: ../../mod/uexport.php:14 ../../mod/settings.php:40
-msgid "Display settings"
-msgstr "Ajustos de pantalla"
-
-#: ../../mod/uexport.php:20 ../../mod/settings.php:46
-msgid "Connector settings"
-msgstr "Configuració dels connectors"
-
-#: ../../mod/uexport.php:25 ../../mod/settings.php:51
-msgid "Plugin settings"
-msgstr "Configuració del plugin"
-
-#: ../../mod/uexport.php:30 ../../mod/settings.php:56
-msgid "Connected apps"
-msgstr "App connectada"
-
-#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:61
-msgid "Export personal data"
-msgstr "Exportar dades personals"
-
-#: ../../mod/uexport.php:40 ../../mod/settings.php:66
-msgid "Remove account"
-msgstr "Esborrar compte"
-
-#: ../../mod/uexport.php:48 ../../mod/settings.php:74
-#: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1033
-#: ../../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:167
-#: ../../addon.old/dav/friendica/layout.fnk.php:225
-#: ../../addon.old/mathjax/mathjax.php:36
-msgid "Settings"
-msgstr "Ajustos"
-
-#: ../../mod/uexport.php:72
-msgid "Export account"
-msgstr ""
-
-#: ../../mod/uexport.php:72
-msgid ""
-"Export your account info and contacts. Use this to make a backup of your "
-"account and/or to move it to another server."
-msgstr ""
-
-#: ../../mod/uexport.php:73
-msgid "Export all"
-msgstr ""
-
-#: ../../mod/uexport.php:73
-msgid ""
-"Export your accout info, contacts and all your items as json. Could be a "
-"very big file, and could take a lot of time. Use this to make a full backup "
-"of your account (photos are not exported)"
-msgstr ""
-
-#: ../../mod/install.php:117
-msgid "Friendica Social Communications Server - Setup"
-msgstr "Friendica Social Communications Server - Ajustos"
-
-#: ../../mod/install.php:123
-msgid "Could not connect to database."
-msgstr "No puc connectar a la base de dades."
-
-#: ../../mod/install.php:127
-msgid "Could not create table."
-msgstr "No puc creat taula."
-
-#: ../../mod/install.php:133
-msgid "Your Friendica site database has been installed."
-msgstr "La base de dades del teu lloc Friendica ha estat instal·lada."
-
-#: ../../mod/install.php:138
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "Pot ser que hagi d'importar l'arxiu \"database.sql\" manualment amb phpmyadmin o mysql."
-
-#: ../../mod/install.php:139 ../../mod/install.php:206
-#: ../../mod/install.php:506
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Per favor, consulti l'arxiu \"INSTALL.txt\"."
-
-#: ../../mod/install.php:203
-msgid "System check"
-msgstr "Comprovació del Sistema"
-
-#: ../../mod/install.php:208
-msgid "Check again"
-msgstr "Comprovi de nou"
-
-#: ../../mod/install.php:227
-msgid "Database connection"
-msgstr "Conexió a la base de dades"
-
-#: ../../mod/install.php:228
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
-msgstr "Per a instal·lar Friendica necessitem conèixer com connectar amb la deva base de dades."
-
-#: ../../mod/install.php:229
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Per favor, posi's en contacte amb el seu proveïdor de hosting o administrador del lloc si té alguna pregunta sobre aquestes opcions."
-
-#: ../../mod/install.php:230
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "La base de dades que especifiques ja hauria d'existir. Si no és així, crea-la abans de continuar."
-
-#: ../../mod/install.php:234
-msgid "Database Server Name"
-msgstr "Nom del Servidor de base de Dades"
-
-#: ../../mod/install.php:235
-msgid "Database Login Name"
-msgstr "Nom d'Usuari de la base de Dades"
-
-#: ../../mod/install.php:236
-msgid "Database Login Password"
-msgstr "Contrasenya d'Usuari de la base de Dades"
-
-#: ../../mod/install.php:237
-msgid "Database Name"
-msgstr "Nom de la base de Dades"
-
-#: ../../mod/install.php:238 ../../mod/install.php:277
-msgid "Site administrator email address"
-msgstr "Adreça de correu del administrador del lloc"
-
-#: ../../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 "El seu compte d'adreça electrònica ha de coincidir per tal d'utilitzar el panell d'administració web."
-
-#: ../../mod/install.php:242 ../../mod/install.php:280
-msgid "Please select a default timezone for your website"
-msgstr "Per favor, seleccioni una zona horària per defecte per al seu lloc web"
-
-#: ../../mod/install.php:267
-msgid "Site settings"
-msgstr "Configuracions del lloc"
-
-#: ../../mod/install.php:320
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "No es va poder trobar una versió de línia de comandos de PHP en la ruta del servidor web."
-
-#: ../../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 "Si no tens una versió de línia de comandos instal·lada al teu servidor PHP, no podràs fer córrer els sondejos via cron. Mira <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"
-
-#: ../../mod/install.php:325
-msgid "PHP executable path"
-msgstr "Direcció del executable PHP"
-
-#: ../../mod/install.php:325
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Entra la ruta sencera fins l'executable de php. Pots deixar això buit  per continuar l'instal·lació."
-
-#: ../../mod/install.php:330
-msgid "Command line PHP"
-msgstr "Linia de comandos PHP"
-
-#: ../../mod/install.php:339
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "La versió de línia de comandos de PHP en el seu sistema no té \"register_argc_argv\" habilitat."
-
-#: ../../mod/install.php:340
-msgid "This is required for message delivery to work."
-msgstr "Això és necessari perquè funcioni el lliurament de missatges."
-
-#: ../../mod/install.php:342
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
-
-#: ../../mod/install.php:363
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Error: la funció \"openssl_pkey_new\" en aquest sistema no és capaç de generar claus de xifrat"
-
-#: ../../mod/install.php:364
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Si s'executa en Windows, per favor consulti la secció \"http://www.php.net/manual/en/openssl.installation.php\"."
-
-#: ../../mod/install.php:366
-msgid "Generate encryption keys"
-msgstr "Generar claus d'encripció"
-
-#: ../../mod/install.php:373
-msgid "libCurl PHP module"
-msgstr "Mòdul libCurl de PHP"
-
-#: ../../mod/install.php:374
-msgid "GD graphics PHP module"
-msgstr "Mòdul GD de gràfics de PHP"
-
-#: ../../mod/install.php:375
-msgid "OpenSSL PHP module"
-msgstr "Mòdul OpenSSl de PHP"
-
-#: ../../mod/install.php:376
-msgid "mysqli PHP module"
-msgstr "Mòdul mysqli de PHP"
-
-#: ../../mod/install.php:377
-msgid "mb_string PHP module"
-msgstr "Mòdul mb_string de PHP"
-
-#: ../../mod/install.php:382 ../../mod/install.php:384
-msgid "Apache mod_rewrite module"
-msgstr "Apache mod_rewrite modul "
-
-#: ../../mod/install.php:382
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Error: el mòdul mod-rewrite del servidor web Apache és necessari però no està instal·lat."
-
-#: ../../mod/install.php:390
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Error: El mòdul libCURL de PHP és necessari però no està instal·lat."
-
-#: ../../mod/install.php:394
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Error: el mòdul gràfic GD de PHP amb support per JPEG és necessari però no està instal·lat."
-
-#: ../../mod/install.php:398
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Error: El mòdul enssl de PHP és necessari però no està instal·lat."
-
-#: ../../mod/install.php:402
-msgid "Error: mysqli PHP module required but not installed."
-msgstr "Error: El mòdul mysqli de PHP és necessari però no està instal·lat."
-
-#: ../../mod/install.php:406
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Error: mòdul mb_string de PHP requerit però no instal·lat."
-
-#: ../../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 "L'instal·lador web necessita crear un arxiu anomenat \".htconfig.php\" en la carpeta superior del seu servidor web però alguna cosa ho va impedir."
-
-#: ../../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 "Això freqüentment és a causa d'una configuració de permisos; el servidor web no pot escriure arxius en la carpeta - encara que sigui possible."
-
-#: ../../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 "Al final d'aquest procediment, et facilitarem un text que hauràs de guardar en un arxiu que s'anomena .htconfig.php que hi es a la carpeta principal del teu Friendica."
-
-#: ../../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 "Alternativament, pots saltar-te aquest procediment i configurar-ho manualment. Per favor, mira l'arxiu \"INTALL.txt\" per a instruccions."
-
-#: ../../mod/install.php:429
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php és escribible"
-
-#: ../../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 ""
-
-#: ../../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 "URL rewrite en .htaccess no esta treballant. Comprova la configuració del teu servidor."
-
-#: ../../mod/install.php:459
-msgid "Url rewrite is working"
-msgstr "URL rewrite està treballant"
-
-#: ../../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 "L'arxiu per a la configuració de la base de dades \".htconfig.php\" no es pot escriure. Per favor, usi el text adjunt per crear un arxiu de configuració en l'arrel del servidor web."
-
-#: ../../mod/install.php:493
-msgid "Errors encountered creating database tables."
-msgstr "Trobats errors durant la creació de les taules de la base de dades."
-
-#: ../../mod/install.php:504
-msgid "<h1>What next</h1>"
-msgstr "<h1>Que es següent</h1>"
-
-#: ../../mod/install.php:505
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "IMPORTANT: necessitarà configurar [manualment] el programar una tasca pel sondejador (poller.php)"
-
-#: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:393
-msgid "l F d, Y \\@ g:i A"
-msgstr "l F d, Y \\@ g:i A"
-
-#: ../../mod/localtime.php:24
-msgid "Time Conversion"
-msgstr "Temps de Conversió"
-
-#: ../../mod/localtime.php:26
-msgid ""
-"Friendica provides this service for sharing events with other networks and "
-"friends in unknown timezones."
-msgstr ""
-
-#: ../../mod/localtime.php:30
-#, php-format
-msgid "UTC time: %s"
-msgstr "hora UTC: %s"
-
-#: ../../mod/localtime.php:33
-#, php-format
-msgid "Current timezone: %s"
-msgstr "Zona horària actual: %s"
-
-#: ../../mod/localtime.php:36
-#, php-format
-msgid "Converted localtime: %s"
-msgstr "Conversión de hora local: %s"
-
-#: ../../mod/localtime.php:41
-msgid "Please select your timezone:"
-msgstr "Si us plau, seleccioneu la vostra zona horària:"
-
-#: ../../mod/poke.php:192
-msgid "Poke/Prod"
-msgstr "Atia/Punxa"
-
-#: ../../mod/poke.php:193
-msgid "poke, prod or do other things to somebody"
-msgstr "Atiar, punxar o fer altres coses a algú"
-
-#: ../../mod/poke.php:194
-msgid "Recipient"
-msgstr "Recipient"
-
-#: ../../mod/poke.php:195
-msgid "Choose what you wish to do to recipient"
-msgstr "Tria que vols fer amb el contenidor"
-
-#: ../../mod/poke.php:198
-msgid "Make this post private"
-msgstr "Fes aquest missatge privat"
-
-#: ../../mod/match.php:12
-msgid "Profile Match"
-msgstr "Perfil Aconseguit"
-
-#: ../../mod/match.php:20
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "No hi ha paraules clau que coincideixin. Si us plau, afegeixi paraules clau al teu perfil predeterminat."
-
-#: ../../mod/match.php:57
-msgid "is interested in:"
-msgstr "està interessat en:"
-
-#: ../../mod/match.php:58 ../../mod/suggest.php:88
-#: ../../include/contact_widgets.php:9 ../../boot.php:1317
-msgid "Connect"
-msgstr "Connexió"
-
-#: ../../mod/match.php:65 ../../mod/dirfind.php:60
-msgid "No matches"
-msgstr "No hi ha coincidències"
-
-#: ../../mod/lockview.php:31 ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
-msgstr "Informació de privacitat remota no disponible."
-
-#: ../../mod/lockview.php:48
-#: ../../addon/remote_permissions/remote_permissions.php:124
-msgid "Visible to:"
-msgstr "Visible per a:"
-
-#: ../../mod/content.php:119 ../../mod/network.php:596
-msgid "No such group"
-msgstr "Cap grup com"
-
-#: ../../mod/content.php:130 ../../mod/network.php:607
-msgid "Group is empty"
-msgstr "El Grup es buit"
-
-#: ../../mod/content.php:134 ../../mod/network.php:611
-msgid "Group: "
-msgstr "Grup:"
-
-#: ../../mod/content.php:438 ../../mod/content.php:740
-#: ../../include/conversation.php:569 ../../object/Item.php:119
-msgid "Select"
-msgstr "Selecionar"
-
-#: ../../mod/content.php:472 ../../mod/content.php:852
-#: ../../mod/content.php:853 ../../include/conversation.php:609
-#: ../../object/Item.php:258 ../../object/Item.php:259
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Veure perfil de %s @ %s"
-
-#: ../../mod/content.php:482 ../../mod/content.php:864
-#: ../../include/conversation.php:629 ../../object/Item.php:272
-#, php-format
-msgid "%s from %s"
-msgstr "%s des de %s"
-
-#: ../../mod/content.php:497 ../../include/conversation.php:644
-msgid "View in context"
-msgstr "Veure en context"
-
-#: ../../mod/content.php:603 ../../object/Item.php:313
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d comentari"
-msgstr[1] "%d comentaris"
-
-#: ../../mod/content.php:605 ../../include/text.php:1514
-#: ../../object/Item.php:315 ../../object/Item.php:328
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] "comentari"
-
-#: ../../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: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 "Mostrar més"
-
-#: ../../mod/content.php:684 ../../object/Item.php:204
-msgid "like"
-msgstr "Agrada"
-
-#: ../../mod/content.php:685 ../../object/Item.php:205
-msgid "dislike"
-msgstr "Desagrada"
-
-#: ../../mod/content.php:687 ../../object/Item.php:207
-msgid "Share this"
-msgstr "Compartir això"
-
-#: ../../mod/content.php:687 ../../object/Item.php:207
-msgid "share"
-msgstr "Compartir"
-
-#: ../../mod/content.php:711 ../../object/Item.php:605
-msgid "Bold"
-msgstr "Negreta"
-
-#: ../../mod/content.php:712 ../../object/Item.php:606
-msgid "Italic"
-msgstr "Itallica"
-
-#: ../../mod/content.php:713 ../../object/Item.php:607
-msgid "Underline"
-msgstr "Subratllat"
-
-#: ../../mod/content.php:714 ../../object/Item.php:608
-msgid "Quote"
-msgstr "Cometes"
-
-#: ../../mod/content.php:715 ../../object/Item.php:609
-msgid "Code"
-msgstr "Codi"
-
-#: ../../mod/content.php:716 ../../object/Item.php:610
-msgid "Image"
-msgstr "Imatge"
-
-#: ../../mod/content.php:717 ../../object/Item.php:611
-msgid "Link"
-msgstr "Enllaç"
-
-#: ../../mod/content.php:718 ../../object/Item.php:612
-msgid "Video"
-msgstr "Video"
-
-#: ../../mod/content.php:753 ../../object/Item.php:183
-msgid "add star"
-msgstr "Afegir a favorits"
-
-#: ../../mod/content.php:754 ../../object/Item.php:184
-msgid "remove star"
-msgstr "Esborrar favorit"
-
-#: ../../mod/content.php:755 ../../object/Item.php:185
-msgid "toggle star status"
-msgstr "Canviar estatus de favorit"
-
-#: ../../mod/content.php:758 ../../object/Item.php:188
-msgid "starred"
-msgstr "favorit"
-
-#: ../../mod/content.php:759 ../../object/Item.php:193
-msgid "add tag"
-msgstr "afegir etiqueta"
-
-#: ../../mod/content.php:763 ../../object/Item.php:123
-msgid "save to folder"
-msgstr "guardat a la carpeta"
-
-#: ../../mod/content.php:854 ../../object/Item.php:260
-msgid "to"
-msgstr "a"
-
-#: ../../mod/content.php:855 ../../object/Item.php:262
-msgid "Wall-to-Wall"
-msgstr "Mur-a-Mur"
-
-#: ../../mod/content.php:856 ../../object/Item.php:263
-msgid "via Wall-To-Wall:"
-msgstr "via Mur-a-Mur"
-
-#: ../../mod/home.php:34 ../../addon/communityhome/communityhome.php:189
-#: ../../addon.old/communityhome/communityhome.php:179
-#, php-format
-msgid "Welcome to %s"
-msgstr "Benvingut a %s"
-
-#: ../../mod/notifications.php:26
-msgid "Invalid request identifier."
-msgstr "Sol·licitud d'identificació no vàlida."
-
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
-#: ../../mod/notifications.php:211
-msgid "Discard"
-msgstr "Descartar"
-
-#: ../../mod/notifications.php:51 ../../mod/notifications.php:164
-#: ../../mod/notifications.php:210 ../../mod/contacts.php:359
-#: ../../mod/contacts.php:413
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: ../../mod/notifications.php:78
-msgid "System"
-msgstr "Sistema"
-
-#: ../../mod/notifications.php:83 ../../include/nav.php:140
-msgid "Network"
-msgstr "Xarxa"
-
-#: ../../mod/notifications.php:88 ../../mod/network.php:444
-msgid "Personal"
-msgstr "Personal"
-
-#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
-#: ../../include/nav.php:104 ../../include/nav.php:143
-msgid "Home"
-msgstr "Inici"
-
-#: ../../mod/notifications.php:98 ../../include/nav.php:149
-msgid "Introductions"
-msgstr "Presentacions"
-
-#: ../../mod/notifications.php:103 ../../mod/message.php:182
-#: ../../include/nav.php:156
-msgid "Messages"
-msgstr "Missatges"
-
-#: ../../mod/notifications.php:122
-msgid "Show Ignored Requests"
-msgstr "Mostra les Sol·licituds Ignorades"
-
-#: ../../mod/notifications.php:122
-msgid "Hide Ignored Requests"
-msgstr "Amaga les Sol·licituds Ignorades"
-
-#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
-msgid "Notification type: "
-msgstr "Tipus de Notificació:"
-
-#: ../../mod/notifications.php:150
-msgid "Friend Suggestion"
-msgstr "Amics Suggerits "
-
-#: ../../mod/notifications.php:152
-#, php-format
-msgid "suggested by %s"
-msgstr "sugerit per %s"
-
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/contacts.php:419
-msgid "Hide this contact from others"
-msgstr "Amaga aquest contacte dels altres"
-
-#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
-msgid "Post a new friend activity"
-msgstr "Publica una activitat  d'amic nova"
-
-#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
-msgid "if applicable"
-msgstr "si es pot aplicar"
-
-#: ../../mod/notifications.php:161 ../../mod/notifications.php:208
-#: ../../mod/admin.php:733
-msgid "Approve"
-msgstr "Aprovar"
-
-#: ../../mod/notifications.php:181
-msgid "Claims to be known to you: "
-msgstr "Diu que et coneix:"
-
-#: ../../mod/notifications.php:181
-msgid "yes"
-msgstr "sí"
-
-#: ../../mod/notifications.php:181
-msgid "no"
-msgstr "no"
-
-#: ../../mod/notifications.php:188
-msgid "Approve as: "
-msgstr "Aprovat com:"
-
-#: ../../mod/notifications.php:189
-msgid "Friend"
-msgstr "Amic"
-
-#: ../../mod/notifications.php:190
-msgid "Sharer"
-msgstr "Partícip"
-
-#: ../../mod/notifications.php:190
-msgid "Fan/Admirer"
-msgstr "Fan/Admirador"
-
-#: ../../mod/notifications.php:196
-msgid "Friend/Connect Request"
-msgstr "Sol·licitud d'Amistat/Connexió"
-
-#: ../../mod/notifications.php:196
-msgid "New Follower"
-msgstr "Nou Seguidor"
-
-#: ../../mod/notifications.php:217
-msgid "No introductions."
-msgstr "Sense presentacions."
-
-#: ../../mod/notifications.php:220 ../../include/nav.php:150
-msgid "Notifications"
-msgstr "Notificacions"
-
-#: ../../mod/notifications.php:257 ../../mod/notifications.php:382
-#: ../../mod/notifications.php:469
-#, php-format
-msgid "%s liked %s's post"
-msgstr "A %s li agrada l'enviament de %s"
-
-#: ../../mod/notifications.php:266 ../../mod/notifications.php:391
-#: ../../mod/notifications.php:478
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "A %s no li agrada l'enviament de %s"
-
-#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
-#: ../../mod/notifications.php:492
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s es ara amic de %s"
-
-#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
-#, php-format
-msgid "%s created a new post"
-msgstr "%s ha creat un enviament nou"
-
-#: ../../mod/notifications.php:288 ../../mod/notifications.php:413
-#: ../../mod/notifications.php:501
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s va comentar en l'enviament de %s"
-
-#: ../../mod/notifications.php:302
-msgid "No more network notifications."
-msgstr "No més notificacions de xarxa."
-
-#: ../../mod/notifications.php:306
-msgid "Network Notifications"
-msgstr "Notificacions de la Xarxa"
-
-#: ../../mod/notifications.php:332 ../../mod/notify.php:61
-msgid "No more system notifications."
-msgstr "No més notificacions del sistema."
-
-#: ../../mod/notifications.php:336 ../../mod/notify.php:65
-msgid "System Notifications"
-msgstr "Notificacions del Sistema"
-
-#: ../../mod/notifications.php:427
-msgid "No more personal notifications."
-msgstr "No més notificacions personals."
-
-#: ../../mod/notifications.php:431
-msgid "Personal Notifications"
-msgstr "Notificacions Personals"
-
-#: ../../mod/notifications.php:508
-msgid "No more home notifications."
-msgstr "No més notificacions d'inici."
-
-#: ../../mod/notifications.php:512
-msgid "Home Notifications"
-msgstr "Notificacions d'Inici"
-
-#: ../../mod/contacts.php:85 ../../mod/contacts.php:165
-msgid "Could not access contact record."
-msgstr "No puc accedir al registre del contacte."
-
-#: ../../mod/contacts.php:99
-msgid "Could not locate selected profile."
-msgstr "No puc localitzar el perfil seleccionat."
-
-#: ../../mod/contacts.php:122
-msgid "Contact updated."
-msgstr "Contacte actualitzat."
-
-#: ../../mod/contacts.php:187
-msgid "Contact has been blocked"
-msgstr "Elcontacte ha estat bloquejat"
-
-#: ../../mod/contacts.php:187
-msgid "Contact has been unblocked"
-msgstr "El contacte ha estat desbloquejat"
-
-#: ../../mod/contacts.php:201
-msgid "Contact has been ignored"
-msgstr "El contacte ha estat ignorat"
-
-#: ../../mod/contacts.php:201
-msgid "Contact has been unignored"
-msgstr "El contacte ha estat recordat"
-
-#: ../../mod/contacts.php:220
-msgid "Contact has been archived"
-msgstr "El contacte ha estat arxivat"
-
-#: ../../mod/contacts.php:220
-msgid "Contact has been unarchived"
-msgstr "El contacte ha estat desarxivat"
-
-#: ../../mod/contacts.php:244
-msgid "Do you really want to delete this contact?"
-msgstr ""
-
-#: ../../mod/contacts.php:263
-msgid "Contact has been removed."
-msgstr "El contacte ha estat tret"
-
-#: ../../mod/contacts.php:301
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr "Ara te una amistat mutua amb %s"
-
-#: ../../mod/contacts.php:305
-#, php-format
-msgid "You are sharing with %s"
-msgstr "Estas compartint amb %s"
-
-#: ../../mod/contacts.php:310
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s esta compartint amb tú"
-
-#: ../../mod/contacts.php:327
-msgid "Private communications are not available for this contact."
-msgstr "Comunicacions privades no disponibles per aquest contacte."
-
-#: ../../mod/contacts.php:330
-msgid "Never"
-msgstr "Mai"
-
-#: ../../mod/contacts.php:334
-msgid "(Update was successful)"
-msgstr "(L'actualització fou exitosa)"
-
-#: ../../mod/contacts.php:334
-msgid "(Update was not successful)"
-msgstr "(L'actualització fracassà)"
-
-#: ../../mod/contacts.php:336
-msgid "Suggest friends"
-msgstr "Suggerir amics"
-
-#: ../../mod/contacts.php:340
-#, php-format
-msgid "Network type: %s"
-msgstr "Xarxa tipus: %s"
-
-#: ../../mod/contacts.php:343 ../../include/contact_widgets.php:199
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] "%d contacte en comú"
-msgstr[1] "%d contactes en comú"
-
-#: ../../mod/contacts.php:348
-msgid "View all contacts"
-msgstr "Veure tots els contactes"
-
-#: ../../mod/contacts.php:353 ../../mod/contacts.php:412
-#: ../../mod/admin.php:737
-msgid "Unblock"
-msgstr "Desbloquejar"
-
-#: ../../mod/contacts.php:353 ../../mod/contacts.php:412
-#: ../../mod/admin.php:736
-msgid "Block"
-msgstr "Bloquejar"
-
-#: ../../mod/contacts.php:356
-msgid "Toggle Blocked status"
-msgstr "Canvi de estatus blocat"
-
-#: ../../mod/contacts.php:359 ../../mod/contacts.php:413
-msgid "Unignore"
-msgstr "Treure d'Ignorats"
-
-#: ../../mod/contacts.php:362
-msgid "Toggle Ignored status"
-msgstr "Canvi de estatus ignorat"
-
-#: ../../mod/contacts.php:366
-msgid "Unarchive"
-msgstr "Desarxivat"
-
-#: ../../mod/contacts.php:366
-msgid "Archive"
-msgstr "Arxivat"
-
-#: ../../mod/contacts.php:369
-msgid "Toggle Archive status"
-msgstr "Canvi de estatus del arxiu"
-
-#: ../../mod/contacts.php:372
-msgid "Repair"
-msgstr "Reparar"
-
-#: ../../mod/contacts.php:375
-msgid "Advanced Contact Settings"
-msgstr "Ajustos Avançats per als Contactes"
-
-#: ../../mod/contacts.php:381
-msgid "Communications lost with this contact!"
-msgstr "La comunicació amb aquest contacte s'ha perdut!"
-
-#: ../../mod/contacts.php:384
-msgid "Contact Editor"
-msgstr "Editor de Contactes"
-
-#: ../../mod/contacts.php:387
-msgid "Profile Visibility"
-msgstr "Perfil de Visibilitat"
-
-#: ../../mod/contacts.php:388
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Si us plau triï el perfil que voleu mostrar a %s quan estigui veient el teu de forma segura."
-
-#: ../../mod/contacts.php:389
-msgid "Contact Information / Notes"
-msgstr "Informació/Notes del contacte"
-
-#: ../../mod/contacts.php:390
-msgid "Edit contact notes"
-msgstr "Editar notes de contactes"
-
-#: ../../mod/contacts.php:395 ../../mod/contacts.php:585
-#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "Visitar perfil de %s [%s]"
-
-#: ../../mod/contacts.php:396
-msgid "Block/Unblock contact"
-msgstr "Bloquejar/Alliberar contacte"
-
-#: ../../mod/contacts.php:397
-msgid "Ignore contact"
-msgstr "Ignore contacte"
-
-#: ../../mod/contacts.php:398
-msgid "Repair URL settings"
-msgstr "Restablir configuració de URL"
-
-#: ../../mod/contacts.php:399
-msgid "View conversations"
-msgstr "Veient conversacions"
-
-#: ../../mod/contacts.php:401
-msgid "Delete contact"
-msgstr "Esborrar contacte"
-
-#: ../../mod/contacts.php:405
-msgid "Last update:"
-msgstr "Última actualització:"
-
-#: ../../mod/contacts.php:407
-msgid "Update public posts"
-msgstr "Actualitzar enviament públic"
-
-#: ../../mod/contacts.php:409 ../../mod/admin.php:1213
-msgid "Update now"
-msgstr "Actualitza ara"
-
-#: ../../mod/contacts.php:416
-msgid "Currently blocked"
-msgstr "Bloquejat actualment"
-
-#: ../../mod/contacts.php:417
-msgid "Currently ignored"
-msgstr "Ignorat actualment"
-
-#: ../../mod/contacts.php:418
-msgid "Currently archived"
-msgstr "Actualment arxivat"
-
-#: ../../mod/contacts.php:419
-msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
-msgstr "Répliques/agraiments per als teus missatges públics <strong>poden</strong> romandre visibles"
-
-#: ../../mod/contacts.php:470
-msgid "Suggestions"
-msgstr "Suggeriments"
-
-#: ../../mod/contacts.php:473
-msgid "Suggest potential friends"
-msgstr "Suggerir amics potencials"
-
-#: ../../mod/contacts.php:476 ../../mod/group.php:194
-msgid "All Contacts"
-msgstr "Tots els Contactes"
-
-#: ../../mod/contacts.php:479
-msgid "Show all contacts"
-msgstr "Mostrar tots els contactes"
-
-#: ../../mod/contacts.php:482
-msgid "Unblocked"
-msgstr "Desblocat"
-
-#: ../../mod/contacts.php:485
-msgid "Only show unblocked contacts"
-msgstr "Mostrar únicament els contactes no blocats"
-
-#: ../../mod/contacts.php:489
-msgid "Blocked"
-msgstr "Blocat"
-
-#: ../../mod/contacts.php:492
-msgid "Only show blocked contacts"
-msgstr "Mostrar únicament els contactes blocats"
-
-#: ../../mod/contacts.php:496
-msgid "Ignored"
-msgstr "Ignorat"
-
-#: ../../mod/contacts.php:499
-msgid "Only show ignored contacts"
-msgstr "Mostrar únicament els contactes ignorats"
-
-#: ../../mod/contacts.php:503
-msgid "Archived"
-msgstr "Arxivat"
-
-#: ../../mod/contacts.php:506
-msgid "Only show archived contacts"
-msgstr "Mostrar únicament els contactes arxivats"
-
-#: ../../mod/contacts.php:510
-msgid "Hidden"
-msgstr "Amagat"
-
-#: ../../mod/contacts.php:513
-msgid "Only show hidden contacts"
-msgstr "Mostrar únicament els contactes amagats"
-
-#: ../../mod/contacts.php:561
-msgid "Mutual Friendship"
-msgstr "Amistat Mutua"
-
-#: ../../mod/contacts.php:565
-msgid "is a fan of yours"
-msgstr "Es un fan teu"
-
-#: ../../mod/contacts.php:569
-msgid "you are a fan of"
-msgstr "ets fan de"
-
-#: ../../mod/contacts.php:586 ../../mod/nogroup.php:41
-msgid "Edit contact"
-msgstr "Editar contacte"
-
-#: ../../mod/contacts.php:607 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:171
-msgid "Contacts"
-msgstr "Contactes"
-
-#: ../../mod/contacts.php:611
-msgid "Search your contacts"
-msgstr "Cercant el seus contactes"
-
-#: ../../mod/contacts.php:612 ../../mod/directory.php:59
-#: ../../addon/forumdirectory/forumdirectory.php:81
-msgid "Finding: "
-msgstr "Cercant:"
-
-#: ../../mod/contacts.php:613 ../../mod/directory.php:61
-#: ../../addon/forumdirectory/forumdirectory.php:83
-#: ../../include/contact_widgets.php:33
-msgid "Find"
-msgstr "Cercar"
-
-#: ../../mod/lostpass.php:17
-msgid "No valid account found."
-msgstr "compte no vàlid trobat."
-
-#: ../../mod/lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr "Sol·licitut de restabliment de contrasenya enviat. Comprovi el seu correu."
-
-#: ../../mod/lostpass.php:44
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Contrasenya restablerta enviada a %s"
-
-#: ../../mod/lostpass.php:66
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "La sol·licitut no pot ser verificada. (Hauries de presentar-la abans). Restabliment de contrasenya fracassat."
-
-#: ../../mod/lostpass.php:84 ../../boot.php:1051
-msgid "Password Reset"
-msgstr "Restabliment de Contrasenya"
-
-#: ../../mod/lostpass.php:85
-msgid "Your password has been reset as requested."
-msgstr "La teva contrasenya fou restablerta com vas demanar."
-
-#: ../../mod/lostpass.php:86
-msgid "Your new password is"
-msgstr "La teva nova contrasenya es"
-
-#: ../../mod/lostpass.php:87
-msgid "Save or copy your new password - and then"
-msgstr "Guarda o copia la nova contrasenya - i llavors"
-
-#: ../../mod/lostpass.php:88
-msgid "click here to login"
-msgstr "clica aquí per identificarte"
-
-#: ../../mod/lostpass.php:89
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Pots camviar la contrasenya des de la pàgina de <em>Configuración</em> desprès d'accedir amb èxit."
-
-#: ../../mod/lostpass.php:107
-#, php-format
-msgid "Your password has been changed at %s"
-msgstr ""
-
-#: ../../mod/lostpass.php:122
-msgid "Forgot your Password?"
-msgstr "Has Oblidat la Contrasenya?"
-
-#: ../../mod/lostpass.php:123
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Introdueixi la seva adreça de correu i enivii-la per restablir la seva contrasenya. Llavors comprovi el seu correu per a les següents instruccións. "
-
-#: ../../mod/lostpass.php:124
-msgid "Nickname or Email: "
-msgstr "Àlies o Correu:"
-
-#: ../../mod/lostpass.php:125
-msgid "Reset"
-msgstr "Restablir"
-
-#: ../../mod/settings.php:35
-msgid "Additional features"
-msgstr ""
-
-#: ../../mod/settings.php:118
-msgid "Missing some important data!"
-msgstr "Perdudes algunes dades importants!"
-
-#: ../../mod/settings.php:121 ../../mod/settings.php:586
-msgid "Update"
-msgstr "Actualitzar"
-
-#: ../../mod/settings.php:227
-msgid "Failed to connect with email account using the settings provided."
-msgstr "Connexió fracassada amb el compte de correu emprant la configuració proveïda."
-
-#: ../../mod/settings.php:232
-msgid "Email settings updated."
-msgstr "Configuració del correu electrònic actualitzada."
-
-#: ../../mod/settings.php:247
-msgid "Features updated"
-msgstr ""
-
-#: ../../mod/settings.php:307
-msgid "Passwords do not match. Password unchanged."
-msgstr "Les contrasenyes no coincideixen. Contrasenya no canviada."
-
-#: ../../mod/settings.php:312
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "No es permeten contasenyes buides. Contrasenya no canviada"
-
-#: ../../mod/settings.php:323
-msgid "Password changed."
-msgstr "Contrasenya canviada."
-
-#: ../../mod/settings.php:325
-msgid "Password update failed. Please try again."
-msgstr "Ha fallat l'actualització de la Contrasenya. Per favor, intenti-ho de nou."
-
-#: ../../mod/settings.php:390
-msgid " Please use a shorter name."
-msgstr "Si us plau, faci servir un nom més curt."
-
-#: ../../mod/settings.php:392
-msgid " Name too short."
-msgstr "Nom massa curt."
-
-#: ../../mod/settings.php:398
-msgid " Not valid email."
-msgstr "Correu no vàlid."
-
-#: ../../mod/settings.php:400
-msgid " Cannot change to that email."
-msgstr "No puc canviar a aquest correu."
-
-#: ../../mod/settings.php:454
-msgid "Private forum has no privacy permissions. Using default privacy group."
-msgstr "Els Fòrums privats no tenen permisos de privacitat. Empra la privacitat de grup per defecte."
-
-#: ../../mod/settings.php:458
-msgid "Private forum has no privacy permissions and no default privacy group."
-msgstr "Els Fòrums privats no tenen permisos de privacitat i tampoc privacitat per defecte de grup."
-
-#: ../../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:104
-#: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:550
-#: ../../addon.old/facebook/facebook.php:495
-#: ../../addon.old/fbpost/fbpost.php:144
-#: ../../addon.old/impressum/impressum.php:78
-#: ../../addon.old/openstreetmap/openstreetmap.php:80
-#: ../../addon.old/mathjax/mathjax.php:66 ../../addon.old/piwik/piwik.php:105
-#: ../../addon.old/twitter/twitter.php:389
-msgid "Settings updated."
-msgstr "Ajustos actualitzats."
-
-#: ../../mod/settings.php:559 ../../mod/settings.php:585
-#: ../../mod/settings.php:621
-msgid "Add application"
-msgstr "Afegir aplicació"
-
-#: ../../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: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:565 ../../mod/settings.php:591
-msgid "Redirect"
-msgstr "Redirigir"
-
-#: ../../mod/settings.php:566 ../../mod/settings.php:592
-msgid "Icon url"
-msgstr "icona de url"
-
-#: ../../mod/settings.php:577
-msgid "You can't edit this application."
-msgstr "No pots editar aquesta aplicació."
-
-#: ../../mod/settings.php:620
-msgid "Connected Apps"
-msgstr "Aplicacions conectades"
-
-#: ../../mod/settings.php:624
-msgid "Client key starts with"
-msgstr "Les claus de client comançen amb"
-
-#: ../../mod/settings.php:625
-msgid "No name"
-msgstr "Sense nom"
-
-#: ../../mod/settings.php:626
-msgid "Remove authorization"
-msgstr "retirar l'autorització"
-
-#: ../../mod/settings.php:638
-msgid "No Plugin settings configured"
-msgstr "No s'han configurat ajustos de Plugin"
-
-#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:124
-#: ../../addon.old/widgets/widgets.php:123
-msgid "Plugin Settings"
-msgstr "Ajustos de Plugin"
-
-#: ../../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 "El suport integrat per a la connectivitat de %s és %s"
-
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
-msgid "enabled"
-msgstr "habilitat"
-
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
-msgid "disabled"
-msgstr "deshabilitat"
-
-#: ../../mod/settings.php:682
-msgid "StatusNet"
-msgstr "StatusNet"
-
-#: ../../mod/settings.php:714
-msgid "Email access is disabled on this site."
-msgstr "L'accés al correu està deshabilitat en aquest lloc."
-
-#: ../../mod/settings.php:721
-msgid "Connector Settings"
-msgstr "Configuració de connectors"
-
-#: ../../mod/settings.php:726
-msgid "Email/Mailbox Setup"
-msgstr "Preparació de Correu/Bústia"
-
-#: ../../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 "Si vol comunicar-se amb els contactes de correu emprant aquest servei (opcional), Si us plau, especifiqui com connectar amb la seva bústia."
-
-#: ../../mod/settings.php:728
-msgid "Last successful email check:"
-msgstr "Última comprovació de correu amb èxit:"
-
-#: ../../mod/settings.php:730
-msgid "IMAP server name:"
-msgstr "Nom del servidor IMAP:"
-
-#: ../../mod/settings.php:731
-msgid "IMAP port:"
-msgstr "Port IMAP:"
-
-#: ../../mod/settings.php:732
-msgid "Security:"
-msgstr "Seguretat:"
-
-#: ../../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 "Cap"
-
-#: ../../mod/settings.php:733
-msgid "Email login name:"
-msgstr "Nom d'usuari del correu"
-
-#: ../../mod/settings.php:734
-msgid "Email password:"
-msgstr "Contrasenya del correu:"
-
-#: ../../mod/settings.php:735
-msgid "Reply-to address:"
-msgstr "Adreça de resposta:"
-
-#: ../../mod/settings.php:736
-msgid "Send public posts to all email contacts:"
-msgstr "Enviar correu públic a tots els contactes del correu:"
-
-#: ../../mod/settings.php:737
-msgid "Action after import:"
-msgstr "Acció després d'importar:"
-
-#: ../../mod/settings.php:737
-msgid "Mark as seen"
-msgstr "Marcar com a vist"
-
-#: ../../mod/settings.php:737
-msgid "Move to folder"
-msgstr "Moure a la carpeta"
-
-#: ../../mod/settings.php:738
-msgid "Move to folder:"
-msgstr "Moure a la carpeta:"
-
-#: ../../mod/settings.php:769 ../../mod/admin.php:420
-msgid "No special theme for mobile devices"
-msgstr ""
-
-#: ../../mod/settings.php:809
-msgid "Display Settings"
-msgstr "Ajustos de Pantalla"
-
-#: ../../mod/settings.php:815 ../../mod/settings.php:826
-msgid "Display Theme:"
-msgstr "Visualitzar el Tema:"
-
-#: ../../mod/settings.php:816
-msgid "Mobile Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:817
-msgid "Update browser every xx seconds"
-msgstr "Actualitzar navegador cada xx segons"
-
-#: ../../mod/settings.php:817
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Mínim cada 10 segons, no hi ha màxim"
-
-#: ../../mod/settings.php:818
-msgid "Number of items to display per page:"
-msgstr "Número d'elements a mostrar per pàgina"
-
-#: ../../mod/settings.php:818
-msgid "Maximum of 100 items"
-msgstr "Màxim de 100 elements"
-
-#: ../../mod/settings.php:819
-msgid "Don't show emoticons"
-msgstr "No mostrar emoticons"
-
-#: ../../mod/settings.php:895
-msgid "Normal Account Page"
-msgstr "Pàgina Normal del Compte "
-
-#: ../../mod/settings.php:896
-msgid "This account is a normal personal profile"
-msgstr "Aques compte es un compte personal normal"
-
-#: ../../mod/settings.php:899
-msgid "Soapbox Page"
-msgstr "Pàgina de Soapbox"
-
-#: ../../mod/settings.php:900
-msgid "Automatically approve all connection/friend requests as read-only fans"
-msgstr "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de només lectura."
-
-#: ../../mod/settings.php:903
-msgid "Community Forum/Celebrity Account"
-msgstr "Compte de Comunitat/Celebritat"
-
-#: ../../mod/settings.php:904
-msgid ""
-"Automatically approve all connection/friend requests as read-write fans"
-msgstr "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de lectura-escriptura"
-
-#: ../../mod/settings.php:907
-msgid "Automatic Friend Page"
-msgstr "Compte d'Amistat Automàtica"
-
-#: ../../mod/settings.php:908
-msgid "Automatically approve all connection/friend requests as friends"
-msgstr "Aprova totes les sol·licituds de amistat/connexió com a amic automàticament"
-
-#: ../../mod/settings.php:911
-msgid "Private Forum [Experimental]"
-msgstr "Fòrum Privat [Experimental]"
-
-#: ../../mod/settings.php:912
-msgid "Private forum - approved members only"
-msgstr "Fòrum privat - Només membres aprovats"
-
-#: ../../mod/settings.php:924
-msgid "OpenID:"
-msgstr "OpenID:"
-
-#: ../../mod/settings.php:924
-msgid "(Optional) Allow this OpenID to login to this account."
-msgstr "(Opcional) Permetre a aquest OpenID iniciar sessió en aquest compte."
-
-#: ../../mod/settings.php:934
-msgid "Publish your default profile in your local site directory?"
-msgstr "Publicar el teu perfil predeterminat en el directori del lloc local?"
-
-#: ../../mod/settings.php:940
-msgid "Publish your default profile in the global social directory?"
-msgstr "Publicar el teu perfil predeterminat al directori social global?"
-
-#: ../../mod/settings.php:948
-msgid "Hide your contact/friend list from viewers of your default profile?"
-msgstr "Amaga la teva llista de contactes/amics dels espectadors del seu perfil per defecte?"
-
-#: ../../mod/settings.php:952
-msgid "Hide your profile details from unknown viewers?"
-msgstr "Amagar els detalls del seu perfil a espectadors desconeguts?"
-
-#: ../../mod/settings.php:957
-msgid "Allow friends to post to your profile page?"
-msgstr "Permet als amics publicar en la seva pàgina de perfil?"
-
-#: ../../mod/settings.php:963
-msgid "Allow friends to tag your posts?"
-msgstr "Permet als amics d'etiquetar els teus missatges?"
-
-#: ../../mod/settings.php:969
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Permeteu-nos suggerir-li com un amic potencial dels nous membres?"
-
-#: ../../mod/settings.php:975
-msgid "Permit unknown people to send you private mail?"
-msgstr "Permetre a desconeguts enviar missatges al teu correu privat?"
-
-#: ../../mod/settings.php:983
-msgid "Profile is <strong>not published</strong>."
-msgstr "El  Perfil <strong>no està publicat</strong>."
-
-#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
-msgid "or"
-msgstr "o"
-
-#: ../../mod/settings.php:991
-msgid "Your Identity Address is"
-msgstr "La seva Adreça d'Identitat és"
-
-#: ../../mod/settings.php:1002
-msgid "Automatically expire posts after this many days:"
-msgstr "Després de aquests nombre de dies, els missatges caduquen automàticament:"
-
-#: ../../mod/settings.php:1002
-msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr "Si està buit, els missatges no caducarà. Missatges caducats s'eliminaran"
-
-#: ../../mod/settings.php:1003
-msgid "Advanced expiration settings"
-msgstr "Configuració avançada d'expiració"
-
-#: ../../mod/settings.php:1004
-msgid "Advanced Expiration"
-msgstr "Expiració Avançada"
-
-#: ../../mod/settings.php:1005
-msgid "Expire posts:"
-msgstr "Expiració d'enviaments"
-
-#: ../../mod/settings.php:1006
-msgid "Expire personal notes:"
-msgstr "Expiració de notes personals"
-
-#: ../../mod/settings.php:1007
-msgid "Expire starred posts:"
-msgstr "Expiració de enviaments de favorits"
-
-#: ../../mod/settings.php:1008
-msgid "Expire photos:"
-msgstr "Expiració de fotos"
-
-#: ../../mod/settings.php:1009
-msgid "Only expire posts by others:"
-msgstr "Només expiren els enviaments dels altres:"
-
-#: ../../mod/settings.php:1035
-msgid "Account Settings"
-msgstr "Ajustos de Compte"
-
-#: ../../mod/settings.php:1043
-msgid "Password Settings"
-msgstr "Ajustos de Contrasenya"
-
-#: ../../mod/settings.php:1044
-msgid "New Password:"
-msgstr "Nova Contrasenya:"
-
-#: ../../mod/settings.php:1045
-msgid "Confirm:"
-msgstr "Confirmar:"
-
-#: ../../mod/settings.php:1045
-msgid "Leave password fields blank unless changing"
-msgstr "Deixi els camps de contrasenya buits per a no fer canvis"
-
-#: ../../mod/settings.php:1049
-msgid "Basic Settings"
-msgstr "Ajustos Basics"
-
-#: ../../mod/settings.php:1050 ../../include/profile_advanced.php:15
-msgid "Full Name:"
-msgstr "Nom Complet:"
-
-#: ../../mod/settings.php:1051
-msgid "Email Address:"
-msgstr "Adreça de Correu:"
-
-#: ../../mod/settings.php:1052
-msgid "Your Timezone:"
-msgstr "La teva zona Horària:"
-
-#: ../../mod/settings.php:1053
-msgid "Default Post Location:"
-msgstr "Localització per Defecte del Missatge:"
-
-#: ../../mod/settings.php:1054
-msgid "Use Browser Location:"
-msgstr "Ubicar-se amb el Navegador:"
-
-#: ../../mod/settings.php:1057
-msgid "Security and Privacy Settings"
-msgstr "Ajustos de Seguretat i Privacitat"
-
-#: ../../mod/settings.php:1059
-msgid "Maximum Friend Requests/Day:"
-msgstr "Nombre Màxim de Sol·licituds per Dia"
-
-#: ../../mod/settings.php:1059 ../../mod/settings.php:1089
-msgid "(to prevent spam abuse)"
-msgstr "(per a prevenir abusos de spam)"
-
-#: ../../mod/settings.php:1060
-msgid "Default Post Permissions"
-msgstr "Permisos de Correu per Defecte"
-
-#: ../../mod/settings.php:1061
-msgid "(click to open/close)"
-msgstr "(clicar per a obrir/tancar)"
-
-#: ../../mod/settings.php:1072
-msgid "Default Private Post"
-msgstr ""
-
-#: ../../mod/settings.php:1073
-msgid "Default Public Post"
-msgstr ""
-
-#: ../../mod/settings.php:1077
-msgid "Default Permissions for New Posts"
-msgstr ""
-
-#: ../../mod/settings.php:1089
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Màxim nombre de missatges, per dia, de desconeguts:"
-
-#: ../../mod/settings.php:1092
-msgid "Notification Settings"
-msgstr "Ajustos de Notificació"
-
-#: ../../mod/settings.php:1093
-msgid "By default post a status message when:"
-msgstr "Enviar per defecte un missatge de estatus quan:"
-
-#: ../../mod/settings.php:1094
-msgid "accepting a friend request"
-msgstr "Acceptar una sol·licitud d'amistat"
-
-#: ../../mod/settings.php:1095
-msgid "joining a forum/community"
-msgstr "Unint-se a un fòrum/comunitat"
-
-#: ../../mod/settings.php:1096
-msgid "making an <em>interesting</em> profile change"
-msgstr "fent un <em interesant</em> canvi al perfil"
-
-#: ../../mod/settings.php:1097
-msgid "Send a notification email when:"
-msgstr "Envia un correu notificant quan:"
-
-#: ../../mod/settings.php:1098
-msgid "You receive an introduction"
-msgstr "Has rebut una presentació"
-
-#: ../../mod/settings.php:1099
-msgid "Your introductions are confirmed"
-msgstr "La teva presentació està confirmada"
-
-#: ../../mod/settings.php:1100
-msgid "Someone writes on your profile wall"
-msgstr "Algú ha escrit en el teu mur de perfil"
-
-#: ../../mod/settings.php:1101
-msgid "Someone writes a followup comment"
-msgstr "Algú ha escrit un comentari de seguiment"
-
-#: ../../mod/settings.php:1102
-msgid "You receive a private message"
-msgstr "Has rebut un missatge privat"
-
-#: ../../mod/settings.php:1103
-msgid "You receive a friend suggestion"
-msgstr "Has rebut una suggerencia d'un amic"
-
-#: ../../mod/settings.php:1104
-msgid "You are tagged in a post"
-msgstr "Estàs etiquetat en un enviament"
-
-#: ../../mod/settings.php:1105
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Has estat Atiat/punxat/etc, en un enviament"
-
-#: ../../mod/settings.php:1108
-msgid "Advanced Account/Page Type Settings"
-msgstr "Ajustos Avançats de Compte/ Pàgina"
-
-#: ../../mod/settings.php:1109
-msgid "Change the behaviour of this account for special situations"
-msgstr "Canviar el comportament d'aquest compte en situacions especials"
-
-#: ../../mod/manage.php:106
-msgid "Manage Identities and/or Pages"
-msgstr "Administrar Identitats i/o  Pàgines"
-
-#: ../../mod/manage.php:107
-msgid ""
-"Toggle between different identities or community/group pages which share "
-"your account details or which you have been granted \"manage\" permissions"
-msgstr "Alternar entre les diferents identitats o les pàgines de comunitats/grups que comparteixen les dades del seu compte o que se li ha concedit els permisos de \"administrar\""
-
-#: ../../mod/manage.php:108
-msgid "Select an identity to manage: "
-msgstr "Seleccionar identitat a administrar:"
-
-#: ../../mod/network.php:181
-msgid "Search Results For:"
-msgstr "Resultats de la Cerca Per a:"
-
-#: ../../mod/network.php:224 ../../mod/search.php:21
-msgid "Remove term"
-msgstr "Traieu termini"
-
-#: ../../mod/network.php:233 ../../mod/search.php:30
-#: ../../include/features.php:41
-msgid "Saved Searches"
-msgstr "Cerques Guardades"
-
-#: ../../mod/network.php:234 ../../include/group.php:275
-msgid "add"
-msgstr "afegir"
-
-#: ../../mod/network.php:397
-msgid "Commented Order"
-msgstr "Ordre dels Comentaris"
-
-#: ../../mod/network.php:400
-msgid "Sort by Comment Date"
-msgstr "Ordenar per Data de Comentari"
-
-#: ../../mod/network.php:403
-msgid "Posted Order"
-msgstr "Ordre dels Enviaments"
-
-#: ../../mod/network.php:406
-msgid "Sort by Post Date"
-msgstr "Ordenar per Data d'Enviament"
-
-#: ../../mod/network.php:447
-msgid "Posts that mention or involve you"
-msgstr "Missatge que et menciona o t'impliquen"
-
-#: ../../mod/network.php:453
-msgid "New"
-msgstr "Nou"
-
-#: ../../mod/network.php:456
-msgid "Activity Stream - by date"
-msgstr "Activitat del Flux - per data"
-
-#: ../../mod/network.php:462
-msgid "Shared Links"
-msgstr "Enllaços Compartits"
-
-#: ../../mod/network.php:465
-msgid "Interesting Links"
-msgstr "Enllaços Interesants"
-
-#: ../../mod/network.php:471
-msgid "Starred"
-msgstr "Favorits"
-
-#: ../../mod/network.php:474
-msgid "Favourite Posts"
-msgstr "Enviaments Favorits"
-
-#: ../../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] "Advertència: Aquest grup conté el membre %s en una xarxa insegura."
-msgstr[1] "Advertència: Aquest grup conté %s membres d'una xarxa insegura."
-
-#: ../../mod/network.php:549
-msgid "Private messages to this group are at risk of public disclosure."
-msgstr "Els missatges privats a aquest grup es troben en risc de divulgació pública."
-
-#: ../../mod/network.php:621
-msgid "Contact: "
-msgstr "Contacte:"
-
-#: ../../mod/network.php:623
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr "Els missatges privats a aquesta persona es troben en risc de divulgació pública."
-
-#: ../../mod/network.php:628
-msgid "Invalid contact."
-msgstr "Contacte no vàlid."
-
-#: ../../mod/notes.php:44 ../../boot.php:1864
-msgid "Personal Notes"
-msgstr "Notes Personals"
-
-#: ../../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:741
-#: ../../addon.old/facebook/facebook.php:770
-#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263
-#: ../../addon.old/fbpost/fbpost.php:267
-#: ../../addon.old/dav/friendica/layout.fnk.php:441
-#: ../../addon.old/dav/friendica/layout.fnk.php:488
-msgid "Save"
-msgstr "Guardar"
-
-#: ../../mod/uimport.php:50 ../../mod/register.php:192
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "Aquest lloc excedeix el nombre diari de registres de comptes. Per favor, provi de nou demà."
-
-#: ../../mod/uimport.php:64
-msgid "Import"
-msgstr ""
-
-#: ../../mod/uimport.php:66
-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 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
-msgid "Account file"
-msgstr ""
-
-#: ../../mod/uimport.php:70
-msgid ""
-"To export your accont, go to \"Settings->Export your porsonal data\" and "
-"select \"Export account\""
-msgstr ""
-
-#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr "Nombre diari de missatges al mur per %s excedit. El missatge ha fallat."
-
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:63
-msgid "No recipient selected."
-msgstr "No s'ha seleccionat destinatari."
-
-#: ../../mod/wallmessage.php:59
-msgid "Unable to check your home location."
-msgstr "Incapaç de comprovar la localització."
-
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:70
-msgid "Message could not be sent."
-msgstr "El Missatge no ha estat enviat."
-
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:73
-msgid "Message collection failure."
-msgstr "Ha fallat la recollida del missatge."
-
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:76
-msgid "Message sent."
-msgstr "Missatge enviat."
-
-#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
-msgid "No recipient."
-msgstr "Sense destinatari."
-
-#: ../../mod/wallmessage.php:127 ../../mod/wallmessage.php:135
-#: ../../mod/message.php:283 ../../mod/message.php:291
-#: ../../mod/message.php:466 ../../mod/message.php:474
-#: ../../include/conversation.php:940 ../../include/conversation.php:958
-msgid "Please enter a link URL:"
-msgstr "Sius plau, entri l'enllaç URL:"
-
-#: ../../mod/wallmessage.php:142 ../../mod/message.php:319
-msgid "Send Private Message"
-msgstr "Enviant Missatge Privat"
-
-#: ../../mod/wallmessage.php:143
-#, php-format
-msgid ""
-"If you wish for %s to respond, please check that the privacy settings on "
-"your site allow private mail from unknown senders."
-msgstr "si vols respondre a %s, comprova que els ajustos de privacitat del lloc permeten correus privats de remitents desconeguts."
-
-#: ../../mod/wallmessage.php:144 ../../mod/message.php:320
-#: ../../mod/message.php:553
-msgid "To:"
-msgstr "Per a:"
-
-#: ../../mod/wallmessage.php:145 ../../mod/message.php:325
-#: ../../mod/message.php:555
-msgid "Subject:"
-msgstr "Assumpte::"
-
-#: ../../mod/wallmessage.php:151 ../../mod/message.php:329
-#: ../../mod/message.php:558 ../../mod/invite.php:134
-msgid "Your message:"
-msgstr "El teu missatge:"
-
-#: ../../mod/newmember.php:6
-msgid "Welcome to Friendica"
-msgstr "Benvingut a Friendica"
-
-#: ../../mod/newmember.php:8
-msgid "New Member Checklist"
-msgstr "Llista de Verificació dels Nous Membres"
-
-#: ../../mod/newmember.php:12
-msgid ""
-"We would like to offer some tips and links to help make your experience "
-"enjoyable. Click any item to visit the relevant page. A link to this page "
-"will be visible from your home page for two weeks after your initial "
-"registration and then will quietly disappear."
-msgstr "Ens agradaria oferir alguns consells i enllaços per ajudar a fer la teva experiència agradable. Feu clic a qualsevol element per visitar la pàgina corresponent. Un enllaç a aquesta pàgina serà visible des de la pàgina d'inici durant dues setmanes després de la teva inscripció inicial i després desapareixerà en silenci."
-
-#: ../../mod/newmember.php:14
-msgid "Getting Started"
-msgstr ""
-
-#: ../../mod/newmember.php:18
-msgid "Friendica Walk-Through"
-msgstr ""
-
-#: ../../mod/newmember.php:18
-msgid ""
-"On your <em>Quick Start</em> page - find a brief introduction to your "
-"profile and network tabs, make some new connections, and find some groups to"
-" join."
-msgstr ""
-
-#: ../../mod/newmember.php:26
-msgid "Go to Your Settings"
-msgstr "Anar als Teus Ajustos"
-
-#: ../../mod/newmember.php:26
-msgid ""
-"On your <em>Settings</em> page -  change your initial password. Also make a "
-"note of your Identity Address. This looks just like an email address - and "
-"will be useful in making friends on the free social web."
-msgstr "En la  de la seva <em>configuració</em> de la pàgina - canviï la contrasenya inicial. També prengui nota de la Adreça d'Identitat. Això s'assembla a una adreça de correu electrònic - i serà útil per fer amics a la xarxa social lliure."
-
-#: ../../mod/newmember.php:28
-msgid ""
-"Review the other settings, particularly the privacy settings. An unpublished"
-" directory listing is like having an unlisted phone number. In general, you "
-"should probably publish your listing - unless all of your friends and "
-"potential friends know exactly how to find you."
-msgstr "Reviseu les altres configuracions, en particular la configuració de privadesa. Una llista de directoris no publicada és com tenir un número de telèfon no llistat. Normalment, hauria de publicar la seva llista - a menys que tots els seus amics i els amics potencials sàpiguen exactament com trobar-li."
-
-#: ../../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:77
-#: ../../boot.php:1840
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
+#: ../../include/nav.php:77 ../../mod/profperm.php:103
+#: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88
+#: ../../boot.php:1946
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:244
-msgid "Upload Profile Photo"
-msgstr "Pujar Foto del Perfil"
+#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1079
+msgid "Full Name:"
+msgstr "Nom Complet:"
 
-#: ../../mod/newmember.php:36
-msgid ""
-"Upload a profile photo if you have not done so already. Studies have shown "
-"that people with real photos of themselves are ten times more likely to make"
-" friends than people who do not."
-msgstr "Puji una foto del seu perfil si encara no ho ha fet. Els estudis han demostrat que les persones amb fotos reals de ells mateixos tenen deu vegades més probabilitats de fer amics que les persones que no ho fan."
-
-#: ../../mod/newmember.php:38
-msgid "Edit Your Profile"
-msgstr "Editar el Teu Perfil"
-
-#: ../../mod/newmember.php:38
-msgid ""
-"Edit your <strong>default</strong> profile to your liking. Review the "
-"settings for hiding your list of friends and hiding the profile from unknown"
-" visitors."
-msgstr "Editi  el perfil per <strong>defecte</strong> al seu gust. Reviseu la configuració per ocultar la seva llista d'amics i ocultar el perfil dels visitants desconeguts."
-
-#: ../../mod/newmember.php:40
-msgid "Profile Keywords"
-msgstr "Paraules clau del Perfil"
-
-#: ../../mod/newmember.php:40
-msgid ""
-"Set some public keywords for your default profile which describe your "
-"interests. We may be able to find other people with similar interests and "
-"suggest friendships."
-msgstr "Estableix algunes paraules clau públiques al teu perfil predeterminat que descriguin els teus interessos. Podem ser capaços de trobar altres persones amb interessos similars i suggerir amistats."
-
-#: ../../mod/newmember.php:44
-msgid "Connecting"
-msgstr "Connectant"
-
-#: ../../mod/newmember.php:49 ../../mod/newmember.php:51
-#: ../../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
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../mod/newmember.php:49
-msgid ""
-"Authorise the Facebook Connector if you currently have a Facebook account "
-"and we will (optionally) import all your Facebook friends and conversations."
-msgstr "Autoritzi el connector de Facebook si vostè té un compte al Facebook i nosaltres (opcionalment) importarem tots els teus amics de Facebook i les converses."
-
-#: ../../mod/newmember.php:51
-msgid ""
-"<em>If</em> this is your own personal server, installing the Facebook addon "
-"may ease your transition to the free social web."
-msgstr "<em>Si </em> aquesta és el seu servidor personal, la instal·lació del complement de Facebook pot facilitar la transició a la web social lliure."
-
-#: ../../mod/newmember.php:56
-msgid "Importing Emails"
-msgstr "Important Emails"
-
-#: ../../mod/newmember.php:56
-msgid ""
-"Enter your email access information on your Connector Settings page if you "
-"wish to import and interact with friends or mailing lists from your email "
-"INBOX"
-msgstr "Introduïu les dades d'accés al correu electrònic a la seva pàgina de configuració de connector, si es desitja importar i relacionar-se amb amics o llistes de correu de la seva bústia d'email"
-
-#: ../../mod/newmember.php:58
-msgid "Go to Your Contacts Page"
-msgstr "Anar a la Teva Pàgina de Contactes"
-
-#: ../../mod/newmember.php:58
-msgid ""
-"Your Contacts page is your gateway to managing friendships and connecting "
-"with friends on other networks. Typically you enter their address or site "
-"URL in the <em>Add New Contact</em> dialog."
-msgstr "La seva pàgina de Contactes és la seva porta d'entrada a la gestió de l'amistat i la connexió amb amics d'altres xarxes. Normalment, vostè entrar en la seva direcció o URL del lloc al  diàleg <em>Afegir Nou Contacte</em>."
-
-#: ../../mod/newmember.php:60
-msgid "Go to Your Site's Directory"
-msgstr "Anar al Teu Directori"
-
-#: ../../mod/newmember.php:60
-msgid ""
-"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."
-msgstr "La pàgina del Directori li permet trobar altres persones en aquesta xarxa o altres llocs federats. Busqui un enllaç <em>Connectar</em> o <em>Seguir</em> a la seva pàgina de perfil. Proporcioni la seva pròpia Adreça de Identitat si així ho sol·licita."
-
-#: ../../mod/newmember.php:62
-msgid "Finding New People"
-msgstr "Trobar Gent Nova"
-
-#: ../../mod/newmember.php:62
-msgid ""
-"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."
-msgstr "Al tauler lateral de la pàgina de contacte Hi ha diverses eines per trobar nous amics. Podem coincidir amb les persones per interesos, buscar persones pel nom o per interès, i oferir suggeriments basats en les relacions de la xarxa. En un nou lloc, els suggeriments d'amics, en general comencen a poblar el lloc a les 24 hores."
-
-#: ../../mod/newmember.php:66 ../../include/group.php:270
-msgid "Groups"
-msgstr "Grups"
-
-#: ../../mod/newmember.php:70
-msgid "Group Your Contacts"
-msgstr "Agrupar els Teus Contactes"
-
-#: ../../mod/newmember.php:70
-msgid ""
-"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."
-msgstr "Una vegada que s'han fet alguns amics, organitzi'ls en grups de conversa privada a la barra lateral de la seva pàgina de contactes i després pot interactuar amb cada grup de forma privada a la pàgina de la xarxa."
-
-#: ../../mod/newmember.php:73
-msgid "Why Aren't My Posts Public?"
-msgstr "Per que no es public el meu enviament?"
-
-#: ../../mod/newmember.php:73
-msgid ""
-"Friendica respects your privacy. By default, your posts will only show up to"
-" people you've added as friends. For more information, see the help section "
-"from the link above."
-msgstr "Friendica respecta la teva privacitat. Per defecte, els teus enviaments només s'envien a gent que has afegit com a amic. Per més informació, mira la secció d'ajuda des de l'enllaç de dalt."
-
-#: ../../mod/newmember.php:78
-msgid "Getting Help"
-msgstr "Demanant Ajuda"
-
-#: ../../mod/newmember.php:82
-msgid "Go to the Help Section"
-msgstr "Anar a la secció d'Ajuda"
-
-#: ../../mod/newmember.php:82
-msgid ""
-"Our <strong>help</strong> pages may be consulted for detail on other program"
-" features and resources."
-msgstr "A les nostres pàgines <strong>d'ajuda</strong> es poden consultar detalls sobre les característiques d'altres programes i recursos."
-
-#: ../../mod/attach.php:8
-msgid "Item not available."
-msgstr "Element no disponible"
-
-#: ../../mod/attach.php:20
-msgid "Item was not found."
-msgstr "Element no trobat."
-
-#: ../../mod/group.php:29
-msgid "Group created."
-msgstr "Grup creat."
-
-#: ../../mod/group.php:35
-msgid "Could not create group."
-msgstr "No puc crear grup."
-
-#: ../../mod/group.php:47 ../../mod/group.php:140
-msgid "Group not found."
-msgstr "Grup no trobat"
-
-#: ../../mod/group.php:60
-msgid "Group name changed."
-msgstr "Nom de Grup canviat."
-
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:340
-msgid "Permission denied"
-msgstr "Permís denegat"
-
-#: ../../mod/group.php:93
-msgid "Create a group of contacts/friends."
-msgstr "Crear un grup de contactes/amics."
-
-#: ../../mod/group.php:94 ../../mod/group.php:180
-msgid "Group Name: "
-msgstr "Nom del Grup:"
-
-#: ../../mod/group.php:113
-msgid "Group removed."
-msgstr "Grup esborrat."
-
-#: ../../mod/group.php:115
-msgid "Unable to remove group."
-msgstr "Incapaç de esborrar Grup."
-
-#: ../../mod/group.php:179
-msgid "Group Editor"
-msgstr "Editor de Grup:"
-
-#: ../../mod/group.php:192
-msgid "Members"
-msgstr "Membres"
-
-#: ../../mod/group.php:224 ../../mod/profperm.php:105
-msgid "Click on a contact to add or remove."
-msgstr "Clicar sobre el contacte per afegir o esborrar."
-
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
-msgid "Invalid profile identifier."
-msgstr "Identificador del perfil no vàlid."
-
-#: ../../mod/profperm.php:101
-msgid "Profile Visibility Editor"
-msgstr "Editor de Visibilitat del Perfil"
-
-#: ../../mod/profperm.php:114
-msgid "Visible To"
-msgstr "Visible Per"
-
-#: ../../mod/profperm.php:130
-msgid "All Contacts (with secure profile access)"
-msgstr "Tots els Contactes (amb accés segur al perfil)"
-
-#: ../../mod/viewcontacts.php:39
-msgid "No contacts."
-msgstr "Sense Contactes"
-
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:678
-msgid "View Contacts"
-msgstr "Veure Contactes"
-
-#: ../../mod/register.php:91 ../../mod/regmod.php:54
-#, php-format
-msgid "Registration details for %s"
-msgstr "Detalls del registre per a %s"
-
-#: ../../mod/register.php:99
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr "Registrat amb èxit. Per favor, comprovi el seu correu per a posteriors instruccions."
-
-#: ../../mod/register.php:103
-msgid "Failed to send email message. Here is the message that failed."
-msgstr "Error en enviar missatge de correu electrònic. Aquí està el missatge que ha fallat."
-
-#: ../../mod/register.php:108
-msgid "Your registration can not be processed."
-msgstr "El seu registre no pot ser processat."
-
-#: ../../mod/register.php:145
-#, php-format
-msgid "Registration request at %s"
-msgstr "Sol·licitud de registre a %s"
-
-#: ../../mod/register.php:154
-msgid "Your registration is pending approval by the site owner."
-msgstr "El seu registre està pendent d'aprovació pel propietari del lloc."
-
-#: ../../mod/register.php:220
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr "Vostè pot (opcionalment), omplir aquest formulari a través de OpenID mitjançant el subministrament de la seva OpenID i fent clic a 'Registrar'."
-
-#: ../../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 "Si vostè no està familiaritzat amb Twitter, si us plau deixi aquest camp en blanc i completi la resta dels elements."
-
-#: ../../mod/register.php:222
-msgid "Your OpenID (optional): "
-msgstr "El seu OpenID (opcional):"
-
-#: ../../mod/register.php:236
-msgid "Include your profile in member directory?"
-msgstr "Incloc el seu perfil al directori de membres?"
-
-#: ../../mod/register.php:257
-msgid "Membership on this site is by invitation only."
-msgstr "Lloc accesible mitjançant invitació."
-
-#: ../../mod/register.php:258
-msgid "Your invitation ID: "
-msgstr "El teu ID de invitació:"
-
-#: ../../mod/register.php:261 ../../mod/admin.php:462
-msgid "Registration"
-msgstr "Procés de Registre"
-
-#: ../../mod/register.php:269
-msgid "Your Full Name (e.g. Joe Smith): "
-msgstr "El seu nom complet (per exemple, Joan Ningú):"
-
-#: ../../mod/register.php:270
-msgid "Your Email Address: "
-msgstr "La Seva Adreça de Correu:"
-
-#: ../../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 "Tria un nom de perfil. Això ha de començar amb un caràcter de text. La seva adreça de perfil en aquest lloc serà '<strong>alies@$sitename</strong>'."
-
-#: ../../mod/register.php:272
-msgid "Choose a nickname: "
-msgstr "Tria un àlies:"
-
-#: ../../mod/register.php:275 ../../include/nav.php:108 ../../boot.php:1012
-msgid "Register"
-msgstr "Registrar"
-
-#: ../../mod/dirfind.php:26
-msgid "People Search"
-msgstr "Cercant Gent"
-
-#: ../../mod/like.php:151 ../../mod/subthread.php:87 ../../mod/tagger.php:62
-#: ../../addon/communityhome/communityhome.php:171
-#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1510
-#: ../../include/diaspora.php:1860 ../../include/conversation.php:126
-#: ../../include/conversation.php:254
-#: ../../addon.old/communityhome/communityhome.php:163
-msgid "photo"
-msgstr "foto"
-
-#: ../../mod/like.php:151 ../../mod/like.php:322 ../../mod/subthread.php:87
-#: ../../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:121 ../../include/conversation.php:130
-#: ../../include/conversation.php:249 ../../include/conversation.php:258
-#: ../../addon.old/facebook/facebook.php:1598
-#: ../../addon.old/communityhome/communityhome.php:158
-#: ../../addon.old/communityhome/communityhome.php:167
-msgid "status"
-msgstr "estatus"
-
-#: ../../mod/like.php:168 ../../addon/facebook/facebook.php:1604
-#: ../../addon/communityhome/communityhome.php:180
-#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1876
-#: ../../include/conversation.php:137
-#: ../../addon.old/facebook/facebook.php:1602
-#: ../../addon.old/communityhome/communityhome.php:172
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "a %1$s agrada %2$s de %3$s"
-
-#: ../../mod/like.php:170 ../../include/conversation.php:140
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "a %1$s no agrada %2$s de %3$s"
-
-#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../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 "Article no trobat."
-
-#: ../../mod/viewsrc.php:7
-msgid "Access denied."
-msgstr "Accés denegat."
-
-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:78 ../../boot.php:1847
-msgid "Photos"
-msgstr "Fotos"
-
-#: ../../mod/fbrowser.php:113
-msgid "Files"
-msgstr "Arxius"
-
-#: ../../mod/regmod.php:63
-msgid "Account approved."
-msgstr "Compte aprovat."
-
-#: ../../mod/regmod.php:100
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Procés de Registre revocat per a %s"
-
-#: ../../mod/regmod.php:112
-msgid "Please login."
-msgstr "Si us plau, ingressa."
-
-#: ../../mod/item.php:104
-msgid "Unable to locate original post."
-msgstr "No es pot localitzar post original."
-
-#: ../../mod/item.php:292
-msgid "Empty post discarded."
-msgstr "Buidat després de rebutjar."
-
-#: ../../mod/item.php:428 ../../mod/wall_upload.php:135
-#: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151
-#: ../../include/message.php:144
-msgid "Wall Photos"
-msgstr "Fotos del Mur"
-
-#: ../../mod/item.php:841
-msgid "System error. Post not saved."
-msgstr "Error del sistema. Publicació no guardada."
-
-#: ../../mod/item.php:866
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social "
-"network."
-msgstr "Aquest missatge va ser enviat a vostè per %s, un membre de la xarxa social Friendica."
-
-#: ../../mod/item.php:868
-#, php-format
-msgid "You may visit them online at %s"
-msgstr "El pot visitar en línia a %s"
-
-#: ../../mod/item.php:869
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr "Si us plau, poseu-vos en contacte amb el remitent responent a aquest missatge si no voleu rebre aquests missatges."
-
-#: ../../mod/item.php:871
-#, php-format
-msgid "%s posted an update."
-msgstr "%s ha publicat una actualització."
-
-#: ../../mod/mood.php:62 ../../include/conversation.php:227
-#, php-format
-msgid "%1$s is currently %2$s"
-msgstr "%1$s es normalment %2$s"
-
-#: ../../mod/mood.php:133
-msgid "Mood"
-msgstr ""
-
-#: ../../mod/mood.php:134
-msgid "Set your current mood and tell your friends"
-msgstr ""
-
-#: ../../mod/profile_photo.php:44
-msgid "Image uploaded but image cropping failed."
-msgstr "Imatge pujada però no es va poder retallar."
-
-#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:84
-#: ../../mod/profile_photo.php:91 ../../mod/profile_photo.php:308
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr "La reducció de la imatge [%s] va fracassar."
-
-#: ../../mod/profile_photo.php:118
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Recarregui la pàgina o netegi la caché del navegador si la nova foto no apareix immediatament."
-
-#: ../../mod/profile_photo.php:128
-msgid "Unable to process image"
-msgstr "No es pot processar la imatge"
-
-#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:90
-#, php-format
-msgid "Image exceeds size limit of %d"
-msgstr "La imatge sobrepassa el límit de mida de %d"
-
-#: ../../mod/profile_photo.php:242
-msgid "Upload File:"
-msgstr "Pujar arxiu:"
-
-#: ../../mod/profile_photo.php:243
-msgid "Select a profile:"
-msgstr ""
-
-#: ../../mod/profile_photo.php:245
-#: ../../addon/dav/friendica/layout.fnk.php:152
-#: ../../addon.old/dav/friendica/layout.fnk.php:152
-msgid "Upload"
-msgstr "Pujar"
-
-#: ../../mod/profile_photo.php:248
-msgid "skip this step"
-msgstr "saltar aquest pas"
-
-#: ../../mod/profile_photo.php:248
-msgid "select a photo from your photo albums"
-msgstr "tria una foto dels teus àlbums"
-
-#: ../../mod/profile_photo.php:262
-msgid "Crop Image"
-msgstr "retallar imatge"
-
-#: ../../mod/profile_photo.php:263
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Per favor, ajusta la retallada d'imatge per a una optima visualització."
-
-#: ../../mod/profile_photo.php:265
-msgid "Done Editing"
-msgstr "Edició Feta"
-
-#: ../../mod/profile_photo.php:299
-msgid "Image uploaded successfully."
-msgstr "Carregada de la imatge amb èxit."
-
-#: ../../mod/hcard.php:10
-msgid "No profile"
-msgstr "Sense perfil"
-
-#: ../../mod/removeme.php:45 ../../mod/removeme.php:48
-msgid "Remove My Account"
-msgstr "Eliminar el Meu Compte"
-
-#: ../../mod/removeme.php:46
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr "Això eliminarà per complet el seu compte. Quan s'hagi fet això, no serà recuperable."
-
-#: ../../mod/removeme.php:47
-msgid "Please enter your password for verification:"
-msgstr "Si us plau, introduïu la contrasenya per a la verificació:"
-
-#: ../../mod/navigation.php:20 ../../include/nav.php:34
-msgid "Nothing new here"
-msgstr "Res nou aquí"
-
-#: ../../mod/navigation.php:24 ../../include/nav.php:38
-msgid "Clear notifications"
-msgstr ""
-
-#: ../../mod/message.php:9 ../../include/nav.php:159
-msgid "New Message"
-msgstr "Nou Missatge"
-
-#: ../../mod/message.php:67
-msgid "Unable to locate contact information."
-msgstr "No es pot trobar informació de contacte."
-
-#: ../../mod/message.php:207
-msgid "Do you really want to delete this message?"
-msgstr ""
-
-#: ../../mod/message.php:227
-msgid "Message deleted."
-msgstr "Missatge eliminat."
-
-#: ../../mod/message.php:258
-msgid "Conversation removed."
-msgstr "Conversació esborrada."
-
-#: ../../mod/message.php:371
-msgid "No messages."
-msgstr "Sense missatges."
-
-#: ../../mod/message.php:378
-#, php-format
-msgid "Unknown sender - %s"
-msgstr "remitent desconegut - %s"
-
-#: ../../mod/message.php:381
-#, php-format
-msgid "You and %s"
-msgstr "Tu i %s"
-
-#: ../../mod/message.php:384
-#, php-format
-msgid "%s and You"
-msgstr "%s i Tu"
-
-#: ../../mod/message.php:405 ../../mod/message.php:546
-msgid "Delete conversation"
-msgstr "Esborrar conversació"
-
-#: ../../mod/message.php:408
-msgid "D, d M Y - g:i A"
-msgstr "D, d M Y - g:i A"
-
-#: ../../mod/message.php:411
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d missatge"
-msgstr[1] "%d missatges"
-
-#: ../../mod/message.php:450
-msgid "Message not available."
-msgstr "Missatge no disponible."
-
-#: ../../mod/message.php:520
-msgid "Delete message"
-msgstr "Esborra missatge"
-
-#: ../../mod/message.php:548
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Comunicacions degures no disponibles. Tú <strong>pots</strong> respondre des de la pàgina de perfil del remitent."
-
-#: ../../mod/message.php:552
-msgid "Send Reply"
-msgstr "Enviar Resposta"
-
-#: ../../mod/allfriends.php:34
-#, php-format
-msgid "Friends of %s"
-msgstr "Amics de %s"
-
-#: ../../mod/allfriends.php:40
-msgid "No friends to display."
-msgstr "No hi ha amics que mostrar"
-
-#: ../../mod/admin.php:55
-msgid "Theme settings updated."
-msgstr "Ajustos de Tema actualitzats"
-
-#: ../../mod/admin.php:96 ../../mod/admin.php:460
-msgid "Site"
-msgstr "Lloc"
-
-#: ../../mod/admin.php:97 ../../mod/admin.php:727 ../../mod/admin.php:740
-msgid "Users"
-msgstr "Usuaris"
-
-#: ../../mod/admin.php:98 ../../mod/admin.php:822 ../../mod/admin.php:864
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../../mod/admin.php:99 ../../mod/admin.php:1031 ../../mod/admin.php:1067
-msgid "Themes"
-msgstr "Temes"
-
-#: ../../mod/admin.php:100
-msgid "DB updates"
-msgstr "Actualitzacions de BD"
-
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1154
-msgid "Logs"
-msgstr "Registres"
-
-#: ../../mod/admin.php:120 ../../include/nav.php:178
-msgid "Admin"
-msgstr "Admin"
-
-#: ../../mod/admin.php:121
-msgid "Plugin Features"
-msgstr "Característiques del Plugin"
-
-#: ../../mod/admin.php:123
-msgid "User registrations waiting for confirmation"
-msgstr "Registre d'usuari a l'espera de confirmació"
-
-#: ../../mod/admin.php:183 ../../mod/admin.php:698
-msgid "Normal Account"
-msgstr "Compte Normal"
-
-#: ../../mod/admin.php:184 ../../mod/admin.php:699
-msgid "Soapbox Account"
-msgstr "Compte Tribuna"
-
-#: ../../mod/admin.php:185 ../../mod/admin.php:700
-msgid "Community/Celebrity Account"
-msgstr "Compte de Comunitat/Celebritat"
-
-#: ../../mod/admin.php:186 ../../mod/admin.php:701
-msgid "Automatic Friend Account"
-msgstr "Compte d'Amistat Automàtic"
-
-#: ../../mod/admin.php:187
-msgid "Blog Account"
-msgstr "Compte de Blog"
-
-#: ../../mod/admin.php:188
-msgid "Private Forum"
-msgstr "Fòrum Privat"
-
-#: ../../mod/admin.php:207
-msgid "Message queues"
-msgstr "Cues de missatges"
-
-#: ../../mod/admin.php:212 ../../mod/admin.php:459 ../../mod/admin.php:726
-#: ../../mod/admin.php:821 ../../mod/admin.php:863 ../../mod/admin.php:1030
-#: ../../mod/admin.php:1066 ../../mod/admin.php:1153
-msgid "Administration"
-msgstr "Administració"
-
-#: ../../mod/admin.php:213
-msgid "Summary"
-msgstr "Sumari"
-
-#: ../../mod/admin.php:215
-msgid "Registered users"
-msgstr "Usuaris registrats"
-
-#: ../../mod/admin.php:217
-msgid "Pending registrations"
-msgstr "Registres d'usuari pendents"
-
-#: ../../mod/admin.php:218
-msgid "Version"
-msgstr "Versió"
-
-#: ../../mod/admin.php:220
-msgid "Active plugins"
-msgstr "Plugins actius"
-
-#: ../../mod/admin.php:391
-msgid "Site settings updated."
-msgstr "Ajustos del lloc actualitzats."
-
-#: ../../mod/admin.php:446
-msgid "Closed"
-msgstr "Tancat"
-
-#: ../../mod/admin.php:447
-msgid "Requires approval"
-msgstr "Requereix aprovació"
-
-#: ../../mod/admin.php:448
-msgid "Open"
-msgstr "Obert"
-
-#: ../../mod/admin.php:452
-msgid "No SSL policy, links will track page SSL state"
-msgstr "No existe una política de SSL, se hará un seguimiento de los vínculos de la página con SSL"
-
-#: ../../mod/admin.php:453
-msgid "Force all links to use SSL"
-msgstr "Forzar a tots els enllaços a utilitzar SSL"
-
-#: ../../mod/admin.php:454
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
-msgstr "Certificat auto-signat, utilitzar SSL només per a enllaços locals (desaconsellat)"
-
-#: ../../mod/admin.php:463
-msgid "File upload"
-msgstr "Fitxer carregat"
-
-#: ../../mod/admin.php:464
-msgid "Policies"
-msgstr "Polítiques"
-
-#: ../../mod/admin.php:465
-msgid "Advanced"
-msgstr "Avançat"
-
-#: ../../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 "Nom del lloc"
-
-#: ../../mod/admin.php:471
-msgid "Banner/Logo"
-msgstr "Senyera/Logo"
-
-#: ../../mod/admin.php:472
-msgid "System language"
-msgstr "Idioma del Sistema"
-
-#: ../../mod/admin.php:473
-msgid "System theme"
-msgstr "Tema del sistema"
-
-#: ../../mod/admin.php:473
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr "Tema per defecte del sistema - pot ser obviat pels perfils del usuari - <a href='#' id='cnftheme'>Canviar ajustos de tema</a>"
-
-#: ../../mod/admin.php:474
-msgid "Mobile system theme"
-msgstr ""
-
-#: ../../mod/admin.php:474
-msgid "Theme for mobile devices"
-msgstr "Tema per a aparells mòbils"
-
-#: ../../mod/admin.php:475
-msgid "SSL link policy"
-msgstr "Política SSL per als enllaços"
-
-#: ../../mod/admin.php:475
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr "Determina si els enllaços generats han de ser forçats a utilitzar SSL"
-
-#: ../../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 "Mida màxima de les imatges"
-
-#: ../../mod/admin.php:477
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr "Mida màxima en bytes de les imatges a pujar. Per defecte es 0, que vol dir sense límits."
-
-#: ../../mod/admin.php:478
-msgid "Maximum image length"
-msgstr "Maxima longitud d'imatge"
-
-#: ../../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:479
-msgid "JPEG image quality"
-msgstr ""
-
-#: ../../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:481
-msgid "Register policy"
-msgstr "Política per a registrar"
-
-#: ../../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 "Text al registrar"
-
-#: ../../mod/admin.php:483
-msgid "Will be displayed prominently on the registration page."
-msgstr "Serà mostrat de forma preminent a la pàgina durant el procés de registre."
-
-#: ../../mod/admin.php:484
-msgid "Accounts abandoned after x days"
-msgstr "Comptes abandonats després de x dies"
-
-#: ../../mod/admin.php:484
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal."
-
-#: ../../mod/admin.php:485
-msgid "Allowed friend domains"
-msgstr "Dominis amics permesos"
-
-#: ../../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 "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis."
-
-#: ../../mod/admin.php:486
-msgid "Allowed email domains"
-msgstr "Dominis de correu permesos"
-
-#: ../../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 "Llista de dominis separada per comes, de adreçes de correu que són permeses per registrtar-se. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis."
-
-#: ../../mod/admin.php:487
-msgid "Block public"
-msgstr "Bloqueig públic"
-
-#: ../../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 "Bloqueja l'accés públic a qualsevol pàgina del lloc fins que t'hagis identificat."
-
-#: ../../mod/admin.php:488
-msgid "Force publish"
-msgstr "Forçar publicació"
-
-#: ../../mod/admin.php:488
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr "Obliga a que tots el perfils en aquest lloc siguin mostrats en el directori del lloc."
-
-#: ../../mod/admin.php:489
-msgid "Global directory update URL"
-msgstr "Actualitzar URL del directori global"
-
-#: ../../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 per actualitzar el directori global. Si no es configura, el directori global serà completament inaccesible per a l'aplicació. "
-
-#: ../../mod/admin.php:490
-msgid "Allow threaded items"
-msgstr ""
-
-#: ../../mod/admin.php:490
-msgid "Allow infinite level threading for items on this site."
-msgstr ""
-
-#: ../../mod/admin.php:491
-msgid "Private posts by default for new users"
-msgstr ""
-
-#: ../../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:493
-msgid "Block multiple registrations"
-msgstr "Bloquejar multiples registracions"
-
-#: ../../mod/admin.php:493
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr "Inhabilita als usuaris el crear comptes adicionals per a usar com a pàgines."
-
-#: ../../mod/admin.php:494
-msgid "OpenID support"
-msgstr "Suport per a OpenID"
-
-#: ../../mod/admin.php:494
-msgid "OpenID support for registration and logins."
-msgstr "Suport per a registre i validació a OpenID."
-
-#: ../../mod/admin.php:495
-msgid "Fullname check"
-msgstr "Comprobació de nom complet"
-
-#: ../../mod/admin.php:495
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr "Obliga els usuaris a col·locar un espai en blanc entre nom i cognoms, com a mesura antispam"
-
-#: ../../mod/admin.php:496
-msgid "UTF-8 Regular expressions"
-msgstr "expresions regulars UTF-8"
-
-#: ../../mod/admin.php:496
-msgid "Use PHP UTF8 regular expressions"
-msgstr "Empri expresions regulars de PHP amb format UTF8"
-
-#: ../../mod/admin.php:497
-msgid "Show Community Page"
-msgstr "Mostra la Pàgina de Comunitat"
-
-#: ../../mod/admin.php:497
-msgid ""
-"Display a Community page showing all recent public postings on this site."
-msgstr "Mostra a la pàgina de comunitat tots els missatges públics recents, d'aquest lloc."
-
-#: ../../mod/admin.php:498
-msgid "Enable OStatus support"
-msgstr "Activa el suport per a OStatus"
-
-#: ../../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 "Proveeix de compatibilitat integrada amb OStatus (identi.ca, status.net, etc). Totes les comunicacions a OStatus són públiques amb el que ocasionalment pots veure advertències."
-
-#: ../../mod/admin.php:499
-msgid "Enable Diaspora support"
-msgstr "Habilitar suport per Diaspora"
-
-#: ../../mod/admin.php:499
-msgid "Provide built-in Diaspora network compatibility."
-msgstr "Proveeix compatibilitat integrada amb la xarxa Diaspora"
-
-#: ../../mod/admin.php:500
-msgid "Only allow Friendica contacts"
-msgstr "Només permetre contactes de Friendica"
-
-#: ../../mod/admin.php:500
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
-msgstr "Tots els contactes "
-
-#: ../../mod/admin.php:501
-msgid "Verify SSL"
-msgstr "Verificar SSL"
-
-#: ../../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 "Si ho vols, pots comprovar el certificat estrictament. Això farà que no puguis connectar (de cap manera) amb llocs amb certificats SSL autosignats."
-
-#: ../../mod/admin.php:502
-msgid "Proxy user"
-msgstr "proxy d'usuari"
-
-#: ../../mod/admin.php:503
-msgid "Proxy URL"
-msgstr "URL del proxy"
-
-#: ../../mod/admin.php:504
-msgid "Network timeout"
-msgstr "Temps excedit a la xarxa"
-
-#: ../../mod/admin.php:504
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Valor en segons. Canviat a 0 es sense límits (no recomenat)"
-
-#: ../../mod/admin.php:505
-msgid "Delivery interval"
-msgstr "Interval d'entrega"
-
-#: ../../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 "Retardar processos d'entrega, en segon pla, en aquesta quantitat de segons, per reduir la càrrega del sistema . Recomanem : 4-5 per als servidors compartits , 2-3 per a servidors privats virtuals . 0-1 per els grans servidors dedicats."
-
-#: ../../mod/admin.php:506
-msgid "Poll interval"
-msgstr "Interval entre sondejos"
-
-#: ../../mod/admin.php:506
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr "Endarrerir els processos de sondeig en segon pla durant aquest període, en segons, per tal de reduir la càrrega de treball del sistema, Si s'empra 0, s'utilitza l'interval d'entregues. "
-
-#: ../../mod/admin.php:507
-msgid "Maximum Load Average"
-msgstr "Càrrega Màxima Sostinguda"
-
-#: ../../mod/admin.php:507
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr "Càrrega màxima del sistema abans d'apaçar els processos d'entrega i sondeig - predeterminat a 50."
-
-#: ../../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 "L'actualització ha estat marcada amb èxit"
-
-#: ../../mod/admin.php:542
-#, php-format
-msgid "Executing %s failed. Check system logs."
-msgstr "Ha fracassat l'execució de %s. Comprova el registre del sistema."
-
-#: ../../mod/admin.php:545
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "L'actualització de %s es va aplicar amb èxit."
-
-#: ../../mod/admin.php:549
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr "L'actualització de %s no ha retornat el seu estatus. Es desconeix si ha estat amb èxit."
-
-#: ../../mod/admin.php:552
-#, php-format
-msgid "Update function %s could not be found."
-msgstr "L'actualització de la funció %s no es pot trobar."
-
-#: ../../mod/admin.php:567
-msgid "No failed updates."
-msgstr "No hi ha actualitzacions fallides."
-
-#: ../../mod/admin.php:571
-msgid "Failed Updates"
-msgstr "Actualitzacions Fallides"
-
-#: ../../mod/admin.php:572
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr "Això no inclou actualitzacions anteriors a 1139, raó per la que no ha retornat l'estatus."
-
-#: ../../mod/admin.php:573
-msgid "Mark success (if update was manually applied)"
-msgstr "Marcat am èxit (si l'actualització es va fer manualment)"
-
-#: ../../mod/admin.php:574
-msgid "Attempt to execute this update step automatically"
-msgstr "Intentant executar aquest pas d'actualització automàticament"
-
-#: ../../mod/admin.php:599
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s usuari bloquejar/desbloquejar"
-msgstr[1] "%s usuaris bloquejar/desbloquejar"
-
-#: ../../mod/admin.php:606
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s usuari esborrat"
-msgstr[1] "%s usuaris esborrats"
-
-#: ../../mod/admin.php:645
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Usuari %s' esborrat"
-
-#: ../../mod/admin.php:653
-#, php-format
-msgid "User '%s' unblocked"
-msgstr "Usuari %s' desbloquejat"
-
-#: ../../mod/admin.php:653
-#, php-format
-msgid "User '%s' blocked"
-msgstr "L'usuari '%s' és bloquejat"
-
-#: ../../mod/admin.php:729
-msgid "select all"
-msgstr "Seleccionar tot"
-
-#: ../../mod/admin.php:730
-msgid "User registrations waiting for confirm"
-msgstr "Registre d'usuari esperant confirmació"
-
-#: ../../mod/admin.php:731
-msgid "Request date"
-msgstr "Data de sol·licitud"
-
-#: ../../mod/admin.php:731 ../../mod/admin.php:741
-#: ../../include/contact_selectors.php:79
-#: ../../include/contact_selectors.php:86
-msgid "Email"
-msgstr "Correu"
-
-#: ../../mod/admin.php:732
-msgid "No registrations."
-msgstr "Sense registres."
-
-#: ../../mod/admin.php:734
-msgid "Deny"
-msgstr "Denegar"
-
-#: ../../mod/admin.php:738
-msgid "Site admin"
-msgstr ""
-
-#: ../../mod/admin.php:741
-msgid "Register date"
-msgstr "Data de registre"
-
-#: ../../mod/admin.php:741
-msgid "Last login"
-msgstr "Últim accés"
-
-#: ../../mod/admin.php:741
-msgid "Last item"
-msgstr "Últim element"
-
-#: ../../mod/admin.php:741
-msgid "Account"
-msgstr "Compte"
-
-#: ../../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 "Els usuaris seleccionats seran esborrats!\\n\\nqualsevol cosa que aquests usuaris hagin publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?"
-
-#: ../../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 "L'usuari {0} s'eliminarà!\\n\\nQualsevol cosa que aquest usuari hagi publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?"
-
-#: ../../mod/admin.php:785
-#, php-format
-msgid "Plugin %s disabled."
-msgstr "Plugin %s deshabilitat."
-
-#: ../../mod/admin.php:789
-#, php-format
-msgid "Plugin %s enabled."
-msgstr "Plugin %s habilitat."
-
-#: ../../mod/admin.php:799 ../../mod/admin.php:1001
-msgid "Disable"
-msgstr "Deshabilitar"
-
-#: ../../mod/admin.php:801 ../../mod/admin.php:1003
-msgid "Enable"
-msgstr "Habilitar"
-
-#: ../../mod/admin.php:823 ../../mod/admin.php:1032
-msgid "Toggle"
-msgstr "Canviar"
-
-#: ../../mod/admin.php:831 ../../mod/admin.php:1042
-msgid "Author: "
-msgstr "Autor:"
-
-#: ../../mod/admin.php:832 ../../mod/admin.php:1043
-msgid "Maintainer: "
-msgstr "Responsable:"
-
-#: ../../mod/admin.php:961
-msgid "No themes found."
-msgstr "No s'ha trobat temes."
-
-#: ../../mod/admin.php:1024
-msgid "Screenshot"
-msgstr "Captura de pantalla"
-
-#: ../../mod/admin.php:1072
-msgid "[Experimental]"
-msgstr "[Experimental]"
-
-#: ../../mod/admin.php:1073
-msgid "[Unsupported]"
-msgstr "[No soportat]"
-
-#: ../../mod/admin.php:1100
-msgid "Log settings updated."
-msgstr "Configuració del registre actualitzada."
-
-#: ../../mod/admin.php:1156
-msgid "Clear"
-msgstr "Netejar"
-
-#: ../../mod/admin.php:1162
-msgid "Debugging"
-msgstr "Esplugar"
-
-#: ../../mod/admin.php:1163
-msgid "Log file"
-msgstr "Arxiu de registre"
-
-#: ../../mod/admin.php:1163
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr "Ha de tenir permisos d'escriptura pel servidor web. En relació amb el seu directori Friendica de nivell superior."
-
-#: ../../mod/admin.php:1164
-msgid "Log level"
-msgstr "Nivell de transcripció"
-
-#: ../../mod/admin.php:1214
-msgid "Close"
-msgstr "Tancar"
-
-#: ../../mod/admin.php:1220
-msgid "FTP Host"
-msgstr "Amfitrió FTP"
-
-#: ../../mod/admin.php:1221
-msgid "FTP Path"
-msgstr "Direcció FTP"
-
-#: ../../mod/admin.php:1222
-msgid "FTP User"
-msgstr "Usuari FTP"
-
-#: ../../mod/admin.php:1223
-msgid "FTP Password"
-msgstr "Contrasenya FTP"
-
-#: ../../mod/profile.php:21 ../../boot.php:1225
-msgid "Requested profile is not available."
-msgstr "El perfil sol·licitat no està disponible."
-
-#: ../../mod/profile.php:155 ../../mod/display.php:99
-msgid "Access to this profile has been restricted."
-msgstr "L'accés a aquest perfil ha estat restringit."
-
-#: ../../mod/profile.php:180
-msgid "Tips for New Members"
-msgstr "Consells per a nous membres"
-
-#: ../../mod/ping.php:238
-msgid "{0} wants to be your friend"
-msgstr "{0} vol ser el teu amic"
-
-#: ../../mod/ping.php:243
-msgid "{0} sent you a message"
-msgstr "{0} t'ha enviat un missatge de"
-
-#: ../../mod/ping.php:248
-msgid "{0} requested registration"
-msgstr "{0} solicituts de registre"
-
-#: ../../mod/ping.php:254
-#, php-format
-msgid "{0} commented %s's post"
-msgstr "{0} va comentar l'enviament de %s"
-
-#: ../../mod/ping.php:259
-#, php-format
-msgid "{0} liked %s's post"
-msgstr "A {0} l'ha agradat l'enviament de %s"
-
-#: ../../mod/ping.php:264
-#, php-format
-msgid "{0} disliked %s's post"
-msgstr "A {0} no l'ha agradat l'enviament de %s"
-
-#: ../../mod/ping.php:269
-#, php-format
-msgid "{0} is now friends with %s"
-msgstr "{0} ara és amic de %s"
-
-#: ../../mod/ping.php:274
-msgid "{0} posted"
-msgstr "{0} publicat"
-
-#: ../../mod/ping.php:279
-#, php-format
-msgid "{0} tagged %s's post with #%s"
-msgstr "{0} va etiquetar la publicació de %s com #%s"
-
-#: ../../mod/ping.php:285
-msgid "{0} mentioned you in a post"
-msgstr "{0} et menciona en un missatge"
-
-#: ../../mod/nogroup.php:59
-msgid "Contacts who are not members of a group"
-msgstr "Contactes que no pertanyen a cap grup"
-
-#: ../../mod/openid.php:24
-msgid "OpenID protocol error. No ID returned."
-msgstr "Error al protocol OpenID. No ha retornat ID."
-
-#: ../../mod/openid.php:53
-msgid ""
-"Account not found and OpenID registration is not permitted on this site."
-msgstr "Compte no trobat i el registrar-se amb OpenID no està permès en aquest lloc."
-
-#: ../../mod/openid.php:93 ../../include/auth.php:112
-#: ../../include/auth.php:175
-msgid "Login failed."
-msgstr "Error d'accés."
-
-#: ../../mod/follow.php:27
-msgid "Contact added"
-msgstr "Contacte afegit"
-
-#: ../../mod/common.php:42
-msgid "Common Friends"
-msgstr "Amics Comuns"
-
-#: ../../mod/common.php:78
-msgid "No contacts in common."
-msgstr "Sense contactes en comú."
-
-#: ../../mod/subthread.php:103
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr ""
-
-#: ../../mod/share.php:44
-msgid "link"
-msgstr "enllaç"
-
-#: ../../mod/display.php:177
-msgid "Item has been removed."
-msgstr "El element ha estat esborrat."
-
-#: ../../mod/apps.php:4
-msgid "Applications"
-msgstr "Aplicacions"
-
-#: ../../mod/apps.php:7
-msgid "No installed applications."
-msgstr "Aplicacions no instal·lades."
-
-#: ../../mod/search.php:99 ../../include/text.php:738
-#: ../../include/text.php:739 ../../include/nav.php:118
-msgid "Search"
-msgstr "Cercar"
-
-#: ../../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 "Perfil no trobat."
-
-#: ../../mod/profiles.php:37
-msgid "Profile deleted."
-msgstr "Perfil esborrat."
-
-#: ../../mod/profiles.php:55 ../../mod/profiles.php:89
-msgid "Profile-"
-msgstr "Perfil-"
-
-#: ../../mod/profiles.php:74 ../../mod/profiles.php:117
-msgid "New profile created."
-msgstr "Nou perfil creat."
-
-#: ../../mod/profiles.php:95
-msgid "Profile unavailable to clone."
-msgstr "No es pot clonar el perfil."
-
-#: ../../mod/profiles.php:170
-msgid "Profile Name is required."
-msgstr "Nom de perfil requerit."
-
-#: ../../mod/profiles.php:317
-msgid "Marital Status"
-msgstr "Estatus Marital"
-
-#: ../../mod/profiles.php:321
-msgid "Romantic Partner"
-msgstr "Soci Romàntic"
-
-#: ../../mod/profiles.php:325
-msgid "Likes"
-msgstr "Agrada"
-
-#: ../../mod/profiles.php:329
-msgid "Dislikes"
-msgstr "No agrada"
-
-#: ../../mod/profiles.php:333
-msgid "Work/Employment"
-msgstr "Treball/Ocupació"
-
-#: ../../mod/profiles.php:336
-msgid "Religion"
-msgstr "Religió"
-
-#: ../../mod/profiles.php:340
-msgid "Political Views"
-msgstr "Idees Polítiques"
-
-#: ../../mod/profiles.php:344
-msgid "Gender"
-msgstr "Gènere"
-
-#: ../../mod/profiles.php:348
-msgid "Sexual Preference"
-msgstr "Preferència sexual"
-
-#: ../../mod/profiles.php:352
-msgid "Homepage"
-msgstr "Inici"
-
-#: ../../mod/profiles.php:356
-msgid "Interests"
-msgstr "Interesos"
-
-#: ../../mod/profiles.php:360
-msgid "Address"
-msgstr "Adreça"
-
-#: ../../mod/profiles.php:367 ../../addon/dav/common/wdcal_edit.inc.php:183
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:183
-msgid "Location"
-msgstr "Ubicació"
-
-#: ../../mod/profiles.php:450
-msgid "Profile updated."
-msgstr "Perfil actualitzat."
-
-#: ../../mod/profiles.php:517
-msgid " and "
-msgstr " i "
-
-#: ../../mod/profiles.php:525
-msgid "public profile"
-msgstr "perfil públic"
-
-#: ../../mod/profiles.php:528
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s s'ha canviat de %2$s a &ldquo;%3$s&rdquo;"
-
-#: ../../mod/profiles.php:529
-#, php-format
-msgid " - Visit %1$s's %2$s"
-msgstr " - Visita %1$s de %2$s"
-
-#: ../../mod/profiles.php:532
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s te una actualització %2$s, canviant %3$s."
-
-#: ../../mod/profiles.php:605
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Amaga la llista de contactes/amics en la vista d'aquest perfil?"
-
-#: ../../mod/profiles.php:625
-msgid "Edit Profile Details"
-msgstr "Editor de Detalls del Perfil"
-
-#: ../../mod/profiles.php:627
-msgid "Change Profile Photo"
-msgstr ""
-
-#: ../../mod/profiles.php:628
-msgid "View this profile"
-msgstr "Veure aquest perfil"
-
-#: ../../mod/profiles.php:629
-msgid "Create a new profile using these settings"
-msgstr "Crear un nou perfil amb aquests ajustos"
-
-#: ../../mod/profiles.php:630
-msgid "Clone this profile"
-msgstr "Clonar aquest perfil"
-
-#: ../../mod/profiles.php:631
-msgid "Delete this profile"
-msgstr "Esborrar aquest perfil"
-
-#: ../../mod/profiles.php:632
-msgid "Profile Name:"
-msgstr "Nom de Perfil:"
-
-#: ../../mod/profiles.php:633
-msgid "Your Full Name:"
-msgstr "El Teu Nom Complet."
-
-#: ../../mod/profiles.php:634
-msgid "Title/Description:"
-msgstr "Títol/Descripció:"
-
-#: ../../mod/profiles.php:635
-msgid "Your Gender:"
-msgstr "Gènere:"
-
-#: ../../mod/profiles.php:636
-#, php-format
-msgid "Birthday (%s):"
-msgstr "Aniversari (%s)"
-
-#: ../../mod/profiles.php:637
-msgid "Street Address:"
-msgstr "Direcció:"
-
-#: ../../mod/profiles.php:638
-msgid "Locality/City:"
-msgstr "Localitat/Ciutat:"
-
-#: ../../mod/profiles.php:639
-msgid "Postal/Zip Code:"
-msgstr "Codi Postal:"
-
-#: ../../mod/profiles.php:640
-msgid "Country:"
-msgstr "País"
-
-#: ../../mod/profiles.php:641
-msgid "Region/State:"
-msgstr "Regió/Estat:"
-
-#: ../../mod/profiles.php:642
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr "<span class=\"heart\">&hearts;</span> Estat Civil:"
-
-#: ../../mod/profiles.php:643
-msgid "Who: (if applicable)"
-msgstr "Qui? (si és aplicable)"
-
-#: ../../mod/profiles.php:644
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Exemples: cathy123, Cathy Williams, cathy@example.com"
-
-#: ../../mod/profiles.php:645
-msgid "Since [date]:"
-msgstr "Des de [data]"
-
-#: ../../mod/profiles.php:646 ../../include/profile_advanced.php:46
-msgid "Sexual Preference:"
-msgstr "Preferència Sexual:"
-
-#: ../../mod/profiles.php:647
-msgid "Homepage URL:"
-msgstr "Pàgina web URL:"
-
-#: ../../mod/profiles.php:648 ../../include/profile_advanced.php:50
-msgid "Hometown:"
-msgstr "Lloc de residència:"
-
-#: ../../mod/profiles.php:649 ../../include/profile_advanced.php:54
-msgid "Political Views:"
-msgstr "Idees Polítiques:"
-
-#: ../../mod/profiles.php:650
-msgid "Religious Views:"
-msgstr "Creencies Religioses:"
-
-#: ../../mod/profiles.php:651
-msgid "Public Keywords:"
-msgstr "Paraules Clau Públiques"
-
-#: ../../mod/profiles.php:652
-msgid "Private Keywords:"
-msgstr "Paraules Clau Privades:"
-
-#: ../../mod/profiles.php:653 ../../include/profile_advanced.php:62
-msgid "Likes:"
-msgstr "Agrada:"
-
-#: ../../mod/profiles.php:654 ../../include/profile_advanced.php:64
-msgid "Dislikes:"
-msgstr "No Agrada"
-
-#: ../../mod/profiles.php:655
-msgid "Example: fishing photography software"
-msgstr "Exemple: pesca fotografia programari"
-
-#: ../../mod/profiles.php:656
-msgid "(Used for suggesting potential friends, can be seen by others)"
-msgstr "(Emprat per suggerir potencials amics, Altres poden veure-ho)"
-
-#: ../../mod/profiles.php:657
-msgid "(Used for searching profiles, never shown to others)"
-msgstr "(Emprat durant la cerca de perfils, mai mostrat a ningú)"
-
-#: ../../mod/profiles.php:658
-msgid "Tell us about yourself..."
-msgstr "Parla'ns de tú....."
-
-#: ../../mod/profiles.php:659
-msgid "Hobbies/Interests"
-msgstr "Aficions/Interessos"
-
-#: ../../mod/profiles.php:660
-msgid "Contact information and Social Networks"
-msgstr "Informació de contacte i Xarxes Socials"
-
-#: ../../mod/profiles.php:661
-msgid "Musical interests"
-msgstr "Gustos musicals"
-
-#: ../../mod/profiles.php:662
-msgid "Books, literature"
-msgstr "Llibres, Literatura"
-
-#: ../../mod/profiles.php:663
-msgid "Television"
-msgstr "Televisió"
-
-#: ../../mod/profiles.php:664
-msgid "Film/dance/culture/entertainment"
-msgstr "Cinema/ball/cultura/entreteniments"
-
-#: ../../mod/profiles.php:665
-msgid "Love/romance"
-msgstr "Amor/sentiments"
-
-#: ../../mod/profiles.php:666
-msgid "Work/employment"
-msgstr "Treball/ocupació"
-
-#: ../../mod/profiles.php:667
-msgid "School/education"
-msgstr "Ensenyament/estudis"
-
-#: ../../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 "Aquest és el teu perfil <strong>públic</strong>.<br />El qual <strong>pot</strong> ser visible per qualsevol qui faci servir Internet."
-
-#: ../../mod/profiles.php:682 ../../mod/directory.php:111
-#: ../../addon/forumdirectory/forumdirectory.php:133
-msgid "Age: "
-msgstr "Edat:"
-
-#: ../../mod/profiles.php:721
-msgid "Edit/Manage Profiles"
-msgstr "Editar/Gestionar Perfils"
-
-#: ../../mod/profiles.php:722 ../../boot.php:1345
-msgid "Change profile photo"
-msgstr "Canviar la foto del perfil"
-
-#: ../../mod/profiles.php:723 ../../boot.php:1346
-msgid "Create New Profile"
-msgstr "Crear un Nou Perfil"
-
-#: ../../mod/profiles.php:734 ../../boot.php:1356
-msgid "Profile Image"
-msgstr "Imatge del Perfil"
-
-#: ../../mod/profiles.php:736 ../../boot.php:1359
-msgid "visible to everybody"
-msgstr "Visible per tothom"
-
-#: ../../mod/profiles.php:737 ../../boot.php:1360
-msgid "Edit visibility"
-msgstr "Editar visibilitat"
-
-#: ../../mod/filer.php:30 ../../include/conversation.php:944
-#: ../../include/conversation.php:962
-msgid "Save to Folder:"
-msgstr "Guardar a la Carpeta:"
-
-#: ../../mod/filer.php:30
-msgid "- select -"
-msgstr "- seleccionar -"
-
-#: ../../mod/tagger.php:95 ../../include/conversation.php:266
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s etiquetats %2$s %3$s amb %4$s"
-
-#: ../../mod/delegate.php:95
-msgid "No potential page delegates located."
-msgstr "No es troben pàgines potencialment delegades."
-
-#: ../../mod/delegate.php:121 ../../include/nav.php:165
-msgid "Delegate Page Management"
-msgstr "Gestió de les Pàgines Delegades"
-
-#: ../../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 "Els delegats poden gestionar tots els aspectes d'aquest compte/pàgina, excepte per als ajustaments bàsics del compte. Si us plau, no deleguin el seu compte personal a ningú que no confiïn completament."
-
-#: ../../mod/delegate.php:124
-msgid "Existing Page Managers"
-msgstr "Actuals Administradors de Pàgina"
-
-#: ../../mod/delegate.php:126
-msgid "Existing Page Delegates"
-msgstr "Actuals Delegats de Pàgina"
-
-#: ../../mod/delegate.php:128
-msgid "Potential Delegates"
-msgstr "Delegats Potencials"
-
-#: ../../mod/delegate.php:131
-msgid "Add"
-msgstr "Afegir"
-
-#: ../../mod/delegate.php:132
-msgid "No entries."
-msgstr "Sense entrades"
-
-#: ../../mod/babel.php:17
-msgid "Source (bbcode) text:"
-msgstr "Text Codi (bbcode): "
-
-#: ../../mod/babel.php:23
-msgid "Source (Diaspora) text to convert to BBcode:"
-msgstr "Font (Diaspora) Convertir text a BBcode"
-
-#: ../../mod/babel.php:31
-msgid "Source input: "
-msgstr "Entrada de Codi:"
-
-#: ../../mod/babel.php:35
-msgid "bb2html (raw HTML): "
-msgstr ""
-
-#: ../../mod/babel.php:39
-msgid "bb2html: "
-msgstr "bb2html: "
-
-#: ../../mod/babel.php:43
-msgid "bb2html2bb: "
-msgstr "bb2html2bb: "
-
-#: ../../mod/babel.php:47
-msgid "bb2md: "
-msgstr "bb2md: "
-
-#: ../../mod/babel.php:51
-msgid "bb2md2html: "
-msgstr "bb2md2html: "
-
-#: ../../mod/babel.php:55
-msgid "bb2dia2bb: "
-msgstr "bb2dia2bb: "
-
-#: ../../mod/babel.php:59
-msgid "bb2md2html2bb: "
-msgstr "bb2md2html2bb: "
-
-#: ../../mod/babel.php:69
-msgid "Source input (Diaspora format): "
-msgstr "Font d'entrada (format de Diaspora)"
-
-#: ../../mod/babel.php:74
-msgid "diaspora2bb: "
-msgstr "diaspora2bb: "
-
-#: ../../mod/suggest.php:27
-msgid "Do you really want to delete this suggestion?"
-msgstr ""
-
-#: ../../mod/suggest.php:66 ../../view/theme/diabook/theme.php:520
-#: ../../include/contact_widgets.php:34
-msgid "Friend Suggestions"
-msgstr "Amics Suggerits"
-
-#: ../../mod/suggest.php:72
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Cap suggeriment disponible. Si això és un nou lloc, si us plau torna a intentar en 24 hores."
-
-#: ../../mod/suggest.php:90
-msgid "Ignore/Hide"
-msgstr "Ignorar/Amagar"
-
-#: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71
-#: ../../view/theme/diabook/theme.php:518
-msgid "Global Directory"
-msgstr "Directori Global"
-
-#: ../../mod/directory.php:57 ../../addon/forumdirectory/forumdirectory.php:79
-msgid "Find on this site"
-msgstr "Trobat en aquest lloc"
-
-#: ../../mod/directory.php:60 ../../addon/forumdirectory/forumdirectory.php:82
-msgid "Site Directory"
-msgstr "Directori Local"
-
-#: ../../mod/directory.php:114
-#: ../../addon/forumdirectory/forumdirectory.php:136
-msgid "Gender: "
-msgstr "Gènere:"
-
-#: ../../mod/directory.php:136
-#: ../../addon/forumdirectory/forumdirectory.php:158
-#: ../../include/profile_advanced.php:17 ../../boot.php:1381
+#: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
+#: ../../boot.php:1486
 msgid "Gender:"
 msgstr "Gènere:"
 
-#: ../../mod/directory.php:138
-#: ../../addon/forumdirectory/forumdirectory.php:160
-#: ../../include/profile_advanced.php:37 ../../boot.php:1384
-msgid "Status:"
-msgstr "Estatus:"
-
-#: ../../mod/directory.php:140
-#: ../../addon/forumdirectory/forumdirectory.php:162
-#: ../../include/profile_advanced.php:48 ../../boot.php:1386
-msgid "Homepage:"
-msgstr "Pàgina web:"
-
-#: ../../mod/directory.php:142
-#: ../../addon/forumdirectory/forumdirectory.php:164
-#: ../../include/profile_advanced.php:58
-msgid "About:"
-msgstr "Acerca de:"
-
-#: ../../mod/directory.php:187
-#: ../../addon/forumdirectory/forumdirectory.php:201
-msgid "No entries (some entries may be hidden)."
-msgstr "No hi ha entrades (algunes de les entrades poden estar amagades)."
-
-#: ../../mod/invite.php:27
-msgid "Total invitation limit exceeded."
-msgstr ""
-
-#: ../../mod/invite.php:49
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : No es una adreça de correu vàlida"
-
-#: ../../mod/invite.php:73
-msgid "Please join us on Friendica"
-msgstr "Per favor, uneixi's a nosaltres en Friendica"
-
-#: ../../mod/invite.php:84
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr ""
-
-#: ../../mod/invite.php:89
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Ha fallat l'entrega del missatge."
-
-#: ../../mod/invite.php:93
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d missatge enviat"
-msgstr[1] "%d missatges enviats."
-
-#: ../../mod/invite.php:112
-msgid "You have no more invitations available"
-msgstr "No te més invitacions disponibles"
-
-#: ../../mod/invite.php:120
-#, php-format
-msgid ""
-"Visit %s for a list of public sites that you can join. Friendica members on "
-"other sites can all connect with each other, as well as with members of many"
-" other social networks."
-msgstr "Visita %s per a una llista de llocs públics on unir-te. Els membres de Friendica d'altres llocs poden connectar-se de forma total, així com amb membres de moltes altres xarxes socials."
-
-#: ../../mod/invite.php:122
-#, php-format
-msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
-msgstr "Per acceptar aquesta invitació, per favor visita i registra't a %s o en qualsevol altre pàgina web pública Friendica."
-
-#: ../../mod/invite.php:123
-#, php-format
-msgid ""
-"Friendica sites all inter-connect to create a huge privacy-enhanced social "
-"web that is owned and controlled by its members. They can also connect with "
-"many traditional social networks. See %s for a list of alternate Friendica "
-"sites you can join."
-msgstr "Tots els llocs Friendica estàn interconnectats per crear una web social amb privacitat millorada, controlada i propietat dels seus membres. També poden connectar amb moltes xarxes socials tradicionals. Consulteu %s per a una llista de llocs de Friendica alternatius en que pot inscriure's."
-
-#: ../../mod/invite.php:126
-msgid ""
-"Our apologies. This system is not currently configured to connect with other"
-" public sites or invite members."
-msgstr "Nostres disculpes. Aquest sistema no està configurat actualment per connectar amb altres llocs públics o convidar als membres."
-
-#: ../../mod/invite.php:132
-msgid "Send invitations"
-msgstr "Enviant Invitacions"
-
-#: ../../mod/invite.php:133
-msgid "Enter email addresses, one per line:"
-msgstr "Entri adreçes de correu, una per línia:"
-
-#: ../../mod/invite.php:135
-msgid ""
-"You are cordially invited to join me and other close friends on Friendica - "
-"and help us to create a better social web."
-msgstr "Estàs cordialment convidat a ajuntarte a mi i altres amics propers en Friendica - i ajudar-nos a crear una millor web social."
-
-#: ../../mod/invite.php:137
-msgid "You will need to supply this invitation code: $invite_code"
-msgstr "Vostè haurà de proporcionar aquest codi d'invitació: $invite_code"
-
-#: ../../mod/invite.php:137
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
-msgstr "Un cop registrat, si us plau contactar amb mi a través de la meva pàgina de perfil a:"
-
-#: ../../mod/invite.php:139
-msgid ""
-"For more information about the Friendica project and why we feel it is "
-"important, please visit http://friendica.com"
-msgstr "Per a més informació sobre el projecte Friendica i perque creiem que això es important, per favor, visita http://friendica.com"
-
-#: ../../mod/dfrn_confirm.php:119
-msgid ""
-"This may occasionally happen if contact was requested by both persons and it"
-" has already been approved."
-msgstr "Això pot ocorre ocasionalment si el contacte fa una petició per ambdues persones i ja han estat aprovades."
-
-#: ../../mod/dfrn_confirm.php:237
-msgid "Response from remote site was not understood."
-msgstr "La resposta des del lloc remot no s'entenia."
-
-#: ../../mod/dfrn_confirm.php:246
-msgid "Unexpected response from remote site: "
-msgstr "Resposta inesperada de lloc remot:"
-
-#: ../../mod/dfrn_confirm.php:254
-msgid "Confirmation completed successfully."
-msgstr "La confirmació s'ha completat correctament."
-
-#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
-#: ../../mod/dfrn_confirm.php:277
-msgid "Remote site reported: "
-msgstr "El lloc remot informa:"
-
-#: ../../mod/dfrn_confirm.php:268
-msgid "Temporary failure. Please wait and try again."
-msgstr "Fallada temporal. Si us plau, espereu i torneu a intentar."
-
-#: ../../mod/dfrn_confirm.php:275
-msgid "Introduction failed or was revoked."
-msgstr "La presentació va fallar o va ser revocada."
-
-#: ../../mod/dfrn_confirm.php:420
-msgid "Unable to set contact photo."
-msgstr "No es pot canviar la foto de contacte."
-
-#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:621
-#: ../../include/conversation.php:172
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr "%1$s és ara amic amb %2$s"
-
-#: ../../mod/dfrn_confirm.php:562
-#, php-format
-msgid "No user record found for '%s' "
-msgstr "No es troben registres d'usuari per a '%s'"
-
-#: ../../mod/dfrn_confirm.php:572
-msgid "Our site encryption key is apparently messed up."
-msgstr "La nostra clau de xifrat del lloc pel que sembla en mal estat."
-
-#: ../../mod/dfrn_confirm.php:583
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr "Es va proporcionar una URL del lloc buida o la URL no va poder ser desxifrada per nosaltres."
-
-#: ../../mod/dfrn_confirm.php:604
-msgid "Contact record was not found for you on our site."
-msgstr "No s'han trobat registres del contacte al nostre lloc."
-
-#: ../../mod/dfrn_confirm.php:618
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr "la clau pública del lloc no disponible en les dades del contacte per URL %s."
-
-#: ../../mod/dfrn_confirm.php:638
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
-msgstr "La ID proporcionada pel seu sistema és un duplicat en el nostre sistema. Hauria de treballar si intenta de nou."
-
-#: ../../mod/dfrn_confirm.php:649
-msgid "Unable to set your contact credentials on our system."
-msgstr "No es pot canviar les seves credencials de contacte en el nostre sistema."
-
-#: ../../mod/dfrn_confirm.php:716
-msgid "Unable to update your contact profile details on our system"
-msgstr "No es pot actualitzar els detalls del seu perfil de contacte en el nostre sistema"
-
-#: ../../mod/dfrn_confirm.php:751
-#, php-format
-msgid "Connection accepted at %s"
-msgstr "Connexió acceptada en %s"
-
-#: ../../mod/dfrn_confirm.php:800
-#, php-format
-msgid "%1$s has joined %2$s"
-msgstr "%1$s s'ha unit a  %2$s"
-
-#: ../../addon/fromgplus/fromgplus.php:33
-#: ../../addon.old/fromgplus/fromgplus.php:29
-msgid "Google+ Import Settings"
-msgstr "Ajustos Google+ Import"
-
-#: ../../addon/fromgplus/fromgplus.php:36
-#: ../../addon.old/fromgplus/fromgplus.php:32
-msgid "Enable Google+ Import"
-msgstr "Habilita Google+ Import"
-
-#: ../../addon/fromgplus/fromgplus.php:39
-#: ../../addon.old/fromgplus/fromgplus.php:35
-msgid "Google Account ID"
-msgstr "ID del compte Google"
-
-#: ../../addon/fromgplus/fromgplus.php:59
-#: ../../addon.old/fromgplus/fromgplus.php:55
-msgid "Google+ Import Settings saved."
-msgstr "Ajustos Google+ Import guardats."
-
-#: ../../addon/facebook/facebook.php:525
-#: ../../addon.old/facebook/facebook.php:523
-msgid "Facebook disabled"
-msgstr "Facebook deshabilitat"
-
-#: ../../addon/facebook/facebook.php:530
-#: ../../addon.old/facebook/facebook.php:528
-msgid "Updating contacts"
-msgstr "Actualitzant contactes"
-
-#: ../../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 "La clau del API de Facebook s'ha perdut."
-
-#: ../../addon/facebook/facebook.php:560
-#: ../../addon.old/facebook/facebook.php:558
-msgid "Facebook Connect"
-msgstr "Facebook Connectat"
-
-#: ../../addon/facebook/facebook.php:566
-#: ../../addon.old/facebook/facebook.php:564
-msgid "Install Facebook connector for this account."
-msgstr "Instal·lar el connector de Facebook per aquest compte."
-
-#: ../../addon/facebook/facebook.php:573
-#: ../../addon.old/facebook/facebook.php:571
-msgid "Remove Facebook connector"
-msgstr "Eliminar el connector de Faceboook"
-
-#: ../../addon/facebook/facebook.php:578 ../../addon/fbpost/fbpost.php:228
-#: ../../addon.old/facebook/facebook.php:576
-#: ../../addon.old/fbpost/fbpost.php:217
-msgid ""
-"Re-authenticate [This is necessary whenever your Facebook password is "
-"changed.]"
-msgstr "Re-autentificar [Això és necessari cada vegada que la contrasenya de Facebook canvia.]"
-
-#: ../../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 "Enviar a Facebook per defecte"
-
-#: ../../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 "La vinculació amb amics de Facebook s'ha deshabilitat en aquest lloc. Els ajustos que facis no faran efecte."
-
-#: ../../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 "La vinculació amb amics de Facebook s'ha deshabilitat en aquest lloc. Si esta deshabilitat, no es pot utilitzar."
-
-#: ../../addon/facebook/facebook.php:598
-#: ../../addon.old/facebook/facebook.php:596
-msgid "Link all your Facebook friends and conversations on this website"
-msgstr "Enllaça tots els teus amics i les converses de Facebook en aquest lloc web"
-
-#: ../../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 "Les converses de Facebook consisteixen en el <em>perfil del mur</em> i en el<em> flux </em> del seu amic."
-
-#: ../../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 "En aquesta pàgina web, el flux del seu amic a Facebook només és visible per a vostè."
-
-#: ../../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 "Les següents opcions determinen la privacitat del mur del seu perfil de Facebook en aquest lloc web."
-
-#: ../../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 "En aquesta pàgina web les seves converses al mur del perfil de Facebook només seran visible per a vostè"
-
-#: ../../addon/facebook/facebook.php:611
-#: ../../addon.old/facebook/facebook.php:609
-msgid "Do not import your Facebook profile wall conversations"
-msgstr "No importi les seves converses del mur del perfil de Facebook"
-
-#: ../../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,"
-" 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."
-msgstr "Si opta per vincular les converses i deixar ambdues caselles sense marcar, el mur del seu perfil de Facebook es fusionarà amb el mur del seu perfil en aquest lloc web i la seva configuració de privacitat en aquest website serà utilitzada per determinar qui pot veure les converses."
-
-#: ../../addon/facebook/facebook.php:618
-#: ../../addon.old/facebook/facebook.php:616
-msgid "Comma separated applications to ignore"
-msgstr "Separats per comes les aplicacions a ignorar"
-
-#: ../../addon/facebook/facebook.php:702
-#: ../../addon.old/facebook/facebook.php:700
-msgid "Problems with Facebook Real-Time Updates"
-msgstr "Problemes amb Actualitzacions en Temps Real a Facebook"
-
-#: ../../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 "Administrador"
-
-#: ../../addon/facebook/facebook.php:731
-#: ../../addon.old/facebook/facebook.php:729
-msgid "Facebook Connector Settings"
-msgstr "Ajustos del Connector de Facebook"
-
-#: ../../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 Key"
-
-#: ../../addon/facebook/facebook.php:756 ../../addon/fbpost/fbpost.php:317
-#: ../../addon.old/facebook/facebook.php:754
-#: ../../addon.old/fbpost/fbpost.php:262
-msgid ""
-"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>"
-msgstr "Error: Apareix que has especificat el App-ID i el Secret en el arxiu .htconfig.php. Per estar especificat allà, no pot ser canviat utilitzant aquest formulari.<br><br>"
-
-#: ../../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 "Error: la API Key facilitada sembla incorrecta (no es va poder recuperar el token d'accés de l'aplicatiu)."
-
-#: ../../addon/facebook/facebook.php:763
-#: ../../addon.old/facebook/facebook.php:761
-msgid "The given API Key seems to work correctly."
-msgstr "La API Key facilitada sembla treballar correctament."
-
-#: ../../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 "La correcció de la API key no pot ser detectada. Quelcom estrany ha succeït."
-
-#: ../../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:769 ../../addon/fbpost/fbpost.php:320
-#: ../../addon.old/facebook/facebook.php:767
-#: ../../addon.old/fbpost/fbpost.php:265
-msgid "Application secret"
-msgstr "Application secret"
-
-#: ../../addon/facebook/facebook.php:770
-#: ../../addon.old/facebook/facebook.php:768
-#, php-format
-msgid "Polling Interval in minutes (minimum %1$s minutes)"
-msgstr "Interval entre sondejos en minuts (mínim %1s minuts)"
-
-#: ../../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 "Sincronitzar els comentaris (els comentaris a Facebook es perden, a costa de la major càrrega del sistema)"
-
-#: ../../addon/facebook/facebook.php:775
-#: ../../addon.old/facebook/facebook.php:773
-msgid "Real-Time Updates"
-msgstr "Actualitzacions en Temps Real"
-
-#: ../../addon/facebook/facebook.php:779
-#: ../../addon.old/facebook/facebook.php:777
-msgid "Real-Time Updates are activated."
-msgstr "Actualitzacions en Temps Real està activat."
-
-#: ../../addon/facebook/facebook.php:780
-#: ../../addon.old/facebook/facebook.php:778
-msgid "Deactivate Real-Time Updates"
-msgstr "Actualitzacions en Temps Real Desactivat"
-
-#: ../../addon/facebook/facebook.php:782
-#: ../../addon.old/facebook/facebook.php:780
-msgid "Real-Time Updates not activated."
-msgstr "Actualitzacions en Temps Real no activat."
-
-#: ../../addon/facebook/facebook.php:782
-#: ../../addon.old/facebook/facebook.php:780
-msgid "Activate Real-Time Updates"
-msgstr "Actualitzacions en Temps Real Activat"
-
-#: ../../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
-#: ../../addon.old/dav/friendica/layout.fnk.php:361
-msgid "The new values have been saved."
-msgstr "Els nous valors s'han guardat."
-
-#: ../../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 "Enviament a Facebook"
-
-#: ../../addon/facebook/facebook.php:923 ../../addon/fbpost/fbpost.php:487
-#: ../../addon.old/facebook/facebook.php:921
-#: ../../addon.old/fbpost/fbpost.php:399
-msgid ""
-"Post to Facebook cancelled because of multi-network access permission "
-"conflict."
-msgstr "Enviament a Facebook cancel·lat perque hi ha un conflicte de permisos d'accés multi-xarxa."
-
-#: ../../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 "Vist en Friendica"
-
-#: ../../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 "Enviament a Facebook fracassat. En cua per a reintent."
-
-#: ../../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 "La seva connexió a Facebook es va convertir en no vàlida. Per favor, torni a autenticar-se"
-
-#: ../../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 "La seva connexió a Facebook es va convertir en no vàlida"
-
-#: ../../addon/facebook/facebook.php:1226 ../../addon/fbpost/fbpost.php:845
-#: ../../addon.old/facebook/facebook.php:1224
-#: ../../addon.old/fbpost/fbpost.php:685
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"The connection between your accounts on %2$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
-msgstr "Hi %1$s,\n\nLa connexió entre els teus comptes en %2$s i Facebook s'han tornat no vàlides. Això passa normalment quan canvies la contrasenya de Facebook. Per activar la conexió novament has de %3$sre-autenticar el connector de Facebook%4$s."
-
-#: ../../addon/snautofollow/snautofollow.php:32
-#: ../../addon.old/snautofollow/snautofollow.php:32
-msgid "StatusNet AutoFollow settings updated."
-msgstr "Ajustos de AutoSeguiment a StatusNet actualitzats."
-
-#: ../../addon/snautofollow/snautofollow.php:56
-#: ../../addon.old/snautofollow/snautofollow.php:56
-msgid "StatusNet AutoFollow Settings"
-msgstr "Ajustos de AutoSeguiment a StatusNet"
-
-#: ../../addon/snautofollow/snautofollow.php:58
-#: ../../addon.old/snautofollow/snautofollow.php:58
-msgid "Automatically follow any StatusNet followers/mentioners"
-msgstr "Segueix Automaticament qualsevol seguidor/mencionador de StatusNet"
-
-#: ../../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 "Temps de vida de la caché (en hores)"
-
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:356
-#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265
-msgid "Cache Statistics"
-msgstr "Estadístiques de la caché"
-
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:359
-#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268
-msgid "Number of items"
-msgstr "Nombre d'elements"
-
-#: ../../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 "Mida de la caché"
-
-#: ../../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 "Esborra tota la cachè"
-
-#: ../../addon/fbpost/fbpost.php:183 ../../addon.old/fbpost/fbpost.php:172
-msgid "Facebook Post disabled"
-msgstr ""
-
-#: ../../addon/fbpost/fbpost.php:210 ../../addon.old/fbpost/fbpost.php:199
-msgid "Facebook Post"
-msgstr ""
-
-#: ../../addon/fbpost/fbpost.php:216 ../../addon.old/fbpost/fbpost.php:205
-msgid "Install Facebook Post connector for this account."
-msgstr ""
-
-#: ../../addon/fbpost/fbpost.php:223 ../../addon.old/fbpost/fbpost.php:212
-msgid "Remove Facebook Post connector"
-msgstr ""
-
-#: ../../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/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 persona li agrada això"
-msgstr[1] "%d persones els agrada això"
-
-#: ../../addon/widgets/widget_like.php:62
-#: ../../addon.old/widgets/widget_like.php:61
-#, php-format
-msgid "%d person doesn't like this"
-msgid_plural "%d people don't like this"
-msgstr[0] "%d persona no li agrada això"
-msgstr[1] "%d persones no els agrada això"
-
-#: ../../addon/widgets/widget_friendheader.php:40
-#: ../../addon.old/widgets/widget_friendheader.php:40
-msgid "Get added to this list!"
-msgstr "S'afegeixen a aquesta llista!"
-
-#: ../../addon/widgets/widgets.php:57 ../../addon.old/widgets/widgets.php:56
-msgid "Generate new key"
-msgstr "Generar nova clau"
-
-#: ../../addon/widgets/widgets.php:60 ../../addon.old/widgets/widgets.php:59
-msgid "Widgets key"
-msgstr "Ginys clau"
-
-#: ../../addon/widgets/widgets.php:62 ../../addon.old/widgets/widgets.php:61
-msgid "Widgets available"
-msgstr "Ginys disponibles"
-
-#: ../../addon/widgets/widget_friends.php:40
-#: ../../addon.old/widgets/widget_friends.php:40
-msgid "Connect on Friendica!"
-msgstr "Connectar en Friendica"
-
-#: ../../addon/morepokes/morepokes.php:19
-#: ../../addon.old/morepokes/morepokes.php:19
-msgid "bitchslap"
-msgstr "bufetada"
-
-#: ../../addon/morepokes/morepokes.php:19
-#: ../../addon.old/morepokes/morepokes.php:19
-msgid "bitchslapped"
-msgstr "bufetejat"
-
-#: ../../addon/morepokes/morepokes.php:20
-#: ../../addon.old/morepokes/morepokes.php:20
-msgid "shag"
-msgstr "fotut"
-
-#: ../../addon/morepokes/morepokes.php:20
-#: ../../addon.old/morepokes/morepokes.php:20
-msgid "shagged"
-msgstr "fotre"
-
-#: ../../addon/morepokes/morepokes.php:21
-#: ../../addon.old/morepokes/morepokes.php:21
-msgid "do something obscenely biological to"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:21
-#: ../../addon.old/morepokes/morepokes.php:21
-msgid "did something obscenely biological to"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:22
-#: ../../addon.old/morepokes/morepokes.php:22
-msgid "point out the poke feature to"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:22
-#: ../../addon.old/morepokes/morepokes.php:22
-msgid "pointed out the poke feature to"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:23
-#: ../../addon.old/morepokes/morepokes.php:23
-msgid "declare undying love for"
-msgstr "declara amor inmortal a"
-
-#: ../../addon/morepokes/morepokes.php:23
-#: ../../addon.old/morepokes/morepokes.php:23
-msgid "declared undying love for"
-msgstr "declarat amor inmortal a"
-
-#: ../../addon/morepokes/morepokes.php:24
-#: ../../addon.old/morepokes/morepokes.php:24
-msgid "patent"
-msgstr "patent"
-
-#: ../../addon/morepokes/morepokes.php:24
-#: ../../addon.old/morepokes/morepokes.php:24
-msgid "patented"
-msgstr "patentat"
-
-#: ../../addon/morepokes/morepokes.php:25
-#: ../../addon.old/morepokes/morepokes.php:25
-msgid "stroke beard"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:25
-#: ../../addon.old/morepokes/morepokes.php:25
-msgid "stroked their beard at"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:26
-#: ../../addon.old/morepokes/morepokes.php:26
-msgid ""
-"bemoan the declining standards of modern secondary and tertiary education to"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:26
-#: ../../addon.old/morepokes/morepokes.php:26
-msgid ""
-"bemoans the declining standards of modern secondary and tertiary education "
-"to"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:27
-#: ../../addon.old/morepokes/morepokes.php:27
-msgid "hug"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:27
-#: ../../addon.old/morepokes/morepokes.php:27
-msgid "hugged"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:28
-#: ../../addon.old/morepokes/morepokes.php:28
-msgid "kiss"
-msgstr "petó"
-
-#: ../../addon/morepokes/morepokes.php:28
-#: ../../addon.old/morepokes/morepokes.php:28
-msgid "kissed"
-msgstr "besat"
-
-#: ../../addon/morepokes/morepokes.php:29
-#: ../../addon.old/morepokes/morepokes.php:29
-msgid "raise eyebrows at"
-msgstr "sorprès"
-
-#: ../../addon/morepokes/morepokes.php:29
-#: ../../addon.old/morepokes/morepokes.php:29
-msgid "raised their eyebrows at"
-msgstr "es van sorprendre"
-
-#: ../../addon/morepokes/morepokes.php:30
-#: ../../addon.old/morepokes/morepokes.php:30
-msgid "insult"
-msgstr "insult"
-
-#: ../../addon/morepokes/morepokes.php:30
-#: ../../addon.old/morepokes/morepokes.php:30
-msgid "insulted"
-msgstr "insultat"
-
-#: ../../addon/morepokes/morepokes.php:31
-#: ../../addon.old/morepokes/morepokes.php:31
-msgid "praise"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:31
-#: ../../addon.old/morepokes/morepokes.php:31
-msgid "praised"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:32
-#: ../../addon.old/morepokes/morepokes.php:32
-msgid "be dubious of"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:32
-#: ../../addon.old/morepokes/morepokes.php:32
-msgid "was dubious of"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:33
-#: ../../addon.old/morepokes/morepokes.php:33
-msgid "eat"
-msgstr "menja"
-
-#: ../../addon/morepokes/morepokes.php:33
-#: ../../addon.old/morepokes/morepokes.php:33
-msgid "ate"
-msgstr "menjà"
-
-#: ../../addon/morepokes/morepokes.php:34
-#: ../../addon.old/morepokes/morepokes.php:34
-msgid "giggle and fawn at"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:34
-#: ../../addon.old/morepokes/morepokes.php:34
-msgid "giggled and fawned at"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:35
-#: ../../addon.old/morepokes/morepokes.php:35
-msgid "doubt"
-msgstr "dubte"
-
-#: ../../addon/morepokes/morepokes.php:35
-#: ../../addon.old/morepokes/morepokes.php:35
-msgid "doubted"
-msgstr "dubitat"
-
-#: ../../addon/morepokes/morepokes.php:36
-#: ../../addon.old/morepokes/morepokes.php:36
-msgid "glare"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:36
-#: ../../addon.old/morepokes/morepokes.php:36
-msgid "glared at"
-msgstr ""
-
-#: ../../addon/yourls/yourls.php:55 ../../addon.old/yourls/yourls.php:55
-msgid "YourLS Settings"
-msgstr "La Teva Configuració de LS"
-
-#: ../../addon/yourls/yourls.php:57 ../../addon.old/yourls/yourls.php:57
-msgid "URL: http://"
-msgstr "URL: http://"
-
-#: ../../addon/yourls/yourls.php:62 ../../addon.old/yourls/yourls.php:62
-msgid "Username:"
-msgstr "Nom d'usuari:"
-
-#: ../../addon/yourls/yourls.php:67 ../../addon.old/yourls/yourls.php:67
-msgid "Password:"
-msgstr "Contrasenya:"
-
-#: ../../addon/yourls/yourls.php:72 ../../addon.old/yourls/yourls.php:72
-msgid "Use SSL "
-msgstr "Emprar SSL"
-
-#: ../../addon/yourls/yourls.php:92 ../../addon.old/yourls/yourls.php:92
-msgid "yourls Settings saved."
-msgstr "Guardar la seva configuració."
-
-#: ../../addon/ljpost/ljpost.php:39 ../../addon.old/ljpost/ljpost.php:39
-msgid "Post to LiveJournal"
-msgstr "Missatge a Livejournal"
-
-#: ../../addon/ljpost/ljpost.php:70 ../../addon.old/ljpost/ljpost.php:70
-msgid "LiveJournal Post Settings"
-msgstr "Configuració d'enviaments a Livejournal"
-
-#: ../../addon/ljpost/ljpost.php:72 ../../addon.old/ljpost/ljpost.php:72
-msgid "Enable LiveJournal Post Plugin"
-msgstr "Habilitat el plugin d'enviaments a Livejournal"
-
-#: ../../addon/ljpost/ljpost.php:77 ../../addon.old/ljpost/ljpost.php:77
-msgid "LiveJournal username"
-msgstr "Nom d'usuari a Livejournal"
-
-#: ../../addon/ljpost/ljpost.php:82 ../../addon.old/ljpost/ljpost.php:82
-msgid "LiveJournal password"
-msgstr "Contrasenya a Livejournal"
-
-#: ../../addon/ljpost/ljpost.php:87 ../../addon.old/ljpost/ljpost.php:87
-msgid "Post to LiveJournal by default"
-msgstr "Enviar per defecte a Livejournal"
-
-#: ../../addon/nsfw/nsfw.php:78 ../../addon.old/nsfw/nsfw.php:78
-msgid "Not Safe For Work (General Purpose Content Filter) settings"
-msgstr "Ajustos, Not Safe For Work (Filtre de Contingut de Propòsit General)"
-
-#: ../../addon/nsfw/nsfw.php:80 ../../addon.old/nsfw/nsfw.php:80
-msgid ""
-"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."
-msgstr "Aquest plugin es veu en enviaments amb les paraules/text que s'especifiquen a continuació , i amagarà qualsevol contingut que contingui les paraules clau de manera que no apareguin en moments inapropiats, com ara insinuacions sexuals que poden ser inadequades en un entorn de treball. És de bona educació i es recomana etiquetar qualsevol contingut que contingui nus amb #NSFW. Aquest filtre també es pot fer coincidir amb qualsevol paraula/text que especifiqueu, i per tant pot ser utilitzat com un filtre general de contingut."
-
-#: ../../addon/nsfw/nsfw.php:81 ../../addon.old/nsfw/nsfw.php:81
-msgid "Enable Content filter"
-msgstr "Activat el filtre de Contingut"
-
-#: ../../addon/nsfw/nsfw.php:84 ../../addon.old/nsfw/nsfw.php:84
-msgid "Comma separated list of keywords to hide"
-msgstr "Llista separada per comes de paraules clau per ocultar"
-
-#: ../../addon/nsfw/nsfw.php:89 ../../addon.old/nsfw/nsfw.php:89
-msgid "Use /expression/ to provide regular expressions"
-msgstr "Emprar /expressió/  per a proporcionar expressions regulars"
-
-#: ../../addon/nsfw/nsfw.php:105 ../../addon.old/nsfw/nsfw.php:105
-msgid "NSFW Settings saved."
-msgstr "Configuració NSFW guardada."
-
-#: ../../addon/nsfw/nsfw.php:157 ../../addon.old/nsfw/nsfw.php:157
-#, php-format
-msgid "%s - Click to open/close"
-msgstr "%s - Clicar per obrir/tancar"
-
-#: ../../addon/page/page.php:62 ../../addon/page/page.php:92
-#: ../../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 "Forums"
-
-#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:98
-#: ../../addon.old/page/page.php:130
-#: ../../addon.old/forumlist/forumlist.php:94
-msgid "Forums:"
-msgstr "Fòrums:"
-
-#: ../../addon/page/page.php:166 ../../addon.old/page/page.php:166
-msgid "Page settings updated."
-msgstr "Actualitzats els ajustos de pàgina."
-
-#: ../../addon/page/page.php:195 ../../addon.old/page/page.php:195
-msgid "Page Settings"
-msgstr "Ajustos de pàgina"
-
-#: ../../addon/page/page.php:197 ../../addon.old/page/page.php:197
-msgid "How many forums to display on sidebar without paging"
-msgstr "Quants fòrums per mostrar a la barra lateral per pàgina"
-
-#: ../../addon/page/page.php:200 ../../addon.old/page/page.php:200
-msgid "Randomise Page/Forum list"
-msgstr "Aleatoritza la llista de Pàgina/Fòrum"
-
-#: ../../addon/page/page.php:203 ../../addon.old/page/page.php:203
-msgid "Show pages/forums on profile page"
-msgstr "Mostra pàgines/fòrums a la pàgina de perfil"
-
-#: ../../addon/planets/planets.php:150 ../../addon.old/planets/planets.php:150
-msgid "Planets Settings"
-msgstr "Ajustos de Planet"
-
-#: ../../addon/planets/planets.php:152 ../../addon.old/planets/planets.php:152
-msgid "Enable Planets Plugin"
-msgstr "Activa Plugin de Planet"
-
-#: ../../addon/forumdirectory/forumdirectory.php:22
-msgid "Forum Directory"
-msgstr ""
-
-#: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:91
-#: ../../boot.php:1037 ../../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
-msgid "Login"
-msgstr "Identifica't"
-
-#: ../../addon/communityhome/communityhome.php:29
-#: ../../addon.old/communityhome/communityhome.php:29
-#: ../../addon.old/communityhome/twillingham/communityhome.php:29
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../../addon/communityhome/communityhome.php:39
-#: ../../addon.old/communityhome/communityhome.php:38
-#: ../../addon.old/communityhome/twillingham/communityhome.php:38
-msgid "Latest users"
-msgstr "Últims usuaris"
-
-#: ../../addon/communityhome/communityhome.php:84
-#: ../../addon.old/communityhome/communityhome.php:81
-#: ../../addon.old/communityhome/twillingham/communityhome.php:81
-msgid "Most active users"
-msgstr "Usuaris més actius"
-
-#: ../../addon/communityhome/communityhome.php:102
-#: ../../addon.old/communityhome/communityhome.php:98
-msgid "Latest photos"
-msgstr "Darreres fotos"
-
-#: ../../addon/communityhome/communityhome.php:141
-#: ../../addon.old/communityhome/communityhome.php:133
-msgid "Latest likes"
-msgstr "Darrers agrada"
-
-#: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1508
-#: ../../include/conversation.php:118 ../../include/conversation.php:246
-#: ../../addon.old/communityhome/communityhome.php:155
-msgid "event"
-msgstr "esdeveniment"
-
-#: ../../addon/dav/common/wdcal_backend.inc.php:92
-#: ../../addon/dav/common/wdcal_backend.inc.php:166
-#: ../../addon/dav/common/wdcal_backend.inc.php:178
-#: ../../addon/dav/common/wdcal_backend.inc.php:206
-#: ../../addon/dav/common/wdcal_backend.inc.php:214
-#: ../../addon/dav/common/wdcal_backend.inc.php:229
-#: ../../addon.old/dav/common/wdcal_backend.inc.php:92
-#: ../../addon.old/dav/common/wdcal_backend.inc.php:166
-#: ../../addon.old/dav/common/wdcal_backend.inc.php:178
-#: ../../addon.old/dav/common/wdcal_backend.inc.php:206
-#: ../../addon.old/dav/common/wdcal_backend.inc.php:214
-#: ../../addon.old/dav/common/wdcal_backend.inc.php:229
-msgid "No access"
-msgstr "Inaccessible"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:30
-#: ../../addon/dav/common/wdcal_edit.inc.php:738
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:30
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:738
-msgid "Could not open component for editing"
-msgstr ""
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:140
-#: ../../addon/dav/friendica/layout.fnk.php:143
-#: ../../addon/dav/friendica/layout.fnk.php:422
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:140
-#: ../../addon.old/dav/friendica/layout.fnk.php:143
-#: ../../addon.old/dav/friendica/layout.fnk.php:422
-msgid "Go back to the calendar"
-msgstr "Tornar al calendari"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:144
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:144
-msgid "Event data"
-msgstr "data d'esdeveniment"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:146
-#: ../../addon/dav/friendica/main.php:239
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:146
-#: ../../addon.old/dav/friendica/main.php:239
-msgid "Calendar"
-msgstr "Calendari"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:163
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:163
-msgid "Special color"
-msgstr "Color especial"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:169
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:169
-msgid "Subject"
-msgstr "Subjecte"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:173
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:173
-msgid "Starts"
-msgstr "Inicia"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:178
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:178
-msgid "Ends"
-msgstr "Finalitza"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:185
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:185
-msgid "Description"
-msgstr "Descripció"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:188
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:188
-msgid "Recurrence"
-msgstr "Reaparició"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:190
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:190
-msgid "Frequency"
-msgstr "Freqüència"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:194
-#: ../../include/contact_selectors.php:59
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:194
-msgid "Daily"
-msgstr "Diari"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:197
-#: ../../include/contact_selectors.php:60
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:197
-msgid "Weekly"
-msgstr "Setmanal"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:200
-#: ../../include/contact_selectors.php:61
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:200
-msgid "Monthly"
-msgstr "Mensual"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:203
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:203
-msgid "Yearly"
-msgstr "Anyal"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:214
-#: ../../include/datetime.php:288
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:214
-msgid "days"
-msgstr "dies"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:215
-#: ../../include/datetime.php:287
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:215
-msgid "weeks"
-msgstr "setmanes"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:216
-#: ../../include/datetime.php:286
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:216
-msgid "months"
-msgstr "mesos"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:217
-#: ../../include/datetime.php:285
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:217
-msgid "years"
-msgstr "anys"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:218
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:218
-msgid "Interval"
-msgstr "Interval"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:218
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:218
-msgid "All %select% %time%"
-msgstr "Tot %select% %time%"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:222
-#: ../../addon/dav/common/wdcal_edit.inc.php:260
-#: ../../addon/dav/common/wdcal_edit.inc.php:481
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:222
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:260
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:481
-msgid "Days"
-msgstr "Dies"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:231
-#: ../../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: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
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:293
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:305
-msgid "Sunday"
-msgstr "Diumenge"
-
-#: ../../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: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
-msgid "Monday"
-msgstr "Dilluns"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../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 "Dimarts"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../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 "Dimecres"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../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 "Dijous"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../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 "Divendres"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../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"
-msgstr "Dissabte"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:297
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:297
-msgid "First day of week:"
-msgstr "Primer dia de la setmana:"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:350
-#: ../../addon/dav/common/wdcal_edit.inc.php:373
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:350
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:373
-msgid "Day of month"
-msgstr "Dia del mes"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:354
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:354
-msgid "#num#th of each month"
-msgstr "#num# de cada mes"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:357
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:357
-msgid "#num#th-last of each month"
-msgstr "#num# ultim de cada mes"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:360
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:360
-msgid "#num#th #wkday# of each month"
-msgstr "#num# #wkday# de cada mes"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:363
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:363
-msgid "#num#th-last #wkday# of each month"
-msgstr "#num# ultim #wkday# de cada mes"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:372
-#: ../../addon/dav/friendica/layout.fnk.php:255
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:372
-#: ../../addon.old/dav/friendica/layout.fnk.php:255
-msgid "Month"
-msgstr "Mes"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:377
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:377
-msgid "#num#th of the given month"
-msgstr "#num# del mes corrent"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:380
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:380
-msgid "#num#th-last of the given month"
-msgstr "#num# ultim del mes corrent"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:383
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:383
-msgid "#num#th #wkday# of the given month"
-msgstr "#num#  #wkday# del mes corrent"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:386
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:386
-msgid "#num#th-last #wkday# of the given month"
-msgstr "#num# ultim #wkday# del mes corrent"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:413
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:413
-msgid "Repeat until"
-msgstr "repetir fins"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:417
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:417
-msgid "Infinite"
-msgstr "Infinit"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:420
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:420
-msgid "Until the following date"
-msgstr "Fins la data següent"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:423
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:423
-msgid "Number of times"
-msgstr "Nombre de vegades"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:429
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:429
-msgid "Exceptions"
-msgstr "Excepcions"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:432
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:432
-msgid "none"
-msgstr "res"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:449
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:449
-msgid "Notification"
-msgstr "Notificació"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:466
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:466
-msgid "Notify by"
-msgstr "Notificat per"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:469
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:469
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:470
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:470
-msgid "On Friendica / Display"
-msgstr "A Friendica / Display"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:474
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:474
-msgid "Time"
-msgstr "Hora"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:478
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:478
-msgid "Hours"
-msgstr "Hores"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:479
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:479
-msgid "Minutes"
-msgstr "Minuts"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:480
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:480
-msgid "Seconds"
-msgstr "Segons"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:482
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:482
-msgid "Weeks"
-msgstr "Setmanes"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:485
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:485
-msgid "before the"
-msgstr "bans de"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:486
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:486
-msgid "start of the event"
-msgstr "inici del esdeveniment"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:487
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:487
-msgid "end of the event"
-msgstr "fi del esdeveniment"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:492
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:492
-msgid "Add a notification"
-msgstr "Afegir una notificació"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:687
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:687
-msgid "The event #name# will start at #date"
-msgstr "El esdeveniment #name# començara el #date"
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:696
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:696
-msgid "#name# is about to begin."
-msgstr "#name# esta a punt de començar."
-
-#: ../../addon/dav/common/wdcal_edit.inc.php:769
-#: ../../addon.old/dav/common/wdcal_edit.inc.php:769
-msgid "Saved"
-msgstr "Guardat"
-
-#: ../../addon/dav/common/wdcal_configuration.php:148
-#: ../../addon.old/dav/common/wdcal_configuration.php:148
-msgid "U.S. Time Format (mm/dd/YYYY)"
-msgstr "Data en format U.S. (mm/dd/YYY)"
-
-#: ../../addon/dav/common/wdcal_configuration.php:243
-#: ../../addon.old/dav/common/wdcal_configuration.php:243
-msgid "German Time Format (dd.mm.YYYY)"
-msgstr "Data en format Alemany (dd.mm.YYYY)"
-
-#: ../../addon/dav/common/dav_caldav_backend_private.inc.php:39
-#: ../../addon.old/dav/common/dav_caldav_backend_private.inc.php:39
-msgid "Private Events"
-msgstr "Esdeveniment Privat"
-
-#: ../../addon/dav/common/dav_carddav_backend_private.inc.php:46
-#: ../../addon.old/dav/common/dav_carddav_backend_private.inc.php:46
-msgid "Private Addressbooks"
-msgstr "Contacte Privat"
-
-#: ../../addon/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php:36
-#: ../../addon.old/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php:36
-msgid "Friendica-Native events"
-msgstr "esdeveniments Nadius a Friendica"
-
-#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:36
-#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:59
-#: ../../addon.old/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:36
-#: ../../addon.old/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:59
-msgid "Friendica-Contacts"
-msgstr "Friendica-Contactes"
-
-#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:60
-#: ../../addon.old/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:60
-msgid "Your Friendica-Contacts"
-msgstr "Els teus Contactes a Friendica"
-
-#: ../../addon/dav/friendica/layout.fnk.php:99
-#: ../../addon/dav/friendica/layout.fnk.php:136
-#: ../../addon.old/dav/friendica/layout.fnk.php:99
-#: ../../addon.old/dav/friendica/layout.fnk.php:136
-msgid ""
-"Something went wrong when trying to import the file. Sorry. Maybe some "
-"events were imported anyway."
-msgstr "Quelcom va anar malament quan intentava importar l'arxiu. Disculpes. Por ser alguns esdeveniments es varen importar d'alguna manera."
-
-#: ../../addon/dav/friendica/layout.fnk.php:131
-#: ../../addon.old/dav/friendica/layout.fnk.php:131
-msgid "Something went wrong when trying to import the file. Sorry."
-msgstr "Quelcom va anar malament quan intentava importar l'arxiu. Disculpes."
-
-#: ../../addon/dav/friendica/layout.fnk.php:134
-#: ../../addon.old/dav/friendica/layout.fnk.php:134
-msgid "The ICS-File has been imported."
-msgstr "L'arxiu ICS ha estat importat"
-
-#: ../../addon/dav/friendica/layout.fnk.php:138
-#: ../../addon.old/dav/friendica/layout.fnk.php:138
-msgid "No file was uploaded."
-msgstr "Cap arxiu es va carregar."
-
-#: ../../addon/dav/friendica/layout.fnk.php:147
-#: ../../addon.old/dav/friendica/layout.fnk.php:147
-msgid "Import a ICS-file"
-msgstr "importar un arxiu ICS"
-
-#: ../../addon/dav/friendica/layout.fnk.php:150
-#: ../../addon.old/dav/friendica/layout.fnk.php:150
-msgid "ICS-File"
-msgstr "Arxiu ICS"
-
-#: ../../addon/dav/friendica/layout.fnk.php:151
-#: ../../addon.old/dav/friendica/layout.fnk.php:151
-msgid "Overwrite all #num# existing events"
-msgstr "Sobrescriu tots #num# esdeveniments existents"
-
-#: ../../addon/dav/friendica/layout.fnk.php:228
-#: ../../addon.old/dav/friendica/layout.fnk.php:228
-msgid "New event"
-msgstr "Nou esdeveniment"
-
-#: ../../addon/dav/friendica/layout.fnk.php:232
-#: ../../addon.old/dav/friendica/layout.fnk.php:232
-msgid "Today"
-msgstr "Avui"
-
-#: ../../addon/dav/friendica/layout.fnk.php:241
-#: ../../addon.old/dav/friendica/layout.fnk.php:241
-msgid "Day"
-msgstr "Dia"
-
-#: ../../addon/dav/friendica/layout.fnk.php:248
-#: ../../addon.old/dav/friendica/layout.fnk.php:248
-msgid "Week"
-msgstr "Setmana"
-
-#: ../../addon/dav/friendica/layout.fnk.php:260
-#: ../../addon.old/dav/friendica/layout.fnk.php:260
-msgid "Reload"
-msgstr "Recarregar"
-
-#: ../../addon/dav/friendica/layout.fnk.php:271
-#: ../../addon.old/dav/friendica/layout.fnk.php:271
-msgid "Date"
-msgstr "Data"
-
-#: ../../addon/dav/friendica/layout.fnk.php:313
-#: ../../addon.old/dav/friendica/layout.fnk.php:313
-msgid "Error"
-msgstr "Error"
-
-#: ../../addon/dav/friendica/layout.fnk.php:380
-#: ../../addon.old/dav/friendica/layout.fnk.php:380
-msgid "The calendar has been updated."
-msgstr "El calendari ha estat actualitzat."
-
-#: ../../addon/dav/friendica/layout.fnk.php:393
-#: ../../addon.old/dav/friendica/layout.fnk.php:393
-msgid "The new calendar has been created."
-msgstr "El nou calendari ha estat creat."
-
-#: ../../addon/dav/friendica/layout.fnk.php:417
-#: ../../addon.old/dav/friendica/layout.fnk.php:417
-msgid "The calendar has been deleted."
-msgstr "el calendari ha estat esborrat."
-
-#: ../../addon/dav/friendica/layout.fnk.php:424
-#: ../../addon.old/dav/friendica/layout.fnk.php:424
-msgid "Calendar Settings"
-msgstr "Ajustos de Calendari"
-
-#: ../../addon/dav/friendica/layout.fnk.php:430
-#: ../../addon.old/dav/friendica/layout.fnk.php:430
-msgid "Date format"
-msgstr "Format de la data"
-
-#: ../../addon/dav/friendica/layout.fnk.php:439
-#: ../../addon.old/dav/friendica/layout.fnk.php:439
-msgid "Time zone"
-msgstr "Zona horària"
-
-#: ../../addon/dav/friendica/layout.fnk.php:445
-#: ../../addon.old/dav/friendica/layout.fnk.php:445
-msgid "Calendars"
-msgstr "Calendaris"
-
-#: ../../addon/dav/friendica/layout.fnk.php:487
-#: ../../addon.old/dav/friendica/layout.fnk.php:487
-msgid "Create a new calendar"
-msgstr "Creat un nou calendari"
-
-#: ../../addon/dav/friendica/layout.fnk.php:496
-#: ../../addon.old/dav/friendica/layout.fnk.php:496
-msgid "Limitations"
-msgstr "Limitacions"
-
-#: ../../addon/dav/friendica/layout.fnk.php:500
-#: ../../addon/libravatar/libravatar.php:82
-#: ../../addon.old/dav/friendica/layout.fnk.php:500
-#: ../../addon.old/libravatar/libravatar.php:82
-msgid "Warning"
-msgstr "Avís"
-
-#: ../../addon/dav/friendica/layout.fnk.php:504
-#: ../../addon.old/dav/friendica/layout.fnk.php:504
-msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
-msgstr "Syncronització (iPhone, Thunderbird Lightning, Android, ...)"
-
-#: ../../addon/dav/friendica/layout.fnk.php:511
-#: ../../addon.old/dav/friendica/layout.fnk.php:511
-msgid "Synchronizing this calendar with the iPhone"
-msgstr "Sncronitzant aquest calendari amb el iPhone"
-
-#: ../../addon/dav/friendica/layout.fnk.php:522
-#: ../../addon.old/dav/friendica/layout.fnk.php:522
-msgid "Synchronizing your Friendica-Contacts with the iPhone"
-msgstr "Sincronitzant els teus contactes a Friendica amb el iPhone"
-
-#: ../../addon/dav/friendica/main.php:202
-#: ../../addon.old/dav/friendica/main.php:202
-msgid ""
-"The current version of this plugin has not been set up correctly. Please "
-"contact the system administrator of your installation of friendica to fix "
-"this."
-msgstr ""
-
-#: ../../addon/dav/friendica/main.php:242
-#: ../../addon.old/dav/friendica/main.php:242
-msgid "Extended calendar with CalDAV-support"
-msgstr "Calendari ampliat amb suport CalDAV"
-
-#: ../../addon/dav/friendica/main.php:279
-#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
-#: ../../include/enotify.php:28 ../../include/notifier.php:785
-#: ../../addon.old/dav/friendica/main.php:279
-#: ../../addon.old/dav/friendica/main.php:280
-msgid "noreply"
-msgstr "no contestar"
-
-#: ../../addon/dav/friendica/main.php:282
-#: ../../addon.old/dav/friendica/main.php:282
-msgid "Notification: "
-msgstr ""
-
-#: ../../addon/dav/friendica/main.php:309
-#: ../../addon.old/dav/friendica/main.php:309
-msgid "The database tables have been installed."
-msgstr "Les taules de la base de dades han estat instal·lades."
-
-#: ../../addon/dav/friendica/main.php:310
-#: ../../addon.old/dav/friendica/main.php:310
-msgid "An error occurred during the installation."
-msgstr "Ha ocorregut un error durant la instal·lació."
-
-#: ../../addon/dav/friendica/main.php:316
-#: ../../addon.old/dav/friendica/main.php:316
-msgid "The database tables have been updated."
-msgstr ""
-
-#: ../../addon/dav/friendica/main.php:317
-#: ../../addon.old/dav/friendica/main.php:317
-msgid "An error occurred during the update."
-msgstr ""
-
-#: ../../addon/dav/friendica/main.php:333
-#: ../../addon.old/dav/friendica/main.php:333
-msgid "No system-wide settings yet."
-msgstr "No tens enllestits els ajustos del sistema."
-
-#: ../../addon/dav/friendica/main.php:336
-#: ../../addon.old/dav/friendica/main.php:336
-msgid "Database status"
-msgstr "Estat de la base de dades"
-
-#: ../../addon/dav/friendica/main.php:339
-#: ../../addon.old/dav/friendica/main.php:339
-msgid "Installed"
-msgstr "Instal·lat"
-
-#: ../../addon/dav/friendica/main.php:343
-#: ../../addon.old/dav/friendica/main.php:343
-msgid "Upgrade needed"
-msgstr "Necessites actualitzar"
-
-#: ../../addon/dav/friendica/main.php:343
-#: ../../addon.old/dav/friendica/main.php:343
-msgid ""
-"Please back up all calendar data (the tables beginning with dav_*) before "
-"proceeding. While all calendar events <i>should</i> be converted to the new "
-"database structure, it's always safe to have a backup. Below, you can have a"
-" look at the database-queries that will be made when pressing the "
-"'update'-button."
-msgstr ""
-
-#: ../../addon/dav/friendica/main.php:343
-#: ../../addon.old/dav/friendica/main.php:343
-msgid "Upgrade"
-msgstr "Actualització"
-
-#: ../../addon/dav/friendica/main.php:346
-#: ../../addon.old/dav/friendica/main.php:346
-msgid "Not installed"
-msgstr "No instal·lat"
-
-#: ../../addon/dav/friendica/main.php:346
-#: ../../addon.old/dav/friendica/main.php:346
-msgid "Install"
-msgstr "Instal·lat"
-
-#: ../../addon/dav/friendica/main.php:350
-#: ../../addon.old/dav/friendica/main.php:350
-msgid "Unknown"
-msgstr ""
-
-#: ../../addon/dav/friendica/main.php:350
-#: ../../addon.old/dav/friendica/main.php:350
-msgid ""
-"Something really went wrong. I cannot recover from this state automatically,"
-" sorry. Please go to the database backend, back up the data, and delete all "
-"tables beginning with 'dav_' manually. Afterwards, this installation routine"
-" should be able to reinitialize the tables automatically."
-msgstr ""
-
-#: ../../addon/dav/friendica/main.php:355
-#: ../../addon.old/dav/friendica/main.php:355
-msgid "Troubleshooting"
-msgstr "Solució de problemes"
-
-#: ../../addon/dav/friendica/main.php:356
-#: ../../addon.old/dav/friendica/main.php:356
-msgid "Manual creation of the database tables:"
-msgstr "Creació manual de les taules de la base de dades:"
-
-#: ../../addon/dav/friendica/main.php:357
-#: ../../addon.old/dav/friendica/main.php:357
-msgid "Show SQL-statements"
-msgstr "Mostrar instruccions de SQL "
-
-#: ../../addon/dav/friendica/calendar.friendica.fnk.php:206
-#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:206
-msgid "Private Calendar"
-msgstr "Calendari Privat"
-
-#: ../../addon/dav/friendica/calendar.friendica.fnk.php:207
-#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:207
-msgid "Friendica Events: Mine"
-msgstr "Esdeveniments Friendica: Meus"
-
-#: ../../addon/dav/friendica/calendar.friendica.fnk.php:208
-#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:208
-msgid "Friendica Events: Contacts"
-msgstr "Esdeveniments Friendica: Contactes"
-
-#: ../../addon/dav/friendica/calendar.friendica.fnk.php:248
-#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:248
-msgid "Private Addresses"
-msgstr "Adreces Privades"
-
-#: ../../addon/dav/friendica/calendar.friendica.fnk.php:249
-#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:249
-msgid "Friendica Contacts"
-msgstr "Contactes a Friendica"
-
-#: ../../addon/uhremotestorage/uhremotestorage.php:84
-#: ../../addon.old/uhremotestorage/uhremotestorage.php:84
-#, php-format
-msgid ""
-"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>"
-msgstr "Permetre l'ús del seu ID de friendica (%s) per Connectar a l'emmagatzematge extern (com ownCloud). Veure <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\"> WebFinger RemoteStorage </a>"
-
-#: ../../addon/uhremotestorage/uhremotestorage.php:85
-#: ../../addon.old/uhremotestorage/uhremotestorage.php:85
-msgid "Template URL (with {category})"
-msgstr "Plantilles de URL (amb {categoria})"
-
-#: ../../addon/uhremotestorage/uhremotestorage.php:86
-#: ../../addon.old/uhremotestorage/uhremotestorage.php:86
-msgid "OAuth end-point"
-msgstr "OAuth end-point"
-
-#: ../../addon/uhremotestorage/uhremotestorage.php:87
-#: ../../addon.old/uhremotestorage/uhremotestorage.php:87
-msgid "Api"
-msgstr "Api"
-
-#: ../../addon/membersince/membersince.php:18
-#: ../../addon.old/membersince/membersince.php:18
-msgid "Member since:"
-msgstr "Membre des de:"
-
-#: ../../addon/tictac/tictac.php:20 ../../addon.old/tictac/tictac.php:20
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr "Tres en línia Tridimensional"
-
-#: ../../addon/tictac/tictac.php:53 ../../addon.old/tictac/tictac.php:53
-msgid "3D Tic-Tac-Toe"
-msgstr "Tres en línia 3D"
-
-#: ../../addon/tictac/tictac.php:58 ../../addon.old/tictac/tictac.php:58
-msgid "New game"
-msgstr "Nou joc"
-
-#: ../../addon/tictac/tictac.php:59 ../../addon.old/tictac/tictac.php:59
-msgid "New game with handicap"
-msgstr "Nou joc modificat"
-
-#: ../../addon/tictac/tictac.php:60 ../../addon.old/tictac/tictac.php:60
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
-msgstr "El joc del tres en línia tridimensional és com el joc tradicional, excepte que es juga en diversos nivells simultàniament."
-
-#: ../../addon/tictac/tictac.php:61 ../../addon.old/tictac/tictac.php:61
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
-msgstr "En aquest cas hi ha tres nivells. Vostè guanya per aconseguir tres en una fila en qualsevol nivell, així com dalt, baix i en diagonal a través dels diferents nivells."
-
-#: ../../addon/tictac/tictac.php:63 ../../addon.old/tictac/tictac.php:63
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr "El joc modificat desactiva la posició central en el nivell mitjà perquè el jugador en aquesta posició té sovint un avantatge injust."
-
-#: ../../addon/tictac/tictac.php:182 ../../addon.old/tictac/tictac.php:182
-msgid "You go first..."
-msgstr "Vostè va primer ..."
-
-#: ../../addon/tictac/tictac.php:187 ../../addon.old/tictac/tictac.php:187
-msgid "I'm going first this time..."
-msgstr "Vaig primer aquesta vegada ..."
-
-#: ../../addon/tictac/tictac.php:193 ../../addon.old/tictac/tictac.php:193
-msgid "You won!"
-msgstr "Has guanyat!"
-
-#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224
-#: ../../addon.old/tictac/tictac.php:199 ../../addon.old/tictac/tictac.php:224
-msgid "\"Cat\" game!"
-msgstr "Empat!"
-
-#: ../../addon/tictac/tictac.php:222 ../../addon.old/tictac/tictac.php:222
-msgid "I won!"
-msgstr "Vaig guanyar!"
-
-#: ../../addon/randplace/randplace.php:169
-#: ../../addon.old/randplace/randplace.php:169
-msgid "Randplace Settings"
-msgstr "Configuració de Randplace"
-
-#: ../../addon/randplace/randplace.php:171
-#: ../../addon.old/randplace/randplace.php:171
-msgid "Enable Randplace Plugin"
-msgstr "Habilitar el Plugin de Randplace"
-
-#: ../../addon/dwpost/dwpost.php:39 ../../addon.old/dwpost/dwpost.php:39
-msgid "Post to Dreamwidth"
-msgstr "Missatge a Dreamwidth"
-
-#: ../../addon/dwpost/dwpost.php:70 ../../addon.old/dwpost/dwpost.php:70
-msgid "Dreamwidth Post Settings"
-msgstr "Configuració d'enviaments a Dreamwidth"
-
-#: ../../addon/dwpost/dwpost.php:72 ../../addon.old/dwpost/dwpost.php:72
-msgid "Enable dreamwidth Post Plugin"
-msgstr "Habilitat el plugin d'enviaments a Dreamwidth"
-
-#: ../../addon/dwpost/dwpost.php:77 ../../addon.old/dwpost/dwpost.php:77
-msgid "dreamwidth username"
-msgstr "Nom d'usuari a Dreamwidth"
-
-#: ../../addon/dwpost/dwpost.php:82 ../../addon.old/dwpost/dwpost.php:82
-msgid "dreamwidth password"
-msgstr "Contrasenya a Dreamwidth"
-
-#: ../../addon/dwpost/dwpost.php:87 ../../addon.old/dwpost/dwpost.php:87
-msgid "Post to dreamwidth by default"
-msgstr "Enviar per defecte a Dreamwidth"
-
-#: ../../addon/remote_permissions/remote_permissions.php:45
-msgid "Remote Permissions Settings"
-msgstr ""
-
-#: ../../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:58
-msgid "Remote Permissions settings updated."
-msgstr ""
-
-#: ../../addon/remote_permissions/remote_permissions.php:178
-msgid "Visible to"
-msgstr ""
-
-#: ../../addon/remote_permissions/remote_permissions.php:178
-msgid "may only be a partial list"
-msgstr ""
-
-#: ../../addon/remote_permissions/remote_permissions.php:197
-#: ../../addon/altpager/altpager.php:99
-msgid "Global"
-msgstr ""
-
-#: ../../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:198
-#: ../../addon/altpager/altpager.php:100
-msgid "Individual"
-msgstr ""
-
-#: ../../addon/remote_permissions/remote_permissions.php:198
-msgid "Each user chooses whether his/her posts show the post recipients"
-msgstr ""
-
-#: ../../addon/startpage/startpage.php:83
-#: ../../addon.old/startpage/startpage.php:83
-msgid "Startpage Settings"
-msgstr "Ajustos de la pàgina d'inici"
-
-#: ../../addon/startpage/startpage.php:85
-#: ../../addon.old/startpage/startpage.php:85
-msgid "Home page to load after login  - leave blank for profile wall"
-msgstr "Pàgina personal a carregar després d'accedir  - deixar buit pel perfil del mur"
-
-#: ../../addon/startpage/startpage.php:88
-#: ../../addon.old/startpage/startpage.php:88
-msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
-msgstr "Exemples: \"xarxa\" o \"notificacions/sistema\""
-
-#: ../../addon/geonames/geonames.php:143
-#: ../../addon.old/geonames/geonames.php:143
-msgid "Geonames settings updated."
-msgstr "Actualitzada la configuració de Geonames."
-
-#: ../../addon/geonames/geonames.php:179
-#: ../../addon.old/geonames/geonames.php:179
-msgid "Geonames Settings"
-msgstr "Configuració de Geonames"
-
-#: ../../addon/geonames/geonames.php:181
-#: ../../addon.old/geonames/geonames.php:181
-msgid "Enable Geonames Plugin"
-msgstr "Habilitar Plugin de Geonames"
-
-#: ../../addon/public_server/public_server.php:126
-#: ../../addon/testdrive/testdrive.php:94
-#: ../../addon.old/public_server/public_server.php:126
-#: ../../addon.old/testdrive/testdrive.php:94
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr "El teu compte en %s expirarà en pocs dies."
-
-#: ../../addon/public_server/public_server.php:127
-#: ../../addon.old/public_server/public_server.php:127
-msgid "Your Friendica account is about to expire."
-msgstr "El teu compte de Friendica està a punt de caducar."
-
-#: ../../addon/public_server/public_server.php:128
-#: ../../addon.old/public_server/public_server.php:128
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your 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"
-msgstr "Hi %1$s,\n\nEl teu compte en %2$s expirara en menys de cinc dies. Pots mantenir el teu compte accedint al menys una vegada cada 30 dies."
-
-#: ../../addon/js_upload/js_upload.php:43
-#: ../../addon.old/js_upload/js_upload.php:43
-msgid "Upload a file"
-msgstr "Carrega un arxiu"
-
-#: ../../addon/js_upload/js_upload.php:44
-#: ../../addon.old/js_upload/js_upload.php:44
-msgid "Drop files here to upload"
-msgstr "Deixa aquí el arxiu a carregar"
-
-#: ../../addon/js_upload/js_upload.php:46
-#: ../../addon.old/js_upload/js_upload.php:46
-msgid "Failed"
-msgstr "Fracassar"
-
-#: ../../addon/js_upload/js_upload.php:303
-#: ../../addon.old/js_upload/js_upload.php:297
-msgid "No files were uploaded."
-msgstr "No hi ha arxius carregats."
-
-#: ../../addon/js_upload/js_upload.php:309
-#: ../../addon.old/js_upload/js_upload.php:303
-msgid "Uploaded file is empty"
-msgstr "L'arxiu carregat està buit"
-
-#: ../../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 "Arxiu té una extensió no vàlida, ha de ser una de"
-
-#: ../../addon/js_upload/js_upload.php:343
-#: ../../addon.old/js_upload/js_upload.php:337
-msgid "Upload was cancelled, or server error encountered"
-msgstr "La pujada va ser cancel.lada, o es va trobar un error de servidor"
-
-#: ../../addon/forumlist/forumlist.php:67
-#: ../../addon.old/forumlist/forumlist.php:63
-msgid "show/hide"
-msgstr "mostra/amaga"
-
-#: ../../addon/forumlist/forumlist.php:81
-#: ../../addon.old/forumlist/forumlist.php:77
-msgid "No forum subscriptions"
-msgstr "No hi ha subscripcions al fòrum"
-
-#: ../../addon/forumlist/forumlist.php:134
-#: ../../addon.old/forumlist/forumlist.php:131
-msgid "Forumlist settings updated."
-msgstr "Ajustos de Forumlist actualitzats."
-
-#: ../../addon/forumlist/forumlist.php:162
-#: ../../addon.old/forumlist/forumlist.php:159
-msgid "Forumlist Settings"
-msgstr "Ajustos de Forumlist"
-
-#: ../../addon/forumlist/forumlist.php:164
-#: ../../addon.old/forumlist/forumlist.php:161
-msgid "Randomise forum list"
-msgstr ""
-
-#: ../../addon/forumlist/forumlist.php:167
-#: ../../addon.old/forumlist/forumlist.php:164
-msgid "Show forums on profile page"
-msgstr ""
-
-#: ../../addon/forumlist/forumlist.php:170
-#: ../../addon.old/forumlist/forumlist.php:167
-msgid "Show forums on network page"
-msgstr ""
-
-#: ../../addon/impressum/impressum.php:37
-#: ../../addon.old/impressum/impressum.php:37
-msgid "Impressum"
-msgstr "Impressum"
-
-#: ../../addon/impressum/impressum.php:50
-#: ../../addon/impressum/impressum.php:52
-#: ../../addon/impressum/impressum.php:84
-#: ../../addon.old/impressum/impressum.php:50
-#: ../../addon.old/impressum/impressum.php:52
-#: ../../addon.old/impressum/impressum.php:84
-msgid "Site Owner"
-msgstr "Propietari del lloc"
-
-#: ../../addon/impressum/impressum.php:50
-#: ../../addon/impressum/impressum.php:88
-#: ../../addon.old/impressum/impressum.php:50
-#: ../../addon.old/impressum/impressum.php:88
-msgid "Email Address"
-msgstr "Adreça de correu"
-
-#: ../../addon/impressum/impressum.php:55
-#: ../../addon/impressum/impressum.php:86
-#: ../../addon.old/impressum/impressum.php:55
-#: ../../addon.old/impressum/impressum.php:86
-msgid "Postal Address"
-msgstr "Adreça postal"
-
-#: ../../addon/impressum/impressum.php:61
-#: ../../addon.old/impressum/impressum.php:61
-msgid ""
-"The impressum addon needs to be configured!<br />Please add at least the "
-"<tt>owner</tt> variable to your config file. For other variables please "
-"refer to the README file of the addon."
-msgstr "El complement impressum s'ha de configurar!<br />Si us plau afegiu almenys la variable <tt>propietari </tt> al fitxer de configuració. Per a les altres variables, consulteu el fitxer README del complement."
-
-#: ../../addon/impressum/impressum.php:84
-#: ../../addon.old/impressum/impressum.php:84
-msgid "The page operators name."
-msgstr "Nom de la pàgina del gestor."
-
-#: ../../addon/impressum/impressum.php:85
-#: ../../addon.old/impressum/impressum.php:85
-msgid "Site Owners Profile"
-msgstr "Perfil del Propietari del Lloc"
-
-#: ../../addon/impressum/impressum.php:85
-#: ../../addon.old/impressum/impressum.php:85
-msgid "Profile address of the operator."
-msgstr "Adreça del perfil del gestor."
-
-#: ../../addon/impressum/impressum.php:86
-#: ../../addon.old/impressum/impressum.php:86
-msgid "How to contact the operator via snail mail. You can use BBCode here."
-msgstr "Com posar-se en contacte amb l'operador a través de correu postal. Vostè pot utilitzar BBCode aquí."
-
-#: ../../addon/impressum/impressum.php:87
-#: ../../addon.old/impressum/impressum.php:87
-msgid "Notes"
-msgstr "Notes"
-
-#: ../../addon/impressum/impressum.php:87
-#: ../../addon.old/impressum/impressum.php:87
-msgid ""
-"Additional notes that are displayed beneath the contact information. You can"
-" use BBCode here."
-msgstr "Notes addicionals que es mostren sota de la informació de contacte. Vostè pot usar BBCode aquí."
-
-#: ../../addon/impressum/impressum.php:88
-#: ../../addon.old/impressum/impressum.php:88
-msgid "How to contact the operator via email. (will be displayed obfuscated)"
-msgstr "Com contactar amb el gestor via correu electronic. ( es visualitzara ofuscat)"
-
-#: ../../addon/impressum/impressum.php:89
-#: ../../addon.old/impressum/impressum.php:89
-msgid "Footer note"
-msgstr "Nota a peu de pàgina"
-
-#: ../../addon/impressum/impressum.php:89
-#: ../../addon.old/impressum/impressum.php:89
-msgid "Text for the footer. You can use BBCode here."
-msgstr "Text pel peu de pàgina. Pots emprar BBCode aquí."
-
-#: ../../addon/buglink/buglink.php:15 ../../addon.old/buglink/buglink.php:15
-msgid "Report Bug"
-msgstr "Informar de problema"
-
-#: ../../addon/notimeline/notimeline.php:32
-#: ../../addon.old/notimeline/notimeline.php:32
-msgid "No Timeline settings updated."
-msgstr "No s'han actualitzat els ajustos de la línia de temps"
-
-#: ../../addon/notimeline/notimeline.php:56
-#: ../../addon.old/notimeline/notimeline.php:56
-msgid "No Timeline Settings"
-msgstr "No hi han ajustos de la línia de temps"
-
-#: ../../addon/notimeline/notimeline.php:58
-#: ../../addon.old/notimeline/notimeline.php:58
-msgid "Disable Archive selector on profile wall"
-msgstr "Desactivar el selector d'arxius del mur de perfils"
-
-#: ../../addon/blockem/blockem.php:51 ../../addon.old/blockem/blockem.php:51
-msgid "\"Blockem\" Settings"
-msgstr "Configuració de \"Bloqueig\""
-
-#: ../../addon/blockem/blockem.php:53 ../../addon.old/blockem/blockem.php:53
-msgid "Comma separated profile URLS to block"
-msgstr "URLS dels perfils a bloquejar, separats per comes"
-
-#: ../../addon/blockem/blockem.php:70 ../../addon.old/blockem/blockem.php:70
-msgid "BLOCKEM Settings saved."
-msgstr "Guardada la configuració de BLOQUEIG."
-
-#: ../../addon/blockem/blockem.php:105 ../../addon.old/blockem/blockem.php:105
-#, php-format
-msgid "Blocked %s - Click to open/close"
-msgstr "Bloquejar %s - Clica per obrir/tancar"
-
-#: ../../addon/blockem/blockem.php:160 ../../addon.old/blockem/blockem.php:160
-msgid "Unblock Author"
-msgstr "Desbloquejar Autor"
-
-#: ../../addon/blockem/blockem.php:162 ../../addon.old/blockem/blockem.php:162
-msgid "Block Author"
-msgstr "Bloquejar Autor"
-
-#: ../../addon/blockem/blockem.php:194 ../../addon.old/blockem/blockem.php:194
-msgid "blockem settings updated"
-msgstr "Actualitzar la Configuració de bloqueig"
-
-#: ../../addon/qcomment/qcomment.php:51
-#: ../../addon.old/qcomment/qcomment.php:51
-msgid ":-)"
-msgstr ":-)"
-
-#: ../../addon/qcomment/qcomment.php:51
-#: ../../addon.old/qcomment/qcomment.php:51
-msgid ":-("
-msgstr ":-("
-
-#: ../../addon/qcomment/qcomment.php:51
-#: ../../addon.old/qcomment/qcomment.php:51
-msgid "lol"
-msgstr "lol"
-
-#: ../../addon/qcomment/qcomment.php:54
-#: ../../addon.old/qcomment/qcomment.php:54
-msgid "Quick Comment Settings"
-msgstr "Configuració Ràpida dels Comentaris"
-
-#: ../../addon/qcomment/qcomment.php:56
-#: ../../addon.old/qcomment/qcomment.php:56
-msgid ""
-"Quick comments are found near comment boxes, sometimes hidden. Click them to"
-" provide simple replies."
-msgstr "Comentaris ràpids es troben prop de les caixes de comentaris, de vegades ocults. Feu clic a ells per donar respostes simples."
-
-#: ../../addon/qcomment/qcomment.php:57
-#: ../../addon.old/qcomment/qcomment.php:57
-msgid "Enter quick comments, one per line"
-msgstr "Introduïu els comentaris ràpids, un per línia"
-
-#: ../../addon/qcomment/qcomment.php:75
-#: ../../addon.old/qcomment/qcomment.php:75
-msgid "Quick Comment settings saved."
-msgstr "Guardada la configuració de comentaris ràpids."
-
-#: ../../addon/openstreetmap/openstreetmap.php:95
-#: ../../addon.old/openstreetmap/openstreetmap.php:71
-msgid "Tile Server URL"
-msgstr "URL del servidor, del mosaico de servidores"
-
-#: ../../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 "Una llista de  <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\"> un mosaic de servidors públics</a>"
-
-#: ../../addon/openstreetmap/openstreetmap.php:96
-#: ../../addon.old/openstreetmap/openstreetmap.php:72
-msgid "Default zoom"
-msgstr "Zoom per defecte"
-
-#: ../../addon/openstreetmap/openstreetmap.php:96
-#: ../../addon.old/openstreetmap/openstreetmap.php:72
-msgid "The default zoom level. (1:world, 18:highest)"
-msgstr "Nivell de zoom per defecte. (1: el món, 18: el més alt)"
-
-#: ../../addon/group_text/group_text.php:46
-msgid "Group Text settings updated."
-msgstr ""
-
-#: ../../addon/group_text/group_text.php:76
-#: ../../addon.old/group_text/group_text.php:76
-msgid "Group Text"
-msgstr ""
-
-#: ../../addon/group_text/group_text.php:78
-#: ../../addon.old/group_text/group_text.php:78
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr ""
-
-#: ../../addon/libravatar/libravatar.php:14
-#: ../../addon.old/libravatar/libravatar.php:14
-msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
-msgstr "No puc instal·lar Libravatar , <br>requereix PHP>=5.3"
-
-#: ../../addon/libravatar/libravatar.php:73
-#: ../../addon/gravatar/gravatar.php:71
-#: ../../addon.old/libravatar/libravatar.php:73
-#: ../../addon.old/gravatar/gravatar.php:71
-msgid "generic profile image"
-msgstr "imatge de perfil genérica"
-
-#: ../../addon/libravatar/libravatar.php:74
-#: ../../addon/gravatar/gravatar.php:72
-#: ../../addon.old/libravatar/libravatar.php:74
-#: ../../addon.old/gravatar/gravatar.php:72
-msgid "random geometric pattern"
-msgstr "Patró geometric aleatori"
-
-#: ../../addon/libravatar/libravatar.php:75
-#: ../../addon/gravatar/gravatar.php:73
-#: ../../addon.old/libravatar/libravatar.php:75
-#: ../../addon.old/gravatar/gravatar.php:73
-msgid "monster face"
-msgstr "Cara monstruosa"
-
-#: ../../addon/libravatar/libravatar.php:76
-#: ../../addon/gravatar/gravatar.php:74
-#: ../../addon.old/libravatar/libravatar.php:76
-#: ../../addon.old/gravatar/gravatar.php:74
-msgid "computer generated face"
-msgstr "Cara monstruosa generada per ordinador"
-
-#: ../../addon/libravatar/libravatar.php:77
-#: ../../addon/gravatar/gravatar.php:75
-#: ../../addon.old/libravatar/libravatar.php:77
-#: ../../addon.old/gravatar/gravatar.php:75
-msgid "retro arcade style face"
-msgstr "Cara d'estil arcade retro"
-
-#: ../../addon/libravatar/libravatar.php:83
-#: ../../addon.old/libravatar/libravatar.php:83
-#, php-format
-msgid "Your PHP version %s is lower than the required PHP >= 5.3."
-msgstr "La teva versió de PHP %s es inferior a la requerida, PHP>=5.3"
-
-#: ../../addon/libravatar/libravatar.php:84
-#: ../../addon.old/libravatar/libravatar.php:84
-msgid "This addon is not functional on your server."
-msgstr "Aquest addon no es funcional al teu servidor."
-
-#: ../../addon/libravatar/libravatar.php:93
-#: ../../addon/gravatar/gravatar.php:89
-#: ../../addon.old/libravatar/libravatar.php:93
-#: ../../addon.old/gravatar/gravatar.php:89
-msgid "Information"
-msgstr "informació"
-
-#: ../../addon/libravatar/libravatar.php:93
-#: ../../addon.old/libravatar/libravatar.php:93
-msgid ""
-"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
-"Libravatar addon will fall back to Gravatar if nothing was found at "
-"Libravatar."
-msgstr "el addon Gravatar està instal·lat. Si us plau, desactiva el addon Gravatar.<br> El addon Libravatar tornarà a Gravatar si no es trova res a Libravatar."
-
-#: ../../addon/libravatar/libravatar.php:100
-#: ../../addon/gravatar/gravatar.php:96
-#: ../../addon.old/libravatar/libravatar.php:100
-#: ../../addon.old/gravatar/gravatar.php:96
-msgid "Default avatar image"
-msgstr "Imatge d'avatar per defecte"
-
-#: ../../addon/libravatar/libravatar.php:100
-#: ../../addon.old/libravatar/libravatar.php:100
-msgid "Select default avatar image if none was found. See README"
-msgstr "seleccionada la imatge d'avatar per defecte si no es trova cap altre. Veure README"
-
-#: ../../addon/libravatar/libravatar.php:112
-#: ../../addon.old/libravatar/libravatar.php:112
-msgid "Libravatar settings updated."
-msgstr "Ajustos de Libravatar actualitzats."
-
-#: ../../addon/libertree/libertree.php:36
-#: ../../addon.old/libertree/libertree.php:36
-msgid "Post to libertree"
-msgstr "Enviament a libertree"
-
-#: ../../addon/libertree/libertree.php:67
-#: ../../addon.old/libertree/libertree.php:67
-msgid "libertree Post Settings"
-msgstr "Ajustos d'enviaments a libertree"
-
-#: ../../addon/libertree/libertree.php:69
-#: ../../addon.old/libertree/libertree.php:69
-msgid "Enable Libertree Post Plugin"
-msgstr "Activa el plugin d'enviaments a libertree"
-
-#: ../../addon/libertree/libertree.php:74
-#: ../../addon.old/libertree/libertree.php:74
-msgid "Libertree API token"
-msgstr "Libertree API token"
-
-#: ../../addon/libertree/libertree.php:79
-#: ../../addon.old/libertree/libertree.php:79
-msgid "Libertree site URL"
-msgstr "lloc URL libertree"
-
-#: ../../addon/libertree/libertree.php:84
-#: ../../addon.old/libertree/libertree.php:84
-msgid "Post to Libertree by default"
-msgstr "Enviar a libertree per defecte"
-
-#: ../../addon/altpager/altpager.php:46
-#: ../../addon.old/altpager/altpager.php:46
-msgid "Altpager settings updated."
-msgstr "Ajustos de Altpagerr actualitzats."
-
-#: ../../addon/altpager/altpager.php:83
-#: ../../addon.old/altpager/altpager.php:79
-msgid "Alternate Pagination Setting"
-msgstr "Alternate Pagination Setting"
-
-#: ../../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 "Emprar enllaç a \"més nova\" i \"més antiga\" pàgina, en lloc de números de pàgina? "
-
-#: ../../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 "
-"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
-"your wall,network tab and private mail."
-msgstr "El complement MathJax processa les fórmules matemàtiques escrites utilitzant la sintaxi de LaTeX, envoltades per l'habitual $$ o un bloc de \"eqnarray\" en les publicacions del seu mur, a la fitxa de la xarxa i correu privat."
-
-#: ../../addon/mathjax/mathjax.php:38 ../../addon.old/mathjax/mathjax.php:38
-msgid "Use the MathJax renderer"
-msgstr "Utilitzar el processador Mathjax"
-
-#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
-msgid "MathJax Base URL"
-msgstr "URL Base de Mathjax"
-
-#: ../../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 "La URL del fitxer javascript que ha de ser inclòs per a usar Mathjax. Pot ser utilitzat per Mathjax CDN o un altre instal·lació de Mathjax."
-
-#: ../../addon/editplain/editplain.php:46
-#: ../../addon.old/group_text/group_text.php:46
-#: ../../addon.old/editplain/editplain.php:46
-msgid "Editplain settings updated."
-msgstr "Actualitzar la configuració de Editplain."
-
-#: ../../addon/editplain/editplain.php:76
-#: ../../addon.old/editplain/editplain.php:76
-msgid "Editplain Settings"
-msgstr "Configuració de Editplain"
-
-#: ../../addon/editplain/editplain.php:78
-#: ../../addon.old/editplain/editplain.php:78
-msgid "Disable richtext status editor"
-msgstr "Deshabilitar l'editor d'estatus de texte enriquit"
-
-#: ../../addon/gravatar/gravatar.php:89
-#: ../../addon.old/gravatar/gravatar.php:89
-msgid ""
-"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."
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:96
-#: ../../addon.old/gravatar/gravatar.php:96
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr "Se selecciona  la imatge d'avatar per defecte si no es troba cap en Gravatar. Veure el README"
-
-#: ../../addon/gravatar/gravatar.php:97
-#: ../../addon.old/gravatar/gravatar.php:97
-msgid "Rating of images"
-msgstr "Classificació de les imatges"
-
-#: ../../addon/gravatar/gravatar.php:97
-#: ../../addon.old/gravatar/gravatar.php:97
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr "Selecciona la classe d'avatar apropiat pel teu lloc. Veure el README"
-
-#: ../../addon/gravatar/gravatar.php:111
-#: ../../addon.old/gravatar/gravatar.php:111
-msgid "Gravatar settings updated."
-msgstr "Ajustos de Gravatar actualitzats."
-
-#: ../../addon/testdrive/testdrive.php:95
-#: ../../addon.old/testdrive/testdrive.php:95
-msgid "Your Friendica test account is about to expire."
-msgstr "La teva provatura de Friendica esta a prop d'expirar."
-
-#: ../../addon/testdrive/testdrive.php:96
-#: ../../addon.old/testdrive/testdrive.php:96
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your 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."
-msgstr "Hola %1$s ,\n\nEl seu compte de prova a %2$s expirarà en menys de cinc dies . Esperem que hagi gaudit d'aquesta prova i aprofita aquesta oportunitat per trobar un lloc web Friendica permanent per a les teves comunicacions socials integrades . Una llista de llocs públics es troba disponible a http://dir.friendica.com/siteinfo - i per obtenir més informació sobre com configurar el vostre servidor Friendica consulteu el lloc web del projecte en el Friendica http://friendica.com ."
-
-#: ../../addon/pageheader/pageheader.php:50
-#: ../../addon.old/pageheader/pageheader.php:50
-msgid "\"pageheader\" Settings"
-msgstr "Configuració de la capçalera de pàgina."
-
-#: ../../addon/pageheader/pageheader.php:68
-#: ../../addon.old/pageheader/pageheader.php:68
-msgid "pageheader Settings saved."
-msgstr "guardada la configuració de la capçalera de pàgina."
-
-#: ../../addon/ijpost/ijpost.php:39 ../../addon.old/ijpost/ijpost.php:39
-msgid "Post to Insanejournal"
-msgstr "Enviament a Insanejournal"
-
-#: ../../addon/ijpost/ijpost.php:70 ../../addon.old/ijpost/ijpost.php:70
-msgid "InsaneJournal Post Settings"
-msgstr "Ajustos d'Enviament a Insanejournal"
-
-#: ../../addon/ijpost/ijpost.php:72 ../../addon.old/ijpost/ijpost.php:72
-msgid "Enable InsaneJournal Post Plugin"
-msgstr "Habilita el Plugin d'Enviaments a Insanejournal"
-
-#: ../../addon/ijpost/ijpost.php:77 ../../addon.old/ijpost/ijpost.php:77
-msgid "InsaneJournal username"
-msgstr "Nom d'usuari de Insanejournal"
-
-#: ../../addon/ijpost/ijpost.php:82 ../../addon.old/ijpost/ijpost.php:82
-msgid "InsaneJournal password"
-msgstr "Contrasenya de Insanejournal"
-
-#: ../../addon/ijpost/ijpost.php:87 ../../addon.old/ijpost/ijpost.php:87
-msgid "Post to InsaneJournal by default"
-msgstr "Enviar per defecte a Insanejournal"
-
-#: ../../addon/jappixmini/jappixmini.php:266
-#: ../../addon.old/jappixmini/jappixmini.php:266
-msgid "Jappix Mini addon settings"
-msgstr ""
-
-#: ../../addon/jappixmini/jappixmini.php:268
-#: ../../addon.old/jappixmini/jappixmini.php:268
-msgid "Activate addon"
-msgstr ""
-
-#: ../../addon/jappixmini/jappixmini.php:271
-#: ../../addon.old/jappixmini/jappixmini.php:271
-msgid ""
-"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
-msgstr ""
-
-#: ../../addon/jappixmini/jappixmini.php:274
-#: ../../addon.old/jappixmini/jappixmini.php:274
-msgid "Jabber username"
-msgstr ""
-
-#: ../../addon/jappixmini/jappixmini.php:277
-#: ../../addon.old/jappixmini/jappixmini.php:277
-msgid "Jabber server"
-msgstr ""
-
-#: ../../addon/jappixmini/jappixmini.php:281
-#: ../../addon.old/jappixmini/jappixmini.php:281
-msgid "Jabber BOSH host"
-msgstr ""
-
-#: ../../addon/jappixmini/jappixmini.php:285
-#: ../../addon.old/jappixmini/jappixmini.php:285
-msgid "Jabber password"
-msgstr ""
-
-#: ../../addon/jappixmini/jappixmini.php:290
-#: ../../addon.old/jappixmini/jappixmini.php:290
-msgid "Encrypt Jabber password with Friendica password (recommended)"
-msgstr ""
-
-#: ../../addon/jappixmini/jappixmini.php:293
-#: ../../addon.old/jappixmini/jappixmini.php:293
-msgid "Friendica password"
-msgstr ""
-
-#: ../../addon/jappixmini/jappixmini.php:296
-#: ../../addon.old/jappixmini/jappixmini.php:296
-msgid "Approve subscription requests from Friendica contacts automatically"
-msgstr ""
-
-#: ../../addon/jappixmini/jappixmini.php:299
-#: ../../addon.old/jappixmini/jappixmini.php:299
-msgid "Subscribe to Friendica contacts automatically"
-msgstr ""
-
-#: ../../addon/jappixmini/jappixmini.php:302
-#: ../../addon.old/jappixmini/jappixmini.php:302
-msgid "Purge internal list of jabber addresses of contacts"
-msgstr ""
-
-#: ../../addon/jappixmini/jappixmini.php:308
-#: ../../addon.old/jappixmini/jappixmini.php:308
-msgid "Add contact"
-msgstr ""
-
-#: ../../addon/viewsrc/viewsrc.php:39 ../../addon.old/viewsrc/viewsrc.php:37
-msgid "View Source"
-msgstr "Veure les Fonts"
-
-#: ../../addon/statusnet/statusnet.php:138
-#: ../../addon.old/statusnet/statusnet.php:134
-msgid "Post to StatusNet"
-msgstr "Publica-ho a StatusNet"
-
-#: ../../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 "Si us plau, poseu-vos en contacte amb l'administrador del lloc. <br /> L'adreça URL de l'API proporcionada no és vàlida."
-
-#: ../../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 "No hem pogut posar-nos en contacte amb l'API StatusNet amb la ruta que has introduït."
-
-#: ../../addon/statusnet/statusnet.php:238
-#: ../../addon.old/statusnet/statusnet.php:232
-msgid "StatusNet settings updated."
-msgstr "La configuració StatusNet actualitzada."
-
-#: ../../addon/statusnet/statusnet.php:269
-#: ../../addon.old/statusnet/statusnet.php:257
-msgid "StatusNet Posting Settings"
-msgstr "Configuració d'Enviaments per a StatusNet"
-
-#: ../../addon/statusnet/statusnet.php:283
-#: ../../addon.old/statusnet/statusnet.php:271
-msgid "Globally Available StatusNet OAuthKeys"
-msgstr "OAuthKeys de StatusNet Globalment Disponible"
-
-#: ../../addon/statusnet/statusnet.php:284
-#: ../../addon.old/statusnet/statusnet.php:272
-msgid ""
-"There are preconfigured OAuth key pairs for some StatusNet servers "
-"available. If you are useing one of them, please use these credentials. If "
-"not feel free to connect to any other StatusNet instance (see below)."
-msgstr "Hi ha preconfigurats parells clau OAuth per a alguns servidors StatusNet disponibles. Si està emprant un d'ells, utilitzi aquestes credencials. Si no és així no dubteu a connectar-se a qualsevol altra instància StatusNet (veure a baix)."
-
-#: ../../addon/statusnet/statusnet.php:292
-#: ../../addon.old/statusnet/statusnet.php:280
-msgid "Provide your own OAuth Credentials"
-msgstr "Proporcioneu les vostres credencials de OAuth"
-
-#: ../../addon/statusnet/statusnet.php:293
-#: ../../addon.old/statusnet/statusnet.php:281
-msgid ""
-"No consumer key pair for StatusNet found. Register your Friendica Account as"
-" an desktop client on your StatusNet account, copy the consumer key pair "
-"here and enter the API base root.<br />Before you register your own OAuth "
-"key pair ask the administrator if there is already a key pair for this "
-"Friendica installation at your favorited StatusNet installation."
-msgstr "no s'ha trobat cap parell \"consumer key\" per StatusNet. Registra el teu compte Friendica com un client d'escriptori en el seu compte StatusNet, copieu el parell de \"consumer key\" aquí i entri a l'arrel de la base de l'API. <br /> Abans de registrar el seu parell de claus OAuth demani a l'administrador si ja hi ha un parell de claus per a aquesta instal·lació de Friendica en la instal·lació del teu favorit StatusNet."
-
-#: ../../addon/statusnet/statusnet.php:295
-#: ../../addon.old/statusnet/statusnet.php:283
-msgid "OAuth Consumer Key"
-msgstr "OAuth Consumer Key"
-
-#: ../../addon/statusnet/statusnet.php:298
-#: ../../addon.old/statusnet/statusnet.php:286
-msgid "OAuth Consumer Secret"
-msgstr "OAuth Consumer Secret"
-
-#: ../../addon/statusnet/statusnet.php:301
-#: ../../addon.old/statusnet/statusnet.php:289
-msgid "Base API Path (remember the trailing /)"
-msgstr "Base API Path (recorda deixar / al final)"
-
-#: ../../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 "
-"security code from StatusNet which you have to copy into the input box below"
-" and submit the form. Only your <strong>public</strong> posts will be posted"
-" to StatusNet."
-msgstr "Per connectar al seu compte StatusNet, feu clic al botó de sota per obtenir un codi de seguretat StatusNet, que has de copiar a la casella de sota, i enviar el formulari. Només els missatges <strong> públics </strong> es publicaran en StatusNet."
-
-#: ../../addon/statusnet/statusnet.php:323
-#: ../../addon.old/statusnet/statusnet.php:311
-msgid "Log in with StatusNet"
-msgstr "Accedeixi com en  StatusNet"
-
-#: ../../addon/statusnet/statusnet.php:325
-#: ../../addon.old/statusnet/statusnet.php:313
-msgid "Copy the security code from StatusNet here"
-msgstr "Copieu el codi de seguretat StatusNet aquí"
-
-#: ../../addon/statusnet/statusnet.php:331
-#: ../../addon.old/statusnet/statusnet.php:319
-msgid "Cancel Connection Process"
-msgstr "Cancel·lar el procés de connexió"
-
-#: ../../addon/statusnet/statusnet.php:333
-#: ../../addon.old/statusnet/statusnet.php:321
-msgid "Current StatusNet API is"
-msgstr "L'Actual StatusNet API és"
-
-#: ../../addon/statusnet/statusnet.php:334
-#: ../../addon.old/statusnet/statusnet.php:322
-msgid "Cancel StatusNet Connection"
-msgstr "Cancel·lar la connexió amb StatusNet"
-
-#: ../../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 "Actualment connectat a: "
-
-#: ../../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 "
-"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."
-msgstr "Si està activat, tots els seus anuncis <strong>públics</strong> poden ser publicats en el compte StatusNet associat. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada."
-
-#: ../../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 "<strong>Nota</strong>: A causa de les seves opcions de privacitat (<em>Amaga els detalls del teu perfil dels espectadors desconeguts? </em>)  el vincle potencialment inclòs en anuncis públics transmesos a StatusNet conduirà el visitant a una pàgina en blanc en la que informarà al visitants que l'accés al seu perfil s'ha restringit."
-
-#: ../../addon/statusnet/statusnet.php:351
-#: ../../addon.old/statusnet/statusnet.php:339
-msgid "Allow posting to StatusNet"
-msgstr "Permetre enviaments a StatusNet"
-
-#: ../../addon/statusnet/statusnet.php:354
-#: ../../addon.old/statusnet/statusnet.php:342
-msgid "Send public postings to StatusNet by default"
-msgstr "Enviar missatges públics a StatusNet per defecte"
-
-#: ../../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 "Enviar enllaços #-etiquetes i @-noms a StatusNet"
-
-#: ../../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 "Esborrar configuració de OAuth"
-
-#: ../../addon/statusnet/statusnet.php:745
-#: ../../addon.old/statusnet/statusnet.php:568
-msgid "API URL"
-msgstr "API URL"
-
-#: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
-#: ../../addon.old/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
-msgid "Infinite Improbability Drive"
-msgstr "Infinite Improbability Drive"
-
-#: ../../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 "Publica-ho al Tumblr"
-
-#: ../../addon/tumblr/tumblr.php:185 ../../addon.old/tumblr/tumblr.php:67
-msgid "Tumblr Post Settings"
-msgstr "Configuració d'Enviaments de Tumblr"
-
-#: ../../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 "Habilita el plugin de enviaments de Tumblr"
-
-#: ../../addon/tumblr/tumblr.php:197 ../../addon.old/tumblr/tumblr.php:84
-msgid "Post to Tumblr by default"
-msgstr "Enviar a Tumblr per defecte"
-
-#: ../../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 "Actualitzar la configuració de Numfriends."
-
-#: ../../addon/numfriends/numfriends.php:77
-#: ../../addon.old/numfriends/numfriends.php:77
-msgid "Numfriends Settings"
-msgstr "Configuració de 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 "Quants contactes per mostrar a la barra lateral el perfil"
-
-#: ../../addon/gnot/gnot.php:48 ../../addon.old/gnot/gnot.php:48
-msgid "Gnot settings updated."
-msgstr "Configuració de Gnot actualitzada"
-
-#: ../../addon/gnot/gnot.php:79 ../../addon.old/gnot/gnot.php:79
-msgid "Gnot Settings"
-msgstr "Configuració de Gnot"
-
-#: ../../addon/gnot/gnot.php:81 ../../addon.old/gnot/gnot.php:81
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the"
-" subject line."
-msgstr "Permet crear fils de les notificacions de comentaris de correu electrònic a Gmail i anonimat de la línia d'assumpte."
-
-#: ../../addon/gnot/gnot.php:82 ../../addon.old/gnot/gnot.php:82
-msgid "Enable this plugin/addon?"
-msgstr "Activar aquest plugin/aplicació?"
-
-#: ../../addon/gnot/gnot.php:97 ../../addon.old/gnot/gnot.php:97
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr "[Friendica: Notifica] Conversació comentada #%d"
-
-#: ../../addon/wppost/wppost.php:42 ../../addon.old/wppost/wppost.php:42
-msgid "Post to Wordpress"
-msgstr "Publica-ho al Wordpress"
-
-#: ../../addon/wppost/wppost.php:76 ../../addon.old/wppost/wppost.php:76
-msgid "WordPress Post Settings"
-msgstr "Configuració d'enviaments a WordPress"
-
-#: ../../addon/wppost/wppost.php:78 ../../addon.old/wppost/wppost.php:78
-msgid "Enable WordPress Post Plugin"
-msgstr "Habilitar Configuració d'Enviaments a WordPress"
-
-#: ../../addon/wppost/wppost.php:83 ../../addon.old/wppost/wppost.php:83
-msgid "WordPress username"
-msgstr "Nom d'usuari de WordPress"
-
-#: ../../addon/wppost/wppost.php:88 ../../addon.old/wppost/wppost.php:88
-msgid "WordPress password"
-msgstr "Contrasenya de WordPress"
-
-#: ../../addon/wppost/wppost.php:93 ../../addon.old/wppost/wppost.php:93
-msgid "WordPress API URL"
-msgstr "WordPress API URL"
-
-#: ../../addon/wppost/wppost.php:98 ../../addon.old/wppost/wppost.php:98
-msgid "Post to WordPress by default"
-msgstr "Enviar a WordPress per defecte"
-
-#: ../../addon/wppost/wppost.php:103 ../../addon.old/wppost/wppost.php:103
-msgid "Provide a backlink to the Friendica post"
-msgstr "Proveeix un retroenllaç al missatge de Friendica"
-
-#: ../../addon/wppost/wppost.php:201 ../../addon/blogger/blogger.php:172
-#: ../../addon/posterous/posterous.php:189
-#: ../../addon.old/drpost/drpost.php:184 ../../addon.old/wppost/wppost.php:201
-#: ../../addon.old/blogger/blogger.php:172
-#: ../../addon.old/posterous/posterous.php:189
-msgid "Post from Friendica"
-msgstr "Enviament des de Friendica"
-
-#: ../../addon/wppost/wppost.php:207 ../../addon.old/wppost/wppost.php:207
-msgid "Read the original post and comment stream on Friendica"
-msgstr "Llegeix el missatge original i el flux de comentaris en Friendica"
-
-#: ../../addon/showmore/showmore.php:38
-#: ../../addon.old/showmore/showmore.php:38
-msgid "\"Show more\" Settings"
-msgstr "Configuració de \"Mostrar més\""
-
-#: ../../addon/showmore/showmore.php:41
-#: ../../addon.old/showmore/showmore.php:41
-msgid "Enable Show More"
-msgstr "Habilita Mostrar Més"
-
-#: ../../addon/showmore/showmore.php:44
-#: ../../addon.old/showmore/showmore.php:44
-msgid "Cutting posts after how much characters"
-msgstr "Tallar els missatges després de quants caràcters"
-
-#: ../../addon/showmore/showmore.php:65
-#: ../../addon.old/showmore/showmore.php:65
-msgid "Show More Settings saved."
-msgstr "Guardada la configuració de \"Mostra Més\"."
-
-#: ../../addon/piwik/piwik.php:79 ../../addon.old/piwik/piwik.php:79
-msgid ""
-"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
-"analytics tool."
-msgstr "Aquest lloc web realitza un seguiment mitjançant la eina d'anàlisi <a href='http://www.piwik.org'>Piwik</a>."
-
-#: ../../addon/piwik/piwik.php:82 ../../addon.old/piwik/piwik.php:82
-#, php-format
-msgid ""
-"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)."
-msgstr "Si no vol que les seves visites es registrin d'aquesta manera vostè <a href='%s'> pot establir una cookie per evitar a Piwik a partir de noves visites del lloc web </a> (opt-out)."
-
-#: ../../addon/piwik/piwik.php:90 ../../addon.old/piwik/piwik.php:90
-msgid "Piwik Base URL"
-msgstr "URL Piwik Base"
-
-#: ../../addon/piwik/piwik.php:90 ../../addon.old/piwik/piwik.php:90
-msgid ""
-"Absolute path to your Piwik installation. (without protocol (http/s), with "
-"trailing slash)"
-msgstr "Trajectoria absoluta per a la instal·lació de Piwik (sense el protocol (http/s), amb la barra final )"
-
-#: ../../addon/piwik/piwik.php:91 ../../addon.old/piwik/piwik.php:91
-msgid "Site ID"
-msgstr "Lloc ID"
-
-#: ../../addon/piwik/piwik.php:92 ../../addon.old/piwik/piwik.php:92
-msgid "Show opt-out cookie link?"
-msgstr "Mostra l'enllaç cookie opt-out?"
-
-#: ../../addon/piwik/piwik.php:93 ../../addon.old/piwik/piwik.php:93
-msgid "Asynchronous tracking"
-msgstr "Seguiment asíncrono"
-
-#: ../../addon/twitter/twitter.php:77 ../../addon.old/twitter/twitter.php:73
-msgid "Post to Twitter"
-msgstr "Publica-ho al Twitter"
-
-#: ../../addon/twitter/twitter.php:129 ../../addon.old/twitter/twitter.php:122
-msgid "Twitter settings updated."
-msgstr "La configuració de Twitter actualitzada."
-
-#: ../../addon/twitter/twitter.php:157 ../../addon.old/twitter/twitter.php:146
-msgid "Twitter Posting Settings"
-msgstr "Configuració d'Enviaments per a Twitter"
-
-#: ../../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 "No s'ha pogut emparellar cap clau \"consumer key\" per a Twitter. Si us plau, poseu-vos en contacte amb l'administrador del lloc."
-
-#: ../../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 "
-"button below to get a PIN from Twitter which you have to copy into the input"
-" box below and submit the form. Only your <strong>public</strong> posts will"
-" be posted to Twitter."
-msgstr "En aquesta instància Friendica el plugin Twitter va ser habilitat, però encara no ha connectat el compte al seu compte de Twitter. Per a això feu clic al botó de sota per obtenir un PIN de Twitter que ha de copiar a la casella de sota i enviar el formulari. Només els missatges <strong> públics </strong> es publicaran a Twitter."
-
-#: ../../addon/twitter/twitter.php:184 ../../addon.old/twitter/twitter.php:173
-msgid "Log in with Twitter"
-msgstr "Accedeixi com en  Twitter"
-
-#: ../../addon/twitter/twitter.php:186 ../../addon.old/twitter/twitter.php:175
-msgid "Copy the PIN from Twitter here"
-msgstr "Copieu el codi PIN de Twitter aquí"
-
-#: ../../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 "Si està activat, tots els seus anuncis <strong> públics </strong> poden ser publicats en el corresponent compte de Twitter. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada."
-
-#: ../../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 "
-"postings relayed to Twitter will lead the visitor to a blank page informing "
-"the visitor that the access to your profile has been restricted."
-msgstr "<strong>Nota</strong>: donada la seva configuració de privacitat (<em> Amaga els detalls del teu perfil dels espectadors desconeguts? </em>) el vincle potencialment inclòs en anuncis públics retransmesos a Twitter conduirà al visitant a una pàgina en blanc informar als visitants que l'accés al seu perfil s'ha restringit."
-
-#: ../../addon/twitter/twitter.php:206 ../../addon.old/twitter/twitter.php:195
-msgid "Allow posting to Twitter"
-msgstr "Permetre anunci a Twitter"
-
-#: ../../addon/twitter/twitter.php:209 ../../addon.old/twitter/twitter.php:198
-msgid "Send public postings to Twitter by default"
-msgstr "Enviar anuncis públics a Twitter per defecte"
-
-#: ../../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 "Enviar enllaços #-etiquetes i @-noms a Twitter"
-
-#: ../../addon/twitter/twitter.php:558 ../../addon.old/twitter/twitter.php:396
-msgid "Consumer key"
-msgstr "Consumer key"
-
-#: ../../addon/twitter/twitter.php:559 ../../addon.old/twitter/twitter.php:397
-msgid "Consumer secret"
-msgstr "Consumer secret"
-
-#: ../../addon/twitter/twitter.php:560
-msgid "Name of the Twitter Application"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:560
-msgid ""
-"set this to avoid mirroring postings from ~friendica back to ~friendica"
-msgstr ""
-
-#: ../../addon/irc/irc.php:44 ../../addon.old/irc/irc.php:44
-msgid "IRC Settings"
-msgstr "Ajustos de IRC"
-
-#: ../../addon/irc/irc.php:46 ../../addon.old/irc/irc.php:46
-msgid "Channel(s) to auto connect (comma separated)"
-msgstr "Canal(s) per auto connectar (separats per comes)"
-
-#: ../../addon/irc/irc.php:51 ../../addon.old/irc/irc.php:51
-msgid "Popular Channels (comma separated)"
-msgstr "Canals Populars (separats per comes)"
-
-#: ../../addon/irc/irc.php:69 ../../addon.old/irc/irc.php:69
-msgid "IRC settings saved."
-msgstr "Ajustos del IRC guardats."
-
-#: ../../addon/irc/irc.php:74 ../../addon.old/irc/irc.php:74
-msgid "IRC Chatroom"
-msgstr "IRC Chatroom"
-
-#: ../../addon/irc/irc.php:96 ../../addon.old/irc/irc.php:96
-msgid "Popular Channels"
-msgstr "Canals Populars"
-
-#: ../../addon/fromapp/fromapp.php:38 ../../addon.old/fromapp/fromapp.php:38
-msgid "Fromapp settings updated."
-msgstr ""
-
-#: ../../addon/fromapp/fromapp.php:64 ../../addon.old/fromapp/fromapp.php:64
-msgid "FromApp Settings"
-msgstr ""
-
-#: ../../addon/fromapp/fromapp.php:66 ../../addon.old/fromapp/fromapp.php:66
-msgid ""
-"The application name you would like to show your posts originating from."
-msgstr ""
-
-#: ../../addon/fromapp/fromapp.php:70 ../../addon.old/fromapp/fromapp.php:70
-msgid "Use this application name even if another application was used."
-msgstr ""
-
-#: ../../addon/blogger/blogger.php:42 ../../addon.old/blogger/blogger.php:42
-msgid "Post to blogger"
-msgstr "Enviament a blogger"
-
-#: ../../addon/blogger/blogger.php:74 ../../addon.old/blogger/blogger.php:74
-msgid "Blogger Post Settings"
-msgstr "Ajustos d'enviament a blogger"
-
-#: ../../addon/blogger/blogger.php:76 ../../addon.old/blogger/blogger.php:76
-msgid "Enable Blogger Post Plugin"
-msgstr "Habilita el Plugin d'Enviaments a Blogger"
-
-#: ../../addon/blogger/blogger.php:81 ../../addon.old/blogger/blogger.php:81
-msgid "Blogger username"
-msgstr "Nom d'usuari a blogger"
-
-#: ../../addon/blogger/blogger.php:86 ../../addon.old/blogger/blogger.php:86
-msgid "Blogger password"
-msgstr "Contrasenya a blogger"
-
-#: ../../addon/blogger/blogger.php:91 ../../addon.old/blogger/blogger.php:91
-msgid "Blogger API URL"
-msgstr "Blogger API URL"
-
-#: ../../addon/blogger/blogger.php:96 ../../addon.old/blogger/blogger.php:96
-msgid "Post to Blogger by default"
-msgstr "Enviament a Blogger per defecte"
-
-#: ../../addon/posterous/posterous.php:37
-#: ../../addon.old/posterous/posterous.php:37
-msgid "Post to Posterous"
-msgstr "enviament a Posterous"
-
-#: ../../addon/posterous/posterous.php:70
-#: ../../addon.old/posterous/posterous.php:70
-msgid "Posterous Post Settings"
-msgstr "Configuració d'Enviaments a Posterous"
-
-#: ../../addon/posterous/posterous.php:72
-#: ../../addon.old/posterous/posterous.php:72
-msgid "Enable Posterous Post Plugin"
-msgstr "Habilitar plugin d'Enviament de Posterous"
-
-#: ../../addon/posterous/posterous.php:77
-#: ../../addon.old/posterous/posterous.php:77
-msgid "Posterous login"
-msgstr "Inici de sessió a Posterous"
-
-#: ../../addon/posterous/posterous.php:82
-#: ../../addon.old/posterous/posterous.php:82
-msgid "Posterous password"
-msgstr "Contrasenya a Posterous"
-
-#: ../../addon/posterous/posterous.php:87
-#: ../../addon.old/posterous/posterous.php:87
-msgid "Posterous site ID"
-msgstr "ID al lloc Posterous"
-
-#: ../../addon/posterous/posterous.php:92
-#: ../../addon.old/posterous/posterous.php:92
-msgid "Posterous API token"
-msgstr "Posterous API token"
-
-#: ../../addon/posterous/posterous.php:97
-#: ../../addon.old/posterous/posterous.php:97
-msgid "Post to Posterous by default"
-msgstr "Enviar a Posterous per defecte"
-
-#: ../../view/theme/cleanzero/config.php:82
-#: ../../view/theme/diabook/config.php:154
-#: ../../view/theme/quattro/config.php:66 ../../view/theme/dispy/config.php:72
-msgid "Theme settings"
-msgstr "Configuració de Temes"
-
-#: ../../view/theme/cleanzero/config.php:83
-msgid "Set resize level for images in posts and comments (width and height)"
-msgstr "Ajusteu el nivell de canvi de mida d'imatges en els missatges i comentaris ( amplada i alçada"
-
-#: ../../view/theme/cleanzero/config.php:84
-#: ../../view/theme/diabook/config.php:155
-#: ../../view/theme/dispy/config.php:73
-msgid "Set font-size for posts and comments"
-msgstr "Canvia la mida del tipus de lletra per enviaments i comentaris"
-
-#: ../../view/theme/cleanzero/config.php:85
-msgid "Set theme width"
-msgstr "Ajustar l'ample del tema"
-
-#: ../../view/theme/cleanzero/config.php:86
-#: ../../view/theme/quattro/config.php:68
-msgid "Color scheme"
-msgstr "Esquema de colors"
-
-#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:76
-#: ../../include/nav.php:143
-msgid "Your posts and conversations"
-msgstr "Els teus anuncis i converses"
-
-#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:77
-msgid "Your profile page"
-msgstr "La seva pàgina de perfil"
-
-#: ../../view/theme/diabook/theme.php:89
-msgid "Your contacts"
-msgstr "Els teus contactes"
-
-#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:78
-msgid "Your photos"
-msgstr "Les seves fotos"
-
-#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:79
-msgid "Your events"
-msgstr "Els seus esdeveniments"
-
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:80
-msgid "Personal notes"
-msgstr "Notes personals"
-
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:80
-msgid "Your personal photos"
-msgstr "Les seves fotos personals"
-
-#: ../../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 "Pàgines de la Comunitat"
-
-#: ../../view/theme/diabook/theme.php:384
-#: ../../view/theme/diabook/theme.php:634
-#: ../../view/theme/diabook/config.php:165
-msgid "Community Profiles"
-msgstr "Perfils de Comunitat"
-
-#: ../../view/theme/diabook/theme.php:405
-#: ../../view/theme/diabook/theme.php:639
-#: ../../view/theme/diabook/config.php:170
-msgid "Last users"
-msgstr "Últims usuaris"
-
-#: ../../view/theme/diabook/theme.php:434
-#: ../../view/theme/diabook/theme.php:641
-#: ../../view/theme/diabook/config.php:172
-msgid "Last likes"
-msgstr "Últims \"m'agrada\""
-
-#: ../../view/theme/diabook/theme.php:479
-#: ../../view/theme/diabook/theme.php:640
-#: ../../view/theme/diabook/config.php:171
-msgid "Last photos"
-msgstr "Últimes fotos"
-
-#: ../../view/theme/diabook/theme.php:516
-#: ../../view/theme/diabook/theme.php:637
-#: ../../view/theme/diabook/config.php:168
-msgid "Find Friends"
-msgstr "Trobar Amistats"
-
-#: ../../view/theme/diabook/theme.php:517
-msgid "Local Directory"
-msgstr "Directori Local"
-
-#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
-msgid "Similar Interests"
-msgstr "Aficions Similars"
-
-#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
-msgid "Invite Friends"
-msgstr "Invita Amics"
-
-#: ../../view/theme/diabook/theme.php:572
-#: ../../view/theme/diabook/theme.php:633
-#: ../../view/theme/diabook/config.php:164
-msgid "Earth Layers"
-msgstr "Earth Layers"
-
-#: ../../view/theme/diabook/theme.php:577
-msgid "Set zoomfactor for Earth Layers"
-msgstr "Ajustar el factor de zoom per Earth Layers"
-
-#: ../../view/theme/diabook/theme.php:578
-#: ../../view/theme/diabook/config.php:161
-msgid "Set longitude (X) for Earth Layers"
-msgstr "Ajustar longitud (X) per Earth Layers"
-
-#: ../../view/theme/diabook/theme.php:579
-#: ../../view/theme/diabook/config.php:162
-msgid "Set latitude (Y) for Earth Layers"
-msgstr "Ajustar latitud (Y) per Earth Layers"
-
-#: ../../view/theme/diabook/theme.php:592
-#: ../../view/theme/diabook/theme.php:635
-#: ../../view/theme/diabook/config.php:166
-msgid "Help or @NewHere ?"
-msgstr "Ajuda o @NouAqui?"
-
-#: ../../view/theme/diabook/theme.php:599
-#: ../../view/theme/diabook/theme.php:636
-#: ../../view/theme/diabook/config.php:167
-msgid "Connect Services"
-msgstr "Serveis Connectats"
-
-#: ../../view/theme/diabook/theme.php:606
-#: ../../view/theme/diabook/theme.php:638
-msgid "Last Tweets"
-msgstr "Últims Tweets"
-
-#: ../../view/theme/diabook/theme.php:609
-#: ../../view/theme/diabook/config.php:159
-msgid "Set twitter search term"
-msgstr "Ajustar el terme de cerca de twitter"
-
-#: ../../view/theme/diabook/theme.php:629
-#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:327
-msgid "don't show"
-msgstr "no mostris"
-
-#: ../../view/theme/diabook/theme.php:629
-#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:326
-msgid "show"
-msgstr "mostra"
-
-#: ../../view/theme/diabook/theme.php:630
-msgid "Show/hide boxes at right-hand column:"
-msgstr "Mostra/amaga els marcs de la columna a ma dreta"
-
-#: ../../view/theme/diabook/config.php:156
-#: ../../view/theme/dispy/config.php:74
-msgid "Set line-height for posts and comments"
-msgstr "Canvia l'espaiat de línia per enviaments i comentaris"
-
-#: ../../view/theme/diabook/config.php:157
-msgid "Set resolution for middle column"
-msgstr "canvia la resolució per a la columna central"
-
-#: ../../view/theme/diabook/config.php:158
-msgid "Set color scheme"
-msgstr "Canvia l'esquema de color"
-
-#: ../../view/theme/diabook/config.php:160
-msgid "Set zoomfactor for Earth Layer"
-msgstr "Ajustar el factor de zoom de Earth Layers"
-
-#: ../../view/theme/diabook/config.php:169
-msgid "Last tweets"
-msgstr "Últims tweets"
-
-#: ../../view/theme/quattro/config.php:67
-msgid "Alignment"
-msgstr "Adaptació"
-
-#: ../../view/theme/quattro/config.php:67
-msgid "Left"
-msgstr "Esquerra"
-
-#: ../../view/theme/quattro/config.php:67
-msgid "Center"
-msgstr "Centre"
-
-#: ../../view/theme/quattro/config.php:69
-msgid "Posts font size"
-msgstr ""
-
-#: ../../view/theme/quattro/config.php:70
-msgid "Textareas font size"
-msgstr ""
-
-#: ../../view/theme/dispy/config.php:75
-msgid "Set colour scheme"
-msgstr "Establir l'esquema de color"
-
 #: ../../include/profile_advanced.php:22
 msgid "j F, Y"
 msgstr "j F, Y"
@@ -8112,23 +51,57 @@ msgstr "Aniversari:"
 msgid "Age:"
 msgstr "Edat:"
 
+#: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
+#: ../../boot.php:1489
+msgid "Status:"
+msgstr "Estatus:"
+
 #: ../../include/profile_advanced.php:43
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "per a %1$d %2$s"
 
+#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:650
+msgid "Sexual Preference:"
+msgstr "Preferència Sexual:"
+
+#: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
+#: ../../boot.php:1491
+msgid "Homepage:"
+msgstr "Pàgina web:"
+
+#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:652
+msgid "Hometown:"
+msgstr "Lloc de residència:"
+
 #: ../../include/profile_advanced.php:52
 msgid "Tags:"
 msgstr "Etiquetes:"
 
+#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:653
+msgid "Political Views:"
+msgstr "Idees Polítiques:"
+
 #: ../../include/profile_advanced.php:56
 msgid "Religion:"
 msgstr "Religió:"
 
+#: ../../include/profile_advanced.php:58 ../../mod/directory.php:142
+msgid "About:"
+msgstr "Acerca de:"
+
 #: ../../include/profile_advanced.php:60
 msgid "Hobbies/Interests:"
 msgstr "Aficiones/Intereses:"
 
+#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:657
+msgid "Likes:"
+msgstr "Agrada:"
+
+#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:658
+msgid "Dislikes:"
+msgstr "No Agrada"
+
 #: ../../include/profile_advanced.php:67
 msgid "Contact information and Social Networks:"
 msgstr "Informació de contacte i Xarxes Socials:"
@@ -8161,70 +134,6 @@ msgstr "Treball/ocupació:"
 msgid "School/education:"
 msgstr "Escola/formació"
 
-#: ../../include/contact_selectors.php:32
-msgid "Unknown | Not categorised"
-msgstr "Desconegut/No categoritzat"
-
-#: ../../include/contact_selectors.php:33
-msgid "Block immediately"
-msgstr "Bloquejar immediatament"
-
-#: ../../include/contact_selectors.php:34
-msgid "Shady, spammer, self-marketer"
-msgstr "Sospitós, Spam, auto-publicitat"
-
-#: ../../include/contact_selectors.php:35
-msgid "Known to me, but no opinion"
-msgstr "Conegut per mi, però sense opinió"
-
-#: ../../include/contact_selectors.php:36
-msgid "OK, probably harmless"
-msgstr "Bé, probablement inofensiu"
-
-#: ../../include/contact_selectors.php:37
-msgid "Reputable, has my trust"
-msgstr "Bona reputació, té la meva confiança"
-
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr "Freqüentment"
-
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr "Cada hora"
-
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr "Dues vegades al dia"
-
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
-msgstr "Zot!"
-
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
-msgstr "MySpace"
-
-#: ../../include/contact_selectors.php:87
-msgid "Google+"
-msgstr ""
-
 #: ../../include/profile_selectors.php:6
 msgid "Male"
 msgstr "Home"
@@ -8458,475 +367,328 @@ msgstr "No t'interessa"
 msgid "Ask me"
 msgstr "Pregunta'm"
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:399
+#: ../../include/Contact.php:115
+msgid "stopped following"
+msgstr "Deixar de seguir"
+
+#: ../../include/Contact.php:225 ../../include/conversation.php:878
+msgid "Poke"
+msgstr "Atia"
+
+#: ../../include/Contact.php:226 ../../include/conversation.php:872
+msgid "View Status"
+msgstr "Veure Estatus"
+
+#: ../../include/Contact.php:227 ../../include/conversation.php:873
+msgid "View Profile"
+msgstr "Veure Perfil"
+
+#: ../../include/Contact.php:228 ../../include/conversation.php:874
+msgid "View Photos"
+msgstr "Veure Fotos"
+
+#: ../../include/Contact.php:229 ../../include/Contact.php:251
+#: ../../include/conversation.php:875
+msgid "Network Posts"
+msgstr "Enviaments a la Xarxa"
+
+#: ../../include/Contact.php:230 ../../include/Contact.php:251
+#: ../../include/conversation.php:876
+msgid "Edit Contact"
+msgstr "Editat Contacte"
+
+#: ../../include/Contact.php:231 ../../include/Contact.php:251
+#: ../../include/conversation.php:877
+msgid "Send PM"
+msgstr "Enviar Missatge Privat"
+
+#: ../../include/acl_selectors.php:325
+msgid "Visible to everybody"
+msgstr "Visible per tothom"
+
+#: ../../include/acl_selectors.php:326 ../../view/theme/diabook/config.php:146
+#: ../../view/theme/diabook/theme.php:629
+msgid "show"
+msgstr "mostra"
+
+#: ../../include/acl_selectors.php:327 ../../view/theme/diabook/config.php:146
+#: ../../view/theme/diabook/theme.php:629
+msgid "don't show"
+msgstr "no mostris"
+
+#: ../../include/auth.php:38
+msgid "Logged out."
+msgstr "Has sortit"
+
+#: ../../include/auth.php:112 ../../include/auth.php:175
+#: ../../mod/openid.php:93
+msgid "Login failed."
+msgstr "Error d'accés."
+
+#: ../../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 "Em trobat un problema quan accedies amb la OpenID que has proporcionat. Per favor, revisa la cadena del ID."
+
+#: ../../include/auth.php:128
+msgid "The error message was:"
+msgstr "El missatge d'error fou: "
+
+#: ../../include/bb2diaspora.php:393 ../../include/event.php:11
+#: ../../mod/localtime.php:12
+msgid "l F d, Y \\@ g:i A"
+msgstr "l F d, Y \\@ g:i A"
+
+#: ../../include/bb2diaspora.php:399 ../../include/event.php:20
 msgid "Starts:"
 msgstr "Inici:"
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:407
+#: ../../include/bb2diaspora.php:407 ../../include/event.php:30
 msgid "Finishes:"
 msgstr "Acaba:"
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:775
-msgid "(no subject)"
-msgstr "(sense assumpte)"
+#: ../../include/bb2diaspora.php:415 ../../include/event.php:40
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1484
+msgid "Location:"
+msgstr "Ubicació:"
 
-#: ../../include/Scrape.php:583
-msgid " on Last.fm"
-msgstr " a Last.fm"
+#: ../../include/follow.php:27 ../../mod/dfrn_request.php:502
+msgid "Disallowed profile URL."
+msgstr "Perfil URL no permès."
 
-#: ../../include/text.php:262
-msgid "prev"
-msgstr "Prev"
+#: ../../include/follow.php:32
+msgid "Connect URL missing."
+msgstr "URL del connector perduda."
 
-#: ../../include/text.php:264
-msgid "first"
-msgstr "Primer"
+#: ../../include/follow.php:59
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Aquest lloc no està configurat per permetre les comunicacions amb altres xarxes."
 
-#: ../../include/text.php:293
-msgid "last"
-msgstr "Últim"
+#: ../../include/follow.php:60 ../../include/follow.php:80
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "Protocol de comunnicació no compatible o alimentador descobert."
 
-#: ../../include/text.php:296
-msgid "next"
-msgstr "següent"
+#: ../../include/follow.php:78
+msgid "The profile address specified does not provide adequate information."
+msgstr "L'adreça de perfil especificada no proveeix informació adient."
 
-#: ../../include/text.php:314
-msgid "newer"
-msgstr "Més nou"
+#: ../../include/follow.php:82
+msgid "An author or name was not found."
+msgstr "Un autor o nom no va ser trobat"
 
-#: ../../include/text.php:318
-msgid "older"
-msgstr "més vell"
+#: ../../include/follow.php:84
+msgid "No browser URL could be matched to this address."
+msgstr "Cap direcció URL del navegador coincideix amb aquesta adreça."
 
-#: ../../include/text.php:657
-msgid "No contacts"
-msgstr "Sense contactes"
+#: ../../include/follow.php:86
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "Incapaç de trobar coincidències amb la Adreça d'Identitat estil @ amb els protocols coneguts o contactes de correu. "
 
-#: ../../include/text.php:666
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] "%d Contacte"
-msgstr[1] "%d Contactes"
+#: ../../include/follow.php:87
+msgid "Use mailto: in front of address to force email check."
+msgstr "Emprar mailto: davant la adreça per a forçar la comprovació del  correu."
 
-#: ../../include/text.php:779
-msgid "poke"
-msgstr "atia"
+#: ../../include/follow.php:93
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "La direcció del perfil especificat pertany a una xarxa que ha estat desactivada en aquest lloc."
 
-#: ../../include/text.php:779 ../../include/conversation.php:211
-msgid "poked"
-msgstr "atiar"
+#: ../../include/follow.php:103
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Perfil limitat. Aquesta persona no podrà rebre notificacions personals/directes de tu."
 
-#: ../../include/text.php:780
-msgid "ping"
-msgstr ""
+#: ../../include/follow.php:205
+msgid "Unable to retrieve contact information."
+msgstr "No es pot recuperar la informació de contacte."
 
-#: ../../include/text.php:780
-msgid "pinged"
-msgstr ""
+#: ../../include/follow.php:259
+msgid "following"
+msgstr "seguint"
 
-#: ../../include/text.php:781
-msgid "prod"
-msgstr ""
+#: ../../include/user.php:39
+msgid "An invitation is required."
+msgstr "Es requereix invitació."
 
-#: ../../include/text.php:781
-msgid "prodded"
-msgstr ""
+#: ../../include/user.php:44
+msgid "Invitation could not be verified."
+msgstr "La invitació no ha pogut ser verificada."
 
-#: ../../include/text.php:782
-msgid "slap"
-msgstr ""
+#: ../../include/user.php:52
+msgid "Invalid OpenID url"
+msgstr "OpenID url no vàlid"
 
-#: ../../include/text.php:782
-msgid "slapped"
-msgstr ""
+#: ../../include/user.php:67
+msgid "Please enter the required information."
+msgstr "Per favor, introdueixi la informació requerida."
 
-#: ../../include/text.php:783
-msgid "finger"
-msgstr "dit"
+#: ../../include/user.php:81
+msgid "Please use a shorter name."
+msgstr "Per favor, empri un nom més curt."
 
-#: ../../include/text.php:783
-msgid "fingered"
-msgstr ""
+#: ../../include/user.php:83
+msgid "Name too short."
+msgstr "Nom massa curt."
 
-#: ../../include/text.php:784
-msgid "rebuff"
-msgstr ""
+#: ../../include/user.php:98
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "Això no sembla ser el teu nom complet."
 
-#: ../../include/text.php:784
-msgid "rebuffed"
-msgstr ""
+#: ../../include/user.php:103
+msgid "Your email domain is not among those allowed on this site."
+msgstr "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc."
 
-#: ../../include/text.php:796
-msgid "happy"
-msgstr "feliç"
+#: ../../include/user.php:106
+msgid "Not a valid email address."
+msgstr "Adreça de correu no vàlida."
 
-#: ../../include/text.php:797
-msgid "sad"
-msgstr ""
+#: ../../include/user.php:116
+msgid "Cannot use that email."
+msgstr "No es pot utilitzar aquest correu electrònic."
 
-#: ../../include/text.php:798
-msgid "mellow"
-msgstr ""
+#: ../../include/user.php:122
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
+msgstr "El teu sobrenom nomes pot contenir \"a-z\", \"0-9\", \"-\", i \"_\", i començar amb lletra."
 
-#: ../../include/text.php:799
-msgid "tired"
-msgstr ""
+#: ../../include/user.php:128 ../../include/user.php:226
+msgid "Nickname is already registered. Please choose another."
+msgstr "àlies ja registrat. Tria un altre."
 
-#: ../../include/text.php:800
-msgid "perky"
-msgstr ""
+#: ../../include/user.php:138
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr "L'àlies emprat ja està registrat alguna vegada i no es pot reutilitzar "
 
-#: ../../include/text.php:801
-msgid "angry"
-msgstr "disgustat"
+#: ../../include/user.php:154
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "ERROR IMPORTANT: La generació de claus de seguretat ha fallat."
 
-#: ../../include/text.php:802
-msgid "stupified"
-msgstr ""
+#: ../../include/user.php:212
+msgid "An error occurred during registration. Please try again."
+msgstr "Un error ha succeït durant el registre. Intenta-ho de nou."
 
-#: ../../include/text.php:803
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:804
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:805
-msgid "bitter"
-msgstr "amarg"
-
-#: ../../include/text.php:806
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:807
-msgid "alive"
-msgstr "viu"
-
-#: ../../include/text.php:808
-msgid "annoyed"
-msgstr "molest"
-
-#: ../../include/text.php:809
-msgid "anxious"
-msgstr "ansiós"
-
-#: ../../include/text.php:810
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:811
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:812
-msgid "frustrated"
-msgstr "frustrat"
-
-#: ../../include/text.php:813
-msgid "motivated"
-msgstr "motivat"
-
-#: ../../include/text.php:814
-msgid "relaxed"
-msgstr "tranquil"
-
-#: ../../include/text.php:815
-msgid "surprised"
-msgstr "sorprès"
-
-#: ../../include/text.php:979
-msgid "January"
-msgstr "Gener"
-
-#: ../../include/text.php:979
-msgid "February"
-msgstr "Febrer"
-
-#: ../../include/text.php:979
-msgid "March"
-msgstr "Març"
-
-#: ../../include/text.php:979
-msgid "April"
-msgstr "Abril"
-
-#: ../../include/text.php:979
-msgid "May"
-msgstr "Maig"
-
-#: ../../include/text.php:979
-msgid "June"
-msgstr "Juny"
-
-#: ../../include/text.php:979
-msgid "July"
-msgstr "Juliol"
-
-#: ../../include/text.php:979
-msgid "August"
-msgstr "Agost"
-
-#: ../../include/text.php:979
-msgid "September"
-msgstr "Setembre"
-
-#: ../../include/text.php:979
-msgid "October"
-msgstr "Octubre"
-
-#: ../../include/text.php:979
-msgid "November"
-msgstr "Novembre"
-
-#: ../../include/text.php:979
-msgid "December"
-msgstr "Desembre"
-
-#: ../../include/text.php:1078
-msgid "bytes"
-msgstr "bytes"
-
-#: ../../include/text.php:1105 ../../include/text.php:1117
-msgid "Click to open/close"
-msgstr "Clicar per a obrir/tancar"
-
-#: ../../include/text.php:1290 ../../include/user.php:237
+#: ../../include/user.php:237 ../../include/text.php:1594
 msgid "default"
 msgstr "per defecte"
 
-#: ../../include/text.php:1302
-msgid "Select an alternate language"
-msgstr "Sel·lecciona un idioma alternatiu"
+#: ../../include/user.php:247
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Un error ha succeit durant la creació del teu perfil per defecte. Intenta-ho de nou."
 
-#: ../../include/text.php:1512
-msgid "activity"
-msgstr "activitat"
+#: ../../include/user.php:325 ../../include/user.php:332
+#: ../../include/user.php:339 ../../mod/photos.php:154
+#: ../../mod/photos.php:725 ../../mod/photos.php:1183
+#: ../../mod/photos.php:1206 ../../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 ../../view/theme/diabook/theme.php:493
+msgid "Profile Photos"
+msgstr "Fotos del Perfil"
 
-#: ../../include/text.php:1515
-msgid "post"
-msgstr "missatge"
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
+msgstr "Desconegut/No categoritzat"
 
-#: ../../include/text.php:1670
-msgid "Item filed"
-msgstr "Element arxivat"
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
+msgstr "Bloquejar immediatament"
 
-#: ../../include/diaspora.php:704
-msgid "Sharing notification from Diaspora network"
-msgstr "Compartint la notificació de la xarxa Diàspora"
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
+msgstr "Sospitós, Spam, auto-publicitat"
 
-#: ../../include/diaspora.php:2248
-msgid "Attachments:"
-msgstr "Adjunts:"
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
+msgstr "Conegut per mi, però sense opinió"
 
-#: ../../include/network.php:850
-msgid "view full size"
-msgstr "Veure a mida completa"
+#: ../../include/contact_selectors.php:36
+msgid "OK, probably harmless"
+msgstr "Bé, probablement inofensiu"
 
-#: ../../include/oembed.php:138
-msgid "Embedded content"
-msgstr "Contingut incrustat"
+#: ../../include/contact_selectors.php:37
+msgid "Reputable, has my trust"
+msgstr "Bona reputació, té la meva confiança"
 
-#: ../../include/oembed.php:147
-msgid "Embedding disabled"
-msgstr "Incrustacions deshabilitades"
+#: ../../include/contact_selectors.php:56 ../../mod/admin.php:452
+msgid "Frequently"
+msgstr "Freqüentment"
 
-#: ../../include/uimport.php:61
-msgid "Error decoding account file"
-msgstr ""
+#: ../../include/contact_selectors.php:57 ../../mod/admin.php:453
+msgid "Hourly"
+msgstr "Cada hora"
 
-#: ../../include/uimport.php:67
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr ""
+#: ../../include/contact_selectors.php:58 ../../mod/admin.php:454
+msgid "Twice daily"
+msgstr "Dues vegades al dia"
 
-#: ../../include/uimport.php:72
-msgid "Error! I can't import this file: DB schema version is not compatible."
-msgstr ""
+#: ../../include/contact_selectors.php:59 ../../mod/admin.php:455
+msgid "Daily"
+msgstr "Diari"
 
-#: ../../include/uimport.php:81
-msgid "Error! Cannot check nickname"
-msgstr ""
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Setmanal"
 
-#: ../../include/uimport.php:85
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr ""
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "Mensual"
 
-#: ../../include/uimport.php:104
-msgid "User creation error"
-msgstr ""
+#: ../../include/contact_selectors.php:76 ../../mod/dfrn_request.php:840
+msgid "Friendica"
+msgstr "Friendica"
 
-#: ../../include/uimport.php:122
-msgid "User profile creation error"
-msgstr ""
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr "OStatus"
 
-#: ../../include/uimport.php:167
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
 
-#: ../../include/uimport.php:245
-msgid "Done. You can now login with your username and password"
-msgstr ""
+#: ../../include/contact_selectors.php:79
+#: ../../include/contact_selectors.php:86 ../../mod/admin.php:766
+#: ../../mod/admin.php:777
+msgid "Email"
+msgstr "Correu"
 
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr "Un grup eliminat amb aquest nom va ser restablert. Els permisos dels elements existents <strong>poden</strong> aplicar-se a aquest grup i tots els futurs membres. Si això no és el que pretén, si us plau, crei un altre grup amb un nom diferent."
+#: ../../include/contact_selectors.php:80 ../../mod/settings.php:705
+#: ../../mod/dfrn_request.php:842
+msgid "Diaspora"
+msgstr "Diaspora"
 
-#: ../../include/group.php:207
-msgid "Default privacy group for new contacts"
-msgstr "Privacitat per defecte per a nous contactes"
+#: ../../include/contact_selectors.php:81 ../../mod/newmember.php:49
+#: ../../mod/newmember.php:51
+msgid "Facebook"
+msgstr "Facebook"
 
-#: ../../include/group.php:226
-msgid "Everybody"
-msgstr "Tothom"
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr "Zot!"
 
-#: ../../include/group.php:249
-msgid "edit"
-msgstr "editar"
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr "LinkedIn"
 
-#: ../../include/group.php:271
-msgid "Edit group"
-msgstr "Editar grup"
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
 
-#: ../../include/group.php:272
-msgid "Create a new group"
-msgstr "Crear un nou grup"
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr "MySpace"
 
-#: ../../include/group.php:273
-msgid "Contacts not in any group"
-msgstr "Contactes en cap grup"
-
-#: ../../include/nav.php:73 ../../boot.php:1036
-msgid "Logout"
-msgstr "Sortir"
-
-#: ../../include/nav.php:73
-msgid "End this session"
-msgstr "Termina sessió"
-
-#: ../../include/nav.php:76 ../../boot.php:1833
-msgid "Status"
-msgstr "Estatus"
-
-#: ../../include/nav.php:91
-msgid "Sign in"
-msgstr "Accedeix"
-
-#: ../../include/nav.php:104
-msgid "Home Page"
-msgstr "Pàgina d'Inici"
-
-#: ../../include/nav.php:108
-msgid "Create an account"
-msgstr "Crear un compte"
-
-#: ../../include/nav.php:113
-msgid "Help and documentation"
-msgstr "Ajuda i documentació"
-
-#: ../../include/nav.php:116
-msgid "Apps"
-msgstr "Aplicacions"
-
-#: ../../include/nav.php:116
-msgid "Addon applications, utilities, games"
-msgstr "Afegits: aplicacions, utilitats, jocs"
-
-#: ../../include/nav.php:118
-msgid "Search site content"
-msgstr "Busca contingut en el lloc"
-
-#: ../../include/nav.php:128
-msgid "Conversations on this site"
-msgstr "Converses en aquest lloc"
-
-#: ../../include/nav.php:130
-msgid "Directory"
-msgstr "Directori"
-
-#: ../../include/nav.php:130
-msgid "People directory"
-msgstr "Directori de gent"
-
-#: ../../include/nav.php:140
-msgid "Conversations from your friends"
-msgstr "Converses dels teus amics"
-
-#: ../../include/nav.php:141
-msgid "Network Reset"
-msgstr ""
-
-#: ../../include/nav.php:141
-msgid "Load Network page with no filters"
-msgstr ""
-
-#: ../../include/nav.php:149
-msgid "Friend Requests"
-msgstr "Sol·licitud d'Amistat"
-
-#: ../../include/nav.php:151
-msgid "See all notifications"
-msgstr "Veure totes les notificacions"
-
-#: ../../include/nav.php:152
-msgid "Mark all system notifications seen"
-msgstr "Marcar totes les notificacions del sistema com a vistes"
-
-#: ../../include/nav.php:156
-msgid "Private mail"
-msgstr "Correu privat"
-
-#: ../../include/nav.php:157
-msgid "Inbox"
-msgstr "Safata d'entrada"
-
-#: ../../include/nav.php:158
-msgid "Outbox"
-msgstr "Safata de sortida"
-
-#: ../../include/nav.php:162
-msgid "Manage"
-msgstr "Gestionar"
-
-#: ../../include/nav.php:162
-msgid "Manage other pages"
-msgstr "Gestiona altres pàgines"
-
-#: ../../include/nav.php:165
-msgid "Delegations"
-msgstr ""
-
-#: ../../include/nav.php:169 ../../boot.php:1339
-msgid "Profiles"
-msgstr "Perfils"
-
-#: ../../include/nav.php:169
-msgid "Manage/Edit Profiles"
-msgstr ""
-
-#: ../../include/nav.php:171
-msgid "Manage/edit friends and contacts"
-msgstr "Gestiona/edita amics i contactes"
-
-#: ../../include/nav.php:178
-msgid "Site setup and configuration"
-msgstr "Ajustos i configuració del lloc"
-
-#: ../../include/nav.php:182
-msgid "Navigation"
-msgstr ""
-
-#: ../../include/nav.php:182
-msgid "Site map"
-msgstr ""
+#: ../../include/contact_selectors.php:87
+msgid "Google+"
+msgstr "Google+"
 
 #: ../../include/contact_widgets.php:6
 msgid "Add New Contact"
@@ -8940,6 +702,11 @@ msgstr "Introdueixi adreça o ubicació web"
 msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "Exemple: bob@example.com, http://example.com/barbara"
 
+#: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
+#: ../../mod/match.php:58 ../../boot.php:1416
+msgid "Connect"
+msgstr "Connexió"
+
 #: ../../include/contact_widgets.php:23
 #, php-format
 msgid "%d invitation available"
@@ -8963,10 +730,28 @@ msgstr "Connectar/Seguir"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Exemples: Robert Morgenstein, Pescar"
 
+#: ../../include/contact_widgets.php:33 ../../mod/contacts.php:613
+#: ../../mod/directory.php:61
+msgid "Find"
+msgstr "Cercar"
+
+#: ../../include/contact_widgets.php:34 ../../mod/suggest.php:66
+#: ../../view/theme/diabook/theme.php:520
+msgid "Friend Suggestions"
+msgstr "Amics Suggerits"
+
+#: ../../include/contact_widgets.php:35 ../../view/theme/diabook/theme.php:519
+msgid "Similar Interests"
+msgstr "Aficions Similars"
+
 #: ../../include/contact_widgets.php:36
 msgid "Random Profile"
 msgstr "Perfi Aleatori"
 
+#: ../../include/contact_widgets.php:37 ../../view/theme/diabook/theme.php:521
+msgid "Invite Friends"
+msgstr "Invita Amics"
+
 #: ../../include/contact_widgets.php:70
 msgid "Networks"
 msgstr "Xarxes"
@@ -8987,19 +772,44 @@ msgstr "Tot"
 msgid "Categories"
 msgstr "Categories"
 
-#: ../../include/auth.php:38
-msgid "Logged out."
-msgstr "Has sortit"
+#: ../../include/contact_widgets.php:199 ../../mod/contacts.php:343
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] "%d contacte en comú"
+msgstr[1] "%d contactes en comú"
 
-#: ../../include/auth.php:128
+#: ../../include/contact_widgets.php:204 ../../mod/content.php:629
+#: ../../object/Item.php:365 ../../boot.php:670
+msgid "show more"
+msgstr "Mostrar més"
+
+#: ../../include/Scrape.php:583
+msgid " on Last.fm"
+msgstr " a Last.fm"
+
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:549
+msgid "Image/photo"
+msgstr "Imatge/foto"
+
+#: ../../include/bbcode.php:272
+#, php-format
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Em trobat un problema quan accedies amb la OpenID que has proporcionat. Per favor, revisa la cadena del ID."
+"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
+"href=\"%s\" target=\"external-link\">post</a>"
+msgstr "<span><a href=\"%s\" target=\"external-link\">%s</a> va escriure el següent <a href=\"%s\" target=\"external-link\">post</a>"
 
-#: ../../include/auth.php:128
-msgid "The error message was:"
-msgstr "El missatge d'error fou: "
+#: ../../include/bbcode.php:514 ../../include/bbcode.php:534
+msgid "$1 wrote:"
+msgstr "$1 va escriure:"
+
+#: ../../include/bbcode.php:557 ../../include/bbcode.php:558
+msgid "Encrypted content"
+msgstr "Encriptar contingut"
+
+#: ../../include/network.php:877
+msgid "view full size"
+msgstr "Veure'l a mida completa"
 
 #: ../../include/datetime.php:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
@@ -9025,10 +835,26 @@ msgstr "mai"
 msgid "less than a second ago"
 msgstr "Fa menys d'un segon"
 
+#: ../../include/datetime.php:285
+msgid "years"
+msgstr "anys"
+
+#: ../../include/datetime.php:286
+msgid "months"
+msgstr "mesos"
+
 #: ../../include/datetime.php:287
 msgid "week"
 msgstr "setmana"
 
+#: ../../include/datetime.php:287
+msgid "weeks"
+msgstr "setmanes"
+
+#: ../../include/datetime.php:288
+msgid "days"
+msgstr "dies"
+
 #: ../../include/datetime.php:289
 msgid "hour"
 msgstr "hora"
@@ -9058,195 +884,915 @@ msgstr "segons"
 msgid "%1$d %2$s ago"
 msgstr " fa %1$d %2$s"
 
-#: ../../include/datetime.php:472 ../../include/items.php:1705
+#: ../../include/datetime.php:472 ../../include/items.php:1813
 #, php-format
 msgid "%s's birthday"
 msgstr "%s aniversari"
 
-#: ../../include/datetime.php:473 ../../include/items.php:1706
+#: ../../include/datetime.php:473 ../../include/items.php:1814
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Feliç Aniversari %s"
 
-#: ../../include/bbcode.php:210 ../../include/bbcode.php:515
-msgid "Image/photo"
-msgstr "Imatge/foto"
+#: ../../include/plugin.php:439 ../../include/plugin.php:441
+msgid "Click here to upgrade."
+msgstr "Clica aquí per actualitzar."
 
-#: ../../include/bbcode.php:272
+#: ../../include/plugin.php:447
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Aquesta acció excedeix els límits del teu plan de subscripció."
+
+#: ../../include/plugin.php:452
+msgid "This action is not available under your subscription plan."
+msgstr "Aquesta acció no està disponible en el teu plan de subscripció."
+
+#: ../../include/delivery.php:457 ../../include/notifier.php:775
+msgid "(no subject)"
+msgstr "(sense assumpte)"
+
+#: ../../include/delivery.php:468 ../../include/enotify.php:28
+#: ../../include/notifier.php:785
+msgid "noreply"
+msgstr "no contestar"
+
+#: ../../include/diaspora.php:621 ../../include/conversation.php:172
+#: ../../mod/dfrn_confirm.php:477
 #, php-format
-msgid ""
-"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
-"href=\"%s\" target=\"external-link\">post</a>"
-msgstr ""
+msgid "%1$s is now friends with %2$s"
+msgstr "%1$s és ara amic amb %2$s"
 
-#: ../../include/bbcode.php:480 ../../include/bbcode.php:500
-msgid "$1 wrote:"
-msgstr "$1 va escriure:"
+#: ../../include/diaspora.php:704
+msgid "Sharing notification from Diaspora network"
+msgstr "Compartint la notificació de la xarxa Diàspora"
 
-#: ../../include/bbcode.php:520 ../../include/bbcode.php:521
-msgid "Encrypted content"
-msgstr "Encriptar contingut"
+#: ../../include/diaspora.php:1874 ../../include/text.php:1860
+#: ../../include/conversation.php:126 ../../include/conversation.php:254
+#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
+#: ../../view/theme/diabook/theme.php:464
+msgid "photo"
+msgstr "foto"
+
+#: ../../include/diaspora.php:1874 ../../include/conversation.php:121
+#: ../../include/conversation.php:130 ../../include/conversation.php:249
+#: ../../include/conversation.php:258 ../../mod/subthread.php:87
+#: ../../mod/tagger.php:62 ../../mod/like.php:151 ../../mod/like.php:322
+#: ../../view/theme/diabook/theme.php:459
+#: ../../view/theme/diabook/theme.php:468
+msgid "status"
+msgstr "estatus"
+
+#: ../../include/diaspora.php:1890 ../../include/conversation.php:137
+#: ../../mod/like.php:168 ../../view/theme/diabook/theme.php:473
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "a %1$s agrada %2$s de %3$s"
+
+#: ../../include/diaspora.php:2262
+msgid "Attachments:"
+msgstr "Adjunts:"
+
+#: ../../include/items.php:3488 ../../mod/dfrn_request.php:716
+msgid "[Name Withheld]"
+msgstr "[Nom Amagat]"
+
+#: ../../include/items.php:3495
+msgid "A new person is sharing with you at "
+msgstr "Una persona nova està compartint amb tú en"
+
+#: ../../include/items.php:3495
+msgid "You have a new follower at "
+msgstr "Tens un nou seguidor a "
+
+#: ../../include/items.php:3979 ../../mod/display.php:51
+#: ../../mod/display.php:246 ../../mod/admin.php:158 ../../mod/admin.php:809
+#: ../../mod/admin.php:1009 ../../mod/viewsrc.php:15 ../../mod/notice.php:15
+msgid "Item not found."
+msgstr "Article no trobat."
+
+#: ../../include/items.php:4018
+msgid "Do you really want to delete this item?"
+msgstr "Realment vols esborrar aquest article?"
+
+#: ../../include/items.php:4020 ../../mod/profiles.php:610
+#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
+#: ../../mod/settings.php:961 ../../mod/settings.php:967
+#: ../../mod/settings.php:975 ../../mod/settings.php:979
+#: ../../mod/settings.php:984 ../../mod/settings.php:990
+#: ../../mod/settings.php:996 ../../mod/settings.php:1002
+#: ../../mod/settings.php:1032 ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034 ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036 ../../mod/dfrn_request.php:836
+#: ../../mod/suggest.php:29 ../../mod/message.php:209
+msgid "Yes"
+msgstr "Si"
+
+#: ../../include/items.php:4023 ../../include/conversation.php:1120
+#: ../../mod/contacts.php:249 ../../mod/settings.php:585
+#: ../../mod/settings.php:611 ../../mod/dfrn_request.php:848
+#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
+#: ../../mod/photos.php:202 ../../mod/photos.php:290
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+#: ../../include/items.php:4143 ../../mod/profiles.php:146
+#: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/display.php:242
+#: ../../mod/nogroup.php:25 ../../mod/item.php:143 ../../mod/item.php:159
+#: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
+#: ../../mod/contacts.php:147 ../../mod/settings.php:91
+#: ../../mod/settings.php:566 ../../mod/settings.php:571
+#: ../../mod/crepair.php:115 ../../mod/delegate.php:6 ../../mod/poke.php:135
+#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
+#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
+#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
+#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
+#: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
+#: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/manage.php:96
+#: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
+#: ../../mod/network.php:6 ../../mod/notifications.php:66
+#: ../../mod/photos.php:133 ../../mod/photos.php:1044
+#: ../../mod/install.php:151 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:169 ../../mod/profile_photo.php:180
+#: ../../mod/profile_photo.php:193 ../../index.php:346
+msgid "Permission denied."
+msgstr "Permís denegat."
+
+#: ../../include/items.php:4213
+msgid "Archives"
+msgstr "Arxius"
 
 #: ../../include/features.php:23
 msgid "General Features"
-msgstr ""
+msgstr "Característiques Generals"
 
 #: ../../include/features.php:25
 msgid "Multiple Profiles"
-msgstr ""
+msgstr "Perfils Múltiples"
 
 #: ../../include/features.php:25
 msgid "Ability to create multiple profiles"
-msgstr ""
+msgstr "Habilitat per crear múltiples perfils"
 
 #: ../../include/features.php:30
 msgid "Post Composition Features"
-msgstr ""
+msgstr "Característiques de Composició d'Enviaments"
 
 #: ../../include/features.php:31
 msgid "Richtext Editor"
-msgstr ""
+msgstr "Editor de Text Enriquit"
 
 #: ../../include/features.php:31
 msgid "Enable richtext editor"
-msgstr ""
+msgstr "Activar l'Editor de Text Enriquit"
 
 #: ../../include/features.php:32
 msgid "Post Preview"
-msgstr ""
+msgstr "Vista Prèvia de l'Enviament"
 
 #: ../../include/features.php:32
 msgid "Allow previewing posts and comments before publishing them"
-msgstr ""
+msgstr "Permetre la vista prèvia dels enviament i comentaris abans de publicar-los"
 
 #: ../../include/features.php:37
 msgid "Network Sidebar Widgets"
-msgstr ""
+msgstr "Barra Lateral Selectora de Xarxa "
 
 #: ../../include/features.php:38
 msgid "Search by Date"
-msgstr ""
+msgstr "Cerca per Data"
 
 #: ../../include/features.php:38
 msgid "Ability to select posts by date ranges"
-msgstr ""
+msgstr "Possibilitat de seleccionar els missatges per intervals de temps"
 
 #: ../../include/features.php:39
 msgid "Group Filter"
-msgstr ""
+msgstr "Filtre de Grup"
 
 #: ../../include/features.php:39
 msgid "Enable widget to display Network posts only from selected group"
-msgstr ""
+msgstr "Habilitar botò per veure missatges de Xarxa només del grup seleccionat"
 
 #: ../../include/features.php:40
 msgid "Network Filter"
-msgstr ""
+msgstr "Filtre de Xarxa"
 
 #: ../../include/features.php:40
 msgid "Enable widget to display Network posts only from selected network"
-msgstr ""
+msgstr "Habilitar botò per veure missatges de Xarxa només de la xarxa seleccionada"
+
+#: ../../include/features.php:41 ../../mod/search.php:30
+#: ../../mod/network.php:233
+msgid "Saved Searches"
+msgstr "Cerques Guardades"
 
 #: ../../include/features.php:41
 msgid "Save search terms for re-use"
-msgstr ""
+msgstr "Guarda els termes de cerca per re-emprar"
 
 #: ../../include/features.php:46
 msgid "Network Tabs"
-msgstr ""
+msgstr "Pestanya Xarxes"
 
 #: ../../include/features.php:47
 msgid "Network Personal Tab"
-msgstr ""
+msgstr "Pestanya Xarxa Personal"
 
 #: ../../include/features.php:47
 msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr ""
+msgstr "Habilitar la pestanya per veure unicament missatges de Xarxa en els que has intervingut"
 
 #: ../../include/features.php:48
 msgid "Network New Tab"
-msgstr ""
+msgstr "Pestanya Nova Xarxa"
 
 #: ../../include/features.php:48
 msgid "Enable tab to display only new Network posts (from the last 12 hours)"
-msgstr ""
+msgstr "Habilitar la pestanya per veure només els nous missatges de Xarxa (els de les darreres 12 hores)"
 
 #: ../../include/features.php:49
 msgid "Network Shared Links Tab"
-msgstr ""
+msgstr "Pestanya d'Enllaços de Xarxa Compartits"
 
 #: ../../include/features.php:49
 msgid "Enable tab to display only Network posts with links in them"
-msgstr ""
+msgstr "Habilitar la pestanya per veure els missatges de Xarxa amb enllaços en ells"
 
 #: ../../include/features.php:54
 msgid "Post/Comment Tools"
-msgstr ""
+msgstr "Eines d'Enviaments/Comentaris"
 
 #: ../../include/features.php:55
 msgid "Multiple Deletion"
-msgstr ""
+msgstr "Esborrat Múltiple"
 
 #: ../../include/features.php:55
 msgid "Select and delete multiple posts/comments at once"
-msgstr ""
+msgstr "Sel·lecciona i esborra múltiples enviaments/commentaris en una vegada"
 
 #: ../../include/features.php:56
 msgid "Edit Sent Posts"
-msgstr ""
+msgstr "Editar Missatges Enviats"
 
 #: ../../include/features.php:56
 msgid "Edit and correct posts and comments after sending"
-msgstr ""
+msgstr "Edita i corregeix enviaments i comentaris una vegada han estat enviats"
 
 #: ../../include/features.php:57
 msgid "Tagging"
-msgstr ""
+msgstr "Etiquetant"
 
 #: ../../include/features.php:57
 msgid "Ability to tag existing posts"
-msgstr ""
+msgstr "Habilitar el etiquetar missatges existents"
 
 #: ../../include/features.php:58
 msgid "Post Categories"
-msgstr ""
+msgstr "Categories en Enviaments"
 
 #: ../../include/features.php:58
 msgid "Add categories to your posts"
-msgstr ""
+msgstr "Afegeix categories als teus enviaments"
 
 #: ../../include/features.php:59
 msgid "Ability to file posts under folders"
-msgstr ""
+msgstr "Habilitar el arxivar missatges en carpetes"
 
 #: ../../include/features.php:60
 msgid "Dislike Posts"
-msgstr ""
+msgstr "No agrada el Missatge"
 
 #: ../../include/features.php:60
 msgid "Ability to dislike posts/comments"
-msgstr ""
+msgstr "Habilita el marcar amb \"no agrada\" els enviaments/comentaris"
 
 #: ../../include/features.php:61
 msgid "Star Posts"
-msgstr ""
+msgstr "Missatge Estelar"
 
 #: ../../include/features.php:61
 msgid "Ability to mark special posts with a star indicator"
-msgstr ""
+msgstr "Habilita el marcar amb un estel, missatges especials"
 
-#: ../../include/dba.php:41
+#: ../../include/dba.php:44
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "No put trobar informació de DNS  del servidor de base de dades '%s'"
 
-#: ../../include/message.php:15 ../../include/message.php:172
-msgid "[no subject]"
-msgstr "[Sense assumpte]"
+#: ../../include/text.php:294
+msgid "prev"
+msgstr "Prev"
 
-#: ../../include/acl_selectors.php:325
-msgid "Visible to everybody"
-msgstr "Visible per tothom"
+#: ../../include/text.php:296
+msgid "first"
+msgstr "Primer"
+
+#: ../../include/text.php:325
+msgid "last"
+msgstr "Últim"
+
+#: ../../include/text.php:328
+msgid "next"
+msgstr "següent"
+
+#: ../../include/text.php:352
+msgid "newer"
+msgstr "Més nou"
+
+#: ../../include/text.php:356
+msgid "older"
+msgstr "més vell"
+
+#: ../../include/text.php:807
+msgid "No contacts"
+msgstr "Sense contactes"
+
+#: ../../include/text.php:816
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d Contacte"
+msgstr[1] "%d Contactes"
+
+#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
+msgid "View Contacts"
+msgstr "Veure Contactes"
+
+#: ../../include/text.php:905 ../../include/text.php:906
+#: ../../include/nav.php:118 ../../mod/search.php:99
+msgid "Search"
+msgstr "Cercar"
+
+#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
+msgid "Save"
+msgstr "Guardar"
+
+#: ../../include/text.php:957
+msgid "poke"
+msgstr "atia"
+
+#: ../../include/text.php:957 ../../include/conversation.php:211
+msgid "poked"
+msgstr "atiar"
+
+#: ../../include/text.php:958
+msgid "ping"
+msgstr "toc"
+
+#: ../../include/text.php:958
+msgid "pinged"
+msgstr "tocat"
+
+#: ../../include/text.php:959
+msgid "prod"
+msgstr "pinxat"
+
+#: ../../include/text.php:959
+msgid "prodded"
+msgstr "pinxat"
+
+#: ../../include/text.php:960
+msgid "slap"
+msgstr "bufetada"
+
+#: ../../include/text.php:960
+msgid "slapped"
+msgstr "Abufetejat"
+
+#: ../../include/text.php:961
+msgid "finger"
+msgstr "dit"
+
+#: ../../include/text.php:961
+msgid "fingered"
+msgstr "Senyalat"
+
+#: ../../include/text.php:962
+msgid "rebuff"
+msgstr "rebuig"
+
+#: ../../include/text.php:962
+msgid "rebuffed"
+msgstr "rebutjat"
+
+#: ../../include/text.php:976
+msgid "happy"
+msgstr "feliç"
+
+#: ../../include/text.php:977
+msgid "sad"
+msgstr "trist"
+
+#: ../../include/text.php:978
+msgid "mellow"
+msgstr "embafador"
+
+#: ../../include/text.php:979
+msgid "tired"
+msgstr "cansat"
+
+#: ../../include/text.php:980
+msgid "perky"
+msgstr "alegre"
+
+#: ../../include/text.php:981
+msgid "angry"
+msgstr "disgustat"
+
+#: ../../include/text.php:982
+msgid "stupified"
+msgstr "estupefacte"
+
+#: ../../include/text.php:983
+msgid "puzzled"
+msgstr "perplexe"
+
+#: ../../include/text.php:984
+msgid "interested"
+msgstr "interessat"
+
+#: ../../include/text.php:985
+msgid "bitter"
+msgstr "amarg"
+
+#: ../../include/text.php:986
+msgid "cheerful"
+msgstr "animat"
+
+#: ../../include/text.php:987
+msgid "alive"
+msgstr "viu"
+
+#: ../../include/text.php:988
+msgid "annoyed"
+msgstr "molest"
+
+#: ../../include/text.php:989
+msgid "anxious"
+msgstr "ansiós"
+
+#: ../../include/text.php:990
+msgid "cranky"
+msgstr "irritable"
+
+#: ../../include/text.php:991
+msgid "disturbed"
+msgstr "turbat"
+
+#: ../../include/text.php:992
+msgid "frustrated"
+msgstr "frustrat"
+
+#: ../../include/text.php:993
+msgid "motivated"
+msgstr "motivat"
+
+#: ../../include/text.php:994
+msgid "relaxed"
+msgstr "tranquil"
+
+#: ../../include/text.php:995
+msgid "surprised"
+msgstr "sorprès"
+
+#: ../../include/text.php:1161
+msgid "Monday"
+msgstr "Dilluns"
+
+#: ../../include/text.php:1161
+msgid "Tuesday"
+msgstr "Dimarts"
+
+#: ../../include/text.php:1161
+msgid "Wednesday"
+msgstr "Dimecres"
+
+#: ../../include/text.php:1161
+msgid "Thursday"
+msgstr "Dijous"
+
+#: ../../include/text.php:1161
+msgid "Friday"
+msgstr "Divendres"
+
+#: ../../include/text.php:1161
+msgid "Saturday"
+msgstr "Dissabte"
+
+#: ../../include/text.php:1161
+msgid "Sunday"
+msgstr "Diumenge"
+
+#: ../../include/text.php:1165
+msgid "January"
+msgstr "Gener"
+
+#: ../../include/text.php:1165
+msgid "February"
+msgstr "Febrer"
+
+#: ../../include/text.php:1165
+msgid "March"
+msgstr "Març"
+
+#: ../../include/text.php:1165
+msgid "April"
+msgstr "Abril"
+
+#: ../../include/text.php:1165
+msgid "May"
+msgstr "Maig"
+
+#: ../../include/text.php:1165
+msgid "June"
+msgstr "Juny"
+
+#: ../../include/text.php:1165
+msgid "July"
+msgstr "Juliol"
+
+#: ../../include/text.php:1165
+msgid "August"
+msgstr "Agost"
+
+#: ../../include/text.php:1165
+msgid "September"
+msgstr "Setembre"
+
+#: ../../include/text.php:1165
+msgid "October"
+msgstr "Octubre"
+
+#: ../../include/text.php:1165
+msgid "November"
+msgstr "Novembre"
+
+#: ../../include/text.php:1165
+msgid "December"
+msgstr "Desembre"
+
+#: ../../include/text.php:1321 ../../mod/videos.php:301
+msgid "View Video"
+msgstr "Veure Video"
+
+#: ../../include/text.php:1353
+msgid "bytes"
+msgstr "bytes"
+
+#: ../../include/text.php:1377 ../../include/text.php:1389
+msgid "Click to open/close"
+msgstr "Clicar per a obrir/tancar"
+
+#: ../../include/text.php:1551 ../../mod/events.php:335
+msgid "link to source"
+msgstr "Enllaç al origen"
+
+#: ../../include/text.php:1606
+msgid "Select an alternate language"
+msgstr "Sel·lecciona un idioma alternatiu"
+
+#: ../../include/text.php:1858 ../../include/conversation.php:118
+#: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
+msgid "event"
+msgstr "esdeveniment"
+
+#: ../../include/text.php:1862
+msgid "activity"
+msgstr "activitat"
+
+#: ../../include/text.php:1864 ../../mod/content.php:628
+#: ../../object/Item.php:364 ../../object/Item.php:377
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] "comentari"
+
+#: ../../include/text.php:1865
+msgid "post"
+msgstr "missatge"
+
+#: ../../include/text.php:2020
+msgid "Item filed"
+msgstr "Element arxivat"
+
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "Un grup eliminat amb aquest nom va ser restablert. Els permisos dels elements existents <strong>poden</strong> aplicar-se a aquest grup i tots els futurs membres. Si això no és el que pretén, si us plau, crei un altre grup amb un nom diferent."
+
+#: ../../include/group.php:207
+msgid "Default privacy group for new contacts"
+msgstr "Privacitat per defecte per a nous contactes"
+
+#: ../../include/group.php:226
+msgid "Everybody"
+msgstr "Tothom"
+
+#: ../../include/group.php:249
+msgid "edit"
+msgstr "editar"
+
+#: ../../include/group.php:270 ../../mod/newmember.php:66
+msgid "Groups"
+msgstr "Grups"
+
+#: ../../include/group.php:271
+msgid "Edit group"
+msgstr "Editar grup"
+
+#: ../../include/group.php:272
+msgid "Create a new group"
+msgstr "Crear un nou grup"
+
+#: ../../include/group.php:273
+msgid "Contacts not in any group"
+msgstr "Contactes en cap grup"
+
+#: ../../include/group.php:275 ../../mod/network.php:234
+msgid "add"
+msgstr "afegir"
+
+#: ../../include/conversation.php:140 ../../mod/like.php:170
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "a %1$s no agrada %2$s de %3$s"
+
+#: ../../include/conversation.php:207
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s atiat %2$s"
+
+#: ../../include/conversation.php:227 ../../mod/mood.php:62
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr "%1$s es normalment %2$s"
+
+#: ../../include/conversation.php:266 ../../mod/tagger.php:95
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s etiquetats %2$s %3$s amb %4$s"
+
+#: ../../include/conversation.php:291
+msgid "post/item"
+msgstr "anunci/element"
+
+#: ../../include/conversation.php:292
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s marcat %2$s's %3$s com favorit"
+
+#: ../../include/conversation.php:612 ../../mod/content.php:461
+#: ../../mod/content.php:763 ../../object/Item.php:126
+msgid "Select"
+msgstr "Selecionar"
+
+#: ../../include/conversation.php:613 ../../mod/admin.php:770
+#: ../../mod/settings.php:647 ../../mod/group.php:171
+#: ../../mod/photos.php:1637 ../../mod/content.php:462
+#: ../../mod/content.php:764 ../../object/Item.php:127
+msgid "Delete"
+msgstr "Esborrar"
+
+#: ../../include/conversation.php:652 ../../mod/content.php:495
+#: ../../mod/content.php:875 ../../mod/content.php:876
+#: ../../object/Item.php:306 ../../object/Item.php:307
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Veure perfil de %s @ %s"
+
+#: ../../include/conversation.php:664 ../../object/Item.php:297
+msgid "Categories:"
+msgstr "Categories:"
+
+#: ../../include/conversation.php:665 ../../object/Item.php:298
+msgid "Filed under:"
+msgstr "Arxivat a:"
+
+#: ../../include/conversation.php:672 ../../mod/content.php:505
+#: ../../mod/content.php:887 ../../object/Item.php:320
+#, php-format
+msgid "%s from %s"
+msgstr "%s des de %s"
+
+#: ../../include/conversation.php:687 ../../mod/content.php:520
+msgid "View in context"
+msgstr "Veure en context"
+
+#: ../../include/conversation.php:689 ../../include/conversation.php:1100
+#: ../../mod/editpost.php:124 ../../mod/wallmessage.php:156
+#: ../../mod/message.php:334 ../../mod/message.php:565
+#: ../../mod/photos.php:1532 ../../mod/content.php:522
+#: ../../mod/content.php:906 ../../object/Item.php:341
+msgid "Please wait"
+msgstr "Si us plau esperi"
+
+#: ../../include/conversation.php:768
+msgid "remove"
+msgstr "esborrar"
+
+#: ../../include/conversation.php:772
+msgid "Delete Selected Items"
+msgstr "Esborra els Elements Seleccionats"
+
+#: ../../include/conversation.php:871
+msgid "Follow Thread"
+msgstr "Seguir el Fil"
+
+#: ../../include/conversation.php:940
+#, php-format
+msgid "%s likes this."
+msgstr "a %s agrada això."
+
+#: ../../include/conversation.php:940
+#, php-format
+msgid "%s doesn't like this."
+msgstr "a %s desagrada això."
+
+#: ../../include/conversation.php:945
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
+msgstr "<span  %1$s>%2$d gent</span> agrada això"
+
+#: ../../include/conversation.php:948
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
+msgstr "<span  %1$s>%2$d gent</span> no agrada això"
+
+#: ../../include/conversation.php:962
+msgid "and"
+msgstr "i"
+
+#: ../../include/conversation.php:968
+#, php-format
+msgid ", and %d other people"
+msgstr ", i altres %d persones"
+
+#: ../../include/conversation.php:970
+#, php-format
+msgid "%s like this."
+msgstr "a %s li agrada això."
+
+#: ../../include/conversation.php:970
+#, php-format
+msgid "%s don't like this."
+msgstr "a %s no li agrada això."
+
+#: ../../include/conversation.php:997 ../../include/conversation.php:1015
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Visible per a <strong>tothom</strong>"
+
+#: ../../include/conversation.php:998 ../../include/conversation.php:1016
+#: ../../mod/wallmessage.php:127 ../../mod/wallmessage.php:135
+#: ../../mod/message.php:283 ../../mod/message.php:291
+#: ../../mod/message.php:466 ../../mod/message.php:474
+msgid "Please enter a link URL:"
+msgstr "Sius plau, entri l'enllaç URL:"
+
+#: ../../include/conversation.php:999 ../../include/conversation.php:1017
+msgid "Please enter a video link/URL:"
+msgstr "Per favor , introdueixi el enllaç/URL del video"
+
+#: ../../include/conversation.php:1000 ../../include/conversation.php:1018
+msgid "Please enter an audio link/URL:"
+msgstr "Per favor , introdueixi el enllaç/URL del audio:"
+
+#: ../../include/conversation.php:1001 ../../include/conversation.php:1019
+msgid "Tag term:"
+msgstr "Terminis de l'etiqueta:"
+
+#: ../../include/conversation.php:1002 ../../include/conversation.php:1020
+#: ../../mod/filer.php:30
+msgid "Save to Folder:"
+msgstr "Guardar a la Carpeta:"
+
+#: ../../include/conversation.php:1003 ../../include/conversation.php:1021
+msgid "Where are you right now?"
+msgstr "On ets ara?"
+
+#: ../../include/conversation.php:1004
+msgid "Delete item(s)?"
+msgstr "Esborrar element(s)?"
+
+#: ../../include/conversation.php:1046
+msgid "Post to Email"
+msgstr "Correu per enviar"
+
+#: ../../include/conversation.php:1081 ../../mod/photos.php:1531
+msgid "Share"
+msgstr "Compartir"
+
+#: ../../include/conversation.php:1082 ../../mod/editpost.php:110
+#: ../../mod/wallmessage.php:154 ../../mod/message.php:332
+#: ../../mod/message.php:562
+msgid "Upload photo"
+msgstr "Carregar foto"
+
+#: ../../include/conversation.php:1083 ../../mod/editpost.php:111
+msgid "upload photo"
+msgstr "carregar fotos"
+
+#: ../../include/conversation.php:1084 ../../mod/editpost.php:112
+msgid "Attach file"
+msgstr "Adjunta fitxer"
+
+#: ../../include/conversation.php:1085 ../../mod/editpost.php:113
+msgid "attach file"
+msgstr "adjuntar arxiu"
+
+#: ../../include/conversation.php:1086 ../../mod/editpost.php:114
+#: ../../mod/wallmessage.php:155 ../../mod/message.php:333
+#: ../../mod/message.php:563
+msgid "Insert web link"
+msgstr "Inserir enllaç web"
+
+#: ../../include/conversation.php:1087 ../../mod/editpost.php:115
+msgid "web link"
+msgstr "enllaç de web"
+
+#: ../../include/conversation.php:1088 ../../mod/editpost.php:116
+msgid "Insert video link"
+msgstr "Insertar enllaç de video"
+
+#: ../../include/conversation.php:1089 ../../mod/editpost.php:117
+msgid "video link"
+msgstr "enllaç de video"
+
+#: ../../include/conversation.php:1090 ../../mod/editpost.php:118
+msgid "Insert audio link"
+msgstr "Insertar enllaç de audio"
+
+#: ../../include/conversation.php:1091 ../../mod/editpost.php:119
+msgid "audio link"
+msgstr "enllaç de audio"
+
+#: ../../include/conversation.php:1092 ../../mod/editpost.php:120
+msgid "Set your location"
+msgstr "Canvia la teva ubicació"
+
+#: ../../include/conversation.php:1093 ../../mod/editpost.php:121
+msgid "set location"
+msgstr "establir la ubicació"
+
+#: ../../include/conversation.php:1094 ../../mod/editpost.php:122
+msgid "Clear browser location"
+msgstr "neteja adreçes del navegador"
+
+#: ../../include/conversation.php:1095 ../../mod/editpost.php:123
+msgid "clear location"
+msgstr "netejar ubicació"
+
+#: ../../include/conversation.php:1097 ../../mod/editpost.php:137
+msgid "Set title"
+msgstr "Canviar títol"
+
+#: ../../include/conversation.php:1099 ../../mod/editpost.php:139
+msgid "Categories (comma-separated list)"
+msgstr "Categories (lista separada per comes)"
+
+#: ../../include/conversation.php:1101 ../../mod/editpost.php:125
+msgid "Permission settings"
+msgstr "Configuració de permisos"
+
+#: ../../include/conversation.php:1102
+msgid "permissions"
+msgstr "Permissos"
+
+#: ../../include/conversation.php:1110 ../../mod/editpost.php:133
+msgid "CC: email addresses"
+msgstr "CC: Adreça de correu"
+
+#: ../../include/conversation.php:1111 ../../mod/editpost.php:134
+msgid "Public post"
+msgstr "Enviament públic"
+
+#: ../../include/conversation.php:1113 ../../mod/editpost.php:140
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Exemple: bob@example.com, mary@example.com"
+
+#: ../../include/conversation.php:1117 ../../mod/editpost.php:145
+#: ../../mod/photos.php:1553 ../../mod/photos.php:1597
+#: ../../mod/photos.php:1680 ../../mod/content.php:742
+#: ../../object/Item.php:662
+msgid "Preview"
+msgstr "Vista prèvia"
+
+#: ../../include/conversation.php:1126
+msgid "Post to Groups"
+msgstr "Publica-ho a Grups"
+
+#: ../../include/conversation.php:1127
+msgid "Post to Contacts"
+msgstr "Publica-ho a Contactes"
+
+#: ../../include/conversation.php:1128
+msgid "Private post"
+msgstr "Enviament Privat"
 
 #: ../../include/enotify.php:16
 msgid "Friendica Notification"
@@ -9355,17 +1901,17 @@ msgstr "%1$s [url=%2$s] t'ha etiquetat[/url]."
 #: ../../include/enotify.php:155
 #, php-format
 msgid "[Friendica:Notify] %1$s poked you"
-msgstr ""
+msgstr "[Friendica:Notificació] %1$s t'atia"
 
 #: ../../include/enotify.php:156
 #, php-format
 msgid "%1$s poked you at %2$s"
-msgstr ""
+msgstr "%1$s t'atia en %2$s"
 
 #: ../../include/enotify.php:157
 #, php-format
 msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr ""
+msgstr "%1$s [url=%2$s]t'atia[/url]."
 
 #: ../../include/enotify.php:172
 #, php-format
@@ -9434,144 +1980,293 @@ msgstr "Foto:"
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Si us plau, visiteu %s per aprovar o rebutjar la suggerencia."
 
-#: ../../include/follow.php:32
-msgid "Connect URL missing."
-msgstr "URL del connector perduda."
+#: ../../include/message.php:15 ../../include/message.php:172
+msgid "[no subject]"
+msgstr "[Sense assumpte]"
 
-#: ../../include/follow.php:59
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "Aquest lloc no està configurat per permetre les comunicacions amb altres xarxes."
+#: ../../include/message.php:144 ../../mod/item.php:446
+#: ../../mod/wall_upload.php:135 ../../mod/wall_upload.php:144
+#: ../../mod/wall_upload.php:151
+msgid "Wall Photos"
+msgstr "Fotos del Mur"
 
-#: ../../include/follow.php:60 ../../include/follow.php:80
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "Protocol de comunnicació no compatible o alimentador descobert."
+#: ../../include/nav.php:34 ../../mod/navigation.php:20
+msgid "Nothing new here"
+msgstr "Res nou aquí"
 
-#: ../../include/follow.php:78
-msgid "The profile address specified does not provide adequate information."
-msgstr "L'adreça de perfil especificada no proveeix informació adient."
+#: ../../include/nav.php:38 ../../mod/navigation.php:24
+msgid "Clear notifications"
+msgstr "Neteja notificacions"
 
-#: ../../include/follow.php:82
-msgid "An author or name was not found."
-msgstr "Un autor o nom no va ser trobat"
+#: ../../include/nav.php:73 ../../boot.php:1135
+msgid "Logout"
+msgstr "Sortir"
 
-#: ../../include/follow.php:84
-msgid "No browser URL could be matched to this address."
-msgstr "Cap direcció URL del navegador coincideix amb aquesta adreça."
+#: ../../include/nav.php:73
+msgid "End this session"
+msgstr "Termina sessió"
 
-#: ../../include/follow.php:86
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr "Incapaç de trobar coincidències amb la Adreça d'Identitat estil @ amb els protocols coneguts o contactes de correu. "
+#: ../../include/nav.php:76 ../../boot.php:1939
+msgid "Status"
+msgstr "Estatus"
 
-#: ../../include/follow.php:87
-msgid "Use mailto: in front of address to force email check."
-msgstr "Emprar mailto: davant la adreça per a forçar la comprovació del  correu."
+#: ../../include/nav.php:76 ../../include/nav.php:143
+#: ../../view/theme/diabook/theme.php:87
+msgid "Your posts and conversations"
+msgstr "Els teus anuncis i converses"
 
-#: ../../include/follow.php:93
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "La direcció del perfil especificat pertany a una xarxa que ha estat desactivada en aquest lloc."
+#: ../../include/nav.php:77 ../../view/theme/diabook/theme.php:88
+msgid "Your profile page"
+msgstr "La seva pàgina de perfil"
 
-#: ../../include/follow.php:103
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "Perfil limitat. Aquesta persona no podrà rebre notificacions personals/directes de tu."
+#: ../../include/nav.php:78 ../../mod/fbrowser.php:25
+#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1953
+msgid "Photos"
+msgstr "Fotos"
 
-#: ../../include/follow.php:205
-msgid "Unable to retrieve contact information."
-msgstr "No es pot recuperar la informació de contacte."
+#: ../../include/nav.php:78 ../../view/theme/diabook/theme.php:90
+msgid "Your photos"
+msgstr "Les seves fotos"
 
-#: ../../include/follow.php:259
-msgid "following"
-msgstr "seguint"
+#: ../../include/nav.php:79 ../../mod/events.php:370
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1970
+msgid "Events"
+msgstr "Esdeveniments"
 
-#: ../../include/items.php:3373
-msgid "A new person is sharing with you at "
-msgstr "Una persona nova està compartint amb tú en"
+#: ../../include/nav.php:79 ../../view/theme/diabook/theme.php:91
+msgid "Your events"
+msgstr "Els seus esdeveniments"
 
-#: ../../include/items.php:3373
-msgid "You have a new follower at "
-msgstr "Tens un nou seguidor a "
+#: ../../include/nav.php:80 ../../view/theme/diabook/theme.php:92
+msgid "Personal notes"
+msgstr "Notes personals"
 
-#: ../../include/items.php:3892
-msgid "Do you really want to delete this item?"
-msgstr ""
+#: ../../include/nav.php:80 ../../view/theme/diabook/theme.php:92
+msgid "Your personal photos"
+msgstr "Les seves fotos personals"
 
-#: ../../include/items.php:4085
-msgid "Archives"
-msgstr "Arxius"
+#: ../../include/nav.php:91 ../../boot.php:1136
+msgid "Login"
+msgstr "Identifica't"
 
-#: ../../include/user.php:39
-msgid "An invitation is required."
-msgstr "Es requereix invitació."
+#: ../../include/nav.php:91
+msgid "Sign in"
+msgstr "Accedeix"
 
-#: ../../include/user.php:44
-msgid "Invitation could not be verified."
-msgstr "La invitació no ha pogut ser verificada."
+#: ../../include/nav.php:104 ../../include/nav.php:143
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
+msgid "Home"
+msgstr "Inici"
 
-#: ../../include/user.php:52
-msgid "Invalid OpenID url"
-msgstr "OpenID url no vàlid"
+#: ../../include/nav.php:104
+msgid "Home Page"
+msgstr "Pàgina d'Inici"
 
-#: ../../include/user.php:67
-msgid "Please enter the required information."
-msgstr "Per favor, introdueixi la informació requerida."
+#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1111
+msgid "Register"
+msgstr "Registrar"
 
-#: ../../include/user.php:81
-msgid "Please use a shorter name."
-msgstr "Per favor, empri un nom més curt."
+#: ../../include/nav.php:108
+msgid "Create an account"
+msgstr "Crear un compte"
 
-#: ../../include/user.php:83
-msgid "Name too short."
-msgstr "Nom massa curt."
+#: ../../include/nav.php:113 ../../mod/help.php:84
+msgid "Help"
+msgstr "Ajuda"
 
-#: ../../include/user.php:98
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "Això no sembla ser el teu nom complet."
+#: ../../include/nav.php:113
+msgid "Help and documentation"
+msgstr "Ajuda i documentació"
 
-#: ../../include/user.php:103
-msgid "Your email domain is not among those allowed on this site."
-msgstr "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc."
+#: ../../include/nav.php:116
+msgid "Apps"
+msgstr "Aplicacions"
 
-#: ../../include/user.php:106
-msgid "Not a valid email address."
-msgstr "Adreça de correu no vàlida."
+#: ../../include/nav.php:116
+msgid "Addon applications, utilities, games"
+msgstr "Afegits: aplicacions, utilitats, jocs"
 
-#: ../../include/user.php:116
-msgid "Cannot use that email."
-msgstr "No es pot utilitzar aquest correu electrònic."
+#: ../../include/nav.php:118
+msgid "Search site content"
+msgstr "Busca contingut en el lloc"
 
-#: ../../include/user.php:122
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
-msgstr "El teu sobrenom nomes pot contenir \"a-z\", \"0-9\", \"-\", i \"_\", i començar amb lletra."
+#: ../../include/nav.php:128 ../../mod/community.php:32
+#: ../../view/theme/diabook/theme.php:93
+msgid "Community"
+msgstr "Comunitat"
 
-#: ../../include/user.php:128 ../../include/user.php:226
-msgid "Nickname is already registered. Please choose another."
-msgstr "àlies ja registrat. Tria un altre."
+#: ../../include/nav.php:128
+msgid "Conversations on this site"
+msgstr "Converses en aquest lloc"
 
-#: ../../include/user.php:138
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
-msgstr "L'àlies emprat ja està registrat alguna vegada i no es pot reutilitzar "
+#: ../../include/nav.php:130
+msgid "Directory"
+msgstr "Directori"
 
-#: ../../include/user.php:154
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "ERROR IMPORTANT: La generació de claus de seguretat ha fallat."
+#: ../../include/nav.php:130
+msgid "People directory"
+msgstr "Directori de gent"
 
-#: ../../include/user.php:212
-msgid "An error occurred during registration. Please try again."
-msgstr "Un error ha succeït durant el registre. Intenta-ho de nou."
+#: ../../include/nav.php:140 ../../mod/notifications.php:83
+msgid "Network"
+msgstr "Xarxa"
 
-#: ../../include/user.php:247
-msgid "An error occurred creating your default profile. Please try again."
-msgstr "Un error ha succeit durant la creació del teu perfil per defecte. Intenta-ho de nou."
+#: ../../include/nav.php:140
+msgid "Conversations from your friends"
+msgstr "Converses dels teus amics"
+
+#: ../../include/nav.php:141
+msgid "Network Reset"
+msgstr "Reiniciar Xarxa"
+
+#: ../../include/nav.php:141
+msgid "Load Network page with no filters"
+msgstr "carrega la pàgina de Xarxa sense filtres"
+
+#: ../../include/nav.php:149 ../../mod/notifications.php:98
+msgid "Introductions"
+msgstr "Presentacions"
+
+#: ../../include/nav.php:149
+msgid "Friend Requests"
+msgstr "Sol·licitud d'Amistat"
+
+#: ../../include/nav.php:150 ../../mod/notifications.php:220
+msgid "Notifications"
+msgstr "Notificacions"
+
+#: ../../include/nav.php:151
+msgid "See all notifications"
+msgstr "Veure totes les notificacions"
+
+#: ../../include/nav.php:152
+msgid "Mark all system notifications seen"
+msgstr "Marcar totes les notificacions del sistema com a vistes"
+
+#: ../../include/nav.php:156 ../../mod/message.php:182
+#: ../../mod/notifications.php:103
+msgid "Messages"
+msgstr "Missatges"
+
+#: ../../include/nav.php:156
+msgid "Private mail"
+msgstr "Correu privat"
+
+#: ../../include/nav.php:157
+msgid "Inbox"
+msgstr "Safata d'entrada"
+
+#: ../../include/nav.php:158
+msgid "Outbox"
+msgstr "Safata de sortida"
+
+#: ../../include/nav.php:159 ../../mod/message.php:9
+msgid "New Message"
+msgstr "Nou Missatge"
+
+#: ../../include/nav.php:162
+msgid "Manage"
+msgstr "Gestionar"
+
+#: ../../include/nav.php:162
+msgid "Manage other pages"
+msgstr "Gestiona altres pàgines"
+
+#: ../../include/nav.php:165
+msgid "Delegations"
+msgstr "Delegacions"
+
+#: ../../include/nav.php:165 ../../mod/delegate.php:121
+msgid "Delegate Page Management"
+msgstr "Gestió de les Pàgines Delegades"
+
+#: ../../include/nav.php:167 ../../mod/admin.php:861 ../../mod/admin.php:1069
+#: ../../mod/settings.php:74 ../../mod/uexport.php:48
+#: ../../mod/newmember.php:22 ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:658
+msgid "Settings"
+msgstr "Ajustos"
+
+#: ../../include/nav.php:167 ../../mod/settings.php:30 ../../mod/uexport.php:9
+msgid "Account settings"
+msgstr "Configuració del compte"
+
+#: ../../include/nav.php:169 ../../boot.php:1438
+msgid "Profiles"
+msgstr "Perfils"
+
+#: ../../include/nav.php:169
+msgid "Manage/Edit Profiles"
+msgstr "Gestiona/Edita Perfils"
+
+#: ../../include/nav.php:171 ../../mod/contacts.php:607
+#: ../../view/theme/diabook/theme.php:89
+msgid "Contacts"
+msgstr "Contactes"
+
+#: ../../include/nav.php:171
+msgid "Manage/edit friends and contacts"
+msgstr "Gestiona/edita amics i contactes"
+
+#: ../../include/nav.php:178 ../../mod/admin.php:120
+msgid "Admin"
+msgstr "Admin"
+
+#: ../../include/nav.php:178
+msgid "Site setup and configuration"
+msgstr "Ajustos i configuració del lloc"
+
+#: ../../include/nav.php:182
+msgid "Navigation"
+msgstr "Navegació"
+
+#: ../../include/nav.php:182
+msgid "Site map"
+msgstr "Mapa del lloc"
+
+#: ../../include/oembed.php:138
+msgid "Embedded content"
+msgstr "Contingut incrustat"
+
+#: ../../include/oembed.php:147
+msgid "Embedding disabled"
+msgstr "Incrustacions deshabilitades"
+
+#: ../../include/uimport.php:94
+msgid "Error decoding account file"
+msgstr "Error decodificant l'arxiu del compte"
+
+#: ../../include/uimport.php:100
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Error! No hi ha dades al arxiu! No es un arxiu de compte de Friendica?"
+
+#: ../../include/uimport.php:116
+msgid "Error! Cannot check nickname"
+msgstr "Error! No puc comprobar l'Àlies"
+
+#: ../../include/uimport.php:120
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "El usuari %s' ja existeix en aquest servidor!"
+
+#: ../../include/uimport.php:139
+msgid "User creation error"
+msgstr "Error en la creació de l'usuari"
+
+#: ../../include/uimport.php:157
+msgid "User profile creation error"
+msgstr "Error en la creació del perfil d'usuari"
+
+#: ../../include/uimport.php:202
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d contacte no importat"
+msgstr[1] "%d contactes no importats"
+
+#: ../../include/uimport.php:272
+msgid "Done. You can now login with your username and password"
+msgstr "Fet. Ja pots identificar-te amb el teu nom d'usuari i contrasenya"
 
 #: ../../include/security.php:22
 msgid "Welcome "
@@ -9591,360 +2286,4830 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "El formulari del token de seguretat no es correcte. Això probablement passa perquè el formulari ha estat massa temps obert (>3 hores) abans d'enviat-lo."
 
-#: ../../include/Contact.php:115
-msgid "stopped following"
-msgstr "Deixar de seguir"
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:133
+#: ../../mod/profiles.php:160 ../../mod/profiles.php:583
+#: ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
+msgstr "Perfil no trobat."
 
-#: ../../include/Contact.php:225 ../../include/conversation.php:820
-msgid "Poke"
-msgstr ""
+#: ../../mod/profiles.php:37
+msgid "Profile deleted."
+msgstr "Perfil esborrat."
 
-#: ../../include/Contact.php:226 ../../include/conversation.php:814
-msgid "View Status"
-msgstr "Veure Estatus"
+#: ../../mod/profiles.php:55 ../../mod/profiles.php:89
+msgid "Profile-"
+msgstr "Perfil-"
 
-#: ../../include/Contact.php:227 ../../include/conversation.php:815
-msgid "View Profile"
-msgstr "Veure Perfil"
+#: ../../mod/profiles.php:74 ../../mod/profiles.php:117
+msgid "New profile created."
+msgstr "Nou perfil creat."
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:816
-msgid "View Photos"
-msgstr "Veure Fotos"
+#: ../../mod/profiles.php:95
+msgid "Profile unavailable to clone."
+msgstr "No es pot clonar el perfil."
 
-#: ../../include/Contact.php:229 ../../include/Contact.php:251
-#: ../../include/conversation.php:817
-msgid "Network Posts"
-msgstr "Enviaments a la Xarxa"
+#: ../../mod/profiles.php:170
+msgid "Profile Name is required."
+msgstr "Nom de perfil requerit."
 
-#: ../../include/Contact.php:230 ../../include/Contact.php:251
-#: ../../include/conversation.php:818
-msgid "Edit Contact"
-msgstr "Editat Contacte"
+#: ../../mod/profiles.php:317
+msgid "Marital Status"
+msgstr "Estatus Marital"
 
-#: ../../include/Contact.php:231 ../../include/Contact.php:251
-#: ../../include/conversation.php:819
-msgid "Send PM"
-msgstr "Enviar Missatge Privat"
+#: ../../mod/profiles.php:321
+msgid "Romantic Partner"
+msgstr "Soci Romàntic"
 
-#: ../../include/conversation.php:207
+#: ../../mod/profiles.php:325
+msgid "Likes"
+msgstr "Agrada"
+
+#: ../../mod/profiles.php:329
+msgid "Dislikes"
+msgstr "No agrada"
+
+#: ../../mod/profiles.php:333
+msgid "Work/Employment"
+msgstr "Treball/Ocupació"
+
+#: ../../mod/profiles.php:336
+msgid "Religion"
+msgstr "Religió"
+
+#: ../../mod/profiles.php:340
+msgid "Political Views"
+msgstr "Idees Polítiques"
+
+#: ../../mod/profiles.php:344
+msgid "Gender"
+msgstr "Gènere"
+
+#: ../../mod/profiles.php:348
+msgid "Sexual Preference"
+msgstr "Preferència sexual"
+
+#: ../../mod/profiles.php:352
+msgid "Homepage"
+msgstr "Inici"
+
+#: ../../mod/profiles.php:356
+msgid "Interests"
+msgstr "Interesos"
+
+#: ../../mod/profiles.php:360
+msgid "Address"
+msgstr "Adreça"
+
+#: ../../mod/profiles.php:367
+msgid "Location"
+msgstr "Ubicació"
+
+#: ../../mod/profiles.php:450
+msgid "Profile updated."
+msgstr "Perfil actualitzat."
+
+#: ../../mod/profiles.php:521
+msgid " and "
+msgstr " i "
+
+#: ../../mod/profiles.php:529
+msgid "public profile"
+msgstr "perfil públic"
+
+#: ../../mod/profiles.php:532
 #, php-format
-msgid "%1$s poked %2$s"
-msgstr ""
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s s'ha canviat de %2$s a &ldquo;%3$s&rdquo;"
 
-#: ../../include/conversation.php:291
-msgid "post/item"
-msgstr "anunci/element"
-
-#: ../../include/conversation.php:292
+#: ../../mod/profiles.php:533
 #, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
-msgstr "%1$s marcat %2$s's %3$s com favorit"
+msgid " - Visit %1$s's %2$s"
+msgstr " - Visita %1$s de %2$s"
 
-#: ../../include/conversation.php:621 ../../object/Item.php:249
-msgid "Categories:"
-msgstr ""
-
-#: ../../include/conversation.php:622 ../../object/Item.php:250
-msgid "Filed under:"
-msgstr ""
-
-#: ../../include/conversation.php:710
-msgid "remove"
-msgstr "esborrar"
-
-#: ../../include/conversation.php:714
-msgid "Delete Selected Items"
-msgstr "Esborra els Elements Seleccionats"
-
-#: ../../include/conversation.php:813
-msgid "Follow Thread"
-msgstr ""
-
-#: ../../include/conversation.php:882
+#: ../../mod/profiles.php:536
 #, php-format
-msgid "%s likes this."
-msgstr "a %s agrada això."
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s te una actualització %2$s, canviant %3$s."
 
-#: ../../include/conversation.php:882
+#: ../../mod/profiles.php:609
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Amaga la llista de contactes/amics en la vista d'aquest perfil?"
+
+#: ../../mod/profiles.php:611 ../../mod/api.php:106 ../../mod/register.php:240
+#: ../../mod/settings.php:961 ../../mod/settings.php:967
+#: ../../mod/settings.php:975 ../../mod/settings.php:979
+#: ../../mod/settings.php:984 ../../mod/settings.php:990
+#: ../../mod/settings.php:996 ../../mod/settings.php:1002
+#: ../../mod/settings.php:1032 ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034 ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036 ../../mod/dfrn_request.php:837
+msgid "No"
+msgstr "No"
+
+#: ../../mod/profiles.php:629
+msgid "Edit Profile Details"
+msgstr "Editor de Detalls del Perfil"
+
+#: ../../mod/profiles.php:630 ../../mod/admin.php:491 ../../mod/admin.php:763
+#: ../../mod/admin.php:902 ../../mod/admin.php:1102 ../../mod/admin.php:1189
+#: ../../mod/contacts.php:386 ../../mod/settings.php:584
+#: ../../mod/settings.php:694 ../../mod/settings.php:763
+#: ../../mod/settings.php:837 ../../mod/settings.php:1064
+#: ../../mod/crepair.php:166 ../../mod/poke.php:199 ../../mod/events.php:478
+#: ../../mod/fsuggest.php:107 ../../mod/group.php:87 ../../mod/invite.php:140
+#: ../../mod/localtime.php:45 ../../mod/manage.php:110
+#: ../../mod/message.php:335 ../../mod/message.php:564 ../../mod/mood.php:137
+#: ../../mod/photos.php:1078 ../../mod/photos.php:1199
+#: ../../mod/photos.php:1501 ../../mod/photos.php:1552
+#: ../../mod/photos.php:1596 ../../mod/photos.php:1679
+#: ../../mod/install.php:248 ../../mod/install.php:286
+#: ../../mod/content.php:733 ../../object/Item.php:653
+#: ../../view/theme/cleanzero/config.php:80
+#: ../../view/theme/diabook/config.php:152
+#: ../../view/theme/diabook/theme.php:642 ../../view/theme/dispy/config.php:70
+#: ../../view/theme/quattro/config.php:64
+msgid "Submit"
+msgstr "Enviar"
+
+#: ../../mod/profiles.php:631
+msgid "Change Profile Photo"
+msgstr "Canviar la Foto del Perfil"
+
+#: ../../mod/profiles.php:632
+msgid "View this profile"
+msgstr "Veure aquest perfil"
+
+#: ../../mod/profiles.php:633
+msgid "Create a new profile using these settings"
+msgstr "Crear un nou perfil amb aquests ajustos"
+
+#: ../../mod/profiles.php:634
+msgid "Clone this profile"
+msgstr "Clonar aquest perfil"
+
+#: ../../mod/profiles.php:635
+msgid "Delete this profile"
+msgstr "Esborrar aquest perfil"
+
+#: ../../mod/profiles.php:636
+msgid "Profile Name:"
+msgstr "Nom de Perfil:"
+
+#: ../../mod/profiles.php:637
+msgid "Your Full Name:"
+msgstr "El Teu Nom Complet."
+
+#: ../../mod/profiles.php:638
+msgid "Title/Description:"
+msgstr "Títol/Descripció:"
+
+#: ../../mod/profiles.php:639
+msgid "Your Gender:"
+msgstr "Gènere:"
+
+#: ../../mod/profiles.php:640
 #, php-format
-msgid "%s doesn't like this."
-msgstr "a %s desagrada això."
+msgid "Birthday (%s):"
+msgstr "Aniversari (%s)"
 
-#: ../../include/conversation.php:887
+#: ../../mod/profiles.php:641
+msgid "Street Address:"
+msgstr "Direcció:"
+
+#: ../../mod/profiles.php:642
+msgid "Locality/City:"
+msgstr "Localitat/Ciutat:"
+
+#: ../../mod/profiles.php:643
+msgid "Postal/Zip Code:"
+msgstr "Codi Postal:"
+
+#: ../../mod/profiles.php:644
+msgid "Country:"
+msgstr "País"
+
+#: ../../mod/profiles.php:645
+msgid "Region/State:"
+msgstr "Regió/Estat:"
+
+#: ../../mod/profiles.php:646
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Estat Civil:"
+
+#: ../../mod/profiles.php:647
+msgid "Who: (if applicable)"
+msgstr "Qui? (si és aplicable)"
+
+#: ../../mod/profiles.php:648
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Exemples: cathy123, Cathy Williams, cathy@example.com"
+
+#: ../../mod/profiles.php:649
+msgid "Since [date]:"
+msgstr "Des de [data]"
+
+#: ../../mod/profiles.php:651
+msgid "Homepage URL:"
+msgstr "Pàgina web URL:"
+
+#: ../../mod/profiles.php:654
+msgid "Religious Views:"
+msgstr "Creencies Religioses:"
+
+#: ../../mod/profiles.php:655
+msgid "Public Keywords:"
+msgstr "Paraules Clau Públiques"
+
+#: ../../mod/profiles.php:656
+msgid "Private Keywords:"
+msgstr "Paraules Clau Privades:"
+
+#: ../../mod/profiles.php:659
+msgid "Example: fishing photography software"
+msgstr "Exemple: pesca fotografia programari"
+
+#: ../../mod/profiles.php:660
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr "(Emprat per suggerir potencials amics, Altres poden veure-ho)"
+
+#: ../../mod/profiles.php:661
+msgid "(Used for searching profiles, never shown to others)"
+msgstr "(Emprat durant la cerca de perfils, mai mostrat a ningú)"
+
+#: ../../mod/profiles.php:662
+msgid "Tell us about yourself..."
+msgstr "Parla'ns de tú....."
+
+#: ../../mod/profiles.php:663
+msgid "Hobbies/Interests"
+msgstr "Aficions/Interessos"
+
+#: ../../mod/profiles.php:664
+msgid "Contact information and Social Networks"
+msgstr "Informació de contacte i Xarxes Socials"
+
+#: ../../mod/profiles.php:665
+msgid "Musical interests"
+msgstr "Gustos musicals"
+
+#: ../../mod/profiles.php:666
+msgid "Books, literature"
+msgstr "Llibres, Literatura"
+
+#: ../../mod/profiles.php:667
+msgid "Television"
+msgstr "Televisió"
+
+#: ../../mod/profiles.php:668
+msgid "Film/dance/culture/entertainment"
+msgstr "Cinema/ball/cultura/entreteniments"
+
+#: ../../mod/profiles.php:669
+msgid "Love/romance"
+msgstr "Amor/sentiments"
+
+#: ../../mod/profiles.php:670
+msgid "Work/employment"
+msgstr "Treball/ocupació"
+
+#: ../../mod/profiles.php:671
+msgid "School/education"
+msgstr "Ensenyament/estudis"
+
+#: ../../mod/profiles.php:676
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
+msgstr "Aquest és el teu perfil <strong>públic</strong>.<br />El qual <strong>pot</strong> ser visible per qualsevol qui faci servir Internet."
+
+#: ../../mod/profiles.php:686 ../../mod/directory.php:111
+msgid "Age: "
+msgstr "Edat:"
+
+#: ../../mod/profiles.php:725
+msgid "Edit/Manage Profiles"
+msgstr "Editar/Gestionar Perfils"
+
+#: ../../mod/profiles.php:726 ../../boot.php:1444 ../../boot.php:1470
+msgid "Change profile photo"
+msgstr "Canviar la foto del perfil"
+
+#: ../../mod/profiles.php:727 ../../boot.php:1445
+msgid "Create New Profile"
+msgstr "Crear un Nou Perfil"
+
+#: ../../mod/profiles.php:738 ../../boot.php:1455
+msgid "Profile Image"
+msgstr "Imatge del Perfil"
+
+#: ../../mod/profiles.php:740 ../../boot.php:1458
+msgid "visible to everybody"
+msgstr "Visible per tothom"
+
+#: ../../mod/profiles.php:741 ../../boot.php:1459
+msgid "Edit visibility"
+msgstr "Editar visibilitat"
+
+#: ../../mod/profperm.php:19 ../../mod/group.php:72 ../../index.php:345
+msgid "Permission denied"
+msgstr "Permís denegat"
+
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+msgid "Invalid profile identifier."
+msgstr "Identificador del perfil no vàlid."
+
+#: ../../mod/profperm.php:101
+msgid "Profile Visibility Editor"
+msgstr "Editor de Visibilitat del Perfil"
+
+#: ../../mod/profperm.php:105 ../../mod/group.php:224
+msgid "Click on a contact to add or remove."
+msgstr "Clicar sobre el contacte per afegir o esborrar."
+
+#: ../../mod/profperm.php:114
+msgid "Visible To"
+msgstr "Visible Per"
+
+#: ../../mod/profperm.php:130
+msgid "All Contacts (with secure profile access)"
+msgstr "Tots els Contactes (amb accés segur al perfil)"
+
+#: ../../mod/notes.php:44 ../../boot.php:1977
+msgid "Personal Notes"
+msgstr "Notes Personals"
+
+#: ../../mod/display.php:19 ../../mod/search.php:89
+#: ../../mod/dfrn_request.php:761 ../../mod/directory.php:31
+#: ../../mod/videos.php:115 ../../mod/viewcontacts.php:17
+#: ../../mod/photos.php:914 ../../mod/community.php:18
+msgid "Public access denied."
+msgstr "Accés públic denegat."
+
+#: ../../mod/display.php:99 ../../mod/profile.php:155
+msgid "Access to this profile has been restricted."
+msgstr "L'accés a aquest perfil ha estat restringit."
+
+#: ../../mod/display.php:239
+msgid "Item has been removed."
+msgstr "El element ha estat esborrat."
+
+#: ../../mod/nogroup.php:40 ../../mod/contacts.php:395
+#: ../../mod/contacts.php:585 ../../mod/viewcontacts.php:62
 #, php-format
-msgid "<span  %1$s>%2$d people</span> like this"
-msgstr ""
+msgid "Visit %s's profile [%s]"
+msgstr "Visitar perfil de %s [%s]"
 
-#: ../../include/conversation.php:890
+#: ../../mod/nogroup.php:41 ../../mod/contacts.php:586
+msgid "Edit contact"
+msgstr "Editar contacte"
+
+#: ../../mod/nogroup.php:59
+msgid "Contacts who are not members of a group"
+msgstr "Contactes que no pertanyen a cap grup"
+
+#: ../../mod/ping.php:238
+msgid "{0} wants to be your friend"
+msgstr "{0} vol ser el teu amic"
+
+#: ../../mod/ping.php:243
+msgid "{0} sent you a message"
+msgstr "{0} t'ha enviat un missatge de"
+
+#: ../../mod/ping.php:248
+msgid "{0} requested registration"
+msgstr "{0} solicituts de registre"
+
+#: ../../mod/ping.php:254
 #, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this"
-msgstr ""
+msgid "{0} commented %s's post"
+msgstr "{0} va comentar l'enviament de %s"
 
-#: ../../include/conversation.php:904
-msgid "and"
-msgstr "i"
-
-#: ../../include/conversation.php:910
+#: ../../mod/ping.php:259
 #, php-format
-msgid ", and %d other people"
-msgstr ", i altres %d persones"
+msgid "{0} liked %s's post"
+msgstr "A {0} l'ha agradat l'enviament de %s"
 
-#: ../../include/conversation.php:912
+#: ../../mod/ping.php:264
 #, php-format
-msgid "%s like this."
-msgstr "a %s li agrada això."
+msgid "{0} disliked %s's post"
+msgstr "A {0} no l'ha agradat l'enviament de %s"
 
-#: ../../include/conversation.php:912
+#: ../../mod/ping.php:269
 #, php-format
-msgid "%s don't like this."
-msgstr "a %s no li agrada això."
+msgid "{0} is now friends with %s"
+msgstr "{0} ara és amic de %s"
 
-#: ../../include/conversation.php:939 ../../include/conversation.php:957
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Visible per a <strong>tothom</strong>"
+#: ../../mod/ping.php:274
+msgid "{0} posted"
+msgstr "{0} publicat"
 
-#: ../../include/conversation.php:941 ../../include/conversation.php:959
-msgid "Please enter a video link/URL:"
-msgstr "Per favor , introdueixi el enllaç/URL del video"
+#: ../../mod/ping.php:279
+#, php-format
+msgid "{0} tagged %s's post with #%s"
+msgstr "{0} va etiquetar la publicació de %s com #%s"
 
-#: ../../include/conversation.php:942 ../../include/conversation.php:960
-msgid "Please enter an audio link/URL:"
-msgstr "Per favor , introdueixi el enllaç/URL del audio:"
+#: ../../mod/ping.php:285
+msgid "{0} mentioned you in a post"
+msgstr "{0} et menciona en un missatge"
 
-#: ../../include/conversation.php:943 ../../include/conversation.php:961
-msgid "Tag term:"
-msgstr "Terminis de l'etiqueta:"
+#: ../../mod/admin.php:55
+msgid "Theme settings updated."
+msgstr "Ajustos de Tema actualitzats"
 
-#: ../../include/conversation.php:945 ../../include/conversation.php:963
-msgid "Where are you right now?"
-msgstr "On ets ara?"
+#: ../../mod/admin.php:96 ../../mod/admin.php:490
+msgid "Site"
+msgstr "Lloc"
 
-#: ../../include/conversation.php:946
-msgid "Delete item(s)?"
-msgstr ""
+#: ../../mod/admin.php:97 ../../mod/admin.php:762 ../../mod/admin.php:776
+msgid "Users"
+msgstr "Usuaris"
 
-#: ../../include/conversation.php:988
-msgid "Post to Email"
-msgstr "Correu per enviar"
+#: ../../mod/admin.php:98 ../../mod/admin.php:859 ../../mod/admin.php:901
+msgid "Plugins"
+msgstr "Plugins"
 
-#: ../../include/conversation.php:1044
-msgid "permissions"
-msgstr "Permissos"
+#: ../../mod/admin.php:99 ../../mod/admin.php:1067 ../../mod/admin.php:1101
+msgid "Themes"
+msgstr "Temes"
 
-#: ../../include/conversation.php:1068
-msgid "Post to Groups"
-msgstr ""
+#: ../../mod/admin.php:100
+msgid "DB updates"
+msgstr "Actualitzacions de BD"
 
-#: ../../include/conversation.php:1069
-msgid "Post to Contacts"
-msgstr ""
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1188
+msgid "Logs"
+msgstr "Registres"
 
-#: ../../include/conversation.php:1070
-msgid "Private post"
-msgstr ""
+#: ../../mod/admin.php:121
+msgid "Plugin Features"
+msgstr "Característiques del Plugin"
 
-#: ../../include/plugin.php:429 ../../include/plugin.php:431
-msgid "Click here to upgrade."
-msgstr "Clica aquí per actualitzar."
+#: ../../mod/admin.php:123
+msgid "User registrations waiting for confirmation"
+msgstr "Registre d'usuari a l'espera de confirmació"
 
-#: ../../include/plugin.php:437
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Aquesta acció excedeix els límits del teu plan de subscripció."
+#: ../../mod/admin.php:182 ../../mod/admin.php:733
+msgid "Normal Account"
+msgstr "Compte Normal"
 
-#: ../../include/plugin.php:442
-msgid "This action is not available under your subscription plan."
-msgstr "Aquesta acció no està disponible en el teu plan de subscripció."
+#: ../../mod/admin.php:183 ../../mod/admin.php:734
+msgid "Soapbox Account"
+msgstr "Compte Tribuna"
 
-#: ../../boot.php:640
+#: ../../mod/admin.php:184 ../../mod/admin.php:735
+msgid "Community/Celebrity Account"
+msgstr "Compte de Comunitat/Celebritat"
+
+#: ../../mod/admin.php:185 ../../mod/admin.php:736
+msgid "Automatic Friend Account"
+msgstr "Compte d'Amistat Automàtic"
+
+#: ../../mod/admin.php:186
+msgid "Blog Account"
+msgstr "Compte de Blog"
+
+#: ../../mod/admin.php:187
+msgid "Private Forum"
+msgstr "Fòrum Privat"
+
+#: ../../mod/admin.php:206
+msgid "Message queues"
+msgstr "Cues de missatges"
+
+#: ../../mod/admin.php:211 ../../mod/admin.php:489 ../../mod/admin.php:761
+#: ../../mod/admin.php:858 ../../mod/admin.php:900 ../../mod/admin.php:1066
+#: ../../mod/admin.php:1100 ../../mod/admin.php:1187
+msgid "Administration"
+msgstr "Administració"
+
+#: ../../mod/admin.php:212
+msgid "Summary"
+msgstr "Sumari"
+
+#: ../../mod/admin.php:214
+msgid "Registered users"
+msgstr "Usuaris registrats"
+
+#: ../../mod/admin.php:216
+msgid "Pending registrations"
+msgstr "Registres d'usuari pendents"
+
+#: ../../mod/admin.php:217
+msgid "Version"
+msgstr "Versió"
+
+#: ../../mod/admin.php:219
+msgid "Active plugins"
+msgstr "Plugins actius"
+
+#: ../../mod/admin.php:405
+msgid "Site settings updated."
+msgstr "Ajustos del lloc actualitzats."
+
+#: ../../mod/admin.php:434 ../../mod/settings.php:793
+msgid "No special theme for mobile devices"
+msgstr "No hi ha un tema específic per a mòbil"
+
+#: ../../mod/admin.php:451 ../../mod/contacts.php:330
+msgid "Never"
+msgstr "Mai"
+
+#: ../../mod/admin.php:460
+msgid "Multi user instance"
+msgstr "Instancia multiusuari"
+
+#: ../../mod/admin.php:476
+msgid "Closed"
+msgstr "Tancat"
+
+#: ../../mod/admin.php:477
+msgid "Requires approval"
+msgstr "Requereix aprovació"
+
+#: ../../mod/admin.php:478
+msgid "Open"
+msgstr "Obert"
+
+#: ../../mod/admin.php:482
+msgid "No SSL policy, links will track page SSL state"
+msgstr "No existe una política de SSL, se hará un seguimiento de los vínculos de la página con SSL"
+
+#: ../../mod/admin.php:483
+msgid "Force all links to use SSL"
+msgstr "Forzar a tots els enllaços a utilitzar SSL"
+
+#: ../../mod/admin.php:484
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr "Certificat auto-signat, utilitzar SSL només per a enllaços locals (desaconsellat)"
+
+#: ../../mod/admin.php:492 ../../mod/register.php:261
+msgid "Registration"
+msgstr "Procés de Registre"
+
+#: ../../mod/admin.php:493
+msgid "File upload"
+msgstr "Fitxer carregat"
+
+#: ../../mod/admin.php:494
+msgid "Policies"
+msgstr "Polítiques"
+
+#: ../../mod/admin.php:495
+msgid "Advanced"
+msgstr "Avançat"
+
+#: ../../mod/admin.php:496
+msgid "Performance"
+msgstr "Rendiment"
+
+#: ../../mod/admin.php:500
+msgid "Site name"
+msgstr "Nom del lloc"
+
+#: ../../mod/admin.php:501
+msgid "Banner/Logo"
+msgstr "Senyera/Logo"
+
+#: ../../mod/admin.php:502
+msgid "System language"
+msgstr "Idioma del Sistema"
+
+#: ../../mod/admin.php:503
+msgid "System theme"
+msgstr "Tema del sistema"
+
+#: ../../mod/admin.php:503
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr "Tema per defecte del sistema - pot ser obviat pels perfils del usuari - <a href='#' id='cnftheme'>Canviar ajustos de tema</a>"
+
+#: ../../mod/admin.php:504
+msgid "Mobile system theme"
+msgstr "Tema per a mòbil"
+
+#: ../../mod/admin.php:504
+msgid "Theme for mobile devices"
+msgstr "Tema per a aparells mòbils"
+
+#: ../../mod/admin.php:505
+msgid "SSL link policy"
+msgstr "Política SSL per als enllaços"
+
+#: ../../mod/admin.php:505
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr "Determina si els enllaços generats han de ser forçats a utilitzar SSL"
+
+#: ../../mod/admin.php:506
+msgid "'Share' element"
+msgstr "'Compartir' element"
+
+#: ../../mod/admin.php:506
+msgid "Activates the bbcode element 'share' for repeating items."
+msgstr "Activa el element bbcode 'compartir' per a repetir articles."
+
+#: ../../mod/admin.php:507
+msgid "Hide help entry from navigation menu"
+msgstr "Amaga l'entrada d'ajuda del menu de navegació"
+
+#: ../../mod/admin.php:507
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
+msgstr "Amaga l'entrada del menú de les pàgines d'ajuda. Pots encara accedir entrant /ajuda directament."
+
+#: ../../mod/admin.php:508
+msgid "Single user instance"
+msgstr "Instancia per a un únic usuari"
+
+#: ../../mod/admin.php:508
+msgid "Make this instance multi-user or single-user for the named user"
+msgstr "Fer aquesta instancia multi-usuari o mono-usuari per al usuari anomenat"
+
+#: ../../mod/admin.php:509
+msgid "Maximum image size"
+msgstr "Mida màxima de les imatges"
+
+#: ../../mod/admin.php:509
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Mida màxima en bytes de les imatges a pujar. Per defecte es 0, que vol dir sense límits."
+
+#: ../../mod/admin.php:510
+msgid "Maximum image length"
+msgstr "Maxima longitud d'imatge"
+
+#: ../../mod/admin.php:510
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
+msgstr "Longitud màxima en píxels del costat més llarg de la imatge carregada. Per defecte es -1, que significa sense límits"
+
+#: ../../mod/admin.php:511
+msgid "JPEG image quality"
+msgstr "Qualitat per a la imatge JPEG"
+
+#: ../../mod/admin.php:511
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr "Els JPEGs pujats seran guardats amb la qualitat que ajustis de  [0-100]. Per defecte es 100 màxima qualitat."
+
+#: ../../mod/admin.php:513
+msgid "Register policy"
+msgstr "Política per a registrar"
+
+#: ../../mod/admin.php:514
+msgid "Maximum Daily Registrations"
+msgstr "Registres Màxims Diaris"
+
+#: ../../mod/admin.php:514
+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 "Si es permet el registre, això ajusta el nombre màxim de nous usuaris a acceptar diariament. Si el registre esta tancat, aquest ajust no te efectes."
+
+#: ../../mod/admin.php:515
+msgid "Register text"
+msgstr "Text al registrar"
+
+#: ../../mod/admin.php:515
+msgid "Will be displayed prominently on the registration page."
+msgstr "Serà mostrat de forma preminent a la pàgina durant el procés de registre."
+
+#: ../../mod/admin.php:516
+msgid "Accounts abandoned after x days"
+msgstr "Comptes abandonats després de x dies"
+
+#: ../../mod/admin.php:516
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal."
+
+#: ../../mod/admin.php:517
+msgid "Allowed friend domains"
+msgstr "Dominis amics permesos"
+
+#: ../../mod/admin.php:517
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis."
+
+#: ../../mod/admin.php:518
+msgid "Allowed email domains"
+msgstr "Dominis de correu permesos"
+
+#: ../../mod/admin.php:518
+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 "Llista de dominis separada per comes, de adreçes de correu que són permeses per registrtar-se. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis."
+
+#: ../../mod/admin.php:519
+msgid "Block public"
+msgstr "Bloqueig públic"
+
+#: ../../mod/admin.php:519
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Bloqueja l'accés públic a qualsevol pàgina del lloc fins que t'hagis identificat."
+
+#: ../../mod/admin.php:520
+msgid "Force publish"
+msgstr "Forçar publicació"
+
+#: ../../mod/admin.php:520
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Obliga a que tots el perfils en aquest lloc siguin mostrats en el directori del lloc."
+
+#: ../../mod/admin.php:521
+msgid "Global directory update URL"
+msgstr "Actualitzar URL del directori global"
+
+#: ../../mod/admin.php:521
+msgid ""
+"URL to update the global directory. If this is not set, the global directory"
+" is completely unavailable to the application."
+msgstr "URL per actualitzar el directori global. Si no es configura, el directori global serà completament inaccesible per a l'aplicació. "
+
+#: ../../mod/admin.php:522
+msgid "Allow threaded items"
+msgstr "Permetre fils als articles"
+
+#: ../../mod/admin.php:522
+msgid "Allow infinite level threading for items on this site."
+msgstr "Permet un nivell infinit de fils per a articles en aquest lloc."
+
+#: ../../mod/admin.php:523
+msgid "Private posts by default for new users"
+msgstr "Els enviaments dels nous usuaris seran privats per defecte."
+
+#: ../../mod/admin.php:523
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
+msgstr "Canviar els permisos d'enviament per defecte per a tots els nous membres a grup privat en lloc de públic."
+
+#: ../../mod/admin.php:524
+msgid "Don't include post content in email notifications"
+msgstr "No incloure el assumpte a les notificacions per correu electrónic"
+
+#: ../../mod/admin.php:524
+msgid ""
+"Don't include the content of a post/comment/private message/etc. in the "
+"email notifications that are sent out from this site, as a privacy measure."
+msgstr "No incloure assumpte d'un enviament/comentari/missatge_privat/etc. Als correus electronics que envii fora d'aquest lloc, com a mesura de privacitat. "
+
+#: ../../mod/admin.php:525
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr "Deshabilita el accés públic als complements llistats al menu d'aplicacions"
+
+#: ../../mod/admin.php:525
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr "Marcant això restringiras els complements llistats al menú d'aplicacions al membres"
+
+#: ../../mod/admin.php:526
+msgid "Don't embed private images in posts"
+msgstr "No incrustar imatges en missatges privats"
+
+#: ../../mod/admin.php:526
+msgid ""
+"Don't replace locally-hosted private photos in posts with an embedded copy "
+"of the image. This means that contacts who receive posts containing private "
+"photos will have to authenticate and load each image, which may take a "
+"while."
+msgstr "No reemplaçar les fotos privades hospedades localment en missatges amb una còpia de l'imatge embeguda. Això vol dir que els contactes que rebin el missatge contenint fotos privades s'ha d'autenticar i carregar cada imatge, amb el que pot suposar bastant temps."
+
+#: ../../mod/admin.php:528
+msgid "Block multiple registrations"
+msgstr "Bloquejar multiples registracions"
+
+#: ../../mod/admin.php:528
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr "Inhabilita als usuaris el crear comptes adicionals per a usar com a pàgines."
+
+#: ../../mod/admin.php:529
+msgid "OpenID support"
+msgstr "Suport per a OpenID"
+
+#: ../../mod/admin.php:529
+msgid "OpenID support for registration and logins."
+msgstr "Suport per a registre i validació a OpenID."
+
+#: ../../mod/admin.php:530
+msgid "Fullname check"
+msgstr "Comprobació de nom complet"
+
+#: ../../mod/admin.php:530
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr "Obliga els usuaris a col·locar un espai en blanc entre nom i cognoms, com a mesura antispam"
+
+#: ../../mod/admin.php:531
+msgid "UTF-8 Regular expressions"
+msgstr "expresions regulars UTF-8"
+
+#: ../../mod/admin.php:531
+msgid "Use PHP UTF8 regular expressions"
+msgstr "Empri expresions regulars de PHP amb format UTF8"
+
+#: ../../mod/admin.php:532
+msgid "Show Community Page"
+msgstr "Mostra la Pàgina de Comunitat"
+
+#: ../../mod/admin.php:532
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr "Mostra a la pàgina de comunitat tots els missatges públics recents, d'aquest lloc."
+
+#: ../../mod/admin.php:533
+msgid "Enable OStatus support"
+msgstr "Activa el suport per a OStatus"
+
+#: ../../mod/admin.php:533
+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 "Proveeix de compatibilitat integrada amb OStatus (identi.ca, status.net, etc). Totes les comunicacions a OStatus són públiques amb el que ocasionalment pots veure advertències."
+
+#: ../../mod/admin.php:534
+msgid "OStatus conversation completion interval"
+msgstr "Interval de conclusió de la conversació a OStatus"
+
+#: ../../mod/admin.php:534
+msgid ""
+"How often shall the poller check for new entries in OStatus conversations? "
+"This can be a very ressource task."
+msgstr "Com de sovint el sondejador ha de comprovar les noves conversacions entrades a OStatus? Això pot implicar una gran càrrega de treball."
+
+#: ../../mod/admin.php:535
+msgid "Enable Diaspora support"
+msgstr "Habilitar suport per Diaspora"
+
+#: ../../mod/admin.php:535
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Proveeix compatibilitat integrada amb la xarxa Diaspora"
+
+#: ../../mod/admin.php:536
+msgid "Only allow Friendica contacts"
+msgstr "Només permetre contactes de Friendica"
+
+#: ../../mod/admin.php:536
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr "Tots els contactes "
+
+#: ../../mod/admin.php:537
+msgid "Verify SSL"
+msgstr "Verificar SSL"
+
+#: ../../mod/admin.php:537
+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 "Si ho vols, pots comprovar el certificat estrictament. Això farà que no puguis connectar (de cap manera) amb llocs amb certificats SSL autosignats."
+
+#: ../../mod/admin.php:538
+msgid "Proxy user"
+msgstr "proxy d'usuari"
+
+#: ../../mod/admin.php:539
+msgid "Proxy URL"
+msgstr "URL del proxy"
+
+#: ../../mod/admin.php:540
+msgid "Network timeout"
+msgstr "Temps excedit a la xarxa"
+
+#: ../../mod/admin.php:540
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Valor en segons. Canviat a 0 es sense límits (no recomenat)"
+
+#: ../../mod/admin.php:541
+msgid "Delivery interval"
+msgstr "Interval d'entrega"
+
+#: ../../mod/admin.php:541
+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 "Retardar processos d'entrega, en segon pla, en aquesta quantitat de segons, per reduir la càrrega del sistema . Recomanem : 4-5 per als servidors compartits , 2-3 per a servidors privats virtuals . 0-1 per els grans servidors dedicats."
+
+#: ../../mod/admin.php:542
+msgid "Poll interval"
+msgstr "Interval entre sondejos"
+
+#: ../../mod/admin.php:542
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr "Endarrerir els processos de sondeig en segon pla durant aquest període, en segons, per tal de reduir la càrrega de treball del sistema, Si s'empra 0, s'utilitza l'interval d'entregues. "
+
+#: ../../mod/admin.php:543
+msgid "Maximum Load Average"
+msgstr "Càrrega Màxima Sostinguda"
+
+#: ../../mod/admin.php:543
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Càrrega màxima del sistema abans d'apaçar els processos d'entrega i sondeig - predeterminat a 50."
+
+#: ../../mod/admin.php:545
+msgid "Use MySQL full text engine"
+msgstr "Emprar el motor de text complet de MySQL"
+
+#: ../../mod/admin.php:545
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr "Activa el motos de text complet. Accelera les cerques pero només pot cercar per quatre o més caracters."
+
+#: ../../mod/admin.php:546
+msgid "Path to item cache"
+msgstr "Camí cap a la caché de l'article"
+
+#: ../../mod/admin.php:547
+msgid "Cache duration in seconds"
+msgstr "Duració de la caché en segons"
+
+#: ../../mod/admin.php:547
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One"
+" day)."
+msgstr "Quan de temps s'han de mantenir els fitxers a la caché?. El valor per defecte son 86400 segons (un dia)."
+
+#: ../../mod/admin.php:548
+msgid "Path for lock file"
+msgstr "Camí per a l'arxiu bloquejat"
+
+#: ../../mod/admin.php:549
+msgid "Temp path"
+msgstr "Camí a carpeta temporal"
+
+#: ../../mod/admin.php:550
+msgid "Base path to installation"
+msgstr "Trajectoria base per a instal·lar"
+
+#: ../../mod/admin.php:567
+msgid "Update has been marked successful"
+msgstr "L'actualització ha estat marcada amb èxit"
+
+#: ../../mod/admin.php:577
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr "Ha fracassat l'execució de %s. Comprova el registre del sistema."
+
+#: ../../mod/admin.php:580
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "L'actualització de %s es va aplicar amb èxit."
+
+#: ../../mod/admin.php:584
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr "L'actualització de %s no ha retornat el seu estatus. Es desconeix si ha estat amb èxit."
+
+#: ../../mod/admin.php:587
+#, php-format
+msgid "Update function %s could not be found."
+msgstr "L'actualització de la funció %s no es pot trobar."
+
+#: ../../mod/admin.php:602
+msgid "No failed updates."
+msgstr "No hi ha actualitzacions fallides."
+
+#: ../../mod/admin.php:606
+msgid "Failed Updates"
+msgstr "Actualitzacions Fallides"
+
+#: ../../mod/admin.php:607
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr "Això no inclou actualitzacions anteriors a 1139, raó per la que no ha retornat l'estatus."
+
+#: ../../mod/admin.php:608
+msgid "Mark success (if update was manually applied)"
+msgstr "Marcat am èxit (si l'actualització es va fer manualment)"
+
+#: ../../mod/admin.php:609
+msgid "Attempt to execute this update step automatically"
+msgstr "Intentant executar aquest pas d'actualització automàticament"
+
+#: ../../mod/admin.php:634
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "%s usuari bloquejar/desbloquejar"
+msgstr[1] "%s usuaris bloquejar/desbloquejar"
+
+#: ../../mod/admin.php:641
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s usuari esborrat"
+msgstr[1] "%s usuaris esborrats"
+
+#: ../../mod/admin.php:680
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Usuari %s' esborrat"
+
+#: ../../mod/admin.php:688
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "Usuari %s' desbloquejat"
+
+#: ../../mod/admin.php:688
+#, php-format
+msgid "User '%s' blocked"
+msgstr "L'usuari '%s' és bloquejat"
+
+#: ../../mod/admin.php:764
+msgid "select all"
+msgstr "Seleccionar tot"
+
+#: ../../mod/admin.php:765
+msgid "User registrations waiting for confirm"
+msgstr "Registre d'usuari esperant confirmació"
+
+#: ../../mod/admin.php:766
+msgid "Request date"
+msgstr "Data de sol·licitud"
+
+#: ../../mod/admin.php:766 ../../mod/admin.php:777 ../../mod/settings.php:586
+#: ../../mod/settings.php:612 ../../mod/crepair.php:148
+msgid "Name"
+msgstr "Nom"
+
+#: ../../mod/admin.php:767
+msgid "No registrations."
+msgstr "Sense registres."
+
+#: ../../mod/admin.php:768 ../../mod/notifications.php:161
+#: ../../mod/notifications.php:208
+msgid "Approve"
+msgstr "Aprovar"
+
+#: ../../mod/admin.php:769
+msgid "Deny"
+msgstr "Denegar"
+
+#: ../../mod/admin.php:771 ../../mod/contacts.php:353
+#: ../../mod/contacts.php:412
+msgid "Block"
+msgstr "Bloquejar"
+
+#: ../../mod/admin.php:772 ../../mod/contacts.php:353
+#: ../../mod/contacts.php:412
+msgid "Unblock"
+msgstr "Desbloquejar"
+
+#: ../../mod/admin.php:773
+msgid "Site admin"
+msgstr "Administrador del lloc"
+
+#: ../../mod/admin.php:774
+msgid "Account expired"
+msgstr "Compte expirat"
+
+#: ../../mod/admin.php:777
+msgid "Register date"
+msgstr "Data de registre"
+
+#: ../../mod/admin.php:777
+msgid "Last login"
+msgstr "Últim accés"
+
+#: ../../mod/admin.php:777
+msgid "Last item"
+msgstr "Últim element"
+
+#: ../../mod/admin.php:777
+msgid "Account"
+msgstr "Compte"
+
+#: ../../mod/admin.php:779
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Els usuaris seleccionats seran esborrats!\\n\\nqualsevol cosa que aquests usuaris hagin publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?"
+
+#: ../../mod/admin.php:780
+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 "L'usuari {0} s'eliminarà!\\n\\nQualsevol cosa que aquest usuari hagi publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?"
+
+#: ../../mod/admin.php:821
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Plugin %s deshabilitat."
+
+#: ../../mod/admin.php:825
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Plugin %s habilitat."
+
+#: ../../mod/admin.php:835 ../../mod/admin.php:1038
+msgid "Disable"
+msgstr "Deshabilitar"
+
+#: ../../mod/admin.php:837 ../../mod/admin.php:1040
+msgid "Enable"
+msgstr "Habilitar"
+
+#: ../../mod/admin.php:860 ../../mod/admin.php:1068
+msgid "Toggle"
+msgstr "Canviar"
+
+#: ../../mod/admin.php:868 ../../mod/admin.php:1078
+msgid "Author: "
+msgstr "Autor:"
+
+#: ../../mod/admin.php:869 ../../mod/admin.php:1079
+msgid "Maintainer: "
+msgstr "Responsable:"
+
+#: ../../mod/admin.php:998
+msgid "No themes found."
+msgstr "No s'ha trobat temes."
+
+#: ../../mod/admin.php:1060
+msgid "Screenshot"
+msgstr "Captura de pantalla"
+
+#: ../../mod/admin.php:1106
+msgid "[Experimental]"
+msgstr "[Experimental]"
+
+#: ../../mod/admin.php:1107
+msgid "[Unsupported]"
+msgstr "[No soportat]"
+
+#: ../../mod/admin.php:1134
+msgid "Log settings updated."
+msgstr "Configuració del registre actualitzada."
+
+#: ../../mod/admin.php:1190
+msgid "Clear"
+msgstr "Netejar"
+
+#: ../../mod/admin.php:1196
+msgid "Enable Debugging"
+msgstr "Habilitar Depuració"
+
+#: ../../mod/admin.php:1197
+msgid "Log file"
+msgstr "Arxiu de registre"
+
+#: ../../mod/admin.php:1197
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr "Ha de tenir permisos d'escriptura pel servidor web. En relació amb el seu directori Friendica de nivell superior."
+
+#: ../../mod/admin.php:1198
+msgid "Log level"
+msgstr "Nivell de transcripció"
+
+#: ../../mod/admin.php:1247 ../../mod/contacts.php:409
+msgid "Update now"
+msgstr "Actualitza ara"
+
+#: ../../mod/admin.php:1248
+msgid "Close"
+msgstr "Tancar"
+
+#: ../../mod/admin.php:1254
+msgid "FTP Host"
+msgstr "Amfitrió FTP"
+
+#: ../../mod/admin.php:1255
+msgid "FTP Path"
+msgstr "Direcció FTP"
+
+#: ../../mod/admin.php:1256
+msgid "FTP User"
+msgstr "Usuari FTP"
+
+#: ../../mod/admin.php:1257
+msgid "FTP Password"
+msgstr "Contrasenya FTP"
+
+#: ../../mod/item.php:108
+msgid "Unable to locate original post."
+msgstr "No es pot localitzar post original."
+
+#: ../../mod/item.php:310
+msgid "Empty post discarded."
+msgstr "Buidat després de rebutjar."
+
+#: ../../mod/item.php:872
+msgid "System error. Post not saved."
+msgstr "Error del sistema. Publicació no guardada."
+
+#: ../../mod/item.php:897
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social "
+"network."
+msgstr "Aquest missatge va ser enviat a vostè per %s, un membre de la xarxa social Friendica."
+
+#: ../../mod/item.php:899
+#, php-format
+msgid "You may visit them online at %s"
+msgstr "El pot visitar en línia a %s"
+
+#: ../../mod/item.php:900
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr "Si us plau, poseu-vos en contacte amb el remitent responent a aquest missatge si no voleu rebre aquests missatges."
+
+#: ../../mod/item.php:904
+#, php-format
+msgid "%s posted an update."
+msgstr "%s ha publicat una actualització."
+
+#: ../../mod/allfriends.php:34
+#, php-format
+msgid "Friends of %s"
+msgstr "Amics de %s"
+
+#: ../../mod/allfriends.php:40
+msgid "No friends to display."
+msgstr "No hi ha amics que mostrar"
+
+#: ../../mod/search.php:21 ../../mod/network.php:224
+msgid "Remove term"
+msgstr "Traieu termini"
+
+#: ../../mod/search.php:180 ../../mod/search.php:206
+#: ../../mod/community.php:61 ../../mod/community.php:89
+msgid "No results."
+msgstr "Sense resultats."
+
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Autoritzi la connexió de aplicacions"
+
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Torni a la seva aplicació i inserti aquest Codi de Seguretat:"
+
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr "Per favor, accedeixi per a continuar."
+
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Vol autoritzar a aquesta aplicació per accedir als teus missatges i contactes, i/o crear nous enviaments per a vostè?"
+
+#: ../../mod/register.php:91 ../../mod/regmod.php:54
+#, php-format
+msgid "Registration details for %s"
+msgstr "Detalls del registre per a %s"
+
+#: ../../mod/register.php:99
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr "Registrat amb èxit. Per favor, comprovi el seu correu per a posteriors instruccions."
+
+#: ../../mod/register.php:103
+msgid "Failed to send email message. Here is the message that failed."
+msgstr "Error en enviar missatge de correu electrònic. Aquí està el missatge que ha fallat."
+
+#: ../../mod/register.php:108
+msgid "Your registration can not be processed."
+msgstr "El seu registre no pot ser processat."
+
+#: ../../mod/register.php:145
+#, php-format
+msgid "Registration request at %s"
+msgstr "Sol·licitud de registre a %s"
+
+#: ../../mod/register.php:154
+msgid "Your registration is pending approval by the site owner."
+msgstr "El seu registre està pendent d'aprovació pel propietari del lloc."
+
+#: ../../mod/register.php:192 ../../mod/uimport.php:50
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Aquest lloc excedeix el nombre diari de registres de comptes. Per favor, provi de nou demà."
+
+#: ../../mod/register.php:220
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr "Vostè pot (opcionalment), omplir aquest formulari a través de OpenID mitjançant el subministrament de la seva OpenID i fent clic a 'Registrar'."
+
+#: ../../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 "Si vostè no està familiaritzat amb Twitter, si us plau deixi aquest camp en blanc i completi la resta dels elements."
+
+#: ../../mod/register.php:222
+msgid "Your OpenID (optional): "
+msgstr "El seu OpenID (opcional):"
+
+#: ../../mod/register.php:236
+msgid "Include your profile in member directory?"
+msgstr "Incloc el seu perfil al directori de membres?"
+
+#: ../../mod/register.php:257
+msgid "Membership on this site is by invitation only."
+msgstr "Lloc accesible mitjançant invitació."
+
+#: ../../mod/register.php:258
+msgid "Your invitation ID: "
+msgstr "El teu ID de invitació:"
+
+#: ../../mod/register.php:269
+msgid "Your Full Name (e.g. Joe Smith): "
+msgstr "El seu nom complet (per exemple, Joan Ningú):"
+
+#: ../../mod/register.php:270
+msgid "Your Email Address: "
+msgstr "La Seva Adreça de Correu:"
+
+#: ../../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 "Tria un nom de perfil. Això ha de començar amb un caràcter de text. La seva adreça de perfil en aquest lloc serà '<strong>alies@$sitename</strong>'."
+
+#: ../../mod/register.php:272
+msgid "Choose a nickname: "
+msgstr "Tria un àlies:"
+
+#: ../../mod/regmod.php:63
+msgid "Account approved."
+msgstr "Compte aprovat."
+
+#: ../../mod/regmod.php:100
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Procés de Registre revocat per a %s"
+
+#: ../../mod/regmod.php:112
+msgid "Please login."
+msgstr "Si us plau, ingressa."
+
+#: ../../mod/attach.php:8
+msgid "Item not available."
+msgstr "Element no disponible"
+
+#: ../../mod/attach.php:20
+msgid "Item was not found."
+msgstr "Element no trobat."
+
+#: ../../mod/removeme.php:45 ../../mod/removeme.php:48
+msgid "Remove My Account"
+msgstr "Eliminar el Meu Compte"
+
+#: ../../mod/removeme.php:46
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr "Això eliminarà per complet el seu compte. Quan s'hagi fet això, no serà recuperable."
+
+#: ../../mod/removeme.php:47
+msgid "Please enter your password for verification:"
+msgstr "Si us plau, introduïu la contrasenya per a la verificació:"
+
+#: ../../mod/babel.php:17
+msgid "Source (bbcode) text:"
+msgstr "Text Codi (bbcode): "
+
+#: ../../mod/babel.php:23
+msgid "Source (Diaspora) text to convert to BBcode:"
+msgstr "Font (Diaspora) Convertir text a BBcode"
+
+#: ../../mod/babel.php:31
+msgid "Source input: "
+msgstr "Entrada de Codi:"
+
+#: ../../mod/babel.php:35
+msgid "bb2html (raw HTML): "
+msgstr "bb2html (raw HTML): "
+
+#: ../../mod/babel.php:39
+msgid "bb2html: "
+msgstr "bb2html: "
+
+#: ../../mod/babel.php:43
+msgid "bb2html2bb: "
+msgstr "bb2html2bb: "
+
+#: ../../mod/babel.php:47
+msgid "bb2md: "
+msgstr "bb2md: "
+
+#: ../../mod/babel.php:51
+msgid "bb2md2html: "
+msgstr "bb2md2html: "
+
+#: ../../mod/babel.php:55
+msgid "bb2dia2bb: "
+msgstr "bb2dia2bb: "
+
+#: ../../mod/babel.php:59
+msgid "bb2md2html2bb: "
+msgstr "bb2md2html2bb: "
+
+#: ../../mod/babel.php:69
+msgid "Source input (Diaspora format): "
+msgstr "Font d'entrada (format de Diaspora)"
+
+#: ../../mod/babel.php:74
+msgid "diaspora2bb: "
+msgstr "diaspora2bb: "
+
+#: ../../mod/common.php:42
+msgid "Common Friends"
+msgstr "Amics Comuns"
+
+#: ../../mod/common.php:78
+msgid "No contacts in common."
+msgstr "Sense contactes en comú."
+
+#: ../../mod/apps.php:7
+msgid "You must be logged in to use addons. "
+msgstr "T'has d'identificar per emprar els complements"
+
+#: ../../mod/apps.php:11
+msgid "Applications"
+msgstr "Aplicacions"
+
+#: ../../mod/apps.php:14
+msgid "No installed applications."
+msgstr "Aplicacions no instal·lades."
+
+#: ../../mod/contacts.php:85 ../../mod/contacts.php:165
+msgid "Could not access contact record."
+msgstr "No puc accedir al registre del contacte."
+
+#: ../../mod/contacts.php:99
+msgid "Could not locate selected profile."
+msgstr "No puc localitzar el perfil seleccionat."
+
+#: ../../mod/contacts.php:122
+msgid "Contact updated."
+msgstr "Contacte actualitzat."
+
+#: ../../mod/contacts.php:124 ../../mod/dfrn_request.php:571
+msgid "Failed to update contact record."
+msgstr "Error en actualitzar registre de contacte."
+
+#: ../../mod/contacts.php:187
+msgid "Contact has been blocked"
+msgstr "Elcontacte ha estat bloquejat"
+
+#: ../../mod/contacts.php:187
+msgid "Contact has been unblocked"
+msgstr "El contacte ha estat desbloquejat"
+
+#: ../../mod/contacts.php:201
+msgid "Contact has been ignored"
+msgstr "El contacte ha estat ignorat"
+
+#: ../../mod/contacts.php:201
+msgid "Contact has been unignored"
+msgstr "El contacte ha estat recordat"
+
+#: ../../mod/contacts.php:220
+msgid "Contact has been archived"
+msgstr "El contacte ha estat arxivat"
+
+#: ../../mod/contacts.php:220
+msgid "Contact has been unarchived"
+msgstr "El contacte ha estat desarxivat"
+
+#: ../../mod/contacts.php:244
+msgid "Do you really want to delete this contact?"
+msgstr "Realment vols esborrar aquest contacte?"
+
+#: ../../mod/contacts.php:263
+msgid "Contact has been removed."
+msgstr "El contacte ha estat tret"
+
+#: ../../mod/contacts.php:301
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "Ara te una amistat mutua amb %s"
+
+#: ../../mod/contacts.php:305
+#, php-format
+msgid "You are sharing with %s"
+msgstr "Estas compartint amb %s"
+
+#: ../../mod/contacts.php:310
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s esta compartint amb tú"
+
+#: ../../mod/contacts.php:327
+msgid "Private communications are not available for this contact."
+msgstr "Comunicacions privades no disponibles per aquest contacte."
+
+#: ../../mod/contacts.php:334
+msgid "(Update was successful)"
+msgstr "(L'actualització fou exitosa)"
+
+#: ../../mod/contacts.php:334
+msgid "(Update was not successful)"
+msgstr "(L'actualització fracassà)"
+
+#: ../../mod/contacts.php:336
+msgid "Suggest friends"
+msgstr "Suggerir amics"
+
+#: ../../mod/contacts.php:340
+#, php-format
+msgid "Network type: %s"
+msgstr "Xarxa tipus: %s"
+
+#: ../../mod/contacts.php:348
+msgid "View all contacts"
+msgstr "Veure tots els contactes"
+
+#: ../../mod/contacts.php:356
+msgid "Toggle Blocked status"
+msgstr "Canvi de estatus blocat"
+
+#: ../../mod/contacts.php:359 ../../mod/contacts.php:413
+msgid "Unignore"
+msgstr "Treure d'Ignorats"
+
+#: ../../mod/contacts.php:359 ../../mod/contacts.php:413
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:164
+#: ../../mod/notifications.php:210
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../../mod/contacts.php:362
+msgid "Toggle Ignored status"
+msgstr "Canvi de estatus ignorat"
+
+#: ../../mod/contacts.php:366
+msgid "Unarchive"
+msgstr "Desarxivat"
+
+#: ../../mod/contacts.php:366
+msgid "Archive"
+msgstr "Arxivat"
+
+#: ../../mod/contacts.php:369
+msgid "Toggle Archive status"
+msgstr "Canvi de estatus del arxiu"
+
+#: ../../mod/contacts.php:372
+msgid "Repair"
+msgstr "Reparar"
+
+#: ../../mod/contacts.php:375
+msgid "Advanced Contact Settings"
+msgstr "Ajustos Avançats per als Contactes"
+
+#: ../../mod/contacts.php:381
+msgid "Communications lost with this contact!"
+msgstr "La comunicació amb aquest contacte s'ha perdut!"
+
+#: ../../mod/contacts.php:384
+msgid "Contact Editor"
+msgstr "Editor de Contactes"
+
+#: ../../mod/contacts.php:387
+msgid "Profile Visibility"
+msgstr "Perfil de Visibilitat"
+
+#: ../../mod/contacts.php:388
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Si us plau triï el perfil que voleu mostrar a %s quan estigui veient el teu de forma segura."
+
+#: ../../mod/contacts.php:389
+msgid "Contact Information / Notes"
+msgstr "Informació/Notes del contacte"
+
+#: ../../mod/contacts.php:390
+msgid "Edit contact notes"
+msgstr "Editar notes de contactes"
+
+#: ../../mod/contacts.php:396
+msgid "Block/Unblock contact"
+msgstr "Bloquejar/Alliberar contacte"
+
+#: ../../mod/contacts.php:397
+msgid "Ignore contact"
+msgstr "Ignore contacte"
+
+#: ../../mod/contacts.php:398
+msgid "Repair URL settings"
+msgstr "Restablir configuració de URL"
+
+#: ../../mod/contacts.php:399
+msgid "View conversations"
+msgstr "Veient conversacions"
+
+#: ../../mod/contacts.php:401
+msgid "Delete contact"
+msgstr "Esborrar contacte"
+
+#: ../../mod/contacts.php:405
+msgid "Last update:"
+msgstr "Última actualització:"
+
+#: ../../mod/contacts.php:407
+msgid "Update public posts"
+msgstr "Actualitzar enviament públic"
+
+#: ../../mod/contacts.php:416
+msgid "Currently blocked"
+msgstr "Bloquejat actualment"
+
+#: ../../mod/contacts.php:417
+msgid "Currently ignored"
+msgstr "Ignorat actualment"
+
+#: ../../mod/contacts.php:418
+msgid "Currently archived"
+msgstr "Actualment arxivat"
+
+#: ../../mod/contacts.php:419 ../../mod/notifications.php:157
+#: ../../mod/notifications.php:204
+msgid "Hide this contact from others"
+msgstr "Amaga aquest contacte dels altres"
+
+#: ../../mod/contacts.php:419
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Répliques/agraiments per als teus missatges públics <strong>poden</strong> romandre visibles"
+
+#: ../../mod/contacts.php:470
+msgid "Suggestions"
+msgstr "Suggeriments"
+
+#: ../../mod/contacts.php:473
+msgid "Suggest potential friends"
+msgstr "Suggerir amics potencials"
+
+#: ../../mod/contacts.php:476 ../../mod/group.php:194
+msgid "All Contacts"
+msgstr "Tots els Contactes"
+
+#: ../../mod/contacts.php:479
+msgid "Show all contacts"
+msgstr "Mostrar tots els contactes"
+
+#: ../../mod/contacts.php:482
+msgid "Unblocked"
+msgstr "Desblocat"
+
+#: ../../mod/contacts.php:485
+msgid "Only show unblocked contacts"
+msgstr "Mostrar únicament els contactes no blocats"
+
+#: ../../mod/contacts.php:489
+msgid "Blocked"
+msgstr "Blocat"
+
+#: ../../mod/contacts.php:492
+msgid "Only show blocked contacts"
+msgstr "Mostrar únicament els contactes blocats"
+
+#: ../../mod/contacts.php:496
+msgid "Ignored"
+msgstr "Ignorat"
+
+#: ../../mod/contacts.php:499
+msgid "Only show ignored contacts"
+msgstr "Mostrar únicament els contactes ignorats"
+
+#: ../../mod/contacts.php:503
+msgid "Archived"
+msgstr "Arxivat"
+
+#: ../../mod/contacts.php:506
+msgid "Only show archived contacts"
+msgstr "Mostrar únicament els contactes arxivats"
+
+#: ../../mod/contacts.php:510
+msgid "Hidden"
+msgstr "Amagat"
+
+#: ../../mod/contacts.php:513
+msgid "Only show hidden contacts"
+msgstr "Mostrar únicament els contactes amagats"
+
+#: ../../mod/contacts.php:561
+msgid "Mutual Friendship"
+msgstr "Amistat Mutua"
+
+#: ../../mod/contacts.php:565
+msgid "is a fan of yours"
+msgstr "Es un fan teu"
+
+#: ../../mod/contacts.php:569
+msgid "you are a fan of"
+msgstr "ets fan de"
+
+#: ../../mod/contacts.php:611
+msgid "Search your contacts"
+msgstr "Cercant el seus contactes"
+
+#: ../../mod/contacts.php:612 ../../mod/directory.php:59
+msgid "Finding: "
+msgstr "Cercant:"
+
+#: ../../mod/settings.php:23 ../../mod/photos.php:79
+msgid "everybody"
+msgstr "tothom"
+
+#: ../../mod/settings.php:35
+msgid "Additional features"
+msgstr "Característiques Adicionals"
+
+#: ../../mod/settings.php:40 ../../mod/uexport.php:14
+msgid "Display settings"
+msgstr "Ajustos de pantalla"
+
+#: ../../mod/settings.php:46 ../../mod/uexport.php:20
+msgid "Connector settings"
+msgstr "Configuració dels connectors"
+
+#: ../../mod/settings.php:51 ../../mod/uexport.php:25
+msgid "Plugin settings"
+msgstr "Configuració del plugin"
+
+#: ../../mod/settings.php:56 ../../mod/uexport.php:30
+msgid "Connected apps"
+msgstr "App connectada"
+
+#: ../../mod/settings.php:61 ../../mod/uexport.php:35 ../../mod/uexport.php:80
+msgid "Export personal data"
+msgstr "Exportar dades personals"
+
+#: ../../mod/settings.php:66 ../../mod/uexport.php:40
+msgid "Remove account"
+msgstr "Esborrar compte"
+
+#: ../../mod/settings.php:118
+msgid "Missing some important data!"
+msgstr "Perdudes algunes dades importants!"
+
+#: ../../mod/settings.php:121 ../../mod/settings.php:610
+msgid "Update"
+msgstr "Actualitzar"
+
+#: ../../mod/settings.php:227
+msgid "Failed to connect with email account using the settings provided."
+msgstr "Connexió fracassada amb el compte de correu emprant la configuració proveïda."
+
+#: ../../mod/settings.php:232
+msgid "Email settings updated."
+msgstr "Configuració del correu electrònic actualitzada."
+
+#: ../../mod/settings.php:247
+msgid "Features updated"
+msgstr "Característiques actualitzades"
+
+#: ../../mod/settings.php:312
+msgid "Passwords do not match. Password unchanged."
+msgstr "Les contrasenyes no coincideixen. Contrasenya no canviada."
+
+#: ../../mod/settings.php:317
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "No es permeten contasenyes buides. Contrasenya no canviada"
+
+#: ../../mod/settings.php:325
+msgid "Wrong password."
+msgstr "Contrasenya errònia"
+
+#: ../../mod/settings.php:336
+msgid "Password changed."
+msgstr "Contrasenya canviada."
+
+#: ../../mod/settings.php:338
+msgid "Password update failed. Please try again."
+msgstr "Ha fallat l'actualització de la Contrasenya. Per favor, intenti-ho de nou."
+
+#: ../../mod/settings.php:403
+msgid " Please use a shorter name."
+msgstr "Si us plau, faci servir un nom més curt."
+
+#: ../../mod/settings.php:405
+msgid " Name too short."
+msgstr "Nom massa curt."
+
+#: ../../mod/settings.php:414
+msgid "Wrong Password"
+msgstr "Contrasenya Errònia"
+
+#: ../../mod/settings.php:419
+msgid " Not valid email."
+msgstr "Correu no vàlid."
+
+#: ../../mod/settings.php:422
+msgid " Cannot change to that email."
+msgstr "No puc canviar a aquest correu."
+
+#: ../../mod/settings.php:476
+msgid "Private forum has no privacy permissions. Using default privacy group."
+msgstr "Els Fòrums privats no tenen permisos de privacitat. Empra la privacitat de grup per defecte."
+
+#: ../../mod/settings.php:480
+msgid "Private forum has no privacy permissions and no default privacy group."
+msgstr "Els Fòrums privats no tenen permisos de privacitat i tampoc privacitat per defecte de grup."
+
+#: ../../mod/settings.php:510
+msgid "Settings updated."
+msgstr "Ajustos actualitzats."
+
+#: ../../mod/settings.php:583 ../../mod/settings.php:609
+#: ../../mod/settings.php:645
+msgid "Add application"
+msgstr "Afegir aplicació"
+
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
+msgid "Consumer Key"
+msgstr "Consumer Key"
+
+#: ../../mod/settings.php:588 ../../mod/settings.php:614
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
+
+#: ../../mod/settings.php:589 ../../mod/settings.php:615
+msgid "Redirect"
+msgstr "Redirigir"
+
+#: ../../mod/settings.php:590 ../../mod/settings.php:616
+msgid "Icon url"
+msgstr "icona de url"
+
+#: ../../mod/settings.php:601
+msgid "You can't edit this application."
+msgstr "No pots editar aquesta aplicació."
+
+#: ../../mod/settings.php:644
+msgid "Connected Apps"
+msgstr "Aplicacions conectades"
+
+#: ../../mod/settings.php:646 ../../mod/editpost.php:109
+#: ../../mod/content.php:751 ../../object/Item.php:117
+msgid "Edit"
+msgstr "Editar"
+
+#: ../../mod/settings.php:648
+msgid "Client key starts with"
+msgstr "Les claus de client comançen amb"
+
+#: ../../mod/settings.php:649
+msgid "No name"
+msgstr "Sense nom"
+
+#: ../../mod/settings.php:650
+msgid "Remove authorization"
+msgstr "retirar l'autorització"
+
+#: ../../mod/settings.php:662
+msgid "No Plugin settings configured"
+msgstr "No s'han configurat ajustos de Plugin"
+
+#: ../../mod/settings.php:670
+msgid "Plugin Settings"
+msgstr "Ajustos de Plugin"
+
+#: ../../mod/settings.php:684
+msgid "Off"
+msgstr "Apagat"
+
+#: ../../mod/settings.php:684
+msgid "On"
+msgstr "Engegat"
+
+#: ../../mod/settings.php:692
+msgid "Additional Features"
+msgstr "Característiques Adicionals"
+
+#: ../../mod/settings.php:705 ../../mod/settings.php:706
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
+msgstr "El suport integrat per a la connectivitat de %s és %s"
+
+#: ../../mod/settings.php:705 ../../mod/settings.php:706
+msgid "enabled"
+msgstr "habilitat"
+
+#: ../../mod/settings.php:705 ../../mod/settings.php:706
+msgid "disabled"
+msgstr "deshabilitat"
+
+#: ../../mod/settings.php:706
+msgid "StatusNet"
+msgstr "StatusNet"
+
+#: ../../mod/settings.php:738
+msgid "Email access is disabled on this site."
+msgstr "L'accés al correu està deshabilitat en aquest lloc."
+
+#: ../../mod/settings.php:745
+msgid "Connector Settings"
+msgstr "Configuració de connectors"
+
+#: ../../mod/settings.php:750
+msgid "Email/Mailbox Setup"
+msgstr "Preparació de Correu/Bústia"
+
+#: ../../mod/settings.php:751
+msgid ""
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
+msgstr "Si vol comunicar-se amb els contactes de correu emprant aquest servei (opcional), Si us plau, especifiqui com connectar amb la seva bústia."
+
+#: ../../mod/settings.php:752
+msgid "Last successful email check:"
+msgstr "Última comprovació de correu amb èxit:"
+
+#: ../../mod/settings.php:754
+msgid "IMAP server name:"
+msgstr "Nom del servidor IMAP:"
+
+#: ../../mod/settings.php:755
+msgid "IMAP port:"
+msgstr "Port IMAP:"
+
+#: ../../mod/settings.php:756
+msgid "Security:"
+msgstr "Seguretat:"
+
+#: ../../mod/settings.php:756 ../../mod/settings.php:761
+msgid "None"
+msgstr "Cap"
+
+#: ../../mod/settings.php:757
+msgid "Email login name:"
+msgstr "Nom d'usuari del correu"
+
+#: ../../mod/settings.php:758
+msgid "Email password:"
+msgstr "Contrasenya del correu:"
+
+#: ../../mod/settings.php:759
+msgid "Reply-to address:"
+msgstr "Adreça de resposta:"
+
+#: ../../mod/settings.php:760
+msgid "Send public posts to all email contacts:"
+msgstr "Enviar correu públic a tots els contactes del correu:"
+
+#: ../../mod/settings.php:761
+msgid "Action after import:"
+msgstr "Acció després d'importar:"
+
+#: ../../mod/settings.php:761
+msgid "Mark as seen"
+msgstr "Marcar com a vist"
+
+#: ../../mod/settings.php:761
+msgid "Move to folder"
+msgstr "Moure a la carpeta"
+
+#: ../../mod/settings.php:762
+msgid "Move to folder:"
+msgstr "Moure a la carpeta:"
+
+#: ../../mod/settings.php:835
+msgid "Display Settings"
+msgstr "Ajustos de Pantalla"
+
+#: ../../mod/settings.php:841 ../../mod/settings.php:853
+msgid "Display Theme:"
+msgstr "Visualitzar el Tema:"
+
+#: ../../mod/settings.php:842
+msgid "Mobile Theme:"
+msgstr "Tema Mobile:"
+
+#: ../../mod/settings.php:843
+msgid "Update browser every xx seconds"
+msgstr "Actualitzar navegador cada xx segons"
+
+#: ../../mod/settings.php:843
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Mínim cada 10 segons, no hi ha màxim"
+
+#: ../../mod/settings.php:844
+msgid "Number of items to display per page:"
+msgstr "Número d'elements a mostrar per pàgina"
+
+#: ../../mod/settings.php:844 ../../mod/settings.php:845
+msgid "Maximum of 100 items"
+msgstr "Màxim de 100 elements"
+
+#: ../../mod/settings.php:845
+msgid "Number of items to display per page when viewed from mobile device:"
+msgstr "Nombre d'elements a veure per pàgina quan es vegin des d'un dispositiu mòbil:"
+
+#: ../../mod/settings.php:846
+msgid "Don't show emoticons"
+msgstr "No mostrar emoticons"
+
+#: ../../mod/settings.php:922
+msgid "Normal Account Page"
+msgstr "Pàgina Normal del Compte "
+
+#: ../../mod/settings.php:923
+msgid "This account is a normal personal profile"
+msgstr "Aques compte es un compte personal normal"
+
+#: ../../mod/settings.php:926
+msgid "Soapbox Page"
+msgstr "Pàgina de Soapbox"
+
+#: ../../mod/settings.php:927
+msgid "Automatically approve all connection/friend requests as read-only fans"
+msgstr "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de només lectura."
+
+#: ../../mod/settings.php:930
+msgid "Community Forum/Celebrity Account"
+msgstr "Compte de Comunitat/Celebritat"
+
+#: ../../mod/settings.php:931
+msgid ""
+"Automatically approve all connection/friend requests as read-write fans"
+msgstr "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de lectura-escriptura"
+
+#: ../../mod/settings.php:934
+msgid "Automatic Friend Page"
+msgstr "Compte d'Amistat Automàtica"
+
+#: ../../mod/settings.php:935
+msgid "Automatically approve all connection/friend requests as friends"
+msgstr "Aprova totes les sol·licituds de amistat/connexió com a amic automàticament"
+
+#: ../../mod/settings.php:938
+msgid "Private Forum [Experimental]"
+msgstr "Fòrum Privat [Experimental]"
+
+#: ../../mod/settings.php:939
+msgid "Private forum - approved members only"
+msgstr "Fòrum privat - Només membres aprovats"
+
+#: ../../mod/settings.php:951
+msgid "OpenID:"
+msgstr "OpenID:"
+
+#: ../../mod/settings.php:951
+msgid "(Optional) Allow this OpenID to login to this account."
+msgstr "(Opcional) Permetre a aquest OpenID iniciar sessió en aquest compte."
+
+#: ../../mod/settings.php:961
+msgid "Publish your default profile in your local site directory?"
+msgstr "Publicar el teu perfil predeterminat en el directori del lloc local?"
+
+#: ../../mod/settings.php:967
+msgid "Publish your default profile in the global social directory?"
+msgstr "Publicar el teu perfil predeterminat al directori social global?"
+
+#: ../../mod/settings.php:975
+msgid "Hide your contact/friend list from viewers of your default profile?"
+msgstr "Amaga la teva llista de contactes/amics dels espectadors del seu perfil per defecte?"
+
+#: ../../mod/settings.php:979
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Amagar els detalls del seu perfil a espectadors desconeguts?"
+
+#: ../../mod/settings.php:984
+msgid "Allow friends to post to your profile page?"
+msgstr "Permet als amics publicar en la seva pàgina de perfil?"
+
+#: ../../mod/settings.php:990
+msgid "Allow friends to tag your posts?"
+msgstr "Permet als amics d'etiquetar els teus missatges?"
+
+#: ../../mod/settings.php:996
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Permeteu-nos suggerir-li com un amic potencial dels nous membres?"
+
+#: ../../mod/settings.php:1002
+msgid "Permit unknown people to send you private mail?"
+msgstr "Permetre a desconeguts enviar missatges al teu correu privat?"
+
+#: ../../mod/settings.php:1010
+msgid "Profile is <strong>not published</strong>."
+msgstr "El  Perfil <strong>no està publicat</strong>."
+
+#: ../../mod/settings.php:1013 ../../mod/profile_photo.php:248
+msgid "or"
+msgstr "o"
+
+#: ../../mod/settings.php:1018
+msgid "Your Identity Address is"
+msgstr "La seva Adreça d'Identitat és"
+
+#: ../../mod/settings.php:1029
+msgid "Automatically expire posts after this many days:"
+msgstr "Després de aquests nombre de dies, els missatges caduquen automàticament:"
+
+#: ../../mod/settings.php:1029
+msgid "If empty, posts will not expire. Expired posts will be deleted"
+msgstr "Si està buit, els missatges no caducarà. Missatges caducats s'eliminaran"
+
+#: ../../mod/settings.php:1030
+msgid "Advanced expiration settings"
+msgstr "Configuració avançada d'expiració"
+
+#: ../../mod/settings.php:1031
+msgid "Advanced Expiration"
+msgstr "Expiració Avançada"
+
+#: ../../mod/settings.php:1032
+msgid "Expire posts:"
+msgstr "Expiració d'enviaments"
+
+#: ../../mod/settings.php:1033
+msgid "Expire personal notes:"
+msgstr "Expiració de notes personals"
+
+#: ../../mod/settings.php:1034
+msgid "Expire starred posts:"
+msgstr "Expiració de enviaments de favorits"
+
+#: ../../mod/settings.php:1035
+msgid "Expire photos:"
+msgstr "Expiració de fotos"
+
+#: ../../mod/settings.php:1036
+msgid "Only expire posts by others:"
+msgstr "Només expiren els enviaments dels altres:"
+
+#: ../../mod/settings.php:1062
+msgid "Account Settings"
+msgstr "Ajustos de Compte"
+
+#: ../../mod/settings.php:1070
+msgid "Password Settings"
+msgstr "Ajustos de Contrasenya"
+
+#: ../../mod/settings.php:1071
+msgid "New Password:"
+msgstr "Nova Contrasenya:"
+
+#: ../../mod/settings.php:1072
+msgid "Confirm:"
+msgstr "Confirmar:"
+
+#: ../../mod/settings.php:1072
+msgid "Leave password fields blank unless changing"
+msgstr "Deixi els camps de contrasenya buits per a no fer canvis"
+
+#: ../../mod/settings.php:1073
+msgid "Current Password:"
+msgstr "Contrasenya Actual:"
+
+#: ../../mod/settings.php:1073 ../../mod/settings.php:1074
+msgid "Your current password to confirm the changes"
+msgstr "La teva actual contrasenya a fi de confirmar els canvis"
+
+#: ../../mod/settings.php:1074
+msgid "Password:"
+msgstr "Contrasenya:"
+
+#: ../../mod/settings.php:1078
+msgid "Basic Settings"
+msgstr "Ajustos Basics"
+
+#: ../../mod/settings.php:1080
+msgid "Email Address:"
+msgstr "Adreça de Correu:"
+
+#: ../../mod/settings.php:1081
+msgid "Your Timezone:"
+msgstr "La teva zona Horària:"
+
+#: ../../mod/settings.php:1082
+msgid "Default Post Location:"
+msgstr "Localització per Defecte del Missatge:"
+
+#: ../../mod/settings.php:1083
+msgid "Use Browser Location:"
+msgstr "Ubicar-se amb el Navegador:"
+
+#: ../../mod/settings.php:1086
+msgid "Security and Privacy Settings"
+msgstr "Ajustos de Seguretat i Privacitat"
+
+#: ../../mod/settings.php:1088
+msgid "Maximum Friend Requests/Day:"
+msgstr "Nombre Màxim de Sol·licituds per Dia"
+
+#: ../../mod/settings.php:1088 ../../mod/settings.php:1118
+msgid "(to prevent spam abuse)"
+msgstr "(per a prevenir abusos de spam)"
+
+#: ../../mod/settings.php:1089
+msgid "Default Post Permissions"
+msgstr "Permisos de Correu per Defecte"
+
+#: ../../mod/settings.php:1090
+msgid "(click to open/close)"
+msgstr "(clicar per a obrir/tancar)"
+
+#: ../../mod/settings.php:1099 ../../mod/photos.php:1140
+#: ../../mod/photos.php:1506
+msgid "Show to Groups"
+msgstr "Mostrar en Grups"
+
+#: ../../mod/settings.php:1100 ../../mod/photos.php:1141
+#: ../../mod/photos.php:1507
+msgid "Show to Contacts"
+msgstr "Mostrar a Contactes"
+
+#: ../../mod/settings.php:1101
+msgid "Default Private Post"
+msgstr "Missatges Privats Per Defecte"
+
+#: ../../mod/settings.php:1102
+msgid "Default Public Post"
+msgstr "Missatges Públics Per Defecte"
+
+#: ../../mod/settings.php:1106
+msgid "Default Permissions for New Posts"
+msgstr "Permisos Per Defecte per a Nous Missatges"
+
+#: ../../mod/settings.php:1118
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Màxim nombre de missatges, per dia, de desconeguts:"
+
+#: ../../mod/settings.php:1121
+msgid "Notification Settings"
+msgstr "Ajustos de Notificació"
+
+#: ../../mod/settings.php:1122
+msgid "By default post a status message when:"
+msgstr "Enviar per defecte un missatge de estatus quan:"
+
+#: ../../mod/settings.php:1123
+msgid "accepting a friend request"
+msgstr "Acceptar una sol·licitud d'amistat"
+
+#: ../../mod/settings.php:1124
+msgid "joining a forum/community"
+msgstr "Unint-se a un fòrum/comunitat"
+
+#: ../../mod/settings.php:1125
+msgid "making an <em>interesting</em> profile change"
+msgstr "fent un <em interesant</em> canvi al perfil"
+
+#: ../../mod/settings.php:1126
+msgid "Send a notification email when:"
+msgstr "Envia un correu notificant quan:"
+
+#: ../../mod/settings.php:1127
+msgid "You receive an introduction"
+msgstr "Has rebut una presentació"
+
+#: ../../mod/settings.php:1128
+msgid "Your introductions are confirmed"
+msgstr "La teva presentació està confirmada"
+
+#: ../../mod/settings.php:1129
+msgid "Someone writes on your profile wall"
+msgstr "Algú ha escrit en el teu mur de perfil"
+
+#: ../../mod/settings.php:1130
+msgid "Someone writes a followup comment"
+msgstr "Algú ha escrit un comentari de seguiment"
+
+#: ../../mod/settings.php:1131
+msgid "You receive a private message"
+msgstr "Has rebut un missatge privat"
+
+#: ../../mod/settings.php:1132
+msgid "You receive a friend suggestion"
+msgstr "Has rebut una suggerencia d'un amic"
+
+#: ../../mod/settings.php:1133
+msgid "You are tagged in a post"
+msgstr "Estàs etiquetat en un enviament"
+
+#: ../../mod/settings.php:1134
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Has estat Atiat/punxat/etc, en un enviament"
+
+#: ../../mod/settings.php:1137
+msgid "Advanced Account/Page Type Settings"
+msgstr "Ajustos Avançats de Compte/ Pàgina"
+
+#: ../../mod/settings.php:1138
+msgid "Change the behaviour of this account for special situations"
+msgstr "Canviar el comportament d'aquest compte en situacions especials"
+
+#: ../../mod/share.php:44
+msgid "link"
+msgstr "enllaç"
+
+#: ../../mod/crepair.php:102
+msgid "Contact settings applied."
+msgstr "Ajustos de Contacte aplicats."
+
+#: ../../mod/crepair.php:104
+msgid "Contact update failed."
+msgstr "Fracassà l'actualització de Contacte"
+
+#: ../../mod/crepair.php:129 ../../mod/dfrn_confirm.php:118
+#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+msgid "Contact not found."
+msgstr "Contacte no trobat"
+
+#: ../../mod/crepair.php:135
+msgid "Repair Contact Settings"
+msgstr "Reposar els ajustos de Contacte"
+
+#: ../../mod/crepair.php:137
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
+" information your communications with this contact may stop working."
+msgstr "<strong>ADVERTÈNCIA: Això és molt avançat </strong> i si s'introdueix informació incorrecta la seva comunicació amb aquest contacte pot deixar de funcionar."
+
+#: ../../mod/crepair.php:138
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
+msgstr "Si us plau, prem el botó 'Tornar' <strong>ara</strong> si no saps segur que has de fer aqui."
+
+#: ../../mod/crepair.php:144
+msgid "Return to contact editor"
+msgstr "Tornar al editor de contactes"
+
+#: ../../mod/crepair.php:149
+msgid "Account Nickname"
+msgstr "Àlies del Compte"
+
+#: ../../mod/crepair.php:150
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@Tagname - té prel·lació sobre Nom/Àlies"
+
+#: ../../mod/crepair.php:151
+msgid "Account URL"
+msgstr "Adreça URL del Compte"
+
+#: ../../mod/crepair.php:152
+msgid "Friend Request URL"
+msgstr "Adreça URL de sol·licitud d'Amistat"
+
+#: ../../mod/crepair.php:153
+msgid "Friend Confirm URL"
+msgstr "Adreça URL de confirmació d'Amic"
+
+#: ../../mod/crepair.php:154
+msgid "Notification Endpoint URL"
+msgstr "Adreça URL de Notificació"
+
+#: ../../mod/crepair.php:155
+msgid "Poll/Feed URL"
+msgstr "Adreça de Enquesta/Alimentador"
+
+#: ../../mod/crepair.php:156
+msgid "New photo from this URL"
+msgstr "Nova foto d'aquesta URL"
+
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr "No es troben pàgines potencialment delegades."
+
+#: ../../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 "Els delegats poden gestionar tots els aspectes d'aquest compte/pàgina, excepte per als ajustaments bàsics del compte. Si us plau, no deleguin el seu compte personal a ningú que no confiïn completament."
+
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
+msgstr "Actuals Administradors de Pàgina"
+
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr "Actuals Delegats de Pàgina"
+
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Delegats Potencials"
+
+#: ../../mod/delegate.php:130 ../../mod/tagrm.php:93
+msgid "Remove"
+msgstr "Esborrar"
+
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Afegir"
+
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Sense entrades"
+
+#: ../../mod/poke.php:192
+msgid "Poke/Prod"
+msgstr "Atia/Punxa"
+
+#: ../../mod/poke.php:193
+msgid "poke, prod or do other things to somebody"
+msgstr "Atiar, punxar o fer altres coses a algú"
+
+#: ../../mod/poke.php:194
+msgid "Recipient"
+msgstr "Recipient"
+
+#: ../../mod/poke.php:195
+msgid "Choose what you wish to do to recipient"
+msgstr "Tria que vols fer amb el contenidor"
+
+#: ../../mod/poke.php:198
+msgid "Make this post private"
+msgstr "Fes aquest missatge privat"
+
+#: ../../mod/dfrn_confirm.php:119
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "Això pot ocorre ocasionalment si el contacte fa una petició per ambdues persones i ja han estat aprovades."
+
+#: ../../mod/dfrn_confirm.php:237
+msgid "Response from remote site was not understood."
+msgstr "La resposta des del lloc remot no s'entenia."
+
+#: ../../mod/dfrn_confirm.php:246
+msgid "Unexpected response from remote site: "
+msgstr "Resposta inesperada de lloc remot:"
+
+#: ../../mod/dfrn_confirm.php:254
+msgid "Confirmation completed successfully."
+msgstr "La confirmació s'ha completat correctament."
+
+#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
+#: ../../mod/dfrn_confirm.php:277
+msgid "Remote site reported: "
+msgstr "El lloc remot informa:"
+
+#: ../../mod/dfrn_confirm.php:268
+msgid "Temporary failure. Please wait and try again."
+msgstr "Fallada temporal. Si us plau, espereu i torneu a intentar."
+
+#: ../../mod/dfrn_confirm.php:275
+msgid "Introduction failed or was revoked."
+msgstr "La presentació va fallar o va ser revocada."
+
+#: ../../mod/dfrn_confirm.php:420
+msgid "Unable to set contact photo."
+msgstr "No es pot canviar la foto de contacte."
+
+#: ../../mod/dfrn_confirm.php:562
+#, php-format
+msgid "No user record found for '%s' "
+msgstr "No es troben registres d'usuari per a '%s'"
+
+#: ../../mod/dfrn_confirm.php:572
+msgid "Our site encryption key is apparently messed up."
+msgstr "La nostra clau de xifrat del lloc pel que sembla en mal estat."
+
+#: ../../mod/dfrn_confirm.php:583
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr "Es va proporcionar una URL del lloc buida o la URL no va poder ser desxifrada per nosaltres."
+
+#: ../../mod/dfrn_confirm.php:604
+msgid "Contact record was not found for you on our site."
+msgstr "No s'han trobat registres del contacte al nostre lloc."
+
+#: ../../mod/dfrn_confirm.php:618
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr "la clau pública del lloc no disponible en les dades del contacte per URL %s."
+
+#: ../../mod/dfrn_confirm.php:638
+msgid ""
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
+msgstr "La ID proporcionada pel seu sistema és un duplicat en el nostre sistema. Hauria de treballar si intenta de nou."
+
+#: ../../mod/dfrn_confirm.php:649
+msgid "Unable to set your contact credentials on our system."
+msgstr "No es pot canviar les seves credencials de contacte en el nostre sistema."
+
+#: ../../mod/dfrn_confirm.php:716
+msgid "Unable to update your contact profile details on our system"
+msgstr "No es pot actualitzar els detalls del seu perfil de contacte en el nostre sistema"
+
+#: ../../mod/dfrn_confirm.php:751
+#, php-format
+msgid "Connection accepted at %s"
+msgstr "Connexió acceptada en %s"
+
+#: ../../mod/dfrn_confirm.php:800
+#, php-format
+msgid "%1$s has joined %2$s"
+msgstr "%1$s s'ha unit a  %2$s"
+
+#: ../../mod/dfrn_poll.php:103 ../../mod/dfrn_poll.php:536
+#, php-format
+msgid "%1$s welcomes %2$s"
+msgstr "%1$s benvingut %2$s"
+
+#: ../../mod/dfrn_request.php:93
+msgid "This introduction has already been accepted."
+msgstr "Aquesta presentació ha estat acceptada."
+
+#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:513
+msgid "Profile location is not valid or does not contain profile information."
+msgstr "El perfil de situació no és vàlid o no contè informació de perfil"
+
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:518
+msgid "Warning: profile location has no identifiable owner name."
+msgstr "Atenció: El perfil de situació no te nom de propietari identificable."
+
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:520
+msgid "Warning: profile location has no profile photo."
+msgstr "Atenció: El perfil de situació no te foto de perfil"
+
+#: ../../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"
+msgstr[0] "%d el paràmetre requerit no es va trobar al lloc indicat"
+msgstr[1] "%d els paràmetres requerits no es van trobar allloc indicat"
+
+#: ../../mod/dfrn_request.php:170
+msgid "Introduction complete."
+msgstr "Completada la presentació."
+
+#: ../../mod/dfrn_request.php:209
+msgid "Unrecoverable protocol error."
+msgstr "Error de protocol irrecuperable."
+
+#: ../../mod/dfrn_request.php:237
+msgid "Profile unavailable."
+msgstr "Perfil no disponible"
+
+#: ../../mod/dfrn_request.php:262
+#, php-format
+msgid "%s has received too many connection requests today."
+msgstr "%s avui ha rebut excesives peticions de connexió. "
+
+#: ../../mod/dfrn_request.php:263
+msgid "Spam protection measures have been invoked."
+msgstr "Mesures de protecció contra spam han estat invocades."
+
+#: ../../mod/dfrn_request.php:264
+msgid "Friends are advised to please try again in 24 hours."
+msgstr "S'aconsellà els amics que probin pasades 24 hores."
+
+#: ../../mod/dfrn_request.php:326
+msgid "Invalid locator"
+msgstr "Localitzador no vàlid"
+
+#: ../../mod/dfrn_request.php:335
+msgid "Invalid email address."
+msgstr "Adreça de correu no vàlida."
+
+#: ../../mod/dfrn_request.php:362
+msgid "This account has not been configured for email. Request failed."
+msgstr "Aquest compte no s'ha configurat per al correu electrònic. Ha fallat la sol·licitud."
+
+#: ../../mod/dfrn_request.php:458
+msgid "Unable to resolve your name at the provided location."
+msgstr "Incapaç de resoldre el teu nom al lloc facilitat."
+
+#: ../../mod/dfrn_request.php:471
+msgid "You have already introduced yourself here."
+msgstr "Has fer la teva presentació aquí."
+
+#: ../../mod/dfrn_request.php:475
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr "Aparentment, ja tens amistat amb %s"
+
+#: ../../mod/dfrn_request.php:496
+msgid "Invalid profile URL."
+msgstr "Perfil URL no vàlid."
+
+#: ../../mod/dfrn_request.php:592
+msgid "Your introduction has been sent."
+msgstr "La teva presentació ha estat enviada."
+
+#: ../../mod/dfrn_request.php:645
+msgid "Please login to confirm introduction."
+msgstr "Si us plau, entri per confirmar la presentació."
+
+#: ../../mod/dfrn_request.php:659
+msgid ""
+"Incorrect identity currently logged in. Please login to "
+"<strong>this</strong> profile."
+msgstr "Sesió iniciada amb la identificació incorrecta. Entra en <strong>aquest</strong> perfil."
+
+#: ../../mod/dfrn_request.php:670
+msgid "Hide this contact"
+msgstr "Amaga aquest contacte"
+
+#: ../../mod/dfrn_request.php:673
+#, php-format
+msgid "Welcome home %s."
+msgstr "Benvingut de nou %s"
+
+#: ../../mod/dfrn_request.php:674
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr "Si us plau, confirmi la seva sol·licitud de Presentació/Amistat a %s."
+
+#: ../../mod/dfrn_request.php:675
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: ../../mod/dfrn_request.php:811
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
+msgstr "Si us plau, introdueixi la seva \"Adreça Identificativa\" d'una de les següents xarxes socials suportades:"
+
+#: ../../mod/dfrn_request.php:827
+msgid "<strike>Connect as an email follower</strike> (Coming soon)"
+msgstr "<strike>Connectar com un seguidor de correu</strike> (Disponible aviat)"
+
+#: ../../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 "Si encara no ets membre de la web social lliure, <a href=\"http://dir.friendica.com/siteinfo\">segueix aquest enllaç per a trobar un lloc Friendica públic i uneix-te  avui</a>."
+
+#: ../../mod/dfrn_request.php:832
+msgid "Friend/Connection Request"
+msgstr "Sol·licitud d'Amistat"
+
+#: ../../mod/dfrn_request.php:833
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@identi.ca"
+msgstr "Exemples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
+
+#: ../../mod/dfrn_request.php:834
+msgid "Please answer the following:"
+msgstr "Si us plau, contesti les següents preguntes:"
+
+#: ../../mod/dfrn_request.php:835
+#, php-format
+msgid "Does %s know you?"
+msgstr "%s et coneix?"
+
+#: ../../mod/dfrn_request.php:838
+msgid "Add a personal note:"
+msgstr "Afegir una nota personal:"
+
+#: ../../mod/dfrn_request.php:841
+msgid "StatusNet/Federated Social Web"
+msgstr "Web Social StatusNet/Federated "
+
+#: ../../mod/dfrn_request.php:843
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search"
+" bar."
+msgstr " - per favor no utilitzi aquest formulari.  Al contrari, entra %s en la barra de cerques de Diaspora."
+
+#: ../../mod/dfrn_request.php:844
+msgid "Your Identity Address:"
+msgstr "La Teva Adreça Identificativa:"
+
+#: ../../mod/dfrn_request.php:847
+msgid "Submit Request"
+msgstr "Sol·licitud Enviada"
+
+#: ../../mod/subthread.php:103
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s esta seguint %2$s de %3$s"
+
+#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
+msgid "Global Directory"
+msgstr "Directori Global"
+
+#: ../../mod/directory.php:57
+msgid "Find on this site"
+msgstr "Trobat en aquest lloc"
+
+#: ../../mod/directory.php:60
+msgid "Site Directory"
+msgstr "Directori Local"
+
+#: ../../mod/directory.php:114
+msgid "Gender: "
+msgstr "Gènere:"
+
+#: ../../mod/directory.php:187
+msgid "No entries (some entries may be hidden)."
+msgstr "No hi ha entrades (algunes de les entrades poden estar amagades)."
+
+#: ../../mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
+msgstr "Realment vols esborrar aquest suggeriment?"
+
+#: ../../mod/suggest.php:72
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Cap suggeriment disponible. Si això és un nou lloc, si us plau torna a intentar en 24 hores."
+
+#: ../../mod/suggest.php:90
+msgid "Ignore/Hide"
+msgstr "Ignorar/Amagar"
+
+#: ../../mod/dirfind.php:26
+msgid "People Search"
+msgstr "Cercant Gent"
+
+#: ../../mod/dirfind.php:60 ../../mod/match.php:65
+msgid "No matches"
+msgstr "No hi ha coincidències"
+
+#: ../../mod/videos.php:125
+msgid "No videos selected"
+msgstr "No s'han seleccionat vídeos "
+
+#: ../../mod/videos.php:226 ../../mod/photos.php:1025
+msgid "Access to this item is restricted."
+msgstr "L'accés a aquest element està restringit."
+
+#: ../../mod/videos.php:308 ../../mod/photos.php:1784
+msgid "View Album"
+msgstr "Veure Àlbum"
+
+#: ../../mod/videos.php:317
+msgid "Recent Videos"
+msgstr "Videos Recents"
+
+#: ../../mod/videos.php:319
+msgid "Upload New Videos"
+msgstr "Carrega Nous Videos"
+
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr "Etiqueta eliminada"
+
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr "Esborrar etiqueta del element"
+
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr "Selecciona etiqueta a esborrar:"
+
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
+msgstr "Element no trobat"
+
+#: ../../mod/editpost.php:39
+msgid "Edit post"
+msgstr "Editar Enviament"
+
+#: ../../mod/events.php:66
+msgid "Event title and start time are required."
+msgstr "Títol d'esdeveniment i hora d'inici requerits."
+
+#: ../../mod/events.php:291
+msgid "l, F j"
+msgstr "l, F j"
+
+#: ../../mod/events.php:313
+msgid "Edit event"
+msgstr "Editar esdeveniment"
+
+#: ../../mod/events.php:371
+msgid "Create New Event"
+msgstr "Crear un nou esdeveniment"
+
+#: ../../mod/events.php:372
+msgid "Previous"
+msgstr "Previ"
+
+#: ../../mod/events.php:373 ../../mod/install.php:207
+msgid "Next"
+msgstr "Següent"
+
+#: ../../mod/events.php:446
+msgid "hour:minute"
+msgstr "hora:minut"
+
+#: ../../mod/events.php:456
+msgid "Event details"
+msgstr "Detalls del esdeveniment"
+
+#: ../../mod/events.php:457
+#, php-format
+msgid "Format is %s %s. Starting date and Title are required."
+msgstr "El Format és %s %s. Data d'inici i títol requerits."
+
+#: ../../mod/events.php:459
+msgid "Event Starts:"
+msgstr "Inici d'Esdeveniment:"
+
+#: ../../mod/events.php:459 ../../mod/events.php:473
+msgid "Required"
+msgstr "Requerit"
+
+#: ../../mod/events.php:462
+msgid "Finish date/time is not known or not relevant"
+msgstr "La data/hora de finalització no es coneixen o no són relevants"
+
+#: ../../mod/events.php:464
+msgid "Event Finishes:"
+msgstr "L'esdeveniment Finalitza:"
+
+#: ../../mod/events.php:467
+msgid "Adjust for viewer timezone"
+msgstr "Ajustar a la zona horaria de l'espectador"
+
+#: ../../mod/events.php:469
+msgid "Description:"
+msgstr "Descripció:"
+
+#: ../../mod/events.php:473
+msgid "Title:"
+msgstr "Títol:"
+
+#: ../../mod/events.php:475
+msgid "Share this event"
+msgstr "Compartir aquest esdeveniment"
+
+#: ../../mod/fbrowser.php:113
+msgid "Files"
+msgstr "Arxius"
+
+#: ../../mod/uexport.php:72
+msgid "Export account"
+msgstr "Exportar compte"
+
+#: ../../mod/uexport.php:72
+msgid ""
+"Export your account info and contacts. Use this to make a backup of your "
+"account and/or to move it to another server."
+msgstr "Exportar la teva informació del compte i de contactes. Empra això per fer una còpia de seguretat del teu compte i/o moure'l cap altre servidor. "
+
+#: ../../mod/uexport.php:73
+msgid "Export all"
+msgstr "Exportar tot"
+
+#: ../../mod/uexport.php:73
+msgid ""
+"Export your accout info, contacts and all your items as json. Could be a "
+"very big file, and could take a lot of time. Use this to make a full backup "
+"of your account (photos are not exported)"
+msgstr "Exportar la teva informació de compte, contactes i tots els teus articles com a json. Pot ser un fitxer molt gran, i pot trigar molt temps. Empra això per fer una còpia de seguretat total del teu compte (les fotos no s'exporten)"
+
+#: ../../mod/filer.php:30
+msgid "- select -"
+msgstr "- seleccionar -"
+
+#: ../../mod/uimport.php:64
+msgid "Import"
+msgstr "Importar"
+
+#: ../../mod/uimport.php:66
+msgid "Move account"
+msgstr "Moure el compte"
+
+#: ../../mod/uimport.php:67
+msgid "You can import an account from another Friendica server."
+msgstr "Pots importar un compte d'un altre servidor Friendica"
+
+#: ../../mod/uimport.php:68
+msgid ""
+"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 "Es necessari que exportis el teu compte de l'antic servidor i el pugis a aquest. Recrearem el teu antic compte aquí amb tots els teus contactes. Intentarem també informar als teus amics que t'has traslladat aquí."
+
+#: ../../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 "Aquesta característica es experimental. Podem importar els teus contactes de la xarxa OStatus (status/identi.ca) o de Diaspora"
+
+#: ../../mod/uimport.php:70
+msgid "Account file"
+msgstr "Arxiu del compte"
+
+#: ../../mod/uimport.php:70
+msgid ""
+"To export your accont, go to \"Settings->Export your porsonal data\" and "
+"select \"Export account\""
+msgstr "Per exportar el teu compte, ves a \"Ajustos->Exportar les teves dades personals\" i sel·lecciona \"Exportar compte\""
+
+#: ../../mod/update_community.php:18 ../../mod/update_display.php:22
+#: ../../mod/update_network.php:22 ../../mod/update_notes.php:41
+#: ../../mod/update_profile.php:41
+msgid "[Embedded content - reload page to view]"
+msgstr "[Contingut embegut - recarrega la pàgina per a veure-ho]"
+
+#: ../../mod/follow.php:27
+msgid "Contact added"
+msgstr "Contacte afegit"
+
+#: ../../mod/friendica.php:55
+msgid "This is Friendica, version"
+msgstr "Això és Friendica, versió"
+
+#: ../../mod/friendica.php:56
+msgid "running at web location"
+msgstr "funcionant en la ubicació web"
+
+#: ../../mod/friendica.php:58
+msgid ""
+"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
+"more about the Friendica project."
+msgstr "Si us plau, visiteu <a href=\"http://friendica.com\">Friendica.com</a> per obtenir més informació sobre el projecte Friendica."
+
+#: ../../mod/friendica.php:60
+msgid "Bug reports and issues: please visit"
+msgstr "Pels informes d'error i problemes: si us plau, visiteu"
+
+#: ../../mod/friendica.php:61
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
+msgstr "Suggeriments, elogis, donacions, etc si us plau escrigui a \"Info\" en Friendica - dot com"
+
+#: ../../mod/friendica.php:75
+msgid "Installed plugins/addons/apps:"
+msgstr "plugins/addons/apps instal·lats:"
+
+#: ../../mod/friendica.php:88
+msgid "No installed plugins/addons/apps"
+msgstr "plugins/addons/apps no instal·lats"
+
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
+msgstr "Enviat suggeriment d'amic."
+
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
+msgstr "Suggerir Amics"
+
+#: ../../mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Suggerir un amic per a %s"
+
+#: ../../mod/group.php:29
+msgid "Group created."
+msgstr "Grup creat."
+
+#: ../../mod/group.php:35
+msgid "Could not create group."
+msgstr "No puc crear grup."
+
+#: ../../mod/group.php:47 ../../mod/group.php:140
+msgid "Group not found."
+msgstr "Grup no trobat"
+
+#: ../../mod/group.php:60
+msgid "Group name changed."
+msgstr "Nom de Grup canviat."
+
+#: ../../mod/group.php:93
+msgid "Create a group of contacts/friends."
+msgstr "Crear un grup de contactes/amics."
+
+#: ../../mod/group.php:94 ../../mod/group.php:180
+msgid "Group Name: "
+msgstr "Nom del Grup:"
+
+#: ../../mod/group.php:113
+msgid "Group removed."
+msgstr "Grup esborrat."
+
+#: ../../mod/group.php:115
+msgid "Unable to remove group."
+msgstr "Incapaç de esborrar Grup."
+
+#: ../../mod/group.php:179
+msgid "Group Editor"
+msgstr "Editor de Grup:"
+
+#: ../../mod/group.php:192
+msgid "Members"
+msgstr "Membres"
+
+#: ../../mod/hcard.php:10
+msgid "No profile"
+msgstr "Sense perfil"
+
+#: ../../mod/help.php:79
+msgid "Help:"
+msgstr "Ajuda:"
+
+#: ../../mod/help.php:90 ../../index.php:231
+msgid "Not Found"
+msgstr "No trobat"
+
+#: ../../mod/help.php:93 ../../index.php:234
+msgid "Page not found."
+msgstr "Pàgina no trobada."
+
+#: ../../mod/viewcontacts.php:39
+msgid "No contacts."
+msgstr "Sense Contactes"
+
+#: ../../mod/home.php:34
+#, php-format
+msgid "Welcome to %s"
+msgstr "Benvingut a %s"
+
+#: ../../mod/viewsrc.php:7
+msgid "Access denied."
+msgstr "Accés denegat."
+
+#: ../../mod/wall_attach.php:69
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "L'arxiu excedeix la mida límit de %d"
+
+#: ../../mod/wall_attach.php:110 ../../mod/wall_attach.php:121
+msgid "File upload failed."
+msgstr "La càrrega de fitxers ha fallat."
+
+#: ../../mod/wall_upload.php:90 ../../mod/profile_photo.php:144
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr "La imatge sobrepassa el límit de mida de %d"
+
+#: ../../mod/wall_upload.php:112 ../../mod/photos.php:801
+#: ../../mod/profile_photo.php:153
+msgid "Unable to process image."
+msgstr "Incapaç de processar la imatge."
+
+#: ../../mod/wall_upload.php:138 ../../mod/photos.php:828
+#: ../../mod/profile_photo.php:301
+msgid "Image upload failed."
+msgstr "Actualització de la imatge fracassada."
+
+#: ../../mod/invite.php:27
+msgid "Total invitation limit exceeded."
+msgstr "Limit d'invitacions excedit."
+
+#: ../../mod/invite.php:49
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : No es una adreça de correu vàlida"
+
+#: ../../mod/invite.php:73
+msgid "Please join us on Friendica"
+msgstr "Per favor, uneixi's a nosaltres en Friendica"
+
+#: ../../mod/invite.php:84
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Limit d'invitacions excedit. Per favor, Contacti amb l'administrador del lloc."
+
+#: ../../mod/invite.php:89
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Ha fallat l'entrega del missatge."
+
+#: ../../mod/invite.php:93
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d missatge enviat"
+msgstr[1] "%d missatges enviats."
+
+#: ../../mod/invite.php:112
+msgid "You have no more invitations available"
+msgstr "No te més invitacions disponibles"
+
+#: ../../mod/invite.php:120
+#, php-format
+msgid ""
+"Visit %s for a list of public sites that you can join. Friendica members on "
+"other sites can all connect with each other, as well as with members of many"
+" other social networks."
+msgstr "Visita %s per a una llista de llocs públics on unir-te. Els membres de Friendica d'altres llocs poden connectar-se de forma total, així com amb membres de moltes altres xarxes socials."
+
+#: ../../mod/invite.php:122
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr "Per acceptar aquesta invitació, per favor visita i registra't a %s o en qualsevol altre pàgina web pública Friendica."
+
+#: ../../mod/invite.php:123
+#, php-format
+msgid ""
+"Friendica sites all inter-connect to create a huge privacy-enhanced social "
+"web that is owned and controlled by its members. They can also connect with "
+"many traditional social networks. See %s for a list of alternate Friendica "
+"sites you can join."
+msgstr "Tots els llocs Friendica estàn interconnectats per crear una web social amb privacitat millorada, controlada i propietat dels seus membres. També poden connectar amb moltes xarxes socials tradicionals. Consulteu %s per a una llista de llocs de Friendica alternatius en que pot inscriure's."
+
+#: ../../mod/invite.php:126
+msgid ""
+"Our apologies. This system is not currently configured to connect with other"
+" public sites or invite members."
+msgstr "Nostres disculpes. Aquest sistema no està configurat actualment per connectar amb altres llocs públics o convidar als membres."
+
+#: ../../mod/invite.php:132
+msgid "Send invitations"
+msgstr "Enviant Invitacions"
+
+#: ../../mod/invite.php:133
+msgid "Enter email addresses, one per line:"
+msgstr "Entri adreçes de correu, una per línia:"
+
+#: ../../mod/invite.php:134 ../../mod/wallmessage.php:151
+#: ../../mod/message.php:329 ../../mod/message.php:558
+msgid "Your message:"
+msgstr "El teu missatge:"
+
+#: ../../mod/invite.php:135
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
+msgstr "Estàs cordialment convidat a ajuntarte a mi i altres amics propers en Friendica - i ajudar-nos a crear una millor web social."
+
+#: ../../mod/invite.php:137
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr "Vostè haurà de proporcionar aquest codi d'invitació: $invite_code"
+
+#: ../../mod/invite.php:137
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr "Un cop registrat, si us plau contactar amb mi a través de la meva pàgina de perfil a:"
+
+#: ../../mod/invite.php:139
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendica.com"
+msgstr "Per a més informació sobre el projecte Friendica i perque creiem que això es important, per favor, visita http://friendica.com"
+
+#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Nombre diari de missatges al mur per %s excedit. El missatge ha fallat."
+
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:63
+msgid "No recipient selected."
+msgstr "No s'ha seleccionat destinatari."
+
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr "Incapaç de comprovar la localització."
+
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:70
+msgid "Message could not be sent."
+msgstr "El Missatge no ha estat enviat."
+
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:73
+msgid "Message collection failure."
+msgstr "Ha fallat la recollida del missatge."
+
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:76
+msgid "Message sent."
+msgstr "Missatge enviat."
+
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
+msgstr "Sense destinatari."
+
+#: ../../mod/wallmessage.php:142 ../../mod/message.php:319
+msgid "Send Private Message"
+msgstr "Enviant Missatge Privat"
+
+#: ../../mod/wallmessage.php:143
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr "si vols respondre a %s, comprova que els ajustos de privacitat del lloc permeten correus privats de remitents desconeguts."
+
+#: ../../mod/wallmessage.php:144 ../../mod/message.php:320
+#: ../../mod/message.php:553
+msgid "To:"
+msgstr "Per a:"
+
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:325
+#: ../../mod/message.php:555
+msgid "Subject:"
+msgstr "Assumpte::"
+
+#: ../../mod/localtime.php:24
+msgid "Time Conversion"
+msgstr "Temps de Conversió"
+
+#: ../../mod/localtime.php:26
+msgid ""
+"Friendica provides this service for sharing events with other networks and "
+"friends in unknown timezones."
+msgstr "Friendica ofereix aquest servei per a compartir esdeveniments amb d'altres xarxes i amics en zones horaries que son desconegudes"
+
+#: ../../mod/localtime.php:30
+#, php-format
+msgid "UTC time: %s"
+msgstr "hora UTC: %s"
+
+#: ../../mod/localtime.php:33
+#, php-format
+msgid "Current timezone: %s"
+msgstr "Zona horària actual: %s"
+
+#: ../../mod/localtime.php:36
+#, php-format
+msgid "Converted localtime: %s"
+msgstr "Conversión de hora local: %s"
+
+#: ../../mod/localtime.php:41
+msgid "Please select your timezone:"
+msgstr "Si us plau, seleccioneu la vostra zona horària:"
+
+#: ../../mod/lockview.php:31 ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
+msgstr "Informació de privacitat remota no disponible."
+
+#: ../../mod/lockview.php:48
+msgid "Visible to:"
+msgstr "Visible per a:"
+
+#: ../../mod/lostpass.php:17
+msgid "No valid account found."
+msgstr "compte no vàlid trobat."
+
+#: ../../mod/lostpass.php:33
+msgid "Password reset request issued. Check your email."
+msgstr "Sol·licitut de restabliment de contrasenya enviat. Comprovi el seu correu."
+
+#: ../../mod/lostpass.php:44
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Contrasenya restablerta enviada a %s"
+
+#: ../../mod/lostpass.php:66
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "La sol·licitut no pot ser verificada. (Hauries de presentar-la abans). Restabliment de contrasenya fracassat."
+
+#: ../../mod/lostpass.php:84 ../../boot.php:1150
+msgid "Password Reset"
+msgstr "Restabliment de Contrasenya"
+
+#: ../../mod/lostpass.php:85
+msgid "Your password has been reset as requested."
+msgstr "La teva contrasenya fou restablerta com vas demanar."
+
+#: ../../mod/lostpass.php:86
+msgid "Your new password is"
+msgstr "La teva nova contrasenya es"
+
+#: ../../mod/lostpass.php:87
+msgid "Save or copy your new password - and then"
+msgstr "Guarda o copia la nova contrasenya - i llavors"
+
+#: ../../mod/lostpass.php:88
+msgid "click here to login"
+msgstr "clica aquí per identificarte"
+
+#: ../../mod/lostpass.php:89
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Pots camviar la contrasenya des de la pàgina de <em>Configuración</em> desprès d'accedir amb èxit."
+
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has been changed at %s"
+msgstr "La teva contrasenya ha estat canviada a %s"
+
+#: ../../mod/lostpass.php:122
+msgid "Forgot your Password?"
+msgstr "Has Oblidat la Contrasenya?"
+
+#: ../../mod/lostpass.php:123
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Introdueixi la seva adreça de correu i enivii-la per restablir la seva contrasenya. Llavors comprovi el seu correu per a les següents instruccións. "
+
+#: ../../mod/lostpass.php:124
+msgid "Nickname or Email: "
+msgstr "Àlies o Correu:"
+
+#: ../../mod/lostpass.php:125
+msgid "Reset"
+msgstr "Restablir"
+
+#: ../../mod/maintenance.php:5
+msgid "System down for maintenance"
+msgstr "Sistema apagat per manteniment"
+
+#: ../../mod/manage.php:106
+msgid "Manage Identities and/or Pages"
+msgstr "Administrar Identitats i/o  Pàgines"
+
+#: ../../mod/manage.php:107
+msgid ""
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
+msgstr "Alternar entre les diferents identitats o les pàgines de comunitats/grups que comparteixen les dades del seu compte o que se li ha concedit els permisos de \"administrar\""
+
+#: ../../mod/manage.php:108
+msgid "Select an identity to manage: "
+msgstr "Seleccionar identitat a administrar:"
+
+#: ../../mod/match.php:12
+msgid "Profile Match"
+msgstr "Perfil Aconseguit"
+
+#: ../../mod/match.php:20
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "No hi ha paraules clau que coincideixin. Si us plau, afegeixi paraules clau al teu perfil predeterminat."
+
+#: ../../mod/match.php:57
+msgid "is interested in:"
+msgstr "està interessat en:"
+
+#: ../../mod/message.php:67
+msgid "Unable to locate contact information."
+msgstr "No es pot trobar informació de contacte."
+
+#: ../../mod/message.php:207
+msgid "Do you really want to delete this message?"
+msgstr "Realment vols esborrar aquest missatge?"
+
+#: ../../mod/message.php:227
+msgid "Message deleted."
+msgstr "Missatge eliminat."
+
+#: ../../mod/message.php:258
+msgid "Conversation removed."
+msgstr "Conversació esborrada."
+
+#: ../../mod/message.php:371
+msgid "No messages."
+msgstr "Sense missatges."
+
+#: ../../mod/message.php:378
+#, php-format
+msgid "Unknown sender - %s"
+msgstr "remitent desconegut - %s"
+
+#: ../../mod/message.php:381
+#, php-format
+msgid "You and %s"
+msgstr "Tu i %s"
+
+#: ../../mod/message.php:384
+#, php-format
+msgid "%s and You"
+msgstr "%s i Tu"
+
+#: ../../mod/message.php:405 ../../mod/message.php:546
+msgid "Delete conversation"
+msgstr "Esborrar conversació"
+
+#: ../../mod/message.php:408
+msgid "D, d M Y - g:i A"
+msgstr "D, d M Y - g:i A"
+
+#: ../../mod/message.php:411
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d missatge"
+msgstr[1] "%d missatges"
+
+#: ../../mod/message.php:450
+msgid "Message not available."
+msgstr "Missatge no disponible."
+
+#: ../../mod/message.php:520
+msgid "Delete message"
+msgstr "Esborra missatge"
+
+#: ../../mod/message.php:548
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Comunicacions degures no disponibles. Tú <strong>pots</strong> respondre des de la pàgina de perfil del remitent."
+
+#: ../../mod/message.php:552
+msgid "Send Reply"
+msgstr "Enviar Resposta"
+
+#: ../../mod/mood.php:133
+msgid "Mood"
+msgstr "Humor"
+
+#: ../../mod/mood.php:134
+msgid "Set your current mood and tell your friends"
+msgstr "Ajusta el teu actual estat d'ànim i comenta-ho als amics"
+
+#: ../../mod/network.php:181
+msgid "Search Results For:"
+msgstr "Resultats de la Cerca Per a:"
+
+#: ../../mod/network.php:397
+msgid "Commented Order"
+msgstr "Ordre dels Comentaris"
+
+#: ../../mod/network.php:400
+msgid "Sort by Comment Date"
+msgstr "Ordenar per Data de Comentari"
+
+#: ../../mod/network.php:403
+msgid "Posted Order"
+msgstr "Ordre dels Enviaments"
+
+#: ../../mod/network.php:406
+msgid "Sort by Post Date"
+msgstr "Ordenar per Data d'Enviament"
+
+#: ../../mod/network.php:444 ../../mod/notifications.php:88
+msgid "Personal"
+msgstr "Personal"
+
+#: ../../mod/network.php:447
+msgid "Posts that mention or involve you"
+msgstr "Missatge que et menciona o t'impliquen"
+
+#: ../../mod/network.php:453
+msgid "New"
+msgstr "Nou"
+
+#: ../../mod/network.php:456
+msgid "Activity Stream - by date"
+msgstr "Activitat del Flux - per data"
+
+#: ../../mod/network.php:462
+msgid "Shared Links"
+msgstr "Enllaços Compartits"
+
+#: ../../mod/network.php:465
+msgid "Interesting Links"
+msgstr "Enllaços Interesants"
+
+#: ../../mod/network.php:471
+msgid "Starred"
+msgstr "Favorits"
+
+#: ../../mod/network.php:474
+msgid "Favourite Posts"
+msgstr "Enviaments Favorits"
+
+#: ../../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] "Advertència: Aquest grup conté el membre %s en una xarxa insegura."
+msgstr[1] "Advertència: Aquest grup conté %s membres d'una xarxa insegura."
+
+#: ../../mod/network.php:549
+msgid "Private messages to this group are at risk of public disclosure."
+msgstr "Els missatges privats a aquest grup es troben en risc de divulgació pública."
+
+#: ../../mod/network.php:596 ../../mod/content.php:119
+msgid "No such group"
+msgstr "Cap grup com"
+
+#: ../../mod/network.php:607 ../../mod/content.php:130
+msgid "Group is empty"
+msgstr "El Grup es buit"
+
+#: ../../mod/network.php:611 ../../mod/content.php:134
+msgid "Group: "
+msgstr "Grup:"
+
+#: ../../mod/network.php:621
+msgid "Contact: "
+msgstr "Contacte:"
+
+#: ../../mod/network.php:623
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "Els missatges privats a aquesta persona es troben en risc de divulgació pública."
+
+#: ../../mod/network.php:628
+msgid "Invalid contact."
+msgstr "Contacte no vàlid."
+
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr "Sol·licitud d'identificació no vàlida."
+
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
+#: ../../mod/notifications.php:211
+msgid "Discard"
+msgstr "Descartar"
+
+#: ../../mod/notifications.php:78
+msgid "System"
+msgstr "Sistema"
+
+#: ../../mod/notifications.php:122
+msgid "Show Ignored Requests"
+msgstr "Mostra les Sol·licituds Ignorades"
+
+#: ../../mod/notifications.php:122
+msgid "Hide Ignored Requests"
+msgstr "Amaga les Sol·licituds Ignorades"
+
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
+msgid "Notification type: "
+msgstr "Tipus de Notificació:"
+
+#: ../../mod/notifications.php:150
+msgid "Friend Suggestion"
+msgstr "Amics Suggerits "
+
+#: ../../mod/notifications.php:152
+#, php-format
+msgid "suggested by %s"
+msgstr "sugerit per %s"
+
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
+msgid "Post a new friend activity"
+msgstr "Publica una activitat  d'amic nova"
+
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
+msgid "if applicable"
+msgstr "si es pot aplicar"
+
+#: ../../mod/notifications.php:181
+msgid "Claims to be known to you: "
+msgstr "Diu que et coneix:"
+
+#: ../../mod/notifications.php:181
+msgid "yes"
+msgstr "sí"
+
+#: ../../mod/notifications.php:181
+msgid "no"
+msgstr "no"
+
+#: ../../mod/notifications.php:188
+msgid "Approve as: "
+msgstr "Aprovat com:"
+
+#: ../../mod/notifications.php:189
+msgid "Friend"
+msgstr "Amic"
+
+#: ../../mod/notifications.php:190
+msgid "Sharer"
+msgstr "Partícip"
+
+#: ../../mod/notifications.php:190
+msgid "Fan/Admirer"
+msgstr "Fan/Admirador"
+
+#: ../../mod/notifications.php:196
+msgid "Friend/Connect Request"
+msgstr "Sol·licitud d'Amistat/Connexió"
+
+#: ../../mod/notifications.php:196
+msgid "New Follower"
+msgstr "Nou Seguidor"
+
+#: ../../mod/notifications.php:217
+msgid "No introductions."
+msgstr "Sense presentacions."
+
+#: ../../mod/notifications.php:257 ../../mod/notifications.php:382
+#: ../../mod/notifications.php:469
+#, php-format
+msgid "%s liked %s's post"
+msgstr "A %s li agrada l'enviament de %s"
+
+#: ../../mod/notifications.php:266 ../../mod/notifications.php:391
+#: ../../mod/notifications.php:478
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "A %s no li agrada l'enviament de %s"
+
+#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
+#: ../../mod/notifications.php:492
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s es ara amic de %s"
+
+#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
+#, php-format
+msgid "%s created a new post"
+msgstr "%s ha creat un enviament nou"
+
+#: ../../mod/notifications.php:288 ../../mod/notifications.php:413
+#: ../../mod/notifications.php:501
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s va comentar en l'enviament de %s"
+
+#: ../../mod/notifications.php:302
+msgid "No more network notifications."
+msgstr "No més notificacions de xarxa."
+
+#: ../../mod/notifications.php:306
+msgid "Network Notifications"
+msgstr "Notificacions de la Xarxa"
+
+#: ../../mod/notifications.php:332 ../../mod/notify.php:61
+msgid "No more system notifications."
+msgstr "No més notificacions del sistema."
+
+#: ../../mod/notifications.php:336 ../../mod/notify.php:65
+msgid "System Notifications"
+msgstr "Notificacions del Sistema"
+
+#: ../../mod/notifications.php:427
+msgid "No more personal notifications."
+msgstr "No més notificacions personals."
+
+#: ../../mod/notifications.php:431
+msgid "Personal Notifications"
+msgstr "Notificacions Personals"
+
+#: ../../mod/notifications.php:508
+msgid "No more home notifications."
+msgstr "No més notificacions d'inici."
+
+#: ../../mod/notifications.php:512
+msgid "Home Notifications"
+msgstr "Notificacions d'Inici"
+
+#: ../../mod/photos.php:51 ../../boot.php:1956
+msgid "Photo Albums"
+msgstr "Àlbum de Fotos"
+
+#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1058
+#: ../../mod/photos.php:1183 ../../mod/photos.php:1206
+#: ../../mod/photos.php:1736 ../../mod/photos.php:1748
+#: ../../view/theme/diabook/theme.php:492
+msgid "Contact Photos"
+msgstr "Fotos de Contacte"
+
+#: ../../mod/photos.php:66 ../../mod/photos.php:1222 ../../mod/photos.php:1795
+msgid "Upload New Photos"
+msgstr "Actualitzar Noves Fotos"
+
+#: ../../mod/photos.php:143
+msgid "Contact information unavailable"
+msgstr "Informació del Contacte no disponible"
+
+#: ../../mod/photos.php:164
+msgid "Album not found."
+msgstr "Àlbum no trobat."
+
+#: ../../mod/photos.php:187 ../../mod/photos.php:199 ../../mod/photos.php:1200
+msgid "Delete Album"
+msgstr "Eliminar Àlbum"
+
+#: ../../mod/photos.php:197
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr "Realment vols esborrar aquest album de fotos amb totes les fotos?"
+
+#: ../../mod/photos.php:276 ../../mod/photos.php:287 ../../mod/photos.php:1502
+msgid "Delete Photo"
+msgstr "Eliminar Foto"
+
+#: ../../mod/photos.php:285
+msgid "Do you really want to delete this photo?"
+msgstr "Realment vols esborrar aquesta foto?"
+
+#: ../../mod/photos.php:656
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
+msgstr "%1$s fou etiquetat a %2$s per %3$s"
+
+#: ../../mod/photos.php:656
+msgid "a photo"
+msgstr "una foto"
+
+#: ../../mod/photos.php:761
+msgid "Image exceeds size limit of "
+msgstr "La imatge excedeix el límit de "
+
+#: ../../mod/photos.php:769
+msgid "Image file is empty."
+msgstr "El fitxer de imatge és buit."
+
+#: ../../mod/photos.php:924
+msgid "No photos selected"
+msgstr "No s'han seleccionat fotos"
+
+#: ../../mod/photos.php:1088
+#, php-format
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+msgstr "Has emprat %1$.2f Mbytes de %2$.2f Mbytes del magatzem de fotos."
+
+#: ../../mod/photos.php:1123
+msgid "Upload Photos"
+msgstr "Carregar Fotos"
+
+#: ../../mod/photos.php:1127 ../../mod/photos.php:1195
+msgid "New album name: "
+msgstr "Nou nom d'àlbum:"
+
+#: ../../mod/photos.php:1128
+msgid "or existing album name: "
+msgstr "o nom d'àlbum existent:"
+
+#: ../../mod/photos.php:1129
+msgid "Do not show a status post for this upload"
+msgstr "No tornis a mostrar un missatge d'estat d'aquesta pujada"
+
+#: ../../mod/photos.php:1131 ../../mod/photos.php:1497
+msgid "Permissions"
+msgstr "Permisos"
+
+#: ../../mod/photos.php:1142
+msgid "Private Photo"
+msgstr "Foto Privada"
+
+#: ../../mod/photos.php:1143
+msgid "Public Photo"
+msgstr "Foto Pública"
+
+#: ../../mod/photos.php:1210
+msgid "Edit Album"
+msgstr "Editar Àlbum"
+
+#: ../../mod/photos.php:1216
+msgid "Show Newest First"
+msgstr "Mostrar el més Nou Primer"
+
+#: ../../mod/photos.php:1218
+msgid "Show Oldest First"
+msgstr "Mostrar el més Antic Primer"
+
+#: ../../mod/photos.php:1251 ../../mod/photos.php:1778
+msgid "View Photo"
+msgstr "Veure Foto"
+
+#: ../../mod/photos.php:1286
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permís denegat. L'accés a aquest element pot estar restringit."
+
+#: ../../mod/photos.php:1288
+msgid "Photo not available"
+msgstr "Foto no disponible"
+
+#: ../../mod/photos.php:1344
+msgid "View photo"
+msgstr "Veure foto"
+
+#: ../../mod/photos.php:1344
+msgid "Edit photo"
+msgstr "Editar foto"
+
+#: ../../mod/photos.php:1345
+msgid "Use as profile photo"
+msgstr "Emprar com a foto del perfil"
+
+#: ../../mod/photos.php:1351 ../../mod/content.php:643
+#: ../../object/Item.php:113
+msgid "Private Message"
+msgstr "Missatge Privat"
+
+#: ../../mod/photos.php:1370
+msgid "View Full Size"
+msgstr "Veure'l a Mida Completa"
+
+#: ../../mod/photos.php:1444
+msgid "Tags: "
+msgstr "Etiquetes:"
+
+#: ../../mod/photos.php:1447
+msgid "[Remove any tag]"
+msgstr "Treure etiquetes"
+
+#: ../../mod/photos.php:1487
+msgid "Rotate CW (right)"
+msgstr "Rotar CW (dreta)"
+
+#: ../../mod/photos.php:1488
+msgid "Rotate CCW (left)"
+msgstr "Rotar CCW (esquerra)"
+
+#: ../../mod/photos.php:1490
+msgid "New album name"
+msgstr "Nou nom d'àlbum"
+
+#: ../../mod/photos.php:1493
+msgid "Caption"
+msgstr "Títol"
+
+#: ../../mod/photos.php:1495
+msgid "Add a Tag"
+msgstr "Afegir una etiqueta"
+
+#: ../../mod/photos.php:1499
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Exemple: @bob, @Barbara_jensen, @jim@example.com,  #California, #camping"
+
+#: ../../mod/photos.php:1508
+msgid "Private photo"
+msgstr "Foto Privada"
+
+#: ../../mod/photos.php:1509
+msgid "Public photo"
+msgstr "Foto pública"
+
+#: ../../mod/photos.php:1529 ../../mod/content.php:707
+#: ../../object/Item.php:232
+msgid "I like this (toggle)"
+msgstr "M'agrada això (canviar)"
+
+#: ../../mod/photos.php:1530 ../../mod/content.php:708
+#: ../../object/Item.php:233
+msgid "I don't like this (toggle)"
+msgstr "No m'agrada això (canviar)"
+
+#: ../../mod/photos.php:1549 ../../mod/photos.php:1593
+#: ../../mod/photos.php:1676 ../../mod/content.php:730
+#: ../../object/Item.php:650
+msgid "This is you"
+msgstr "Aquest ets tu"
+
+#: ../../mod/photos.php:1551 ../../mod/photos.php:1595
+#: ../../mod/photos.php:1678 ../../mod/content.php:732
+#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:669
+msgid "Comment"
+msgstr "Comentari"
+
+#: ../../mod/photos.php:1793
+msgid "Recent Photos"
+msgstr "Fotos Recents"
+
+#: ../../mod/newmember.php:6
+msgid "Welcome to Friendica"
+msgstr "Benvingut a Friendica"
+
+#: ../../mod/newmember.php:8
+msgid "New Member Checklist"
+msgstr "Llista de Verificació dels Nous Membres"
+
+#: ../../mod/newmember.php:12
+msgid ""
+"We would like to offer some tips and links to help make your experience "
+"enjoyable. Click any item to visit the relevant page. A link to this page "
+"will be visible from your home page for two weeks after your initial "
+"registration and then will quietly disappear."
+msgstr "Ens agradaria oferir alguns consells i enllaços per ajudar a fer la teva experiència agradable. Feu clic a qualsevol element per visitar la pàgina corresponent. Un enllaç a aquesta pàgina serà visible des de la pàgina d'inici durant dues setmanes després de la teva inscripció inicial i després desapareixerà en silenci."
+
+#: ../../mod/newmember.php:14
+msgid "Getting Started"
+msgstr "Començem"
+
+#: ../../mod/newmember.php:18
+msgid "Friendica Walk-Through"
+msgstr "Paseja per Friendica"
+
+#: ../../mod/newmember.php:18
+msgid ""
+"On your <em>Quick Start</em> page - find a brief introduction to your "
+"profile and network tabs, make some new connections, and find some groups to"
+" join."
+msgstr "A la teva pàgina de <em>Inici Ràpid</em> - troba una breu presentació per les teves fitxes de perfil i xarxa, crea alguna nova connexió i troba algun grup per unir-te."
+
+#: ../../mod/newmember.php:26
+msgid "Go to Your Settings"
+msgstr "Anar als Teus Ajustos"
+
+#: ../../mod/newmember.php:26
+msgid ""
+"On your <em>Settings</em> page -  change your initial password. Also make a "
+"note of your Identity Address. This looks just like an email address - and "
+"will be useful in making friends on the free social web."
+msgstr "En la  de la seva <em>configuració</em> de la pàgina - canviï la contrasenya inicial. També prengui nota de la Adreça d'Identitat. Això s'assembla a una adreça de correu electrònic - i serà útil per fer amics a la xarxa social lliure."
+
+#: ../../mod/newmember.php:28
+msgid ""
+"Review the other settings, particularly the privacy settings. An unpublished"
+" directory listing is like having an unlisted phone number. In general, you "
+"should probably publish your listing - unless all of your friends and "
+"potential friends know exactly how to find you."
+msgstr "Reviseu les altres configuracions, en particular la configuració de privadesa. Una llista de directoris no publicada és com tenir un número de telèfon no llistat. Normalment, hauria de publicar la seva llista - a menys que tots els seus amics i els amics potencials sàpiguen exactament com trobar-li."
+
+#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:244
+msgid "Upload Profile Photo"
+msgstr "Pujar Foto del Perfil"
+
+#: ../../mod/newmember.php:36
+msgid ""
+"Upload a profile photo if you have not done so already. Studies have shown "
+"that people with real photos of themselves are ten times more likely to make"
+" friends than people who do not."
+msgstr "Puji una foto del seu perfil si encara no ho ha fet. Els estudis han demostrat que les persones amb fotos reals de ells mateixos tenen deu vegades més probabilitats de fer amics que les persones que no ho fan."
+
+#: ../../mod/newmember.php:38
+msgid "Edit Your Profile"
+msgstr "Editar el Teu Perfil"
+
+#: ../../mod/newmember.php:38
+msgid ""
+"Edit your <strong>default</strong> profile to your liking. Review the "
+"settings for hiding your list of friends and hiding the profile from unknown"
+" visitors."
+msgstr "Editi  el perfil per <strong>defecte</strong> al seu gust. Reviseu la configuració per ocultar la seva llista d'amics i ocultar el perfil dels visitants desconeguts."
+
+#: ../../mod/newmember.php:40
+msgid "Profile Keywords"
+msgstr "Paraules clau del Perfil"
+
+#: ../../mod/newmember.php:40
+msgid ""
+"Set some public keywords for your default profile which describe your "
+"interests. We may be able to find other people with similar interests and "
+"suggest friendships."
+msgstr "Estableix algunes paraules clau públiques al teu perfil predeterminat que descriguin els teus interessos. Podem ser capaços de trobar altres persones amb interessos similars i suggerir amistats."
+
+#: ../../mod/newmember.php:44
+msgid "Connecting"
+msgstr "Connectant"
+
+#: ../../mod/newmember.php:49
+msgid ""
+"Authorise the Facebook Connector if you currently have a Facebook account "
+"and we will (optionally) import all your Facebook friends and conversations."
+msgstr "Autoritzi el connector de Facebook si vostè té un compte al Facebook i nosaltres (opcionalment) importarem tots els teus amics de Facebook i les converses."
+
+#: ../../mod/newmember.php:51
+msgid ""
+"<em>If</em> this is your own personal server, installing the Facebook addon "
+"may ease your transition to the free social web."
+msgstr "<em>Si </em> aquesta és el seu servidor personal, la instal·lació del complement de Facebook pot facilitar la transició a la web social lliure."
+
+#: ../../mod/newmember.php:56
+msgid "Importing Emails"
+msgstr "Important Emails"
+
+#: ../../mod/newmember.php:56
+msgid ""
+"Enter your email access information on your Connector Settings page if you "
+"wish to import and interact with friends or mailing lists from your email "
+"INBOX"
+msgstr "Introduïu les dades d'accés al correu electrònic a la seva pàgina de configuració de connector, si es desitja importar i relacionar-se amb amics o llistes de correu de la seva bústia d'email"
+
+#: ../../mod/newmember.php:58
+msgid "Go to Your Contacts Page"
+msgstr "Anar a la Teva Pàgina de Contactes"
+
+#: ../../mod/newmember.php:58
+msgid ""
+"Your Contacts page is your gateway to managing friendships and connecting "
+"with friends on other networks. Typically you enter their address or site "
+"URL in the <em>Add New Contact</em> dialog."
+msgstr "La seva pàgina de Contactes és la seva porta d'entrada a la gestió de l'amistat i la connexió amb amics d'altres xarxes. Normalment, vostè entrar en la seva direcció o URL del lloc al  diàleg <em>Afegir Nou Contacte</em>."
+
+#: ../../mod/newmember.php:60
+msgid "Go to Your Site's Directory"
+msgstr "Anar al Teu Directori"
+
+#: ../../mod/newmember.php:60
+msgid ""
+"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."
+msgstr "La pàgina del Directori li permet trobar altres persones en aquesta xarxa o altres llocs federats. Busqui un enllaç <em>Connectar</em> o <em>Seguir</em> a la seva pàgina de perfil. Proporcioni la seva pròpia Adreça de Identitat si així ho sol·licita."
+
+#: ../../mod/newmember.php:62
+msgid "Finding New People"
+msgstr "Trobar Gent Nova"
+
+#: ../../mod/newmember.php:62
+msgid ""
+"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."
+msgstr "Al tauler lateral de la pàgina de contacte Hi ha diverses eines per trobar nous amics. Podem coincidir amb les persones per interesos, buscar persones pel nom o per interès, i oferir suggeriments basats en les relacions de la xarxa. En un nou lloc, els suggeriments d'amics, en general comencen a poblar el lloc a les 24 hores."
+
+#: ../../mod/newmember.php:70
+msgid "Group Your Contacts"
+msgstr "Agrupar els Teus Contactes"
+
+#: ../../mod/newmember.php:70
+msgid ""
+"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."
+msgstr "Una vegada que s'han fet alguns amics, organitzi'ls en grups de conversa privada a la barra lateral de la seva pàgina de contactes i després pot interactuar amb cada grup de forma privada a la pàgina de la xarxa."
+
+#: ../../mod/newmember.php:73
+msgid "Why Aren't My Posts Public?"
+msgstr "Per que no es public el meu enviament?"
+
+#: ../../mod/newmember.php:73
+msgid ""
+"Friendica respects your privacy. By default, your posts will only show up to"
+" people you've added as friends. For more information, see the help section "
+"from the link above."
+msgstr "Friendica respecta la teva privacitat. Per defecte, els teus enviaments només s'envien a gent que has afegit com a amic. Per més informació, mira la secció d'ajuda des de l'enllaç de dalt."
+
+#: ../../mod/newmember.php:78
+msgid "Getting Help"
+msgstr "Demanant Ajuda"
+
+#: ../../mod/newmember.php:82
+msgid "Go to the Help Section"
+msgstr "Anar a la secció d'Ajuda"
+
+#: ../../mod/newmember.php:82
+msgid ""
+"Our <strong>help</strong> pages may be consulted for detail on other program"
+" features and resources."
+msgstr "A les nostres pàgines <strong>d'ajuda</strong> es poden consultar detalls sobre les característiques d'altres programes i recursos."
+
+#: ../../mod/profile.php:21 ../../boot.php:1324
+msgid "Requested profile is not available."
+msgstr "El perfil sol·licitat no està disponible."
+
+#: ../../mod/profile.php:180
+msgid "Tips for New Members"
+msgstr "Consells per a nous membres"
+
+#: ../../mod/install.php:117
+msgid "Friendica Social Communications Server - Setup"
+msgstr "Friendica Social Communications Server - Ajustos"
+
+#: ../../mod/install.php:123
+msgid "Could not connect to database."
+msgstr "No puc connectar a la base de dades."
+
+#: ../../mod/install.php:127
+msgid "Could not create table."
+msgstr "No puc creat taula."
+
+#: ../../mod/install.php:133
+msgid "Your Friendica site database has been installed."
+msgstr "La base de dades del teu lloc Friendica ha estat instal·lada."
+
+#: ../../mod/install.php:138
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Pot ser que hagi d'importar l'arxiu \"database.sql\" manualment amb phpmyadmin o mysql."
+
+#: ../../mod/install.php:139 ../../mod/install.php:206
+#: ../../mod/install.php:521
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Per favor, consulti l'arxiu \"INSTALL.txt\"."
+
+#: ../../mod/install.php:203
+msgid "System check"
+msgstr "Comprovació del Sistema"
+
+#: ../../mod/install.php:208
+msgid "Check again"
+msgstr "Comprovi de nou"
+
+#: ../../mod/install.php:227
+msgid "Database connection"
+msgstr "Conexió a la base de dades"
+
+#: ../../mod/install.php:228
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "Per a instal·lar Friendica necessitem conèixer com connectar amb la deva base de dades."
+
+#: ../../mod/install.php:229
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Per favor, posi's en contacte amb el seu proveïdor de hosting o administrador del lloc si té alguna pregunta sobre aquestes opcions."
+
+#: ../../mod/install.php:230
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "La base de dades que especifiques ja hauria d'existir. Si no és així, crea-la abans de continuar."
+
+#: ../../mod/install.php:234
+msgid "Database Server Name"
+msgstr "Nom del Servidor de base de Dades"
+
+#: ../../mod/install.php:235
+msgid "Database Login Name"
+msgstr "Nom d'Usuari de la base de Dades"
+
+#: ../../mod/install.php:236
+msgid "Database Login Password"
+msgstr "Contrasenya d'Usuari de la base de Dades"
+
+#: ../../mod/install.php:237
+msgid "Database Name"
+msgstr "Nom de la base de Dades"
+
+#: ../../mod/install.php:238 ../../mod/install.php:277
+msgid "Site administrator email address"
+msgstr "Adreça de correu del administrador del lloc"
+
+#: ../../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 "El seu compte d'adreça electrònica ha de coincidir per tal d'utilitzar el panell d'administració web."
+
+#: ../../mod/install.php:242 ../../mod/install.php:280
+msgid "Please select a default timezone for your website"
+msgstr "Per favor, seleccioni una zona horària per defecte per al seu lloc web"
+
+#: ../../mod/install.php:267
+msgid "Site settings"
+msgstr "Configuracions del lloc"
+
+#: ../../mod/install.php:321
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "No es va poder trobar una versió de línia de comandos de PHP en la ruta del servidor web."
+
+#: ../../mod/install.php:322
+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 "Si no tens una versió de línia de comandos instal·lada al teu servidor PHP, no podràs fer córrer els sondejos via cron. Mira <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"
+
+#: ../../mod/install.php:326
+msgid "PHP executable path"
+msgstr "Direcció del executable PHP"
+
+#: ../../mod/install.php:326
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Entra la ruta sencera fins l'executable de php. Pots deixar això buit  per continuar l'instal·lació."
+
+#: ../../mod/install.php:331
+msgid "Command line PHP"
+msgstr "Linia de comandos PHP"
+
+#: ../../mod/install.php:340
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+msgstr "El programari executable PHP no es el binari php cli (hauria de ser la versió cgi-fcgi)"
+
+#: ../../mod/install.php:341
+msgid "Found PHP version: "
+msgstr "Trobada la versió PHP:"
+
+#: ../../mod/install.php:343
+msgid "PHP cli binary"
+msgstr "PHP cli binari"
+
+#: ../../mod/install.php:354
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "La versió de línia de comandos de PHP en el seu sistema no té \"register_argc_argv\" habilitat."
+
+#: ../../mod/install.php:355
+msgid "This is required for message delivery to work."
+msgstr "Això és necessari perquè funcioni el lliurament de missatges."
+
+#: ../../mod/install.php:357
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
+
+#: ../../mod/install.php:378
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Error: la funció \"openssl_pkey_new\" en aquest sistema no és capaç de generar claus de xifrat"
+
+#: ../../mod/install.php:379
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Si s'executa en Windows, per favor consulti la secció \"http://www.php.net/manual/en/openssl.installation.php\"."
+
+#: ../../mod/install.php:381
+msgid "Generate encryption keys"
+msgstr "Generar claus d'encripció"
+
+#: ../../mod/install.php:388
+msgid "libCurl PHP module"
+msgstr "Mòdul libCurl de PHP"
+
+#: ../../mod/install.php:389
+msgid "GD graphics PHP module"
+msgstr "Mòdul GD de gràfics de PHP"
+
+#: ../../mod/install.php:390
+msgid "OpenSSL PHP module"
+msgstr "Mòdul OpenSSl de PHP"
+
+#: ../../mod/install.php:391
+msgid "mysqli PHP module"
+msgstr "Mòdul mysqli de PHP"
+
+#: ../../mod/install.php:392
+msgid "mb_string PHP module"
+msgstr "Mòdul mb_string de PHP"
+
+#: ../../mod/install.php:397 ../../mod/install.php:399
+msgid "Apache mod_rewrite module"
+msgstr "Apache mod_rewrite modul "
+
+#: ../../mod/install.php:397
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Error: el mòdul mod-rewrite del servidor web Apache és necessari però no està instal·lat."
+
+#: ../../mod/install.php:405
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Error: El mòdul libCURL de PHP és necessari però no està instal·lat."
+
+#: ../../mod/install.php:409
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Error: el mòdul gràfic GD de PHP amb support per JPEG és necessari però no està instal·lat."
+
+#: ../../mod/install.php:413
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Error: El mòdul enssl de PHP és necessari però no està instal·lat."
+
+#: ../../mod/install.php:417
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Error: El mòdul mysqli de PHP és necessari però no està instal·lat."
+
+#: ../../mod/install.php:421
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Error: mòdul mb_string de PHP requerit però no instal·lat."
+
+#: ../../mod/install.php:438
+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 "L'instal·lador web necessita crear un arxiu anomenat \".htconfig.php\" en la carpeta superior del seu servidor web però alguna cosa ho va impedir."
+
+#: ../../mod/install.php:439
+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 "Això freqüentment és a causa d'una configuració de permisos; el servidor web no pot escriure arxius en la carpeta - encara que sigui possible."
+
+#: ../../mod/install.php:440
+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 "Al final d'aquest procediment, et facilitarem un text que hauràs de guardar en un arxiu que s'anomena .htconfig.php que hi es a la carpeta principal del teu Friendica."
+
+#: ../../mod/install.php:441
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"INSTALL.txt\" for instructions."
+msgstr "Alternativament, pots saltar-te aquest procediment i configurar-ho manualment. Per favor, mira l'arxiu \"INTALL.txt\" per a instruccions."
+
+#: ../../mod/install.php:444
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php és escribible"
+
+#: ../../mod/install.php:454
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Friendica empra el motor de plantilla Smarty3 per dibuixar la web. Smarty3 compila plantilles a PHP per accelerar el redibuxar."
+
+#: ../../mod/install.php:455
+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 "Per poder guardar aquestes plantilles compilades, el servidor web necessita tenir accés d'escriptura al directori view/smarty3/  sota la carpeta principal de Friendica."
+
+#: ../../mod/install.php:456
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Per favor, asegura que l'usuari que corre el servidor web (p.e. www-data) te accés d'escriptura a aquesta carpeta."
+
+#: ../../mod/install.php:457
+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 "Nota: Com a mesura de seguretat, hauries de facilitar al servidor web, accés d'escriptura a view/smarty3/ excepte els fitxers de plantilles (.tpl) que conté."
+
+#: ../../mod/install.php:460
+msgid "view/smarty3 is writable"
+msgstr "view/smarty3 es escribible"
+
+#: ../../mod/install.php:472
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr "URL rewrite en .htaccess no esta treballant. Comprova la configuració del teu servidor."
+
+#: ../../mod/install.php:474
+msgid "Url rewrite is working"
+msgstr "URL rewrite està treballant"
+
+#: ../../mod/install.php:484
+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 "L'arxiu per a la configuració de la base de dades \".htconfig.php\" no es pot escriure. Per favor, usi el text adjunt per crear un arxiu de configuració en l'arrel del servidor web."
+
+#: ../../mod/install.php:508
+msgid "Errors encountered creating database tables."
+msgstr "Trobats errors durant la creació de les taules de la base de dades."
+
+#: ../../mod/install.php:519
+msgid "<h1>What next</h1>"
+msgstr "<h1>Que es següent</h1>"
+
+#: ../../mod/install.php:520
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "IMPORTANT: necessitarà configurar [manualment] el programar una tasca pel sondejador (poller.php)"
+
+#: ../../mod/oexchange.php:25
+msgid "Post successful."
+msgstr "Publicat amb éxit."
+
+#: ../../mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
+msgstr "Error al protocol OpenID. No ha retornat ID."
+
+#: ../../mod/openid.php:53
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "Compte no trobat i el registrar-se amb OpenID no està permès en aquest lloc."
+
+#: ../../mod/profile_photo.php:44
+msgid "Image uploaded but image cropping failed."
+msgstr "Imatge pujada però no es va poder retallar."
+
+#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:84
+#: ../../mod/profile_photo.php:91 ../../mod/profile_photo.php:308
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "La reducció de la imatge [%s] va fracassar."
+
+#: ../../mod/profile_photo.php:118
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Recarregui la pàgina o netegi la caché del navegador si la nova foto no apareix immediatament."
+
+#: ../../mod/profile_photo.php:128
+msgid "Unable to process image"
+msgstr "No es pot processar la imatge"
+
+#: ../../mod/profile_photo.php:242
+msgid "Upload File:"
+msgstr "Pujar arxiu:"
+
+#: ../../mod/profile_photo.php:243
+msgid "Select a profile:"
+msgstr "Tria un perfil:"
+
+#: ../../mod/profile_photo.php:245
+msgid "Upload"
+msgstr "Pujar"
+
+#: ../../mod/profile_photo.php:248
+msgid "skip this step"
+msgstr "saltar aquest pas"
+
+#: ../../mod/profile_photo.php:248
+msgid "select a photo from your photo albums"
+msgstr "tria una foto dels teus àlbums"
+
+#: ../../mod/profile_photo.php:262
+msgid "Crop Image"
+msgstr "retallar imatge"
+
+#: ../../mod/profile_photo.php:263
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Per favor, ajusta la retallada d'imatge per a una optima visualització."
+
+#: ../../mod/profile_photo.php:265
+msgid "Done Editing"
+msgstr "Edició Feta"
+
+#: ../../mod/profile_photo.php:299
+msgid "Image uploaded successfully."
+msgstr "Carregada de la imatge amb èxit."
+
+#: ../../mod/community.php:23
+msgid "Not available."
+msgstr "No disponible."
+
+#: ../../mod/content.php:626 ../../object/Item.php:362
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d comentari"
+msgstr[1] "%d comentaris"
+
+#: ../../mod/content.php:707 ../../object/Item.php:232
+msgid "like"
+msgstr "Agrada"
+
+#: ../../mod/content.php:708 ../../object/Item.php:233
+msgid "dislike"
+msgstr "Desagrada"
+
+#: ../../mod/content.php:710 ../../object/Item.php:235
+msgid "Share this"
+msgstr "Compartir això"
+
+#: ../../mod/content.php:710 ../../object/Item.php:235
+msgid "share"
+msgstr "Compartir"
+
+#: ../../mod/content.php:734 ../../object/Item.php:654
+msgid "Bold"
+msgstr "Negreta"
+
+#: ../../mod/content.php:735 ../../object/Item.php:655
+msgid "Italic"
+msgstr "Itallica"
+
+#: ../../mod/content.php:736 ../../object/Item.php:656
+msgid "Underline"
+msgstr "Subratllat"
+
+#: ../../mod/content.php:737 ../../object/Item.php:657
+msgid "Quote"
+msgstr "Cometes"
+
+#: ../../mod/content.php:738 ../../object/Item.php:658
+msgid "Code"
+msgstr "Codi"
+
+#: ../../mod/content.php:739 ../../object/Item.php:659
+msgid "Image"
+msgstr "Imatge"
+
+#: ../../mod/content.php:740 ../../object/Item.php:660
+msgid "Link"
+msgstr "Enllaç"
+
+#: ../../mod/content.php:741 ../../object/Item.php:661
+msgid "Video"
+msgstr "Video"
+
+#: ../../mod/content.php:776 ../../object/Item.php:211
+msgid "add star"
+msgstr "Afegir a favorits"
+
+#: ../../mod/content.php:777 ../../object/Item.php:212
+msgid "remove star"
+msgstr "Esborrar favorit"
+
+#: ../../mod/content.php:778 ../../object/Item.php:213
+msgid "toggle star status"
+msgstr "Canviar estatus de favorit"
+
+#: ../../mod/content.php:781 ../../object/Item.php:216
+msgid "starred"
+msgstr "favorit"
+
+#: ../../mod/content.php:782 ../../object/Item.php:221
+msgid "add tag"
+msgstr "afegir etiqueta"
+
+#: ../../mod/content.php:786 ../../object/Item.php:130
+msgid "save to folder"
+msgstr "guardat a la carpeta"
+
+#: ../../mod/content.php:877 ../../object/Item.php:308
+msgid "to"
+msgstr "a"
+
+#: ../../mod/content.php:878 ../../object/Item.php:310
+msgid "Wall-to-Wall"
+msgstr "Mur-a-Mur"
+
+#: ../../mod/content.php:879 ../../object/Item.php:311
+msgid "via Wall-To-Wall:"
+msgstr "via Mur-a-Mur"
+
+#: ../../object/Item.php:92
+msgid "This entry was edited"
+msgstr "L'entrada fou editada"
+
+#: ../../object/Item.php:309
+msgid "via"
+msgstr "via"
+
+#: ../../view/theme/cleanzero/config.php:82
+#: ../../view/theme/diabook/config.php:154
+#: ../../view/theme/dispy/config.php:72 ../../view/theme/quattro/config.php:66
+msgid "Theme settings"
+msgstr "Configuració de Temes"
+
+#: ../../view/theme/cleanzero/config.php:83
+msgid "Set resize level for images in posts and comments (width and height)"
+msgstr "Ajusteu el nivell de canvi de mida d'imatges en els missatges i comentaris ( amplada i alçada"
+
+#: ../../view/theme/cleanzero/config.php:84
+#: ../../view/theme/diabook/config.php:155
+#: ../../view/theme/dispy/config.php:73
+msgid "Set font-size for posts and comments"
+msgstr "Canvia la mida del tipus de lletra per enviaments i comentaris"
+
+#: ../../view/theme/cleanzero/config.php:85
+msgid "Set theme width"
+msgstr "Ajustar l'ample del tema"
+
+#: ../../view/theme/cleanzero/config.php:86
+#: ../../view/theme/quattro/config.php:68
+msgid "Color scheme"
+msgstr "Esquema de colors"
+
+#: ../../view/theme/diabook/config.php:156
+#: ../../view/theme/dispy/config.php:74
+msgid "Set line-height for posts and comments"
+msgstr "Canvia l'espaiat de línia per enviaments i comentaris"
+
+#: ../../view/theme/diabook/config.php:157
+msgid "Set resolution for middle column"
+msgstr "canvia la resolució per a la columna central"
+
+#: ../../view/theme/diabook/config.php:158
+msgid "Set color scheme"
+msgstr "Canvia l'esquema de color"
+
+#: ../../view/theme/diabook/config.php:159
+#: ../../view/theme/diabook/theme.php:609
+msgid "Set twitter search term"
+msgstr "Ajustar el terme de cerca de twitter"
+
+#: ../../view/theme/diabook/config.php:160
+msgid "Set zoomfactor for Earth Layer"
+msgstr "Ajustar el factor de zoom de Earth Layers"
+
+#: ../../view/theme/diabook/config.php:161
+#: ../../view/theme/diabook/theme.php:578
+msgid "Set longitude (X) for Earth Layers"
+msgstr "Ajustar longitud (X) per Earth Layers"
+
+#: ../../view/theme/diabook/config.php:162
+#: ../../view/theme/diabook/theme.php:579
+msgid "Set latitude (Y) for Earth Layers"
+msgstr "Ajustar latitud (Y) per Earth Layers"
+
+#: ../../view/theme/diabook/config.php:163
+#: ../../view/theme/diabook/theme.php:94
+#: ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:632
+msgid "Community Pages"
+msgstr "Pàgines de la Comunitat"
+
+#: ../../view/theme/diabook/config.php:164
+#: ../../view/theme/diabook/theme.php:572
+#: ../../view/theme/diabook/theme.php:633
+msgid "Earth Layers"
+msgstr "Earth Layers"
+
+#: ../../view/theme/diabook/config.php:165
+#: ../../view/theme/diabook/theme.php:384
+#: ../../view/theme/diabook/theme.php:634
+msgid "Community Profiles"
+msgstr "Perfils de Comunitat"
+
+#: ../../view/theme/diabook/config.php:166
+#: ../../view/theme/diabook/theme.php:592
+#: ../../view/theme/diabook/theme.php:635
+msgid "Help or @NewHere ?"
+msgstr "Ajuda o @NouAqui?"
+
+#: ../../view/theme/diabook/config.php:167
+#: ../../view/theme/diabook/theme.php:599
+#: ../../view/theme/diabook/theme.php:636
+msgid "Connect Services"
+msgstr "Serveis Connectats"
+
+#: ../../view/theme/diabook/config.php:168
+#: ../../view/theme/diabook/theme.php:516
+#: ../../view/theme/diabook/theme.php:637
+msgid "Find Friends"
+msgstr "Trobar Amistats"
+
+#: ../../view/theme/diabook/config.php:169
+msgid "Last tweets"
+msgstr "Últims tweets"
+
+#: ../../view/theme/diabook/config.php:170
+#: ../../view/theme/diabook/theme.php:405
+#: ../../view/theme/diabook/theme.php:639
+msgid "Last users"
+msgstr "Últims usuaris"
+
+#: ../../view/theme/diabook/config.php:171
+#: ../../view/theme/diabook/theme.php:479
+#: ../../view/theme/diabook/theme.php:640
+msgid "Last photos"
+msgstr "Últimes fotos"
+
+#: ../../view/theme/diabook/config.php:172
+#: ../../view/theme/diabook/theme.php:434
+#: ../../view/theme/diabook/theme.php:641
+msgid "Last likes"
+msgstr "Últims \"m'agrada\""
+
+#: ../../view/theme/diabook/theme.php:89
+msgid "Your contacts"
+msgstr "Els teus contactes"
+
+#: ../../view/theme/diabook/theme.php:517
+msgid "Local Directory"
+msgstr "Directori Local"
+
+#: ../../view/theme/diabook/theme.php:577
+msgid "Set zoomfactor for Earth Layers"
+msgstr "Ajustar el factor de zoom per Earth Layers"
+
+#: ../../view/theme/diabook/theme.php:606
+#: ../../view/theme/diabook/theme.php:638
+msgid "Last Tweets"
+msgstr "Últims Tweets"
+
+#: ../../view/theme/diabook/theme.php:630
+msgid "Show/hide boxes at right-hand column:"
+msgstr "Mostra/amaga els marcs de la columna a ma dreta"
+
+#: ../../view/theme/dispy/config.php:75
+msgid "Set colour scheme"
+msgstr "Establir l'esquema de color"
+
+#: ../../view/theme/quattro/config.php:67
+msgid "Alignment"
+msgstr "Adaptació"
+
+#: ../../view/theme/quattro/config.php:67
+msgid "Left"
+msgstr "Esquerra"
+
+#: ../../view/theme/quattro/config.php:67
+msgid "Center"
+msgstr "Centre"
+
+#: ../../view/theme/quattro/config.php:69
+msgid "Posts font size"
+msgstr "Mida del text en enviaments"
+
+#: ../../view/theme/quattro/config.php:70
+msgid "Textareas font size"
+msgstr "mida del text en Areas de Text"
+
+#: ../../index.php:405
+msgid "toggle mobile"
+msgstr "canviar a mòbil"
+
+#: ../../boot.php:668
 msgid "Delete this item?"
 msgstr "Esborrar aquest element?"
 
-#: ../../boot.php:643
+#: ../../boot.php:671
 msgid "show fewer"
 msgstr "Mostrar menys"
 
-#: ../../boot.php:899
+#: ../../boot.php:998
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Actualització de %s fracassà. Mira el registre d'errors."
 
-#: ../../boot.php:901
+#: ../../boot.php:1000
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error d'actualització en %s"
 
-#: ../../boot.php:1011
+#: ../../boot.php:1110
 msgid "Create a New Account"
 msgstr "Crear un Nou Compte"
 
-#: ../../boot.php:1039
+#: ../../boot.php:1138
 msgid "Nickname or Email address: "
 msgstr "Àlies o Adreça de correu:"
 
-#: ../../boot.php:1040
+#: ../../boot.php:1139
 msgid "Password: "
 msgstr "Contrasenya:"
 
-#: ../../boot.php:1041
+#: ../../boot.php:1140
 msgid "Remember me"
-msgstr ""
+msgstr "Recorda'm ho"
 
-#: ../../boot.php:1044
+#: ../../boot.php:1143
 msgid "Or login using OpenID: "
 msgstr "O accedixi emprant OpenID:"
 
-#: ../../boot.php:1050
+#: ../../boot.php:1149
 msgid "Forgot your password?"
 msgstr "Oblidà la contrasenya?"
 
-#: ../../boot.php:1053
+#: ../../boot.php:1152
 msgid "Website Terms of Service"
-msgstr ""
+msgstr "Termes del Servei al Llocweb"
 
-#: ../../boot.php:1054
+#: ../../boot.php:1153
 msgid "terms of service"
-msgstr ""
+msgstr "termes del servei"
 
-#: ../../boot.php:1056
+#: ../../boot.php:1155
 msgid "Website Privacy Policy"
-msgstr ""
+msgstr "Política de Privacitat al Llocweb"
 
-#: ../../boot.php:1057
+#: ../../boot.php:1156
 msgid "privacy policy"
-msgstr ""
+msgstr "política de privacitat"
 
-#: ../../boot.php:1186
+#: ../../boot.php:1285
 msgid "Requested account is not available."
-msgstr ""
+msgstr "El compte sol·licitat no esta disponible"
 
-#: ../../boot.php:1265
+#: ../../boot.php:1364 ../../boot.php:1468
 msgid "Edit profile"
 msgstr "Editar perfil"
 
-#: ../../boot.php:1331
+#: ../../boot.php:1430
 msgid "Message"
 msgstr "Missatge"
 
-#: ../../boot.php:1339
+#: ../../boot.php:1438
 msgid "Manage/edit profiles"
 msgstr "Gestiona/edita perfils"
 
-#: ../../boot.php:1461 ../../boot.php:1547
+#: ../../boot.php:1567 ../../boot.php:1653
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../boot.php:1462 ../../boot.php:1548
+#: ../../boot.php:1568 ../../boot.php:1654
 msgid "F d"
 msgstr "F d"
 
-#: ../../boot.php:1507 ../../boot.php:1588
+#: ../../boot.php:1613 ../../boot.php:1694
 msgid "[today]"
 msgstr "[avui]"
 
-#: ../../boot.php:1519
+#: ../../boot.php:1625
 msgid "Birthday Reminders"
 msgstr "Recordatori d'Aniversaris"
 
-#: ../../boot.php:1520
+#: ../../boot.php:1626
 msgid "Birthdays this week:"
 msgstr "Aniversari aquesta setmana"
 
-#: ../../boot.php:1581
+#: ../../boot.php:1687
 msgid "[No description]"
 msgstr "[sense descripció]"
 
-#: ../../boot.php:1599
+#: ../../boot.php:1705
 msgid "Event Reminders"
 msgstr "Recordatori d'Esdeveniments"
 
-#: ../../boot.php:1600
+#: ../../boot.php:1706
 msgid "Events this week:"
 msgstr "Esdeveniments aquesta setmana"
 
-#: ../../boot.php:1836
+#: ../../boot.php:1942
 msgid "Status Messages and Posts"
 msgstr "Missatges i Enviaments d'Estatus"
 
-#: ../../boot.php:1843
+#: ../../boot.php:1949
 msgid "Profile Details"
 msgstr "Detalls del Perfil"
 
-#: ../../boot.php:1860
+#: ../../boot.php:1960 ../../boot.php:1963
+msgid "Videos"
+msgstr "Vídeos"
+
+#: ../../boot.php:1973
 msgid "Events and Calendar"
 msgstr "Esdeveniments i Calendari"
 
-#: ../../boot.php:1867
+#: ../../boot.php:1980
 msgid "Only You Can See This"
 msgstr "Només ho pots veure tu"
-
-#: ../../object/Item.php:261
-msgid "via"
-msgstr ""
-
-#: ../../index.php:400
-msgid "toggle mobile"
-msgstr ""
-
-#: ../../addon.old/bg/bg.php:51
-msgid "Bg settings updated."
-msgstr "Ajustos de Bg actualitzats."
-
-#: ../../addon.old/bg/bg.php:82
-msgid "Bg Settings"
-msgstr "Ajustos de Bg"
-
-#: ../../addon.old/drpost/drpost.php:35
-msgid "Post to Drupal"
-msgstr "Missatge a Drupal"
-
-#: ../../addon.old/drpost/drpost.php:72
-msgid "Drupal Post Settings"
-msgstr "Configuració d'enviaments a Drupal"
-
-#: ../../addon.old/drpost/drpost.php:74
-msgid "Enable Drupal Post Plugin"
-msgstr "Habilitar el Plugin d'Enviaments de Drupal"
-
-#: ../../addon.old/drpost/drpost.php:79
-msgid "Drupal username"
-msgstr "Nom d'usuari de Drupal"
-
-#: ../../addon.old/drpost/drpost.php:84
-msgid "Drupal password"
-msgstr "Contrasenya de Drupal"
-
-#: ../../addon.old/drpost/drpost.php:89
-msgid "Post Type - article,page,or blog"
-msgstr "Tipus d'Enviament- article,pàgina, o blog"
-
-#: ../../addon.old/drpost/drpost.php:94
-msgid "Drupal site URL"
-msgstr "URL del lloc Drupal"
-
-#: ../../addon.old/drpost/drpost.php:99
-msgid "Drupal site uses clean URLS"
-msgstr "el Lloc Drupal empra URLS netes"
-
-#: ../../addon.old/drpost/drpost.php:104
-msgid "Post to Drupal by default"
-msgstr "Enviar a Drupal per defecte"
-
-#: ../../addon.old/oembed.old/oembed.php:30
-msgid "OEmbed settings updated"
-msgstr "Actualitzar la configuració OEmbed"
-
-#: ../../addon.old/oembed.old/oembed.php:43
-msgid "Use OEmbed for YouTube videos"
-msgstr "Empreu OEmbed per videos YouTube"
-
-#: ../../addon.old/oembed.old/oembed.php:71
-msgid "URL to embed:"
-msgstr "Adreça URL del recurs"
-
-#: ../../addon.old/tumblr/tumblr.php:74
-msgid "Tumblr login"
-msgstr "Inici de sessió de Tumblr"
-
-#: ../../addon.old/tumblr/tumblr.php:79
-msgid "Tumblr password"
-msgstr "Caontrasenya de Tumblr"
diff --git a/view/ca/strings.php b/view/ca/strings.php
index 31e3e7e223..a7adb12e7d 100644
--- a/view/ca/strings.php
+++ b/view/ca/strings.php
@@ -5,1715 +5,25 @@ function string_plural_select_ca($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Post successful."] = "Publicat amb éxit.";
-$a->strings["[Embedded content - reload page to view]"] = "[Contingut embegut - recarrega la pàgina per a veure-ho]";
-$a->strings["Contact settings applied."] = "Ajustos de Contacte aplicats.";
-$a->strings["Contact update failed."] = "Fracassà l'actualització de Contacte";
-$a->strings["Permission denied."] = "Permís denegat.";
-$a->strings["Contact not found."] = "Contacte no trobat";
-$a->strings["Repair Contact Settings"] = "Reposar els ajustos de Contacte";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ADVERTÈNCIA: Això és molt avançat </strong> i si s'introdueix informació incorrecta la seva comunicació amb aquest contacte pot deixar de funcionar.";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Si us plau, prem el botó 'Tornar' <strong>ara</strong> si no saps segur que has de fer aqui.";
-$a->strings["Return to contact editor"] = "Tornar al editor de contactes";
-$a->strings["Name"] = "Nom";
-$a->strings["Account Nickname"] = "Àlies del Compte";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - té prel·lació sobre Nom/Àlies";
-$a->strings["Account URL"] = "Adreça URL del Compte";
-$a->strings["Friend Request URL"] = "Adreça URL de sol·licitud d'Amistat";
-$a->strings["Friend Confirm URL"] = "Adreça URL de confirmació d'Amic";
-$a->strings["Notification Endpoint URL"] = "Adreça URL de Notificació";
-$a->strings["Poll/Feed URL"] = "Adreça de Enquesta/Alimentador";
-$a->strings["New photo from this URL"] = "Nova foto d'aquesta URL";
-$a->strings["Submit"] = "Enviar";
-$a->strings["Help:"] = "Ajuda:";
-$a->strings["Help"] = "Ajuda";
-$a->strings["Not Found"] = "No trobat";
-$a->strings["Page not found."] = "Pàgina no trobada.";
-$a->strings["File exceeds size limit of %d"] = "L'arxiu excedeix la mida límit de %d";
-$a->strings["File upload failed."] = "La càrrega de fitxers ha fallat.";
-$a->strings["Friend suggestion sent."] = "Enviat suggeriment d'amic.";
-$a->strings["Suggest Friends"] = "Suggerir Amics";
-$a->strings["Suggest a friend for %s"] = "Suggerir un amic per a %s";
-$a->strings["Event title and start time are required."] = "Títol d'esdeveniment i hora d'inici requerits.";
-$a->strings["l, F j"] = "l, F j";
-$a->strings["Edit event"] = "Editar esdeveniment";
-$a->strings["link to source"] = "Enllaç al origen";
-$a->strings["Events"] = "Esdeveniments";
-$a->strings["Create New Event"] = "Crear un nou esdeveniment";
-$a->strings["Previous"] = "Previ";
-$a->strings["Next"] = "Següent";
-$a->strings["hour:minute"] = "hora:minut";
-$a->strings["Event details"] = "Detalls del esdeveniment";
-$a->strings["Format is %s %s. Starting date and Title are required."] = "El Format és %s %s. Data d'inici i títol requerits.";
-$a->strings["Event Starts:"] = "Inici d'Esdeveniment:";
-$a->strings["Required"] = "Requerit";
-$a->strings["Finish date/time is not known or not relevant"] = "La data/hora de finalització no es coneixen o no són relevants";
-$a->strings["Event Finishes:"] = "L'esdeveniment Finalitza:";
-$a->strings["Adjust for viewer timezone"] = "Ajustar a la zona horaria de l'espectador";
-$a->strings["Description:"] = "Descripció:";
-$a->strings["Location:"] = "Ubicació:";
-$a->strings["Title:"] = "Títol:";
-$a->strings["Share this event"] = "Compartir aquest esdeveniment";
-$a->strings["System down for maintenance"] = "";
-$a->strings["Cancel"] = "Cancel·lar";
-$a->strings["Tag removed"] = "Etiqueta eliminada";
-$a->strings["Remove Item Tag"] = "Esborrar etiqueta del element";
-$a->strings["Select a tag to remove: "] = "Selecciona etiqueta a esborrar:";
-$a->strings["Remove"] = "Esborrar";
-$a->strings["%1\$s welcomes %2\$s"] = "";
-$a->strings["Authorize application connection"] = "Autoritzi la connexió de aplicacions";
-$a->strings["Return to your app and insert this Securty Code:"] = "Torni a la seva aplicació i inserti aquest Codi de Seguretat:";
-$a->strings["Please login to continue."] = "Per favor, accedeixi per a continuar.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vol autoritzar a aquesta aplicació per accedir als teus missatges i contactes, i/o crear nous enviaments per a vostè?";
-$a->strings["Yes"] = "Si";
-$a->strings["No"] = "No";
-$a->strings["Photo Albums"] = "Àlbum de Fotos";
-$a->strings["Contact Photos"] = "Fotos de Contacte";
-$a->strings["Upload New Photos"] = "Actualitzar Noves Fotos";
-$a->strings["everybody"] = "tothom";
-$a->strings["Contact information unavailable"] = "Informació del Contacte no disponible";
-$a->strings["Profile Photos"] = "Fotos del Perfil";
-$a->strings["Album not found."] = "Àlbum no trobat.";
-$a->strings["Delete Album"] = "Eliminar Àlbum";
-$a->strings["Do you really want to delete this photo album and all its photos?"] = "";
-$a->strings["Delete Photo"] = "Eliminar Foto";
-$a->strings["Do you really want to delete this photo?"] = "";
-$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "";
-$a->strings["a photo"] = "";
-$a->strings["Image exceeds size limit of "] = "La imatge excedeix el límit de ";
-$a->strings["Image file is empty."] = "El fitxer de imatge és buit.";
-$a->strings["Unable to process image."] = "Incapaç de processar la imatge.";
-$a->strings["Image upload failed."] = "Actualització de la imatge fracassada.";
-$a->strings["Public access denied."] = "Accés públic denegat.";
-$a->strings["No photos selected"] = "No s'han seleccionat fotos";
-$a->strings["Access to this item is restricted."] = "L'accés a aquest element està restringit.";
-$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Has emprat %1$.2f Mbytes de %2$.2f Mbytes del magatzem de fotos.";
-$a->strings["Upload Photos"] = "Carregar Fotos";
-$a->strings["New album name: "] = "Nou nom d'àlbum:";
-$a->strings["or existing album name: "] = "o nom d'àlbum existent:";
-$a->strings["Do not show a status post for this upload"] = "No tornis a mostrar un missatge d'estat d'aquesta pujada";
-$a->strings["Permissions"] = "Permisos";
-$a->strings["Show to Groups"] = "";
-$a->strings["Show to Contacts"] = "";
-$a->strings["Private Photo"] = "";
-$a->strings["Public Photo"] = "";
-$a->strings["Edit Album"] = "Editar Àlbum";
-$a->strings["Show Newest First"] = "";
-$a->strings["Show Oldest First"] = "";
-$a->strings["View Photo"] = "Veure Foto";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Permís denegat. L'accés a aquest element pot estar restringit.";
-$a->strings["Photo not available"] = "Foto no disponible";
-$a->strings["View photo"] = "Veure foto";
-$a->strings["Edit photo"] = "Editar foto";
-$a->strings["Use as profile photo"] = "Emprar com a foto del perfil";
-$a->strings["Private Message"] = "Missatge Privat";
-$a->strings["View Full Size"] = "Veure'l a Mida Completa";
-$a->strings["Tags: "] = "Etiquetes:";
-$a->strings["[Remove any tag]"] = "Treure etiquetes";
-$a->strings["Rotate CW (right)"] = "Rotar CW (dreta)";
-$a->strings["Rotate CCW (left)"] = "Rotar CCW (esquerra)";
-$a->strings["New album name"] = "Nou nom d'àlbum";
-$a->strings["Caption"] = "Títol";
-$a->strings["Add a Tag"] = "Afegir una etiqueta";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Exemple: @bob, @Barbara_jensen, @jim@example.com,  #California, #camping";
-$a->strings["Private photo"] = "";
-$a->strings["Public photo"] = "";
-$a->strings["I like this (toggle)"] = "M'agrada això (canviar)";
-$a->strings["I don't like this (toggle)"] = "No m'agrada això (canviar)";
-$a->strings["Share"] = "Compartir";
-$a->strings["Please wait"] = "Si us plau esperi";
-$a->strings["This is you"] = "Aquest ets tu";
-$a->strings["Comment"] = "Comentari";
-$a->strings["Preview"] = "Vista prèvia";
-$a->strings["Delete"] = "Esborrar";
-$a->strings["View Album"] = "Veure Àlbum";
-$a->strings["Recent Photos"] = "Fotos Recents";
-$a->strings["Not available."] = "No disponible.";
-$a->strings["Community"] = "Comunitat";
-$a->strings["No results."] = "Sense resultats.";
-$a->strings["This is Friendica, version"] = "Això és Friendica, versió";
-$a->strings["running at web location"] = "funcionant en la ubicació web";
-$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Si us plau, visiteu <a href=\"http://friendica.com\">Friendica.com</a> per obtenir més informació sobre el projecte Friendica.";
-$a->strings["Bug reports and issues: please visit"] = "Pels informes d'error i problemes: si us plau, visiteu";
-$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Suggeriments, elogis, donacions, etc si us plau escrigui a \"Info\" en Friendica - dot com";
-$a->strings["Installed plugins/addons/apps:"] = "plugins/addons/apps instal·lats:";
-$a->strings["No installed plugins/addons/apps"] = "plugins/addons/apps no instal·lats";
-$a->strings["Item not found"] = "Element no trobat";
-$a->strings["Edit post"] = "Editar Enviament";
-$a->strings["Edit"] = "Editar";
-$a->strings["Upload photo"] = "Carregar foto";
-$a->strings["upload photo"] = "carregar fotos";
-$a->strings["Attach file"] = "Adjunta fitxer";
-$a->strings["attach file"] = "adjuntar arxiu";
-$a->strings["Insert web link"] = "Inserir enllaç web";
-$a->strings["web link"] = "enllaç de web";
-$a->strings["Insert video link"] = "Insertar enllaç de video";
-$a->strings["video link"] = "enllaç de video";
-$a->strings["Insert audio link"] = "Insertar enllaç de audio";
-$a->strings["audio link"] = "enllaç de audio";
-$a->strings["Set your location"] = "Canvia la teva ubicació";
-$a->strings["set location"] = "establir la ubicació";
-$a->strings["Clear browser location"] = "neteja adreçes del navegador";
-$a->strings["clear location"] = "netejar ubicació";
-$a->strings["Permission settings"] = "Configuració de permisos";
-$a->strings["CC: email addresses"] = "CC: Adreça de correu";
-$a->strings["Public post"] = "Enviament públic";
-$a->strings["Set title"] = "Canviar títol";
-$a->strings["Categories (comma-separated list)"] = "Categories (lista separada per comes)";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Exemple: bob@example.com, mary@example.com";
-$a->strings["This introduction has already been accepted."] = "Aquesta presentació ha estat acceptada.";
-$a->strings["Profile location is not valid or does not contain profile information."] = "El perfil de situació no és vàlid o no contè informació de perfil";
-$a->strings["Warning: profile location has no identifiable owner name."] = "Atenció: El perfil de situació no te nom de propietari identificable.";
-$a->strings["Warning: profile location has no profile photo."] = "Atenció: El perfil de situació no te foto de perfil";
-$a->strings["%d required parameter was not found at the given location"] = array(
-	0 => "%d el paràmetre requerit no es va trobar al lloc indicat",
-	1 => "%d els paràmetres requerits no es van trobar allloc indicat",
-);
-$a->strings["Introduction complete."] = "Completada la presentació.";
-$a->strings["Unrecoverable protocol error."] = "Error de protocol irrecuperable.";
-$a->strings["Profile unavailable."] = "Perfil no disponible";
-$a->strings["%s has received too many connection requests today."] = "%s avui ha rebut excesives peticions de connexió. ";
-$a->strings["Spam protection measures have been invoked."] = "Mesures de protecció contra spam han estat invocades.";
-$a->strings["Friends are advised to please try again in 24 hours."] = "S'aconsellà els amics que probin pasades 24 hores.";
-$a->strings["Invalid locator"] = "Localitzador no vàlid";
-$a->strings["Invalid email address."] = "Adreça de correu no vàlida.";
-$a->strings["This account has not been configured for email. Request failed."] = "Aquest compte no s'ha configurat per al correu electrònic. Ha fallat la sol·licitud.";
-$a->strings["Unable to resolve your name at the provided location."] = "Incapaç de resoldre el teu nom al lloc facilitat.";
-$a->strings["You have already introduced yourself here."] = "Has fer la teva presentació aquí.";
-$a->strings["Apparently you are already friends with %s."] = "Aparentment, ja tens amistat amb %s";
-$a->strings["Invalid profile URL."] = "Perfil URL no vàlid.";
-$a->strings["Disallowed profile URL."] = "Perfil URL no permès.";
-$a->strings["Failed to update contact record."] = "Error en actualitzar registre de contacte.";
-$a->strings["Your introduction has been sent."] = "La teva presentació ha estat enviada.";
-$a->strings["Please login to confirm introduction."] = "Si us plau, entri per confirmar la presentació.";
-$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Sesió iniciada amb la identificació incorrecta. Entra en <strong>aquest</strong> perfil.";
-$a->strings["Hide this contact"] = "Amaga aquest contacte";
-$a->strings["Welcome home %s."] = "Benvingut de nou %s";
-$a->strings["Please confirm your introduction/connection request to %s."] = "Si us plau, confirmi la seva sol·licitud de Presentació/Amistat a %s.";
-$a->strings["Confirm"] = "Confirmar";
-$a->strings["[Name Withheld]"] = "[Nom Amagat]";
-$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Si us plau, introdueixi la seva \"Adreça Identificativa\" d'una de les següents xarxes socials suportades:";
-$a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "<strike>Connectar com un seguidor de correu</strike> (Disponible aviat)";
-$a->strings["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>."] = "Si encara no ets membre de la web social lliure, <a href=\"http://dir.friendica.com/siteinfo\">segueix aquest enllaç per a trobar un lloc Friendica públic i uneix-te  avui</a>.";
-$a->strings["Friend/Connection Request"] = "Sol·licitud d'Amistat";
-$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Exemples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
-$a->strings["Please answer the following:"] = "Si us plau, contesti les següents preguntes:";
-$a->strings["Does %s know you?"] = "%s et coneix?";
-$a->strings["Add a personal note:"] = "Afegir una nota personal:";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["StatusNet/Federated Social Web"] = "Web Social StatusNet/Federated ";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - per favor no utilitzi aquest formulari.  Al contrari, entra %s en la barra de cerques de Diaspora.";
-$a->strings["Your Identity Address:"] = "La Teva Adreça Identificativa:";
-$a->strings["Submit Request"] = "Sol·licitud Enviada";
-$a->strings["Account settings"] = "Configuració del compte";
-$a->strings["Display settings"] = "Ajustos de pantalla";
-$a->strings["Connector settings"] = "Configuració dels connectors";
-$a->strings["Plugin settings"] = "Configuració del plugin";
-$a->strings["Connected apps"] = "App connectada";
-$a->strings["Export personal data"] = "Exportar dades personals";
-$a->strings["Remove account"] = "Esborrar compte";
-$a->strings["Settings"] = "Ajustos";
-$a->strings["Export account"] = "";
-$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "";
-$a->strings["Export all"] = "";
-$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "";
-$a->strings["Friendica Social Communications Server - Setup"] = "Friendica Social Communications Server - Ajustos";
-$a->strings["Could not connect to database."] = "No puc connectar a la base de dades.";
-$a->strings["Could not create table."] = "No puc creat taula.";
-$a->strings["Your Friendica site database has been installed."] = "La base de dades del teu lloc Friendica ha estat instal·lada.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Pot ser que hagi d'importar l'arxiu \"database.sql\" manualment amb phpmyadmin o mysql.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Per favor, consulti l'arxiu \"INSTALL.txt\".";
-$a->strings["System check"] = "Comprovació del Sistema";
-$a->strings["Check again"] = "Comprovi de nou";
-$a->strings["Database connection"] = "Conexió a la base de dades";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Per a instal·lar Friendica necessitem conèixer com connectar amb la deva base de dades.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Per favor, posi's en contacte amb el seu proveïdor de hosting o administrador del lloc si té alguna pregunta sobre aquestes opcions.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de dades que especifiques ja hauria d'existir. Si no és així, crea-la abans de continuar.";
-$a->strings["Database Server Name"] = "Nom del Servidor de base de Dades";
-$a->strings["Database Login Name"] = "Nom d'Usuari de la base de Dades";
-$a->strings["Database Login Password"] = "Contrasenya d'Usuari de la base de Dades";
-$a->strings["Database Name"] = "Nom de la base de Dades";
-$a->strings["Site administrator email address"] = "Adreça de correu del administrador del lloc";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "El seu compte d'adreça electrònica ha de coincidir per tal d'utilitzar el panell d'administració web.";
-$a->strings["Please select a default timezone for your website"] = "Per favor, seleccioni una zona horària per defecte per al seu lloc web";
-$a->strings["Site settings"] = "Configuracions del lloc";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No es va poder trobar una versió de línia de comandos de PHP en la ruta del servidor web.";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"] = "Si no tens una versió de línia de comandos instal·lada al teu servidor PHP, no podràs fer córrer els sondejos via cron. Mira <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>";
-$a->strings["PHP executable path"] = "Direcció del executable PHP";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Entra la ruta sencera fins l'executable de php. Pots deixar això buit  per continuar l'instal·lació.";
-$a->strings["Command line PHP"] = "Linia de comandos PHP";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versió de línia de comandos de PHP en el seu sistema no té \"register_argc_argv\" habilitat.";
-$a->strings["This is required for message delivery to work."] = "Això és necessari perquè funcioni el lliurament de missatges.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: la funció \"openssl_pkey_new\" en aquest sistema no és capaç de generar claus de xifrat";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si s'executa en Windows, per favor consulti la secció \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Generate encryption keys"] = "Generar claus d'encripció";
-$a->strings["libCurl PHP module"] = "Mòdul libCurl de PHP";
-$a->strings["GD graphics PHP module"] = "Mòdul GD de gràfics de PHP";
-$a->strings["OpenSSL PHP module"] = "Mòdul OpenSSl de PHP";
-$a->strings["mysqli PHP module"] = "Mòdul mysqli de PHP";
-$a->strings["mb_string PHP module"] = "Mòdul mb_string de PHP";
-$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite modul ";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: el mòdul mod-rewrite del servidor web Apache és necessari però no està instal·lat.";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Error: El mòdul libCURL de PHP és necessari però no està instal·lat.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: el mòdul gràfic GD de PHP amb support per JPEG és necessari però no està instal·lat.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Error: El mòdul enssl de PHP és necessari però no està instal·lat.";
-$a->strings["Error: mysqli PHP module required but not installed."] = "Error: El mòdul mysqli de PHP és necessari però no està instal·lat.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Error: mòdul mb_string de PHP requerit però no instal·lat.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "L'instal·lador web necessita crear un arxiu anomenat \".htconfig.php\" en la carpeta superior del seu servidor web però alguna cosa ho va impedir.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Això freqüentment és a causa d'una configuració de permisos; el servidor web no pot escriure arxius en la carpeta - encara que sigui possible.";
-$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."] = "Al final d'aquest procediment, et facilitarem un text que hauràs de guardar en un arxiu que s'anomena .htconfig.php que hi es a la carpeta principal del teu Friendica.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativament, pots saltar-te aquest procediment i configurar-ho manualment. Per favor, mira l'arxiu \"INTALL.txt\" per a instruccions.";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php és escribible";
-$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."] = "URL rewrite en .htaccess no esta treballant. Comprova la configuració del teu servidor.";
-$a->strings["Url rewrite is working"] = "URL rewrite està treballant";
-$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."] = "L'arxiu per a la configuració de la base de dades \".htconfig.php\" no es pot escriure. Per favor, usi el text adjunt per crear un arxiu de configuració en l'arrel del servidor web.";
-$a->strings["Errors encountered creating database tables."] = "Trobats errors durant la creació de les taules de la base de dades.";
-$a->strings["<h1>What next</h1>"] = "<h1>Que es següent</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: necessitarà configurar [manualment] el programar una tasca pel sondejador (poller.php)";
-$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
-$a->strings["Time Conversion"] = "Temps de Conversió";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "";
-$a->strings["UTC time: %s"] = "hora UTC: %s";
-$a->strings["Current timezone: %s"] = "Zona horària actual: %s";
-$a->strings["Converted localtime: %s"] = "Conversión de hora local: %s";
-$a->strings["Please select your timezone:"] = "Si us plau, seleccioneu la vostra zona horària:";
-$a->strings["Poke/Prod"] = "Atia/Punxa";
-$a->strings["poke, prod or do other things to somebody"] = "Atiar, punxar o fer altres coses a algú";
-$a->strings["Recipient"] = "Recipient";
-$a->strings["Choose what you wish to do to recipient"] = "Tria que vols fer amb el contenidor";
-$a->strings["Make this post private"] = "Fes aquest missatge privat";
-$a->strings["Profile Match"] = "Perfil Aconseguit";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hi ha paraules clau que coincideixin. Si us plau, afegeixi paraules clau al teu perfil predeterminat.";
-$a->strings["is interested in:"] = "està interessat en:";
-$a->strings["Connect"] = "Connexió";
-$a->strings["No matches"] = "No hi ha coincidències";
-$a->strings["Remote privacy information not available."] = "Informació de privacitat remota no disponible.";
-$a->strings["Visible to:"] = "Visible per a:";
-$a->strings["No such group"] = "Cap grup com";
-$a->strings["Group is empty"] = "El Grup es buit";
-$a->strings["Group: "] = "Grup:";
-$a->strings["Select"] = "Selecionar";
-$a->strings["View %s's profile @ %s"] = "Veure perfil de %s @ %s";
-$a->strings["%s from %s"] = "%s des de %s";
-$a->strings["View in context"] = "Veure en context";
-$a->strings["%d comment"] = array(
-	0 => "%d comentari",
-	1 => "%d comentaris",
-);
-$a->strings["comment"] = array(
-	0 => "",
-	1 => "comentari",
-);
-$a->strings["show more"] = "Mostrar més";
-$a->strings["like"] = "Agrada";
-$a->strings["dislike"] = "Desagrada";
-$a->strings["Share this"] = "Compartir això";
-$a->strings["share"] = "Compartir";
-$a->strings["Bold"] = "Negreta";
-$a->strings["Italic"] = "Itallica";
-$a->strings["Underline"] = "Subratllat";
-$a->strings["Quote"] = "Cometes";
-$a->strings["Code"] = "Codi";
-$a->strings["Image"] = "Imatge";
-$a->strings["Link"] = "Enllaç";
-$a->strings["Video"] = "Video";
-$a->strings["add star"] = "Afegir a favorits";
-$a->strings["remove star"] = "Esborrar favorit";
-$a->strings["toggle star status"] = "Canviar estatus de favorit";
-$a->strings["starred"] = "favorit";
-$a->strings["add tag"] = "afegir etiqueta";
-$a->strings["save to folder"] = "guardat a la carpeta";
-$a->strings["to"] = "a";
-$a->strings["Wall-to-Wall"] = "Mur-a-Mur";
-$a->strings["via Wall-To-Wall:"] = "via Mur-a-Mur";
-$a->strings["Welcome to %s"] = "Benvingut a %s";
-$a->strings["Invalid request identifier."] = "Sol·licitud d'identificació no vàlida.";
-$a->strings["Discard"] = "Descartar";
-$a->strings["Ignore"] = "Ignorar";
-$a->strings["System"] = "Sistema";
-$a->strings["Network"] = "Xarxa";
-$a->strings["Personal"] = "Personal";
-$a->strings["Home"] = "Inici";
-$a->strings["Introductions"] = "Presentacions";
-$a->strings["Messages"] = "Missatges";
-$a->strings["Show Ignored Requests"] = "Mostra les Sol·licituds Ignorades";
-$a->strings["Hide Ignored Requests"] = "Amaga les Sol·licituds Ignorades";
-$a->strings["Notification type: "] = "Tipus de Notificació:";
-$a->strings["Friend Suggestion"] = "Amics Suggerits ";
-$a->strings["suggested by %s"] = "sugerit per %s";
-$a->strings["Hide this contact from others"] = "Amaga aquest contacte dels altres";
-$a->strings["Post a new friend activity"] = "Publica una activitat  d'amic nova";
-$a->strings["if applicable"] = "si es pot aplicar";
-$a->strings["Approve"] = "Aprovar";
-$a->strings["Claims to be known to you: "] = "Diu que et coneix:";
-$a->strings["yes"] = "sí";
-$a->strings["no"] = "no";
-$a->strings["Approve as: "] = "Aprovat com:";
-$a->strings["Friend"] = "Amic";
-$a->strings["Sharer"] = "Partícip";
-$a->strings["Fan/Admirer"] = "Fan/Admirador";
-$a->strings["Friend/Connect Request"] = "Sol·licitud d'Amistat/Connexió";
-$a->strings["New Follower"] = "Nou Seguidor";
-$a->strings["No introductions."] = "Sense presentacions.";
-$a->strings["Notifications"] = "Notificacions";
-$a->strings["%s liked %s's post"] = "A %s li agrada l'enviament de %s";
-$a->strings["%s disliked %s's post"] = "A %s no li agrada l'enviament de %s";
-$a->strings["%s is now friends with %s"] = "%s es ara amic de %s";
-$a->strings["%s created a new post"] = "%s ha creat un enviament nou";
-$a->strings["%s commented on %s's post"] = "%s va comentar en l'enviament de %s";
-$a->strings["No more network notifications."] = "No més notificacions de xarxa.";
-$a->strings["Network Notifications"] = "Notificacions de la Xarxa";
-$a->strings["No more system notifications."] = "No més notificacions del sistema.";
-$a->strings["System Notifications"] = "Notificacions del Sistema";
-$a->strings["No more personal notifications."] = "No més notificacions personals.";
-$a->strings["Personal Notifications"] = "Notificacions Personals";
-$a->strings["No more home notifications."] = "No més notificacions d'inici.";
-$a->strings["Home Notifications"] = "Notificacions d'Inici";
-$a->strings["Could not access contact record."] = "No puc accedir al registre del contacte.";
-$a->strings["Could not locate selected profile."] = "No puc localitzar el perfil seleccionat.";
-$a->strings["Contact updated."] = "Contacte actualitzat.";
-$a->strings["Contact has been blocked"] = "Elcontacte ha estat bloquejat";
-$a->strings["Contact has been unblocked"] = "El contacte ha estat desbloquejat";
-$a->strings["Contact has been ignored"] = "El contacte ha estat ignorat";
-$a->strings["Contact has been unignored"] = "El contacte ha estat recordat";
-$a->strings["Contact has been archived"] = "El contacte ha estat arxivat";
-$a->strings["Contact has been unarchived"] = "El contacte ha estat desarxivat";
-$a->strings["Do you really want to delete this contact?"] = "";
-$a->strings["Contact has been removed."] = "El contacte ha estat tret";
-$a->strings["You are mutual friends with %s"] = "Ara te una amistat mutua amb %s";
-$a->strings["You are sharing with %s"] = "Estas compartint amb %s";
-$a->strings["%s is sharing with you"] = "%s esta compartint amb tú";
-$a->strings["Private communications are not available for this contact."] = "Comunicacions privades no disponibles per aquest contacte.";
-$a->strings["Never"] = "Mai";
-$a->strings["(Update was successful)"] = "(L'actualització fou exitosa)";
-$a->strings["(Update was not successful)"] = "(L'actualització fracassà)";
-$a->strings["Suggest friends"] = "Suggerir amics";
-$a->strings["Network type: %s"] = "Xarxa tipus: %s";
-$a->strings["%d contact in common"] = array(
-	0 => "%d contacte en comú",
-	1 => "%d contactes en comú",
-);
-$a->strings["View all contacts"] = "Veure tots els contactes";
-$a->strings["Unblock"] = "Desbloquejar";
-$a->strings["Block"] = "Bloquejar";
-$a->strings["Toggle Blocked status"] = "Canvi de estatus blocat";
-$a->strings["Unignore"] = "Treure d'Ignorats";
-$a->strings["Toggle Ignored status"] = "Canvi de estatus ignorat";
-$a->strings["Unarchive"] = "Desarxivat";
-$a->strings["Archive"] = "Arxivat";
-$a->strings["Toggle Archive status"] = "Canvi de estatus del arxiu";
-$a->strings["Repair"] = "Reparar";
-$a->strings["Advanced Contact Settings"] = "Ajustos Avançats per als Contactes";
-$a->strings["Communications lost with this contact!"] = "La comunicació amb aquest contacte s'ha perdut!";
-$a->strings["Contact Editor"] = "Editor de Contactes";
-$a->strings["Profile Visibility"] = "Perfil de Visibilitat";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Si us plau triï el perfil que voleu mostrar a %s quan estigui veient el teu de forma segura.";
-$a->strings["Contact Information / Notes"] = "Informació/Notes del contacte";
-$a->strings["Edit contact notes"] = "Editar notes de contactes";
-$a->strings["Visit %s's profile [%s]"] = "Visitar perfil de %s [%s]";
-$a->strings["Block/Unblock contact"] = "Bloquejar/Alliberar contacte";
-$a->strings["Ignore contact"] = "Ignore contacte";
-$a->strings["Repair URL settings"] = "Restablir configuració de URL";
-$a->strings["View conversations"] = "Veient conversacions";
-$a->strings["Delete contact"] = "Esborrar contacte";
-$a->strings["Last update:"] = "Última actualització:";
-$a->strings["Update public posts"] = "Actualitzar enviament públic";
-$a->strings["Update now"] = "Actualitza ara";
-$a->strings["Currently blocked"] = "Bloquejat actualment";
-$a->strings["Currently ignored"] = "Ignorat actualment";
-$a->strings["Currently archived"] = "Actualment arxivat";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Répliques/agraiments per als teus missatges públics <strong>poden</strong> romandre visibles";
-$a->strings["Suggestions"] = "Suggeriments";
-$a->strings["Suggest potential friends"] = "Suggerir amics potencials";
-$a->strings["All Contacts"] = "Tots els Contactes";
-$a->strings["Show all contacts"] = "Mostrar tots els contactes";
-$a->strings["Unblocked"] = "Desblocat";
-$a->strings["Only show unblocked contacts"] = "Mostrar únicament els contactes no blocats";
-$a->strings["Blocked"] = "Blocat";
-$a->strings["Only show blocked contacts"] = "Mostrar únicament els contactes blocats";
-$a->strings["Ignored"] = "Ignorat";
-$a->strings["Only show ignored contacts"] = "Mostrar únicament els contactes ignorats";
-$a->strings["Archived"] = "Arxivat";
-$a->strings["Only show archived contacts"] = "Mostrar únicament els contactes arxivats";
-$a->strings["Hidden"] = "Amagat";
-$a->strings["Only show hidden contacts"] = "Mostrar únicament els contactes amagats";
-$a->strings["Mutual Friendship"] = "Amistat Mutua";
-$a->strings["is a fan of yours"] = "Es un fan teu";
-$a->strings["you are a fan of"] = "ets fan de";
-$a->strings["Edit contact"] = "Editar contacte";
-$a->strings["Contacts"] = "Contactes";
-$a->strings["Search your contacts"] = "Cercant el seus contactes";
-$a->strings["Finding: "] = "Cercant:";
-$a->strings["Find"] = "Cercar";
-$a->strings["No valid account found."] = "compte no vàlid trobat.";
-$a->strings["Password reset request issued. Check your email."] = "Sol·licitut de restabliment de contrasenya enviat. Comprovi el seu correu.";
-$a->strings["Password reset requested at %s"] = "Contrasenya restablerta enviada a %s";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La sol·licitut no pot ser verificada. (Hauries de presentar-la abans). Restabliment de contrasenya fracassat.";
-$a->strings["Password Reset"] = "Restabliment de Contrasenya";
-$a->strings["Your password has been reset as requested."] = "La teva contrasenya fou restablerta com vas demanar.";
-$a->strings["Your new password is"] = "La teva nova contrasenya es";
-$a->strings["Save or copy your new password - and then"] = "Guarda o copia la nova contrasenya - i llavors";
-$a->strings["click here to login"] = "clica aquí per identificarte";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Pots camviar la contrasenya des de la pàgina de <em>Configuración</em> desprès d'accedir amb èxit.";
-$a->strings["Your password has been changed at %s"] = "";
-$a->strings["Forgot your Password?"] = "Has Oblidat la Contrasenya?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introdueixi la seva adreça de correu i enivii-la per restablir la seva contrasenya. Llavors comprovi el seu correu per a les següents instruccións. ";
-$a->strings["Nickname or Email: "] = "Àlies o Correu:";
-$a->strings["Reset"] = "Restablir";
-$a->strings["Additional features"] = "";
-$a->strings["Missing some important data!"] = "Perdudes algunes dades importants!";
-$a->strings["Update"] = "Actualitzar";
-$a->strings["Failed to connect with email account using the settings provided."] = "Connexió fracassada amb el compte de correu emprant la configuració proveïda.";
-$a->strings["Email settings updated."] = "Configuració del correu electrònic actualitzada.";
-$a->strings["Features updated"] = "";
-$a->strings["Passwords do not match. Password unchanged."] = "Les contrasenyes no coincideixen. Contrasenya no canviada.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "No es permeten contasenyes buides. Contrasenya no canviada";
-$a->strings["Password changed."] = "Contrasenya canviada.";
-$a->strings["Password update failed. Please try again."] = "Ha fallat l'actualització de la Contrasenya. Per favor, intenti-ho de nou.";
-$a->strings[" Please use a shorter name."] = "Si us plau, faci servir un nom més curt.";
-$a->strings[" Name too short."] = "Nom massa curt.";
-$a->strings[" Not valid email."] = "Correu no vàlid.";
-$a->strings[" Cannot change to that email."] = "No puc canviar a aquest correu.";
-$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Els Fòrums privats no tenen permisos de privacitat. Empra la privacitat de grup per defecte.";
-$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Els Fòrums privats no tenen permisos de privacitat i tampoc privacitat per defecte de grup.";
-$a->strings["Settings updated."] = "Ajustos actualitzats.";
-$a->strings["Add application"] = "Afegir aplicació";
-$a->strings["Consumer Key"] = "Consumer Key";
-$a->strings["Consumer Secret"] = "Consumer Secret";
-$a->strings["Redirect"] = "Redirigir";
-$a->strings["Icon url"] = "icona de url";
-$a->strings["You can't edit this application."] = "No pots editar aquesta aplicació.";
-$a->strings["Connected Apps"] = "Aplicacions conectades";
-$a->strings["Client key starts with"] = "Les claus de client comançen amb";
-$a->strings["No name"] = "Sense nom";
-$a->strings["Remove authorization"] = "retirar l'autorització";
-$a->strings["No Plugin settings configured"] = "No s'han configurat ajustos de Plugin";
-$a->strings["Plugin Settings"] = "Ajustos de Plugin";
-$a->strings["Off"] = "";
-$a->strings["On"] = "";
-$a->strings["Additional Features"] = "";
-$a->strings["Built-in support for %s connectivity is %s"] = "El suport integrat per a la connectivitat de %s és %s";
-$a->strings["enabled"] = "habilitat";
-$a->strings["disabled"] = "deshabilitat";
-$a->strings["StatusNet"] = "StatusNet";
-$a->strings["Email access is disabled on this site."] = "L'accés al correu està deshabilitat en aquest lloc.";
-$a->strings["Connector Settings"] = "Configuració de connectors";
-$a->strings["Email/Mailbox Setup"] = "Preparació de Correu/Bústia";
-$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Si vol comunicar-se amb els contactes de correu emprant aquest servei (opcional), Si us plau, especifiqui com connectar amb la seva bústia.";
-$a->strings["Last successful email check:"] = "Última comprovació de correu amb èxit:";
-$a->strings["IMAP server name:"] = "Nom del servidor IMAP:";
-$a->strings["IMAP port:"] = "Port IMAP:";
-$a->strings["Security:"] = "Seguretat:";
-$a->strings["None"] = "Cap";
-$a->strings["Email login name:"] = "Nom d'usuari del correu";
-$a->strings["Email password:"] = "Contrasenya del correu:";
-$a->strings["Reply-to address:"] = "Adreça de resposta:";
-$a->strings["Send public posts to all email contacts:"] = "Enviar correu públic a tots els contactes del correu:";
-$a->strings["Action after import:"] = "Acció després d'importar:";
-$a->strings["Mark as seen"] = "Marcar com a vist";
-$a->strings["Move to folder"] = "Moure a la carpeta";
-$a->strings["Move to folder:"] = "Moure a la carpeta:";
-$a->strings["No special theme for mobile devices"] = "";
-$a->strings["Display Settings"] = "Ajustos de Pantalla";
-$a->strings["Display Theme:"] = "Visualitzar el Tema:";
-$a->strings["Mobile Theme:"] = "";
-$a->strings["Update browser every xx seconds"] = "Actualitzar navegador cada xx segons";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Mínim cada 10 segons, no hi ha màxim";
-$a->strings["Number of items to display per page:"] = "Número d'elements a mostrar per pàgina";
-$a->strings["Maximum of 100 items"] = "Màxim de 100 elements";
-$a->strings["Don't show emoticons"] = "No mostrar emoticons";
-$a->strings["Normal Account Page"] = "Pàgina Normal del Compte ";
-$a->strings["This account is a normal personal profile"] = "Aques compte es un compte personal normal";
-$a->strings["Soapbox Page"] = "Pàgina de Soapbox";
-$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de només lectura.";
-$a->strings["Community Forum/Celebrity Account"] = "Compte de Comunitat/Celebritat";
-$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de lectura-escriptura";
-$a->strings["Automatic Friend Page"] = "Compte d'Amistat Automàtica";
-$a->strings["Automatically approve all connection/friend requests as friends"] = "Aprova totes les sol·licituds de amistat/connexió com a amic automàticament";
-$a->strings["Private Forum [Experimental]"] = "Fòrum Privat [Experimental]";
-$a->strings["Private forum - approved members only"] = "Fòrum privat - Només membres aprovats";
-$a->strings["OpenID:"] = "OpenID:";
-$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Opcional) Permetre a aquest OpenID iniciar sessió en aquest compte.";
-$a->strings["Publish your default profile in your local site directory?"] = "Publicar el teu perfil predeterminat en el directori del lloc local?";
-$a->strings["Publish your default profile in the global social directory?"] = "Publicar el teu perfil predeterminat al directori social global?";
-$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Amaga la teva llista de contactes/amics dels espectadors del seu perfil per defecte?";
-$a->strings["Hide your profile details from unknown viewers?"] = "Amagar els detalls del seu perfil a espectadors desconeguts?";
-$a->strings["Allow friends to post to your profile page?"] = "Permet als amics publicar en la seva pàgina de perfil?";
-$a->strings["Allow friends to tag your posts?"] = "Permet als amics d'etiquetar els teus missatges?";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Permeteu-nos suggerir-li com un amic potencial dels nous membres?";
-$a->strings["Permit unknown people to send you private mail?"] = "Permetre a desconeguts enviar missatges al teu correu privat?";
-$a->strings["Profile is <strong>not published</strong>."] = "El  Perfil <strong>no està publicat</strong>.";
-$a->strings["or"] = "o";
-$a->strings["Your Identity Address is"] = "La seva Adreça d'Identitat és";
-$a->strings["Automatically expire posts after this many days:"] = "Després de aquests nombre de dies, els missatges caduquen automàticament:";
-$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Si està buit, els missatges no caducarà. Missatges caducats s'eliminaran";
-$a->strings["Advanced expiration settings"] = "Configuració avançada d'expiració";
-$a->strings["Advanced Expiration"] = "Expiració Avançada";
-$a->strings["Expire posts:"] = "Expiració d'enviaments";
-$a->strings["Expire personal notes:"] = "Expiració de notes personals";
-$a->strings["Expire starred posts:"] = "Expiració de enviaments de favorits";
-$a->strings["Expire photos:"] = "Expiració de fotos";
-$a->strings["Only expire posts by others:"] = "Només expiren els enviaments dels altres:";
-$a->strings["Account Settings"] = "Ajustos de Compte";
-$a->strings["Password Settings"] = "Ajustos de Contrasenya";
-$a->strings["New Password:"] = "Nova Contrasenya:";
-$a->strings["Confirm:"] = "Confirmar:";
-$a->strings["Leave password fields blank unless changing"] = "Deixi els camps de contrasenya buits per a no fer canvis";
-$a->strings["Basic Settings"] = "Ajustos Basics";
-$a->strings["Full Name:"] = "Nom Complet:";
-$a->strings["Email Address:"] = "Adreça de Correu:";
-$a->strings["Your Timezone:"] = "La teva zona Horària:";
-$a->strings["Default Post Location:"] = "Localització per Defecte del Missatge:";
-$a->strings["Use Browser Location:"] = "Ubicar-se amb el Navegador:";
-$a->strings["Security and Privacy Settings"] = "Ajustos de Seguretat i Privacitat";
-$a->strings["Maximum Friend Requests/Day:"] = "Nombre Màxim de Sol·licituds per Dia";
-$a->strings["(to prevent spam abuse)"] = "(per a prevenir abusos de spam)";
-$a->strings["Default Post Permissions"] = "Permisos de Correu per Defecte";
-$a->strings["(click to open/close)"] = "(clicar per a obrir/tancar)";
-$a->strings["Default Private Post"] = "";
-$a->strings["Default Public Post"] = "";
-$a->strings["Default Permissions for New Posts"] = "";
-$a->strings["Maximum private messages per day from unknown people:"] = "Màxim nombre de missatges, per dia, de desconeguts:";
-$a->strings["Notification Settings"] = "Ajustos de Notificació";
-$a->strings["By default post a status message when:"] = "Enviar per defecte un missatge de estatus quan:";
-$a->strings["accepting a friend request"] = "Acceptar una sol·licitud d'amistat";
-$a->strings["joining a forum/community"] = "Unint-se a un fòrum/comunitat";
-$a->strings["making an <em>interesting</em> profile change"] = "fent un <em interesant</em> canvi al perfil";
-$a->strings["Send a notification email when:"] = "Envia un correu notificant quan:";
-$a->strings["You receive an introduction"] = "Has rebut una presentació";
-$a->strings["Your introductions are confirmed"] = "La teva presentació està confirmada";
-$a->strings["Someone writes on your profile wall"] = "Algú ha escrit en el teu mur de perfil";
-$a->strings["Someone writes a followup comment"] = "Algú ha escrit un comentari de seguiment";
-$a->strings["You receive a private message"] = "Has rebut un missatge privat";
-$a->strings["You receive a friend suggestion"] = "Has rebut una suggerencia d'un amic";
-$a->strings["You are tagged in a post"] = "Estàs etiquetat en un enviament";
-$a->strings["You are poked/prodded/etc. in a post"] = "Has estat Atiat/punxat/etc, en un enviament";
-$a->strings["Advanced Account/Page Type Settings"] = "Ajustos Avançats de Compte/ Pàgina";
-$a->strings["Change the behaviour of this account for special situations"] = "Canviar el comportament d'aquest compte en situacions especials";
-$a->strings["Manage Identities and/or Pages"] = "Administrar Identitats i/o  Pàgines";
-$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Alternar entre les diferents identitats o les pàgines de comunitats/grups que comparteixen les dades del seu compte o que se li ha concedit els permisos de \"administrar\"";
-$a->strings["Select an identity to manage: "] = "Seleccionar identitat a administrar:";
-$a->strings["Search Results For:"] = "Resultats de la Cerca Per a:";
-$a->strings["Remove term"] = "Traieu termini";
-$a->strings["Saved Searches"] = "Cerques Guardades";
-$a->strings["add"] = "afegir";
-$a->strings["Commented Order"] = "Ordre dels Comentaris";
-$a->strings["Sort by Comment Date"] = "Ordenar per Data de Comentari";
-$a->strings["Posted Order"] = "Ordre dels Enviaments";
-$a->strings["Sort by Post Date"] = "Ordenar per Data d'Enviament";
-$a->strings["Posts that mention or involve you"] = "Missatge que et menciona o t'impliquen";
-$a->strings["New"] = "Nou";
-$a->strings["Activity Stream - by date"] = "Activitat del Flux - per data";
-$a->strings["Shared Links"] = "Enllaços Compartits";
-$a->strings["Interesting Links"] = "Enllaços Interesants";
-$a->strings["Starred"] = "Favorits";
-$a->strings["Favourite Posts"] = "Enviaments Favorits";
-$a->strings["Warning: This group contains %s member from an insecure network."] = array(
-	0 => "Advertència: Aquest grup conté el membre %s en una xarxa insegura.",
-	1 => "Advertència: Aquest grup conté %s membres d'una xarxa insegura.",
-);
-$a->strings["Private messages to this group are at risk of public disclosure."] = "Els missatges privats a aquest grup es troben en risc de divulgació pública.";
-$a->strings["Contact: "] = "Contacte:";
-$a->strings["Private messages to this person are at risk of public disclosure."] = "Els missatges privats a aquesta persona es troben en risc de divulgació pública.";
-$a->strings["Invalid contact."] = "Contacte no vàlid.";
-$a->strings["Personal Notes"] = "Notes Personals";
-$a->strings["Save"] = "Guardar";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Aquest lloc excedeix el nombre diari de registres de comptes. Per favor, provi de nou demà.";
-$a->strings["Import"] = "";
-$a->strings["Move account"] = "";
-$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."] = "Nombre diari de missatges al mur per %s excedit. El missatge ha fallat.";
-$a->strings["No recipient selected."] = "No s'ha seleccionat destinatari.";
-$a->strings["Unable to check your home location."] = "Incapaç de comprovar la localització.";
-$a->strings["Message could not be sent."] = "El Missatge no ha estat enviat.";
-$a->strings["Message collection failure."] = "Ha fallat la recollida del missatge.";
-$a->strings["Message sent."] = "Missatge enviat.";
-$a->strings["No recipient."] = "Sense destinatari.";
-$a->strings["Please enter a link URL:"] = "Sius plau, entri l'enllaç URL:";
-$a->strings["Send Private Message"] = "Enviant Missatge Privat";
-$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "si vols respondre a %s, comprova que els ajustos de privacitat del lloc permeten correus privats de remitents desconeguts.";
-$a->strings["To:"] = "Per a:";
-$a->strings["Subject:"] = "Assumpte::";
-$a->strings["Your message:"] = "El teu missatge:";
-$a->strings["Welcome to Friendica"] = "Benvingut a Friendica";
-$a->strings["New Member Checklist"] = "Llista de Verificació dels Nous Membres";
-$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Ens agradaria oferir alguns consells i enllaços per ajudar a fer la teva experiència agradable. Feu clic a qualsevol element per visitar la pàgina corresponent. Un enllaç a aquesta pàgina serà visible des de la pàgina d'inici durant dues setmanes després de la teva inscripció inicial i després desapareixerà en silenci.";
-$a->strings["Getting Started"] = "";
-$a->strings["Friendica Walk-Through"] = "";
-$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "";
-$a->strings["Go to Your Settings"] = "Anar als Teus Ajustos";
-$a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "En la  de la seva <em>configuració</em> de la pàgina - canviï la contrasenya inicial. També prengui nota de la Adreça d'Identitat. Això s'assembla a una adreça de correu electrònic - i serà útil per fer amics a la xarxa social lliure.";
-$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Reviseu les altres configuracions, en particular la configuració de privadesa. Una llista de directoris no publicada és com tenir un número de telèfon no llistat. Normalment, hauria de publicar la seva llista - a menys que tots els seus amics i els amics potencials sàpiguen exactament com trobar-li.";
 $a->strings["Profile"] = "Perfil";
-$a->strings["Upload Profile Photo"] = "Pujar Foto del Perfil";
-$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Puji una foto del seu perfil si encara no ho ha fet. Els estudis han demostrat que les persones amb fotos reals de ells mateixos tenen deu vegades més probabilitats de fer amics que les persones que no ho fan.";
-$a->strings["Edit Your Profile"] = "Editar el Teu Perfil";
-$a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editi  el perfil per <strong>defecte</strong> al seu gust. Reviseu la configuració per ocultar la seva llista d'amics i ocultar el perfil dels visitants desconeguts.";
-$a->strings["Profile Keywords"] = "Paraules clau del Perfil";
-$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Estableix algunes paraules clau públiques al teu perfil predeterminat que descriguin els teus interessos. Podem ser capaços de trobar altres persones amb interessos similars i suggerir amistats.";
-$a->strings["Connecting"] = "Connectant";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Autoritzi el connector de Facebook si vostè té un compte al Facebook i nosaltres (opcionalment) importarem tots els teus amics de Facebook i les converses.";
-$a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Si </em> aquesta és el seu servidor personal, la instal·lació del complement de Facebook pot facilitar la transició a la web social lliure.";
-$a->strings["Importing Emails"] = "Important Emails";
-$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Introduïu les dades d'accés al correu electrònic a la seva pàgina de configuració de connector, si es desitja importar i relacionar-se amb amics o llistes de correu de la seva bústia d'email";
-$a->strings["Go to Your Contacts Page"] = "Anar a la Teva Pàgina de Contactes";
-$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog."] = "La seva pàgina de Contactes és la seva porta d'entrada a la gestió de l'amistat i la connexió amb amics d'altres xarxes. Normalment, vostè entrar en la seva direcció o URL del lloc al  diàleg <em>Afegir Nou Contacte</em>.";
-$a->strings["Go to Your Site's Directory"] = "Anar al Teu Directori";
-$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "La pàgina del Directori li permet trobar altres persones en aquesta xarxa o altres llocs federats. Busqui un enllaç <em>Connectar</em> o <em>Seguir</em> a la seva pàgina de perfil. Proporcioni la seva pròpia Adreça de Identitat si així ho sol·licita.";
-$a->strings["Finding New People"] = "Trobar Gent Nova";
-$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."] = "Al tauler lateral de la pàgina de contacte Hi ha diverses eines per trobar nous amics. Podem coincidir amb les persones per interesos, buscar persones pel nom o per interès, i oferir suggeriments basats en les relacions de la xarxa. En un nou lloc, els suggeriments d'amics, en general comencen a poblar el lloc a les 24 hores.";
-$a->strings["Groups"] = "Grups";
-$a->strings["Group Your Contacts"] = "Agrupar els Teus Contactes";
-$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."] = "Una vegada que s'han fet alguns amics, organitzi'ls en grups de conversa privada a la barra lateral de la seva pàgina de contactes i després pot interactuar amb cada grup de forma privada a la pàgina de la xarxa.";
-$a->strings["Why Aren't My Posts Public?"] = "Per que no es public el meu enviament?";
-$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respecta la teva privacitat. Per defecte, els teus enviaments només s'envien a gent que has afegit com a amic. Per més informació, mira la secció d'ajuda des de l'enllaç de dalt.";
-$a->strings["Getting Help"] = "Demanant Ajuda";
-$a->strings["Go to the Help Section"] = "Anar a la secció d'Ajuda";
-$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "A les nostres pàgines <strong>d'ajuda</strong> es poden consultar detalls sobre les característiques d'altres programes i recursos.";
-$a->strings["Item not available."] = "Element no disponible";
-$a->strings["Item was not found."] = "Element no trobat.";
-$a->strings["Group created."] = "Grup creat.";
-$a->strings["Could not create group."] = "No puc crear grup.";
-$a->strings["Group not found."] = "Grup no trobat";
-$a->strings["Group name changed."] = "Nom de Grup canviat.";
-$a->strings["Permission denied"] = "Permís denegat";
-$a->strings["Create a group of contacts/friends."] = "Crear un grup de contactes/amics.";
-$a->strings["Group Name: "] = "Nom del Grup:";
-$a->strings["Group removed."] = "Grup esborrat.";
-$a->strings["Unable to remove group."] = "Incapaç de esborrar Grup.";
-$a->strings["Group Editor"] = "Editor de Grup:";
-$a->strings["Members"] = "Membres";
-$a->strings["Click on a contact to add or remove."] = "Clicar sobre el contacte per afegir o esborrar.";
-$a->strings["Invalid profile identifier."] = "Identificador del perfil no vàlid.";
-$a->strings["Profile Visibility Editor"] = "Editor de Visibilitat del Perfil";
-$a->strings["Visible To"] = "Visible Per";
-$a->strings["All Contacts (with secure profile access)"] = "Tots els Contactes (amb accés segur al perfil)";
-$a->strings["No contacts."] = "Sense Contactes";
-$a->strings["View Contacts"] = "Veure Contactes";
-$a->strings["Registration details for %s"] = "Detalls del registre per a %s";
-$a->strings["Registration successful. Please check your email for further instructions."] = "Registrat amb èxit. Per favor, comprovi el seu correu per a posteriors instruccions.";
-$a->strings["Failed to send email message. Here is the message that failed."] = "Error en enviar missatge de correu electrònic. Aquí està el missatge que ha fallat.";
-$a->strings["Your registration can not be processed."] = "El seu registre no pot ser processat.";
-$a->strings["Registration request at %s"] = "Sol·licitud de registre a %s";
-$a->strings["Your registration is pending approval by the site owner."] = "El seu registre està pendent d'aprovació pel propietari del lloc.";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vostè pot (opcionalment), omplir aquest formulari a través de OpenID mitjançant el subministrament de la seva OpenID i fent clic a 'Registrar'.";
-$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si vostè no està familiaritzat amb Twitter, si us plau deixi aquest camp en blanc i completi la resta dels elements.";
-$a->strings["Your OpenID (optional): "] = "El seu OpenID (opcional):";
-$a->strings["Include your profile in member directory?"] = "Incloc el seu perfil al directori de membres?";
-$a->strings["Membership on this site is by invitation only."] = "Lloc accesible mitjançant invitació.";
-$a->strings["Your invitation ID: "] = "El teu ID de invitació:";
-$a->strings["Registration"] = "Procés de Registre";
-$a->strings["Your Full Name (e.g. Joe Smith): "] = "El seu nom complet (per exemple, Joan Ningú):";
-$a->strings["Your Email Address: "] = "La Seva Adreça de Correu:";
-$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Tria un nom de perfil. Això ha de començar amb un caràcter de text. La seva adreça de perfil en aquest lloc serà '<strong>alies@\$sitename</strong>'.";
-$a->strings["Choose a nickname: "] = "Tria un àlies:";
-$a->strings["Register"] = "Registrar";
-$a->strings["People Search"] = "Cercant Gent";
-$a->strings["photo"] = "foto";
-$a->strings["status"] = "estatus";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s agrada %2\$s de %3\$s";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "a %1\$s no agrada %2\$s de %3\$s";
-$a->strings["Item not found."] = "Article no trobat.";
-$a->strings["Access denied."] = "Accés denegat.";
-$a->strings["Photos"] = "Fotos";
-$a->strings["Files"] = "Arxius";
-$a->strings["Account approved."] = "Compte aprovat.";
-$a->strings["Registration revoked for %s"] = "Procés de Registre revocat per a %s";
-$a->strings["Please login."] = "Si us plau, ingressa.";
-$a->strings["Unable to locate original post."] = "No es pot localitzar post original.";
-$a->strings["Empty post discarded."] = "Buidat després de rebutjar.";
-$a->strings["Wall Photos"] = "Fotos del Mur";
-$a->strings["System error. Post not saved."] = "Error del sistema. Publicació no guardada.";
-$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Aquest missatge va ser enviat a vostè per %s, un membre de la xarxa social Friendica.";
-$a->strings["You may visit them online at %s"] = "El pot visitar en línia a %s";
-$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Si us plau, poseu-vos en contacte amb el remitent responent a aquest missatge si no voleu rebre aquests missatges.";
-$a->strings["%s posted an update."] = "%s ha publicat una actualització.";
-$a->strings["%1\$s is currently %2\$s"] = "%1\$s es normalment %2\$s";
-$a->strings["Mood"] = "";
-$a->strings["Set your current mood and tell your friends"] = "";
-$a->strings["Image uploaded but image cropping failed."] = "Imatge pujada però no es va poder retallar.";
-$a->strings["Image size reduction [%s] failed."] = "La reducció de la imatge [%s] va fracassar.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recarregui la pàgina o netegi la caché del navegador si la nova foto no apareix immediatament.";
-$a->strings["Unable to process image"] = "No es pot processar la imatge";
-$a->strings["Image exceeds size limit of %d"] = "La imatge sobrepassa el límit de mida de %d";
-$a->strings["Upload File:"] = "Pujar arxiu:";
-$a->strings["Select a profile:"] = "";
-$a->strings["Upload"] = "Pujar";
-$a->strings["skip this step"] = "saltar aquest pas";
-$a->strings["select a photo from your photo albums"] = "tria una foto dels teus àlbums";
-$a->strings["Crop Image"] = "retallar imatge";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Per favor, ajusta la retallada d'imatge per a una optima visualització.";
-$a->strings["Done Editing"] = "Edició Feta";
-$a->strings["Image uploaded successfully."] = "Carregada de la imatge amb èxit.";
-$a->strings["No profile"] = "Sense perfil";
-$a->strings["Remove My Account"] = "Eliminar el Meu Compte";
-$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Això eliminarà per complet el seu compte. Quan s'hagi fet això, no serà recuperable.";
-$a->strings["Please enter your password for verification:"] = "Si us plau, introduïu la contrasenya per a la verificació:";
-$a->strings["Nothing new here"] = "Res nou aquí";
-$a->strings["Clear notifications"] = "";
-$a->strings["New Message"] = "Nou Missatge";
-$a->strings["Unable to locate contact information."] = "No es pot trobar informació de contacte.";
-$a->strings["Do you really want to delete this message?"] = "";
-$a->strings["Message deleted."] = "Missatge eliminat.";
-$a->strings["Conversation removed."] = "Conversació esborrada.";
-$a->strings["No messages."] = "Sense missatges.";
-$a->strings["Unknown sender - %s"] = "remitent desconegut - %s";
-$a->strings["You and %s"] = "Tu i %s";
-$a->strings["%s and You"] = "%s i Tu";
-$a->strings["Delete conversation"] = "Esborrar conversació";
-$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
-$a->strings["%d message"] = array(
-	0 => "%d missatge",
-	1 => "%d missatges",
-);
-$a->strings["Message not available."] = "Missatge no disponible.";
-$a->strings["Delete message"] = "Esborra missatge";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicacions degures no disponibles. Tú <strong>pots</strong> respondre des de la pàgina de perfil del remitent.";
-$a->strings["Send Reply"] = "Enviar Resposta";
-$a->strings["Friends of %s"] = "Amics de %s";
-$a->strings["No friends to display."] = "No hi ha amics que mostrar";
-$a->strings["Theme settings updated."] = "Ajustos de Tema actualitzats";
-$a->strings["Site"] = "Lloc";
-$a->strings["Users"] = "Usuaris";
-$a->strings["Plugins"] = "Plugins";
-$a->strings["Themes"] = "Temes";
-$a->strings["DB updates"] = "Actualitzacions de BD";
-$a->strings["Logs"] = "Registres";
-$a->strings["Admin"] = "Admin";
-$a->strings["Plugin Features"] = "Característiques del Plugin";
-$a->strings["User registrations waiting for confirmation"] = "Registre d'usuari a l'espera de confirmació";
-$a->strings["Normal Account"] = "Compte Normal";
-$a->strings["Soapbox Account"] = "Compte Tribuna";
-$a->strings["Community/Celebrity Account"] = "Compte de Comunitat/Celebritat";
-$a->strings["Automatic Friend Account"] = "Compte d'Amistat Automàtic";
-$a->strings["Blog Account"] = "Compte de Blog";
-$a->strings["Private Forum"] = "Fòrum Privat";
-$a->strings["Message queues"] = "Cues de missatges";
-$a->strings["Administration"] = "Administració";
-$a->strings["Summary"] = "Sumari";
-$a->strings["Registered users"] = "Usuaris registrats";
-$a->strings["Pending registrations"] = "Registres d'usuari pendents";
-$a->strings["Version"] = "Versió";
-$a->strings["Active plugins"] = "Plugins actius";
-$a->strings["Site settings updated."] = "Ajustos del lloc actualitzats.";
-$a->strings["Closed"] = "Tancat";
-$a->strings["Requires approval"] = "Requereix aprovació";
-$a->strings["Open"] = "Obert";
-$a->strings["No SSL policy, links will track page SSL state"] = "No existe una política de SSL, se hará un seguimiento de los vínculos de la página con SSL";
-$a->strings["Force all links to use SSL"] = "Forzar a tots els enllaços a utilitzar SSL";
-$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Certificat auto-signat, utilitzar SSL només per a enllaços locals (desaconsellat)";
-$a->strings["File upload"] = "Fitxer carregat";
-$a->strings["Policies"] = "Polítiques";
-$a->strings["Advanced"] = "Avançat";
-$a->strings["Performance"] = "";
-$a->strings["Site name"] = "Nom del lloc";
-$a->strings["Banner/Logo"] = "Senyera/Logo";
-$a->strings["System language"] = "Idioma del Sistema";
-$a->strings["System theme"] = "Tema del sistema";
-$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Tema per defecte del sistema - pot ser obviat pels perfils del usuari - <a href='#' id='cnftheme'>Canviar ajustos de tema</a>";
-$a->strings["Mobile system theme"] = "";
-$a->strings["Theme for mobile devices"] = "Tema per a aparells mòbils";
-$a->strings["SSL link policy"] = "Política SSL per als enllaços";
-$a->strings["Determines whether generated links should be forced to use SSL"] = "Determina si els enllaços generats han de ser forçats a utilitzar SSL";
-$a->strings["'Share' element"] = "";
-$a->strings["Activates the bbcode element 'share' for repeating items."] = "";
-$a->strings["Maximum image size"] = "Mida màxima de les imatges";
-$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Mida màxima en bytes de les imatges a pujar. Per defecte es 0, que vol dir sense límits.";
-$a->strings["Maximum image length"] = "Maxima longitud d'imatge";
-$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "";
-$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"] = "Política per a registrar";
-$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"] = "Text al registrar";
-$a->strings["Will be displayed prominently on the registration page."] = "Serà mostrat de forma preminent a la pàgina durant el procés de registre.";
-$a->strings["Accounts abandoned after x days"] = "Comptes abandonats després de x dies";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
-$a->strings["Allowed friend domains"] = "Dominis amics permesos";
-$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
-$a->strings["Allowed email domains"] = "Dominis de correu permesos";
-$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per registrtar-se. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
-$a->strings["Block public"] = "Bloqueig públic";
-$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Bloqueja l'accés públic a qualsevol pàgina del lloc fins que t'hagis identificat.";
-$a->strings["Force publish"] = "Forçar publicació";
-$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Obliga a que tots el perfils en aquest lloc siguin mostrats en el directori del lloc.";
-$a->strings["Global directory update URL"] = "Actualitzar URL del directori global";
-$a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL per actualitzar el directori global. Si no es configura, el directori global serà completament inaccesible per a l'aplicació. ";
-$a->strings["Allow threaded items"] = "";
-$a->strings["Allow infinite level threading for items on this site."] = "";
-$a->strings["Private posts by default for new users"] = "";
-$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "";
-$a->strings["Block multiple registrations"] = "Bloquejar multiples registracions";
-$a->strings["Disallow users to register additional accounts for use as pages."] = "Inhabilita als usuaris el crear comptes adicionals per a usar com a pàgines.";
-$a->strings["OpenID support"] = "Suport per a OpenID";
-$a->strings["OpenID support for registration and logins."] = "Suport per a registre i validació a OpenID.";
-$a->strings["Fullname check"] = "Comprobació de nom complet";
-$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Obliga els usuaris a col·locar un espai en blanc entre nom i cognoms, com a mesura antispam";
-$a->strings["UTF-8 Regular expressions"] = "expresions regulars UTF-8";
-$a->strings["Use PHP UTF8 regular expressions"] = "Empri expresions regulars de PHP amb format UTF8";
-$a->strings["Show Community Page"] = "Mostra la Pàgina de Comunitat";
-$a->strings["Display a Community page showing all recent public postings on this site."] = "Mostra a la pàgina de comunitat tots els missatges públics recents, d'aquest lloc.";
-$a->strings["Enable OStatus support"] = "Activa el suport per a OStatus";
-$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Proveeix de compatibilitat integrada amb OStatus (identi.ca, status.net, etc). Totes les comunicacions a OStatus són públiques amb el que ocasionalment pots veure advertències.";
-$a->strings["Enable Diaspora support"] = "Habilitar suport per Diaspora";
-$a->strings["Provide built-in Diaspora network compatibility."] = "Proveeix compatibilitat integrada amb la xarxa Diaspora";
-$a->strings["Only allow Friendica contacts"] = "Només permetre contactes de Friendica";
-$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Tots els contactes ";
-$a->strings["Verify SSL"] = "Verificar SSL";
-$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Si ho vols, pots comprovar el certificat estrictament. Això farà que no puguis connectar (de cap manera) amb llocs amb certificats SSL autosignats.";
-$a->strings["Proxy user"] = "proxy d'usuari";
-$a->strings["Proxy URL"] = "URL del proxy";
-$a->strings["Network timeout"] = "Temps excedit a la xarxa";
-$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valor en segons. Canviat a 0 es sense límits (no recomenat)";
-$a->strings["Delivery interval"] = "Interval d'entrega";
-$a->strings["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."] = "Retardar processos d'entrega, en segon pla, en aquesta quantitat de segons, per reduir la càrrega del sistema . Recomanem : 4-5 per als servidors compartits , 2-3 per a servidors privats virtuals . 0-1 per els grans servidors dedicats.";
-$a->strings["Poll interval"] = "Interval entre sondejos";
-$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Endarrerir els processos de sondeig en segon pla durant aquest període, en segons, per tal de reduir la càrrega de treball del sistema, Si s'empra 0, s'utilitza l'interval d'entregues. ";
-$a->strings["Maximum Load Average"] = "Càrrega Màxima Sostinguda";
-$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Càrrega màxima del sistema abans d'apaçar els processos d'entrega i sondeig - predeterminat a 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"] = "L'actualització ha estat marcada amb èxit";
-$a->strings["Executing %s failed. Check system logs."] = "Ha fracassat l'execució de %s. Comprova el registre del sistema.";
-$a->strings["Update %s was successfully applied."] = "L'actualització de %s es va aplicar amb èxit.";
-$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "L'actualització de %s no ha retornat el seu estatus. Es desconeix si ha estat amb èxit.";
-$a->strings["Update function %s could not be found."] = "L'actualització de la funció %s no es pot trobar.";
-$a->strings["No failed updates."] = "No hi ha actualitzacions fallides.";
-$a->strings["Failed Updates"] = "Actualitzacions Fallides";
-$a->strings["This does not include updates prior to 1139, which did not return a status."] = "Això no inclou actualitzacions anteriors a 1139, raó per la que no ha retornat l'estatus.";
-$a->strings["Mark success (if update was manually applied)"] = "Marcat am èxit (si l'actualització es va fer manualment)";
-$a->strings["Attempt to execute this update step automatically"] = "Intentant executar aquest pas d'actualització automàticament";
-$a->strings["%s user blocked/unblocked"] = array(
-	0 => "%s usuari bloquejar/desbloquejar",
-	1 => "%s usuaris bloquejar/desbloquejar",
-);
-$a->strings["%s user deleted"] = array(
-	0 => "%s usuari esborrat",
-	1 => "%s usuaris esborrats",
-);
-$a->strings["User '%s' deleted"] = "Usuari %s' esborrat";
-$a->strings["User '%s' unblocked"] = "Usuari %s' desbloquejat";
-$a->strings["User '%s' blocked"] = "L'usuari '%s' és bloquejat";
-$a->strings["select all"] = "Seleccionar tot";
-$a->strings["User registrations waiting for confirm"] = "Registre d'usuari esperant confirmació";
-$a->strings["Request date"] = "Data de sol·licitud";
-$a->strings["Email"] = "Correu";
-$a->strings["No registrations."] = "Sense registres.";
-$a->strings["Deny"] = "Denegar";
-$a->strings["Site admin"] = "";
-$a->strings["Register date"] = "Data de registre";
-$a->strings["Last login"] = "Últim accés";
-$a->strings["Last item"] = "Últim element";
-$a->strings["Account"] = "Compte";
-$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Els usuaris seleccionats seran esborrats!\\n\\nqualsevol cosa que aquests usuaris hagin publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?";
-$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'usuari {0} s'eliminarà!\\n\\nQualsevol cosa que aquest usuari hagi publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?";
-$a->strings["Plugin %s disabled."] = "Plugin %s deshabilitat.";
-$a->strings["Plugin %s enabled."] = "Plugin %s habilitat.";
-$a->strings["Disable"] = "Deshabilitar";
-$a->strings["Enable"] = "Habilitar";
-$a->strings["Toggle"] = "Canviar";
-$a->strings["Author: "] = "Autor:";
-$a->strings["Maintainer: "] = "Responsable:";
-$a->strings["No themes found."] = "No s'ha trobat temes.";
-$a->strings["Screenshot"] = "Captura de pantalla";
-$a->strings["[Experimental]"] = "[Experimental]";
-$a->strings["[Unsupported]"] = "[No soportat]";
-$a->strings["Log settings updated."] = "Configuració del registre actualitzada.";
-$a->strings["Clear"] = "Netejar";
-$a->strings["Debugging"] = "Esplugar";
-$a->strings["Log file"] = "Arxiu de registre";
-$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Ha de tenir permisos d'escriptura pel servidor web. En relació amb el seu directori Friendica de nivell superior.";
-$a->strings["Log level"] = "Nivell de transcripció";
-$a->strings["Close"] = "Tancar";
-$a->strings["FTP Host"] = "Amfitrió FTP";
-$a->strings["FTP Path"] = "Direcció FTP";
-$a->strings["FTP User"] = "Usuari FTP";
-$a->strings["FTP Password"] = "Contrasenya FTP";
-$a->strings["Requested profile is not available."] = "El perfil sol·licitat no està disponible.";
-$a->strings["Access to this profile has been restricted."] = "L'accés a aquest perfil ha estat restringit.";
-$a->strings["Tips for New Members"] = "Consells per a nous membres";
-$a->strings["{0} wants to be your friend"] = "{0} vol ser el teu amic";
-$a->strings["{0} sent you a message"] = "{0} t'ha enviat un missatge de";
-$a->strings["{0} requested registration"] = "{0} solicituts de registre";
-$a->strings["{0} commented %s's post"] = "{0} va comentar l'enviament de %s";
-$a->strings["{0} liked %s's post"] = "A {0} l'ha agradat l'enviament de %s";
-$a->strings["{0} disliked %s's post"] = "A {0} no l'ha agradat l'enviament de %s";
-$a->strings["{0} is now friends with %s"] = "{0} ara és amic de %s";
-$a->strings["{0} posted"] = "{0} publicat";
-$a->strings["{0} tagged %s's post with #%s"] = "{0} va etiquetar la publicació de %s com #%s";
-$a->strings["{0} mentioned you in a post"] = "{0} et menciona en un missatge";
-$a->strings["Contacts who are not members of a group"] = "Contactes que no pertanyen a cap grup";
-$a->strings["OpenID protocol error. No ID returned."] = "Error al protocol OpenID. No ha retornat ID.";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Compte no trobat i el registrar-se amb OpenID no està permès en aquest lloc.";
-$a->strings["Login failed."] = "Error d'accés.";
-$a->strings["Contact added"] = "Contacte afegit";
-$a->strings["Common Friends"] = "Amics Comuns";
-$a->strings["No contacts in common."] = "Sense contactes en comú.";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "";
-$a->strings["link"] = "enllaç";
-$a->strings["Item has been removed."] = "El element ha estat esborrat.";
-$a->strings["Applications"] = "Aplicacions";
-$a->strings["No installed applications."] = "Aplicacions no instal·lades.";
-$a->strings["Search"] = "Cercar";
-$a->strings["Profile not found."] = "Perfil no trobat.";
-$a->strings["Profile deleted."] = "Perfil esborrat.";
-$a->strings["Profile-"] = "Perfil-";
-$a->strings["New profile created."] = "Nou perfil creat.";
-$a->strings["Profile unavailable to clone."] = "No es pot clonar el perfil.";
-$a->strings["Profile Name is required."] = "Nom de perfil requerit.";
-$a->strings["Marital Status"] = "Estatus Marital";
-$a->strings["Romantic Partner"] = "Soci Romàntic";
-$a->strings["Likes"] = "Agrada";
-$a->strings["Dislikes"] = "No agrada";
-$a->strings["Work/Employment"] = "Treball/Ocupació";
-$a->strings["Religion"] = "Religió";
-$a->strings["Political Views"] = "Idees Polítiques";
-$a->strings["Gender"] = "Gènere";
-$a->strings["Sexual Preference"] = "Preferència sexual";
-$a->strings["Homepage"] = "Inici";
-$a->strings["Interests"] = "Interesos";
-$a->strings["Address"] = "Adreça";
-$a->strings["Location"] = "Ubicació";
-$a->strings["Profile updated."] = "Perfil actualitzat.";
-$a->strings[" and "] = " i ";
-$a->strings["public profile"] = "perfil públic";
-$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s s'ha canviat de %2\$s a &ldquo;%3\$s&rdquo;";
-$a->strings[" - Visit %1\$s's %2\$s"] = " - Visita %1\$s de %2\$s";
-$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s te una actualització %2\$s, canviant %3\$s.";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Amaga la llista de contactes/amics en la vista d'aquest perfil?";
-$a->strings["Edit Profile Details"] = "Editor de Detalls del Perfil";
-$a->strings["Change Profile Photo"] = "";
-$a->strings["View this profile"] = "Veure aquest perfil";
-$a->strings["Create a new profile using these settings"] = "Crear un nou perfil amb aquests ajustos";
-$a->strings["Clone this profile"] = "Clonar aquest perfil";
-$a->strings["Delete this profile"] = "Esborrar aquest perfil";
-$a->strings["Profile Name:"] = "Nom de Perfil:";
-$a->strings["Your Full Name:"] = "El Teu Nom Complet.";
-$a->strings["Title/Description:"] = "Títol/Descripció:";
-$a->strings["Your Gender:"] = "Gènere:";
-$a->strings["Birthday (%s):"] = "Aniversari (%s)";
-$a->strings["Street Address:"] = "Direcció:";
-$a->strings["Locality/City:"] = "Localitat/Ciutat:";
-$a->strings["Postal/Zip Code:"] = "Codi Postal:";
-$a->strings["Country:"] = "País";
-$a->strings["Region/State:"] = "Regió/Estat:";
-$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Estat Civil:";
-$a->strings["Who: (if applicable)"] = "Qui? (si és aplicable)";
-$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Exemples: cathy123, Cathy Williams, cathy@example.com";
-$a->strings["Since [date]:"] = "Des de [data]";
-$a->strings["Sexual Preference:"] = "Preferència Sexual:";
-$a->strings["Homepage URL:"] = "Pàgina web URL:";
-$a->strings["Hometown:"] = "Lloc de residència:";
-$a->strings["Political Views:"] = "Idees Polítiques:";
-$a->strings["Religious Views:"] = "Creencies Religioses:";
-$a->strings["Public Keywords:"] = "Paraules Clau Públiques";
-$a->strings["Private Keywords:"] = "Paraules Clau Privades:";
-$a->strings["Likes:"] = "Agrada:";
-$a->strings["Dislikes:"] = "No Agrada";
-$a->strings["Example: fishing photography software"] = "Exemple: pesca fotografia programari";
-$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Emprat per suggerir potencials amics, Altres poden veure-ho)";
-$a->strings["(Used for searching profiles, never shown to others)"] = "(Emprat durant la cerca de perfils, mai mostrat a ningú)";
-$a->strings["Tell us about yourself..."] = "Parla'ns de tú.....";
-$a->strings["Hobbies/Interests"] = "Aficions/Interessos";
-$a->strings["Contact information and Social Networks"] = "Informació de contacte i Xarxes Socials";
-$a->strings["Musical interests"] = "Gustos musicals";
-$a->strings["Books, literature"] = "Llibres, Literatura";
-$a->strings["Television"] = "Televisió";
-$a->strings["Film/dance/culture/entertainment"] = "Cinema/ball/cultura/entreteniments";
-$a->strings["Love/romance"] = "Amor/sentiments";
-$a->strings["Work/employment"] = "Treball/ocupació";
-$a->strings["School/education"] = "Ensenyament/estudis";
-$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Aquest és el teu perfil <strong>públic</strong>.<br />El qual <strong>pot</strong> ser visible per qualsevol qui faci servir Internet.";
-$a->strings["Age: "] = "Edat:";
-$a->strings["Edit/Manage Profiles"] = "Editar/Gestionar Perfils";
-$a->strings["Change profile photo"] = "Canviar la foto del perfil";
-$a->strings["Create New Profile"] = "Crear un Nou Perfil";
-$a->strings["Profile Image"] = "Imatge del Perfil";
-$a->strings["visible to everybody"] = "Visible per tothom";
-$a->strings["Edit visibility"] = "Editar visibilitat";
-$a->strings["Save to Folder:"] = "Guardar a la Carpeta:";
-$a->strings["- select -"] = "- seleccionar -";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s etiquetats %2\$s %3\$s amb %4\$s";
-$a->strings["No potential page delegates located."] = "No es troben pàgines potencialment delegades.";
-$a->strings["Delegate Page Management"] = "Gestió de les Pàgines Delegades";
-$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."] = "Els delegats poden gestionar tots els aspectes d'aquest compte/pàgina, excepte per als ajustaments bàsics del compte. Si us plau, no deleguin el seu compte personal a ningú que no confiïn completament.";
-$a->strings["Existing Page Managers"] = "Actuals Administradors de Pàgina";
-$a->strings["Existing Page Delegates"] = "Actuals Delegats de Pàgina";
-$a->strings["Potential Delegates"] = "Delegats Potencials";
-$a->strings["Add"] = "Afegir";
-$a->strings["No entries."] = "Sense entrades";
-$a->strings["Source (bbcode) text:"] = "Text Codi (bbcode): ";
-$a->strings["Source (Diaspora) text to convert to BBcode:"] = "Font (Diaspora) Convertir text a BBcode";
-$a->strings["Source input: "] = "Entrada de Codi:";
-$a->strings["bb2html (raw HTML): "] = "";
-$a->strings["bb2html: "] = "bb2html: ";
-$a->strings["bb2html2bb: "] = "bb2html2bb: ";
-$a->strings["bb2md: "] = "bb2md: ";
-$a->strings["bb2md2html: "] = "bb2md2html: ";
-$a->strings["bb2dia2bb: "] = "bb2dia2bb: ";
-$a->strings["bb2md2html2bb: "] = "bb2md2html2bb: ";
-$a->strings["Source input (Diaspora format): "] = "Font d'entrada (format de Diaspora)";
-$a->strings["diaspora2bb: "] = "diaspora2bb: ";
-$a->strings["Do you really want to delete this suggestion?"] = "";
-$a->strings["Friend Suggestions"] = "Amics Suggerits";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Cap suggeriment disponible. Si això és un nou lloc, si us plau torna a intentar en 24 hores.";
-$a->strings["Ignore/Hide"] = "Ignorar/Amagar";
-$a->strings["Global Directory"] = "Directori Global";
-$a->strings["Find on this site"] = "Trobat en aquest lloc";
-$a->strings["Site Directory"] = "Directori Local";
-$a->strings["Gender: "] = "Gènere:";
+$a->strings["Full Name:"] = "Nom Complet:";
 $a->strings["Gender:"] = "Gènere:";
-$a->strings["Status:"] = "Estatus:";
-$a->strings["Homepage:"] = "Pàgina web:";
-$a->strings["About:"] = "Acerca de:";
-$a->strings["No entries (some entries may be hidden)."] = "No hi ha entrades (algunes de les entrades poden estar amagades).";
-$a->strings["Total invitation limit exceeded."] = "";
-$a->strings["%s : Not a valid email address."] = "%s : No es una adreça de correu vàlida";
-$a->strings["Please join us on Friendica"] = "Per favor, uneixi's a nosaltres en Friendica";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "";
-$a->strings["%s : Message delivery failed."] = "%s : Ha fallat l'entrega del missatge.";
-$a->strings["%d message sent."] = array(
-	0 => "%d missatge enviat",
-	1 => "%d missatges enviats.",
-);
-$a->strings["You have no more invitations available"] = "No te més invitacions disponibles";
-$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Visita %s per a una llista de llocs públics on unir-te. Els membres de Friendica d'altres llocs poden connectar-se de forma total, així com amb membres de moltes altres xarxes socials.";
-$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Per acceptar aquesta invitació, per favor visita i registra't a %s o en qualsevol altre pàgina web pública Friendica.";
-$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Tots els llocs Friendica estàn interconnectats per crear una web social amb privacitat millorada, controlada i propietat dels seus membres. També poden connectar amb moltes xarxes socials tradicionals. Consulteu %s per a una llista de llocs de Friendica alternatius en que pot inscriure's.";
-$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Nostres disculpes. Aquest sistema no està configurat actualment per connectar amb altres llocs públics o convidar als membres.";
-$a->strings["Send invitations"] = "Enviant Invitacions";
-$a->strings["Enter email addresses, one per line:"] = "Entri adreçes de correu, una per línia:";
-$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Estàs cordialment convidat a ajuntarte a mi i altres amics propers en Friendica - i ajudar-nos a crear una millor web social.";
-$a->strings["You will need to supply this invitation code: \$invite_code"] = "Vostè haurà de proporcionar aquest codi d'invitació: \$invite_code";
-$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Un cop registrat, si us plau contactar amb mi a través de la meva pàgina de perfil a:";
-$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Per a més informació sobre el projecte Friendica i perque creiem que això es important, per favor, visita http://friendica.com";
-$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Això pot ocorre ocasionalment si el contacte fa una petició per ambdues persones i ja han estat aprovades.";
-$a->strings["Response from remote site was not understood."] = "La resposta des del lloc remot no s'entenia.";
-$a->strings["Unexpected response from remote site: "] = "Resposta inesperada de lloc remot:";
-$a->strings["Confirmation completed successfully."] = "La confirmació s'ha completat correctament.";
-$a->strings["Remote site reported: "] = "El lloc remot informa:";
-$a->strings["Temporary failure. Please wait and try again."] = "Fallada temporal. Si us plau, espereu i torneu a intentar.";
-$a->strings["Introduction failed or was revoked."] = "La presentació va fallar o va ser revocada.";
-$a->strings["Unable to set contact photo."] = "No es pot canviar la foto de contacte.";
-$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s és ara amic amb %2\$s";
-$a->strings["No user record found for '%s' "] = "No es troben registres d'usuari per a '%s'";
-$a->strings["Our site encryption key is apparently messed up."] = "La nostra clau de xifrat del lloc pel que sembla en mal estat.";
-$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Es va proporcionar una URL del lloc buida o la URL no va poder ser desxifrada per nosaltres.";
-$a->strings["Contact record was not found for you on our site."] = "No s'han trobat registres del contacte al nostre lloc.";
-$a->strings["Site public key not available in contact record for URL %s."] = "la clau pública del lloc no disponible en les dades del contacte per URL %s.";
-$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "La ID proporcionada pel seu sistema és un duplicat en el nostre sistema. Hauria de treballar si intenta de nou.";
-$a->strings["Unable to set your contact credentials on our system."] = "No es pot canviar les seves credencials de contacte en el nostre sistema.";
-$a->strings["Unable to update your contact profile details on our system"] = "No es pot actualitzar els detalls del seu perfil de contacte en el nostre sistema";
-$a->strings["Connection accepted at %s"] = "Connexió acceptada en %s";
-$a->strings["%1\$s has joined %2\$s"] = "%1\$s s'ha unit a  %2\$s";
-$a->strings["Google+ Import Settings"] = "Ajustos Google+ Import";
-$a->strings["Enable Google+ Import"] = "Habilita Google+ Import";
-$a->strings["Google Account ID"] = "ID del compte Google";
-$a->strings["Google+ Import Settings saved."] = "Ajustos Google+ Import guardats.";
-$a->strings["Facebook disabled"] = "Facebook deshabilitat";
-$a->strings["Updating contacts"] = "Actualitzant contactes";
-$a->strings["Facebook API key is missing."] = "La clau del API de Facebook s'ha perdut.";
-$a->strings["Facebook Connect"] = "Facebook Connectat";
-$a->strings["Install Facebook connector for this account."] = "Instal·lar el connector de Facebook per aquest compte.";
-$a->strings["Remove Facebook connector"] = "Eliminar el connector de Faceboook";
-$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Re-autentificar [Això és necessari cada vegada que la contrasenya de Facebook canvia.]";
-$a->strings["Post to Facebook by default"] = "Enviar a Facebook per defecte";
-$a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "La vinculació amb amics de Facebook s'ha deshabilitat en aquest lloc. Els ajustos que facis no faran efecte.";
-$a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "La vinculació amb amics de Facebook s'ha deshabilitat en aquest lloc. Si esta deshabilitat, no es pot utilitzar.";
-$a->strings["Link all your Facebook friends and conversations on this website"] = "Enllaça tots els teus amics i les converses de Facebook en aquest lloc web";
-$a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Les converses de Facebook consisteixen en el <em>perfil del mur</em> i en el<em> flux </em> del seu amic.";
-$a->strings["On this website, your Facebook friend stream is only visible to you."] = "En aquesta pàgina web, el flux del seu amic a Facebook només és visible per a vostè.";
-$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "Les següents opcions determinen la privacitat del mur del seu perfil de Facebook en aquest lloc web.";
-$a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "En aquesta pàgina web les seves converses al mur del perfil de Facebook només seran visible per a vostè";
-$a->strings["Do not import your Facebook profile wall conversations"] = "No importi les seves converses del mur del perfil de Facebook";
-$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."] = "Si opta per vincular les converses i deixar ambdues caselles sense marcar, el mur del seu perfil de Facebook es fusionarà amb el mur del seu perfil en aquest lloc web i la seva configuració de privacitat en aquest website serà utilitzada per determinar qui pot veure les converses.";
-$a->strings["Comma separated applications to ignore"] = "Separats per comes les aplicacions a ignorar";
-$a->strings["Problems with Facebook Real-Time Updates"] = "Problemes amb Actualitzacions en Temps Real a Facebook";
-$a->strings["Administrator"] = "Administrador";
-$a->strings["Facebook Connector Settings"] = "Ajustos del Connector de Facebook";
-$a->strings["Facebook API Key"] = "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>"] = "Error: Apareix que has especificat el App-ID i el Secret en el arxiu .htconfig.php. Per estar especificat allà, no pot ser canviat utilitzant aquest formulari.<br><br>";
-$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Error: la API Key facilitada sembla incorrecta (no es va poder recuperar el token d'accés de l'aplicatiu).";
-$a->strings["The given API Key seems to work correctly."] = "La API Key facilitada sembla treballar correctament.";
-$a->strings["The correctness of the API Key could not be detected. Something strange's going on."] = "La correcció de la API key no pot ser detectada. Quelcom estrany ha succeït.";
-$a->strings["App-ID / API-Key"] = "App-ID / API-Key";
-$a->strings["Application secret"] = "Application secret";
-$a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Interval entre sondejos en minuts (mínim %1s minuts)";
-$a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "Sincronitzar els comentaris (els comentaris a Facebook es perden, a costa de la major càrrega del sistema)";
-$a->strings["Real-Time Updates"] = "Actualitzacions en Temps Real";
-$a->strings["Real-Time Updates are activated."] = "Actualitzacions en Temps Real està activat.";
-$a->strings["Deactivate Real-Time Updates"] = "Actualitzacions en Temps Real Desactivat";
-$a->strings["Real-Time Updates not activated."] = "Actualitzacions en Temps Real no activat.";
-$a->strings["Activate Real-Time Updates"] = "Actualitzacions en Temps Real Activat";
-$a->strings["The new values have been saved."] = "Els nous valors s'han guardat.";
-$a->strings["Post to Facebook"] = "Enviament a Facebook";
-$a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "Enviament a Facebook cancel·lat perque hi ha un conflicte de permisos d'accés multi-xarxa.";
-$a->strings["View on Friendica"] = "Vist en Friendica";
-$a->strings["Facebook post failed. Queued for retry."] = "Enviament a Facebook fracassat. En cua per a reintent.";
-$a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "La seva connexió a Facebook es va convertir en no vàlida. Per favor, torni a autenticar-se";
-$a->strings["Facebook connection became invalid"] = "La seva connexió a Facebook es va convertir en no vàlida";
-$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hi %1\$s,\n\nLa connexió entre els teus comptes en %2\$s i Facebook s'han tornat no vàlides. Això passa normalment quan canvies la contrasenya de Facebook. Per activar la conexió novament has de %3\$sre-autenticar el connector de Facebook%4\$s.";
-$a->strings["StatusNet AutoFollow settings updated."] = "Ajustos de AutoSeguiment a StatusNet actualitzats.";
-$a->strings["StatusNet AutoFollow Settings"] = "Ajustos de AutoSeguiment a StatusNet";
-$a->strings["Automatically follow any StatusNet followers/mentioners"] = "Segueix Automaticament qualsevol seguidor/mencionador de StatusNet";
-$a->strings["Lifetime of the cache (in hours)"] = "Temps de vida de la caché (en hores)";
-$a->strings["Cache Statistics"] = "Estadístiques de la caché";
-$a->strings["Number of items"] = "Nombre d'elements";
-$a->strings["Size of the cache"] = "Mida de la caché";
-$a->strings["Delete the whole cache"] = "Esborra tota la cachè";
-$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 persona li agrada això",
-	1 => "%d persones els agrada això",
-);
-$a->strings["%d person doesn't like this"] = array(
-	0 => "%d persona no li agrada això",
-	1 => "%d persones no els agrada això",
-);
-$a->strings["Get added to this list!"] = "S'afegeixen a aquesta llista!";
-$a->strings["Generate new key"] = "Generar nova clau";
-$a->strings["Widgets key"] = "Ginys clau";
-$a->strings["Widgets available"] = "Ginys disponibles";
-$a->strings["Connect on Friendica!"] = "Connectar en Friendica";
-$a->strings["bitchslap"] = "bufetada";
-$a->strings["bitchslapped"] = "bufetejat";
-$a->strings["shag"] = "fotut";
-$a->strings["shagged"] = "fotre";
-$a->strings["do something obscenely biological to"] = "";
-$a->strings["did something obscenely biological to"] = "";
-$a->strings["point out the poke feature to"] = "";
-$a->strings["pointed out the poke feature to"] = "";
-$a->strings["declare undying love for"] = "declara amor inmortal a";
-$a->strings["declared undying love for"] = "declarat amor inmortal a";
-$a->strings["patent"] = "patent";
-$a->strings["patented"] = "patentat";
-$a->strings["stroke beard"] = "";
-$a->strings["stroked their beard at"] = "";
-$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "";
-$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "";
-$a->strings["hug"] = "";
-$a->strings["hugged"] = "";
-$a->strings["kiss"] = "petó";
-$a->strings["kissed"] = "besat";
-$a->strings["raise eyebrows at"] = "sorprès";
-$a->strings["raised their eyebrows at"] = "es van sorprendre";
-$a->strings["insult"] = "insult";
-$a->strings["insulted"] = "insultat";
-$a->strings["praise"] = "";
-$a->strings["praised"] = "";
-$a->strings["be dubious of"] = "";
-$a->strings["was dubious of"] = "";
-$a->strings["eat"] = "menja";
-$a->strings["ate"] = "menjà";
-$a->strings["giggle and fawn at"] = "";
-$a->strings["giggled and fawned at"] = "";
-$a->strings["doubt"] = "dubte";
-$a->strings["doubted"] = "dubitat";
-$a->strings["glare"] = "";
-$a->strings["glared at"] = "";
-$a->strings["YourLS Settings"] = "La Teva Configuració de LS";
-$a->strings["URL: http://"] = "URL: http://";
-$a->strings["Username:"] = "Nom d'usuari:";
-$a->strings["Password:"] = "Contrasenya:";
-$a->strings["Use SSL "] = "Emprar SSL";
-$a->strings["yourls Settings saved."] = "Guardar la seva configuració.";
-$a->strings["Post to LiveJournal"] = "Missatge a Livejournal";
-$a->strings["LiveJournal Post Settings"] = "Configuració d'enviaments a Livejournal";
-$a->strings["Enable LiveJournal Post Plugin"] = "Habilitat el plugin d'enviaments a Livejournal";
-$a->strings["LiveJournal username"] = "Nom d'usuari a Livejournal";
-$a->strings["LiveJournal password"] = "Contrasenya a Livejournal";
-$a->strings["Post to LiveJournal by default"] = "Enviar per defecte a Livejournal";
-$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Ajustos, Not Safe For Work (Filtre de Contingut de Propòsit General)";
-$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."] = "Aquest plugin es veu en enviaments amb les paraules/text que s'especifiquen a continuació , i amagarà qualsevol contingut que contingui les paraules clau de manera que no apareguin en moments inapropiats, com ara insinuacions sexuals que poden ser inadequades en un entorn de treball. És de bona educació i es recomana etiquetar qualsevol contingut que contingui nus amb #NSFW. Aquest filtre també es pot fer coincidir amb qualsevol paraula/text que especifiqueu, i per tant pot ser utilitzat com un filtre general de contingut.";
-$a->strings["Enable Content filter"] = "Activat el filtre de Contingut";
-$a->strings["Comma separated list of keywords to hide"] = "Llista separada per comes de paraules clau per ocultar";
-$a->strings["Use /expression/ to provide regular expressions"] = "Emprar /expressió/  per a proporcionar expressions regulars";
-$a->strings["NSFW Settings saved."] = "Configuració NSFW guardada.";
-$a->strings["%s - Click to open/close"] = "%s - Clicar per obrir/tancar";
-$a->strings["Forums"] = "Forums";
-$a->strings["Forums:"] = "Fòrums:";
-$a->strings["Page settings updated."] = "Actualitzats els ajustos de pàgina.";
-$a->strings["Page Settings"] = "Ajustos de pàgina";
-$a->strings["How many forums to display on sidebar without paging"] = "Quants fòrums per mostrar a la barra lateral per pàgina";
-$a->strings["Randomise Page/Forum list"] = "Aleatoritza la llista de Pàgina/Fòrum";
-$a->strings["Show pages/forums on profile page"] = "Mostra pàgines/fòrums a la pàgina de perfil";
-$a->strings["Planets Settings"] = "Ajustos de Planet";
-$a->strings["Enable Planets Plugin"] = "Activa Plugin de Planet";
-$a->strings["Forum Directory"] = "";
-$a->strings["Login"] = "Identifica't";
-$a->strings["OpenID"] = "OpenID";
-$a->strings["Latest users"] = "Últims usuaris";
-$a->strings["Most active users"] = "Usuaris més actius";
-$a->strings["Latest photos"] = "Darreres fotos";
-$a->strings["Latest likes"] = "Darrers agrada";
-$a->strings["event"] = "esdeveniment";
-$a->strings["No access"] = "Inaccessible";
-$a->strings["Could not open component for editing"] = "";
-$a->strings["Go back to the calendar"] = "Tornar al calendari";
-$a->strings["Event data"] = "data d'esdeveniment";
-$a->strings["Calendar"] = "Calendari";
-$a->strings["Special color"] = "Color especial";
-$a->strings["Subject"] = "Subjecte";
-$a->strings["Starts"] = "Inicia";
-$a->strings["Ends"] = "Finalitza";
-$a->strings["Description"] = "Descripció";
-$a->strings["Recurrence"] = "Reaparició";
-$a->strings["Frequency"] = "Freqüència";
-$a->strings["Daily"] = "Diari";
-$a->strings["Weekly"] = "Setmanal";
-$a->strings["Monthly"] = "Mensual";
-$a->strings["Yearly"] = "Anyal";
-$a->strings["days"] = "dies";
-$a->strings["weeks"] = "setmanes";
-$a->strings["months"] = "mesos";
-$a->strings["years"] = "anys";
-$a->strings["Interval"] = "Interval";
-$a->strings["All %select% %time%"] = "Tot %select% %time%";
-$a->strings["Days"] = "Dies";
-$a->strings["Sunday"] = "Diumenge";
-$a->strings["Monday"] = "Dilluns";
-$a->strings["Tuesday"] = "Dimarts";
-$a->strings["Wednesday"] = "Dimecres";
-$a->strings["Thursday"] = "Dijous";
-$a->strings["Friday"] = "Divendres";
-$a->strings["Saturday"] = "Dissabte";
-$a->strings["First day of week:"] = "Primer dia de la setmana:";
-$a->strings["Day of month"] = "Dia del mes";
-$a->strings["#num#th of each month"] = "#num# de cada mes";
-$a->strings["#num#th-last of each month"] = "#num# ultim de cada mes";
-$a->strings["#num#th #wkday# of each month"] = "#num# #wkday# de cada mes";
-$a->strings["#num#th-last #wkday# of each month"] = "#num# ultim #wkday# de cada mes";
-$a->strings["Month"] = "Mes";
-$a->strings["#num#th of the given month"] = "#num# del mes corrent";
-$a->strings["#num#th-last of the given month"] = "#num# ultim del mes corrent";
-$a->strings["#num#th #wkday# of the given month"] = "#num#  #wkday# del mes corrent";
-$a->strings["#num#th-last #wkday# of the given month"] = "#num# ultim #wkday# del mes corrent";
-$a->strings["Repeat until"] = "repetir fins";
-$a->strings["Infinite"] = "Infinit";
-$a->strings["Until the following date"] = "Fins la data següent";
-$a->strings["Number of times"] = "Nombre de vegades";
-$a->strings["Exceptions"] = "Excepcions";
-$a->strings["none"] = "res";
-$a->strings["Notification"] = "Notificació";
-$a->strings["Notify by"] = "Notificat per";
-$a->strings["E-Mail"] = "E-Mail";
-$a->strings["On Friendica / Display"] = "A Friendica / Display";
-$a->strings["Time"] = "Hora";
-$a->strings["Hours"] = "Hores";
-$a->strings["Minutes"] = "Minuts";
-$a->strings["Seconds"] = "Segons";
-$a->strings["Weeks"] = "Setmanes";
-$a->strings["before the"] = "bans de";
-$a->strings["start of the event"] = "inici del esdeveniment";
-$a->strings["end of the event"] = "fi del esdeveniment";
-$a->strings["Add a notification"] = "Afegir una notificació";
-$a->strings["The event #name# will start at #date"] = "El esdeveniment #name# començara el #date";
-$a->strings["#name# is about to begin."] = "#name# esta a punt de començar.";
-$a->strings["Saved"] = "Guardat";
-$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "Data en format U.S. (mm/dd/YYY)";
-$a->strings["German Time Format (dd.mm.YYYY)"] = "Data en format Alemany (dd.mm.YYYY)";
-$a->strings["Private Events"] = "Esdeveniment Privat";
-$a->strings["Private Addressbooks"] = "Contacte Privat";
-$a->strings["Friendica-Native events"] = "esdeveniments Nadius a Friendica";
-$a->strings["Friendica-Contacts"] = "Friendica-Contactes";
-$a->strings["Your Friendica-Contacts"] = "Els teus Contactes a Friendica";
-$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Quelcom va anar malament quan intentava importar l'arxiu. Disculpes. Por ser alguns esdeveniments es varen importar d'alguna manera.";
-$a->strings["Something went wrong when trying to import the file. Sorry."] = "Quelcom va anar malament quan intentava importar l'arxiu. Disculpes.";
-$a->strings["The ICS-File has been imported."] = "L'arxiu ICS ha estat importat";
-$a->strings["No file was uploaded."] = "Cap arxiu es va carregar.";
-$a->strings["Import a ICS-file"] = "importar un arxiu ICS";
-$a->strings["ICS-File"] = "Arxiu ICS";
-$a->strings["Overwrite all #num# existing events"] = "Sobrescriu tots #num# esdeveniments existents";
-$a->strings["New event"] = "Nou esdeveniment";
-$a->strings["Today"] = "Avui";
-$a->strings["Day"] = "Dia";
-$a->strings["Week"] = "Setmana";
-$a->strings["Reload"] = "Recarregar";
-$a->strings["Date"] = "Data";
-$a->strings["Error"] = "Error";
-$a->strings["The calendar has been updated."] = "El calendari ha estat actualitzat.";
-$a->strings["The new calendar has been created."] = "El nou calendari ha estat creat.";
-$a->strings["The calendar has been deleted."] = "el calendari ha estat esborrat.";
-$a->strings["Calendar Settings"] = "Ajustos de Calendari";
-$a->strings["Date format"] = "Format de la data";
-$a->strings["Time zone"] = "Zona horària";
-$a->strings["Calendars"] = "Calendaris";
-$a->strings["Create a new calendar"] = "Creat un nou calendari";
-$a->strings["Limitations"] = "Limitacions";
-$a->strings["Warning"] = "Avís";
-$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Syncronització (iPhone, Thunderbird Lightning, Android, ...)";
-$a->strings["Synchronizing this calendar with the iPhone"] = "Sncronitzant aquest calendari amb el iPhone";
-$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sincronitzant els teus contactes a Friendica amb el iPhone";
-$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "";
-$a->strings["Extended calendar with CalDAV-support"] = "Calendari ampliat amb suport CalDAV";
-$a->strings["noreply"] = "no contestar";
-$a->strings["Notification: "] = "";
-$a->strings["The database tables have been installed."] = "Les taules de la base de dades han estat instal·lades.";
-$a->strings["An error occurred during the installation."] = "Ha ocorregut un error durant la instal·lació.";
-$a->strings["The database tables have been updated."] = "";
-$a->strings["An error occurred during the update."] = "";
-$a->strings["No system-wide settings yet."] = "No tens enllestits els ajustos del sistema.";
-$a->strings["Database status"] = "Estat de la base de dades";
-$a->strings["Installed"] = "Instal·lat";
-$a->strings["Upgrade needed"] = "Necessites actualitzar";
-$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "";
-$a->strings["Upgrade"] = "Actualització";
-$a->strings["Not installed"] = "No instal·lat";
-$a->strings["Install"] = "Instal·lat";
-$a->strings["Unknown"] = "";
-$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "";
-$a->strings["Troubleshooting"] = "Solució de problemes";
-$a->strings["Manual creation of the database tables:"] = "Creació manual de les taules de la base de dades:";
-$a->strings["Show SQL-statements"] = "Mostrar instruccions de SQL ";
-$a->strings["Private Calendar"] = "Calendari Privat";
-$a->strings["Friendica Events: Mine"] = "Esdeveniments Friendica: Meus";
-$a->strings["Friendica Events: Contacts"] = "Esdeveniments Friendica: Contactes";
-$a->strings["Private Addresses"] = "Adreces Privades";
-$a->strings["Friendica Contacts"] = "Contactes a Friendica";
-$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>"] = "Permetre l'ús del seu ID de friendica (%s) per Connectar a l'emmagatzematge extern (com ownCloud). Veure <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\"> WebFinger RemoteStorage </a>";
-$a->strings["Template URL (with {category})"] = "Plantilles de URL (amb {categoria})";
-$a->strings["OAuth end-point"] = "OAuth end-point";
-$a->strings["Api"] = "Api";
-$a->strings["Member since:"] = "Membre des de:";
-$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tres en línia Tridimensional";
-$a->strings["3D Tic-Tac-Toe"] = "Tres en línia 3D";
-$a->strings["New game"] = "Nou joc";
-$a->strings["New game with handicap"] = "Nou joc modificat";
-$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "El joc del tres en línia tridimensional és com el joc tradicional, excepte que es juga en diversos nivells simultàniament.";
-$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "En aquest cas hi ha tres nivells. Vostè guanya per aconseguir tres en una fila en qualsevol nivell, així com dalt, baix i en diagonal a través dels diferents nivells.";
-$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "El joc modificat desactiva la posició central en el nivell mitjà perquè el jugador en aquesta posició té sovint un avantatge injust.";
-$a->strings["You go first..."] = "Vostè va primer ...";
-$a->strings["I'm going first this time..."] = "Vaig primer aquesta vegada ...";
-$a->strings["You won!"] = "Has guanyat!";
-$a->strings["\"Cat\" game!"] = "Empat!";
-$a->strings["I won!"] = "Vaig guanyar!";
-$a->strings["Randplace Settings"] = "Configuració de Randplace";
-$a->strings["Enable Randplace Plugin"] = "Habilitar el Plugin de Randplace";
-$a->strings["Post to Dreamwidth"] = "Missatge a Dreamwidth";
-$a->strings["Dreamwidth Post Settings"] = "Configuració d'enviaments a Dreamwidth";
-$a->strings["Enable dreamwidth Post Plugin"] = "Habilitat el plugin d'enviaments a Dreamwidth";
-$a->strings["dreamwidth username"] = "Nom d'usuari a Dreamwidth";
-$a->strings["dreamwidth password"] = "Contrasenya a Dreamwidth";
-$a->strings["Post to dreamwidth by default"] = "Enviar per defecte a Dreamwidth";
-$a->strings["Remote Permissions Settings"] = "";
-$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
-$a->strings["Remote Permissions settings updated."] = "";
-$a->strings["Visible to"] = "";
-$a->strings["may only be a partial list"] = "";
-$a->strings["Global"] = "";
-$a->strings["The posts of every user on this server show the post recipients"] = "";
-$a->strings["Individual"] = "";
-$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
-$a->strings["Startpage Settings"] = "Ajustos de la pàgina d'inici";
-$a->strings["Home page to load after login  - leave blank for profile wall"] = "Pàgina personal a carregar després d'accedir  - deixar buit pel perfil del mur";
-$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Exemples: \"xarxa\" o \"notificacions/sistema\"";
-$a->strings["Geonames settings updated."] = "Actualitzada la configuració de Geonames.";
-$a->strings["Geonames Settings"] = "Configuració de Geonames";
-$a->strings["Enable Geonames Plugin"] = "Habilitar Plugin de Geonames";
-$a->strings["Your account on %s will expire in a few days."] = "El teu compte en %s expirarà en pocs dies.";
-$a->strings["Your Friendica account is about to expire."] = "El teu compte de Friendica està a punt de caducar.";
-$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"] = "Hi %1\$s,\n\nEl teu compte en %2\$s expirara en menys de cinc dies. Pots mantenir el teu compte accedint al menys una vegada cada 30 dies.";
-$a->strings["Upload a file"] = "Carrega un arxiu";
-$a->strings["Drop files here to upload"] = "Deixa aquí el arxiu a carregar";
-$a->strings["Failed"] = "Fracassar";
-$a->strings["No files were uploaded."] = "No hi ha arxius carregats.";
-$a->strings["Uploaded file is empty"] = "L'arxiu carregat està buit";
-$a->strings["File has an invalid extension, it should be one of "] = "Arxiu té una extensió no vàlida, ha de ser una de";
-$a->strings["Upload was cancelled, or server error encountered"] = "La pujada va ser cancel.lada, o es va trobar un error de servidor";
-$a->strings["show/hide"] = "mostra/amaga";
-$a->strings["No forum subscriptions"] = "No hi ha subscripcions al fòrum";
-$a->strings["Forumlist settings updated."] = "Ajustos de Forumlist actualitzats.";
-$a->strings["Forumlist Settings"] = "Ajustos de Forumlist";
-$a->strings["Randomise forum list"] = "";
-$a->strings["Show forums on profile page"] = "";
-$a->strings["Show forums on network page"] = "";
-$a->strings["Impressum"] = "Impressum";
-$a->strings["Site Owner"] = "Propietari del lloc";
-$a->strings["Email Address"] = "Adreça de correu";
-$a->strings["Postal Address"] = "Adreça postal";
-$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "El complement impressum s'ha de configurar!<br />Si us plau afegiu almenys la variable <tt>propietari </tt> al fitxer de configuració. Per a les altres variables, consulteu el fitxer README del complement.";
-$a->strings["The page operators name."] = "Nom de la pàgina del gestor.";
-$a->strings["Site Owners Profile"] = "Perfil del Propietari del Lloc";
-$a->strings["Profile address of the operator."] = "Adreça del perfil del gestor.";
-$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Com posar-se en contacte amb l'operador a través de correu postal. Vostè pot utilitzar BBCode aquí.";
-$a->strings["Notes"] = "Notes";
-$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Notes addicionals que es mostren sota de la informació de contacte. Vostè pot usar BBCode aquí.";
-$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Com contactar amb el gestor via correu electronic. ( es visualitzara ofuscat)";
-$a->strings["Footer note"] = "Nota a peu de pàgina";
-$a->strings["Text for the footer. You can use BBCode here."] = "Text pel peu de pàgina. Pots emprar BBCode aquí.";
-$a->strings["Report Bug"] = "Informar de problema";
-$a->strings["No Timeline settings updated."] = "No s'han actualitzat els ajustos de la línia de temps";
-$a->strings["No Timeline Settings"] = "No hi han ajustos de la línia de temps";
-$a->strings["Disable Archive selector on profile wall"] = "Desactivar el selector d'arxius del mur de perfils";
-$a->strings["\"Blockem\" Settings"] = "Configuració de \"Bloqueig\"";
-$a->strings["Comma separated profile URLS to block"] = "URLS dels perfils a bloquejar, separats per comes";
-$a->strings["BLOCKEM Settings saved."] = "Guardada la configuració de BLOQUEIG.";
-$a->strings["Blocked %s - Click to open/close"] = "Bloquejar %s - Clica per obrir/tancar";
-$a->strings["Unblock Author"] = "Desbloquejar Autor";
-$a->strings["Block Author"] = "Bloquejar Autor";
-$a->strings["blockem settings updated"] = "Actualitzar la Configuració de bloqueig";
-$a->strings[":-)"] = ":-)";
-$a->strings[":-("] = ":-(";
-$a->strings["lol"] = "lol";
-$a->strings["Quick Comment Settings"] = "Configuració Ràpida dels Comentaris";
-$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Comentaris ràpids es troben prop de les caixes de comentaris, de vegades ocults. Feu clic a ells per donar respostes simples.";
-$a->strings["Enter quick comments, one per line"] = "Introduïu els comentaris ràpids, un per línia";
-$a->strings["Quick Comment settings saved."] = "Guardada la configuració de comentaris ràpids.";
-$a->strings["Tile Server URL"] = "URL del servidor, del mosaico de servidores";
-$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Una llista de  <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\"> un mosaic de servidors públics</a>";
-$a->strings["Default zoom"] = "Zoom per defecte";
-$a->strings["The default zoom level. (1:world, 18:highest)"] = "Nivell de zoom per defecte. (1: el món, 18: el més alt)";
-$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"] = "No puc instal·lar Libravatar , <br>requereix PHP>=5.3";
-$a->strings["generic profile image"] = "imatge de perfil genérica";
-$a->strings["random geometric pattern"] = "Patró geometric aleatori";
-$a->strings["monster face"] = "Cara monstruosa";
-$a->strings["computer generated face"] = "Cara monstruosa generada per ordinador";
-$a->strings["retro arcade style face"] = "Cara d'estil arcade retro";
-$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "La teva versió de PHP %s es inferior a la requerida, PHP>=5.3";
-$a->strings["This addon is not functional on your server."] = "Aquest addon no es funcional al teu servidor.";
-$a->strings["Information"] = "informació";
-$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "el addon Gravatar està instal·lat. Si us plau, desactiva el addon Gravatar.<br> El addon Libravatar tornarà a Gravatar si no es trova res a Libravatar.";
-$a->strings["Default avatar image"] = "Imatge d'avatar per defecte";
-$a->strings["Select default avatar image if none was found. See README"] = "seleccionada la imatge d'avatar per defecte si no es trova cap altre. Veure README";
-$a->strings["Libravatar settings updated."] = "Ajustos de Libravatar actualitzats.";
-$a->strings["Post to libertree"] = "Enviament a libertree";
-$a->strings["libertree Post Settings"] = "Ajustos d'enviaments a libertree";
-$a->strings["Enable Libertree Post Plugin"] = "Activa el plugin d'enviaments a libertree";
-$a->strings["Libertree API token"] = "Libertree API token";
-$a->strings["Libertree site URL"] = "lloc URL libertree";
-$a->strings["Post to Libertree by default"] = "Enviar a libertree per defecte";
-$a->strings["Altpager settings updated."] = "Ajustos de Altpagerr actualitzats.";
-$a->strings["Alternate Pagination Setting"] = "Alternate Pagination Setting";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Emprar enllaç a \"més nova\" i \"més antiga\" pàgina, en lloc de números de pàgina? ";
-$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."] = "El complement MathJax processa les fórmules matemàtiques escrites utilitzant la sintaxi de LaTeX, envoltades per l'habitual $$ o un bloc de \"eqnarray\" en les publicacions del seu mur, a la fitxa de la xarxa i correu privat.";
-$a->strings["Use the MathJax renderer"] = "Utilitzar el processador Mathjax";
-$a->strings["MathJax Base URL"] = "URL Base de Mathjax";
-$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."] = "La URL del fitxer javascript que ha de ser inclòs per a usar Mathjax. Pot ser utilitzat per Mathjax CDN o un altre instal·lació de Mathjax.";
-$a->strings["Editplain settings updated."] = "Actualitzar la configuració de Editplain.";
-$a->strings["Editplain Settings"] = "Configuració de Editplain";
-$a->strings["Disable richtext status editor"] = "Deshabilitar l'editor d'estatus de texte enriquit";
-$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"] = "Se selecciona  la imatge d'avatar per defecte si no es troba cap en Gravatar. Veure el README";
-$a->strings["Rating of images"] = "Classificació de les imatges";
-$a->strings["Select the appropriate avatar rating for your site. See README"] = "Selecciona la classe d'avatar apropiat pel teu lloc. Veure el README";
-$a->strings["Gravatar settings updated."] = "Ajustos de Gravatar actualitzats.";
-$a->strings["Your Friendica test account is about to expire."] = "La teva provatura de Friendica esta a prop d'expirar.";
-$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."] = "Hola %1\$s ,\n\nEl seu compte de prova a %2\$s expirarà en menys de cinc dies . Esperem que hagi gaudit d'aquesta prova i aprofita aquesta oportunitat per trobar un lloc web Friendica permanent per a les teves comunicacions socials integrades . Una llista de llocs públics es troba disponible a http://dir.friendica.com/siteinfo - i per obtenir més informació sobre com configurar el vostre servidor Friendica consulteu el lloc web del projecte en el Friendica http://friendica.com .";
-$a->strings["\"pageheader\" Settings"] = "Configuració de la capçalera de pàgina.";
-$a->strings["pageheader Settings saved."] = "guardada la configuració de la capçalera de pàgina.";
-$a->strings["Post to Insanejournal"] = "Enviament a Insanejournal";
-$a->strings["InsaneJournal Post Settings"] = "Ajustos d'Enviament a Insanejournal";
-$a->strings["Enable InsaneJournal Post Plugin"] = "Habilita el Plugin d'Enviaments a Insanejournal";
-$a->strings["InsaneJournal username"] = "Nom d'usuari de Insanejournal";
-$a->strings["InsaneJournal password"] = "Contrasenya de Insanejournal";
-$a->strings["Post to InsaneJournal by default"] = "Enviar per defecte a Insanejournal";
-$a->strings["Jappix Mini addon settings"] = "";
-$a->strings["Activate addon"] = "";
-$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "";
-$a->strings["Jabber username"] = "";
-$a->strings["Jabber server"] = "";
-$a->strings["Jabber BOSH host"] = "";
-$a->strings["Jabber password"] = "";
-$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "";
-$a->strings["Friendica password"] = "";
-$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"] = "Veure les Fonts";
-$a->strings["Post to StatusNet"] = "Publica-ho a StatusNet";
-$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Si us plau, poseu-vos en contacte amb l'administrador del lloc. <br /> L'adreça URL de l'API proporcionada no és vàlida.";
-$a->strings["We could not contact the StatusNet API with the Path you entered."] = "No hem pogut posar-nos en contacte amb l'API StatusNet amb la ruta que has introduït.";
-$a->strings["StatusNet settings updated."] = "La configuració StatusNet actualitzada.";
-$a->strings["StatusNet Posting Settings"] = "Configuració d'Enviaments per a StatusNet";
-$a->strings["Globally Available StatusNet OAuthKeys"] = "OAuthKeys de StatusNet Globalment Disponible";
-$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Hi ha preconfigurats parells clau OAuth per a alguns servidors StatusNet disponibles. Si està emprant un d'ells, utilitzi aquestes credencials. Si no és així no dubteu a connectar-se a qualsevol altra instància StatusNet (veure a baix).";
-$a->strings["Provide your own OAuth Credentials"] = "Proporcioneu les vostres credencials de OAuth";
-$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "no s'ha trobat cap parell \"consumer key\" per StatusNet. Registra el teu compte Friendica com un client d'escriptori en el seu compte StatusNet, copieu el parell de \"consumer key\" aquí i entri a l'arrel de la base de l'API. <br /> Abans de registrar el seu parell de claus OAuth demani a l'administrador si ja hi ha un parell de claus per a aquesta instal·lació de Friendica en la instal·lació del teu favorit StatusNet.";
-$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
-$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret";
-$a->strings["Base API Path (remember the trailing /)"] = "Base API Path (recorda deixar / al final)";
-$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "Per connectar al seu compte StatusNet, feu clic al botó de sota per obtenir un codi de seguretat StatusNet, que has de copiar a la casella de sota, i enviar el formulari. Només els missatges <strong> públics </strong> es publicaran en StatusNet.";
-$a->strings["Log in with StatusNet"] = "Accedeixi com en  StatusNet";
-$a->strings["Copy the security code from StatusNet here"] = "Copieu el codi de seguretat StatusNet aquí";
-$a->strings["Cancel Connection Process"] = "Cancel·lar el procés de connexió";
-$a->strings["Current StatusNet API is"] = "L'Actual StatusNet API és";
-$a->strings["Cancel StatusNet Connection"] = "Cancel·lar la connexió amb StatusNet";
-$a->strings["Currently connected to: "] = "Actualment connectat a: ";
-$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."] = "Si està activat, tots els seus anuncis <strong>públics</strong> poden ser publicats en el compte StatusNet associat. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada.";
-$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>Nota</strong>: A causa de les seves opcions de privacitat (<em>Amaga els detalls del teu perfil dels espectadors desconeguts? </em>)  el vincle potencialment inclòs en anuncis públics transmesos a StatusNet conduirà el visitant a una pàgina en blanc en la que informarà al visitants que l'accés al seu perfil s'ha restringit.";
-$a->strings["Allow posting to StatusNet"] = "Permetre enviaments a StatusNet";
-$a->strings["Send public postings to StatusNet by default"] = "Enviar missatges públics a StatusNet per defecte";
-$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"] = "Enviar enllaços #-etiquetes i @-noms a StatusNet";
-$a->strings["Clear OAuth configuration"] = "Esborrar configuració de OAuth";
-$a->strings["API URL"] = "API URL";
-$a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";
-$a->strings["You are now authenticated to tumblr."] = "";
-$a->strings["return to the connector page"] = "";
-$a->strings["Post to Tumblr"] = "Publica-ho al Tumblr";
-$a->strings["Tumblr Post Settings"] = "Configuració d'Enviaments de Tumblr";
-$a->strings["(Re-)Authenticate your tumblr page"] = "";
-$a->strings["Enable Tumblr Post Plugin"] = "Habilita el plugin de enviaments de Tumblr";
-$a->strings["Post to Tumblr by default"] = "Enviar a Tumblr per defecte";
-$a->strings["Post to page:"] = "";
-$a->strings["You are not authenticated to tumblr"] = "";
-$a->strings["Numfriends settings updated."] = "Actualitzar la configuració de Numfriends.";
-$a->strings["Numfriends Settings"] = "Configuració de Numfriends";
-$a->strings["How many contacts to display on profile sidebar"] = "Quants contactes per mostrar a la barra lateral el perfil";
-$a->strings["Gnot settings updated."] = "Configuració de Gnot actualitzada";
-$a->strings["Gnot Settings"] = "Configuració de Gnot";
-$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permet crear fils de les notificacions de comentaris de correu electrònic a Gmail i anonimat de la línia d'assumpte.";
-$a->strings["Enable this plugin/addon?"] = "Activar aquest plugin/aplicació?";
-$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica: Notifica] Conversació comentada #%d";
-$a->strings["Post to Wordpress"] = "Publica-ho al Wordpress";
-$a->strings["WordPress Post Settings"] = "Configuració d'enviaments a WordPress";
-$a->strings["Enable WordPress Post Plugin"] = "Habilitar Configuració d'Enviaments a WordPress";
-$a->strings["WordPress username"] = "Nom d'usuari de WordPress";
-$a->strings["WordPress password"] = "Contrasenya de WordPress";
-$a->strings["WordPress API URL"] = "WordPress API URL";
-$a->strings["Post to WordPress by default"] = "Enviar a WordPress per defecte";
-$a->strings["Provide a backlink to the Friendica post"] = "Proveeix un retroenllaç al missatge de Friendica";
-$a->strings["Post from Friendica"] = "Enviament des de Friendica";
-$a->strings["Read the original post and comment stream on Friendica"] = "Llegeix el missatge original i el flux de comentaris en Friendica";
-$a->strings["\"Show more\" Settings"] = "Configuració de \"Mostrar més\"";
-$a->strings["Enable Show More"] = "Habilita Mostrar Més";
-$a->strings["Cutting posts after how much characters"] = "Tallar els missatges després de quants caràcters";
-$a->strings["Show More Settings saved."] = "Guardada la configuració de \"Mostra Més\".";
-$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Aquest lloc web realitza un seguiment mitjançant la eina d'anàlisi <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)."] = "Si no vol que les seves visites es registrin d'aquesta manera vostè <a href='%s'> pot establir una cookie per evitar a Piwik a partir de noves visites del lloc web </a> (opt-out).";
-$a->strings["Piwik Base URL"] = "URL Piwik Base";
-$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Trajectoria absoluta per a la instal·lació de Piwik (sense el protocol (http/s), amb la barra final )";
-$a->strings["Site ID"] = "Lloc ID";
-$a->strings["Show opt-out cookie link?"] = "Mostra l'enllaç cookie opt-out?";
-$a->strings["Asynchronous tracking"] = "Seguiment asíncrono";
-$a->strings["Post to Twitter"] = "Publica-ho al Twitter";
-$a->strings["Twitter settings updated."] = "La configuració de Twitter actualitzada.";
-$a->strings["Twitter Posting Settings"] = "Configuració d'Enviaments per a Twitter";
-$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No s'ha pogut emparellar cap clau \"consumer key\" per a Twitter. Si us plau, poseu-vos en contacte amb l'administrador del lloc.";
-$a->strings["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 button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "En aquesta instància Friendica el plugin Twitter va ser habilitat, però encara no ha connectat el compte al seu compte de Twitter. Per a això feu clic al botó de sota per obtenir un PIN de Twitter que ha de copiar a la casella de sota i enviar el formulari. Només els missatges <strong> públics </strong> es publicaran a Twitter.";
-$a->strings["Log in with Twitter"] = "Accedeixi com en  Twitter";
-$a->strings["Copy the PIN from Twitter here"] = "Copieu el codi PIN de Twitter aquí";
-$a->strings["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."] = "Si està activat, tots els seus anuncis <strong> públics </strong> poden ser publicats en el corresponent compte de Twitter. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada.";
-$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>Nota</strong>: donada la seva configuració de privacitat (<em> Amaga els detalls del teu perfil dels espectadors desconeguts? </em>) el vincle potencialment inclòs en anuncis públics retransmesos a Twitter conduirà al visitant a una pàgina en blanc informar als visitants que l'accés al seu perfil s'ha restringit.";
-$a->strings["Allow posting to Twitter"] = "Permetre anunci a Twitter";
-$a->strings["Send public postings to Twitter by default"] = "Enviar anuncis públics a Twitter per defecte";
-$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"] = "Enviar enllaços #-etiquetes i @-noms a Twitter";
-$a->strings["Consumer key"] = "Consumer key";
-$a->strings["Consumer secret"] = "Consumer secret";
-$a->strings["Name of the Twitter Application"] = "";
-$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "";
-$a->strings["IRC Settings"] = "Ajustos de IRC";
-$a->strings["Channel(s) to auto connect (comma separated)"] = "Canal(s) per auto connectar (separats per comes)";
-$a->strings["Popular Channels (comma separated)"] = "Canals Populars (separats per comes)";
-$a->strings["IRC settings saved."] = "Ajustos del IRC guardats.";
-$a->strings["IRC Chatroom"] = "IRC Chatroom";
-$a->strings["Popular Channels"] = "Canals Populars";
-$a->strings["Fromapp settings updated."] = "";
-$a->strings["FromApp Settings"] = "";
-$a->strings["The application name you would like to show your posts originating from."] = "";
-$a->strings["Use this application name even if another application was used."] = "";
-$a->strings["Post to blogger"] = "Enviament a blogger";
-$a->strings["Blogger Post Settings"] = "Ajustos d'enviament a blogger";
-$a->strings["Enable Blogger Post Plugin"] = "Habilita el Plugin d'Enviaments a Blogger";
-$a->strings["Blogger username"] = "Nom d'usuari a blogger";
-$a->strings["Blogger password"] = "Contrasenya a blogger";
-$a->strings["Blogger API URL"] = "Blogger API URL";
-$a->strings["Post to Blogger by default"] = "Enviament a Blogger per defecte";
-$a->strings["Post to Posterous"] = "enviament a Posterous";
-$a->strings["Posterous Post Settings"] = "Configuració d'Enviaments a Posterous";
-$a->strings["Enable Posterous Post Plugin"] = "Habilitar plugin d'Enviament de Posterous";
-$a->strings["Posterous login"] = "Inici de sessió a Posterous";
-$a->strings["Posterous password"] = "Contrasenya a Posterous";
-$a->strings["Posterous site ID"] = "ID al lloc Posterous";
-$a->strings["Posterous API token"] = "Posterous API token";
-$a->strings["Post to Posterous by default"] = "Enviar a Posterous per defecte";
-$a->strings["Theme settings"] = "Configuració de Temes";
-$a->strings["Set resize level for images in posts and comments (width and height)"] = "Ajusteu el nivell de canvi de mida d'imatges en els missatges i comentaris ( amplada i alçada";
-$a->strings["Set font-size for posts and comments"] = "Canvia la mida del tipus de lletra per enviaments i comentaris";
-$a->strings["Set theme width"] = "Ajustar l'ample del tema";
-$a->strings["Color scheme"] = "Esquema de colors";
-$a->strings["Your posts and conversations"] = "Els teus anuncis i converses";
-$a->strings["Your profile page"] = "La seva pàgina de perfil";
-$a->strings["Your contacts"] = "Els teus contactes";
-$a->strings["Your photos"] = "Les seves fotos";
-$a->strings["Your events"] = "Els seus esdeveniments";
-$a->strings["Personal notes"] = "Notes personals";
-$a->strings["Your personal photos"] = "Les seves fotos personals";
-$a->strings["Community Pages"] = "Pàgines de la Comunitat";
-$a->strings["Community Profiles"] = "Perfils de Comunitat";
-$a->strings["Last users"] = "Últims usuaris";
-$a->strings["Last likes"] = "Últims \"m'agrada\"";
-$a->strings["Last photos"] = "Últimes fotos";
-$a->strings["Find Friends"] = "Trobar Amistats";
-$a->strings["Local Directory"] = "Directori Local";
-$a->strings["Similar Interests"] = "Aficions Similars";
-$a->strings["Invite Friends"] = "Invita Amics";
-$a->strings["Earth Layers"] = "Earth Layers";
-$a->strings["Set zoomfactor for Earth Layers"] = "Ajustar el factor de zoom per Earth Layers";
-$a->strings["Set longitude (X) for Earth Layers"] = "Ajustar longitud (X) per Earth Layers";
-$a->strings["Set latitude (Y) for Earth Layers"] = "Ajustar latitud (Y) per Earth Layers";
-$a->strings["Help or @NewHere ?"] = "Ajuda o @NouAqui?";
-$a->strings["Connect Services"] = "Serveis Connectats";
-$a->strings["Last Tweets"] = "Últims Tweets";
-$a->strings["Set twitter search term"] = "Ajustar el terme de cerca de twitter";
-$a->strings["don't show"] = "no mostris";
-$a->strings["show"] = "mostra";
-$a->strings["Show/hide boxes at right-hand column:"] = "Mostra/amaga els marcs de la columna a ma dreta";
-$a->strings["Set line-height for posts and comments"] = "Canvia l'espaiat de línia per enviaments i comentaris";
-$a->strings["Set resolution for middle column"] = "canvia la resolució per a la columna central";
-$a->strings["Set color scheme"] = "Canvia l'esquema de color";
-$a->strings["Set zoomfactor for Earth Layer"] = "Ajustar el factor de zoom de Earth Layers";
-$a->strings["Last tweets"] = "Últims tweets";
-$a->strings["Alignment"] = "Adaptació";
-$a->strings["Left"] = "Esquerra";
-$a->strings["Center"] = "Centre";
-$a->strings["Posts font size"] = "";
-$a->strings["Textareas font size"] = "";
-$a->strings["Set colour scheme"] = "Establir l'esquema de color";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
 $a->strings["Birthday:"] = "Aniversari:";
 $a->strings["Age:"] = "Edat:";
+$a->strings["Status:"] = "Estatus:";
 $a->strings["for %1\$d %2\$s"] = "per a %1\$d %2\$s";
+$a->strings["Sexual Preference:"] = "Preferència Sexual:";
+$a->strings["Homepage:"] = "Pàgina web:";
+$a->strings["Hometown:"] = "Lloc de residència:";
 $a->strings["Tags:"] = "Etiquetes:";
+$a->strings["Political Views:"] = "Idees Polítiques:";
 $a->strings["Religion:"] = "Religió:";
+$a->strings["About:"] = "Acerca de:";
 $a->strings["Hobbies/Interests:"] = "Aficiones/Intereses:";
+$a->strings["Likes:"] = "Agrada:";
+$a->strings["Dislikes:"] = "No Agrada";
 $a->strings["Contact information and Social Networks:"] = "Informació de contacte i Xarxes Socials:";
 $a->strings["Musical interests:"] = "Gustos musicals:";
 $a->strings["Books, literature:"] = "Llibres, literatura:";
@@ -1722,22 +32,6 @@ $a->strings["Film/dance/culture/entertainment:"] = "Cinema/ball/cultura/entreten
 $a->strings["Love/Romance:"] = "Amor/sentiments:";
 $a->strings["Work/employment:"] = "Treball/ocupació:";
 $a->strings["School/education:"] = "Escola/formació";
-$a->strings["Unknown | Not categorised"] = "Desconegut/No categoritzat";
-$a->strings["Block immediately"] = "Bloquejar immediatament";
-$a->strings["Shady, spammer, self-marketer"] = "Sospitós, Spam, auto-publicitat";
-$a->strings["Known to me, but no opinion"] = "Conegut per mi, però sense opinió";
-$a->strings["OK, probably harmless"] = "Bé, probablement inofensiu";
-$a->strings["Reputable, has my trust"] = "Bona reputació, té la meva confiança";
-$a->strings["Frequently"] = "Freqüentment";
-$a->strings["Hourly"] = "Cada hora";
-$a->strings["Twice daily"] = "Dues vegades al dia";
-$a->strings["OStatus"] = "OStatus";
-$a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Zot!"] = "Zot!";
-$a->strings["LinkedIn"] = "LinkedIn";
-$a->strings["XMPP/IM"] = "XMPP/IM";
-$a->strings["MySpace"] = "MySpace";
-$a->strings["Google+"] = "";
 $a->strings["Male"] = "Home";
 $a->strings["Female"] = "Dona";
 $a->strings["Currently Male"] = "Actualment Home";
@@ -1796,10 +90,191 @@ $a->strings["Uncertain"] = "Incert";
 $a->strings["It's complicated"] = "Es complicat";
 $a->strings["Don't care"] = "No t'interessa";
 $a->strings["Ask me"] = "Pregunta'm";
+$a->strings["stopped following"] = "Deixar de seguir";
+$a->strings["Poke"] = "Atia";
+$a->strings["View Status"] = "Veure Estatus";
+$a->strings["View Profile"] = "Veure Perfil";
+$a->strings["View Photos"] = "Veure Fotos";
+$a->strings["Network Posts"] = "Enviaments a la Xarxa";
+$a->strings["Edit Contact"] = "Editat Contacte";
+$a->strings["Send PM"] = "Enviar Missatge Privat";
+$a->strings["Visible to everybody"] = "Visible per tothom";
+$a->strings["show"] = "mostra";
+$a->strings["don't show"] = "no mostris";
+$a->strings["Logged out."] = "Has sortit";
+$a->strings["Login failed."] = "Error d'accés.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Em trobat un problema quan accedies amb la OpenID que has proporcionat. Per favor, revisa la cadena del ID.";
+$a->strings["The error message was:"] = "El missatge d'error fou: ";
+$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
 $a->strings["Starts:"] = "Inici:";
 $a->strings["Finishes:"] = "Acaba:";
-$a->strings["(no subject)"] = "(sense assumpte)";
+$a->strings["Location:"] = "Ubicació:";
+$a->strings["Disallowed profile URL."] = "Perfil URL no permès.";
+$a->strings["Connect URL missing."] = "URL del connector perduda.";
+$a->strings["This site is not configured to allow communications with other networks."] = "Aquest lloc no està configurat per permetre les comunicacions amb altres xarxes.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "Protocol de comunnicació no compatible o alimentador descobert.";
+$a->strings["The profile address specified does not provide adequate information."] = "L'adreça de perfil especificada no proveeix informació adient.";
+$a->strings["An author or name was not found."] = "Un autor o nom no va ser trobat";
+$a->strings["No browser URL could be matched to this address."] = "Cap direcció URL del navegador coincideix amb aquesta adreça.";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Incapaç de trobar coincidències amb la Adreça d'Identitat estil @ amb els protocols coneguts o contactes de correu. ";
+$a->strings["Use mailto: in front of address to force email check."] = "Emprar mailto: davant la adreça per a forçar la comprovació del  correu.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "La direcció del perfil especificat pertany a una xarxa que ha estat desactivada en aquest lloc.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Perfil limitat. Aquesta persona no podrà rebre notificacions personals/directes de tu.";
+$a->strings["Unable to retrieve contact information."] = "No es pot recuperar la informació de contacte.";
+$a->strings["following"] = "seguint";
+$a->strings["An invitation is required."] = "Es requereix invitació.";
+$a->strings["Invitation could not be verified."] = "La invitació no ha pogut ser verificada.";
+$a->strings["Invalid OpenID url"] = "OpenID url no vàlid";
+$a->strings["Please enter the required information."] = "Per favor, introdueixi la informació requerida.";
+$a->strings["Please use a shorter name."] = "Per favor, empri un nom més curt.";
+$a->strings["Name too short."] = "Nom massa curt.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Això no sembla ser el teu nom complet.";
+$a->strings["Your email domain is not among those allowed on this site."] = "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc.";
+$a->strings["Not a valid email address."] = "Adreça de correu no vàlida.";
+$a->strings["Cannot use that email."] = "No es pot utilitzar aquest correu electrònic.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "El teu sobrenom nomes pot contenir \"a-z\", \"0-9\", \"-\", i \"_\", i començar amb lletra.";
+$a->strings["Nickname is already registered. Please choose another."] = "àlies ja registrat. Tria un altre.";
+$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "L'àlies emprat ja està registrat alguna vegada i no es pot reutilitzar ";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERROR IMPORTANT: La generació de claus de seguretat ha fallat.";
+$a->strings["An error occurred during registration. Please try again."] = "Un error ha succeït durant el registre. Intenta-ho de nou.";
+$a->strings["default"] = "per defecte";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Un error ha succeit durant la creació del teu perfil per defecte. Intenta-ho de nou.";
+$a->strings["Profile Photos"] = "Fotos del Perfil";
+$a->strings["Unknown | Not categorised"] = "Desconegut/No categoritzat";
+$a->strings["Block immediately"] = "Bloquejar immediatament";
+$a->strings["Shady, spammer, self-marketer"] = "Sospitós, Spam, auto-publicitat";
+$a->strings["Known to me, but no opinion"] = "Conegut per mi, però sense opinió";
+$a->strings["OK, probably harmless"] = "Bé, probablement inofensiu";
+$a->strings["Reputable, has my trust"] = "Bona reputació, té la meva confiança";
+$a->strings["Frequently"] = "Freqüentment";
+$a->strings["Hourly"] = "Cada hora";
+$a->strings["Twice daily"] = "Dues vegades al dia";
+$a->strings["Daily"] = "Diari";
+$a->strings["Weekly"] = "Setmanal";
+$a->strings["Monthly"] = "Mensual";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Email"] = "Correu";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
+$a->strings["Google+"] = "Google+";
+$a->strings["Add New Contact"] = "Afegir Nou Contacte";
+$a->strings["Enter address or web location"] = "Introdueixi adreça o ubicació web";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Exemple: bob@example.com, http://example.com/barbara";
+$a->strings["Connect"] = "Connexió";
+$a->strings["%d invitation available"] = array(
+	0 => "%d invitació disponible",
+	1 => "%d invitacions disponibles",
+);
+$a->strings["Find People"] = "Trobar Gent";
+$a->strings["Enter name or interest"] = "Introdueixi nom o aficions";
+$a->strings["Connect/Follow"] = "Connectar/Seguir";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Robert Morgenstein, Pescar";
+$a->strings["Find"] = "Cercar";
+$a->strings["Friend Suggestions"] = "Amics Suggerits";
+$a->strings["Similar Interests"] = "Aficions Similars";
+$a->strings["Random Profile"] = "Perfi Aleatori";
+$a->strings["Invite Friends"] = "Invita Amics";
+$a->strings["Networks"] = "Xarxes";
+$a->strings["All Networks"] = "totes les Xarxes";
+$a->strings["Saved Folders"] = "Carpetes Guardades";
+$a->strings["Everything"] = "Tot";
+$a->strings["Categories"] = "Categories";
+$a->strings["%d contact in common"] = array(
+	0 => "%d contacte en comú",
+	1 => "%d contactes en comú",
+);
+$a->strings["show more"] = "Mostrar més";
 $a->strings[" on Last.fm"] = " a Last.fm";
+$a->strings["Image/photo"] = "Imatge/foto";
+$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "<span><a href=\"%s\" target=\"external-link\">%s</a> va escriure el següent <a href=\"%s\" target=\"external-link\">post</a>";
+$a->strings["$1 wrote:"] = "$1 va escriure:";
+$a->strings["Encrypted content"] = "Encriptar contingut";
+$a->strings["view full size"] = "Veure'l a mida completa";
+$a->strings["Miscellaneous"] = "Miscel·lania";
+$a->strings["year"] = "any";
+$a->strings["month"] = "mes";
+$a->strings["day"] = "dia";
+$a->strings["never"] = "mai";
+$a->strings["less than a second ago"] = "Fa menys d'un segon";
+$a->strings["years"] = "anys";
+$a->strings["months"] = "mesos";
+$a->strings["week"] = "setmana";
+$a->strings["weeks"] = "setmanes";
+$a->strings["days"] = "dies";
+$a->strings["hour"] = "hora";
+$a->strings["hours"] = "hores";
+$a->strings["minute"] = "minut";
+$a->strings["minutes"] = "minuts";
+$a->strings["second"] = "segon";
+$a->strings["seconds"] = "segons";
+$a->strings["%1\$d %2\$s ago"] = " fa %1\$d %2\$s";
+$a->strings["%s's birthday"] = "%s aniversari";
+$a->strings["Happy Birthday %s"] = "Feliç Aniversari %s";
+$a->strings["Click here to upgrade."] = "Clica aquí per actualitzar.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Aquesta acció excedeix els límits del teu plan de subscripció.";
+$a->strings["This action is not available under your subscription plan."] = "Aquesta acció no està disponible en el teu plan de subscripció.";
+$a->strings["(no subject)"] = "(sense assumpte)";
+$a->strings["noreply"] = "no contestar";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s és ara amic amb %2\$s";
+$a->strings["Sharing notification from Diaspora network"] = "Compartint la notificació de la xarxa Diàspora";
+$a->strings["photo"] = "foto";
+$a->strings["status"] = "estatus";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s agrada %2\$s de %3\$s";
+$a->strings["Attachments:"] = "Adjunts:";
+$a->strings["[Name Withheld]"] = "[Nom Amagat]";
+$a->strings["A new person is sharing with you at "] = "Una persona nova està compartint amb tú en";
+$a->strings["You have a new follower at "] = "Tens un nou seguidor a ";
+$a->strings["Item not found."] = "Article no trobat.";
+$a->strings["Do you really want to delete this item?"] = "Realment vols esborrar aquest article?";
+$a->strings["Yes"] = "Si";
+$a->strings["Cancel"] = "Cancel·lar";
+$a->strings["Permission denied."] = "Permís denegat.";
+$a->strings["Archives"] = "Arxius";
+$a->strings["General Features"] = "Característiques Generals";
+$a->strings["Multiple Profiles"] = "Perfils Múltiples";
+$a->strings["Ability to create multiple profiles"] = "Habilitat per crear múltiples perfils";
+$a->strings["Post Composition Features"] = "Característiques de Composició d'Enviaments";
+$a->strings["Richtext Editor"] = "Editor de Text Enriquit";
+$a->strings["Enable richtext editor"] = "Activar l'Editor de Text Enriquit";
+$a->strings["Post Preview"] = "Vista Prèvia de l'Enviament";
+$a->strings["Allow previewing posts and comments before publishing them"] = "Permetre la vista prèvia dels enviament i comentaris abans de publicar-los";
+$a->strings["Network Sidebar Widgets"] = "Barra Lateral Selectora de Xarxa ";
+$a->strings["Search by Date"] = "Cerca per Data";
+$a->strings["Ability to select posts by date ranges"] = "Possibilitat de seleccionar els missatges per intervals de temps";
+$a->strings["Group Filter"] = "Filtre de Grup";
+$a->strings["Enable widget to display Network posts only from selected group"] = "Habilitar botò per veure missatges de Xarxa només del grup seleccionat";
+$a->strings["Network Filter"] = "Filtre de Xarxa";
+$a->strings["Enable widget to display Network posts only from selected network"] = "Habilitar botò per veure missatges de Xarxa només de la xarxa seleccionada";
+$a->strings["Saved Searches"] = "Cerques Guardades";
+$a->strings["Save search terms for re-use"] = "Guarda els termes de cerca per re-emprar";
+$a->strings["Network Tabs"] = "Pestanya Xarxes";
+$a->strings["Network Personal Tab"] = "Pestanya Xarxa Personal";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Habilitar la pestanya per veure unicament missatges de Xarxa en els que has intervingut";
+$a->strings["Network New Tab"] = "Pestanya Nova Xarxa";
+$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Habilitar la pestanya per veure només els nous missatges de Xarxa (els de les darreres 12 hores)";
+$a->strings["Network Shared Links Tab"] = "Pestanya d'Enllaços de Xarxa Compartits";
+$a->strings["Enable tab to display only Network posts with links in them"] = "Habilitar la pestanya per veure els missatges de Xarxa amb enllaços en ells";
+$a->strings["Post/Comment Tools"] = "Eines d'Enviaments/Comentaris";
+$a->strings["Multiple Deletion"] = "Esborrat Múltiple";
+$a->strings["Select and delete multiple posts/comments at once"] = "Sel·lecciona i esborra múltiples enviaments/commentaris en una vegada";
+$a->strings["Edit Sent Posts"] = "Editar Missatges Enviats";
+$a->strings["Edit and correct posts and comments after sending"] = "Edita i corregeix enviaments i comentaris una vegada han estat enviats";
+$a->strings["Tagging"] = "Etiquetant";
+$a->strings["Ability to tag existing posts"] = "Habilitar el etiquetar missatges existents";
+$a->strings["Post Categories"] = "Categories en Enviaments";
+$a->strings["Add categories to your posts"] = "Afegeix categories als teus enviaments";
+$a->strings["Ability to file posts under folders"] = "Habilitar el arxivar missatges en carpetes";
+$a->strings["Dislike Posts"] = "No agrada el Missatge";
+$a->strings["Ability to dislike posts/comments"] = "Habilita el marcar amb \"no agrada\" els enviaments/comentaris";
+$a->strings["Star Posts"] = "Missatge Estelar";
+$a->strings["Ability to mark special posts with a star indicator"] = "Habilita el marcar amb un estel, missatges especials";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "No put trobar informació de DNS  del servidor de base de dades '%s'";
 $a->strings["prev"] = "Prev";
 $a->strings["first"] = "Primer";
 $a->strings["last"] = "Últim";
@@ -1811,38 +286,48 @@ $a->strings["%d Contact"] = array(
 	0 => "%d Contacte",
 	1 => "%d Contactes",
 );
+$a->strings["View Contacts"] = "Veure Contactes";
+$a->strings["Search"] = "Cercar";
+$a->strings["Save"] = "Guardar";
 $a->strings["poke"] = "atia";
 $a->strings["poked"] = "atiar";
-$a->strings["ping"] = "";
-$a->strings["pinged"] = "";
-$a->strings["prod"] = "";
-$a->strings["prodded"] = "";
-$a->strings["slap"] = "";
-$a->strings["slapped"] = "";
+$a->strings["ping"] = "toc";
+$a->strings["pinged"] = "tocat";
+$a->strings["prod"] = "pinxat";
+$a->strings["prodded"] = "pinxat";
+$a->strings["slap"] = "bufetada";
+$a->strings["slapped"] = "Abufetejat";
 $a->strings["finger"] = "dit";
-$a->strings["fingered"] = "";
-$a->strings["rebuff"] = "";
-$a->strings["rebuffed"] = "";
+$a->strings["fingered"] = "Senyalat";
+$a->strings["rebuff"] = "rebuig";
+$a->strings["rebuffed"] = "rebutjat";
 $a->strings["happy"] = "feliç";
-$a->strings["sad"] = "";
-$a->strings["mellow"] = "";
-$a->strings["tired"] = "";
-$a->strings["perky"] = "";
+$a->strings["sad"] = "trist";
+$a->strings["mellow"] = "embafador";
+$a->strings["tired"] = "cansat";
+$a->strings["perky"] = "alegre";
 $a->strings["angry"] = "disgustat";
-$a->strings["stupified"] = "";
-$a->strings["puzzled"] = "";
-$a->strings["interested"] = "";
+$a->strings["stupified"] = "estupefacte";
+$a->strings["puzzled"] = "perplexe";
+$a->strings["interested"] = "interessat";
 $a->strings["bitter"] = "amarg";
-$a->strings["cheerful"] = "";
+$a->strings["cheerful"] = "animat";
 $a->strings["alive"] = "viu";
 $a->strings["annoyed"] = "molest";
 $a->strings["anxious"] = "ansiós";
-$a->strings["cranky"] = "";
-$a->strings["disturbed"] = "";
+$a->strings["cranky"] = "irritable";
+$a->strings["disturbed"] = "turbat";
 $a->strings["frustrated"] = "frustrat";
 $a->strings["motivated"] = "motivat";
 $a->strings["relaxed"] = "tranquil";
 $a->strings["surprised"] = "sorprès";
+$a->strings["Monday"] = "Dilluns";
+$a->strings["Tuesday"] = "Dimarts";
+$a->strings["Wednesday"] = "Dimecres";
+$a->strings["Thursday"] = "Dijous";
+$a->strings["Friday"] = "Divendres";
+$a->strings["Saturday"] = "Dissabte";
+$a->strings["Sunday"] = "Diumenge";
 $a->strings["January"] = "Gener";
 $a->strings["February"] = "Febrer";
 $a->strings["March"] = "Març";
@@ -1855,148 +340,88 @@ $a->strings["September"] = "Setembre";
 $a->strings["October"] = "Octubre";
 $a->strings["November"] = "Novembre";
 $a->strings["December"] = "Desembre";
+$a->strings["View Video"] = "Veure Video";
 $a->strings["bytes"] = "bytes";
 $a->strings["Click to open/close"] = "Clicar per a obrir/tancar";
-$a->strings["default"] = "per defecte";
+$a->strings["link to source"] = "Enllaç al origen";
 $a->strings["Select an alternate language"] = "Sel·lecciona un idioma alternatiu";
+$a->strings["event"] = "esdeveniment";
 $a->strings["activity"] = "activitat";
+$a->strings["comment"] = array(
+	0 => "",
+	1 => "comentari",
+);
 $a->strings["post"] = "missatge";
 $a->strings["Item filed"] = "Element arxivat";
-$a->strings["Sharing notification from Diaspora network"] = "Compartint la notificació de la xarxa Diàspora";
-$a->strings["Attachments:"] = "Adjunts:";
-$a->strings["view full size"] = "Veure a mida completa";
-$a->strings["Embedded content"] = "Contingut incrustat";
-$a->strings["Embedding disabled"] = "Incrustacions deshabilitades";
-$a->strings["Error decoding account file"] = "";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "";
-$a->strings["Error! I can't import this file: DB schema version is not compatible."] = "";
-$a->strings["Error! Cannot check nickname"] = "";
-$a->strings["User '%s' already exists on this server!"] = "";
-$a->strings["User creation error"] = "";
-$a->strings["User profile creation error"] = "";
-$a->strings["%d contact not imported"] = array(
-	0 => "",
-	1 => "",
-);
-$a->strings["Done. You can now login with your username and password"] = "";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grup eliminat amb aquest nom va ser restablert. Els permisos dels elements existents <strong>poden</strong> aplicar-se a aquest grup i tots els futurs membres. Si això no és el que pretén, si us plau, crei un altre grup amb un nom diferent.";
 $a->strings["Default privacy group for new contacts"] = "Privacitat per defecte per a nous contactes";
 $a->strings["Everybody"] = "Tothom";
 $a->strings["edit"] = "editar";
+$a->strings["Groups"] = "Grups";
 $a->strings["Edit group"] = "Editar grup";
 $a->strings["Create a new group"] = "Crear un nou grup";
 $a->strings["Contacts not in any group"] = "Contactes en cap grup";
-$a->strings["Logout"] = "Sortir";
-$a->strings["End this session"] = "Termina sessió";
-$a->strings["Status"] = "Estatus";
-$a->strings["Sign in"] = "Accedeix";
-$a->strings["Home Page"] = "Pàgina d'Inici";
-$a->strings["Create an account"] = "Crear un compte";
-$a->strings["Help and documentation"] = "Ajuda i documentació";
-$a->strings["Apps"] = "Aplicacions";
-$a->strings["Addon applications, utilities, games"] = "Afegits: aplicacions, utilitats, jocs";
-$a->strings["Search site content"] = "Busca contingut en el lloc";
-$a->strings["Conversations on this site"] = "Converses en aquest lloc";
-$a->strings["Directory"] = "Directori";
-$a->strings["People directory"] = "Directori de gent";
-$a->strings["Conversations from your friends"] = "Converses dels teus amics";
-$a->strings["Network Reset"] = "";
-$a->strings["Load Network page with no filters"] = "";
-$a->strings["Friend Requests"] = "Sol·licitud d'Amistat";
-$a->strings["See all notifications"] = "Veure totes les notificacions";
-$a->strings["Mark all system notifications seen"] = "Marcar totes les notificacions del sistema com a vistes";
-$a->strings["Private mail"] = "Correu privat";
-$a->strings["Inbox"] = "Safata d'entrada";
-$a->strings["Outbox"] = "Safata de sortida";
-$a->strings["Manage"] = "Gestionar";
-$a->strings["Manage other pages"] = "Gestiona altres pàgines";
-$a->strings["Delegations"] = "";
-$a->strings["Profiles"] = "Perfils";
-$a->strings["Manage/Edit Profiles"] = "";
-$a->strings["Manage/edit friends and contacts"] = "Gestiona/edita amics i contactes";
-$a->strings["Site setup and configuration"] = "Ajustos i configuració del lloc";
-$a->strings["Navigation"] = "";
-$a->strings["Site map"] = "";
-$a->strings["Add New Contact"] = "Afegir Nou Contacte";
-$a->strings["Enter address or web location"] = "Introdueixi adreça o ubicació web";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Exemple: bob@example.com, http://example.com/barbara";
-$a->strings["%d invitation available"] = array(
-	0 => "%d invitació disponible",
-	1 => "%d invitacions disponibles",
-);
-$a->strings["Find People"] = "Trobar Gent";
-$a->strings["Enter name or interest"] = "Introdueixi nom o aficions";
-$a->strings["Connect/Follow"] = "Connectar/Seguir";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Robert Morgenstein, Pescar";
-$a->strings["Random Profile"] = "Perfi Aleatori";
-$a->strings["Networks"] = "Xarxes";
-$a->strings["All Networks"] = "totes les Xarxes";
-$a->strings["Saved Folders"] = "Carpetes Guardades";
-$a->strings["Everything"] = "Tot";
-$a->strings["Categories"] = "Categories";
-$a->strings["Logged out."] = "Has sortit";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Em trobat un problema quan accedies amb la OpenID que has proporcionat. Per favor, revisa la cadena del ID.";
-$a->strings["The error message was:"] = "El missatge d'error fou: ";
-$a->strings["Miscellaneous"] = "Miscel·lania";
-$a->strings["year"] = "any";
-$a->strings["month"] = "mes";
-$a->strings["day"] = "dia";
-$a->strings["never"] = "mai";
-$a->strings["less than a second ago"] = "Fa menys d'un segon";
-$a->strings["week"] = "setmana";
-$a->strings["hour"] = "hora";
-$a->strings["hours"] = "hores";
-$a->strings["minute"] = "minut";
-$a->strings["minutes"] = "minuts";
-$a->strings["second"] = "segon";
-$a->strings["seconds"] = "segons";
-$a->strings["%1\$d %2\$s ago"] = " fa %1\$d %2\$s";
-$a->strings["%s's birthday"] = "%s aniversari";
-$a->strings["Happy Birthday %s"] = "Feliç Aniversari %s";
-$a->strings["Image/photo"] = "Imatge/foto";
-$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "";
-$a->strings["$1 wrote:"] = "$1 va escriure:";
-$a->strings["Encrypted content"] = "Encriptar contingut";
-$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'"] = "No put trobar informació de DNS  del servidor de base de dades '%s'";
-$a->strings["[no subject]"] = "[Sense assumpte]";
-$a->strings["Visible to everybody"] = "Visible per tothom";
+$a->strings["add"] = "afegir";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "a %1\$s no agrada %2\$s de %3\$s";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s atiat %2\$s";
+$a->strings["%1\$s is currently %2\$s"] = "%1\$s es normalment %2\$s";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s etiquetats %2\$s %3\$s amb %4\$s";
+$a->strings["post/item"] = "anunci/element";
+$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s marcat %2\$s's %3\$s com favorit";
+$a->strings["Select"] = "Selecionar";
+$a->strings["Delete"] = "Esborrar";
+$a->strings["View %s's profile @ %s"] = "Veure perfil de %s @ %s";
+$a->strings["Categories:"] = "Categories:";
+$a->strings["Filed under:"] = "Arxivat a:";
+$a->strings["%s from %s"] = "%s des de %s";
+$a->strings["View in context"] = "Veure en context";
+$a->strings["Please wait"] = "Si us plau esperi";
+$a->strings["remove"] = "esborrar";
+$a->strings["Delete Selected Items"] = "Esborra els Elements Seleccionats";
+$a->strings["Follow Thread"] = "Seguir el Fil";
+$a->strings["%s likes this."] = "a %s agrada això.";
+$a->strings["%s doesn't like this."] = "a %s desagrada això.";
+$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d gent</span> agrada això";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d gent</span> no agrada això";
+$a->strings["and"] = "i";
+$a->strings[", and %d other people"] = ", i altres %d persones";
+$a->strings["%s like this."] = "a %s li agrada això.";
+$a->strings["%s don't like this."] = "a %s no li agrada això.";
+$a->strings["Visible to <strong>everybody</strong>"] = "Visible per a <strong>tothom</strong>";
+$a->strings["Please enter a link URL:"] = "Sius plau, entri l'enllaç URL:";
+$a->strings["Please enter a video link/URL:"] = "Per favor , introdueixi el enllaç/URL del video";
+$a->strings["Please enter an audio link/URL:"] = "Per favor , introdueixi el enllaç/URL del audio:";
+$a->strings["Tag term:"] = "Terminis de l'etiqueta:";
+$a->strings["Save to Folder:"] = "Guardar a la Carpeta:";
+$a->strings["Where are you right now?"] = "On ets ara?";
+$a->strings["Delete item(s)?"] = "Esborrar element(s)?";
+$a->strings["Post to Email"] = "Correu per enviar";
+$a->strings["Share"] = "Compartir";
+$a->strings["Upload photo"] = "Carregar foto";
+$a->strings["upload photo"] = "carregar fotos";
+$a->strings["Attach file"] = "Adjunta fitxer";
+$a->strings["attach file"] = "adjuntar arxiu";
+$a->strings["Insert web link"] = "Inserir enllaç web";
+$a->strings["web link"] = "enllaç de web";
+$a->strings["Insert video link"] = "Insertar enllaç de video";
+$a->strings["video link"] = "enllaç de video";
+$a->strings["Insert audio link"] = "Insertar enllaç de audio";
+$a->strings["audio link"] = "enllaç de audio";
+$a->strings["Set your location"] = "Canvia la teva ubicació";
+$a->strings["set location"] = "establir la ubicació";
+$a->strings["Clear browser location"] = "neteja adreçes del navegador";
+$a->strings["clear location"] = "netejar ubicació";
+$a->strings["Set title"] = "Canviar títol";
+$a->strings["Categories (comma-separated list)"] = "Categories (lista separada per comes)";
+$a->strings["Permission settings"] = "Configuració de permisos";
+$a->strings["permissions"] = "Permissos";
+$a->strings["CC: email addresses"] = "CC: Adreça de correu";
+$a->strings["Public post"] = "Enviament públic";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Exemple: bob@example.com, mary@example.com";
+$a->strings["Preview"] = "Vista prèvia";
+$a->strings["Post to Groups"] = "Publica-ho a Grups";
+$a->strings["Post to Contacts"] = "Publica-ho a Contactes";
+$a->strings["Private post"] = "Enviament Privat";
 $a->strings["Friendica Notification"] = "Notificacions de Friendica";
 $a->strings["Thank You,"] = "Gràcies,";
 $a->strings["%s Administrator"] = "%s Administrador";
@@ -2018,9 +443,9 @@ $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s enviat a [url
 $a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notifica] %s t'ha etiquetat";
 $a->strings["%1\$s tagged you at %2\$s"] = "%1\$s t'ha etiquetat a %2\$s";
 $a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s] t'ha etiquetat[/url].";
-$a->strings["[Friendica:Notify] %1\$s poked you"] = "";
-$a->strings["%1\$s poked you at %2\$s"] = "";
-$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "";
+$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notificació] %1\$s t'atia";
+$a->strings["%1\$s poked you at %2\$s"] = "%1\$s t'atia en %2\$s";
+$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]t'atia[/url].";
 $a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notifica] %s ha etiquetat el teu missatge";
 $a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s ha etiquetat un missatge teu a %2\$s";
 $a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s etiquetà [url=%2\$s] el teu enviament[/url]";
@@ -2035,80 +460,1164 @@ $a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from
 $a->strings["Name:"] = "Nom:";
 $a->strings["Photo:"] = "Foto:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Si us plau, visiteu %s per aprovar o rebutjar la suggerencia.";
-$a->strings["Connect URL missing."] = "URL del connector perduda.";
-$a->strings["This site is not configured to allow communications with other networks."] = "Aquest lloc no està configurat per permetre les comunicacions amb altres xarxes.";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "Protocol de comunnicació no compatible o alimentador descobert.";
-$a->strings["The profile address specified does not provide adequate information."] = "L'adreça de perfil especificada no proveeix informació adient.";
-$a->strings["An author or name was not found."] = "Un autor o nom no va ser trobat";
-$a->strings["No browser URL could be matched to this address."] = "Cap direcció URL del navegador coincideix amb aquesta adreça.";
-$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Incapaç de trobar coincidències amb la Adreça d'Identitat estil @ amb els protocols coneguts o contactes de correu. ";
-$a->strings["Use mailto: in front of address to force email check."] = "Emprar mailto: davant la adreça per a forçar la comprovació del  correu.";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "La direcció del perfil especificat pertany a una xarxa que ha estat desactivada en aquest lloc.";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Perfil limitat. Aquesta persona no podrà rebre notificacions personals/directes de tu.";
-$a->strings["Unable to retrieve contact information."] = "No es pot recuperar la informació de contacte.";
-$a->strings["following"] = "seguint";
-$a->strings["A new person is sharing with you at "] = "Una persona nova està compartint amb tú en";
-$a->strings["You have a new follower at "] = "Tens un nou seguidor a ";
-$a->strings["Do you really want to delete this item?"] = "";
-$a->strings["Archives"] = "Arxius";
-$a->strings["An invitation is required."] = "Es requereix invitació.";
-$a->strings["Invitation could not be verified."] = "La invitació no ha pogut ser verificada.";
-$a->strings["Invalid OpenID url"] = "OpenID url no vàlid";
-$a->strings["Please enter the required information."] = "Per favor, introdueixi la informació requerida.";
-$a->strings["Please use a shorter name."] = "Per favor, empri un nom més curt.";
-$a->strings["Name too short."] = "Nom massa curt.";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "Això no sembla ser el teu nom complet.";
-$a->strings["Your email domain is not among those allowed on this site."] = "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc.";
-$a->strings["Not a valid email address."] = "Adreça de correu no vàlida.";
-$a->strings["Cannot use that email."] = "No es pot utilitzar aquest correu electrònic.";
-$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "El teu sobrenom nomes pot contenir \"a-z\", \"0-9\", \"-\", i \"_\", i començar amb lletra.";
-$a->strings["Nickname is already registered. Please choose another."] = "àlies ja registrat. Tria un altre.";
-$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "L'àlies emprat ja està registrat alguna vegada i no es pot reutilitzar ";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERROR IMPORTANT: La generació de claus de seguretat ha fallat.";
-$a->strings["An error occurred during registration. Please try again."] = "Un error ha succeït durant el registre. Intenta-ho de nou.";
-$a->strings["An error occurred creating your default profile. Please try again."] = "Un error ha succeit durant la creació del teu perfil per defecte. Intenta-ho de nou.";
+$a->strings["[no subject]"] = "[Sense assumpte]";
+$a->strings["Wall Photos"] = "Fotos del Mur";
+$a->strings["Nothing new here"] = "Res nou aquí";
+$a->strings["Clear notifications"] = "Neteja notificacions";
+$a->strings["Logout"] = "Sortir";
+$a->strings["End this session"] = "Termina sessió";
+$a->strings["Status"] = "Estatus";
+$a->strings["Your posts and conversations"] = "Els teus anuncis i converses";
+$a->strings["Your profile page"] = "La seva pàgina de perfil";
+$a->strings["Photos"] = "Fotos";
+$a->strings["Your photos"] = "Les seves fotos";
+$a->strings["Events"] = "Esdeveniments";
+$a->strings["Your events"] = "Els seus esdeveniments";
+$a->strings["Personal notes"] = "Notes personals";
+$a->strings["Your personal photos"] = "Les seves fotos personals";
+$a->strings["Login"] = "Identifica't";
+$a->strings["Sign in"] = "Accedeix";
+$a->strings["Home"] = "Inici";
+$a->strings["Home Page"] = "Pàgina d'Inici";
+$a->strings["Register"] = "Registrar";
+$a->strings["Create an account"] = "Crear un compte";
+$a->strings["Help"] = "Ajuda";
+$a->strings["Help and documentation"] = "Ajuda i documentació";
+$a->strings["Apps"] = "Aplicacions";
+$a->strings["Addon applications, utilities, games"] = "Afegits: aplicacions, utilitats, jocs";
+$a->strings["Search site content"] = "Busca contingut en el lloc";
+$a->strings["Community"] = "Comunitat";
+$a->strings["Conversations on this site"] = "Converses en aquest lloc";
+$a->strings["Directory"] = "Directori";
+$a->strings["People directory"] = "Directori de gent";
+$a->strings["Network"] = "Xarxa";
+$a->strings["Conversations from your friends"] = "Converses dels teus amics";
+$a->strings["Network Reset"] = "Reiniciar Xarxa";
+$a->strings["Load Network page with no filters"] = "carrega la pàgina de Xarxa sense filtres";
+$a->strings["Introductions"] = "Presentacions";
+$a->strings["Friend Requests"] = "Sol·licitud d'Amistat";
+$a->strings["Notifications"] = "Notificacions";
+$a->strings["See all notifications"] = "Veure totes les notificacions";
+$a->strings["Mark all system notifications seen"] = "Marcar totes les notificacions del sistema com a vistes";
+$a->strings["Messages"] = "Missatges";
+$a->strings["Private mail"] = "Correu privat";
+$a->strings["Inbox"] = "Safata d'entrada";
+$a->strings["Outbox"] = "Safata de sortida";
+$a->strings["New Message"] = "Nou Missatge";
+$a->strings["Manage"] = "Gestionar";
+$a->strings["Manage other pages"] = "Gestiona altres pàgines";
+$a->strings["Delegations"] = "Delegacions";
+$a->strings["Delegate Page Management"] = "Gestió de les Pàgines Delegades";
+$a->strings["Settings"] = "Ajustos";
+$a->strings["Account settings"] = "Configuració del compte";
+$a->strings["Profiles"] = "Perfils";
+$a->strings["Manage/Edit Profiles"] = "Gestiona/Edita Perfils";
+$a->strings["Contacts"] = "Contactes";
+$a->strings["Manage/edit friends and contacts"] = "Gestiona/edita amics i contactes";
+$a->strings["Admin"] = "Admin";
+$a->strings["Site setup and configuration"] = "Ajustos i configuració del lloc";
+$a->strings["Navigation"] = "Navegació";
+$a->strings["Site map"] = "Mapa del lloc";
+$a->strings["Embedded content"] = "Contingut incrustat";
+$a->strings["Embedding disabled"] = "Incrustacions deshabilitades";
+$a->strings["Error decoding account file"] = "Error decodificant l'arxiu del compte";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Error! No hi ha dades al arxiu! No es un arxiu de compte de Friendica?";
+$a->strings["Error! Cannot check nickname"] = "Error! No puc comprobar l'Àlies";
+$a->strings["User '%s' already exists on this server!"] = "El usuari %s' ja existeix en aquest servidor!";
+$a->strings["User creation error"] = "Error en la creació de l'usuari";
+$a->strings["User profile creation error"] = "Error en la creació del perfil d'usuari";
+$a->strings["%d contact not imported"] = array(
+	0 => "%d contacte no importat",
+	1 => "%d contactes no importats",
+);
+$a->strings["Done. You can now login with your username and password"] = "Fet. Ja pots identificar-te amb el teu nom d'usuari i contrasenya";
 $a->strings["Welcome "] = "Benvingut";
 $a->strings["Please upload a profile photo."] = "Per favor, carrega una foto per al perfil";
 $a->strings["Welcome back "] = "Benvingut de nou ";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "El formulari del token de seguretat no es correcte. Això probablement passa perquè el formulari ha estat massa temps obert (>3 hores) abans d'enviat-lo.";
-$a->strings["stopped following"] = "Deixar de seguir";
-$a->strings["Poke"] = "";
-$a->strings["View Status"] = "Veure Estatus";
-$a->strings["View Profile"] = "Veure Perfil";
-$a->strings["View Photos"] = "Veure Fotos";
-$a->strings["Network Posts"] = "Enviaments a la Xarxa";
-$a->strings["Edit Contact"] = "Editat Contacte";
-$a->strings["Send PM"] = "Enviar Missatge Privat";
-$a->strings["%1\$s poked %2\$s"] = "";
-$a->strings["post/item"] = "anunci/element";
-$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s marcat %2\$s's %3\$s com favorit";
-$a->strings["Categories:"] = "";
-$a->strings["Filed under:"] = "";
-$a->strings["remove"] = "esborrar";
-$a->strings["Delete Selected Items"] = "Esborra els Elements Seleccionats";
-$a->strings["Follow Thread"] = "";
-$a->strings["%s likes this."] = "a %s agrada això.";
-$a->strings["%s doesn't like this."] = "a %s desagrada això.";
-$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "";
-$a->strings["and"] = "i";
-$a->strings[", and %d other people"] = ", i altres %d persones";
-$a->strings["%s like this."] = "a %s li agrada això.";
-$a->strings["%s don't like this."] = "a %s no li agrada això.";
-$a->strings["Visible to <strong>everybody</strong>"] = "Visible per a <strong>tothom</strong>";
-$a->strings["Please enter a video link/URL:"] = "Per favor , introdueixi el enllaç/URL del video";
-$a->strings["Please enter an audio link/URL:"] = "Per favor , introdueixi el enllaç/URL del audio:";
-$a->strings["Tag term:"] = "Terminis de l'etiqueta:";
-$a->strings["Where are you right now?"] = "On ets ara?";
-$a->strings["Delete item(s)?"] = "";
-$a->strings["Post to Email"] = "Correu per enviar";
-$a->strings["permissions"] = "Permissos";
-$a->strings["Post to Groups"] = "";
-$a->strings["Post to Contacts"] = "";
-$a->strings["Private post"] = "";
-$a->strings["Click here to upgrade."] = "Clica aquí per actualitzar.";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Aquesta acció excedeix els límits del teu plan de subscripció.";
-$a->strings["This action is not available under your subscription plan."] = "Aquesta acció no està disponible en el teu plan de subscripció.";
+$a->strings["Profile not found."] = "Perfil no trobat.";
+$a->strings["Profile deleted."] = "Perfil esborrat.";
+$a->strings["Profile-"] = "Perfil-";
+$a->strings["New profile created."] = "Nou perfil creat.";
+$a->strings["Profile unavailable to clone."] = "No es pot clonar el perfil.";
+$a->strings["Profile Name is required."] = "Nom de perfil requerit.";
+$a->strings["Marital Status"] = "Estatus Marital";
+$a->strings["Romantic Partner"] = "Soci Romàntic";
+$a->strings["Likes"] = "Agrada";
+$a->strings["Dislikes"] = "No agrada";
+$a->strings["Work/Employment"] = "Treball/Ocupació";
+$a->strings["Religion"] = "Religió";
+$a->strings["Political Views"] = "Idees Polítiques";
+$a->strings["Gender"] = "Gènere";
+$a->strings["Sexual Preference"] = "Preferència sexual";
+$a->strings["Homepage"] = "Inici";
+$a->strings["Interests"] = "Interesos";
+$a->strings["Address"] = "Adreça";
+$a->strings["Location"] = "Ubicació";
+$a->strings["Profile updated."] = "Perfil actualitzat.";
+$a->strings[" and "] = " i ";
+$a->strings["public profile"] = "perfil públic";
+$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s s'ha canviat de %2\$s a &ldquo;%3\$s&rdquo;";
+$a->strings[" - Visit %1\$s's %2\$s"] = " - Visita %1\$s de %2\$s";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s te una actualització %2\$s, canviant %3\$s.";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Amaga la llista de contactes/amics en la vista d'aquest perfil?";
+$a->strings["No"] = "No";
+$a->strings["Edit Profile Details"] = "Editor de Detalls del Perfil";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Change Profile Photo"] = "Canviar la Foto del Perfil";
+$a->strings["View this profile"] = "Veure aquest perfil";
+$a->strings["Create a new profile using these settings"] = "Crear un nou perfil amb aquests ajustos";
+$a->strings["Clone this profile"] = "Clonar aquest perfil";
+$a->strings["Delete this profile"] = "Esborrar aquest perfil";
+$a->strings["Profile Name:"] = "Nom de Perfil:";
+$a->strings["Your Full Name:"] = "El Teu Nom Complet.";
+$a->strings["Title/Description:"] = "Títol/Descripció:";
+$a->strings["Your Gender:"] = "Gènere:";
+$a->strings["Birthday (%s):"] = "Aniversari (%s)";
+$a->strings["Street Address:"] = "Direcció:";
+$a->strings["Locality/City:"] = "Localitat/Ciutat:";
+$a->strings["Postal/Zip Code:"] = "Codi Postal:";
+$a->strings["Country:"] = "País";
+$a->strings["Region/State:"] = "Regió/Estat:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Estat Civil:";
+$a->strings["Who: (if applicable)"] = "Qui? (si és aplicable)";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Exemples: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Since [date]:"] = "Des de [data]";
+$a->strings["Homepage URL:"] = "Pàgina web URL:";
+$a->strings["Religious Views:"] = "Creencies Religioses:";
+$a->strings["Public Keywords:"] = "Paraules Clau Públiques";
+$a->strings["Private Keywords:"] = "Paraules Clau Privades:";
+$a->strings["Example: fishing photography software"] = "Exemple: pesca fotografia programari";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Emprat per suggerir potencials amics, Altres poden veure-ho)";
+$a->strings["(Used for searching profiles, never shown to others)"] = "(Emprat durant la cerca de perfils, mai mostrat a ningú)";
+$a->strings["Tell us about yourself..."] = "Parla'ns de tú.....";
+$a->strings["Hobbies/Interests"] = "Aficions/Interessos";
+$a->strings["Contact information and Social Networks"] = "Informació de contacte i Xarxes Socials";
+$a->strings["Musical interests"] = "Gustos musicals";
+$a->strings["Books, literature"] = "Llibres, Literatura";
+$a->strings["Television"] = "Televisió";
+$a->strings["Film/dance/culture/entertainment"] = "Cinema/ball/cultura/entreteniments";
+$a->strings["Love/romance"] = "Amor/sentiments";
+$a->strings["Work/employment"] = "Treball/ocupació";
+$a->strings["School/education"] = "Ensenyament/estudis";
+$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Aquest és el teu perfil <strong>públic</strong>.<br />El qual <strong>pot</strong> ser visible per qualsevol qui faci servir Internet.";
+$a->strings["Age: "] = "Edat:";
+$a->strings["Edit/Manage Profiles"] = "Editar/Gestionar Perfils";
+$a->strings["Change profile photo"] = "Canviar la foto del perfil";
+$a->strings["Create New Profile"] = "Crear un Nou Perfil";
+$a->strings["Profile Image"] = "Imatge del Perfil";
+$a->strings["visible to everybody"] = "Visible per tothom";
+$a->strings["Edit visibility"] = "Editar visibilitat";
+$a->strings["Permission denied"] = "Permís denegat";
+$a->strings["Invalid profile identifier."] = "Identificador del perfil no vàlid.";
+$a->strings["Profile Visibility Editor"] = "Editor de Visibilitat del Perfil";
+$a->strings["Click on a contact to add or remove."] = "Clicar sobre el contacte per afegir o esborrar.";
+$a->strings["Visible To"] = "Visible Per";
+$a->strings["All Contacts (with secure profile access)"] = "Tots els Contactes (amb accés segur al perfil)";
+$a->strings["Personal Notes"] = "Notes Personals";
+$a->strings["Public access denied."] = "Accés públic denegat.";
+$a->strings["Access to this profile has been restricted."] = "L'accés a aquest perfil ha estat restringit.";
+$a->strings["Item has been removed."] = "El element ha estat esborrat.";
+$a->strings["Visit %s's profile [%s]"] = "Visitar perfil de %s [%s]";
+$a->strings["Edit contact"] = "Editar contacte";
+$a->strings["Contacts who are not members of a group"] = "Contactes que no pertanyen a cap grup";
+$a->strings["{0} wants to be your friend"] = "{0} vol ser el teu amic";
+$a->strings["{0} sent you a message"] = "{0} t'ha enviat un missatge de";
+$a->strings["{0} requested registration"] = "{0} solicituts de registre";
+$a->strings["{0} commented %s's post"] = "{0} va comentar l'enviament de %s";
+$a->strings["{0} liked %s's post"] = "A {0} l'ha agradat l'enviament de %s";
+$a->strings["{0} disliked %s's post"] = "A {0} no l'ha agradat l'enviament de %s";
+$a->strings["{0} is now friends with %s"] = "{0} ara és amic de %s";
+$a->strings["{0} posted"] = "{0} publicat";
+$a->strings["{0} tagged %s's post with #%s"] = "{0} va etiquetar la publicació de %s com #%s";
+$a->strings["{0} mentioned you in a post"] = "{0} et menciona en un missatge";
+$a->strings["Theme settings updated."] = "Ajustos de Tema actualitzats";
+$a->strings["Site"] = "Lloc";
+$a->strings["Users"] = "Usuaris";
+$a->strings["Plugins"] = "Plugins";
+$a->strings["Themes"] = "Temes";
+$a->strings["DB updates"] = "Actualitzacions de BD";
+$a->strings["Logs"] = "Registres";
+$a->strings["Plugin Features"] = "Característiques del Plugin";
+$a->strings["User registrations waiting for confirmation"] = "Registre d'usuari a l'espera de confirmació";
+$a->strings["Normal Account"] = "Compte Normal";
+$a->strings["Soapbox Account"] = "Compte Tribuna";
+$a->strings["Community/Celebrity Account"] = "Compte de Comunitat/Celebritat";
+$a->strings["Automatic Friend Account"] = "Compte d'Amistat Automàtic";
+$a->strings["Blog Account"] = "Compte de Blog";
+$a->strings["Private Forum"] = "Fòrum Privat";
+$a->strings["Message queues"] = "Cues de missatges";
+$a->strings["Administration"] = "Administració";
+$a->strings["Summary"] = "Sumari";
+$a->strings["Registered users"] = "Usuaris registrats";
+$a->strings["Pending registrations"] = "Registres d'usuari pendents";
+$a->strings["Version"] = "Versió";
+$a->strings["Active plugins"] = "Plugins actius";
+$a->strings["Site settings updated."] = "Ajustos del lloc actualitzats.";
+$a->strings["No special theme for mobile devices"] = "No hi ha un tema específic per a mòbil";
+$a->strings["Never"] = "Mai";
+$a->strings["Multi user instance"] = "Instancia multiusuari";
+$a->strings["Closed"] = "Tancat";
+$a->strings["Requires approval"] = "Requereix aprovació";
+$a->strings["Open"] = "Obert";
+$a->strings["No SSL policy, links will track page SSL state"] = "No existe una política de SSL, se hará un seguimiento de los vínculos de la página con SSL";
+$a->strings["Force all links to use SSL"] = "Forzar a tots els enllaços a utilitzar SSL";
+$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Certificat auto-signat, utilitzar SSL només per a enllaços locals (desaconsellat)";
+$a->strings["Registration"] = "Procés de Registre";
+$a->strings["File upload"] = "Fitxer carregat";
+$a->strings["Policies"] = "Polítiques";
+$a->strings["Advanced"] = "Avançat";
+$a->strings["Performance"] = "Rendiment";
+$a->strings["Site name"] = "Nom del lloc";
+$a->strings["Banner/Logo"] = "Senyera/Logo";
+$a->strings["System language"] = "Idioma del Sistema";
+$a->strings["System theme"] = "Tema del sistema";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Tema per defecte del sistema - pot ser obviat pels perfils del usuari - <a href='#' id='cnftheme'>Canviar ajustos de tema</a>";
+$a->strings["Mobile system theme"] = "Tema per a mòbil";
+$a->strings["Theme for mobile devices"] = "Tema per a aparells mòbils";
+$a->strings["SSL link policy"] = "Política SSL per als enllaços";
+$a->strings["Determines whether generated links should be forced to use SSL"] = "Determina si els enllaços generats han de ser forçats a utilitzar SSL";
+$a->strings["'Share' element"] = "'Compartir' element";
+$a->strings["Activates the bbcode element 'share' for repeating items."] = "Activa el element bbcode 'compartir' per a repetir articles.";
+$a->strings["Hide help entry from navigation menu"] = "Amaga l'entrada d'ajuda del menu de navegació";
+$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Amaga l'entrada del menú de les pàgines d'ajuda. Pots encara accedir entrant /ajuda directament.";
+$a->strings["Single user instance"] = "Instancia per a un únic usuari";
+$a->strings["Make this instance multi-user or single-user for the named user"] = "Fer aquesta instancia multi-usuari o mono-usuari per al usuari anomenat";
+$a->strings["Maximum image size"] = "Mida màxima de les imatges";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Mida màxima en bytes de les imatges a pujar. Per defecte es 0, que vol dir sense límits.";
+$a->strings["Maximum image length"] = "Maxima longitud d'imatge";
+$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Longitud màxima en píxels del costat més llarg de la imatge carregada. Per defecte es -1, que significa sense límits";
+$a->strings["JPEG image quality"] = "Qualitat per a la imatge JPEG";
+$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Els JPEGs pujats seran guardats amb la qualitat que ajustis de  [0-100]. Per defecte es 100 màxima qualitat.";
+$a->strings["Register policy"] = "Política per a registrar";
+$a->strings["Maximum Daily Registrations"] = "Registres Màxims Diaris";
+$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."] = "Si es permet el registre, això ajusta el nombre màxim de nous usuaris a acceptar diariament. Si el registre esta tancat, aquest ajust no te efectes.";
+$a->strings["Register text"] = "Text al registrar";
+$a->strings["Will be displayed prominently on the registration page."] = "Serà mostrat de forma preminent a la pàgina durant el procés de registre.";
+$a->strings["Accounts abandoned after x days"] = "Comptes abandonats després de x dies";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
+$a->strings["Allowed friend domains"] = "Dominis amics permesos";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
+$a->strings["Allowed email domains"] = "Dominis de correu permesos";
+$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per registrtar-se. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
+$a->strings["Block public"] = "Bloqueig públic";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Bloqueja l'accés públic a qualsevol pàgina del lloc fins que t'hagis identificat.";
+$a->strings["Force publish"] = "Forçar publicació";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Obliga a que tots el perfils en aquest lloc siguin mostrats en el directori del lloc.";
+$a->strings["Global directory update URL"] = "Actualitzar URL del directori global";
+$a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL per actualitzar el directori global. Si no es configura, el directori global serà completament inaccesible per a l'aplicació. ";
+$a->strings["Allow threaded items"] = "Permetre fils als articles";
+$a->strings["Allow infinite level threading for items on this site."] = "Permet un nivell infinit de fils per a articles en aquest lloc.";
+$a->strings["Private posts by default for new users"] = "Els enviaments dels nous usuaris seran privats per defecte.";
+$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Canviar els permisos d'enviament per defecte per a tots els nous membres a grup privat en lloc de públic.";
+$a->strings["Don't include post content in email notifications"] = "No incloure el assumpte a les notificacions per correu electrónic";
+$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "No incloure assumpte d'un enviament/comentari/missatge_privat/etc. Als correus electronics que envii fora d'aquest lloc, com a mesura de privacitat. ";
+$a->strings["Disallow public access to addons listed in the apps menu."] = "Deshabilita el accés públic als complements llistats al menu d'aplicacions";
+$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Marcant això restringiras els complements llistats al menú d'aplicacions al membres";
+$a->strings["Don't embed private images in posts"] = "No incrustar imatges en missatges privats";
+$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "No reemplaçar les fotos privades hospedades localment en missatges amb una còpia de l'imatge embeguda. Això vol dir que els contactes que rebin el missatge contenint fotos privades s'ha d'autenticar i carregar cada imatge, amb el que pot suposar bastant temps.";
+$a->strings["Block multiple registrations"] = "Bloquejar multiples registracions";
+$a->strings["Disallow users to register additional accounts for use as pages."] = "Inhabilita als usuaris el crear comptes adicionals per a usar com a pàgines.";
+$a->strings["OpenID support"] = "Suport per a OpenID";
+$a->strings["OpenID support for registration and logins."] = "Suport per a registre i validació a OpenID.";
+$a->strings["Fullname check"] = "Comprobació de nom complet";
+$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Obliga els usuaris a col·locar un espai en blanc entre nom i cognoms, com a mesura antispam";
+$a->strings["UTF-8 Regular expressions"] = "expresions regulars UTF-8";
+$a->strings["Use PHP UTF8 regular expressions"] = "Empri expresions regulars de PHP amb format UTF8";
+$a->strings["Show Community Page"] = "Mostra la Pàgina de Comunitat";
+$a->strings["Display a Community page showing all recent public postings on this site."] = "Mostra a la pàgina de comunitat tots els missatges públics recents, d'aquest lloc.";
+$a->strings["Enable OStatus support"] = "Activa el suport per a OStatus";
+$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Proveeix de compatibilitat integrada amb OStatus (identi.ca, status.net, etc). Totes les comunicacions a OStatus són públiques amb el que ocasionalment pots veure advertències.";
+$a->strings["OStatus conversation completion interval"] = "Interval de conclusió de la conversació a OStatus";
+$a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "Com de sovint el sondejador ha de comprovar les noves conversacions entrades a OStatus? Això pot implicar una gran càrrega de treball.";
+$a->strings["Enable Diaspora support"] = "Habilitar suport per Diaspora";
+$a->strings["Provide built-in Diaspora network compatibility."] = "Proveeix compatibilitat integrada amb la xarxa Diaspora";
+$a->strings["Only allow Friendica contacts"] = "Només permetre contactes de Friendica";
+$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Tots els contactes ";
+$a->strings["Verify SSL"] = "Verificar SSL";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Si ho vols, pots comprovar el certificat estrictament. Això farà que no puguis connectar (de cap manera) amb llocs amb certificats SSL autosignats.";
+$a->strings["Proxy user"] = "proxy d'usuari";
+$a->strings["Proxy URL"] = "URL del proxy";
+$a->strings["Network timeout"] = "Temps excedit a la xarxa";
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valor en segons. Canviat a 0 es sense límits (no recomenat)";
+$a->strings["Delivery interval"] = "Interval d'entrega";
+$a->strings["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."] = "Retardar processos d'entrega, en segon pla, en aquesta quantitat de segons, per reduir la càrrega del sistema . Recomanem : 4-5 per als servidors compartits , 2-3 per a servidors privats virtuals . 0-1 per els grans servidors dedicats.";
+$a->strings["Poll interval"] = "Interval entre sondejos";
+$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Endarrerir els processos de sondeig en segon pla durant aquest període, en segons, per tal de reduir la càrrega de treball del sistema, Si s'empra 0, s'utilitza l'interval d'entregues. ";
+$a->strings["Maximum Load Average"] = "Càrrega Màxima Sostinguda";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Càrrega màxima del sistema abans d'apaçar els processos d'entrega i sondeig - predeterminat a 50.";
+$a->strings["Use MySQL full text engine"] = "Emprar el motor de text complet de MySQL";
+$a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "Activa el motos de text complet. Accelera les cerques pero només pot cercar per quatre o més caracters.";
+$a->strings["Path to item cache"] = "Camí cap a la caché de l'article";
+$a->strings["Cache duration in seconds"] = "Duració de la caché en segons";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "Quan de temps s'han de mantenir els fitxers a la caché?. El valor per defecte son 86400 segons (un dia).";
+$a->strings["Path for lock file"] = "Camí per a l'arxiu bloquejat";
+$a->strings["Temp path"] = "Camí a carpeta temporal";
+$a->strings["Base path to installation"] = "Trajectoria base per a instal·lar";
+$a->strings["Update has been marked successful"] = "L'actualització ha estat marcada amb èxit";
+$a->strings["Executing %s failed. Check system logs."] = "Ha fracassat l'execució de %s. Comprova el registre del sistema.";
+$a->strings["Update %s was successfully applied."] = "L'actualització de %s es va aplicar amb èxit.";
+$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "L'actualització de %s no ha retornat el seu estatus. Es desconeix si ha estat amb èxit.";
+$a->strings["Update function %s could not be found."] = "L'actualització de la funció %s no es pot trobar.";
+$a->strings["No failed updates."] = "No hi ha actualitzacions fallides.";
+$a->strings["Failed Updates"] = "Actualitzacions Fallides";
+$a->strings["This does not include updates prior to 1139, which did not return a status."] = "Això no inclou actualitzacions anteriors a 1139, raó per la que no ha retornat l'estatus.";
+$a->strings["Mark success (if update was manually applied)"] = "Marcat am èxit (si l'actualització es va fer manualment)";
+$a->strings["Attempt to execute this update step automatically"] = "Intentant executar aquest pas d'actualització automàticament";
+$a->strings["%s user blocked/unblocked"] = array(
+	0 => "%s usuari bloquejar/desbloquejar",
+	1 => "%s usuaris bloquejar/desbloquejar",
+);
+$a->strings["%s user deleted"] = array(
+	0 => "%s usuari esborrat",
+	1 => "%s usuaris esborrats",
+);
+$a->strings["User '%s' deleted"] = "Usuari %s' esborrat";
+$a->strings["User '%s' unblocked"] = "Usuari %s' desbloquejat";
+$a->strings["User '%s' blocked"] = "L'usuari '%s' és bloquejat";
+$a->strings["select all"] = "Seleccionar tot";
+$a->strings["User registrations waiting for confirm"] = "Registre d'usuari esperant confirmació";
+$a->strings["Request date"] = "Data de sol·licitud";
+$a->strings["Name"] = "Nom";
+$a->strings["No registrations."] = "Sense registres.";
+$a->strings["Approve"] = "Aprovar";
+$a->strings["Deny"] = "Denegar";
+$a->strings["Block"] = "Bloquejar";
+$a->strings["Unblock"] = "Desbloquejar";
+$a->strings["Site admin"] = "Administrador del lloc";
+$a->strings["Account expired"] = "Compte expirat";
+$a->strings["Register date"] = "Data de registre";
+$a->strings["Last login"] = "Últim accés";
+$a->strings["Last item"] = "Últim element";
+$a->strings["Account"] = "Compte";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Els usuaris seleccionats seran esborrats!\\n\\nqualsevol cosa que aquests usuaris hagin publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'usuari {0} s'eliminarà!\\n\\nQualsevol cosa que aquest usuari hagi publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?";
+$a->strings["Plugin %s disabled."] = "Plugin %s deshabilitat.";
+$a->strings["Plugin %s enabled."] = "Plugin %s habilitat.";
+$a->strings["Disable"] = "Deshabilitar";
+$a->strings["Enable"] = "Habilitar";
+$a->strings["Toggle"] = "Canviar";
+$a->strings["Author: "] = "Autor:";
+$a->strings["Maintainer: "] = "Responsable:";
+$a->strings["No themes found."] = "No s'ha trobat temes.";
+$a->strings["Screenshot"] = "Captura de pantalla";
+$a->strings["[Experimental]"] = "[Experimental]";
+$a->strings["[Unsupported]"] = "[No soportat]";
+$a->strings["Log settings updated."] = "Configuració del registre actualitzada.";
+$a->strings["Clear"] = "Netejar";
+$a->strings["Enable Debugging"] = "Habilitar Depuració";
+$a->strings["Log file"] = "Arxiu de registre";
+$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Ha de tenir permisos d'escriptura pel servidor web. En relació amb el seu directori Friendica de nivell superior.";
+$a->strings["Log level"] = "Nivell de transcripció";
+$a->strings["Update now"] = "Actualitza ara";
+$a->strings["Close"] = "Tancar";
+$a->strings["FTP Host"] = "Amfitrió FTP";
+$a->strings["FTP Path"] = "Direcció FTP";
+$a->strings["FTP User"] = "Usuari FTP";
+$a->strings["FTP Password"] = "Contrasenya FTP";
+$a->strings["Unable to locate original post."] = "No es pot localitzar post original.";
+$a->strings["Empty post discarded."] = "Buidat després de rebutjar.";
+$a->strings["System error. Post not saved."] = "Error del sistema. Publicació no guardada.";
+$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Aquest missatge va ser enviat a vostè per %s, un membre de la xarxa social Friendica.";
+$a->strings["You may visit them online at %s"] = "El pot visitar en línia a %s";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Si us plau, poseu-vos en contacte amb el remitent responent a aquest missatge si no voleu rebre aquests missatges.";
+$a->strings["%s posted an update."] = "%s ha publicat una actualització.";
+$a->strings["Friends of %s"] = "Amics de %s";
+$a->strings["No friends to display."] = "No hi ha amics que mostrar";
+$a->strings["Remove term"] = "Traieu termini";
+$a->strings["No results."] = "Sense resultats.";
+$a->strings["Authorize application connection"] = "Autoritzi la connexió de aplicacions";
+$a->strings["Return to your app and insert this Securty Code:"] = "Torni a la seva aplicació i inserti aquest Codi de Seguretat:";
+$a->strings["Please login to continue."] = "Per favor, accedeixi per a continuar.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vol autoritzar a aquesta aplicació per accedir als teus missatges i contactes, i/o crear nous enviaments per a vostè?";
+$a->strings["Registration details for %s"] = "Detalls del registre per a %s";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Registrat amb èxit. Per favor, comprovi el seu correu per a posteriors instruccions.";
+$a->strings["Failed to send email message. Here is the message that failed."] = "Error en enviar missatge de correu electrònic. Aquí està el missatge que ha fallat.";
+$a->strings["Your registration can not be processed."] = "El seu registre no pot ser processat.";
+$a->strings["Registration request at %s"] = "Sol·licitud de registre a %s";
+$a->strings["Your registration is pending approval by the site owner."] = "El seu registre està pendent d'aprovació pel propietari del lloc.";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Aquest lloc excedeix el nombre diari de registres de comptes. Per favor, provi de nou demà.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vostè pot (opcionalment), omplir aquest formulari a través de OpenID mitjançant el subministrament de la seva OpenID i fent clic a 'Registrar'.";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si vostè no està familiaritzat amb Twitter, si us plau deixi aquest camp en blanc i completi la resta dels elements.";
+$a->strings["Your OpenID (optional): "] = "El seu OpenID (opcional):";
+$a->strings["Include your profile in member directory?"] = "Incloc el seu perfil al directori de membres?";
+$a->strings["Membership on this site is by invitation only."] = "Lloc accesible mitjançant invitació.";
+$a->strings["Your invitation ID: "] = "El teu ID de invitació:";
+$a->strings["Your Full Name (e.g. Joe Smith): "] = "El seu nom complet (per exemple, Joan Ningú):";
+$a->strings["Your Email Address: "] = "La Seva Adreça de Correu:";
+$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Tria un nom de perfil. Això ha de començar amb un caràcter de text. La seva adreça de perfil en aquest lloc serà '<strong>alies@\$sitename</strong>'.";
+$a->strings["Choose a nickname: "] = "Tria un àlies:";
+$a->strings["Account approved."] = "Compte aprovat.";
+$a->strings["Registration revoked for %s"] = "Procés de Registre revocat per a %s";
+$a->strings["Please login."] = "Si us plau, ingressa.";
+$a->strings["Item not available."] = "Element no disponible";
+$a->strings["Item was not found."] = "Element no trobat.";
+$a->strings["Remove My Account"] = "Eliminar el Meu Compte";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Això eliminarà per complet el seu compte. Quan s'hagi fet això, no serà recuperable.";
+$a->strings["Please enter your password for verification:"] = "Si us plau, introduïu la contrasenya per a la verificació:";
+$a->strings["Source (bbcode) text:"] = "Text Codi (bbcode): ";
+$a->strings["Source (Diaspora) text to convert to BBcode:"] = "Font (Diaspora) Convertir text a BBcode";
+$a->strings["Source input: "] = "Entrada de Codi:";
+$a->strings["bb2html (raw HTML): "] = "bb2html (raw HTML): ";
+$a->strings["bb2html: "] = "bb2html: ";
+$a->strings["bb2html2bb: "] = "bb2html2bb: ";
+$a->strings["bb2md: "] = "bb2md: ";
+$a->strings["bb2md2html: "] = "bb2md2html: ";
+$a->strings["bb2dia2bb: "] = "bb2dia2bb: ";
+$a->strings["bb2md2html2bb: "] = "bb2md2html2bb: ";
+$a->strings["Source input (Diaspora format): "] = "Font d'entrada (format de Diaspora)";
+$a->strings["diaspora2bb: "] = "diaspora2bb: ";
+$a->strings["Common Friends"] = "Amics Comuns";
+$a->strings["No contacts in common."] = "Sense contactes en comú.";
+$a->strings["You must be logged in to use addons. "] = "T'has d'identificar per emprar els complements";
+$a->strings["Applications"] = "Aplicacions";
+$a->strings["No installed applications."] = "Aplicacions no instal·lades.";
+$a->strings["Could not access contact record."] = "No puc accedir al registre del contacte.";
+$a->strings["Could not locate selected profile."] = "No puc localitzar el perfil seleccionat.";
+$a->strings["Contact updated."] = "Contacte actualitzat.";
+$a->strings["Failed to update contact record."] = "Error en actualitzar registre de contacte.";
+$a->strings["Contact has been blocked"] = "Elcontacte ha estat bloquejat";
+$a->strings["Contact has been unblocked"] = "El contacte ha estat desbloquejat";
+$a->strings["Contact has been ignored"] = "El contacte ha estat ignorat";
+$a->strings["Contact has been unignored"] = "El contacte ha estat recordat";
+$a->strings["Contact has been archived"] = "El contacte ha estat arxivat";
+$a->strings["Contact has been unarchived"] = "El contacte ha estat desarxivat";
+$a->strings["Do you really want to delete this contact?"] = "Realment vols esborrar aquest contacte?";
+$a->strings["Contact has been removed."] = "El contacte ha estat tret";
+$a->strings["You are mutual friends with %s"] = "Ara te una amistat mutua amb %s";
+$a->strings["You are sharing with %s"] = "Estas compartint amb %s";
+$a->strings["%s is sharing with you"] = "%s esta compartint amb tú";
+$a->strings["Private communications are not available for this contact."] = "Comunicacions privades no disponibles per aquest contacte.";
+$a->strings["(Update was successful)"] = "(L'actualització fou exitosa)";
+$a->strings["(Update was not successful)"] = "(L'actualització fracassà)";
+$a->strings["Suggest friends"] = "Suggerir amics";
+$a->strings["Network type: %s"] = "Xarxa tipus: %s";
+$a->strings["View all contacts"] = "Veure tots els contactes";
+$a->strings["Toggle Blocked status"] = "Canvi de estatus blocat";
+$a->strings["Unignore"] = "Treure d'Ignorats";
+$a->strings["Ignore"] = "Ignorar";
+$a->strings["Toggle Ignored status"] = "Canvi de estatus ignorat";
+$a->strings["Unarchive"] = "Desarxivat";
+$a->strings["Archive"] = "Arxivat";
+$a->strings["Toggle Archive status"] = "Canvi de estatus del arxiu";
+$a->strings["Repair"] = "Reparar";
+$a->strings["Advanced Contact Settings"] = "Ajustos Avançats per als Contactes";
+$a->strings["Communications lost with this contact!"] = "La comunicació amb aquest contacte s'ha perdut!";
+$a->strings["Contact Editor"] = "Editor de Contactes";
+$a->strings["Profile Visibility"] = "Perfil de Visibilitat";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Si us plau triï el perfil que voleu mostrar a %s quan estigui veient el teu de forma segura.";
+$a->strings["Contact Information / Notes"] = "Informació/Notes del contacte";
+$a->strings["Edit contact notes"] = "Editar notes de contactes";
+$a->strings["Block/Unblock contact"] = "Bloquejar/Alliberar contacte";
+$a->strings["Ignore contact"] = "Ignore contacte";
+$a->strings["Repair URL settings"] = "Restablir configuració de URL";
+$a->strings["View conversations"] = "Veient conversacions";
+$a->strings["Delete contact"] = "Esborrar contacte";
+$a->strings["Last update:"] = "Última actualització:";
+$a->strings["Update public posts"] = "Actualitzar enviament públic";
+$a->strings["Currently blocked"] = "Bloquejat actualment";
+$a->strings["Currently ignored"] = "Ignorat actualment";
+$a->strings["Currently archived"] = "Actualment arxivat";
+$a->strings["Hide this contact from others"] = "Amaga aquest contacte dels altres";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Répliques/agraiments per als teus missatges públics <strong>poden</strong> romandre visibles";
+$a->strings["Suggestions"] = "Suggeriments";
+$a->strings["Suggest potential friends"] = "Suggerir amics potencials";
+$a->strings["All Contacts"] = "Tots els Contactes";
+$a->strings["Show all contacts"] = "Mostrar tots els contactes";
+$a->strings["Unblocked"] = "Desblocat";
+$a->strings["Only show unblocked contacts"] = "Mostrar únicament els contactes no blocats";
+$a->strings["Blocked"] = "Blocat";
+$a->strings["Only show blocked contacts"] = "Mostrar únicament els contactes blocats";
+$a->strings["Ignored"] = "Ignorat";
+$a->strings["Only show ignored contacts"] = "Mostrar únicament els contactes ignorats";
+$a->strings["Archived"] = "Arxivat";
+$a->strings["Only show archived contacts"] = "Mostrar únicament els contactes arxivats";
+$a->strings["Hidden"] = "Amagat";
+$a->strings["Only show hidden contacts"] = "Mostrar únicament els contactes amagats";
+$a->strings["Mutual Friendship"] = "Amistat Mutua";
+$a->strings["is a fan of yours"] = "Es un fan teu";
+$a->strings["you are a fan of"] = "ets fan de";
+$a->strings["Search your contacts"] = "Cercant el seus contactes";
+$a->strings["Finding: "] = "Cercant:";
+$a->strings["everybody"] = "tothom";
+$a->strings["Additional features"] = "Característiques Adicionals";
+$a->strings["Display settings"] = "Ajustos de pantalla";
+$a->strings["Connector settings"] = "Configuració dels connectors";
+$a->strings["Plugin settings"] = "Configuració del plugin";
+$a->strings["Connected apps"] = "App connectada";
+$a->strings["Export personal data"] = "Exportar dades personals";
+$a->strings["Remove account"] = "Esborrar compte";
+$a->strings["Missing some important data!"] = "Perdudes algunes dades importants!";
+$a->strings["Update"] = "Actualitzar";
+$a->strings["Failed to connect with email account using the settings provided."] = "Connexió fracassada amb el compte de correu emprant la configuració proveïda.";
+$a->strings["Email settings updated."] = "Configuració del correu electrònic actualitzada.";
+$a->strings["Features updated"] = "Característiques actualitzades";
+$a->strings["Passwords do not match. Password unchanged."] = "Les contrasenyes no coincideixen. Contrasenya no canviada.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "No es permeten contasenyes buides. Contrasenya no canviada";
+$a->strings["Wrong password."] = "Contrasenya errònia";
+$a->strings["Password changed."] = "Contrasenya canviada.";
+$a->strings["Password update failed. Please try again."] = "Ha fallat l'actualització de la Contrasenya. Per favor, intenti-ho de nou.";
+$a->strings[" Please use a shorter name."] = "Si us plau, faci servir un nom més curt.";
+$a->strings[" Name too short."] = "Nom massa curt.";
+$a->strings["Wrong Password"] = "Contrasenya Errònia";
+$a->strings[" Not valid email."] = "Correu no vàlid.";
+$a->strings[" Cannot change to that email."] = "No puc canviar a aquest correu.";
+$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Els Fòrums privats no tenen permisos de privacitat. Empra la privacitat de grup per defecte.";
+$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Els Fòrums privats no tenen permisos de privacitat i tampoc privacitat per defecte de grup.";
+$a->strings["Settings updated."] = "Ajustos actualitzats.";
+$a->strings["Add application"] = "Afegir aplicació";
+$a->strings["Consumer Key"] = "Consumer Key";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Redirect"] = "Redirigir";
+$a->strings["Icon url"] = "icona de url";
+$a->strings["You can't edit this application."] = "No pots editar aquesta aplicació.";
+$a->strings["Connected Apps"] = "Aplicacions conectades";
+$a->strings["Edit"] = "Editar";
+$a->strings["Client key starts with"] = "Les claus de client comançen amb";
+$a->strings["No name"] = "Sense nom";
+$a->strings["Remove authorization"] = "retirar l'autorització";
+$a->strings["No Plugin settings configured"] = "No s'han configurat ajustos de Plugin";
+$a->strings["Plugin Settings"] = "Ajustos de Plugin";
+$a->strings["Off"] = "Apagat";
+$a->strings["On"] = "Engegat";
+$a->strings["Additional Features"] = "Característiques Adicionals";
+$a->strings["Built-in support for %s connectivity is %s"] = "El suport integrat per a la connectivitat de %s és %s";
+$a->strings["enabled"] = "habilitat";
+$a->strings["disabled"] = "deshabilitat";
+$a->strings["StatusNet"] = "StatusNet";
+$a->strings["Email access is disabled on this site."] = "L'accés al correu està deshabilitat en aquest lloc.";
+$a->strings["Connector Settings"] = "Configuració de connectors";
+$a->strings["Email/Mailbox Setup"] = "Preparació de Correu/Bústia";
+$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Si vol comunicar-se amb els contactes de correu emprant aquest servei (opcional), Si us plau, especifiqui com connectar amb la seva bústia.";
+$a->strings["Last successful email check:"] = "Última comprovació de correu amb èxit:";
+$a->strings["IMAP server name:"] = "Nom del servidor IMAP:";
+$a->strings["IMAP port:"] = "Port IMAP:";
+$a->strings["Security:"] = "Seguretat:";
+$a->strings["None"] = "Cap";
+$a->strings["Email login name:"] = "Nom d'usuari del correu";
+$a->strings["Email password:"] = "Contrasenya del correu:";
+$a->strings["Reply-to address:"] = "Adreça de resposta:";
+$a->strings["Send public posts to all email contacts:"] = "Enviar correu públic a tots els contactes del correu:";
+$a->strings["Action after import:"] = "Acció després d'importar:";
+$a->strings["Mark as seen"] = "Marcar com a vist";
+$a->strings["Move to folder"] = "Moure a la carpeta";
+$a->strings["Move to folder:"] = "Moure a la carpeta:";
+$a->strings["Display Settings"] = "Ajustos de Pantalla";
+$a->strings["Display Theme:"] = "Visualitzar el Tema:";
+$a->strings["Mobile Theme:"] = "Tema Mobile:";
+$a->strings["Update browser every xx seconds"] = "Actualitzar navegador cada xx segons";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Mínim cada 10 segons, no hi ha màxim";
+$a->strings["Number of items to display per page:"] = "Número d'elements a mostrar per pàgina";
+$a->strings["Maximum of 100 items"] = "Màxim de 100 elements";
+$a->strings["Number of items to display per page when viewed from mobile device:"] = "Nombre d'elements a veure per pàgina quan es vegin des d'un dispositiu mòbil:";
+$a->strings["Don't show emoticons"] = "No mostrar emoticons";
+$a->strings["Normal Account Page"] = "Pàgina Normal del Compte ";
+$a->strings["This account is a normal personal profile"] = "Aques compte es un compte personal normal";
+$a->strings["Soapbox Page"] = "Pàgina de Soapbox";
+$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de només lectura.";
+$a->strings["Community Forum/Celebrity Account"] = "Compte de Comunitat/Celebritat";
+$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de lectura-escriptura";
+$a->strings["Automatic Friend Page"] = "Compte d'Amistat Automàtica";
+$a->strings["Automatically approve all connection/friend requests as friends"] = "Aprova totes les sol·licituds de amistat/connexió com a amic automàticament";
+$a->strings["Private Forum [Experimental]"] = "Fòrum Privat [Experimental]";
+$a->strings["Private forum - approved members only"] = "Fòrum privat - Només membres aprovats";
+$a->strings["OpenID:"] = "OpenID:";
+$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Opcional) Permetre a aquest OpenID iniciar sessió en aquest compte.";
+$a->strings["Publish your default profile in your local site directory?"] = "Publicar el teu perfil predeterminat en el directori del lloc local?";
+$a->strings["Publish your default profile in the global social directory?"] = "Publicar el teu perfil predeterminat al directori social global?";
+$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Amaga la teva llista de contactes/amics dels espectadors del seu perfil per defecte?";
+$a->strings["Hide your profile details from unknown viewers?"] = "Amagar els detalls del seu perfil a espectadors desconeguts?";
+$a->strings["Allow friends to post to your profile page?"] = "Permet als amics publicar en la seva pàgina de perfil?";
+$a->strings["Allow friends to tag your posts?"] = "Permet als amics d'etiquetar els teus missatges?";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Permeteu-nos suggerir-li com un amic potencial dels nous membres?";
+$a->strings["Permit unknown people to send you private mail?"] = "Permetre a desconeguts enviar missatges al teu correu privat?";
+$a->strings["Profile is <strong>not published</strong>."] = "El  Perfil <strong>no està publicat</strong>.";
+$a->strings["or"] = "o";
+$a->strings["Your Identity Address is"] = "La seva Adreça d'Identitat és";
+$a->strings["Automatically expire posts after this many days:"] = "Després de aquests nombre de dies, els missatges caduquen automàticament:";
+$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Si està buit, els missatges no caducarà. Missatges caducats s'eliminaran";
+$a->strings["Advanced expiration settings"] = "Configuració avançada d'expiració";
+$a->strings["Advanced Expiration"] = "Expiració Avançada";
+$a->strings["Expire posts:"] = "Expiració d'enviaments";
+$a->strings["Expire personal notes:"] = "Expiració de notes personals";
+$a->strings["Expire starred posts:"] = "Expiració de enviaments de favorits";
+$a->strings["Expire photos:"] = "Expiració de fotos";
+$a->strings["Only expire posts by others:"] = "Només expiren els enviaments dels altres:";
+$a->strings["Account Settings"] = "Ajustos de Compte";
+$a->strings["Password Settings"] = "Ajustos de Contrasenya";
+$a->strings["New Password:"] = "Nova Contrasenya:";
+$a->strings["Confirm:"] = "Confirmar:";
+$a->strings["Leave password fields blank unless changing"] = "Deixi els camps de contrasenya buits per a no fer canvis";
+$a->strings["Current Password:"] = "Contrasenya Actual:";
+$a->strings["Your current password to confirm the changes"] = "La teva actual contrasenya a fi de confirmar els canvis";
+$a->strings["Password:"] = "Contrasenya:";
+$a->strings["Basic Settings"] = "Ajustos Basics";
+$a->strings["Email Address:"] = "Adreça de Correu:";
+$a->strings["Your Timezone:"] = "La teva zona Horària:";
+$a->strings["Default Post Location:"] = "Localització per Defecte del Missatge:";
+$a->strings["Use Browser Location:"] = "Ubicar-se amb el Navegador:";
+$a->strings["Security and Privacy Settings"] = "Ajustos de Seguretat i Privacitat";
+$a->strings["Maximum Friend Requests/Day:"] = "Nombre Màxim de Sol·licituds per Dia";
+$a->strings["(to prevent spam abuse)"] = "(per a prevenir abusos de spam)";
+$a->strings["Default Post Permissions"] = "Permisos de Correu per Defecte";
+$a->strings["(click to open/close)"] = "(clicar per a obrir/tancar)";
+$a->strings["Show to Groups"] = "Mostrar en Grups";
+$a->strings["Show to Contacts"] = "Mostrar a Contactes";
+$a->strings["Default Private Post"] = "Missatges Privats Per Defecte";
+$a->strings["Default Public Post"] = "Missatges Públics Per Defecte";
+$a->strings["Default Permissions for New Posts"] = "Permisos Per Defecte per a Nous Missatges";
+$a->strings["Maximum private messages per day from unknown people:"] = "Màxim nombre de missatges, per dia, de desconeguts:";
+$a->strings["Notification Settings"] = "Ajustos de Notificació";
+$a->strings["By default post a status message when:"] = "Enviar per defecte un missatge de estatus quan:";
+$a->strings["accepting a friend request"] = "Acceptar una sol·licitud d'amistat";
+$a->strings["joining a forum/community"] = "Unint-se a un fòrum/comunitat";
+$a->strings["making an <em>interesting</em> profile change"] = "fent un <em interesant</em> canvi al perfil";
+$a->strings["Send a notification email when:"] = "Envia un correu notificant quan:";
+$a->strings["You receive an introduction"] = "Has rebut una presentació";
+$a->strings["Your introductions are confirmed"] = "La teva presentació està confirmada";
+$a->strings["Someone writes on your profile wall"] = "Algú ha escrit en el teu mur de perfil";
+$a->strings["Someone writes a followup comment"] = "Algú ha escrit un comentari de seguiment";
+$a->strings["You receive a private message"] = "Has rebut un missatge privat";
+$a->strings["You receive a friend suggestion"] = "Has rebut una suggerencia d'un amic";
+$a->strings["You are tagged in a post"] = "Estàs etiquetat en un enviament";
+$a->strings["You are poked/prodded/etc. in a post"] = "Has estat Atiat/punxat/etc, en un enviament";
+$a->strings["Advanced Account/Page Type Settings"] = "Ajustos Avançats de Compte/ Pàgina";
+$a->strings["Change the behaviour of this account for special situations"] = "Canviar el comportament d'aquest compte en situacions especials";
+$a->strings["link"] = "enllaç";
+$a->strings["Contact settings applied."] = "Ajustos de Contacte aplicats.";
+$a->strings["Contact update failed."] = "Fracassà l'actualització de Contacte";
+$a->strings["Contact not found."] = "Contacte no trobat";
+$a->strings["Repair Contact Settings"] = "Reposar els ajustos de Contacte";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ADVERTÈNCIA: Això és molt avançat </strong> i si s'introdueix informació incorrecta la seva comunicació amb aquest contacte pot deixar de funcionar.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Si us plau, prem el botó 'Tornar' <strong>ara</strong> si no saps segur que has de fer aqui.";
+$a->strings["Return to contact editor"] = "Tornar al editor de contactes";
+$a->strings["Account Nickname"] = "Àlies del Compte";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - té prel·lació sobre Nom/Àlies";
+$a->strings["Account URL"] = "Adreça URL del Compte";
+$a->strings["Friend Request URL"] = "Adreça URL de sol·licitud d'Amistat";
+$a->strings["Friend Confirm URL"] = "Adreça URL de confirmació d'Amic";
+$a->strings["Notification Endpoint URL"] = "Adreça URL de Notificació";
+$a->strings["Poll/Feed URL"] = "Adreça de Enquesta/Alimentador";
+$a->strings["New photo from this URL"] = "Nova foto d'aquesta URL";
+$a->strings["No potential page delegates located."] = "No es troben pàgines potencialment delegades.";
+$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."] = "Els delegats poden gestionar tots els aspectes d'aquest compte/pàgina, excepte per als ajustaments bàsics del compte. Si us plau, no deleguin el seu compte personal a ningú que no confiïn completament.";
+$a->strings["Existing Page Managers"] = "Actuals Administradors de Pàgina";
+$a->strings["Existing Page Delegates"] = "Actuals Delegats de Pàgina";
+$a->strings["Potential Delegates"] = "Delegats Potencials";
+$a->strings["Remove"] = "Esborrar";
+$a->strings["Add"] = "Afegir";
+$a->strings["No entries."] = "Sense entrades";
+$a->strings["Poke/Prod"] = "Atia/Punxa";
+$a->strings["poke, prod or do other things to somebody"] = "Atiar, punxar o fer altres coses a algú";
+$a->strings["Recipient"] = "Recipient";
+$a->strings["Choose what you wish to do to recipient"] = "Tria que vols fer amb el contenidor";
+$a->strings["Make this post private"] = "Fes aquest missatge privat";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Això pot ocorre ocasionalment si el contacte fa una petició per ambdues persones i ja han estat aprovades.";
+$a->strings["Response from remote site was not understood."] = "La resposta des del lloc remot no s'entenia.";
+$a->strings["Unexpected response from remote site: "] = "Resposta inesperada de lloc remot:";
+$a->strings["Confirmation completed successfully."] = "La confirmació s'ha completat correctament.";
+$a->strings["Remote site reported: "] = "El lloc remot informa:";
+$a->strings["Temporary failure. Please wait and try again."] = "Fallada temporal. Si us plau, espereu i torneu a intentar.";
+$a->strings["Introduction failed or was revoked."] = "La presentació va fallar o va ser revocada.";
+$a->strings["Unable to set contact photo."] = "No es pot canviar la foto de contacte.";
+$a->strings["No user record found for '%s' "] = "No es troben registres d'usuari per a '%s'";
+$a->strings["Our site encryption key is apparently messed up."] = "La nostra clau de xifrat del lloc pel que sembla en mal estat.";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Es va proporcionar una URL del lloc buida o la URL no va poder ser desxifrada per nosaltres.";
+$a->strings["Contact record was not found for you on our site."] = "No s'han trobat registres del contacte al nostre lloc.";
+$a->strings["Site public key not available in contact record for URL %s."] = "la clau pública del lloc no disponible en les dades del contacte per URL %s.";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "La ID proporcionada pel seu sistema és un duplicat en el nostre sistema. Hauria de treballar si intenta de nou.";
+$a->strings["Unable to set your contact credentials on our system."] = "No es pot canviar les seves credencials de contacte en el nostre sistema.";
+$a->strings["Unable to update your contact profile details on our system"] = "No es pot actualitzar els detalls del seu perfil de contacte en el nostre sistema";
+$a->strings["Connection accepted at %s"] = "Connexió acceptada en %s";
+$a->strings["%1\$s has joined %2\$s"] = "%1\$s s'ha unit a  %2\$s";
+$a->strings["%1\$s welcomes %2\$s"] = "%1\$s benvingut %2\$s";
+$a->strings["This introduction has already been accepted."] = "Aquesta presentació ha estat acceptada.";
+$a->strings["Profile location is not valid or does not contain profile information."] = "El perfil de situació no és vàlid o no contè informació de perfil";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Atenció: El perfil de situació no te nom de propietari identificable.";
+$a->strings["Warning: profile location has no profile photo."] = "Atenció: El perfil de situació no te foto de perfil";
+$a->strings["%d required parameter was not found at the given location"] = array(
+	0 => "%d el paràmetre requerit no es va trobar al lloc indicat",
+	1 => "%d els paràmetres requerits no es van trobar allloc indicat",
+);
+$a->strings["Introduction complete."] = "Completada la presentació.";
+$a->strings["Unrecoverable protocol error."] = "Error de protocol irrecuperable.";
+$a->strings["Profile unavailable."] = "Perfil no disponible";
+$a->strings["%s has received too many connection requests today."] = "%s avui ha rebut excesives peticions de connexió. ";
+$a->strings["Spam protection measures have been invoked."] = "Mesures de protecció contra spam han estat invocades.";
+$a->strings["Friends are advised to please try again in 24 hours."] = "S'aconsellà els amics que probin pasades 24 hores.";
+$a->strings["Invalid locator"] = "Localitzador no vàlid";
+$a->strings["Invalid email address."] = "Adreça de correu no vàlida.";
+$a->strings["This account has not been configured for email. Request failed."] = "Aquest compte no s'ha configurat per al correu electrònic. Ha fallat la sol·licitud.";
+$a->strings["Unable to resolve your name at the provided location."] = "Incapaç de resoldre el teu nom al lloc facilitat.";
+$a->strings["You have already introduced yourself here."] = "Has fer la teva presentació aquí.";
+$a->strings["Apparently you are already friends with %s."] = "Aparentment, ja tens amistat amb %s";
+$a->strings["Invalid profile URL."] = "Perfil URL no vàlid.";
+$a->strings["Your introduction has been sent."] = "La teva presentació ha estat enviada.";
+$a->strings["Please login to confirm introduction."] = "Si us plau, entri per confirmar la presentació.";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Sesió iniciada amb la identificació incorrecta. Entra en <strong>aquest</strong> perfil.";
+$a->strings["Hide this contact"] = "Amaga aquest contacte";
+$a->strings["Welcome home %s."] = "Benvingut de nou %s";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Si us plau, confirmi la seva sol·licitud de Presentació/Amistat a %s.";
+$a->strings["Confirm"] = "Confirmar";
+$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Si us plau, introdueixi la seva \"Adreça Identificativa\" d'una de les següents xarxes socials suportades:";
+$a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "<strike>Connectar com un seguidor de correu</strike> (Disponible aviat)";
+$a->strings["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>."] = "Si encara no ets membre de la web social lliure, <a href=\"http://dir.friendica.com/siteinfo\">segueix aquest enllaç per a trobar un lloc Friendica públic i uneix-te  avui</a>.";
+$a->strings["Friend/Connection Request"] = "Sol·licitud d'Amistat";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Exemples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
+$a->strings["Please answer the following:"] = "Si us plau, contesti les següents preguntes:";
+$a->strings["Does %s know you?"] = "%s et coneix?";
+$a->strings["Add a personal note:"] = "Afegir una nota personal:";
+$a->strings["StatusNet/Federated Social Web"] = "Web Social StatusNet/Federated ";
+$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - per favor no utilitzi aquest formulari.  Al contrari, entra %s en la barra de cerques de Diaspora.";
+$a->strings["Your Identity Address:"] = "La Teva Adreça Identificativa:";
+$a->strings["Submit Request"] = "Sol·licitud Enviada";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s esta seguint %2\$s de %3\$s";
+$a->strings["Global Directory"] = "Directori Global";
+$a->strings["Find on this site"] = "Trobat en aquest lloc";
+$a->strings["Site Directory"] = "Directori Local";
+$a->strings["Gender: "] = "Gènere:";
+$a->strings["No entries (some entries may be hidden)."] = "No hi ha entrades (algunes de les entrades poden estar amagades).";
+$a->strings["Do you really want to delete this suggestion?"] = "Realment vols esborrar aquest suggeriment?";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Cap suggeriment disponible. Si això és un nou lloc, si us plau torna a intentar en 24 hores.";
+$a->strings["Ignore/Hide"] = "Ignorar/Amagar";
+$a->strings["People Search"] = "Cercant Gent";
+$a->strings["No matches"] = "No hi ha coincidències";
+$a->strings["No videos selected"] = "No s'han seleccionat vídeos ";
+$a->strings["Access to this item is restricted."] = "L'accés a aquest element està restringit.";
+$a->strings["View Album"] = "Veure Àlbum";
+$a->strings["Recent Videos"] = "Videos Recents";
+$a->strings["Upload New Videos"] = "Carrega Nous Videos";
+$a->strings["Tag removed"] = "Etiqueta eliminada";
+$a->strings["Remove Item Tag"] = "Esborrar etiqueta del element";
+$a->strings["Select a tag to remove: "] = "Selecciona etiqueta a esborrar:";
+$a->strings["Item not found"] = "Element no trobat";
+$a->strings["Edit post"] = "Editar Enviament";
+$a->strings["Event title and start time are required."] = "Títol d'esdeveniment i hora d'inici requerits.";
+$a->strings["l, F j"] = "l, F j";
+$a->strings["Edit event"] = "Editar esdeveniment";
+$a->strings["Create New Event"] = "Crear un nou esdeveniment";
+$a->strings["Previous"] = "Previ";
+$a->strings["Next"] = "Següent";
+$a->strings["hour:minute"] = "hora:minut";
+$a->strings["Event details"] = "Detalls del esdeveniment";
+$a->strings["Format is %s %s. Starting date and Title are required."] = "El Format és %s %s. Data d'inici i títol requerits.";
+$a->strings["Event Starts:"] = "Inici d'Esdeveniment:";
+$a->strings["Required"] = "Requerit";
+$a->strings["Finish date/time is not known or not relevant"] = "La data/hora de finalització no es coneixen o no són relevants";
+$a->strings["Event Finishes:"] = "L'esdeveniment Finalitza:";
+$a->strings["Adjust for viewer timezone"] = "Ajustar a la zona horaria de l'espectador";
+$a->strings["Description:"] = "Descripció:";
+$a->strings["Title:"] = "Títol:";
+$a->strings["Share this event"] = "Compartir aquest esdeveniment";
+$a->strings["Files"] = "Arxius";
+$a->strings["Export account"] = "Exportar compte";
+$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportar la teva informació del compte i de contactes. Empra això per fer una còpia de seguretat del teu compte i/o moure'l cap altre servidor. ";
+$a->strings["Export all"] = "Exportar tot";
+$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportar la teva informació de compte, contactes i tots els teus articles com a json. Pot ser un fitxer molt gran, i pot trigar molt temps. Empra això per fer una còpia de seguretat total del teu compte (les fotos no s'exporten)";
+$a->strings["- select -"] = "- seleccionar -";
+$a->strings["Import"] = "Importar";
+$a->strings["Move account"] = "Moure el compte";
+$a->strings["You can import an account from another Friendica server."] = "Pots importar un compte d'un altre servidor Friendica";
+$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."] = "Es necessari que exportis el teu compte de l'antic servidor i el pugis a aquest. Recrearem el teu antic compte aquí amb tots els teus contactes. Intentarem també informar als teus amics que t'has traslladat aquí.";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Aquesta característica es experimental. Podem importar els teus contactes de la xarxa OStatus (status/identi.ca) o de Diaspora";
+$a->strings["Account file"] = "Arxiu del compte";
+$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "Per exportar el teu compte, ves a \"Ajustos->Exportar les teves dades personals\" i sel·lecciona \"Exportar compte\"";
+$a->strings["[Embedded content - reload page to view]"] = "[Contingut embegut - recarrega la pàgina per a veure-ho]";
+$a->strings["Contact added"] = "Contacte afegit";
+$a->strings["This is Friendica, version"] = "Això és Friendica, versió";
+$a->strings["running at web location"] = "funcionant en la ubicació web";
+$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Si us plau, visiteu <a href=\"http://friendica.com\">Friendica.com</a> per obtenir més informació sobre el projecte Friendica.";
+$a->strings["Bug reports and issues: please visit"] = "Pels informes d'error i problemes: si us plau, visiteu";
+$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Suggeriments, elogis, donacions, etc si us plau escrigui a \"Info\" en Friendica - dot com";
+$a->strings["Installed plugins/addons/apps:"] = "plugins/addons/apps instal·lats:";
+$a->strings["No installed plugins/addons/apps"] = "plugins/addons/apps no instal·lats";
+$a->strings["Friend suggestion sent."] = "Enviat suggeriment d'amic.";
+$a->strings["Suggest Friends"] = "Suggerir Amics";
+$a->strings["Suggest a friend for %s"] = "Suggerir un amic per a %s";
+$a->strings["Group created."] = "Grup creat.";
+$a->strings["Could not create group."] = "No puc crear grup.";
+$a->strings["Group not found."] = "Grup no trobat";
+$a->strings["Group name changed."] = "Nom de Grup canviat.";
+$a->strings["Create a group of contacts/friends."] = "Crear un grup de contactes/amics.";
+$a->strings["Group Name: "] = "Nom del Grup:";
+$a->strings["Group removed."] = "Grup esborrat.";
+$a->strings["Unable to remove group."] = "Incapaç de esborrar Grup.";
+$a->strings["Group Editor"] = "Editor de Grup:";
+$a->strings["Members"] = "Membres";
+$a->strings["No profile"] = "Sense perfil";
+$a->strings["Help:"] = "Ajuda:";
+$a->strings["Not Found"] = "No trobat";
+$a->strings["Page not found."] = "Pàgina no trobada.";
+$a->strings["No contacts."] = "Sense Contactes";
+$a->strings["Welcome to %s"] = "Benvingut a %s";
+$a->strings["Access denied."] = "Accés denegat.";
+$a->strings["File exceeds size limit of %d"] = "L'arxiu excedeix la mida límit de %d";
+$a->strings["File upload failed."] = "La càrrega de fitxers ha fallat.";
+$a->strings["Image exceeds size limit of %d"] = "La imatge sobrepassa el límit de mida de %d";
+$a->strings["Unable to process image."] = "Incapaç de processar la imatge.";
+$a->strings["Image upload failed."] = "Actualització de la imatge fracassada.";
+$a->strings["Total invitation limit exceeded."] = "Limit d'invitacions excedit.";
+$a->strings["%s : Not a valid email address."] = "%s : No es una adreça de correu vàlida";
+$a->strings["Please join us on Friendica"] = "Per favor, uneixi's a nosaltres en Friendica";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limit d'invitacions excedit. Per favor, Contacti amb l'administrador del lloc.";
+$a->strings["%s : Message delivery failed."] = "%s : Ha fallat l'entrega del missatge.";
+$a->strings["%d message sent."] = array(
+	0 => "%d missatge enviat",
+	1 => "%d missatges enviats.",
+);
+$a->strings["You have no more invitations available"] = "No te més invitacions disponibles";
+$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Visita %s per a una llista de llocs públics on unir-te. Els membres de Friendica d'altres llocs poden connectar-se de forma total, així com amb membres de moltes altres xarxes socials.";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Per acceptar aquesta invitació, per favor visita i registra't a %s o en qualsevol altre pàgina web pública Friendica.";
+$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Tots els llocs Friendica estàn interconnectats per crear una web social amb privacitat millorada, controlada i propietat dels seus membres. També poden connectar amb moltes xarxes socials tradicionals. Consulteu %s per a una llista de llocs de Friendica alternatius en que pot inscriure's.";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Nostres disculpes. Aquest sistema no està configurat actualment per connectar amb altres llocs públics o convidar als membres.";
+$a->strings["Send invitations"] = "Enviant Invitacions";
+$a->strings["Enter email addresses, one per line:"] = "Entri adreçes de correu, una per línia:";
+$a->strings["Your message:"] = "El teu missatge:";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Estàs cordialment convidat a ajuntarte a mi i altres amics propers en Friendica - i ajudar-nos a crear una millor web social.";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "Vostè haurà de proporcionar aquest codi d'invitació: \$invite_code";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Un cop registrat, si us plau contactar amb mi a través de la meva pàgina de perfil a:";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Per a més informació sobre el projecte Friendica i perque creiem que això es important, per favor, visita http://friendica.com";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Nombre diari de missatges al mur per %s excedit. El missatge ha fallat.";
+$a->strings["No recipient selected."] = "No s'ha seleccionat destinatari.";
+$a->strings["Unable to check your home location."] = "Incapaç de comprovar la localització.";
+$a->strings["Message could not be sent."] = "El Missatge no ha estat enviat.";
+$a->strings["Message collection failure."] = "Ha fallat la recollida del missatge.";
+$a->strings["Message sent."] = "Missatge enviat.";
+$a->strings["No recipient."] = "Sense destinatari.";
+$a->strings["Send Private Message"] = "Enviant Missatge Privat";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "si vols respondre a %s, comprova que els ajustos de privacitat del lloc permeten correus privats de remitents desconeguts.";
+$a->strings["To:"] = "Per a:";
+$a->strings["Subject:"] = "Assumpte::";
+$a->strings["Time Conversion"] = "Temps de Conversió";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofereix aquest servei per a compartir esdeveniments amb d'altres xarxes i amics en zones horaries que son desconegudes";
+$a->strings["UTC time: %s"] = "hora UTC: %s";
+$a->strings["Current timezone: %s"] = "Zona horària actual: %s";
+$a->strings["Converted localtime: %s"] = "Conversión de hora local: %s";
+$a->strings["Please select your timezone:"] = "Si us plau, seleccioneu la vostra zona horària:";
+$a->strings["Remote privacy information not available."] = "Informació de privacitat remota no disponible.";
+$a->strings["Visible to:"] = "Visible per a:";
+$a->strings["No valid account found."] = "compte no vàlid trobat.";
+$a->strings["Password reset request issued. Check your email."] = "Sol·licitut de restabliment de contrasenya enviat. Comprovi el seu correu.";
+$a->strings["Password reset requested at %s"] = "Contrasenya restablerta enviada a %s";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La sol·licitut no pot ser verificada. (Hauries de presentar-la abans). Restabliment de contrasenya fracassat.";
+$a->strings["Password Reset"] = "Restabliment de Contrasenya";
+$a->strings["Your password has been reset as requested."] = "La teva contrasenya fou restablerta com vas demanar.";
+$a->strings["Your new password is"] = "La teva nova contrasenya es";
+$a->strings["Save or copy your new password - and then"] = "Guarda o copia la nova contrasenya - i llavors";
+$a->strings["click here to login"] = "clica aquí per identificarte";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Pots camviar la contrasenya des de la pàgina de <em>Configuración</em> desprès d'accedir amb èxit.";
+$a->strings["Your password has been changed at %s"] = "La teva contrasenya ha estat canviada a %s";
+$a->strings["Forgot your Password?"] = "Has Oblidat la Contrasenya?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introdueixi la seva adreça de correu i enivii-la per restablir la seva contrasenya. Llavors comprovi el seu correu per a les següents instruccións. ";
+$a->strings["Nickname or Email: "] = "Àlies o Correu:";
+$a->strings["Reset"] = "Restablir";
+$a->strings["System down for maintenance"] = "Sistema apagat per manteniment";
+$a->strings["Manage Identities and/or Pages"] = "Administrar Identitats i/o  Pàgines";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Alternar entre les diferents identitats o les pàgines de comunitats/grups que comparteixen les dades del seu compte o que se li ha concedit els permisos de \"administrar\"";
+$a->strings["Select an identity to manage: "] = "Seleccionar identitat a administrar:";
+$a->strings["Profile Match"] = "Perfil Aconseguit";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hi ha paraules clau que coincideixin. Si us plau, afegeixi paraules clau al teu perfil predeterminat.";
+$a->strings["is interested in:"] = "està interessat en:";
+$a->strings["Unable to locate contact information."] = "No es pot trobar informació de contacte.";
+$a->strings["Do you really want to delete this message?"] = "Realment vols esborrar aquest missatge?";
+$a->strings["Message deleted."] = "Missatge eliminat.";
+$a->strings["Conversation removed."] = "Conversació esborrada.";
+$a->strings["No messages."] = "Sense missatges.";
+$a->strings["Unknown sender - %s"] = "remitent desconegut - %s";
+$a->strings["You and %s"] = "Tu i %s";
+$a->strings["%s and You"] = "%s i Tu";
+$a->strings["Delete conversation"] = "Esborrar conversació";
+$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
+$a->strings["%d message"] = array(
+	0 => "%d missatge",
+	1 => "%d missatges",
+);
+$a->strings["Message not available."] = "Missatge no disponible.";
+$a->strings["Delete message"] = "Esborra missatge";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicacions degures no disponibles. Tú <strong>pots</strong> respondre des de la pàgina de perfil del remitent.";
+$a->strings["Send Reply"] = "Enviar Resposta";
+$a->strings["Mood"] = "Humor";
+$a->strings["Set your current mood and tell your friends"] = "Ajusta el teu actual estat d'ànim i comenta-ho als amics";
+$a->strings["Search Results For:"] = "Resultats de la Cerca Per a:";
+$a->strings["Commented Order"] = "Ordre dels Comentaris";
+$a->strings["Sort by Comment Date"] = "Ordenar per Data de Comentari";
+$a->strings["Posted Order"] = "Ordre dels Enviaments";
+$a->strings["Sort by Post Date"] = "Ordenar per Data d'Enviament";
+$a->strings["Personal"] = "Personal";
+$a->strings["Posts that mention or involve you"] = "Missatge que et menciona o t'impliquen";
+$a->strings["New"] = "Nou";
+$a->strings["Activity Stream - by date"] = "Activitat del Flux - per data";
+$a->strings["Shared Links"] = "Enllaços Compartits";
+$a->strings["Interesting Links"] = "Enllaços Interesants";
+$a->strings["Starred"] = "Favorits";
+$a->strings["Favourite Posts"] = "Enviaments Favorits";
+$a->strings["Warning: This group contains %s member from an insecure network."] = array(
+	0 => "Advertència: Aquest grup conté el membre %s en una xarxa insegura.",
+	1 => "Advertència: Aquest grup conté %s membres d'una xarxa insegura.",
+);
+$a->strings["Private messages to this group are at risk of public disclosure."] = "Els missatges privats a aquest grup es troben en risc de divulgació pública.";
+$a->strings["No such group"] = "Cap grup com";
+$a->strings["Group is empty"] = "El Grup es buit";
+$a->strings["Group: "] = "Grup:";
+$a->strings["Contact: "] = "Contacte:";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "Els missatges privats a aquesta persona es troben en risc de divulgació pública.";
+$a->strings["Invalid contact."] = "Contacte no vàlid.";
+$a->strings["Invalid request identifier."] = "Sol·licitud d'identificació no vàlida.";
+$a->strings["Discard"] = "Descartar";
+$a->strings["System"] = "Sistema";
+$a->strings["Show Ignored Requests"] = "Mostra les Sol·licituds Ignorades";
+$a->strings["Hide Ignored Requests"] = "Amaga les Sol·licituds Ignorades";
+$a->strings["Notification type: "] = "Tipus de Notificació:";
+$a->strings["Friend Suggestion"] = "Amics Suggerits ";
+$a->strings["suggested by %s"] = "sugerit per %s";
+$a->strings["Post a new friend activity"] = "Publica una activitat  d'amic nova";
+$a->strings["if applicable"] = "si es pot aplicar";
+$a->strings["Claims to be known to you: "] = "Diu que et coneix:";
+$a->strings["yes"] = "sí";
+$a->strings["no"] = "no";
+$a->strings["Approve as: "] = "Aprovat com:";
+$a->strings["Friend"] = "Amic";
+$a->strings["Sharer"] = "Partícip";
+$a->strings["Fan/Admirer"] = "Fan/Admirador";
+$a->strings["Friend/Connect Request"] = "Sol·licitud d'Amistat/Connexió";
+$a->strings["New Follower"] = "Nou Seguidor";
+$a->strings["No introductions."] = "Sense presentacions.";
+$a->strings["%s liked %s's post"] = "A %s li agrada l'enviament de %s";
+$a->strings["%s disliked %s's post"] = "A %s no li agrada l'enviament de %s";
+$a->strings["%s is now friends with %s"] = "%s es ara amic de %s";
+$a->strings["%s created a new post"] = "%s ha creat un enviament nou";
+$a->strings["%s commented on %s's post"] = "%s va comentar en l'enviament de %s";
+$a->strings["No more network notifications."] = "No més notificacions de xarxa.";
+$a->strings["Network Notifications"] = "Notificacions de la Xarxa";
+$a->strings["No more system notifications."] = "No més notificacions del sistema.";
+$a->strings["System Notifications"] = "Notificacions del Sistema";
+$a->strings["No more personal notifications."] = "No més notificacions personals.";
+$a->strings["Personal Notifications"] = "Notificacions Personals";
+$a->strings["No more home notifications."] = "No més notificacions d'inici.";
+$a->strings["Home Notifications"] = "Notificacions d'Inici";
+$a->strings["Photo Albums"] = "Àlbum de Fotos";
+$a->strings["Contact Photos"] = "Fotos de Contacte";
+$a->strings["Upload New Photos"] = "Actualitzar Noves Fotos";
+$a->strings["Contact information unavailable"] = "Informació del Contacte no disponible";
+$a->strings["Album not found."] = "Àlbum no trobat.";
+$a->strings["Delete Album"] = "Eliminar Àlbum";
+$a->strings["Do you really want to delete this photo album and all its photos?"] = "Realment vols esborrar aquest album de fotos amb totes les fotos?";
+$a->strings["Delete Photo"] = "Eliminar Foto";
+$a->strings["Do you really want to delete this photo?"] = "Realment vols esborrar aquesta foto?";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s fou etiquetat a %2\$s per %3\$s";
+$a->strings["a photo"] = "una foto";
+$a->strings["Image exceeds size limit of "] = "La imatge excedeix el límit de ";
+$a->strings["Image file is empty."] = "El fitxer de imatge és buit.";
+$a->strings["No photos selected"] = "No s'han seleccionat fotos";
+$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Has emprat %1$.2f Mbytes de %2$.2f Mbytes del magatzem de fotos.";
+$a->strings["Upload Photos"] = "Carregar Fotos";
+$a->strings["New album name: "] = "Nou nom d'àlbum:";
+$a->strings["or existing album name: "] = "o nom d'àlbum existent:";
+$a->strings["Do not show a status post for this upload"] = "No tornis a mostrar un missatge d'estat d'aquesta pujada";
+$a->strings["Permissions"] = "Permisos";
+$a->strings["Private Photo"] = "Foto Privada";
+$a->strings["Public Photo"] = "Foto Pública";
+$a->strings["Edit Album"] = "Editar Àlbum";
+$a->strings["Show Newest First"] = "Mostrar el més Nou Primer";
+$a->strings["Show Oldest First"] = "Mostrar el més Antic Primer";
+$a->strings["View Photo"] = "Veure Foto";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permís denegat. L'accés a aquest element pot estar restringit.";
+$a->strings["Photo not available"] = "Foto no disponible";
+$a->strings["View photo"] = "Veure foto";
+$a->strings["Edit photo"] = "Editar foto";
+$a->strings["Use as profile photo"] = "Emprar com a foto del perfil";
+$a->strings["Private Message"] = "Missatge Privat";
+$a->strings["View Full Size"] = "Veure'l a Mida Completa";
+$a->strings["Tags: "] = "Etiquetes:";
+$a->strings["[Remove any tag]"] = "Treure etiquetes";
+$a->strings["Rotate CW (right)"] = "Rotar CW (dreta)";
+$a->strings["Rotate CCW (left)"] = "Rotar CCW (esquerra)";
+$a->strings["New album name"] = "Nou nom d'àlbum";
+$a->strings["Caption"] = "Títol";
+$a->strings["Add a Tag"] = "Afegir una etiqueta";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Exemple: @bob, @Barbara_jensen, @jim@example.com,  #California, #camping";
+$a->strings["Private photo"] = "Foto Privada";
+$a->strings["Public photo"] = "Foto pública";
+$a->strings["I like this (toggle)"] = "M'agrada això (canviar)";
+$a->strings["I don't like this (toggle)"] = "No m'agrada això (canviar)";
+$a->strings["This is you"] = "Aquest ets tu";
+$a->strings["Comment"] = "Comentari";
+$a->strings["Recent Photos"] = "Fotos Recents";
+$a->strings["Welcome to Friendica"] = "Benvingut a Friendica";
+$a->strings["New Member Checklist"] = "Llista de Verificació dels Nous Membres";
+$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Ens agradaria oferir alguns consells i enllaços per ajudar a fer la teva experiència agradable. Feu clic a qualsevol element per visitar la pàgina corresponent. Un enllaç a aquesta pàgina serà visible des de la pàgina d'inici durant dues setmanes després de la teva inscripció inicial i després desapareixerà en silenci.";
+$a->strings["Getting Started"] = "Començem";
+$a->strings["Friendica Walk-Through"] = "Paseja per Friendica";
+$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "A la teva pàgina de <em>Inici Ràpid</em> - troba una breu presentació per les teves fitxes de perfil i xarxa, crea alguna nova connexió i troba algun grup per unir-te.";
+$a->strings["Go to Your Settings"] = "Anar als Teus Ajustos";
+$a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "En la  de la seva <em>configuració</em> de la pàgina - canviï la contrasenya inicial. També prengui nota de la Adreça d'Identitat. Això s'assembla a una adreça de correu electrònic - i serà útil per fer amics a la xarxa social lliure.";
+$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Reviseu les altres configuracions, en particular la configuració de privadesa. Una llista de directoris no publicada és com tenir un número de telèfon no llistat. Normalment, hauria de publicar la seva llista - a menys que tots els seus amics i els amics potencials sàpiguen exactament com trobar-li.";
+$a->strings["Upload Profile Photo"] = "Pujar Foto del Perfil";
+$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Puji una foto del seu perfil si encara no ho ha fet. Els estudis han demostrat que les persones amb fotos reals de ells mateixos tenen deu vegades més probabilitats de fer amics que les persones que no ho fan.";
+$a->strings["Edit Your Profile"] = "Editar el Teu Perfil";
+$a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editi  el perfil per <strong>defecte</strong> al seu gust. Reviseu la configuració per ocultar la seva llista d'amics i ocultar el perfil dels visitants desconeguts.";
+$a->strings["Profile Keywords"] = "Paraules clau del Perfil";
+$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Estableix algunes paraules clau públiques al teu perfil predeterminat que descriguin els teus interessos. Podem ser capaços de trobar altres persones amb interessos similars i suggerir amistats.";
+$a->strings["Connecting"] = "Connectant";
+$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Autoritzi el connector de Facebook si vostè té un compte al Facebook i nosaltres (opcionalment) importarem tots els teus amics de Facebook i les converses.";
+$a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Si </em> aquesta és el seu servidor personal, la instal·lació del complement de Facebook pot facilitar la transició a la web social lliure.";
+$a->strings["Importing Emails"] = "Important Emails";
+$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Introduïu les dades d'accés al correu electrònic a la seva pàgina de configuració de connector, si es desitja importar i relacionar-se amb amics o llistes de correu de la seva bústia d'email";
+$a->strings["Go to Your Contacts Page"] = "Anar a la Teva Pàgina de Contactes";
+$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog."] = "La seva pàgina de Contactes és la seva porta d'entrada a la gestió de l'amistat i la connexió amb amics d'altres xarxes. Normalment, vostè entrar en la seva direcció o URL del lloc al  diàleg <em>Afegir Nou Contacte</em>.";
+$a->strings["Go to Your Site's Directory"] = "Anar al Teu Directori";
+$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "La pàgina del Directori li permet trobar altres persones en aquesta xarxa o altres llocs federats. Busqui un enllaç <em>Connectar</em> o <em>Seguir</em> a la seva pàgina de perfil. Proporcioni la seva pròpia Adreça de Identitat si així ho sol·licita.";
+$a->strings["Finding New People"] = "Trobar Gent Nova";
+$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."] = "Al tauler lateral de la pàgina de contacte Hi ha diverses eines per trobar nous amics. Podem coincidir amb les persones per interesos, buscar persones pel nom o per interès, i oferir suggeriments basats en les relacions de la xarxa. En un nou lloc, els suggeriments d'amics, en general comencen a poblar el lloc a les 24 hores.";
+$a->strings["Group Your Contacts"] = "Agrupar els Teus Contactes";
+$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."] = "Una vegada que s'han fet alguns amics, organitzi'ls en grups de conversa privada a la barra lateral de la seva pàgina de contactes i després pot interactuar amb cada grup de forma privada a la pàgina de la xarxa.";
+$a->strings["Why Aren't My Posts Public?"] = "Per que no es public el meu enviament?";
+$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respecta la teva privacitat. Per defecte, els teus enviaments només s'envien a gent que has afegit com a amic. Per més informació, mira la secció d'ajuda des de l'enllaç de dalt.";
+$a->strings["Getting Help"] = "Demanant Ajuda";
+$a->strings["Go to the Help Section"] = "Anar a la secció d'Ajuda";
+$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "A les nostres pàgines <strong>d'ajuda</strong> es poden consultar detalls sobre les característiques d'altres programes i recursos.";
+$a->strings["Requested profile is not available."] = "El perfil sol·licitat no està disponible.";
+$a->strings["Tips for New Members"] = "Consells per a nous membres";
+$a->strings["Friendica Social Communications Server - Setup"] = "Friendica Social Communications Server - Ajustos";
+$a->strings["Could not connect to database."] = "No puc connectar a la base de dades.";
+$a->strings["Could not create table."] = "No puc creat taula.";
+$a->strings["Your Friendica site database has been installed."] = "La base de dades del teu lloc Friendica ha estat instal·lada.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Pot ser que hagi d'importar l'arxiu \"database.sql\" manualment amb phpmyadmin o mysql.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Per favor, consulti l'arxiu \"INSTALL.txt\".";
+$a->strings["System check"] = "Comprovació del Sistema";
+$a->strings["Check again"] = "Comprovi de nou";
+$a->strings["Database connection"] = "Conexió a la base de dades";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Per a instal·lar Friendica necessitem conèixer com connectar amb la deva base de dades.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Per favor, posi's en contacte amb el seu proveïdor de hosting o administrador del lloc si té alguna pregunta sobre aquestes opcions.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de dades que especifiques ja hauria d'existir. Si no és així, crea-la abans de continuar.";
+$a->strings["Database Server Name"] = "Nom del Servidor de base de Dades";
+$a->strings["Database Login Name"] = "Nom d'Usuari de la base de Dades";
+$a->strings["Database Login Password"] = "Contrasenya d'Usuari de la base de Dades";
+$a->strings["Database Name"] = "Nom de la base de Dades";
+$a->strings["Site administrator email address"] = "Adreça de correu del administrador del lloc";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "El seu compte d'adreça electrònica ha de coincidir per tal d'utilitzar el panell d'administració web.";
+$a->strings["Please select a default timezone for your website"] = "Per favor, seleccioni una zona horària per defecte per al seu lloc web";
+$a->strings["Site settings"] = "Configuracions del lloc";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No es va poder trobar una versió de línia de comandos de PHP en la ruta del servidor web.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"] = "Si no tens una versió de línia de comandos instal·lada al teu servidor PHP, no podràs fer córrer els sondejos via cron. Mira <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>";
+$a->strings["PHP executable path"] = "Direcció del executable PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Entra la ruta sencera fins l'executable de php. Pots deixar això buit  per continuar l'instal·lació.";
+$a->strings["Command line PHP"] = "Linia de comandos PHP";
+$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "El programari executable PHP no es el binari php cli (hauria de ser la versió cgi-fcgi)";
+$a->strings["Found PHP version: "] = "Trobada la versió PHP:";
+$a->strings["PHP cli binary"] = "PHP cli binari";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versió de línia de comandos de PHP en el seu sistema no té \"register_argc_argv\" habilitat.";
+$a->strings["This is required for message delivery to work."] = "Això és necessari perquè funcioni el lliurament de missatges.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: la funció \"openssl_pkey_new\" en aquest sistema no és capaç de generar claus de xifrat";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si s'executa en Windows, per favor consulti la secció \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Generar claus d'encripció";
+$a->strings["libCurl PHP module"] = "Mòdul libCurl de PHP";
+$a->strings["GD graphics PHP module"] = "Mòdul GD de gràfics de PHP";
+$a->strings["OpenSSL PHP module"] = "Mòdul OpenSSl de PHP";
+$a->strings["mysqli PHP module"] = "Mòdul mysqli de PHP";
+$a->strings["mb_string PHP module"] = "Mòdul mb_string de PHP";
+$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite modul ";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: el mòdul mod-rewrite del servidor web Apache és necessari però no està instal·lat.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Error: El mòdul libCURL de PHP és necessari però no està instal·lat.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: el mòdul gràfic GD de PHP amb support per JPEG és necessari però no està instal·lat.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Error: El mòdul enssl de PHP és necessari però no està instal·lat.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Error: El mòdul mysqli de PHP és necessari però no està instal·lat.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Error: mòdul mb_string de PHP requerit però no instal·lat.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "L'instal·lador web necessita crear un arxiu anomenat \".htconfig.php\" en la carpeta superior del seu servidor web però alguna cosa ho va impedir.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Això freqüentment és a causa d'una configuració de permisos; el servidor web no pot escriure arxius en la carpeta - encara que sigui possible.";
+$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."] = "Al final d'aquest procediment, et facilitarem un text que hauràs de guardar en un arxiu que s'anomena .htconfig.php que hi es a la carpeta principal del teu Friendica.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativament, pots saltar-te aquest procediment i configurar-ho manualment. Per favor, mira l'arxiu \"INTALL.txt\" per a instruccions.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php és escribible";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica empra el motor de plantilla Smarty3 per dibuixar la web. Smarty3 compila plantilles a PHP per accelerar el redibuxar.";
+$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."] = "Per poder guardar aquestes plantilles compilades, el servidor web necessita tenir accés d'escriptura al directori view/smarty3/  sota la carpeta principal de Friendica.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Per favor, asegura que l'usuari que corre el servidor web (p.e. www-data) te accés d'escriptura a aquesta carpeta.";
+$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."] = "Nota: Com a mesura de seguretat, hauries de facilitar al servidor web, accés d'escriptura a view/smarty3/ excepte els fitxers de plantilles (.tpl) que conté.";
+$a->strings["view/smarty3 is writable"] = "view/smarty3 es escribible";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "URL rewrite en .htaccess no esta treballant. Comprova la configuració del teu servidor.";
+$a->strings["Url rewrite is working"] = "URL rewrite està treballant";
+$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."] = "L'arxiu per a la configuració de la base de dades \".htconfig.php\" no es pot escriure. Per favor, usi el text adjunt per crear un arxiu de configuració en l'arrel del servidor web.";
+$a->strings["Errors encountered creating database tables."] = "Trobats errors durant la creació de les taules de la base de dades.";
+$a->strings["<h1>What next</h1>"] = "<h1>Que es següent</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: necessitarà configurar [manualment] el programar una tasca pel sondejador (poller.php)";
+$a->strings["Post successful."] = "Publicat amb éxit.";
+$a->strings["OpenID protocol error. No ID returned."] = "Error al protocol OpenID. No ha retornat ID.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Compte no trobat i el registrar-se amb OpenID no està permès en aquest lloc.";
+$a->strings["Image uploaded but image cropping failed."] = "Imatge pujada però no es va poder retallar.";
+$a->strings["Image size reduction [%s] failed."] = "La reducció de la imatge [%s] va fracassar.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recarregui la pàgina o netegi la caché del navegador si la nova foto no apareix immediatament.";
+$a->strings["Unable to process image"] = "No es pot processar la imatge";
+$a->strings["Upload File:"] = "Pujar arxiu:";
+$a->strings["Select a profile:"] = "Tria un perfil:";
+$a->strings["Upload"] = "Pujar";
+$a->strings["skip this step"] = "saltar aquest pas";
+$a->strings["select a photo from your photo albums"] = "tria una foto dels teus àlbums";
+$a->strings["Crop Image"] = "retallar imatge";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Per favor, ajusta la retallada d'imatge per a una optima visualització.";
+$a->strings["Done Editing"] = "Edició Feta";
+$a->strings["Image uploaded successfully."] = "Carregada de la imatge amb èxit.";
+$a->strings["Not available."] = "No disponible.";
+$a->strings["%d comment"] = array(
+	0 => "%d comentari",
+	1 => "%d comentaris",
+);
+$a->strings["like"] = "Agrada";
+$a->strings["dislike"] = "Desagrada";
+$a->strings["Share this"] = "Compartir això";
+$a->strings["share"] = "Compartir";
+$a->strings["Bold"] = "Negreta";
+$a->strings["Italic"] = "Itallica";
+$a->strings["Underline"] = "Subratllat";
+$a->strings["Quote"] = "Cometes";
+$a->strings["Code"] = "Codi";
+$a->strings["Image"] = "Imatge";
+$a->strings["Link"] = "Enllaç";
+$a->strings["Video"] = "Video";
+$a->strings["add star"] = "Afegir a favorits";
+$a->strings["remove star"] = "Esborrar favorit";
+$a->strings["toggle star status"] = "Canviar estatus de favorit";
+$a->strings["starred"] = "favorit";
+$a->strings["add tag"] = "afegir etiqueta";
+$a->strings["save to folder"] = "guardat a la carpeta";
+$a->strings["to"] = "a";
+$a->strings["Wall-to-Wall"] = "Mur-a-Mur";
+$a->strings["via Wall-To-Wall:"] = "via Mur-a-Mur";
+$a->strings["This entry was edited"] = "L'entrada fou editada";
+$a->strings["via"] = "via";
+$a->strings["Theme settings"] = "Configuració de Temes";
+$a->strings["Set resize level for images in posts and comments (width and height)"] = "Ajusteu el nivell de canvi de mida d'imatges en els missatges i comentaris ( amplada i alçada";
+$a->strings["Set font-size for posts and comments"] = "Canvia la mida del tipus de lletra per enviaments i comentaris";
+$a->strings["Set theme width"] = "Ajustar l'ample del tema";
+$a->strings["Color scheme"] = "Esquema de colors";
+$a->strings["Set line-height for posts and comments"] = "Canvia l'espaiat de línia per enviaments i comentaris";
+$a->strings["Set resolution for middle column"] = "canvia la resolució per a la columna central";
+$a->strings["Set color scheme"] = "Canvia l'esquema de color";
+$a->strings["Set twitter search term"] = "Ajustar el terme de cerca de twitter";
+$a->strings["Set zoomfactor for Earth Layer"] = "Ajustar el factor de zoom de Earth Layers";
+$a->strings["Set longitude (X) for Earth Layers"] = "Ajustar longitud (X) per Earth Layers";
+$a->strings["Set latitude (Y) for Earth Layers"] = "Ajustar latitud (Y) per Earth Layers";
+$a->strings["Community Pages"] = "Pàgines de la Comunitat";
+$a->strings["Earth Layers"] = "Earth Layers";
+$a->strings["Community Profiles"] = "Perfils de Comunitat";
+$a->strings["Help or @NewHere ?"] = "Ajuda o @NouAqui?";
+$a->strings["Connect Services"] = "Serveis Connectats";
+$a->strings["Find Friends"] = "Trobar Amistats";
+$a->strings["Last tweets"] = "Últims tweets";
+$a->strings["Last users"] = "Últims usuaris";
+$a->strings["Last photos"] = "Últimes fotos";
+$a->strings["Last likes"] = "Últims \"m'agrada\"";
+$a->strings["Your contacts"] = "Els teus contactes";
+$a->strings["Local Directory"] = "Directori Local";
+$a->strings["Set zoomfactor for Earth Layers"] = "Ajustar el factor de zoom per Earth Layers";
+$a->strings["Last Tweets"] = "Últims Tweets";
+$a->strings["Show/hide boxes at right-hand column:"] = "Mostra/amaga els marcs de la columna a ma dreta";
+$a->strings["Set colour scheme"] = "Establir l'esquema de color";
+$a->strings["Alignment"] = "Adaptació";
+$a->strings["Left"] = "Esquerra";
+$a->strings["Center"] = "Centre";
+$a->strings["Posts font size"] = "Mida del text en enviaments";
+$a->strings["Textareas font size"] = "mida del text en Areas de Text";
+$a->strings["toggle mobile"] = "canviar a mòbil";
 $a->strings["Delete this item?"] = "Esborrar aquest element?";
 $a->strings["show fewer"] = "Mostrar menys";
 $a->strings["Update %s failed. See error logs."] = "Actualització de %s fracassà. Mira el registre d'errors.";
@@ -2116,14 +1625,14 @@ $a->strings["Update Error at %s"] = "Error d'actualització en %s";
 $a->strings["Create a New Account"] = "Crear un Nou Compte";
 $a->strings["Nickname or Email address: "] = "Àlies o Adreça de correu:";
 $a->strings["Password: "] = "Contrasenya:";
-$a->strings["Remember me"] = "";
+$a->strings["Remember me"] = "Recorda'm ho";
 $a->strings["Or login using OpenID: "] = "O accedixi emprant OpenID:";
 $a->strings["Forgot your password?"] = "Oblidà la contrasenya?";
-$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["Website Terms of Service"] = "Termes del Servei al Llocweb";
+$a->strings["terms of service"] = "termes del servei";
+$a->strings["Website Privacy Policy"] = "Política de Privacitat al Llocweb";
+$a->strings["privacy policy"] = "política de privacitat";
+$a->strings["Requested account is not available."] = "El compte sol·licitat no esta disponible";
 $a->strings["Edit profile"] = "Editar perfil";
 $a->strings["Message"] = "Missatge";
 $a->strings["Manage/edit profiles"] = "Gestiona/edita perfils";
@@ -2137,23 +1646,6 @@ $a->strings["Event Reminders"] = "Recordatori d'Esdeveniments";
 $a->strings["Events this week:"] = "Esdeveniments aquesta setmana";
 $a->strings["Status Messages and Posts"] = "Missatges i Enviaments d'Estatus";
 $a->strings["Profile Details"] = "Detalls del Perfil";
+$a->strings["Videos"] = "Vídeos";
 $a->strings["Events and Calendar"] = "Esdeveniments i Calendari";
 $a->strings["Only You Can See This"] = "Només ho pots veure tu";
-$a->strings["via"] = "";
-$a->strings["toggle mobile"] = "";
-$a->strings["Bg settings updated."] = "Ajustos de Bg actualitzats.";
-$a->strings["Bg Settings"] = "Ajustos de Bg";
-$a->strings["Post to Drupal"] = "Missatge a Drupal";
-$a->strings["Drupal Post Settings"] = "Configuració d'enviaments a Drupal";
-$a->strings["Enable Drupal Post Plugin"] = "Habilitar el Plugin d'Enviaments de Drupal";
-$a->strings["Drupal username"] = "Nom d'usuari de Drupal";
-$a->strings["Drupal password"] = "Contrasenya de Drupal";
-$a->strings["Post Type - article,page,or blog"] = "Tipus d'Enviament- article,pàgina, o blog";
-$a->strings["Drupal site URL"] = "URL del lloc Drupal";
-$a->strings["Drupal site uses clean URLS"] = "el Lloc Drupal empra URLS netes";
-$a->strings["Post to Drupal by default"] = "Enviar a Drupal per defecte";
-$a->strings["OEmbed settings updated"] = "Actualitzar la configuració OEmbed";
-$a->strings["Use OEmbed for YouTube videos"] = "Empreu OEmbed per videos YouTube";
-$a->strings["URL to embed:"] = "Adreça URL del recurs";
-$a->strings["Tumblr login"] = "Inici de sessió de Tumblr";
-$a->strings["Tumblr password"] = "Caontrasenya de Tumblr";

From f840d72885b7620560942404a1dba814c196ec70 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 17 May 2013 06:42:28 +0200
Subject: [PATCH 67/67] DE: update to the strings

---
 view/de/update_fail_eml.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/de/update_fail_eml.tpl b/view/de/update_fail_eml.tpl
index cfb55e2405..eb8391fb8d 100644
--- a/view/de/update_fail_eml.tpl
+++ b/view/de/update_fail_eml.tpl
@@ -1,5 +1,5 @@
 Hi, 
-ich bin $sitename.   
+$sitename   
 Die friendica Entwickler haben jüngst Update $update veröffentlicht, 
 aber als ich versucht habe es zu installieren ist etwas schrecklich schief gegangen.  
 Das sollte schnellst möglichst behoben werden und ich kann das nicht alleine machen.