diff --git a/.gitignore b/.gitignore
index 34675be90b..5fe71a7a87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,5 +21,6 @@ report/
 .buildpath
 .externalToolBuilders
 .settings
+#ignore OSX .DS_Store files 
+.DS_Store
 
-view/theme/smoothly
\ No newline at end of file
diff --git a/boot.php b/boot.php
index 7ae4ca315f..93c7a3b9c1 100644
--- a/boot.php
+++ b/boot.php
@@ -11,9 +11,9 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1461' );
+define ( 'FRIENDICA_VERSION',      '3.0.1471' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1154      );
+define ( 'DB_UPDATE_VERSION',      1156      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -1511,14 +1511,20 @@ if(! function_exists('current_theme')) {
 		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
 	
 		if($is_mobile) {
-			$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : '');
-			$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
-
-			if($theme_name === '---') {
-				// user has selected to have the mobile theme be the same as the normal one
+			if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
 				$system_theme = '';
 				$theme_name = '';
 			}
+			else {
+				$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : '');
+				$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
+
+				if($theme_name === '---') {
+					// user has selected to have the mobile theme be the same as the normal one
+					$system_theme = '';
+					$theme_name = '';
+				}
+			}
 		}
 		if(!$is_mobile || ($system_theme === '' && $theme_name === '')) {
 			$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
@@ -1760,3 +1766,20 @@ function build_querystring($params, $name=null) {
     } 
     return $ret;    
 }
+
+/**
+* Returns the complete URL of the current page, e.g.: http(s)://something.com/network
+*
+* Taken from http://webcheatsheet.com/php/get_current_page_url.php
+*/
+function curPageURL() {
+	$pageURL = 'http';
+	if ($_SERVER["HTTPS"] == "on") {$pageURL .= "s";}
+	$pageURL .= "://";
+	if ($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443") {
+		$pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
+	} else {
+		$pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+	}
+	return $pageURL;
+}
diff --git a/database.sql b/database.sql
index 6ba4921cb7..0f82616f7b 100644
--- a/database.sql
+++ b/database.sql
@@ -260,6 +260,7 @@ CREATE TABLE IF NOT EXISTS `event` (
   `type` char(255) NOT NULL,
   `nofinish` tinyint(1) NOT NULL DEFAULT '0',
   `adjust` tinyint(1) NOT NULL DEFAULT '1',
+  `ignore` tinyint(1) NOT NULL DEFAULT '0',
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
@@ -271,7 +272,8 @@ CREATE TABLE IF NOT EXISTS `event` (
   KEY `type` ( `type` ),
   KEY `start` ( `start` ),
   KEY `finish` ( `finish` ),
-  KEY `adjust` ( `adjust` )
+  KEY `adjust` ( `adjust` ),
+  KEY `ignore` ( `ignore` )
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -590,11 +592,13 @@ CREATE TABLE IF NOT EXISTS `item` (
 --
 
 CREATE TABLE IF NOT EXISTS `item_id` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `iid` int(11) NOT NULL,
   `uid` int(11) NOT NULL,
   `sid` char(255) NOT NULL,
   `service` char(255) NOT NULL,
-  PRIMARY KEY (`iid`),
+  PRIMARY KEY (`id`),
+  KEY `iid` (`iid`),
   KEY `uid` (`uid`),
   KEY `sid` (`sid`),
   KEY `service` (`service`)
diff --git a/images/smiley-beard.png b/images/smiley-beard.png
deleted file mode 100644
index 5d4b28463f..0000000000
Binary files a/images/smiley-beard.png and /dev/null differ
diff --git a/images/smiley-whitebeard.png b/images/smiley-whitebeard.png
deleted file mode 100644
index 2a1fccbb72..0000000000
Binary files a/images/smiley-whitebeard.png and /dev/null differ
diff --git a/include/Photo.php b/include/Photo.php
index 5b6e6d846c..00c424c64c 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -46,9 +46,52 @@ class Photo {
         }
         $this->type = $type;
 
-        if($this->is_imagick()) {
-            $this->image = new Imagick();
-            $this->image->readImageBlob($data);
+        if($this->is_imagick() && $this->load_data($data)) {
+			return true;
+		} else {
+			// Failed to load with Imagick, fallback
+			$this->imagick = false;
+		}
+		return $this->load_data($data);
+    }
+
+    public function __destruct() {
+        if($this->image) {
+            if($this->is_imagick()) {
+                $this->image->clear();
+                $this->image->destroy();
+                return;
+            }
+            imagedestroy($this->image);
+        }
+    }
+
+    public function is_imagick() {
+        return $this->imagick;
+    }
+
+    /**
+     * Maps Mime types to Imagick formats
+     */
+    public function get_FormatsMap() {
+        $m = array(
+            'image/jpeg' => 'JPG',
+            'image/png' => 'PNG',
+            'image/gif' => 'GIF'
+        );
+        return $m;
+    }
+
+    private function load_data($data) {
+		if($this->is_imagick()) {
+			$this->image = new Imagick();
+            try {
+				$this->image->readImageBlob($data);
+			}
+			catch (Exception $e) {
+				// Imagick couldn't use the data
+				return false;
+			}
 
             /**
              * Setup the image to the format it will be saved to
@@ -85,45 +128,28 @@ class Photo {
                         $quality = JPEG_QUALITY;
                     $this->image->setCompressionQuality($quality);
             }
-        } else {
-            $this->valid = false;
-            $this->image = @imagecreatefromstring($data);
-            if($this->image !== FALSE) {
-                $this->width  = imagesx($this->image);
-                $this->height = imagesy($this->image);
-                $this->valid  = true;
-                imagealphablending($this->image, false);
-                imagesavealpha($this->image, true);
-            }
-        }
-    }
 
-    public function __destruct() {
-        if($this->image) {
-            if($this->is_imagick()) {
-                $this->image->clear();
-                $this->image->destroy();
-                return;
-            }
-            imagedestroy($this->image);
-        }
-    }
+            $this->width  = $this->image->getImageWidth();
+			$this->height = $this->image->getImageHeight();
+			$this->valid  = true;
 
-    public function is_imagick() {
-        return $this->imagick;
-    }
+            return true;
+		}
 
-    /**
-     * Maps Mime types to Imagick formats
-     */
-    public function get_FormatsMap() {
-        $m = array(
-            'image/jpeg' => 'JPG',
-            'image/png' => 'PNG',
-            'image/gif' => 'GIF'
-        );
-        return $m;
-    }
+		$this->valid = false;
+		$this->image = @imagecreatefromstring($data);
+		if($this->image !== FALSE) {
+			$this->width  = imagesx($this->image);
+			$this->height = imagesy($this->image);
+			$this->valid  = true;
+			imagealphablending($this->image, false);
+			imagesavealpha($this->image, true);
+
+			return true;
+		}
+		
+		return false;
+	}
 
     public function is_valid() {
         if($this->is_imagick())
@@ -637,7 +663,7 @@ function import_profile_photo($photo,$uid,$cid) {
         intval($uid),
         intval($cid)
     );
-    if(count($r)) {
+    if(count($r) && strlen($r[0]['resource-id'])) {
         $hash = $r[0]['resource-id'];
     }
     else {
diff --git a/include/bbcode.php b/include/bbcode.php
index 5a6505740e..d83fe6c12f 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -215,10 +215,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 
 	$a = get_app();
 
-	// Move all spaces out of the tags
-	$Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
-	$Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
-
 	// Hide all [noparse] contained bbtags by spacefying them
 	// POSSIBLE BUG --> Will the 'preg' functions crash if there's an embedded image?
 
@@ -227,6 +223,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	$Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text);
 
 
+	// Move all spaces out of the tags
+	$Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
+	$Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
+
 	// Extract the private images which use data url's since preg has issues with
 	// large data sizes. Stash them away while we do bbcode conversion, and then put them back
 	// in after we've done all the regex matching. We cannot use any preg functions to do this.
diff --git a/include/conversation.php b/include/conversation.php
index ceef63a992..cf5b0fe088 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -59,8 +59,8 @@ function item_redir_and_replace_images($body, $images, $cid) {
 	while($pos !== false && $cnt < 1000) {
 
 		$search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is';
-		$replace = '[url=' . z_path() . '/redir/' . $cid 
-		           . '?f=1&url=' . '$1' . '][!#saved_image' . '$2' .'#!][/url]';
+		$replace = '[url=' . z_path() . '/redir/' . $cid
+				   . '?f=1&url=' . '$1' . '][!#saved_image' . '$2' .'#!][/url]';
 
 		$newbody .= substr($origbody, 0, $pos['start']['open']);
 		$subject = substr($origbody, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']);
@@ -99,17 +99,17 @@ function localize_item(&$item){
 		$item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']);
 
 	$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
-	if ($item['verb']=== ACTIVITY_LIKE || $item['verb']=== ACTIVITY_DISLIKE){
+	if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){
 
-		$r = q("SELECT * from `item`,`contact` WHERE 
+		$r = q("SELECT * from `item`,`contact` WHERE
 				`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
 				 dbesc($item['parent-uri']));
 		if(count($r)==0) return;
 		$obj=$r[0];
-		
-		$author	 = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
+
+		$author  = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
 		$objauthor =  '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
-		
+
 		switch($obj['verb']){
 			case ACTIVITY_POST:
 				switch ($obj['object-type']){
@@ -123,38 +123,36 @@ function localize_item(&$item){
 			default:
 				if($obj['resource-id']){
 					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
+					$m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
 					$rr['plink'] = $m[1];
 				} else {
 					$post_type = t('status');
 				}
 		}
-	
+
 		$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
-                
-		switch($item['verb']){
-			case ACTIVITY_LIKE :
-				$bodyverb = t('%1$s likes %2$s\'s %3$s');
-				break;
-			case ACTIVITY_DISLIKE:
-				$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
-				break;
+
+		if(activity_match($item['verb'],ACTIVITY_LIKE)) {
+			$bodyverb = t('%1$s likes %2$s\'s %3$s');
+		}
+		elseif(activity_match($item['verb'],ACTIVITY_DISLIKE)) {
+			$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
 		}
 		$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
-			
+
 	}
-	if ($item['verb']=== ACTIVITY_FRIEND){
+	if (activity_match($item['verb'],ACTIVITY_FRIEND)) {
 
 		if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
 
 		$Aname = $item['author-name'];
 		$Alink = $item['author-link'];
-		
+
 		$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
-		
+
 		$obj = parse_xml_string($xmlhead.$item['object']);
 		$links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
-		
+
 		$Bname = $obj->title;
 		$Blink = ""; $Bphoto = "";
 		foreach ($links->link as $l){
@@ -163,9 +161,9 @@ function localize_item(&$item){
 				case "alternate": $Blink = $atts['href'];
 				case "photo": $Bphoto = $atts['href'];
 			}
-			
+
 		}
-		
+
 		$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
 		$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
 		if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]';
@@ -181,12 +179,12 @@ function localize_item(&$item){
 
 		$Aname = $item['author-name'];
 		$Alink = $item['author-link'];
-		
+
 		$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
-		
+
 		$obj = parse_xml_string($xmlhead.$item['object']);
 		$links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
-		
+
 		$Bname = $obj->title;
 		$Blink = ""; $Bphoto = "";
 		foreach ($links->link as $l){
@@ -195,9 +193,9 @@ function localize_item(&$item){
 				case "alternate": $Blink = $atts['href'];
 				case "photo": $Bphoto = $atts['href'];
 			}
-			
+
 		}
-		
+
 		$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
 		$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
 		if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
@@ -224,22 +222,22 @@ function localize_item(&$item){
 		$Aname = $item['author-name'];
 		$Alink = $item['author-link'];
 		$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
-		
+
 		$txt = t('%1$s is currently %2$s');
 
 		$item['body'] = sprintf($txt, $A, t($verb));
 	}
 
-    if ($item['verb']===ACTIVITY_TAG){
-		$r = q("SELECT * from `item`,`contact` WHERE 
+	if (activity_match($item['verb'],ACTIVITY_TAG)) {
+		$r = q("SELECT * from `item`,`contact` WHERE
 		`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
 		 dbesc($item['parent-uri']));
 		if(count($r)==0) return;
 		$obj=$r[0];
-		
-		$author	 = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
+
+		$author  = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
 		$objauthor =  '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]';
-		
+
 		switch($obj['verb']){
 			case ACTIVITY_POST:
 				switch ($obj['object-type']){
@@ -253,30 +251,30 @@ function localize_item(&$item){
 			default:
 				if($obj['resource-id']){
 					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
+					$m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
 					$rr['plink'] = $m[1];
 				} else {
 					$post_type = t('status');
 				}
 		}
 		$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
-		
+
 		$parsedobj = parse_xml_string($xmlhead.$item['object']);
-		
+
 		$tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content);
 		$item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag );
-		
+
 	}
-	if ($item['verb']=== ACTIVITY_FAVORITE){
+	if (activity_match($item['verb'],ACTIVITY_FAVORITE)){
 
 		if ($item['object-type']== "")
 			return;
 
 		$Aname = $item['author-name'];
 		$Alink = $item['author-link'];
-		
+
 		$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
-		
+
 		$obj = parse_xml_string($xmlhead.$item['object']);
 		if(strlen($obj->id)) {
 			$r = q("select * from item where uri = '%s' and uid = %d limit 1",
@@ -318,7 +316,7 @@ function localize_item(&$item){
 		$y = best_link_url($item,$sparkle,true);
 		if(strstr($y,'/redir/'))
 			$item['plink'] = $y . '?f=&url=' . $item['plink'];
-	} 
+	}
 
 
 
@@ -332,9 +330,8 @@ function count_descendants($item) {
 
 	if($total > 0) {
 		foreach($item['children'] as $child) {
-			if($child['verb'] === ACTIVITY_LIKE || $child['verb'] === ACTIVITY_DISLIKE) {
+			if(! visible_activity($child))
 				$total --;
-			}
 			$total += count_descendants($child);
 		}
 	}
@@ -342,6 +339,17 @@ function count_descendants($item) {
 	return $total;
 }
 
+function visible_activity($item) {
+
+	if(activity_match($child['verb'],ACTIVITY_LIKE) || activity_match($child['verb'],ACTIVITY_DISLIKE))
+		return false;
+
+	if(activity_match($item['verb'],ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE && $item['uid'] != local_user())
+		return false;
+
+	return true;
+}
+
 /**
  * Recursively prepare a thread for HTML
  */
@@ -353,19 +361,18 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 	$wallwall_template = 'wallwall_thread.tpl';
 	$items_seen = 0;
 	$nb_items = count($items);
-	
+
 	$total_children = $nb_items;
-	
+
 	foreach($items as $item) {
 		if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
 			// Don't count it as a visible item
 			$nb_items--;
 			$total_children --;
 		}
-		if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
+		if(! visible_activity($item)) {
 			$nb_items --;
 			$total_children --;
-
 		}
 	}
 
@@ -375,12 +382,12 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 			continue;
 		}
 
-		if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
+		if(! visible_activity($item)) {
 			continue;
 		}
-		
+
 		$items_seen++;
-		
+
 		$comment = '';
 		$template = $wall_template;
 		$commentww = '';
@@ -417,13 +424,13 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 		$item_writeable = (($item['writable'] || $item['self']) ? true : false);
 
 		// This will allow us to comment on wall-to-wall items owned by our friends
-		// and community forums even if somebody else wrote the post. 
+		// and community forums even if somebody else wrote the post.
 
 		if($visiting && $mode == 'profile')
 			$item_writeable = true;
 
 		$show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
-		$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+		$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
 			|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
 			? t('Private Message')
 			: false);
@@ -436,10 +443,10 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 
 		$drop = array(
 			'dropping' => $dropping,
-			'select' => t('Select'), 
+			'select' => t('Select'),
 			'delete' => t('Delete'),
 		);
-		
+
 		$filer = (($profile_owner == local_user()) ? t("save to folder") : false);
 
 		$diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
@@ -454,7 +461,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 		if($sp)
 			$sparkle = ' sparkle';
 		else
-			$profile_link = zrl($profile_link);					
+			$profile_link = zrl($profile_link);
 
 		$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
 		if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
@@ -467,9 +474,19 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 		$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
 
 		$tags=array();
+		$hashtags = array();
+		$mentions = array();
 		foreach(explode(',',$item['tag']) as $tag){
 			$tag = trim($tag);
-			if ($tag!="") $tags[] = bbcode($tag);
+			if ($tag!="") {
+				$t = bbcode($tag);
+				$tags[] = $t;
+				if($t[0] == '#')
+					$hashtags[] = $t;
+				elseif($t[0] == '@')
+					$mentions[] = $t;
+			}
+
 		}
 
 		$like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
@@ -487,7 +504,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 					$owner_photo = $a->page_contact['thumb'];
 					$owner_name = $a->page_contact['name'];
 					$template = $wallwall_template;
-					$commentww = 'ww';	
+					$commentww = 'ww';
 				}
 				else if($item['owner-link']) {
 
@@ -497,14 +514,14 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 					if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
 
 						// The author url doesn't match the owner (typically the contact)
-						// and also doesn't match the contact alias. 
-						// The name match is a hack to catch several weird cases where URLs are 
+						// and also doesn't match the contact alias.
+						// The name match is a hack to catch several weird cases where URLs are
 						// all over the park. It can be tricked, but this prevents you from
 						// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
-						// well that it's the same Bob Smith. 
+						// well that it's the same Bob Smith.
+
+						// But it could be somebody else with the same name. It just isn't highly likely.
 
-						// But it could be somebody else with the same name. It just isn't highly likely. 
-					
 
 						$owner_url = $item['owner-link'];
 						$owner_photo = $item['owner-avatar'];
@@ -512,7 +529,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 						$template = $wallwall_template;
 						$commentww = 'ww';
 						// If it is our contact, use a friendly redirect link
-						if((link_compare($item['owner-link'],$item['url'])) 
+						if((link_compare($item['owner-link'],$item['url']))
 							&& ($item['network'] === NETWORK_DFRN)) {
 							$owner_url = $redirect_url;
 							$osparkle = ' sparkle';
@@ -577,7 +594,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 				}
 				$comment = replace_macros($cmnt_tpl,array(
 					'$return_path' => '',
-					'$threaded' => $comments_threaded, 
+					'$threaded' => $comments_threaded,
 					'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
 					'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
 					'$id' => $item['item_id'],
@@ -618,9 +635,11 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 			'comment_lastcollapsed' => $lastcollapsed,
 			// template to use to render item (wall, walltowall, search)
 			'template' => $template,
-			
+
 			'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
-			'tags' => $tags,
+			'tags' => template_escape($tags),
+			'hashtags' => template_escape($hashtags),
+			'mentions' => template_escape($mentions),
 			'body' => template_escape($body),
 			'text' => strip_tags(template_escape($body)),
 			'id' => $item['item_id'],
@@ -666,6 +685,8 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 		$item_result = $arr['output'];
 		if($firstcollapsed) {
 			$item_result['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
+			$item_result['hidden_comments_num'] = $total_children;
+			$item_result['hidden_comments_text'] = tt('comment', 'comments', $total_children);
 			$item_result['hide_text'] = t('show more');
 		}
 
@@ -690,7 +711,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 				$item_result['comment'] = false;
 			}
 		}
-		
+
 		$result[] = $item_result;
 	}
 
@@ -703,7 +724,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
  *      - Sequential or unthreaded ("New Item View" or search results)
  *      - conversation view
  * The $mode parameter decides between the various renderings and also
- * figures out how to determine page owner and other contextual items 
+ * figures out how to determine page owner and other contextual items
  * that are based on unique features of the calling module.
  *
  */
@@ -768,19 +789,19 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 	$alike = array();
 	$dlike = array();
-	
-	
+
+
 	// array with html for each thread (parent+comments)
 	$threads = array();
 	$threadsid = -1;
 
 	$page_template = get_markup_template("conversation.tpl");
-		
+
 	if($items && count($items)) {
 
 		if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
 
-			// "New Item View" on network page or search page results 
+			// "New Item View" on network page or search page results
 			// - just loop through the items and format them minimally for display
 
 			//$tpl = get_markup_template('search_item.tpl');
@@ -796,24 +817,39 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				$sparkle     = '';
 
 				if($mode === 'search' || $mode === 'community') {
-					if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+					if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
 						&& ($item['id'] != $item['parent']))
 						continue;
 					$nickname = $item['nickname'];
 				}
 				else
 					$nickname = $a->user['nickname'];
-				
+
 				// prevent private email from leaking.
 				if($item['network'] === NETWORK_MAIL && local_user() != $item['uid'])
 						continue;
-			
+
 				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
 				if($item['author-link'] && (! $item['author-name']))
 					$profile_name = $item['author-link'];
 
 
 
+				$tags=array();
+				$hashtags = array();
+				$mentions = array();
+				foreach(explode(',',$item['tag']) as $tag){
+					$tag = trim($tag);
+					if ($tag!="") {
+						$t = bbcode($tag);
+						$tags[] = $t;
+						if($t[0] == '#')
+							$hashtags[] = $t;
+						elseif($t[0] == '@')
+							$mentions[] = $t;
+					}
+				}
+
 				$sp = false;
 				$profile_link = best_link_url($item,$sp);
 				if($profile_link === 'mailbox')
@@ -821,7 +857,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				if($sp)
 					$sparkle = ' sparkle';
 				else
-					$profile_link = zrl($profile_link);					
+					$profile_link = zrl($profile_link);
 
 				$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
 				if(($normalised != 'mailbox') && (x($a->contacts[$normalised])))
@@ -843,19 +879,19 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 				$drop = array(
 					'dropping' => $dropping,
-					'select' => t('Select'), 
+					'select' => t('Select'),
 					'delete' => t('Delete'),
 				);
 
 				$star = false;
 				$isstarred = "unstarred";
-				
+
 				$lock = false;
 				$likebuttons = false;
 				$shareable = false;
 
 				$body = prepare_body($item,true);
-				
+
 				//$tmp_item = replace_macros($tpl,array(
 				$tmp_item = array(
 					'template' => $tpl,
@@ -869,6 +905,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'thumb' => $profile_avatar,
 					'title' => template_escape($item['title']),
 					'body' => template_escape($body),
+					'tags' => template_escape($tags),
+					'hashtags' => template_escape($hashtags),
+					'mentions' => template_escape($mentions),
 					'text' => strip_tags(template_escape($body)),
 					'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
 					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
@@ -906,25 +945,44 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 			// Normal View
 			$page_template = get_markup_template("threaded_conversation.tpl");
 
+			require_once('object/Conversation.php');
+			require_once('object/Item.php');
+
+			$conv = new Conversation($mode, $preview);
+
 			// get all the topmost parents
-			// this shouldn't be needed, as we should have only them in ou array
+			// this shouldn't be needed, as we should have only them in our array
 			// But for now, this array respects the old style, just in case
 
 			$threads = array();
 			foreach($items as $item) {
 
+				// Can we put this after the visibility check?
 				like_puller($a,$item,$alike,'like');
 				like_puller($a,$item,$dlike,'dislike');
 
+				// Only add what is visible
+				if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+					continue;
+				}
+				if(! visible_activity($item)) {
+					continue;
+				}
+
 				if($item['id'] == $item['parent']) {
-					$threads[] = $item;
+					$item_object = new Item($item);
+					$conv->add_thread($item_object);
 				}
 			}
 
-			$threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode,  $profile_owner, $alike, $dlike, $previewing);
+			$threads = $conv->get_template_data($alike, $dlike);
+			if(!$threads) {
+				logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
+				$threads = array();
+			}
 		}
 	}
-		
+
 	$o = replace_macros($page_template, array(
 		'$baseurl' => $a->get_baseurl($ssl_state),
 		'$mode' => $mode,
@@ -985,7 +1043,7 @@ function item_photo_menu($item){
 	$posts_link="";
 
 	$sparkle = false;
-    $profile_link = best_link_url($item,$sparkle,$ssl_state);
+	$profile_link = best_link_url($item,$sparkle,$ssl_state);
 	if($profile_link === 'mailbox')
 		$profile_link = '';
 
@@ -1001,7 +1059,7 @@ function item_photo_menu($item){
 		$profile_link = zrl($profile_link);
 		if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) {
 			$cid = $item['contact-id'];
-		}		
+		}
 		else {
 			$cid = 0;
 		}
@@ -1027,18 +1085,18 @@ function item_photo_menu($item){
 		t("View Status") => $status_link,
 		t("View Profile") => $profile_link,
 		t("View Photos") => $photos_link,
-		t("Network Posts") => $posts_link, 
+		t("Network Posts") => $posts_link,
 		t("Edit Contact") => $contact_url,
 		t("Send PM") => $pm_url,
 		t("Poke") => $poke_link
 	);
-	
-	
+
+
 	$args = array('item' => $item, 'menu' => $menu);
-	
+
 	call_hooks('item_photo_menu', $args);
 
-	$menu = $args['menu'];	
+	$menu = $args['menu'];
 
 	$o = "";
 	foreach($menu as $k=>$v){
@@ -1070,7 +1128,7 @@ function like_puller($a,$item,&$arr,$mode) {
 			$arr[$item['thr-parent'] . '-l'] = array();
 		if(! isset($arr[$item['thr-parent']]))
 			$arr[$item['thr-parent']] = 1;
-		else	
+		else
 			$arr[$item['thr-parent']] ++;
 		$arr[$item['thr-parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['author-name'] . '</a>';
 	}
@@ -1091,10 +1149,10 @@ function format_like($cnt,$arr,$type,$id) {
 		$o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
 	else {
 		$spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
-		$o .= (($type === 'like') ? 
+		$o .= (($type === 'like') ?
 					sprintf( t('<span  %1$s>%2$d people</span> like this.'), $spanatts, $cnt)
-					 : 
-					sprintf( t('<span  %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt) ); 
+					 :
+					sprintf( t('<span  %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt) );
 		$o .= EOL ;
 		$total = count($arr);
 		if($total >= MAX_LIKERS)
@@ -1114,7 +1172,7 @@ function format_like($cnt,$arr,$type,$id) {
 function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 
 	$o = '';
-		
+
 	$geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
 
 	$plaintext = false;
@@ -1156,7 +1214,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 
 
 	$tpl = get_markup_template("jot.tpl");
-		
+
 	$jotplugins = '';
 	$jotnets = '';
 
@@ -1187,7 +1245,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 	if($notes_cid)
 		$jotnets .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />';
 
-	$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));	
+	$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
 
 	$o .= replace_macros($tpl,array(
 		'$return_path' => $a->query_string,
@@ -1231,12 +1289,13 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$profile_uid' => $x['profile_uid'],
 		'$preview' => t('Preview'),
 		'$sourceapp' => t($a->sourcename),
+		'$cancel' => t('Cancel')
 	));
 
 
 	if ($popup==true){
 		$o = '<div id="jot-popup" style="display: none;">'.$o.'</div>';
-		
+
 	}
 
 	return $o;
@@ -1252,7 +1311,7 @@ function get_item_children($arr, $parent) {
 				$thr_parent = $item['thr-parent'];
 				if($thr_parent == '')
 					$thr_parent = $item['parent-uri'];
-				
+
 				if($thr_parent == $parent['uri']) {
 					$item['children'] = get_item_children($arr, $item);
 					$children[] = $item;
@@ -1303,7 +1362,7 @@ function conv_sort($arr,$order) {
 		usort($parents,'sort_thr_commented');
 
 	if(count($parents))
-		foreach($parents as $i=>$_x) 
+		foreach($parents as $i=>$_x)
 			$parents[$i]['children'] = get_item_children($arr, $_x);
 
 	/*foreach($arr as $x) {
@@ -1321,7 +1380,7 @@ function conv_sort($arr,$order) {
 				usort($y,'sort_thr_created_rev');
 				$parents[$k]['children'] = $y;*/
 			}
-		}	
+		}
 	}
 
 	$ret = array();
diff --git a/include/diaspora.php b/include/diaspora.php
index baee0420ba..497bc7f39f 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2061,11 +2061,20 @@ function diaspora_profile($importer,$xml,$msg) {
 	$image_url = unxmlify($xml->image_url);
 	$birthday = unxmlify($xml->birthday);
 
-	$r = q("SELECT DISTINCT ( `resource-id` ) FROM `photo` WHERE  `uid` = %d AND `contact-id` = %d AND `album` = 'Contact Photos' ",
+
+	$handle_parts = explode("@", $diaspora_handle);
+	if($name === '') {
+		$name = $handle_parts[0];
+	}
+	if(strpos($image_url, $handle_parts[1]) === false) {
+		$image_url = "http://" . $handle_parts[1] . $image_url;
+	}
+
+/*	$r = q("SELECT DISTINCT ( `resource-id` ) FROM `photo` WHERE  `uid` = %d AND `contact-id` = %d AND `album` = 'Contact Photos' ",
 		intval($importer['uid']),
 		intval($contact['id'])
 	);
-	$oldphotos = ((count($r)) ? $r : null);
+	$oldphotos = ((count($r)) ? $r : null);*/
 
 	require_once('include/Photo.php');
 
@@ -2098,7 +2107,7 @@ function diaspora_profile($importer,$xml,$msg) {
 		intval($importer['uid'])
 	); 
 
-	if($r) {
+/*	if($r) {
 		if($oldphotos) {
 			foreach($oldphotos as $ph) {
 				q("DELETE FROM `photo` WHERE `uid` = %d AND `contact-id` = %d AND `album` = 'Contact Photos' AND `resource-id` = '%s' ",
@@ -2108,7 +2117,7 @@ function diaspora_profile($importer,$xml,$msg) {
 				);
 			}
 		}
-	}	
+	}	*/
 
 	return;
 
diff --git a/include/items.php b/include/items.php
index 206458b19d..631a9725c1 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1190,6 +1190,15 @@ function tag_deliver($uid,$item_id) {
 
 	// send a notification
 
+	// use a local photo if we have one
+
+	$r = q("select thumb from contact where uid = %d and nurl = '%s' limit 1",
+		intval($u[0]['uid']),
+		dbesc(normalise_link($item['author-link']))
+	);
+	$photo = (($r && count($r)) ? $r[0]['thumb'] : $item['author-avatar']);
+
+
 	require_once('include/enotify.php');
 	notification(array(
 		'type'         => NOTIFY_TAGSELF,
@@ -1202,7 +1211,7 @@ function tag_deliver($uid,$item_id) {
 		'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item['id'],
 		'source_name'  => $item['author-name'],
 		'source_link'  => $item['author-link'],
-		'source_photo' => $item['author-avatar'],
+		'source_photo' => $photo,
 		'verb'         => ACTIVITY_TAG,
 		'otype'        => 'item'
 	));
@@ -1253,6 +1262,59 @@ function tag_deliver($uid,$item_id) {
 
 
 
+function tgroup_check($uid,$item) {
+
+	$a = get_app();
+
+	$mention = false;
+
+	// check that the message originated elsewhere and is a top-level post
+
+	if(($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri']))
+		return false;
+
+
+	$u = q("select * from user where uid = %d limit 1",
+		intval($uid)
+	);
+	if(! count($u))
+		return false;
+
+	$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+	$prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false);
+
+
+	$link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
+
+	// Diaspora uses their own hardwired link URL in @-tags
+	// instead of the one we supply with webfinger
+
+	$dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
+
+	$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
+	if($cnt) {
+		foreach($matches as $mtch) {
+			if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
+				$mention = true;
+				logger('tgroup_check: mention found: ' . $mtch[2]);
+			}
+		}
+	}
+
+	if(! $mention)
+		return false;
+
+	if((! $community_page) && (! $prvgroup))
+		return false;
+
+
+
+	return true;
+
+}
+
+
+
 
 
 
@@ -1809,6 +1871,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				if($pass == 1)
 					continue;
 
+				// not allowed to post
+
+				if($contact['rel'] == CONTACT_IS_FOLLOWER)
+					continue;
+
+
 				// Have we seen it? If not, import it.
 
 				$item_id  = $item->get_id();
@@ -2083,6 +2151,14 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					$datarray['owner-avatar'] = $contact['thumb'];
 				}
 
+				// We've allowed "followers" to reach this point so we can decide if they are 
+				// posting an @-tag delivery, which followers are allowed to do for certain
+				// page types. Now that we've parsed the post, let's check if it is legit. Otherwise ignore it. 
+
+				if(($contact['rel'] == CONTACT_IS_FOLLOWER) && (! tgroup_check($importer['uid'],$datarray)))
+					continue;
+
+
 				$r = item_store($datarray);
 				continue;
 
@@ -2626,22 +2702,32 @@ function local_delivery($importer,$data) {
 			// Specifically, the recipient? 
 
 			$is_a_remote_comment = false;
-
-			// POSSIBLE CLEANUP --> Why select so many fields when only forum_mode and wall are used?
-			$r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`, 
-				`contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
-				LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 
-				WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' or `item`.`thr-parent` = '%s')
-				AND `item`.`uid` = %d 
-				$sql_extra
+			$top_uri = $parent_uri;
+			
+			$r = q("select `item`.`parent-uri` from `item`
+				WHERE `item`.`uri` = '%s'
 				LIMIT 1",
-				dbesc($parent_uri),
-				dbesc($parent_uri),
-				dbesc($parent_uri),
-				intval($importer['importer_uid'])
+				dbesc($parent_uri)
 			);
-			if($r && count($r))
-				$is_a_remote_comment = true;			
+			if($r && count($r)) {
+				$top_uri = $r[0]['parent-uri'];
+
+				// POSSIBLE CLEANUP --> Why select so many fields when only forum_mode and wall are used?
+				$r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`, 
+					`contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
+					LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 
+					WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' or `item`.`thr-parent` = '%s')
+					AND `item`.`uid` = %d 
+					$sql_extra
+					LIMIT 1",
+					dbesc($top_uri),
+					dbesc($top_uri),
+					dbesc($top_uri),
+					intval($importer['importer_uid'])
+				);
+				if($r && count($r))
+					$is_a_remote_comment = true;
+			}
 
 			// Does this have the characteristics of a community or private group comment?
 			// If it's a reply to a wall post on a community/prvgroup page it's a 
@@ -2695,15 +2781,6 @@ function local_delivery($importer,$data) {
 				}
 
 
-				// TODO: make this next part work against both delivery threads of a community post
-
-//				if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
-//					logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); 
-					// they won't know what to do so don't report an error. Just quietly die.
-//					return 0;
-//				}					
-
-				// our user with $importer['importer_uid'] is the owner
 
 				$own = q("select name,url,thumb from contact where uid = %d and self = 1 limit 1",
 					intval($importer['importer_uid'])
@@ -2773,15 +2850,6 @@ function local_delivery($importer,$data) {
 					}
 				}
 
-// 				if($community) {
-//					$newtag = '@[url=' . $a->get_baseurl() . '/profile/' . $importer['nickname'] . ']' . $importer['username'] . '[/url]';
-//					if(! stristr($datarray['tag'],$newtag)) {
-//						if(strlen($datarray['tag']))
-//							$datarray['tag'] .= ',';
-//						$datarray['tag'] .= $newtag;
-//					}
-//				}
-
 
 				$posted_id = item_store($datarray);
 				$parent = 0;
@@ -2851,6 +2919,9 @@ function local_delivery($importer,$data) {
 				$item_id  = $item->get_id();
 				$datarray = get_atom_elements($feed,$item);
 
+				if($importer['rel'] == CONTACT_IS_FOLLOWER)
+					continue;
+
 				$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($item_id),
 					intval($importer['importer_uid'])
@@ -2945,7 +3016,7 @@ function local_delivery($importer,$data) {
 				if(!x($datarray['type']) || $datarray['type'] != 'activity') {
 
 					$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
-						dbesc($parent_uri),
+						dbesc($top_uri),
 						intval($importer['importer_uid'])
 					);
 
@@ -3085,6 +3156,9 @@ function local_delivery($importer,$data) {
 				$datarray['owner-avatar'] = $importer['thumb'];
 			}
 
+			if(($importer['rel'] == CONTACT_IS_FOLLOWER) && (! tgroup_check($importer['importer_uid'],$datarray)))
+				continue;
+
 			$posted_id = item_store($datarray);
 
 			if(stristr($datarray['verb'],ACTIVITY_POKE)) {
diff --git a/include/onepoll.php b/include/onepoll.php
index 09e7bb7638..4ca60a2fd0 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -275,7 +275,7 @@ function onepoll_run($argv, $argc){
 			openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
 			$mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
 			unset($password);
-			logger("Mail: Connect");
+			logger("Mail: Connect to " . $mailconf[0]['user']);
 			if($mbox) {
 				q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
 					dbesc(datetime_convert()),
@@ -289,7 +289,7 @@ function onepoll_run($argv, $argc){
 			$msgs = email_poll($mbox,$contact['addr']);
 
 			if(count($msgs)) {
-				logger("Mail: Parsing ".count($msgs)." mails.", LOGGER_DEBUG);
+				logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG);
 
 				foreach($msgs as $msg_uid) {
 					logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);
@@ -339,15 +339,15 @@ function onepoll_run($argv, $argc){
 							case 0:
 								break;
 							case 1:
-								logger("Mail: Deleting ".$msg_uid);
+								logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']);
 								imap_delete($mbox, $msg_uid, FT_UID);
 								break;
 							case 2:
-								logger("Mail: Mark as seen ".$msg_uid);
+								logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf[0]['user']);
 								imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
 								break;
 							case 3:
-								logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']);
+								logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']." for ".$mailconf[0]['user']);
 								imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
 								if ($mailconf[0]['movetofolder'] != "")
 									imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
@@ -377,12 +377,12 @@ function onepoll_run($argv, $argc){
 
 					$r = email_get_msg($mbox,$msg_uid, $reply);
 					if(! $r) {
-						logger("Mail: can't fetch msg ".$msg_uid);
+						logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf[0]['user']);
 						continue;
 					}
 					$datarray['body'] = escape_tags($r['body']);
 
-					logger("Mail: Importing ".$msg_uid);
+					logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']);
 
 					// some mailing lists have the original author as 'from' - add this sender info to msg body.
 					// todo: adding a gravatar for the original author would be cool
@@ -423,15 +423,15 @@ function onepoll_run($argv, $argc){
 						case 0:
 							break;
 						case 1:
-							logger("Mail: Deleting ".$msg_uid);
+							logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']);
 							imap_delete($mbox, $msg_uid, FT_UID);
 							break;
 						case 2:
-							logger("Mail: Mark as seen ".$msg_uid);
+							logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf[0]['user']);
 							imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
 							break;
 						case 3:
-							logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']);
+							logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']." for ".$mailconf[0]['user']);
 							imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
 							if ($mailconf[0]['movetofolder'] != "")
 								imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
diff --git a/include/user.php b/include/user.php
index 2d06ef3742..282bbdbba2 100644
--- a/include/user.php
+++ b/include/user.php
@@ -277,18 +277,24 @@ function create_user($arr) {
 		require_once('include/group.php');
 		group_add($newuid, t('Friends'));
 
-		if(! get_config('system', 'newuser_public')) {
-			$r = q("SELECT id FROM `group` WHERE uid = %d AND name = '%s'",
-				intval($newuid),
-				dbesc(t('Friends'))
+		$r = q("SELECT id FROM `group` WHERE uid = %d AND name = '%s'",
+			intval($newuid),
+			dbesc(t('Friends'))
+		);
+		if($r && count($r)) {
+			$def_gid = $r[0]['id'];
+
+			q("UPDATE user SET def_gid = %d WHERE uid = %d",
+				intval($r[0]['id']),
+				intval($newuid)
+			);
+		}
+
+		if(get_config('system', 'newuser_private') && $def_gid) {
+			q("UPDATE user SET allow_gid = '%s' WHERE uid = %d",
+			   dbesc("<" . $def_gid . ">"),
+			   intval($newuid)
 			);
-			if($r) {
-				q("UPDATE user SET def_gid = %d, allow_gid = '%s' WHERE uid = %d",
-				   intval($r[0]['id']),
-				   dbesc("<" . $r[0]['id'] . ">"),
-				   intval($newuid)
-				);
-			}
 		}
 
 	}
diff --git a/index.php b/index.php
index c9b7f34d72..eaa7295e26 100644
--- a/index.php
+++ b/index.php
@@ -13,8 +13,10 @@
  */
 
 require_once('boot.php');
+require_once('object/BaseObject.php');
 
 $a = new App;
+BaseObject::set_app($a);
 
 /**
  *
diff --git a/js/country.js b/js/country.js
index 1494dad2e4..96165409a4 100644
--- a/js/country.js
+++ b/js/country.js
@@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw
 aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
 aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
 aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
-aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Recolutionari.es|SilverLips|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other";
+aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Pplsnet|Recolutionari.es|SilverLips|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other";
 /* 
  * gArCountryInfo
  * (0) Country name
diff --git a/js/main.js b/js/main.js
index 6ab574c4e8..a28c8576f0 100644
--- a/js/main.js
+++ b/js/main.js
@@ -144,6 +144,29 @@
 			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){
diff --git a/library/HTML5/TreeBuilder.php b/library/HTML5/TreeBuilder.php
index 578e73682b..2a789f4df9 100644
--- a/library/HTML5/TreeBuilder.php
+++ b/library/HTML5/TreeBuilder.php
@@ -158,6 +158,8 @@ class HTML5_TreeBuilder {
 
         if ($this->ignore_lf_token) $this->ignore_lf_token--;
         $this->ignored = false;
+
+        $token['name'] = str_replace(':', '-', $token['name']);
         // indenting is a little wonky, this can be changed later on
         switch ($mode) {
 
@@ -1429,7 +1431,7 @@ class HTML5_TreeBuilder {
                 case 'tbody': case 'td': case 'tfoot': case 'th': case 'thead': case 'tr':
                     // parse error
                 break;
-
+                
                 /* A start tag token not covered by the previous entries */
                 default:
                     /* Reconstruct the active formatting elements, if any. */
@@ -3038,7 +3040,7 @@ class HTML5_TreeBuilder {
 
     private function insertElement($token, $append = true) {
         $el = $this->dom->createElementNS(self::NS_HTML, $token['name']);
-
+		
         if (!empty($token['attr'])) {
             foreach($token['attr'] as $attr) {
 
diff --git a/mod/admin.php b/mod/admin.php
index db4d4cff25..ee04830548 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -254,7 +254,7 @@ function admin_page_site_post(&$a){
 	$force_publish		=	((x($_POST,'publish_all'))		? True						: False);
 	$global_directory	=	((x($_POST,'directory_submit_url'))	? notags(trim($_POST['directory_submit_url']))	: '');
 	$thread_allow		=	((x($_POST,'thread_allow'))		? True						: False);
-	$newuser_public		=	((x($_POST,'newuser_public'))		? True						: False);
+	$newuser_private		=	((x($_POST,'newuser_private'))		? True						: False);
 	$no_multi_reg		=	((x($_POST,'no_multi_reg'))		? True						: False);
 	$no_openid		=	!((x($_POST,'no_openid'))		? True						: False);
 	$no_regfullname		=	!((x($_POST,'no_regfullname'))		? True						: False);
@@ -355,7 +355,7 @@ function admin_page_site_post(&$a){
 		set_config('system','directory_submit_url', $global_directory);
 	}
 	set_config('system','thread_allow', $thread_allow);
-	set_config('system','newuser_public', $newuser_public);
+	set_config('system','newuser_private', $newuser_private);
 
 	set_config('system','block_extended_register', $no_multi_reg);
 	set_config('system','no_openid', $no_openid);
@@ -467,14 +467,14 @@ function admin_page_site(&$a) {
 		'$force_publish'	=> array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
 		'$global_directory'	=> array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
 		'$thread_allow'		=> array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
-		'$newuser_public'	=> array('newuser_public', t("No default permissions for new users"), get_config('system','newuser_public'), t("New users will have no private permissions set for their posts by default, making their posts public until they change it.")),
+		'$newuser_private'	=> array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")),
 			
 		'$no_multi_reg'		=> array('no_multi_reg', t("Block multiple registrations"),  get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
 		'$no_openid'		=> array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
 		'$no_regfullname'	=> array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
 		'$no_utf'		=> array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")),
 		'$no_community_page' 	=> array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")),
-		'$ostatus_disabled' 	=> array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), t("Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),	
+		'$ostatus_disabled' 	=> array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),	
 		'$diaspora_enabled' 	=> array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")),	
 		'$dfrn_only'        	=> array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")),
 		'$verifyssl' 		=> array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")),
@@ -664,6 +664,7 @@ function admin_page_users(&$a){
 				);
 					
 	function _setup_users($e){
+        $a = get_app();
 		$accounts = Array(
 			t('Normal Account'), 
 			t('Soapbox Account'),
@@ -674,6 +675,7 @@ function admin_page_users(&$a){
 		$e['register_date'] = relative_date($e['register_date']);
 		$e['login_date'] = relative_date($e['login_date']);
 		$e['lastitem_date'] = relative_date($e['lastitem_date']);
+        $e['is_admin'] = ($e['email'] === $a->config['admin_email']);
 		return $e;
 	}
 	$users = array_map("_setup_users", $users);
@@ -694,6 +696,7 @@ function admin_page_users(&$a){
 		'$delete' => t('Delete'),
 		'$block' => t('Block'),
 		'$unblock' => t('Unblock'),
+        '$siteadmin' => t('Site admin'),
 		
 		'$h_users' => t('Users'),
 		'$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'),  t('Account') ),
diff --git a/mod/content.php b/mod/content.php
index e6789860db..d827b5b57b 100644
--- a/mod/content.php
+++ b/mod/content.php
@@ -584,6 +584,8 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 
 					if (!$comments_collapsed){
 						$threads[$threadsid]['num_comments'] = sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),$comments[$item['parent']] );
+						$threads[$threadsid]['hidden_comments_num'] = $comments[$item['parent']];
+						$threads[$threadsid]['hidden_comments_text'] = tt('comment', 'comments', $comments[$item['parent']]);
 						$threads[$threadsid]['hide_text'] = t('show more');
 						$comments_collapsed = true;
 						$comment_firstcollapsed = true;
diff --git a/mod/editpost.php b/mod/editpost.php
index b44afe245f..03d5263a1d 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -133,6 +133,7 @@ function editpost_content(&$a) {
 		'$preview' => t('Preview'),
 		'$jotplugins' => $jotplugins,
 		'$sourceapp' => t($a->sourcename),
+		'$cancel' => t('Cancel')
 	));
 
 	return $o;
diff --git a/mod/events.php b/mod/events.php
index c448dc0f2e..527e1ec3fd 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -141,6 +141,20 @@ function events_content(&$a) {
 		return;
 	}
 
+	if(($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
+		$r = q("update event set ignore = 1 where id = %d and uid = %d limit 1",
+			intval($a->argv[2]),
+			intval(local_user())
+		);
+	}
+
+	if(($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) {
+		$r = q("update event set ignore = 0 where id = %d and uid = %d limit 1",
+			intval($a->argv[2]),
+			intval(local_user())
+		);
+	}
+
 
 	$htpl = get_markup_template('event_head.tpl');
 	$a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
@@ -157,6 +171,7 @@ function events_content(&$a) {
 	$mode = 'view';
 	$y = 0;
 	$m = 0;
+	$ignored = ((x($_REQUEST,'ignored')) ? intval($_REQUEST['ignored']) : 0);
 
 	if($a->argc > 1) {
 		if($a->argc > 2 && $a->argv[1] == 'event') {
@@ -234,10 +249,11 @@ function events_content(&$a) {
 		} else {
 			$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
 				`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` 
-				WHERE `event`.`uid` = %d
+				WHERE `event`.`uid` = %d and event.ignore = %d
 				AND (( `adjust` = 0 AND `finish` >= '%s' AND `start` <= '%s' ) 
 				OR  (  `adjust` = 1 AND `finish` >= '%s' AND `start` <= '%s' )) ",
 				intval(local_user()),
+				intval($ignored),
 				dbesc($start),
 				dbesc($finish),
 				dbesc($adjust_start),
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 3f034226e1..5ee813b4d6 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -46,7 +46,7 @@ function fbrowser_content($a){
 			}
 				
 			$r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`  
-					FROM `photo` WHERE `uid` = %d $sql_extra
+					FROM `photo` WHERE `uid` = %d AND (height <= 320 AND width <= 320) $sql_extra
 					GROUP BY `resource-id` $sql_extra2",
 				intval(local_user())					
 			);
diff --git a/mod/item.php b/mod/item.php
index 52ea9d58c9..7d36d7f70a 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -373,8 +373,8 @@ function item_post(&$a) {
 
 	$match = null;
 
-	if((! $preview) && preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
-		$images = $match[1];
+	if((! $preview) && preg_match_all("/\[img([\=0-9x]*?)\](.*?)\[\/img\]/",$body,$match)) {
+		$images = $match[2];
 		if(count($images)) {
 			foreach($images as $image) {
 				if(! stristr($image,$a->get_baseurl() . '/photo/'))
diff --git a/mod/network.php b/mod/network.php
index 97f00eeda9..d77a644126 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -471,7 +471,7 @@ function network_content(&$a, $update = 0) {
 		}
 	}
 
-	if((! $group) && (! $cid) && (! $update)) {
+	if((! $group) && (! $cid) && (! $update) && (! get_config('theme','hide_eventlist'))) {
 		$o .= get_birthdays();
 		$o .= get_events();
 	}
diff --git a/mod/newmember.php b/mod/newmember.php
index e17a0db037..8028e7e08d 100644
--- a/mod/newmember.php
+++ b/mod/newmember.php
@@ -69,7 +69,7 @@ function newmember_content(&$a) {
 
 	$o .= '<li>' . '<a target="newmember" href="contacts">' . t('Group Your Contacts') . '</a><br />' . t('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.') . '</li>' . EOL;
 
-	if(! get_config('system', 'newuser_public')) {
+	if(get_config('system', 'newuser_private')) {
 		$o .= '<li>' . '<a target="newmember" href="help/Groups-and-Privacy">' . t("Why Aren't My Posts Public?") . '</a><br />' . t("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.") . '</li>' . EOL;
 	}
 
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 083a39b55f..9adee8f65c 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -307,16 +307,26 @@ function parse_url_content(&$a) {
 
 	$image = "";
 
-        if(sizeof($siteinfo["images"]) > 0){
-            /*
-              Execute below code only if image is present in siteinfo
-             */
-            foreach ($siteinfo["images"] as $imagedata)
-		if($textmode)
-                    $image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]';
+	if(sizeof($siteinfo["images"]) > 0){
+		/* Execute below code only if image is present in siteinfo */
+
+		$total_images = 0;
+		$max_images = get_config('system','max_bookmark_images');
+		if($max_images === false)
+			$max_images = 2;
 		else
-                    $image .= '<img height="'.$imagedata["height"].'" width="'.$imagedata["width"].'" src="'.$imagedata["src"].'" alt="photo" />';
+			$max_images = intval($max_images);
+
+		foreach ($siteinfo["images"] as $imagedata) {
+			if($textmode)
+				$image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]' . "\n";
+			else
+				$image .= '<img height="'.$imagedata["height"].'" width="'.$imagedata["width"].'" src="'.$imagedata["src"].'" alt="photo" /><br />';
+			$total_images ++;
+			if($max_images && $max_images >= $total_images)
+				break;
         }
+	}
 
 	if(strlen($text)) {
 		if($textmode)
diff --git a/mod/ping.php b/mod/ping.php
index 55dcb26bb5..2698956d7d 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -55,6 +55,7 @@ function ping_init(&$a) {
 		$dislikes = array();
 		$friends = array();
 		$posts = array();
+
 		$home = 0;
 		$network = 0;
 
@@ -140,6 +141,48 @@ function ping_init(&$a) {
 			$register = "0";
 		}
 
+		$all_events = 0;
+		$all_events_today = 0;
+		$events = 0;
+		$events_today = 0;
+		$birthdays = 0;
+		$birthdays_today = 0;
+
+
+		$ev = q("SELECT count(`event`.`id`) as total, type, start, adjust FROM `event`
+			WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
+			ORDER BY `start` ASC ",
+			intval(local_user()),
+			dbesc(datetime_convert('UTC','UTC','now + 7 days')),
+			dbesc(datetime_convert('UTC','UTC','now'))
+		);
+
+		if($ev && count($ev)) {
+			$all_events = intval($ev[0]['total']);
+
+			if($all_events) {
+				$str_now = datetime_convert('UTC',$a->timezone,'now','Y-m-d');
+				foreach($ev as $x) {
+					$bd = false;
+					if($x['type'] === 'birthday') {
+						$birthdays ++;
+						$bd = true;
+					}
+					else {
+						$events ++;
+					}
+					if(datetime_convert('UTC',((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'],'Y-m-d') === $str_now) {
+						$all_events_today ++;
+						if($bd)
+							$birthdays_today ++;
+						else
+							$events_today ++;
+					}
+				}
+			}
+		}
+
+
 
 		function xmlize($href, $name, $url, $photo, $date, $seen, $message){
 			$data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
@@ -153,8 +196,15 @@ function ping_init(&$a) {
 		echo "<intro>$intro</intro>
 				<mail>$mail</mail>
 				<net>$network</net>
-				<home>$home</home>";
+				<home>$home</home>\r\n";
 		if ($register!=0) echo "<register>$register</register>";
+
+		echo "<all-events>$all_events</all-events>
+			<all-events-today>$all_events_today</all-events-today>
+			<events>$events</events>
+			<events-today>$events_today</events-today>
+			<birthdays>$birthdays</birthdays>
+			<birthdays-today>$birthdays_today</birthdays-today>\r\n";
 		
 		$tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
 
diff --git a/mod/profile.php b/mod/profile.php
index a4dce79180..b33b181de1 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -304,7 +304,7 @@ function profile_content(&$a, $update = 0) {
 		$items = array();
 	}
 
-	if($is_owner && ! $update) {
+	if($is_owner && (! $update) && (! get_config('theme','hide_eventlist'))) {
 		$o .= get_birthdays();
 		$o .= get_events();
 	}
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 378353f653..d1f77a3db4 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -24,6 +24,20 @@ function profile_photo_post(&$a) {
         
 	if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) {
 
+		// unless proven otherwise
+		$is_default_profile = 1;
+
+		if($_REQUEST['profile']) {
+			$r = q("select id, `is-default` from profile where id = %d and uid = %d limit 1",
+				intval($_REQUEST['profile']),
+				intval(local_user())
+			);
+			if(count($r) && (! intval($r[0]['is-default'])))
+				$is_default_profile = 0;
+		} 
+
+		
+
 		// phase 2 - we have finished cropping
 
 		if($a->argc != 2) {
@@ -57,31 +71,44 @@ function profile_photo_post(&$a) {
 			if($im->is_valid()) {
 				$im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
 
-				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1);
+				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, $is_default_profile);
 
 				if($r === false)
 					notice ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL );
 
 				$im->scaleImage(80);
 
-				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1);
+				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, $is_default_profile);
 			
 				if($r === false)
 					notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL );
 
 				$im->scaleImage(48);
 
-				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, 1);
+				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, $is_default_profile);
 			
 				if($r === false)
 					notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL );
 
-				// Unset the profile photo flag from any other photos I own
+				// If setting for the default profile, unset the profile photo flag from any other photos I own
 
-				$r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
-					dbesc($base_image['resource-id']),
-					intval(local_user())
-				);
+				if($is_default_profile) {
+					$r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
+						dbesc($base_image['resource-id']),
+						intval(local_user())
+					);
+				}
+				else {
+					$r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d limit 1",
+						dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4'),
+						dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5'),
+						intval($_REQUEST['profile']),
+						intval(local_user())
+					);
+				}
+
+				// we'll set the updated profile-photo timestamp even if it isn't the default profile,
+				// so that browsers will do a cache update unconditionally
 
 				$r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 					dbesc(datetime_convert()),
@@ -201,6 +228,11 @@ function profile_photo_content(&$a) {
 		// go ahead as we have jus uploaded a new photo to crop
 	}
 
+	$profiles = q("select `id`,`profile-name` as `name`,`is-default` as `default` from profile where uid = %d",
+		intval(local_user())
+	);
+
+
 	if(! x($a->config,'imagecrop')) {
 	
 		$tpl = get_markup_template('profile_photo.tpl');
@@ -208,8 +240,10 @@ function profile_photo_content(&$a) {
 		$o .= replace_macros($tpl,array(
 			'$user' => $a->user['nickname'],
 			'$lbl_upfile' => t('Upload File:'),
+			'$lbl_profiles' => t('Select a profile:'),
 			'$title' => t('Upload Profile Photo'),
 			'$submit' => t('Upload'),
+			'$profiles' => $profiles,
 			'$form_security_token' => get_form_security_token("profile_photo"),
 			'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . $a->get_baseurl() . '">' . t('skip this step') . '</a>' : '<a href="'. $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
 		));
@@ -222,6 +256,7 @@ function profile_photo_content(&$a) {
 		$tpl = get_markup_template("cropbody.tpl");
 		$o .= replace_macros($tpl,array(
 			'$filename' => $filename,
+			'$profile' => intval($_REQUEST['profile']),
 			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
 			'$image_url' => $a->get_baseurl() . '/photo/' . $filename,
 			'$title' => t('Crop Image'),
@@ -236,7 +271,7 @@ function profile_photo_content(&$a) {
 }}
 
 
-if(! function_exists('_crop_ui_head')) {
+if(! function_exists('profile_photo_crop_ui_head')) {
 function profile_photo_crop_ui_head(&$a, $ph){
 	$max_length = get_config('system','max_image_length');
 	if(! $max_length)
diff --git a/mod/toggle_mobile.php b/mod/toggle_mobile.php
new file mode 100644
index 0000000000..00991e44ca
--- /dev/null
+++ b/mod/toggle_mobile.php
@@ -0,0 +1,17 @@
+<?php
+
+function toggle_mobile_init(&$a) {
+
+	if(isset($_GET['off']))
+		$_SESSION['show-mobile'] = false;
+	else
+		$_SESSION['show-mobile'] = true;
+
+	if(isset($_GET['address']))
+		$address = $_GET['address'];
+	else
+		$address = $a->get_baseurl();
+
+	goaway($address);
+}
+
diff --git a/object/BaseObject.php b/object/BaseObject.php
new file mode 100644
index 0000000000..14f0d8fd08
--- /dev/null
+++ b/object/BaseObject.php
@@ -0,0 +1,37 @@
+<?php
+if(class_exists('BaseObject'))
+	return;
+
+require_once('boot.php');
+
+/**
+ * Basic object
+ *
+ * Contains what is usefull to any object
+ */
+class BaseObject {
+	private static $app = null;
+
+	/**
+	 * Get the app
+	 * 
+	 * Same as get_app from boot.php
+	 */
+	public function get_app() {
+		if(self::$app)
+			return self::$app;
+
+		global $a;
+		self::$app = $a;
+
+		return self::$app;
+	}
+
+	/**
+	 * Set the app
+	 */
+	public static function set_app($app) {
+		self::$app = $app;
+	}
+}
+?>
diff --git a/object/Conversation.php b/object/Conversation.php
new file mode 100644
index 0000000000..8b838f7d00
--- /dev/null
+++ b/object/Conversation.php
@@ -0,0 +1,162 @@
+<?php
+if(class_exists('Conversation'))
+	return;
+
+require_once('boot.php');
+require_once('object/BaseObject.php');
+require_once('object/Item.php');
+require_once('include/text.php');
+
+/**
+ * A list of threads
+ *
+ * We should think about making this a SPL Iterator
+ */
+class Conversation extends BaseObject {
+	private $threads = array();
+	private $mode = null;
+	private $writable = false;
+	private $profile_owner = 0;
+	private $preview = false;
+
+	public function __construct($mode, $preview) {
+		$this->set_mode($mode);
+		$this->preview = $preview;
+	}
+
+	/**
+	 * Set the mode we'll be displayed on
+	 */
+	private function set_mode($mode) {
+		if($this->get_mode() == $mode)
+			return;
+
+		$a = $this->get_app();
+
+		switch($mode) {
+			case 'network':
+			case 'notes':
+				$this->profile_owner = local_user();
+				$this->writable = true;
+				break;
+			case 'profile':
+				$this->profile_owner = $a->profile['profile_uid'];
+				$this->writable = can_write_wall($a,$this->profile_owner);
+				break;
+			case 'display':
+				$this->profile_owner = $a->profile['uid'];
+				$this->writable = can_write_wall($a,$this->profile_owner);
+				break;
+			default:
+				logger('[ERROR] Conversation::set_mode : Unhandled mode ('. $mode .').', LOGGER_DEBUG);
+				return false;
+				break;
+		}
+		$this->mode = $mode;
+	}
+
+	/**
+	 * Get mode
+	 */
+	public function get_mode() {
+		return $this->mode;
+	}
+
+	/**
+	 * Check if page is writable
+	 */
+	public function is_writable() {
+		return $this->writable;
+	}
+
+	/**
+	 * Check if page is a preview
+	 */
+	public function is_preview() {
+		return $this->preview;
+	}
+
+	/**
+	 * Get profile owner
+	 */
+	public function get_profile_owner() {
+		return $this->profile_owner;
+	}
+
+	/**
+	 * Add a thread to the conversation
+	 *
+	 * Returns:
+	 *      _ The inserted item on success
+	 *      _ false on failure
+	 */
+	public function add_thread($item) {
+		$item_id = $item->get_id();
+		if(!$item_id) {
+			logger('[ERROR] Conversation::add_thread : Item has no ID!!', LOGGER_DEBUG);
+			return false;
+		}
+		if($this->get_thread($item->get_id())) {
+			logger('[WARN] Conversation::add_thread : Thread already exists ('. $item->get_id() .').', LOGGER_DEBUG);
+			return false;
+		}
+
+		/*
+		 * Only add will be displayed
+		 */
+		if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) {
+			logger('[WARN] Conversation::add_thread : Thread is a mail ('. $item->get_id() .').', LOGGER_DEBUG);
+			return false;
+		}
+		if($item->get_data_value('verb') === ACTIVITY_LIKE || $item->get_data_value('verb') === ACTIVITY_DISLIKE) {
+			logger('[WARN] Conversation::add_thread : Thread is a (dis)like ('. $item->get_id() .').', LOGGER_DEBUG);
+			return false;
+		}
+		$item->set_conversation($this);
+		$this->threads[] = $item;
+		return end($this->threads);
+	}
+
+	/**
+	 * Get data in a form usable by a conversation template
+	 *
+	 * We should find a way to avoid using those arguments (at least most of them)
+	 *
+	 * Returns:
+	 *      _ The data requested on success
+	 *      _ false on failure
+	 */
+	public function get_template_data($alike, $dlike) {
+		$result = array();
+
+		foreach($this->threads as $item) {
+			if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid'))
+				continue;
+			$item_data = $item->get_template_data($alike, $dlike);
+			if(!$item_data) {
+				logger('[ERROR] Conversation::get_template_data : Failed to get item template data ('. $item->get_id() .').', LOGGER_DEBUG);
+				return false;
+			}
+			$result[] = $item_data;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get a thread based on its item id
+	 *
+	 * Returns:
+	 *      _ The found item on success
+	 *      _ false on failure
+	 */
+	private function get_thread($id) {
+		foreach($this->threads as $item) {
+			if($item->get_id() == $id)
+				return $item;
+		}
+
+		return false;
+	}
+}
+?>
diff --git a/object/Item.php b/object/Item.php
new file mode 100644
index 0000000000..d40a384f56
--- /dev/null
+++ b/object/Item.php
@@ -0,0 +1,640 @@
+<?php
+if(class_exists('Item'))
+	return;
+
+require_once('object/BaseObject.php');
+require_once('include/text.php');
+require_once('boot.php');
+
+/**
+ * An item
+ */
+class Item extends BaseObject {
+	private $data = array();
+	private $template = null;
+	private $available_templates = array(
+		'wall' => 'wall_thread.tpl',
+		'wall2wall' => 'wallwall_thread.tpl'
+	);
+	private $comment_box_template = 'comment_item.tpl';
+	private $toplevel = false;
+	private $writable = false;
+	private $children = array();
+	private $parent = null;
+	private $conversation = null;
+	private $redirect_url = null;
+	private $owner_url = '';
+	private $owner_photo = '';
+	private $owner_name = '';
+	private $wall_to_wall = false;
+	private $threaded = false;
+	private $visiting = false;
+
+	public function __construct($data) {
+		$a = $this->get_app();
+		
+		$this->data = $data;
+		$this->set_template('wall');
+		$this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
+
+		if(is_array($_SESSION['remote'])) {
+			foreach($_SESSION['remote'] as $visitor) {
+				if($visitor['cid'] == $this->get_data_value('contact-id')) {
+					$this->visiting = true;
+					break;
+				}
+			}
+		}
+		
+		$this->writable = ($this->get_data_value('writable') || $this->get_data_value('self'));
+
+		$ssl_state = ((local_user()) ? true : false);
+		$this->redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $this->get_data_value('cid') ;
+
+		if(get_config('system','thread_allow') && $a->theme_thread_allow && !$this->is_toplevel())
+			$this->threaded = true;
+
+		// Prepare the children
+		if(count($data['children'])) {
+			foreach($data['children'] as $item) {
+				/*
+				 * Only add will be displayed
+				 */
+				if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+					continue;
+				}
+				if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
+					continue;
+				}
+				$child = new Item($item);
+				$this->add_child($child);
+			}
+		}
+	}
+
+	/**
+	 * Get data in a form usable by a conversation template
+	 *
+	 * Returns:
+	 *      _ The data requested on success
+	 *      _ false on failure
+	 */
+	public function get_template_data($alike, $dlike, $thread_level=1) {
+		$result = array();
+
+		$a = $this->get_app();
+
+		$item = $this->get_data();
+
+		$commentww = '';
+		$sparkle = '';
+		$buttons = '';
+		$dropping = false;
+		$star = false;
+		$isstarred = "unstarred";
+		$indent = '';
+		$osparkle = '';
+		$total_children = $this->count_descendants();
+
+		$conv = $this->get_conversation();
+
+		$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+			|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
+			? t('Private Message')
+			: false);
+		$shareable = ((($conv->get_profile_owner() == local_user()) && ($item['private'] != 1)) ? true : false);
+		if(local_user() && link_compare($a->contact['url'],$item['author-link']))
+			$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
+		else
+			$edpost = false;
+		if(($this->get_data_value('uid') == local_user()) || $this->is_visiting())
+			$dropping = true;
+
+		$drop = array(
+			'dropping' => $dropping,
+			'select' => t('Select'), 
+			'delete' => t('Delete'),
+		);
+		
+		$filer = (($conv->get_profile_owner() == local_user()) ? t("save to folder") : false);
+
+		$diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+		$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+		if($item['author-link'] && (! $item['author-name']))
+			$profile_name = $item['author-link'];
+
+		$sp = false;
+		$profile_link = best_link_url($item,$sp);
+		if($profile_link === 'mailbox')
+			$profile_link = '';
+		if($sp)
+			$sparkle = ' sparkle';
+		else
+			$profile_link = zrl($profile_link);                 
+
+		$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+		if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
+			$profile_avatar = $a->contacts[$normalised]['thumb'];
+		else
+			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($this->get_data_value('thumb')));
+
+		$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
+		call_hooks('render_location',$locate);
+		$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+
+		$tags=array();
+		foreach(explode(',',$item['tag']) as $tag){
+			$tag = trim($tag);
+			if ($tag!="") $tags[] = bbcode($tag);
+		}
+
+		$like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
+		$dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
+
+		/*
+		 * We should avoid doing this all the time, but it depends on the conversation mode
+		 * And the conv mode may change when we change the conv, or it changes its mode
+		 * Maybe we should establish a way to be notified about conversation changes
+		 */
+		$this->check_wall_to_wall();
+		
+		if($this->is_wall_to_wall() && ($this->get_owner_url() == $this->get_redirect_url()))
+			$osparkle = ' sparkle';
+		
+		if($this->is_toplevel()) {
+			if($conv->get_profile_owner() == local_user()) {
+				$isstarred = (($item['starred']) ? "starred" : "unstarred");
+
+				$star = array(
+					'do' => t("add star"),
+					'undo' => t("remove star"),
+					'toggle' => t("toggle star status"),
+					'classdo' => (($item['starred']) ? "hidden" : ""),
+					'classundo' => (($item['starred']) ? "" : "hidden"),
+					'starred' =>  t('starred'),
+					'tagger' => t("add tag"),
+					'classtagger' => "",
+				);
+			}
+		} else {
+			$indent = 'comment';
+		}
+
+		if($conv->is_writable()) {
+			$buttons = array(
+				'like' => array( t("I like this \x28toggle\x29"), t("like")),
+				'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
+			);
+			if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
+		}
+
+		if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+			$indent .= ' shiny';
+
+		localize_item($item);
+
+		$body = prepare_body($item,true);
+
+		$tmp_item = array(
+			'template' => $this->get_template(),
+			
+			'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
+			'tags' => $tags,
+			'body' => template_escape($body),
+			'text' => strip_tags(template_escape($body)),
+			'id' => $this->get_id(),
+			'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
+			'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+			'to' => t('to'),
+			'wall' => t('Wall-to-Wall'),
+			'vwall' => t('via Wall-To-Wall:'),
+			'profile_url' => $profile_link,
+			'item_photo_menu' => item_photo_menu($item),
+			'name' => template_escape($profile_name),
+			'thumb' => $profile_avatar,
+			'osparkle' => $osparkle,
+			'sparkle' => $sparkle,
+			'title' => template_escape($item['title']),
+			'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
+			'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+			'lock' => $lock,
+			'location' => template_escape($location),
+			'indent' => $indent,
+			'owner_url' => $this->get_owner_url(),
+			'owner_photo' => $this->get_owner_photo(),
+			'owner_name' => template_escape($this->get_owner_name()),
+			'plink' => get_plink($item),
+			'edpost' => $edpost,
+			'isstarred' => $isstarred,
+			'star' => $star,
+			'filer' => $filer,
+			'drop' => $drop,
+			'vote' => $buttons,
+			'like' => $like,
+			'dislike' => $dislike,
+			'comment' => $this->get_comment_box($indent),
+			'previewing' => ($conv->is_preview() ? ' preview ' : ''),
+			'wait' => t('Please wait'),
+			'thread_level' => $thread_level
+		);
+
+		$arr = array('item' => $item, 'output' => $tmp_item);
+		call_hooks('display_item', $arr);
+
+		$result = $arr['output'];
+
+		$result['children'] = array();
+		$children = $this->get_children();
+		$nb_children = count($children);
+		if($nb_children > 0) {
+			foreach($children as $child) {
+				$result['children'][] = $child->get_template_data($alike, $dlike, $thread_level + 1);
+			}
+			// Collapse
+			if(($nb_children > 2) || ($thread_level > 1)) {
+				$result['children'][0]['comment_firstcollapsed'] = true;
+				$result['children'][0]['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
+				$result['children'][0]['hidden_comments_num'] = $total_children;
+				$result['children'][0]['hidden_comments_text'] = tt('comment', 'comments', $total_children);
+				$result['children'][0]['hide_text'] = t('show more');
+				if($thread_level > 1) {
+					$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
+				}
+				else {
+					$result['children'][$nb_children - 3]['comment_lastcollapsed'] = true;
+				}
+			}
+		}
+		
+		$result['private'] = $item['private'];
+		$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
+
+		if($this->is_threaded()) {
+			$result['flatten'] = false;
+			$result['threaded'] = true;
+		}
+		else {
+			$result['flatten'] = true;
+			$result['threaded'] = false;
+		}
+
+		return $result;
+	}
+	
+	public function get_id() {
+		return $this->get_data_value('id');
+	}
+
+	public function is_threaded() {
+		return $this->threaded;
+	}
+
+	/**
+	 * Add a child item
+	 */
+	public function add_child($item) {
+		$item_id = $item->get_id();
+		if(!$item_id) {
+			logger('[ERROR] Item::add_child : Item has no ID!!', LOGGER_DEBUG);
+			return false;
+		}
+		if($this->get_child($item->get_id())) {
+			logger('[WARN] Item::add_child : Item already exists ('. $item->get_id() .').', LOGGER_DEBUG);
+			return false;
+		}
+		/*
+		 * Only add what will be displayed
+		 */
+		if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) {
+			logger('[WARN] Item::add_child : Item is a mail ('. $item->get_id() .').', LOGGER_DEBUG);
+			return false;
+		}
+		if($item->get_data_value('verb') === ACTIVITY_LIKE || $item->get_data_value('verb') === ACTIVITY_DISLIKE) {
+			logger('[WARN] Item::add_child : Item is a (dis)like ('. $item->get_id() .').', LOGGER_DEBUG);
+			return false;
+		}
+		
+		$item->set_parent($this);
+		$this->children[] = $item;
+		return end($this->children);
+	}
+
+	/**
+	 * Get a child by its ID
+	 */
+	public function get_child($id) {
+		foreach($this->get_children() as $child) {
+			if($child->get_id() == $id)
+				return $child;
+		}
+		return null;
+	}
+
+	/**
+	 * Get all ou children
+	 */
+	public function get_children() {
+		return $this->children;
+	}
+
+	/**
+	 * Set our parent
+	 */
+	protected function set_parent($item) {
+		$parent = $this->get_parent();
+		if($parent) {
+			$parent->remove_child($this);
+		}
+		$this->parent = $item;
+		$this->set_conversation($item->get_conversation());
+	}
+
+	/**
+	 * Remove our parent
+	 */
+	protected function remove_parent() {
+		$this->parent = null;
+		$this->conversation = null;
+	}
+
+	/**
+	 * Remove a child
+	 */
+	public function remove_child($item) {
+		$id = $item->get_id();
+		foreach($this->get_children() as $key => $child) {
+			if($child->get_id() == $id) {
+				$child->remove_parent();
+				unset($this->children[$key]);
+				// Reindex the array, in order to make sure there won't be any trouble on loops using count()
+				$this->children = array_values($this->children);
+				return true;
+			}
+		}
+		logger('[WARN] Item::remove_child : Item is not a child ('. $id .').', LOGGER_DEBUG);
+		return false;
+	}
+
+	/**
+	 * Get parent item
+	 */
+	protected function get_parent() {
+		return $this->parent;
+	}
+
+	/**
+	 * set conversation
+	 */
+	public function set_conversation($conv) {
+		$previous_mode = ($this->conversation ? $this->conversation->get_mode() : '');
+		
+		$this->conversation = $conv;
+
+		// Set it on our children too
+		foreach($this->get_children() as $child)
+			$child->set_conversation($conv);
+	}
+
+	/**
+	 * get conversation
+	 */
+	public function get_conversation() {
+		return $this->conversation;
+	}
+
+	/**
+	 * Get raw data
+	 *
+	 * We shouldn't need this
+	 */
+	public function get_data() {
+		return $this->data;
+	}
+
+	/**
+	 * Get a data value
+	 *
+	 * Returns:
+	 *      _ value on success
+	 *      _ false on failure
+	 */
+	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);
+			return false;
+		}
+
+		return $this->data[$name];
+	}
+
+	/**
+	 * Set template
+	 */
+	private function set_template($name) {
+		if(!x($this->available_templates, $name)) {
+			logger('[ERROR] Item::set_template : Template not available ("'. $name .'").', LOGGER_DEBUG);
+			return false;
+		}
+		$this->template = $this->available_templates[$name];
+	}
+
+	/**
+	 * Get template
+	 */
+	private function get_template() {
+		return $this->template;
+	}
+
+	/**
+	 * Check if this is a toplevel post
+	 */
+	private function is_toplevel() {
+		return $this->toplevel;
+	}
+
+	/**
+	 * Check if this is writable
+	 */
+	private function is_writable() {
+		$conv = $this->get_conversation();
+
+		if($conv) {
+			// This will allow us to comment on wall-to-wall items owned by our friends
+			// and community forums even if somebody else wrote the post.
+			return ($this->writable || ($this->is_visiting() && $conv->get_mode() == 'profile'));
+		}
+		return $this->writable;
+	}
+
+	/**
+	 * Count the total of our descendants
+	 */
+	private function count_descendants() {
+		$children = $this->get_children();
+		$total = count($children);
+		if($total > 0) {
+			foreach($children as $child) {
+				$total += $child->count_descendants();
+			}
+		}
+		return $total;
+	}
+
+	/**
+	 * Get the template for the comment box
+	 */
+	private function get_comment_box_template() {
+		return $this->comment_box_template;
+	}
+
+	/**
+	 * Get the comment box
+	 *
+	 * Returns:
+	 *      _ The comment box string (empty if no comment box)
+	 *      _ false on failure
+	 */
+	private function get_comment_box($indent) {
+		if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
+			return '';
+		}
+		
+		$comment_box = '';
+		$conv = $this->get_conversation();
+		$template = get_markup_template($this->get_comment_box_template());
+		$ww = '';
+		if( ($conv->get_mode() === 'network') && $this->is_wall_to_wall() )
+			$ww = 'ww';
+
+		if($conv->is_writable() && $this->is_writable()) {
+			$a = $this->get_app();
+			$qc = $qcomment =  null;
+
+			/*
+			 * Hmmm, code depending on the presence of a particular plugin?
+			 * This should be better if done by a hook
+			 */
+			if(in_array('qcomment',$a->plugins)) {
+				$qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
+				$qcomment = (($qc) ? explode("\n",$qc) : null);
+			}
+			$comment_box = replace_macros($template,array(
+				'$return_path' => '',
+				'$threaded' => $this->is_threaded(),
+				'$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
+				'$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'),
+				'$id' => $this->get_id(),
+				'$parent' => $this->get_id(),
+				'$qcomment' => $qcomment,
+				'$profile_uid' =>  $conv->get_profile_owner(),
+				'$mylink' => $a->contact['url'],
+				'$mytitle' => t('This is you'),
+				'$myphoto' => $a->contact['thumb'],
+				'$comment' => t('Comment'),
+				'$submit' => t('Submit'),
+				'$edbold' => t('Bold'),
+				'$editalic' => t('Italic'),
+				'$eduline' => t('Underline'),
+				'$edquote' => t('Quote'),
+				'$edcode' => t('Code'),
+				'$edimg' => t('Image'),
+				'$edurl' => t('Link'),
+				'$edvideo' => t('Video'),
+				'$preview' => t('Preview'),
+				'$indent' => $indent,
+				'$sourceapp' => t($a->sourcename),
+				'$ww' => (($conv->get_mode() === 'network') ? $ww : '')
+			));
+		}
+
+		return $comment_box;
+	}
+
+	private function get_redirect_url() {
+		return $this->redirect_url;
+	}
+
+	/**
+	 * Check if we are a wall to wall item and set the relevant properties
+	 */
+	protected function check_wall_to_wall() {
+		$a = $this->get_app();
+		$conv = $this->get_conversation();
+		$this->wall_to_wall = false;
+		
+		if($this->is_toplevel()) {
+			if( (! $this->get_data_value('self')) && ($conv->get_mode() !== 'profile')) {
+				if($this->get_data_value('wall')) {
+
+					// On the network page, I am the owner. On the display page it will be the profile owner.
+					// This will have been stored in $a->page_contact by our calling page.
+					// Put this person as the wall owner of the wall-to-wall notice.
+
+					$this->owner_url = zrl($a->page_contact['url']);
+					$this->owner_photo = $a->page_contact['thumb'];
+					$this->owner_name = $a->page_contact['name'];
+					$this->set_template('wall2wall');
+					$this->wall_to_wall = true;
+				}
+				else if($this->get_data_value('owner-link')) {
+
+					$owner_linkmatch = (($this->get_data_value('owner-link')) && link_compare($this->get_data_value('owner-link'),$this->get_data_value('author-link')));
+					$alias_linkmatch = (($this->get_data_value('alias')) && link_compare($this->get_data_value('alias'),$this->get_data_value('author-link')));
+					$owner_namematch = (($this->get_data_value('owner-name')) && $this->get_data_value('owner-name') == $this->get_data_value('author-name'));
+					if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
+
+						// The author url doesn't match the owner (typically the contact)
+						// and also doesn't match the contact alias. 
+						// The name match is a hack to catch several weird cases where URLs are 
+						// all over the park. It can be tricked, but this prevents you from
+						// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
+						// well that it's the same Bob Smith. 
+
+						// But it could be somebody else with the same name. It just isn't highly likely. 
+						
+
+						$this->owner_photo = $this->get_data_value('owner-avatar');
+						$this->owner_name = $this->get_data_value('owner-name');
+						$this->set_template('wall2wall');
+						$this->wall_to_wall = true;
+						// If it is our contact, use a friendly redirect link
+						if((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url'))) 
+							&& ($this->get_data_value('network') === NETWORK_DFRN)) {
+							$this->owner_url = $this->get_redirect_url();
+						}
+						else
+							$this->owner_url = zrl($this->get_data_value('owner-link'));
+					}
+				}
+			}
+		}
+
+		if(!$this->wall_to_wall) {
+			$this->set_template('wall');
+			$this->owner_url = '';
+			$this->owner_photo = '';
+			$this->owner_name = '';
+		}
+	}
+
+	private function is_wall_to_wall() {
+		return $this->wall_to_wall;
+	}
+
+	private function get_owner_url() {
+		return $this->owner_url;
+	}
+
+	private function get_owner_photo() {
+		return $this->owner_photo;
+	}
+
+	private function get_owner_name() {
+		return $this->owner_name;
+	}
+
+	private function is_visiting() {
+		return $this->visiting;
+	}
+}
+?>
diff --git a/update.php b/update.php
index 19e6cf3bdf..3d3eec6f97 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1154 );
+define( 'UPDATE_VERSION' , 1156 );
 
 /**
  *
@@ -1343,3 +1343,22 @@ function update_1153() {
 	if(!$r) return UPDATE_FAILED;
 	return UPDATE_SUCCESS;
 }
+
+function update_1154() {
+	$r = q("ALTER TABLE `event` ADD `ignore` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `adjust` , ADD INDEX ( `ignore` )");
+
+	if(!$r) return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
+}
+
+function update_1155() {
+	$r1 = q("ALTER TABLE `item_id` DROP PRIMARY KEY");
+	$r2 = q("ALTER TABLE `item_id` ADD `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST");
+	$r3 = q("ALTER TABLE `item_id` ADD INDEX ( `iid` ) ");
+
+	if($r1 && $r2 && $r3)
+		return UPDATE_SUCCESS;
+
+	return UPDATE_FAILED;
+}
+
diff --git a/util/messages.po b/util/messages.po
index 2ec7b709f3..30703dfe85 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1461\n"
+"Project-Id-Version: 3.0.1471\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-09 10:00-0700\n"
+"POT-Creation-Date: 2012-09-19 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,8 +47,8 @@ msgstr ""
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
 #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126
 #: ../../mod/item.php:142 ../../mod/mood.php:114
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:142
-#: ../../mod/profile_photo.php:153 ../../mod/profile_photo.php:166
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
+#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
 #: ../../mod/message.php:38 ../../mod/message.php:168
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
 #: ../../mod/wall_upload.php:64 ../../mod/follow.php:9
@@ -56,9 +56,10 @@ msgstr ""
 #: ../../mod/profiles.php:413 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
-#: ../../addon/facebook/facebook.php:516
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3834
-#: ../../index.php:315
+#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
+#: ../../addon/fbpost/fbpost.php:165
+#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3908
+#: ../../index.php:317
 msgid "Permission denied."
 msgstr ""
 
@@ -88,7 +89,7 @@ msgid "Return to contact editor"
 msgstr ""
 
 #: ../../mod/crepair.php:148 ../../mod/settings.php:545
-#: ../../mod/settings.php:571 ../../mod/admin.php:690 ../../mod/admin.php:699
+#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702
 msgid "Name"
 msgstr ""
 
@@ -125,7 +126,7 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:439 ../../mod/photos.php:1005
+#: ../../mod/events.php:455 ../../mod/photos.php:1005
 #: ../../mod/photos.php:1081 ../../mod/photos.php:1338
 #: ../../mod/photos.php:1378 ../../mod/photos.php:1419
 #: ../../mod/photos.php:1451 ../../mod/install.php:246
@@ -134,21 +135,21 @@ msgstr ""
 #: ../../mod/settings.php:543 ../../mod/settings.php:697
 #: ../../mod/settings.php:769 ../../mod/settings.php:976
 #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
-#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:687
-#: ../../mod/admin.php:823 ../../mod/admin.php:1022 ../../mod/admin.php:1109
+#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689
+#: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112
 #: ../../mod/profiles.php:583 ../../mod/invite.php:119
 #: ../../addon/fromgplus/fromgplus.php:40
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
-#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210
-#: ../../addon/planets/planets.php:158
+#: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76
+#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88
+#: ../../addon/page/page.php:210 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
 #: ../../addon/forumlist/forumlist.php:169
-#: ../../addon/impressum/impressum.php:82
+#: ../../addon/impressum/impressum.php:83
 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
@@ -158,7 +159,7 @@ msgstr ""
 #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
 #: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
-#: ../../addon/jappixmini/jappixmini.php:302
+#: ../../addon/jappixmini/jappixmini.php:307
 #: ../../addon/statusnet/statusnet.php:278
 #: ../../addon/statusnet/statusnet.php:292
 #: ../../addon/statusnet/statusnet.php:318
@@ -174,8 +175,8 @@ msgstr ""
 #: ../../view/theme/cleanzero/config.php:80
 #: ../../view/theme/diabook/theme.php:757
 #: ../../view/theme/diabook/config.php:190
-#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:591
+#: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70
+#: ../../include/conversation.php:608 ../../object/Item.php:532
 msgid "Submit"
 msgstr ""
 
@@ -188,11 +189,11 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:224
+#: ../../mod/help.php:38 ../../index.php:226
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:227
+#: ../../mod/help.php:41 ../../index.php:229
 msgid "Page not found."
 msgstr ""
 
@@ -222,90 +223,91 @@ msgstr ""
 msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../mod/events.php:263
+#: ../../mod/events.php:279
 msgid "l, F j"
 msgstr ""
 
-#: ../../mod/events.php:285
+#: ../../mod/events.php:301
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:307 ../../include/text.php:1147
+#: ../../mod/events.php:323 ../../include/text.php:1147
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1683
+#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:131
+#: ../../include/nav.php:52 ../../boot.php:1689
 msgid "Events"
 msgstr ""
 
-#: ../../mod/events.php:332
+#: ../../mod/events.php:348
 msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:333 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263
 msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:334 ../../mod/install.php:205
+#: ../../mod/events.php:350 ../../mod/install.php:205
 #: ../../addon/dav/friendica/layout.fnk.php:266
 msgid "Next"
 msgstr ""
 
-#: ../../mod/events.php:407
+#: ../../mod/events.php:423
 msgid "hour:minute"
 msgstr ""
 
-#: ../../mod/events.php:417
+#: ../../mod/events.php:433
 msgid "Event details"
 msgstr ""
 
-#: ../../mod/events.php:418
+#: ../../mod/events.php:434
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/events.php:420
+#: ../../mod/events.php:436
 msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/events.php:420 ../../mod/events.php:434
+#: ../../mod/events.php:436 ../../mod/events.php:450
 msgid "Required"
 msgstr ""
 
-#: ../../mod/events.php:423
+#: ../../mod/events.php:439
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:425
+#: ../../mod/events.php:441
 msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/events.php:428
+#: ../../mod/events.php:444
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:430
+#: ../../mod/events.php:446
 msgid "Description:"
 msgstr ""
 
-#: ../../mod/events.php:432 ../../mod/directory.php:134
+#: ../../mod/events.php:448 ../../mod/directory.php:134
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
 #: ../../boot.php:1226
 msgid "Location:"
 msgstr ""
 
-#: ../../mod/events.php:434
+#: ../../mod/events.php:450
 msgid "Title:"
 msgstr ""
 
-#: ../../mod/events.php:436
+#: ../../mod/events.php:452
 msgid "Share this event"
 msgstr ""
 
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136
 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
+#: ../../include/conversation.php:1290
 msgid "Cancel"
 msgstr ""
 
@@ -373,7 +375,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:46 ../../boot.php:1676
+#: ../../mod/photos.php:46 ../../boot.php:1682
 msgid "Photo Albums"
 msgstr ""
 
@@ -398,13 +400,13 @@ msgid "Contact information unavailable"
 msgstr ""
 
 #: ../../mod/photos.php:149 ../../mod/photos.php:653 ../../mod/photos.php:1073
-#: ../../mod/photos.php:1088 ../../mod/profile_photo.php:60
-#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
-#: ../../mod/profile_photo.php:177 ../../mod/profile_photo.php:261
-#: ../../mod/profile_photo.php:270
+#: ../../mod/photos.php:1088 ../../mod/profile_photo.php:74
+#: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
+#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
+#: ../../mod/profile_photo.php:305
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318
-#: ../../include/user.php:325 ../../include/user.php:332
+#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:324
+#: ../../include/user.php:331 ../../include/user.php:338
 msgid "Profile Photos"
 msgstr ""
 
@@ -428,7 +430,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:163
 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1399
 #: ../../include/diaspora.php:1824 ../../include/conversation.php:125
-#: ../../include/conversation.php:255
+#: ../../include/conversation.php:253
 msgid "photo"
 msgstr ""
 
@@ -444,12 +446,12 @@ msgstr ""
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/photos.php:729 ../../mod/profile_photo.php:126
+#: ../../mod/photos.php:729 ../../mod/profile_photo.php:153
 #: ../../mod/wall_upload.php:110
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:756 ../../mod/profile_photo.php:266
+#: ../../mod/photos.php:756 ../../mod/profile_photo.php:301
 #: ../../mod/wall_upload.php:136
 msgid "Image upload failed."
 msgstr ""
@@ -535,7 +537,7 @@ msgid "Use as profile photo"
 msgstr ""
 
 #: ../../mod/photos.php:1224 ../../mod/content.php:601
-#: ../../include/conversation.php:428
+#: ../../include/conversation.php:435 ../../object/Item.php:103
 msgid "Private Message"
 msgstr ""
 
@@ -576,49 +578,52 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
 #: ../../mod/photos.php:1356 ../../mod/content.php:665
-#: ../../include/conversation.php:565
+#: ../../include/conversation.php:582 ../../object/Item.php:185
 msgid "I like this (toggle)"
 msgstr ""
 
 #: ../../mod/photos.php:1357 ../../mod/content.php:666
-#: ../../include/conversation.php:566
+#: ../../include/conversation.php:583 ../../object/Item.php:186
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1358 ../../include/conversation.php:1195
+#: ../../mod/photos.php:1358 ../../include/conversation.php:1251
 msgid "Share"
 msgstr ""
 
 #: ../../mod/photos.php:1359 ../../mod/editpost.php:112
 #: ../../mod/content.php:482 ../../mod/content.php:843
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:659
-#: ../../include/conversation.php:891 ../../include/conversation.php:1214
+#: ../../mod/message.php:481 ../../include/conversation.php:678
+#: ../../include/conversation.php:928 ../../include/conversation.php:1270
+#: ../../object/Item.php:237
 msgid "Please wait"
 msgstr ""
 
 #: ../../mod/photos.php:1375 ../../mod/photos.php:1416
 #: ../../mod/photos.php:1448 ../../mod/content.php:688
-#: ../../include/conversation.php:588
+#: ../../include/conversation.php:605 ../../object/Item.php:529
 msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1377 ../../mod/photos.php:1418
 #: ../../mod/photos.php:1450 ../../mod/content.php:690
-#: ../../include/conversation.php:590 ../../boot.php:574
+#: ../../include/conversation.php:607 ../../boot.php:574
+#: ../../object/Item.php:531
 msgid "Comment"
 msgstr ""
 
 #: ../../mod/photos.php:1379 ../../mod/editpost.php:133
-#: ../../mod/content.php:700 ../../include/conversation.php:600
-#: ../../include/conversation.php:1232
+#: ../../mod/content.php:700 ../../include/conversation.php:617
+#: ../../include/conversation.php:1288 ../../object/Item.php:541
 msgid "Preview"
 msgstr ""
 
 #: ../../mod/photos.php:1479 ../../mod/content.php:439
 #: ../../mod/content.php:721 ../../mod/settings.php:606
-#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:694
-#: ../../include/conversation.php:440 ../../include/conversation.php:847
+#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696
+#: ../../include/conversation.php:447 ../../include/conversation.php:881
+#: ../../object/Item.php:116
 msgid "Delete"
 msgstr ""
 
@@ -684,28 +689,29 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:1181
+#: ../../mod/editpost.php:88 ../../include/conversation.php:1237
 msgid "Post to Email"
 msgstr ""
 
 #: ../../mod/editpost.php:103 ../../mod/content.php:708
-#: ../../mod/settings.php:605 ../../include/conversation.php:433
+#: ../../mod/settings.php:605 ../../include/conversation.php:440
+#: ../../object/Item.php:107
 msgid "Edit"
 msgstr ""
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:1196
+#: ../../include/conversation.php:1252
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1198
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1254
 msgid "Attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:1200
+#: ../../include/conversation.php:1256
 msgid "Insert web link"
 msgstr ""
 
@@ -721,35 +727,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1206
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1262
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1208
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1264
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1215
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1271
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1224
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1280
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1225
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1281
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1211
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1267
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:1213
+#: ../../mod/editpost.php:127 ../../include/conversation.php:1269
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:1227
+#: ../../mod/editpost.php:128 ../../include/conversation.php:1283
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -870,7 +876,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3213
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3287
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -1291,28 +1297,32 @@ msgid "Group: "
 msgstr ""
 
 #: ../../mod/content.php:438 ../../mod/content.php:720
-#: ../../include/conversation.php:439 ../../include/conversation.php:846
+#: ../../include/conversation.php:446 ../../include/conversation.php:880
+#: ../../object/Item.php:115
 msgid "Select"
 msgstr ""
 
 #: ../../mod/content.php:455 ../../mod/content.php:813
-#: ../../mod/content.php:814 ../../include/conversation.php:627
-#: ../../include/conversation.php:628 ../../include/conversation.php:863
+#: ../../mod/content.php:814 ../../include/conversation.php:646
+#: ../../include/conversation.php:647 ../../include/conversation.php:897
+#: ../../object/Item.php:206 ../../object/Item.php:207
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #: ../../mod/content.php:465 ../../mod/content.php:825
-#: ../../include/conversation.php:641 ../../include/conversation.php:874
+#: ../../include/conversation.php:660 ../../include/conversation.php:911
+#: ../../object/Item.php:219
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../mod/content.php:480 ../../include/conversation.php:889
+#: ../../mod/content.php:480 ../../include/conversation.php:926
 msgid "View in context"
 msgstr ""
 
-#: ../../mod/content.php:586 ../../include/conversation.php:668
+#: ../../mod/content.php:586 ../../include/conversation.php:687
+#: ../../object/Item.php:256
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -1321,92 +1331,113 @@ msgstr[1] ""
 
 #: ../../mod/content.php:587 ../../addon/page/page.php:76
 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../include/conversation.php:669
-#: ../../boot.php:575
+#: ../../include/contact_widgets.php:195 ../../include/conversation.php:688
+#: ../../boot.php:575 ../../object/Item.php:257
 msgid "show more"
 msgstr ""
 
-#: ../../mod/content.php:665 ../../include/conversation.php:565
+#: ../../mod/content.php:665 ../../include/conversation.php:582
+#: ../../object/Item.php:185
 msgid "like"
 msgstr ""
 
-#: ../../mod/content.php:666 ../../include/conversation.php:566
+#: ../../mod/content.php:666 ../../include/conversation.php:583
+#: ../../object/Item.php:186
 msgid "dislike"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:568
+#: ../../mod/content.php:668 ../../include/conversation.php:585
+#: ../../object/Item.php:188
 msgid "Share this"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:568
+#: ../../mod/content.php:668 ../../include/conversation.php:585
+#: ../../object/Item.php:188
 msgid "share"
 msgstr ""
 
-#: ../../mod/content.php:692 ../../include/conversation.php:592
+#: ../../mod/content.php:692 ../../include/conversation.php:609
+#: ../../object/Item.php:533
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:693 ../../include/conversation.php:593
+#: ../../mod/content.php:693 ../../include/conversation.php:610
+#: ../../object/Item.php:534
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:694 ../../include/conversation.php:594
+#: ../../mod/content.php:694 ../../include/conversation.php:611
+#: ../../object/Item.php:535
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../include/conversation.php:595
+#: ../../mod/content.php:695 ../../include/conversation.php:612
+#: ../../object/Item.php:536
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../include/conversation.php:596
+#: ../../mod/content.php:696 ../../include/conversation.php:613
+#: ../../object/Item.php:537
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../include/conversation.php:597
+#: ../../mod/content.php:697 ../../include/conversation.php:614
+#: ../../object/Item.php:538
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../include/conversation.php:598
+#: ../../mod/content.php:698 ../../include/conversation.php:615
+#: ../../object/Item.php:539
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../include/conversation.php:599
+#: ../../mod/content.php:699 ../../include/conversation.php:616
+#: ../../object/Item.php:540
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:733 ../../include/conversation.php:529
+#: ../../mod/content.php:733 ../../include/conversation.php:546
+#: ../../object/Item.php:169
 msgid "add star"
 msgstr ""
 
-#: ../../mod/content.php:734 ../../include/conversation.php:530
+#: ../../mod/content.php:734 ../../include/conversation.php:547
+#: ../../object/Item.php:170
 msgid "remove star"
 msgstr ""
 
-#: ../../mod/content.php:735 ../../include/conversation.php:531
+#: ../../mod/content.php:735 ../../include/conversation.php:548
+#: ../../object/Item.php:171
 msgid "toggle star status"
 msgstr ""
 
-#: ../../mod/content.php:738 ../../include/conversation.php:534
+#: ../../mod/content.php:738 ../../include/conversation.php:551
+#: ../../object/Item.php:174
 msgid "starred"
 msgstr ""
 
-#: ../../mod/content.php:739 ../../include/conversation.php:535
+#: ../../mod/content.php:739 ../../include/conversation.php:552
+#: ../../object/Item.php:175
 msgid "add tag"
 msgstr ""
 
-#: ../../mod/content.php:743 ../../include/conversation.php:443
+#: ../../mod/content.php:743 ../../include/conversation.php:450
+#: ../../object/Item.php:119
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:815 ../../include/conversation.php:629
+#: ../../mod/content.php:815 ../../include/conversation.php:648
+#: ../../object/Item.php:208
 msgid "to"
 msgstr ""
 
-#: ../../mod/content.php:816 ../../include/conversation.php:630
+#: ../../mod/content.php:816 ../../include/conversation.php:649
+#: ../../object/Item.php:209
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:817 ../../include/conversation.php:631
+#: ../../mod/content.php:817 ../../include/conversation.php:650
+#: ../../object/Item.php:210
 msgid "via Wall-To-Wall:"
 msgstr ""
 
@@ -1491,7 +1522,7 @@ msgid "if applicable"
 msgstr ""
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:692
+#: ../../mod/admin.php:694
 msgid "Approve"
 msgstr ""
 
@@ -1692,12 +1723,12 @@ msgid "View all contacts"
 msgstr ""
 
 #: ../../mod/contacts.php:315 ../../mod/contacts.php:374
-#: ../../mod/admin.php:696
+#: ../../mod/admin.php:698
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/contacts.php:315 ../../mod/contacts.php:374
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:697
 msgid "Block"
 msgstr ""
 
@@ -1794,7 +1825,7 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:371 ../../mod/admin.php:1167
+#: ../../mod/contacts.php:371 ../../mod/admin.php:1170
 msgid "Update now"
 msgstr ""
 
@@ -1922,9 +1953,9 @@ msgstr ""
 #: ../../mod/register.php:90 ../../mod/register.php:144
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
-#: ../../addon/facebook/facebook.php:1200
+#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3222
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3296
 #: ../../boot.php:788
 msgid "Administrator"
 msgstr ""
@@ -2008,7 +2039,7 @@ msgid "Remove account"
 msgstr ""
 
 #: ../../mod/settings.php:69 ../../mod/newmember.php:22
-#: ../../mod/admin.php:782 ../../mod/admin.php:987
+#: ../../mod/admin.php:785 ../../mod/admin.php:990
 #: ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643
 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
@@ -2072,7 +2103,7 @@ msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
 #: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495
-#: ../../addon/impressum/impressum.php:77
+#: ../../addon/fbpost/fbpost.php:144 ../../addon/impressum/impressum.php:78
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
 #: ../../addon/twitter/twitter.php:389
@@ -2338,7 +2369,7 @@ msgstr ""
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:944 ../../mod/profile_photo.php:214
+#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr ""
 
@@ -2612,13 +2643,14 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1690
+#: ../../mod/notes.php:44 ../../boot.php:1696
 msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:770
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:263
+#: ../../addon/fbpost/fbpost.php:267
 #: ../../addon/dav/friendica/layout.fnk.php:441
 #: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681
 msgid "Save"
@@ -2655,7 +2687,7 @@ msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:1132 ../../include/conversation.php:1149
+#: ../../include/conversation.php:1188 ../../include/conversation.php:1205
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2738,11 +2770,11 @@ msgstr ""
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1666
+#: ../../boot.php:1672
 msgid "Profile"
 msgstr ""
 
-#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:211
+#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:244
 msgid "Upload Profile Photo"
 msgstr ""
 
@@ -2780,7 +2812,7 @@ msgid "Connecting"
 msgstr ""
 
 #: ../../mod/newmember.php:49 ../../mod/newmember.php:51
-#: ../../addon/facebook/facebook.php:728
+#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""
@@ -2907,7 +2939,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:314
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:316
 msgid "Permission denied"
 msgstr ""
 
@@ -3056,32 +3088,32 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:62
-#: ../../addon/facebook/facebook.php:1594
+#: ../../addon/facebook/facebook.php:1598
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../view/theme/diabook/theme.php:565
 #: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1824
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
-#: ../../include/conversation.php:250 ../../include/conversation.php:259
+#: ../../include/conversation.php:248 ../../include/conversation.php:257
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
 #: ../../addon/communityhome/communityhome.php:172
 #: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840
-#: ../../include/conversation.php:137
+#: ../../include/conversation.php:136
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/like.php:164 ../../include/conversation.php:140
+#: ../../mod/like.php:164 ../../include/conversation.php:139
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:731 ../../mod/admin.php:930 ../../mod/display.php:29
-#: ../../mod/display.php:145 ../../include/items.php:3700
+#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
+#: ../../mod/display.php:145 ../../include/items.php:3774
 msgid "Item not found."
 msgstr ""
 
@@ -3090,7 +3122,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1673
+#: ../../include/nav.php:51 ../../boot.php:1679
 msgid "Photos"
 msgstr ""
 
@@ -3151,7 +3183,7 @@ msgstr ""
 msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/mood.php:62 ../../include/conversation.php:228
+#: ../../mod/mood.php:62 ../../include/conversation.php:226
 #, php-format
 msgid "%1$s is currently %2$s"
 msgstr ""
@@ -3164,61 +3196,65 @@ msgstr ""
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../mod/profile_photo.php:30
+#: ../../mod/profile_photo.php:44
 msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70
-#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:273
+#: ../../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 ""
 
-#: ../../mod/profile_photo.php:91
+#: ../../mod/profile_photo.php:118
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
-#: ../../mod/profile_photo.php:101
+#: ../../mod/profile_photo.php:128
 msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:117 ../../mod/wall_upload.php:88
+#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/profile_photo.php:210
+#: ../../mod/profile_photo.php:242
 msgid "Upload File:"
 msgstr ""
 
-#: ../../mod/profile_photo.php:212
+#: ../../mod/profile_photo.php:243
+msgid "Select a profile:"
+msgstr ""
+
+#: ../../mod/profile_photo.php:245
 #: ../../addon/dav/friendica/layout.fnk.php:152
 msgid "Upload"
 msgstr ""
 
-#: ../../mod/profile_photo.php:214
+#: ../../mod/profile_photo.php:248
 msgid "skip this step"
 msgstr ""
 
-#: ../../mod/profile_photo.php:214
+#: ../../mod/profile_photo.php:248
 msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../mod/profile_photo.php:227
+#: ../../mod/profile_photo.php:262
 msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:228
+#: ../../mod/profile_photo.php:263
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/profile_photo.php:230
+#: ../../mod/profile_photo.php:265
 msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/profile_photo.php:264
+#: ../../mod/profile_photo.php:299
 msgid "Image uploaded successfully."
 msgstr ""
 
@@ -3325,15 +3361,15 @@ msgstr ""
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:686 ../../mod/admin.php:698
+#: ../../mod/admin.php:97 ../../mod/admin.php:688 ../../mod/admin.php:701
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:780 ../../mod/admin.php:822
+#: ../../mod/admin.php:98 ../../mod/admin.php:783 ../../mod/admin.php:825
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:985 ../../mod/admin.php:1021
+#: ../../mod/admin.php:99 ../../mod/admin.php:988 ../../mod/admin.php:1024
 msgid "Themes"
 msgstr ""
 
@@ -3341,7 +3377,7 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1108
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1111
 msgid "Logs"
 msgstr ""
 
@@ -3357,19 +3393,19 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:668
+#: ../../mod/admin.php:183 ../../mod/admin.php:669
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:669
+#: ../../mod/admin.php:184 ../../mod/admin.php:670
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:670
+#: ../../mod/admin.php:185 ../../mod/admin.php:671
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:671
+#: ../../mod/admin.php:186 ../../mod/admin.php:672
 msgid "Automatic Friend Account"
 msgstr ""
 
@@ -3385,9 +3421,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:685
-#: ../../mod/admin.php:779 ../../mod/admin.php:821 ../../mod/admin.php:984
-#: ../../mod/admin.php:1020 ../../mod/admin.php:1107
+#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:687
+#: ../../mod/admin.php:782 ../../mod/admin.php:824 ../../mod/admin.php:987
+#: ../../mod/admin.php:1023 ../../mod/admin.php:1110
 msgid "Administration"
 msgstr ""
 
@@ -3600,13 +3636,13 @@ msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
 #: ../../mod/admin.php:470
-msgid "No default permissions for new users"
+msgid "Private posts by default for new users"
 msgstr ""
 
 #: ../../mod/admin.php:470
 msgid ""
-"New users will have no private permissions set for their posts by default, "
-"making their posts public until they change it."
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
 msgstr ""
 
 #: ../../mod/admin.php:472
@@ -3812,148 +3848,152 @@ msgstr ""
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:688
+#: ../../mod/admin.php:690
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:689
+#: ../../mod/admin.php:691
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:692
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:690 ../../mod/admin.php:699
+#: ../../mod/admin.php:692 ../../mod/admin.php:702
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:693
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:695
 msgid "Deny"
 msgstr ""
 
 #: ../../mod/admin.php:699
+msgid "Site admin"
+msgstr ""
+
+#: ../../mod/admin.php:702
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:699
+#: ../../mod/admin.php:702
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:699
+#: ../../mod/admin.php:702
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:699
+#: ../../mod/admin.php:702
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:701
+#: ../../mod/admin.php:704
 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:702
+#: ../../mod/admin.php:705
 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:743
+#: ../../mod/admin.php:746
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:747
+#: ../../mod/admin.php:750
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:757 ../../mod/admin.php:955
+#: ../../mod/admin.php:760 ../../mod/admin.php:958
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:759 ../../mod/admin.php:957
+#: ../../mod/admin.php:762 ../../mod/admin.php:960
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:781 ../../mod/admin.php:986
+#: ../../mod/admin.php:784 ../../mod/admin.php:989
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:789 ../../mod/admin.php:996
+#: ../../mod/admin.php:792 ../../mod/admin.php:999
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:790 ../../mod/admin.php:997
+#: ../../mod/admin.php:793 ../../mod/admin.php:1000
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:919
+#: ../../mod/admin.php:922
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:978
+#: ../../mod/admin.php:981
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1026
+#: ../../mod/admin.php:1029
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1027
+#: ../../mod/admin.php:1030
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1054
+#: ../../mod/admin.php:1057
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1110
+#: ../../mod/admin.php:1113
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1116
+#: ../../mod/admin.php:1119
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1117
+#: ../../mod/admin.php:1120
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1117
+#: ../../mod/admin.php:1120
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:1118
+#: ../../mod/admin.php:1121
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1168
+#: ../../mod/admin.php:1171
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:1174
+#: ../../mod/admin.php:1177
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:1175
+#: ../../mod/admin.php:1178
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:1176
+#: ../../mod/admin.php:1179
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:1177
+#: ../../mod/admin.php:1180
 msgid "FTP Password"
 msgstr ""
 
@@ -3969,48 +4009,48 @@ msgstr ""
 msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/ping.php:185
+#: ../../mod/ping.php:235
 msgid "{0} wants to be your friend"
 msgstr ""
 
-#: ../../mod/ping.php:190
+#: ../../mod/ping.php:240
 msgid "{0} sent you a message"
 msgstr ""
 
-#: ../../mod/ping.php:195
+#: ../../mod/ping.php:245
 msgid "{0} requested registration"
 msgstr ""
 
-#: ../../mod/ping.php:201
+#: ../../mod/ping.php:251
 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:206
+#: ../../mod/ping.php:256
 #, php-format
 msgid "{0} liked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:211
+#: ../../mod/ping.php:261
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:216
+#: ../../mod/ping.php:266
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr ""
 
-#: ../../mod/ping.php:221
+#: ../../mod/ping.php:271
 msgid "{0} posted"
 msgstr ""
 
-#: ../../mod/ping.php:226
+#: ../../mod/ping.php:276
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
-#: ../../mod/ping.php:232
+#: ../../mod/ping.php:282
 msgid "{0} mentioned you in a post"
 msgstr ""
 
@@ -4372,8 +4412,8 @@ msgstr ""
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:1136
-#: ../../include/conversation.php:1153
+#: ../../mod/filer.php:29 ../../include/conversation.php:1192
+#: ../../include/conversation.php:1209
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4381,7 +4421,7 @@ msgstr ""
 msgid "- select -"
 msgstr ""
 
-#: ../../mod/tagger.php:95 ../../include/conversation.php:267
+#: ../../mod/tagger.php:95 ../../include/conversation.php:265
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
@@ -4639,7 +4679,7 @@ msgid "Unable to set contact photo."
 msgstr ""
 
 #: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:608
-#: ../../include/conversation.php:173
+#: ../../include/conversation.php:171
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
@@ -4714,7 +4754,7 @@ msgstr ""
 msgid "Updating contacts"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:551
+#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:192
 msgid "Facebook API key is missing."
 msgstr ""
 
@@ -4730,13 +4770,13 @@ msgstr ""
 msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:576
+#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:217
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:583
+#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:224
 msgid "Post to Facebook by default"
 msgstr ""
 
@@ -4802,11 +4842,11 @@ msgstr ""
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:744
+#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:255
 msgid "Facebook API Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:754
+#: ../../addon/facebook/facebook.php:754 ../../addon/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 "
@@ -4829,11 +4869,11 @@ msgid ""
 "going on."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:766
+#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:264
 msgid "App-ID / API-Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:767
+#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:265
 msgid "Application secret"
 msgstr ""
 
@@ -4868,38 +4908,38 @@ msgstr ""
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:799
+#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282
 #: ../../addon/dav/friendica/layout.fnk.php:361
 msgid "The new values have been saved."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:823
+#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:301
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:921
+#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:399
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1149
+#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:610
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1182
+#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:643
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1222
+#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:683
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1223
+#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:684
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1224
+#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:685
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -4953,6 +4993,26 @@ msgstr ""
 msgid "Delete the whole cache"
 msgstr ""
 
+#: ../../addon/fbpost/fbpost.php:172
+msgid "Facebook Post disabled"
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:199
+msgid "Facebook Post"
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:205
+msgid "Install Facebook Post connector for this account."
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:212
+msgid "Remove Facebook Post connector"
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:240
+msgid "Facebook Post Settings"
+msgstr ""
+
 #: ../../addon/widgets/widget_like.php:58
 #, php-format
 msgid "%d person likes this"
@@ -5012,11 +5072,11 @@ msgid "did something obscenely biological to"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:22
-msgid "point out the new poke feature to"
+msgid "point out the poke feature to"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:22
-msgid "pointed out the new poke feature to"
+msgid "pointed out the poke feature to"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:23
@@ -5028,112 +5088,108 @@ msgid "declared undying love for"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:24
-msgid "set fire to"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:25
 msgid "patent"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:25
+#: ../../addon/morepokes/morepokes.php:24
 msgid "patented"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:26
+#: ../../addon/morepokes/morepokes.php:25
 msgid "stroke beard"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:26
+#: ../../addon/morepokes/morepokes.php:25
 msgid "stroked their beard at"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:27
+#: ../../addon/morepokes/morepokes.php:26
 msgid ""
 "bemoan the declining standards of modern secondary and tertiary education to"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:27
+#: ../../addon/morepokes/morepokes.php:26
 msgid ""
 "bemoans the declining standards of modern secondary and tertiary education to"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:28
+#: ../../addon/morepokes/morepokes.php:27
 msgid "hug"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:28
+#: ../../addon/morepokes/morepokes.php:27
 msgid "hugged"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:29
+#: ../../addon/morepokes/morepokes.php:28
 msgid "kiss"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:29
+#: ../../addon/morepokes/morepokes.php:28
 msgid "kissed"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:30
+#: ../../addon/morepokes/morepokes.php:29
 msgid "raise eyebrows at"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:30
+#: ../../addon/morepokes/morepokes.php:29
 msgid "raised their eyebrows at"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:31
+#: ../../addon/morepokes/morepokes.php:30
 msgid "insult"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:31
+#: ../../addon/morepokes/morepokes.php:30
 msgid "insulted"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:32
+#: ../../addon/morepokes/morepokes.php:31
 msgid "praise"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:32
+#: ../../addon/morepokes/morepokes.php:31
 msgid "praised"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:33
+#: ../../addon/morepokes/morepokes.php:32
 msgid "be dubious of"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:33
+#: ../../addon/morepokes/morepokes.php:32
 msgid "was dubious of"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:34
+#: ../../addon/morepokes/morepokes.php:33
 msgid "eat"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:34
+#: ../../addon/morepokes/morepokes.php:33
 msgid "ate"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:35
+#: ../../addon/morepokes/morepokes.php:34
 msgid "giggle and fawn at"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:35
+#: ../../addon/morepokes/morepokes.php:34
 msgid "giggled and fawned at"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:36
+#: ../../addon/morepokes/morepokes.php:35
 msgid "doubt"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:36
+#: ../../addon/morepokes/morepokes.php:35
 msgid "doubted"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:37
+#: ../../addon/morepokes/morepokes.php:36
 msgid "glare"
 msgstr ""
 
-#: ../../addon/morepokes/morepokes.php:37
+#: ../../addon/morepokes/morepokes.php:36
 msgid "glared at"
 msgstr ""
 
@@ -5185,11 +5241,11 @@ msgstr ""
 msgid "Post to LiveJournal by default"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:47
+#: ../../addon/nsfw/nsfw.php:78
 msgid "Not Safe For Work (General Purpose Content Filter) settings"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:49
+#: ../../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 "
@@ -5199,23 +5255,23 @@ msgid ""
 "can thereby be used as a general purpose content filter."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:50
+#: ../../addon/nsfw/nsfw.php:81
 msgid "Enable Content filter"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:53
+#: ../../addon/nsfw/nsfw.php:84
 msgid "Comma separated list of keywords to hide"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:58
+#: ../../addon/nsfw/nsfw.php:89
 msgid "Use /expression/ to provide regular expressions"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:74
+#: ../../addon/nsfw/nsfw.php:105
 msgid "NSFW Settings saved."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:121
+#: ../../addon/nsfw/nsfw.php:157
 #, php-format
 msgid "%s - Click to open/close"
 msgstr ""
@@ -5290,7 +5346,7 @@ msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
 #: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1397
-#: ../../include/conversation.php:117 ../../include/conversation.php:247
+#: ../../include/conversation.php:117 ../../include/conversation.php:245
 msgid "event"
 msgstr ""
 
@@ -6094,68 +6150,68 @@ msgstr ""
 msgid "Show forumlists/forums on profile forumlist"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:36
+#: ../../addon/impressum/impressum.php:37
 msgid "Impressum"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:49
-#: ../../addon/impressum/impressum.php:51
-#: ../../addon/impressum/impressum.php:83
+#: ../../addon/impressum/impressum.php:50
+#: ../../addon/impressum/impressum.php:52
+#: ../../addon/impressum/impressum.php:84
 msgid "Site Owner"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:49
-#: ../../addon/impressum/impressum.php:87
+#: ../../addon/impressum/impressum.php:50
+#: ../../addon/impressum/impressum.php:88
 msgid "Email Address"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:54
-#: ../../addon/impressum/impressum.php:85
+#: ../../addon/impressum/impressum.php:55
+#: ../../addon/impressum/impressum.php:86
 msgid "Postal Address"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:60
+#: ../../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 ""
 
-#: ../../addon/impressum/impressum.php:83
+#: ../../addon/impressum/impressum.php:84
 msgid "The page operators name."
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:84
+#: ../../addon/impressum/impressum.php:85
 msgid "Site Owners Profile"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:84
+#: ../../addon/impressum/impressum.php:85
 msgid "Profile address of the operator."
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:85
+#: ../../addon/impressum/impressum.php:86
 msgid "How to contact the operator via snail mail. You can use BBCode here."
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:86
+#: ../../addon/impressum/impressum.php:87
 msgid "Notes"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:86
+#: ../../addon/impressum/impressum.php:87
 msgid ""
 "Additional notes that are displayed beneath the contact information. You can "
 "use BBCode here."
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:87
+#: ../../addon/impressum/impressum.php:88
 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:88
+#: ../../addon/impressum/impressum.php:89
 msgid "Footer note"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:88
+#: ../../addon/impressum/impressum.php:89
 msgid "Text for the footer. You can use BBCode here."
 msgstr ""
 
@@ -6465,6 +6521,58 @@ msgstr ""
 msgid "Post to InsaneJournal by default"
 msgstr ""
 
+#: ../../addon/jappixmini/jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr ""
+
+#: ../../addon/jappixmini/jappixmini.php:268
+msgid "Activate addon"
+msgstr ""
+
+#: ../../addon/jappixmini/jappixmini.php:271
+msgid "Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr ""
+
+#: ../../addon/jappixmini/jappixmini.php:274
+msgid "Jabber username"
+msgstr ""
+
+#: ../../addon/jappixmini/jappixmini.php:277
+msgid "Jabber server"
+msgstr ""
+
+#: ../../addon/jappixmini/jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr ""
+
+#: ../../addon/jappixmini/jappixmini.php:285
+msgid "Jabber password"
+msgstr ""
+
+#: ../../addon/jappixmini/jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr ""
+
+#: ../../addon/jappixmini/jappixmini.php:293
+msgid "Friendica password"
+msgstr ""
+
+#: ../../addon/jappixmini/jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr ""
+
+#: ../../addon/jappixmini/jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr ""
+
+#: ../../addon/jappixmini/jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr ""
+
+#: ../../addon/jappixmini/jappixmini.php:308
+msgid "Add contact"
+msgstr ""
+
 #: ../../addon/viewsrc/viewsrc.php:37
 msgid "View Source"
 msgstr ""
@@ -6897,7 +7005,7 @@ msgstr ""
 
 #: ../../view/theme/cleanzero/config.php:82
 #: ../../view/theme/diabook/config.php:192
-#: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72
+#: ../../view/theme/quattro/config.php:55 ../../view/theme/dispy/config.php:72
 msgid "Theme settings"
 msgstr ""
 
@@ -6916,7 +7024,7 @@ msgid "Set theme width"
 msgstr ""
 
 #: ../../view/theme/cleanzero/config.php:86
-#: ../../view/theme/quattro/config.php:56
+#: ../../view/theme/quattro/config.php:57
 msgid "Color scheme"
 msgstr ""
 
@@ -7091,15 +7199,15 @@ msgstr ""
 msgid "Last tweets"
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:55
+#: ../../view/theme/quattro/config.php:56
 msgid "Alignment"
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:55
+#: ../../view/theme/quattro/config.php:56
 msgid "Left"
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:55
+#: ../../view/theme/quattro/config.php:56
 msgid "Center"
 msgstr ""
 
@@ -7377,7 +7485,7 @@ msgid "Sex Addict"
 msgstr ""
 
 #: ../../include/profile_selectors.php:42 ../../include/user.php:278
-#: ../../include/user.php:283
+#: ../../include/user.php:282
 msgid "Friends"
 msgstr ""
 
@@ -7520,7 +7628,7 @@ msgstr[1] ""
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:719 ../../include/conversation.php:212
+#: ../../include/text.php:719 ../../include/conversation.php:210
 msgid "poked"
 msgstr ""
 
@@ -7799,7 +7907,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1659
+#: ../../include/nav.php:49 ../../boot.php:1665
 msgid "Status"
 msgstr ""
 
@@ -8029,12 +8137,12 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/datetime.php:472 ../../include/items.php:1621
+#: ../../include/datetime.php:472 ../../include/items.php:1683
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/datetime.php:473 ../../include/items.php:1622
+#: ../../include/datetime.php:473 ../../include/items.php:1684
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
@@ -8308,15 +8416,15 @@ msgstr ""
 msgid "following"
 msgstr ""
 
-#: ../../include/items.php:3220
+#: ../../include/items.php:3294
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:3220
+#: ../../include/items.php:3294
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:3901
+#: ../../include/items.php:3975
 msgid "Archives"
 msgstr ""
 
@@ -8410,151 +8518,151 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:1033
+#: ../../include/Contact.php:220 ../../include/conversation.php:1089
 msgid "Poke"
 msgstr ""
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:1027
+#: ../../include/Contact.php:221 ../../include/conversation.php:1083
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:1028
+#: ../../include/Contact.php:222 ../../include/conversation.php:1084
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:1029
+#: ../../include/Contact.php:223 ../../include/conversation.php:1085
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:1030
+#: ../../include/conversation.php:1086
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:1031
+#: ../../include/conversation.php:1087
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:1032
+#: ../../include/conversation.php:1088
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/conversation.php:208
+#: ../../include/conversation.php:206
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:292
+#: ../../include/conversation.php:290
 msgid "post/item"
 msgstr ""
 
-#: ../../include/conversation.php:293
+#: ../../include/conversation.php:291
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:933
+#: ../../include/conversation.php:989
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1147
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1147
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1095
+#: ../../include/conversation.php:1151
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:1097
+#: ../../include/conversation.php:1153
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1103
+#: ../../include/conversation.php:1159
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:1106
+#: ../../include/conversation.php:1162
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:1107
+#: ../../include/conversation.php:1163
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:1107
+#: ../../include/conversation.php:1163
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1131 ../../include/conversation.php:1148
+#: ../../include/conversation.php:1187 ../../include/conversation.php:1204
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:1133 ../../include/conversation.php:1150
+#: ../../include/conversation.php:1189 ../../include/conversation.php:1206
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1134 ../../include/conversation.php:1151
+#: ../../include/conversation.php:1190 ../../include/conversation.php:1207
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1135 ../../include/conversation.php:1152
+#: ../../include/conversation.php:1191 ../../include/conversation.php:1208
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1137 ../../include/conversation.php:1154
+#: ../../include/conversation.php:1193 ../../include/conversation.php:1210
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1253
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1199
+#: ../../include/conversation.php:1255
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1201
+#: ../../include/conversation.php:1257
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:1202
+#: ../../include/conversation.php:1258
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:1203
+#: ../../include/conversation.php:1259
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:1204
+#: ../../include/conversation.php:1260
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1205
+#: ../../include/conversation.php:1261
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1207
+#: ../../include/conversation.php:1263
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1209
+#: ../../include/conversation.php:1265
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1216
+#: ../../include/conversation.php:1272
 msgid "permissions"
 msgstr ""
 
@@ -8652,18 +8760,18 @@ msgstr ""
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1662
+#: ../../boot.php:1668
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1669
+#: ../../boot.php:1675
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1686
+#: ../../boot.php:1692
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1693
+#: ../../boot.php:1699
 msgid "Only You Can See This"
 msgstr ""
diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 6564565f7e..ceba97d3f1 100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -76,7 +76,7 @@
 	{{ 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_public }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 	
diff --git a/view/admin_users.tpl b/view/admin_users.tpl
index f67e4a0f74..c9ab0e3f73 100644
--- a/view/admin_users.tpl
+++ b/view/admin_users.tpl
@@ -70,11 +70,20 @@
 						<td class='register_date'>$u.register_date</td>
 						<td class='login_date'>$u.login_date</td>
 						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td class='login_date'>$u.page-flags {{ if $u.is_admin }}($siteadmin){{ 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">
-							<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>
+                                    {{ 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 }}
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index 98173aa306..3de24ca8d2 100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -1,10 +1,9 @@
+		{{ 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 $threaded }}
-			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-			{{ else }}
+		{{ endif }}
 			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-			{{ endif }}
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
 				<input type="hidden" name="parent" value="$parent" />
diff --git a/view/cropbody.tpl b/view/cropbody.tpl
index b484d15bf7..4c0ca3d634 100644
--- a/view/cropbody.tpl
+++ b/view/cropbody.tpl
@@ -42,6 +42,7 @@ $desc
 <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" />
diff --git a/view/de/messages.po b/view/de/messages.po
index 686b36b544..0eeb50ab88 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -13,6 +13,7 @@
 #   <leberwurscht@hoegners.de>, 2012.
 #   <marmor69@web.de>, 2012.
 # Martin Schmitt <mas@scsy.de>, 2012.
+#   <matthias@matthiasmoritz.de>, 2012.
 # Oliver  <post@toktan.org>, 2012.
 #   <tobias.diekershoff@gmx.net>, 2011-2012.
 #   <transifex@zottel.net>, 2011-2012.
@@ -21,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-09-08 10:00-0700\n"
-"PO-Revision-Date: 2012-09-09 16:28+0000\n"
+"POT-Creation-Date: 2012-09-15 10:00-0700\n"
+"PO-Revision-Date: 2012-09-16 08:41+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"
@@ -52,7 +53,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/photos.php:128 ../../mod/photos.php:972
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
-#: ../../mod/notifications.php:66 ../../mod/contacts.php:139
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:146
 #: ../../mod/settings.php:86 ../../mod/settings.php:525
 #: ../../mod/settings.php:530 ../../mod/manage.php:87 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
@@ -61,8 +62,8 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
 #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126
 #: ../../mod/item.php:142 ../../mod/mood.php:114
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:142
-#: ../../mod/profile_photo.php:153 ../../mod/profile_photo.php:166
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
+#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
 #: ../../mod/message.php:38 ../../mod/message.php:168
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
 #: ../../mod/wall_upload.php:64 ../../mod/follow.php:9
@@ -70,9 +71,10 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/profiles.php:413 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
-#: ../../addon/facebook/facebook.php:516
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3834
-#: ../../index.php:315
+#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
+#: ../../addon/fbpost/fbpost.php:165
+#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3908
+#: ../../index.php:317
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
@@ -140,11 +142,11 @@ msgstr "Neues Foto von dieser URL"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
 #: ../../mod/events.php:439 ../../mod/photos.php:1005
-#: ../../mod/photos.php:1076 ../../mod/photos.php:1319
-#: ../../mod/photos.php:1359 ../../mod/photos.php:1400
-#: ../../mod/photos.php:1432 ../../mod/install.php:246
+#: ../../mod/photos.php:1081 ../../mod/photos.php:1338
+#: ../../mod/photos.php:1378 ../../mod/photos.php:1419
+#: ../../mod/photos.php:1451 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:691 ../../mod/contacts.php:341
+#: ../../mod/content.php:691 ../../mod/contacts.php:348
 #: ../../mod/settings.php:543 ../../mod/settings.php:697
 #: ../../mod/settings.php:769 ../../mod/settings.php:976
 #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
@@ -154,15 +156,15 @@ msgstr "Neues Foto von dieser URL"
 #: ../../addon/fromgplus/fromgplus.php:40
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
-#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210
-#: ../../addon/planets/planets.php:158
+#: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76
+#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
+#: ../../addon/page/page.php:210 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
 #: ../../addon/forumlist/forumlist.php:169
-#: ../../addon/impressum/impressum.php:82
+#: ../../addon/impressum/impressum.php:83
 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
@@ -172,7 +174,7 @@ msgstr "Neues Foto von dieser URL"
 #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
 #: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
-#: ../../addon/jappixmini/jappixmini.php:302
+#: ../../addon/jappixmini/jappixmini.php:307
 #: ../../addon/statusnet/statusnet.php:278
 #: ../../addon/statusnet/statusnet.php:292
 #: ../../addon/statusnet/statusnet.php:318
@@ -189,7 +191,7 @@ msgstr "Neues Foto von dieser URL"
 #: ../../view/theme/diabook/theme.php:757
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:591
+#: ../../include/conversation.php:601 ../../object/Item.php:532
 msgid "Submit"
 msgstr "Senden"
 
@@ -202,11 +204,11 @@ msgstr "Hilfe:"
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../../mod/help.php:38 ../../index.php:224
+#: ../../mod/help.php:38 ../../index.php:226
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
-#: ../../mod/help.php:41 ../../index.php:227
+#: ../../mod/help.php:41 ../../index.php:229
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
@@ -249,7 +251,7 @@ msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
 #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1683
+#: ../../include/nav.php:52 ../../boot.php:1689
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -387,19 +389,19 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: ../../mod/photos.php:46 ../../boot.php:1676
+#: ../../mod/photos.php:46 ../../boot.php:1682
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
 #: ../../mod/photos.php:54 ../../mod/photos.php:149 ../../mod/photos.php:986
-#: ../../mod/photos.php:1068 ../../mod/photos.php:1083
-#: ../../mod/photos.php:1511 ../../mod/photos.php:1523
+#: ../../mod/photos.php:1073 ../../mod/photos.php:1088
+#: ../../mod/photos.php:1530 ../../mod/photos.php:1542
 #: ../../addon/communityhome/communityhome.php:110
 #: ../../view/theme/diabook/theme.php:598
 msgid "Contact Photos"
 msgstr "Kontaktbilder"
 
-#: ../../mod/photos.php:61 ../../mod/photos.php:1093 ../../mod/photos.php:1561
+#: ../../mod/photos.php:61 ../../mod/photos.php:1104 ../../mod/photos.php:1580
 msgid "Upload New Photos"
 msgstr "Weitere Fotos hochladen"
 
@@ -411,14 +413,14 @@ msgstr "jeder"
 msgid "Contact information unavailable"
 msgstr "Kontaktinformationen nicht verfügbar"
 
-#: ../../mod/photos.php:149 ../../mod/photos.php:653 ../../mod/photos.php:1068
-#: ../../mod/photos.php:1083 ../../mod/profile_photo.php:60
-#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
-#: ../../mod/profile_photo.php:177 ../../mod/profile_photo.php:261
-#: ../../mod/profile_photo.php:270
+#: ../../mod/photos.php:149 ../../mod/photos.php:653 ../../mod/photos.php:1073
+#: ../../mod/photos.php:1088 ../../mod/profile_photo.php:74
+#: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
+#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
+#: ../../mod/profile_photo.php:305
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318
-#: ../../include/user.php:325 ../../include/user.php:332
+#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:324
+#: ../../include/user.php:331 ../../include/user.php:338
 msgid "Profile Photos"
 msgstr "Profilbilder"
 
@@ -426,11 +428,11 @@ msgstr "Profilbilder"
 msgid "Album not found."
 msgstr "Album nicht gefunden."
 
-#: ../../mod/photos.php:177 ../../mod/photos.php:1077
+#: ../../mod/photos.php:177 ../../mod/photos.php:1082
 msgid "Delete Album"
 msgstr "Album löschen"
 
-#: ../../mod/photos.php:240 ../../mod/photos.php:1320
+#: ../../mod/photos.php:240 ../../mod/photos.php:1339
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
@@ -458,12 +460,12 @@ msgstr "Die Bildgröße übersteigt das Limit von "
 msgid "Image file is empty."
 msgstr "Bilddatei ist leer."
 
-#: ../../mod/photos.php:729 ../../mod/profile_photo.php:126
+#: ../../mod/photos.php:729 ../../mod/profile_photo.php:153
 #: ../../mod/wall_upload.php:110
 msgid "Unable to process image."
 msgstr "Konnte das Bild nicht bearbeiten."
 
-#: ../../mod/photos.php:756 ../../mod/profile_photo.php:266
+#: ../../mod/photos.php:756 ../../mod/profile_photo.php:301
 #: ../../mod/wall_upload.php:136
 msgid "Image upload failed."
 msgstr "Hochladen des Bildes gescheitert."
@@ -496,7 +498,7 @@ msgstr "Du verwendest %1$.2f Mbyte des Foto-Speichers."
 msgid "Upload Photos"
 msgstr "Bilder hochladen"
 
-#: ../../mod/photos.php:1028 ../../mod/photos.php:1072
+#: ../../mod/photos.php:1028 ../../mod/photos.php:1077
 msgid "New album name: "
 msgstr "Name des neuen Albums: "
 
@@ -508,132 +510,143 @@ msgstr "oder existierender Albumname: "
 msgid "Do not show a status post for this upload"
 msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen"
 
-#: ../../mod/photos.php:1032 ../../mod/photos.php:1315
+#: ../../mod/photos.php:1032 ../../mod/photos.php:1334
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: ../../mod/photos.php:1087
+#: ../../mod/photos.php:1092
 msgid "Edit Album"
 msgstr "Album bearbeiten"
 
-#: ../../mod/photos.php:1111 ../../mod/photos.php:1544
+#: ../../mod/photos.php:1098
+msgid "Show Newest First"
+msgstr "Zeige neueste zuerst"
+
+#: ../../mod/photos.php:1100
+msgid "Show Oldest First"
+msgstr "Zeige älteste zuerst"
+
+#: ../../mod/photos.php:1124 ../../mod/photos.php:1563
 msgid "View Photo"
 msgstr "Fotos betrachten"
 
-#: ../../mod/photos.php:1146
+#: ../../mod/photos.php:1159
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein."
 
-#: ../../mod/photos.php:1148
+#: ../../mod/photos.php:1161
 msgid "Photo not available"
 msgstr "Foto nicht verfügbar"
 
-#: ../../mod/photos.php:1198
+#: ../../mod/photos.php:1217
 msgid "View photo"
 msgstr "Fotos ansehen"
 
-#: ../../mod/photos.php:1198
+#: ../../mod/photos.php:1217
 msgid "Edit photo"
 msgstr "Foto bearbeiten"
 
-#: ../../mod/photos.php:1199
+#: ../../mod/photos.php:1218
 msgid "Use as profile photo"
 msgstr "Als Profilbild verwenden"
 
-#: ../../mod/photos.php:1205 ../../mod/content.php:601
-#: ../../include/conversation.php:428
+#: ../../mod/photos.php:1224 ../../mod/content.php:601
+#: ../../include/conversation.php:428 ../../object/Item.php:103
 msgid "Private Message"
 msgstr "Private Nachricht"
 
-#: ../../mod/photos.php:1224
+#: ../../mod/photos.php:1243
 msgid "View Full Size"
 msgstr "Betrachte Originalgröße"
 
-#: ../../mod/photos.php:1292
+#: ../../mod/photos.php:1311
 msgid "Tags: "
 msgstr "Tags: "
 
-#: ../../mod/photos.php:1295
+#: ../../mod/photos.php:1314
 msgid "[Remove any tag]"
 msgstr "[Tag entfernen]"
 
-#: ../../mod/photos.php:1305
+#: ../../mod/photos.php:1324
 msgid "Rotate CW (right)"
 msgstr "Drehen US (rechts)"
 
-#: ../../mod/photos.php:1306
+#: ../../mod/photos.php:1325
 msgid "Rotate CCW (left)"
 msgstr "Drehen EUS (links)"
 
-#: ../../mod/photos.php:1308
+#: ../../mod/photos.php:1327
 msgid "New album name"
 msgstr "Name des neuen Albums"
 
-#: ../../mod/photos.php:1311
+#: ../../mod/photos.php:1330
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: ../../mod/photos.php:1313
+#: ../../mod/photos.php:1332
 msgid "Add a Tag"
 msgstr "Tag hinzufügen"
 
-#: ../../mod/photos.php:1317
+#: ../../mod/photos.php:1336
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1337 ../../mod/content.php:665
-#: ../../include/conversation.php:565
+#: ../../mod/photos.php:1356 ../../mod/content.php:665
+#: ../../include/conversation.php:575 ../../object/Item.php:185
 msgid "I like this (toggle)"
 msgstr "Ich mag das (toggle)"
 
-#: ../../mod/photos.php:1338 ../../mod/content.php:666
-#: ../../include/conversation.php:566
+#: ../../mod/photos.php:1357 ../../mod/content.php:666
+#: ../../include/conversation.php:576 ../../object/Item.php:186
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (toggle)"
 
-#: ../../mod/photos.php:1339 ../../include/conversation.php:1195
+#: ../../mod/photos.php:1358 ../../include/conversation.php:1244
 msgid "Share"
 msgstr "Teilen"
 
-#: ../../mod/photos.php:1340 ../../mod/editpost.php:112
+#: ../../mod/photos.php:1359 ../../mod/editpost.php:112
 #: ../../mod/content.php:482 ../../mod/content.php:843
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:659
-#: ../../include/conversation.php:891 ../../include/conversation.php:1214
+#: ../../mod/message.php:481 ../../include/conversation.php:671
+#: ../../include/conversation.php:921 ../../include/conversation.php:1263
+#: ../../object/Item.php:237
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: ../../mod/photos.php:1356 ../../mod/photos.php:1397
-#: ../../mod/photos.php:1429 ../../mod/content.php:688
-#: ../../include/conversation.php:588
+#: ../../mod/photos.php:1375 ../../mod/photos.php:1416
+#: ../../mod/photos.php:1448 ../../mod/content.php:688
+#: ../../include/conversation.php:598 ../../object/Item.php:529
 msgid "This is you"
 msgstr "Das bist du"
 
-#: ../../mod/photos.php:1358 ../../mod/photos.php:1399
-#: ../../mod/photos.php:1431 ../../mod/content.php:690
-#: ../../include/conversation.php:590 ../../boot.php:574
+#: ../../mod/photos.php:1377 ../../mod/photos.php:1418
+#: ../../mod/photos.php:1450 ../../mod/content.php:690
+#: ../../include/conversation.php:600 ../../boot.php:574
+#: ../../object/Item.php:531
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../mod/photos.php:1360 ../../mod/editpost.php:133
-#: ../../mod/content.php:700 ../../include/conversation.php:600
-#: ../../include/conversation.php:1232
+#: ../../mod/photos.php:1379 ../../mod/editpost.php:133
+#: ../../mod/content.php:700 ../../include/conversation.php:610
+#: ../../include/conversation.php:1281 ../../object/Item.php:541
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../mod/photos.php:1460 ../../mod/content.php:439
+#: ../../mod/photos.php:1479 ../../mod/content.php:439
 #: ../../mod/content.php:721 ../../mod/settings.php:606
 #: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:694
-#: ../../include/conversation.php:440 ../../include/conversation.php:847
+#: ../../include/conversation.php:440 ../../include/conversation.php:874
+#: ../../object/Item.php:116
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../../mod/photos.php:1550
+#: ../../mod/photos.php:1569
 msgid "View Album"
 msgstr "Album betrachten"
 
-#: ../../mod/photos.php:1559
+#: ../../mod/photos.php:1578
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
@@ -691,28 +704,29 @@ msgstr "Beitrag nicht gefunden"
 msgid "Edit post"
 msgstr "Beitrag bearbeiten"
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:1181
+#: ../../mod/editpost.php:88 ../../include/conversation.php:1230
 msgid "Post to Email"
 msgstr "An E-Mail senden"
 
 #: ../../mod/editpost.php:103 ../../mod/content.php:708
 #: ../../mod/settings.php:605 ../../include/conversation.php:433
+#: ../../object/Item.php:107
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:1196
+#: ../../include/conversation.php:1245
 msgid "Upload photo"
 msgstr "Foto hochladen"
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1198
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1247
 msgid "Attach file"
 msgstr "Datei anhängen"
 
 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:1200
+#: ../../include/conversation.php:1249
 msgid "Insert web link"
 msgstr "einen Link einfügen"
 
@@ -728,35 +742,35 @@ msgstr "Vorbis [.ogg] Video einfügen"
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Vorbis [.ogg] Audio einfügen"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1206
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1255
 msgid "Set your location"
 msgstr "Deinen Standort festlegen"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1208
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1257
 msgid "Clear browser location"
 msgstr "Browser-Standort leeren"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1215
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1264
 msgid "Permission settings"
 msgstr "Berechtigungseinstellungen"
 
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1224
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1273
 msgid "CC: email addresses"
 msgstr "Cc:-E-Mail-Addressen"
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1225
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1274
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1211
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1260
 msgid "Set title"
 msgstr "Titel setzen"
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:1213
+#: ../../mod/editpost.php:127 ../../include/conversation.php:1262
 msgid "Categories (comma-separated list)"
 msgstr "Kategorien (kommasepariert)"
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:1227
+#: ../../mod/editpost.php:128 ../../include/conversation.php:1276
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Z.B.: bob@example.com, mary@example.com"
 
@@ -841,7 +855,7 @@ msgstr "Ungültige Profil-URL."
 msgid "Disallowed profile URL."
 msgstr "Nicht erlaubte Profil-URL."
 
-#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:116
+#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:123
 msgid "Failed to update contact record."
 msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen."
 
@@ -877,7 +891,7 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s."
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3213
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3287
 msgid "[Name Withheld]"
 msgstr "[Name unterdrückt]"
 
@@ -1299,28 +1313,32 @@ msgid "Group: "
 msgstr "Gruppe: "
 
 #: ../../mod/content.php:438 ../../mod/content.php:720
-#: ../../include/conversation.php:439 ../../include/conversation.php:846
+#: ../../include/conversation.php:439 ../../include/conversation.php:873
+#: ../../object/Item.php:115
 msgid "Select"
 msgstr "Auswählen"
 
 #: ../../mod/content.php:455 ../../mod/content.php:813
-#: ../../mod/content.php:814 ../../include/conversation.php:627
-#: ../../include/conversation.php:628 ../../include/conversation.php:863
+#: ../../mod/content.php:814 ../../include/conversation.php:639
+#: ../../include/conversation.php:640 ../../include/conversation.php:890
+#: ../../object/Item.php:206 ../../object/Item.php:207
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Das Profil von %s auf %s betrachten."
 
 #: ../../mod/content.php:465 ../../mod/content.php:825
-#: ../../include/conversation.php:641 ../../include/conversation.php:874
+#: ../../include/conversation.php:653 ../../include/conversation.php:904
+#: ../../object/Item.php:219
 #, php-format
 msgid "%s from %s"
 msgstr "%s von %s"
 
-#: ../../mod/content.php:480 ../../include/conversation.php:889
+#: ../../mod/content.php:480 ../../include/conversation.php:919
 msgid "View in context"
 msgstr "Im Zusammenhang betrachten"
 
-#: ../../mod/content.php:586 ../../include/conversation.php:668
+#: ../../mod/content.php:586 ../../include/conversation.php:680
+#: ../../object/Item.php:256
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -1329,92 +1347,113 @@ msgstr[1] "%d Kommentare"
 
 #: ../../mod/content.php:587 ../../addon/page/page.php:76
 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../include/conversation.php:669
-#: ../../boot.php:575
+#: ../../include/contact_widgets.php:195 ../../include/conversation.php:681
+#: ../../boot.php:575 ../../object/Item.php:257
 msgid "show more"
 msgstr "mehr anzeigen"
 
-#: ../../mod/content.php:665 ../../include/conversation.php:565
+#: ../../mod/content.php:665 ../../include/conversation.php:575
+#: ../../object/Item.php:185
 msgid "like"
 msgstr "mag ich"
 
-#: ../../mod/content.php:666 ../../include/conversation.php:566
+#: ../../mod/content.php:666 ../../include/conversation.php:576
+#: ../../object/Item.php:186
 msgid "dislike"
 msgstr "mag ich nicht"
 
-#: ../../mod/content.php:668 ../../include/conversation.php:568
+#: ../../mod/content.php:668 ../../include/conversation.php:578
+#: ../../object/Item.php:188
 msgid "Share this"
 msgstr "Weitersagen"
 
-#: ../../mod/content.php:668 ../../include/conversation.php:568
+#: ../../mod/content.php:668 ../../include/conversation.php:578
+#: ../../object/Item.php:188
 msgid "share"
 msgstr "Teilen"
 
-#: ../../mod/content.php:692 ../../include/conversation.php:592
+#: ../../mod/content.php:692 ../../include/conversation.php:602
+#: ../../object/Item.php:533
 msgid "Bold"
 msgstr "Fett"
 
-#: ../../mod/content.php:693 ../../include/conversation.php:593
+#: ../../mod/content.php:693 ../../include/conversation.php:603
+#: ../../object/Item.php:534
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../mod/content.php:694 ../../include/conversation.php:594
+#: ../../mod/content.php:694 ../../include/conversation.php:604
+#: ../../object/Item.php:535
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../../mod/content.php:695 ../../include/conversation.php:595
+#: ../../mod/content.php:695 ../../include/conversation.php:605
+#: ../../object/Item.php:536
 msgid "Quote"
 msgstr "Zitat"
 
-#: ../../mod/content.php:696 ../../include/conversation.php:596
+#: ../../mod/content.php:696 ../../include/conversation.php:606
+#: ../../object/Item.php:537
 msgid "Code"
 msgstr "Code"
 
-#: ../../mod/content.php:697 ../../include/conversation.php:597
+#: ../../mod/content.php:697 ../../include/conversation.php:607
+#: ../../object/Item.php:538
 msgid "Image"
 msgstr "Bild"
 
-#: ../../mod/content.php:698 ../../include/conversation.php:598
+#: ../../mod/content.php:698 ../../include/conversation.php:608
+#: ../../object/Item.php:539
 msgid "Link"
 msgstr "Verweis"
 
-#: ../../mod/content.php:699 ../../include/conversation.php:599
+#: ../../mod/content.php:699 ../../include/conversation.php:609
+#: ../../object/Item.php:540
 msgid "Video"
 msgstr "Video"
 
-#: ../../mod/content.php:733 ../../include/conversation.php:529
+#: ../../mod/content.php:733 ../../include/conversation.php:539
+#: ../../object/Item.php:169
 msgid "add star"
 msgstr "markieren"
 
-#: ../../mod/content.php:734 ../../include/conversation.php:530
+#: ../../mod/content.php:734 ../../include/conversation.php:540
+#: ../../object/Item.php:170
 msgid "remove star"
 msgstr "Markierung entfernen"
 
-#: ../../mod/content.php:735 ../../include/conversation.php:531
+#: ../../mod/content.php:735 ../../include/conversation.php:541
+#: ../../object/Item.php:171
 msgid "toggle star status"
 msgstr "Markierung umschalten"
 
-#: ../../mod/content.php:738 ../../include/conversation.php:534
+#: ../../mod/content.php:738 ../../include/conversation.php:544
+#: ../../object/Item.php:174
 msgid "starred"
 msgstr "markiert"
 
-#: ../../mod/content.php:739 ../../include/conversation.php:535
+#: ../../mod/content.php:739 ../../include/conversation.php:545
+#: ../../object/Item.php:175
 msgid "add tag"
 msgstr "Tag hinzufügen"
 
 #: ../../mod/content.php:743 ../../include/conversation.php:443
+#: ../../object/Item.php:119
 msgid "save to folder"
 msgstr "In Ordner speichern"
 
-#: ../../mod/content.php:815 ../../include/conversation.php:629
+#: ../../mod/content.php:815 ../../include/conversation.php:641
+#: ../../object/Item.php:208
 msgid "to"
 msgstr "zu"
 
-#: ../../mod/content.php:816 ../../include/conversation.php:630
+#: ../../mod/content.php:816 ../../include/conversation.php:642
+#: ../../object/Item.php:209
 msgid "Wall-to-Wall"
 msgstr "Wall-to-Wall"
 
-#: ../../mod/content.php:817 ../../include/conversation.php:631
+#: ../../mod/content.php:817 ../../include/conversation.php:643
+#: ../../object/Item.php:210
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
@@ -1433,8 +1472,8 @@ msgid "Discard"
 msgstr "Verwerfen"
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:160
-#: ../../mod/notifications.php:206 ../../mod/contacts.php:314
-#: ../../mod/contacts.php:368
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:321
+#: ../../mod/contacts.php:375
 msgid "Ignore"
 msgstr "Ignorieren"
 
@@ -1486,7 +1525,7 @@ msgid "suggested by %s"
 msgstr "vorgeschlagen von %s"
 
 #: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/contacts.php:374
+#: ../../mod/contacts.php:381
 msgid "Hide this contact from others"
 msgstr "Verberge diesen Kontakt vor anderen"
 
@@ -1608,307 +1647,307 @@ msgstr "Keine weiteren Pinnwand-Benachrichtigungen"
 msgid "Home Notifications"
 msgstr "Pinnwand Benachrichtigungen"
 
-#: ../../mod/contacts.php:77 ../../mod/contacts.php:157
+#: ../../mod/contacts.php:84 ../../mod/contacts.php:164
 msgid "Could not access contact record."
 msgstr "Konnte nicht auf die Kontaktdaten zugreifen."
 
-#: ../../mod/contacts.php:91
+#: ../../mod/contacts.php:98
 msgid "Could not locate selected profile."
 msgstr "Konnte das ausgewählte Profil nicht finden."
 
-#: ../../mod/contacts.php:114
+#: ../../mod/contacts.php:121
 msgid "Contact updated."
 msgstr "Kontakt aktualisiert."
 
-#: ../../mod/contacts.php:179
+#: ../../mod/contacts.php:186
 msgid "Contact has been blocked"
 msgstr "Kontakt wurde blockiert"
 
-#: ../../mod/contacts.php:179
+#: ../../mod/contacts.php:186
 msgid "Contact has been unblocked"
 msgstr "Kontakt wurde wieder freigegeben"
 
-#: ../../mod/contacts.php:193
+#: ../../mod/contacts.php:200
 msgid "Contact has been ignored"
 msgstr "Kontakt wurde ignoriert"
 
-#: ../../mod/contacts.php:193
+#: ../../mod/contacts.php:200
 msgid "Contact has been unignored"
 msgstr "Kontakt wird nicht mehr ignoriert"
 
-#: ../../mod/contacts.php:209
+#: ../../mod/contacts.php:216
 msgid "Contact has been archived"
 msgstr "Kontakt wurde archiviert"
 
-#: ../../mod/contacts.php:209
+#: ../../mod/contacts.php:216
 msgid "Contact has been unarchived"
 msgstr "Kontakt wurde aus dem Archiv geholt"
 
-#: ../../mod/contacts.php:222
+#: ../../mod/contacts.php:229
 msgid "Contact has been removed."
 msgstr "Kontakt wurde entfernt."
 
-#: ../../mod/contacts.php:256
+#: ../../mod/contacts.php:263
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "Du hast mit %s eine beidseitige Freundschaft"
 
-#: ../../mod/contacts.php:260
+#: ../../mod/contacts.php:267
 #, php-format
 msgid "You are sharing with %s"
 msgstr "Du teilst mit %s"
 
-#: ../../mod/contacts.php:265
+#: ../../mod/contacts.php:272
 #, php-format
 msgid "%s is sharing with you"
 msgstr "%s teilt mit Dir"
 
-#: ../../mod/contacts.php:282
+#: ../../mod/contacts.php:289
 msgid "Private communications are not available for this contact."
 msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar."
 
-#: ../../mod/contacts.php:285
+#: ../../mod/contacts.php:292
 msgid "Never"
 msgstr "Niemals"
 
-#: ../../mod/contacts.php:289
+#: ../../mod/contacts.php:296
 msgid "(Update was successful)"
 msgstr "(Aktualisierung war erfolgreich)"
 
-#: ../../mod/contacts.php:289
+#: ../../mod/contacts.php:296
 msgid "(Update was not successful)"
 msgstr "(Aktualisierung war nicht erfolgreich)"
 
-#: ../../mod/contacts.php:291
+#: ../../mod/contacts.php:298
 msgid "Suggest friends"
 msgstr "Kontakte vorschlagen"
 
-#: ../../mod/contacts.php:295
+#: ../../mod/contacts.php:302
 #, php-format
 msgid "Network type: %s"
 msgstr "Netzwerktyp: %s"
 
-#: ../../mod/contacts.php:298 ../../include/contact_widgets.php:190
+#: ../../mod/contacts.php:305 ../../include/contact_widgets.php:190
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] "%d gemeinsamer Kontakt"
 msgstr[1] "%d gemeinsame Kontakte"
 
-#: ../../mod/contacts.php:303
+#: ../../mod/contacts.php:310
 msgid "View all contacts"
 msgstr "Alle Kontakte anzeigen"
 
-#: ../../mod/contacts.php:308 ../../mod/contacts.php:367
+#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
 #: ../../mod/admin.php:696
 msgid "Unblock"
 msgstr "Entsperren"
 
-#: ../../mod/contacts.php:308 ../../mod/contacts.php:367
+#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
 #: ../../mod/admin.php:695
 msgid "Block"
 msgstr "Sperren"
 
-#: ../../mod/contacts.php:311
+#: ../../mod/contacts.php:318
 msgid "Toggle Blocked status"
 msgstr "Geblockt-Status ein-/ausschalten"
 
-#: ../../mod/contacts.php:314 ../../mod/contacts.php:368
+#: ../../mod/contacts.php:321 ../../mod/contacts.php:375
 msgid "Unignore"
 msgstr "Ignorieren aufheben"
 
-#: ../../mod/contacts.php:317
+#: ../../mod/contacts.php:324
 msgid "Toggle Ignored status"
 msgstr "Ignoriert-Status ein-/ausschalten"
 
-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:328
 msgid "Unarchive"
 msgstr "Aus Archiv zurückholen"
 
-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:328
 msgid "Archive"
 msgstr "Archivieren"
 
-#: ../../mod/contacts.php:324
+#: ../../mod/contacts.php:331
 msgid "Toggle Archive status"
 msgstr "Archiviert-Status ein-/ausschalten"
 
-#: ../../mod/contacts.php:327
+#: ../../mod/contacts.php:334
 msgid "Repair"
 msgstr "Reparieren"
 
-#: ../../mod/contacts.php:330
+#: ../../mod/contacts.php:337
 msgid "Advanced Contact Settings"
 msgstr "Fortgeschrittene Kontakteinstellungen"
 
-#: ../../mod/contacts.php:336
+#: ../../mod/contacts.php:343
 msgid "Communications lost with this contact!"
 msgstr "Verbindungen mit diesem Kontakt verloren!"
 
-#: ../../mod/contacts.php:339
+#: ../../mod/contacts.php:346
 msgid "Contact Editor"
 msgstr "Kontakt Editor"
 
-#: ../../mod/contacts.php:342
+#: ../../mod/contacts.php:349
 msgid "Profile Visibility"
 msgstr "Profil-Sichtbarkeit"
 
-#: ../../mod/contacts.php:343
+#: ../../mod/contacts.php:350
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft."
 
-#: ../../mod/contacts.php:344
+#: ../../mod/contacts.php:351
 msgid "Contact Information / Notes"
 msgstr "Kontakt Informationen / Notizen"
 
-#: ../../mod/contacts.php:345
+#: ../../mod/contacts.php:352
 msgid "Edit contact notes"
 msgstr "Notizen zum Kontakt bearbeiten"
 
-#: ../../mod/contacts.php:350 ../../mod/contacts.php:542
+#: ../../mod/contacts.php:357 ../../mod/contacts.php:549
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Besuche %ss Profil [%s]"
 
-#: ../../mod/contacts.php:351
+#: ../../mod/contacts.php:358
 msgid "Block/Unblock contact"
 msgstr "Kontakt blockieren/freischalten"
 
-#: ../../mod/contacts.php:352
+#: ../../mod/contacts.php:359
 msgid "Ignore contact"
 msgstr "Ignoriere den Kontakt"
 
-#: ../../mod/contacts.php:353
+#: ../../mod/contacts.php:360
 msgid "Repair URL settings"
 msgstr "URL Einstellungen reparieren"
 
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:361
 msgid "View conversations"
 msgstr "Unterhaltungen anzeigen"
 
-#: ../../mod/contacts.php:356
+#: ../../mod/contacts.php:363
 msgid "Delete contact"
 msgstr "Lösche den Kontakt"
 
-#: ../../mod/contacts.php:360
+#: ../../mod/contacts.php:367
 msgid "Last update:"
 msgstr "letzte Aktualisierung:"
 
-#: ../../mod/contacts.php:362
+#: ../../mod/contacts.php:369
 msgid "Update public posts"
 msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/contacts.php:364 ../../mod/admin.php:1167
+#: ../../mod/contacts.php:371 ../../mod/admin.php:1167
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
-#: ../../mod/contacts.php:371
+#: ../../mod/contacts.php:378
 msgid "Currently blocked"
 msgstr "Derzeit geblockt"
 
-#: ../../mod/contacts.php:372
+#: ../../mod/contacts.php:379
 msgid "Currently ignored"
 msgstr "Derzeit ignoriert"
 
-#: ../../mod/contacts.php:373
+#: ../../mod/contacts.php:380
 msgid "Currently archived"
 msgstr "Momentan archiviert"
 
-#: ../../mod/contacts.php:374
+#: ../../mod/contacts.php:381
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"
 
-#: ../../mod/contacts.php:427
+#: ../../mod/contacts.php:434
 msgid "Suggestions"
 msgstr "Kontaktvorschläge"
 
-#: ../../mod/contacts.php:430
+#: ../../mod/contacts.php:437
 msgid "Suggest potential friends"
 msgstr "Freunde vorschlagen"
 
-#: ../../mod/contacts.php:433 ../../mod/group.php:191
+#: ../../mod/contacts.php:440 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr "Alle Kontakte"
 
-#: ../../mod/contacts.php:436
+#: ../../mod/contacts.php:443
 msgid "Show all contacts"
 msgstr "Alle Kontakte anzeigen"
 
-#: ../../mod/contacts.php:439
+#: ../../mod/contacts.php:446
 msgid "Unblocked"
 msgstr "Ungeblockt"
 
-#: ../../mod/contacts.php:442
+#: ../../mod/contacts.php:449
 msgid "Only show unblocked contacts"
 msgstr "Nur nicht-blockierte Kontakte anzeigen"
 
-#: ../../mod/contacts.php:446
+#: ../../mod/contacts.php:453
 msgid "Blocked"
 msgstr "Geblockt"
 
-#: ../../mod/contacts.php:449
+#: ../../mod/contacts.php:456
 msgid "Only show blocked contacts"
 msgstr "Nur blockierte Kontakte anzeigen"
 
-#: ../../mod/contacts.php:453
+#: ../../mod/contacts.php:460
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: ../../mod/contacts.php:456
+#: ../../mod/contacts.php:463
 msgid "Only show ignored contacts"
 msgstr "Nur ignorierte Kontakte anzeigen"
 
-#: ../../mod/contacts.php:460
+#: ../../mod/contacts.php:467
 msgid "Archived"
 msgstr "Archiviert"
 
-#: ../../mod/contacts.php:463
+#: ../../mod/contacts.php:470
 msgid "Only show archived contacts"
 msgstr "Nur archivierte Kontakte anzeigen"
 
-#: ../../mod/contacts.php:467
+#: ../../mod/contacts.php:474
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: ../../mod/contacts.php:470
+#: ../../mod/contacts.php:477
 msgid "Only show hidden contacts"
 msgstr "Nur verborgene Kontakte anzeigen"
 
-#: ../../mod/contacts.php:518
+#: ../../mod/contacts.php:525
 msgid "Mutual Friendship"
 msgstr "Beidseitige Freundschaft"
 
-#: ../../mod/contacts.php:522
+#: ../../mod/contacts.php:529
 msgid "is a fan of yours"
 msgstr "ist ein Fan von dir"
 
-#: ../../mod/contacts.php:526
+#: ../../mod/contacts.php:533
 msgid "you are a fan of"
 msgstr "du bist Fan von"
 
-#: ../../mod/contacts.php:543 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:550 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "Kontakt bearbeiten"
 
-#: ../../mod/contacts.php:564 ../../view/theme/diabook/theme.php:129
+#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:129
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: ../../mod/contacts.php:568
+#: ../../mod/contacts.php:575
 msgid "Search your contacts"
 msgstr "Suche in deinen Kontakten"
 
-#: ../../mod/contacts.php:569 ../../mod/directory.php:59
+#: ../../mod/contacts.php:576 ../../mod/directory.php:59
 msgid "Finding: "
 msgstr "Funde: "
 
-#: ../../mod/contacts.php:570 ../../mod/directory.php:61
+#: ../../mod/contacts.php:577 ../../mod/directory.php:61
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr "Finde"
@@ -1930,9 +1969,9 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 #: ../../mod/register.php:90 ../../mod/register.php:144
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
-#: ../../addon/facebook/facebook.php:1200
+#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3222
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3296
 #: ../../boot.php:788
 msgid "Administrator"
 msgstr "Administrator"
@@ -2080,7 +2119,7 @@ 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:471 ../../addon/facebook/facebook.php:495
-#: ../../addon/impressum/impressum.php:77
+#: ../../addon/fbpost/fbpost.php:144 ../../addon/impressum/impressum.php:78
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
 #: ../../addon/twitter/twitter.php:389
@@ -2347,7 +2386,7 @@ msgstr "Dürfen dir Unbekannte private Nachrichten schicken?"
 msgid "Profile is <strong>not published</strong>."
 msgstr "Profil ist <strong>nicht veröffentlicht</strong>."
 
-#: ../../mod/settings.php:944 ../../mod/profile_photo.php:214
+#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr "oder"
 
@@ -2621,13 +2660,14 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1690
+#: ../../mod/notes.php:44 ../../boot.php:1696
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:770
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:263
+#: ../../addon/fbpost/fbpost.php:267
 #: ../../addon/dav/friendica/layout.fnk.php:441
 #: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681
 msgid "Save"
@@ -2664,7 +2704,7 @@ msgstr "Kein Empfänger."
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:1132 ../../include/conversation.php:1149
+#: ../../include/conversation.php:1181 ../../include/conversation.php:1198
 msgid "Please enter a link URL:"
 msgstr "Bitte gib die URL des Links ein:"
 
@@ -2747,11 +2787,11 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1666
+#: ../../boot.php:1672
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:211
+#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:244
 msgid "Upload Profile Photo"
 msgstr "Profilbild hochladen"
 
@@ -2789,7 +2829,7 @@ msgid "Connecting"
 msgstr "Verbindungen knüpfen"
 
 #: ../../mod/newmember.php:49 ../../mod/newmember.php:51
-#: ../../addon/facebook/facebook.php:728
+#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr "Facebook"
@@ -2916,7 +2956,7 @@ msgstr "Gruppe nicht gefunden."
 msgid "Group name changed."
 msgstr "Gruppenname geändert."
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:314
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:316
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
@@ -3090,7 +3130,7 @@ msgstr "%1$s mag %2$ss %3$s nicht"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
 #: ../../mod/admin.php:731 ../../mod/admin.php:930 ../../mod/display.php:29
-#: ../../mod/display.php:145 ../../include/items.php:3700
+#: ../../mod/display.php:145 ../../include/items.php:3774
 msgid "Item not found."
 msgstr "Beitrag nicht gefunden."
 
@@ -3099,7 +3139,7 @@ msgid "Access denied."
 msgstr "Zugriff verweigert."
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1673
+#: ../../include/nav.php:51 ../../boot.php:1679
 msgid "Photos"
 msgstr "Bilder"
 
@@ -3174,61 +3214,65 @@ msgstr "Stimmung"
 msgid "Set your current mood and tell your friends"
 msgstr "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden"
 
-#: ../../mod/profile_photo.php:30
+#: ../../mod/profile_photo.php:44
 msgid "Image uploaded but image cropping failed."
 msgstr "Bilder hochgeladen, aber das Zuschneiden ist fehlgeschlagen."
 
-#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70
-#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:273
+#: ../../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."
 
-#: ../../mod/profile_photo.php:91
+#: ../../mod/profile_photo.php:118
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."
 
-#: ../../mod/profile_photo.php:101
+#: ../../mod/profile_photo.php:128
 msgid "Unable to process image"
 msgstr "Bild konnte nicht verarbeitet werden"
 
-#: ../../mod/profile_photo.php:117 ../../mod/wall_upload.php:88
+#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr "Bildgröße überschreitet das Limit von %d"
 
-#: ../../mod/profile_photo.php:210
+#: ../../mod/profile_photo.php:242
 msgid "Upload File:"
 msgstr "Datei hochladen:"
 
-#: ../../mod/profile_photo.php:212
+#: ../../mod/profile_photo.php:243
+msgid "Select a profile:"
+msgstr "Profil auswählen"
+
+#: ../../mod/profile_photo.php:245
 #: ../../addon/dav/friendica/layout.fnk.php:152
 msgid "Upload"
 msgstr "Hochladen"
 
-#: ../../mod/profile_photo.php:214
+#: ../../mod/profile_photo.php:248
 msgid "skip this step"
 msgstr "diesen Schritt überspringen"
 
-#: ../../mod/profile_photo.php:214
+#: ../../mod/profile_photo.php:248
 msgid "select a photo from your photo albums"
 msgstr "wähle ein Foto von deinen Fotoalben"
 
-#: ../../mod/profile_photo.php:227
+#: ../../mod/profile_photo.php:262
 msgid "Crop Image"
 msgstr "Bild zurechtschneiden"
 
-#: ../../mod/profile_photo.php:228
+#: ../../mod/profile_photo.php:263
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."
 
-#: ../../mod/profile_photo.php:230
+#: ../../mod/profile_photo.php:265
 msgid "Done Editing"
 msgstr "Bearbeitung abgeschlossen"
 
-#: ../../mod/profile_photo.php:264
+#: ../../mod/profile_photo.php:299
 msgid "Image uploaded successfully."
 msgstr "Bild erfolgreich auf den Server geladen."
 
@@ -3610,14 +3654,14 @@ msgid "Allow infinite level threading for items on this site."
 msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite."
 
 #: ../../mod/admin.php:470
-msgid "No default permissions for new users"
-msgstr "Keine Standard-Zugriffsrechte für Beiträge neuer Nutzer"
+msgid "Private posts by default for new users"
+msgstr "Private Beiträge als Standard für neue Nutzer"
 
 #: ../../mod/admin.php:470
 msgid ""
-"New users will have no private permissions set for their posts by default, "
-"making their posts public until they change it."
-msgstr "Neue Benutzer werden keine Voreinstellungen für die Zugriffrechte haben, so dass ihre Beiträge öffentlich sind, bis sie es ändern."
+"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:472
 msgid "Block multiple registrations"
@@ -4382,8 +4426,8 @@ msgstr "sichtbar für jeden"
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:1136
-#: ../../include/conversation.php:1153
+#: ../../mod/filer.php:29 ../../include/conversation.php:1185
+#: ../../include/conversation.php:1202
 msgid "Save to Folder:"
 msgstr "In diesen Ordner verschieben:"
 
@@ -4724,7 +4768,7 @@ msgstr "Facebook deaktiviert"
 msgid "Updating contacts"
 msgstr "Aktualisiere Kontakte"
 
-#: ../../addon/facebook/facebook.php:551
+#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:192
 msgid "Facebook API key is missing."
 msgstr "Facebook-API-Schlüssel nicht gefunden"
 
@@ -4740,13 +4784,13 @@ msgstr "Facebook-Connector für dieses Konto installieren."
 msgid "Remove Facebook connector"
 msgstr "Facebook-Connector entfernen"
 
-#: ../../addon/facebook/facebook.php:576
+#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:217
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn du dein Facebook-Passwort geändert hast.]"
 
-#: ../../addon/facebook/facebook.php:583
+#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:224
 msgid "Post to Facebook by default"
 msgstr "Veröffentliche standardmäßig bei Facebook"
 
@@ -4812,11 +4856,11 @@ msgstr "Probleme mit Facebook Echtzeit-Updates"
 msgid "Facebook Connector Settings"
 msgstr "Facebook-Verbindungseinstellungen"
 
-#: ../../addon/facebook/facebook.php:744
+#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:255
 msgid "Facebook API Key"
 msgstr "Facebook API Schlüssel"
 
-#: ../../addon/facebook/facebook.php:754
+#: ../../addon/facebook/facebook.php:754 ../../addon/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 "
@@ -4839,11 +4883,11 @@ msgid ""
 "going on."
 msgstr "Die Richtigkeit des API Schlüssels konnte nicht gefunden werden. Irgendwas stimmt nicht."
 
-#: ../../addon/facebook/facebook.php:766
+#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:264
 msgid "App-ID / API-Key"
 msgstr "App-ID / API-Key"
 
-#: ../../addon/facebook/facebook.php:767
+#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:265
 msgid "Application secret"
 msgstr "Anwendungs-Geheimnis"
 
@@ -4878,38 +4922,38 @@ msgstr "Echtzeit-Updates nicht aktiviert."
 msgid "Activate Real-Time Updates"
 msgstr "Echtzeit-Updates aktivieren"
 
-#: ../../addon/facebook/facebook.php:799
+#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282
 #: ../../addon/dav/friendica/layout.fnk.php:361
 msgid "The new values have been saved."
 msgstr "Die neuen Einstellungen wurden gespeichert."
 
-#: ../../addon/facebook/facebook.php:823
+#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:301
 msgid "Post to Facebook"
 msgstr "Bei Facebook veröffentlichen"
 
-#: ../../addon/facebook/facebook.php:921
+#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:399
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen."
 
-#: ../../addon/facebook/facebook.php:1149
+#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:610
 msgid "View on Friendica"
 msgstr "In Friendica betrachten"
 
-#: ../../addon/facebook/facebook.php:1182
+#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:643
 msgid "Facebook post failed. Queued for retry."
 msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut."
 
-#: ../../addon/facebook/facebook.php:1222
+#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:683
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich."
 
-#: ../../addon/facebook/facebook.php:1223
+#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:684
 msgid "Facebook connection became invalid"
 msgstr "Facebook Anmeldedaten sind ungültig geworden"
 
-#: ../../addon/facebook/facebook.php:1224
+#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:685
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -4961,6 +5005,26 @@ msgstr "Größe des Caches"
 msgid "Delete the whole cache"
 msgstr "Cache leeren"
 
+#: ../../addon/fbpost/fbpost.php:172
+msgid "Facebook Post disabled"
+msgstr "Nach Facebook senden deaktiviert"
+
+#: ../../addon/fbpost/fbpost.php:199
+msgid "Facebook Post"
+msgstr "Facebook Relai"
+
+#: ../../addon/fbpost/fbpost.php:205
+msgid "Install Facebook Post connector for this account."
+msgstr "Facebook-Connector für dieses Konto installieren."
+
+#: ../../addon/fbpost/fbpost.php:212
+msgid "Remove Facebook Post connector"
+msgstr "Facebook-Connector entfernen"
+
+#: ../../addon/fbpost/fbpost.php:240
+msgid "Facebook Post Settings"
+msgstr "Facebook-Beitragseinstellungen"
+
 #: ../../addon/widgets/widget_like.php:58
 #, php-format
 msgid "%d person likes this"
@@ -5020,11 +5084,11 @@ msgid "did something obscenely biological to"
 msgstr "machte etwas obszönes Körperliches mit"
 
 #: ../../addon/morepokes/morepokes.php:22
-msgid "point out the new poke feature to"
-msgstr "die neue Anstups-Funktion zeigen"
+msgid "point out the poke feature to"
+msgstr "zeigte die neue Anstups-Funktion"
 
 #: ../../addon/morepokes/morepokes.php:22
-msgid "pointed out the new poke feature to"
+msgid "pointed out the poke feature to"
 msgstr "zeigte die neue Anstups-Funktion"
 
 #: ../../addon/morepokes/morepokes.php:23
@@ -5036,113 +5100,109 @@ msgid "declared undying love for"
 msgstr "verkündete unsterbliche Liebe für"
 
 #: ../../addon/morepokes/morepokes.php:24
-msgid "set fire to"
-msgstr "entflammt"
-
-#: ../../addon/morepokes/morepokes.php:25
 msgid "patent"
 msgstr "patentieren"
 
-#: ../../addon/morepokes/morepokes.php:25
+#: ../../addon/morepokes/morepokes.php:24
 msgid "patented"
 msgstr "patentierte"
 
-#: ../../addon/morepokes/morepokes.php:26
+#: ../../addon/morepokes/morepokes.php:25
 msgid "stroke beard"
 msgstr "sich den Bart kratzen"
 
-#: ../../addon/morepokes/morepokes.php:26
+#: ../../addon/morepokes/morepokes.php:25
 msgid "stroked their beard at"
 msgstr "kratzte sich den Bart in Richtung"
 
-#: ../../addon/morepokes/morepokes.php:27
+#: ../../addon/morepokes/morepokes.php:26
 msgid ""
 "bemoan the declining standards of modern secondary and tertiary education to"
 msgstr "sich über die sinkenden Standards der Schul- und Hochschulbildung beklagen"
 
-#: ../../addon/morepokes/morepokes.php:27
+#: ../../addon/morepokes/morepokes.php:26
 msgid ""
 "bemoans the declining standards of modern secondary and tertiary education "
 "to"
 msgstr "beklagte sich über die sinkenden Standards der Schul- und Hochschulbildung bei"
 
-#: ../../addon/morepokes/morepokes.php:28
+#: ../../addon/morepokes/morepokes.php:27
 msgid "hug"
 msgstr "umarmen"
 
-#: ../../addon/morepokes/morepokes.php:28
+#: ../../addon/morepokes/morepokes.php:27
 msgid "hugged"
 msgstr "umarmte"
 
-#: ../../addon/morepokes/morepokes.php:29
+#: ../../addon/morepokes/morepokes.php:28
 msgid "kiss"
 msgstr "küssen"
 
-#: ../../addon/morepokes/morepokes.php:29
+#: ../../addon/morepokes/morepokes.php:28
 msgid "kissed"
 msgstr "küsste"
 
-#: ../../addon/morepokes/morepokes.php:30
+#: ../../addon/morepokes/morepokes.php:29
 msgid "raise eyebrows at"
 msgstr "Augenbrauen hochziehen"
 
-#: ../../addon/morepokes/morepokes.php:30
+#: ../../addon/morepokes/morepokes.php:29
 msgid "raised their eyebrows at"
 msgstr "zog die Augenbrauen hoch in Richtung"
 
-#: ../../addon/morepokes/morepokes.php:31
+#: ../../addon/morepokes/morepokes.php:30
 msgid "insult"
 msgstr "beleidigen"
 
-#: ../../addon/morepokes/morepokes.php:31
+#: ../../addon/morepokes/morepokes.php:30
 msgid "insulted"
 msgstr "beleidigte"
 
-#: ../../addon/morepokes/morepokes.php:32
+#: ../../addon/morepokes/morepokes.php:31
 msgid "praise"
 msgstr "preisen"
 
-#: ../../addon/morepokes/morepokes.php:32
+#: ../../addon/morepokes/morepokes.php:31
 msgid "praised"
 msgstr "pries"
 
-#: ../../addon/morepokes/morepokes.php:33
+#: ../../addon/morepokes/morepokes.php:32
 msgid "be dubious of"
 msgstr "ungewiss sein"
 
-#: ../../addon/morepokes/morepokes.php:33
+#: ../../addon/morepokes/morepokes.php:32
 msgid "was dubious of"
 msgstr "war ungewiss über"
 
-#: ../../addon/morepokes/morepokes.php:34
+#: ../../addon/morepokes/morepokes.php:33
 msgid "eat"
 msgstr "essen"
 
-#: ../../addon/morepokes/morepokes.php:34
+#: ../../addon/morepokes/morepokes.php:33
 msgid "ate"
 msgstr "aß"
 
-#: ../../addon/morepokes/morepokes.php:35
+#: ../../addon/morepokes/morepokes.php:34
 msgid "giggle and fawn at"
 msgstr "kichern und einschleimen"
 
-#: ../../addon/morepokes/morepokes.php:35
+#: ../../addon/morepokes/morepokes.php:34
 msgid "giggled and fawned at"
 msgstr "kicherte und schleimte sich ein bei"
 
-#: ../../addon/morepokes/morepokes.php:36
+#: ../../addon/morepokes/morepokes.php:35
 msgid "doubt"
 msgstr "bezweifeln"
 
-#: ../../addon/morepokes/morepokes.php:36
+#: ../../addon/morepokes/morepokes.php:35
 msgid "doubted"
 msgstr "bezweifelte"
 
-#: ../../addon/morepokes/morepokes.php:37
+#: ../../addon/morepokes/morepokes.php:36
 msgid "glare"
 msgstr "zornig anstarren"
 
-#: ../../addon/morepokes/morepokes.php:37
+#: ../../addon/morepokes/morepokes.php:36
 msgid "glared at"
 msgstr "starrte zornig auf"
 
@@ -6103,68 +6163,68 @@ msgstr "Zufällige Zusammenstellung der Foren-Liste"
 msgid "Show forumlists/forums on profile forumlist"
 msgstr "Liste der Foren deren Abonnement du bist in deinem Profil anzeigen:"
 
-#: ../../addon/impressum/impressum.php:36
+#: ../../addon/impressum/impressum.php:37
 msgid "Impressum"
 msgstr "Impressum"
 
-#: ../../addon/impressum/impressum.php:49
-#: ../../addon/impressum/impressum.php:51
-#: ../../addon/impressum/impressum.php:83
+#: ../../addon/impressum/impressum.php:50
+#: ../../addon/impressum/impressum.php:52
+#: ../../addon/impressum/impressum.php:84
 msgid "Site Owner"
 msgstr "Betreiber der Seite"
 
-#: ../../addon/impressum/impressum.php:49
-#: ../../addon/impressum/impressum.php:87
+#: ../../addon/impressum/impressum.php:50
+#: ../../addon/impressum/impressum.php:88
 msgid "Email Address"
 msgstr "Email Adresse"
 
-#: ../../addon/impressum/impressum.php:54
-#: ../../addon/impressum/impressum.php:85
+#: ../../addon/impressum/impressum.php:55
+#: ../../addon/impressum/impressum.php:86
 msgid "Postal Address"
 msgstr "Postalische Anschrift"
 
-#: ../../addon/impressum/impressum.php:60
+#: ../../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 "Das Impressums-Plugin muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert."
 
-#: ../../addon/impressum/impressum.php:83
+#: ../../addon/impressum/impressum.php:84
 msgid "The page operators name."
 msgstr "Name des Serveradministrators"
 
-#: ../../addon/impressum/impressum.php:84
+#: ../../addon/impressum/impressum.php:85
 msgid "Site Owners Profile"
 msgstr "Profil des Seitenbetreibers"
 
-#: ../../addon/impressum/impressum.php:84
+#: ../../addon/impressum/impressum.php:85
 msgid "Profile address of the operator."
 msgstr "Profil-Adresse des Serveradministrators"
 
-#: ../../addon/impressum/impressum.php:85
+#: ../../addon/impressum/impressum.php:86
 msgid "How to contact the operator via snail mail. You can use BBCode here."
 msgstr "Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden."
 
-#: ../../addon/impressum/impressum.php:86
+#: ../../addon/impressum/impressum.php:87
 msgid "Notes"
 msgstr "Hinweise"
 
-#: ../../addon/impressum/impressum.php:86
+#: ../../addon/impressum/impressum.php:87
 msgid ""
 "Additional notes that are displayed beneath the contact information. You can"
 " use BBCode here."
 msgstr "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden."
 
-#: ../../addon/impressum/impressum.php:87
+#: ../../addon/impressum/impressum.php:88
 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr "Wie man den Betreiber per Email erreicht. (Adresse wird verschleiert dargestellt)"
 
-#: ../../addon/impressum/impressum.php:88
+#: ../../addon/impressum/impressum.php:89
 msgid "Footer note"
 msgstr "Fußnote"
 
-#: ../../addon/impressum/impressum.php:88
+#: ../../addon/impressum/impressum.php:89
 msgid "Text for the footer. You can use BBCode here."
 msgstr "Text für die Fußzeile. Du kannst BBCode verwenden."
 
@@ -6469,6 +6529,59 @@ msgstr "InsaneJournal Passwort"
 msgid "Post to InsaneJournal by default"
 msgstr "Standardmäßig auf InsaneJournal posten."
 
+#: ../../addon/jappixmini/jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr "Jappix Mini Addon Einstellungen"
+
+#: ../../addon/jappixmini/jappixmini.php:268
+msgid "Activate addon"
+msgstr "Addon aktivieren"
+
+#: ../../addon/jappixmini/jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr "Füge das Jappix Mini Chat Widget <em>nicht</em> zum Webinterface hinzu"
+
+#: ../../addon/jappixmini/jappixmini.php:274
+msgid "Jabber username"
+msgstr "Jabber Nutzername"
+
+#: ../../addon/jappixmini/jappixmini.php:277
+msgid "Jabber server"
+msgstr "Jabber Server"
+
+#: ../../addon/jappixmini/jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr "Jabber BOSH Host"
+
+#: ../../addon/jappixmini/jappixmini.php:285
+msgid "Jabber password"
+msgstr "Japper Passwort"
+
+#: ../../addon/jappixmini/jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Verschlüssele das Jabber Passwort mit dem Friendica Passwort (empfohlen)"
+
+#: ../../addon/jappixmini/jappixmini.php:293
+msgid "Friendica password"
+msgstr "Friendica Passwort"
+
+#: ../../addon/jappixmini/jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Kontaktanfragen von Friendica Kontakten automatisch akzeptieren"
+
+#: ../../addon/jappixmini/jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr "Automatisch Friendica Kontakten bei Jabber folgen"
+
+#: ../../addon/jappixmini/jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Lösche die interne Liste der Jabber Adressen der Kontakte"
+
+#: ../../addon/jappixmini/jappixmini.php:308
+msgid "Add contact"
+msgstr "Kontakt hinzufügen"
+
 #: ../../addon/viewsrc/viewsrc.php:37
 msgid "View Source"
 msgstr "Quelle ansehen"
@@ -7381,7 +7494,7 @@ msgid "Sex Addict"
 msgstr "Sexbesessen"
 
 #: ../../include/profile_selectors.php:42 ../../include/user.php:278
-#: ../../include/user.php:283
+#: ../../include/user.php:282
 msgid "Friends"
 msgstr "Freunde"
 
@@ -7803,7 +7916,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:49 ../../boot.php:1659
+#: ../../include/nav.php:49 ../../boot.php:1665
 msgid "Status"
 msgstr "Status"
 
@@ -8033,12 +8146,12 @@ msgstr "Sekunden"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s her"
 
-#: ../../include/datetime.php:472 ../../include/items.php:1621
+#: ../../include/datetime.php:472 ../../include/items.php:1683
 #, php-format
 msgid "%s's birthday"
 msgstr "%ss Geburtstag"
 
-#: ../../include/datetime.php:473 ../../include/items.php:1622
+#: ../../include/datetime.php:473 ../../include/items.php:1684
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Herzlichen Glückwunsch %s"
@@ -8313,15 +8426,15 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen."
 msgid "following"
 msgstr "folgen"
 
-#: ../../include/items.php:3220
+#: ../../include/items.php:3294
 msgid "A new person is sharing with you at "
 msgstr "Eine neue Person teilt mit dir auf "
 
-#: ../../include/items.php:3220
+#: ../../include/items.php:3294
 msgid "You have a new follower at "
 msgstr "Du hast einen neuen Kontakt auf "
 
-#: ../../include/items.php:3901
+#: ../../include/items.php:3975
 msgid "Archives"
 msgstr "Archiv"
 
@@ -8415,34 +8528,34 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das
 msgid "stopped following"
 msgstr "wird nicht mehr gefolgt"
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:1033
+#: ../../include/Contact.php:220 ../../include/conversation.php:1082
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:1027
+#: ../../include/Contact.php:221 ../../include/conversation.php:1076
 msgid "View Status"
 msgstr "Pinnwand anschauen"
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:1028
+#: ../../include/Contact.php:222 ../../include/conversation.php:1077
 msgid "View Profile"
 msgstr "Profil anschauen"
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:1029
+#: ../../include/Contact.php:223 ../../include/conversation.php:1078
 msgid "View Photos"
 msgstr "Bilder anschauen"
 
 #: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:1030
+#: ../../include/conversation.php:1079
 msgid "Network Posts"
 msgstr "Netzwerkbeiträge"
 
 #: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:1031
+#: ../../include/conversation.php:1080
 msgid "Edit Contact"
 msgstr "Kontakt bearbeiten"
 
 #: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:1032
+#: ../../include/conversation.php:1081
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
@@ -8460,106 +8573,106 @@ 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:933
+#: ../../include/conversation.php:982
 msgid "Delete Selected Items"
 msgstr "Lösche die markierten Beiträge"
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1140
 #, php-format
 msgid "%s likes this."
 msgstr "%s mag das."
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1140
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s mag das nicht."
 
-#: ../../include/conversation.php:1095
+#: ../../include/conversation.php:1144
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "<span  %1$s>%2$d Leute</span> mögen das."
 
-#: ../../include/conversation.php:1097
+#: ../../include/conversation.php:1146
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr "<span  %1$s>%2$d Leute</span> mögen das nicht."
 
-#: ../../include/conversation.php:1103
+#: ../../include/conversation.php:1152
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:1106
+#: ../../include/conversation.php:1155
 #, php-format
 msgid ", and %d other people"
 msgstr " und %d andere"
 
-#: ../../include/conversation.php:1107
+#: ../../include/conversation.php:1156
 #, php-format
 msgid "%s like this."
 msgstr "%s mögen das."
 
-#: ../../include/conversation.php:1107
+#: ../../include/conversation.php:1156
 #, php-format
 msgid "%s don't like this."
 msgstr "%s mögen das nicht."
 
-#: ../../include/conversation.php:1131 ../../include/conversation.php:1148
+#: ../../include/conversation.php:1180 ../../include/conversation.php:1197
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Für <strong>jedermann</strong> sichtbar"
 
-#: ../../include/conversation.php:1133 ../../include/conversation.php:1150
+#: ../../include/conversation.php:1182 ../../include/conversation.php:1199
 msgid "Please enter a video link/URL:"
 msgstr "Bitte Link/URL zum Video einfügen:"
 
-#: ../../include/conversation.php:1134 ../../include/conversation.php:1151
+#: ../../include/conversation.php:1183 ../../include/conversation.php:1200
 msgid "Please enter an audio link/URL:"
 msgstr "Bitte Link/URL zum Audio einfügen:"
 
-#: ../../include/conversation.php:1135 ../../include/conversation.php:1152
+#: ../../include/conversation.php:1184 ../../include/conversation.php:1201
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:1137 ../../include/conversation.php:1154
+#: ../../include/conversation.php:1186 ../../include/conversation.php:1203
 msgid "Where are you right now?"
 msgstr "Wo hältst du dich jetzt gerade auf?"
 
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1246
 msgid "upload photo"
 msgstr "Bild hochladen"
 
-#: ../../include/conversation.php:1199
+#: ../../include/conversation.php:1248
 msgid "attach file"
 msgstr "Datei anhängen"
 
-#: ../../include/conversation.php:1201
+#: ../../include/conversation.php:1250
 msgid "web link"
 msgstr "Weblink"
 
-#: ../../include/conversation.php:1202
+#: ../../include/conversation.php:1251
 msgid "Insert video link"
 msgstr "Video-Adresse einfügen"
 
-#: ../../include/conversation.php:1203
+#: ../../include/conversation.php:1252
 msgid "video link"
 msgstr "Video-Link"
 
-#: ../../include/conversation.php:1204
+#: ../../include/conversation.php:1253
 msgid "Insert audio link"
 msgstr "Audio-Adresse einfügen"
 
-#: ../../include/conversation.php:1205
+#: ../../include/conversation.php:1254
 msgid "audio link"
 msgstr "Audio-Link"
 
-#: ../../include/conversation.php:1207
+#: ../../include/conversation.php:1256
 msgid "set location"
 msgstr "Ort setzen"
 
-#: ../../include/conversation.php:1209
+#: ../../include/conversation.php:1258
 msgid "clear location"
 msgstr "Ort löschen"
 
-#: ../../include/conversation.php:1216
+#: ../../include/conversation.php:1265
 msgid "permissions"
 msgstr "Zugriffsrechte"
 
@@ -8657,18 +8770,18 @@ msgstr "Veranstaltungserinnerungen"
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1662
+#: ../../boot.php:1668
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:1669
+#: ../../boot.php:1675
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1686
+#: ../../boot.php:1692
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1693
+#: ../../boot.php:1699
 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 24c4c066da..330b26ce2b 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -92,6 +92,8 @@ $a->strings["or existing album name: "] = "oder existierender Albumname: ";
 $a->strings["Do not show a status post for this upload"] = "Keine Status-Mitteilung für diesen Beitrag anzeigen";
 $a->strings["Permissions"] = "Berechtigungen";
 $a->strings["Edit Album"] = "Album bearbeiten";
+$a->strings["Show Newest First"] = "Zeige neueste zuerst";
+$a->strings["Show Oldest First"] = "Zeige älteste zuerst";
 $a->strings["View Photo"] = "Fotos betrachten";
 $a->strings["Permission denied. Access to this item may be restricted."] = "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein.";
 $a->strings["Photo not available"] = "Foto nicht verfügbar";
@@ -704,6 +706,7 @@ $a->strings["Shift-reload the page or clear browser cache if the new photo does
 $a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden";
 $a->strings["Image exceeds size limit of %d"] = "Bildgröße überschreitet das Limit von %d";
 $a->strings["Upload File:"] = "Datei hochladen:";
+$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";
@@ -800,8 +803,8 @@ $a->strings["Global directory update URL"] = "URL für Updates beim weltweiten V
 $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["No default permissions for new users"] = "Keine Standard-Zugriffsrechte für Beiträge neuer Nutzer";
-$a->strings["New users will have no private permissions set for their posts by default, making their posts public until they change it."] = "Neue Benutzer werden keine Voreinstellungen für die Zugriffrechte haben, so dass ihre Beiträge öffentlich sind, bis sie es ändern.";
+$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["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";
@@ -1113,6 +1116,11 @@ $a->strings["Cache Statistics"] = "Cache Statistik";
 $a->strings["Number of items"] = "Anzahl der Einträge";
 $a->strings["Size of the cache"] = "Größe des Caches";
 $a->strings["Delete the whole cache"] = "Cache leeren";
+$a->strings["Facebook Post disabled"] = "Nach Facebook senden deaktiviert";
+$a->strings["Facebook Post"] = "Facebook Relai";
+$a->strings["Install Facebook Post connector for this account."] = "Facebook-Connector für dieses Konto installieren.";
+$a->strings["Remove Facebook Post connector"] = "Facebook-Connector entfernen";
+$a->strings["Facebook Post Settings"] = "Facebook-Beitragseinstellungen";
 $a->strings["%d person likes this"] = array(
 	0 => "%d Person mag das",
 	1 => "%d Leute mögen das",
@@ -1132,11 +1140,10 @@ $a->strings["shag"] = "poppen";
 $a->strings["shagged"] = "poppte";
 $a->strings["do something obscenely biological to"] = "mit ihm/ihr etwas obszönes Körperliches machen";
 $a->strings["did something obscenely biological to"] = "machte etwas obszönes Körperliches mit";
-$a->strings["point out the new poke feature to"] = "die neue Anstups-Funktion zeigen";
-$a->strings["pointed out the new poke feature to"] = "zeigte die neue Anstups-Funktion";
+$a->strings["point out the poke feature to"] = "zeigte die neue Anstups-Funktion";
+$a->strings["pointed out the poke feature to"] = "zeigte die neue Anstups-Funktion";
 $a->strings["declare undying love for"] = "unterbliche Liebe verkünden";
 $a->strings["declared undying love for"] = "verkündete unsterbliche Liebe für";
-$a->strings["set fire to"] = "entflammt";
 $a->strings["patent"] = "patentieren";
 $a->strings["patented"] = "patentierte";
 $a->strings["stroke beard"] = "sich den Bart kratzen";
@@ -1463,6 +1470,19 @@ $a->strings["Enable InsaneJournal Post Plugin"] = "InsaneJournal Plugin aktivier
 $a->strings["InsaneJournal username"] = "InsaneJournal Benutzername";
 $a->strings["InsaneJournal password"] = "InsaneJournal Passwort";
 $a->strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten.";
+$a->strings["Jappix Mini addon settings"] = "Jappix Mini Addon Einstellungen";
+$a->strings["Activate addon"] = "Addon aktivieren";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "Füge das Jappix Mini Chat Widget <em>nicht</em> zum Webinterface hinzu";
+$a->strings["Jabber username"] = "Jabber Nutzername";
+$a->strings["Jabber server"] = "Jabber Server";
+$a->strings["Jabber BOSH host"] = "Jabber BOSH Host";
+$a->strings["Jabber password"] = "Japper Passwort";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Verschlüssele das Jabber Passwort mit dem Friendica Passwort (empfohlen)";
+$a->strings["Friendica password"] = "Friendica Passwort";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Kontaktanfragen von Friendica Kontakten automatisch akzeptieren";
+$a->strings["Subscribe to Friendica contacts automatically"] = "Automatisch Friendica Kontakten bei Jabber folgen";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "Lösche die interne Liste der Jabber Adressen der Kontakte";
+$a->strings["Add contact"] = "Kontakt hinzufügen";
 $a->strings["View Source"] = "Quelle ansehen";
 $a->strings["Post to StatusNet"] = "Bei StatusNet veröffentlichen";
 $a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Bitte kontaktiere den Administrator des Servers.<br />Die angegebene API-URL ist nicht gültig.";
diff --git a/view/es/messages.po b/view/es/messages.po
index 54de3ee64b..b9953cc3f8 100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
@@ -1,1459 +1,1217 @@
 # FRIENDICA Distributed Social Network
-# Copyright (C) 2010, 2011 Mike Macgirvin
-# This file is distributed under the same license as the Friendika package.
+# Copyright (C) 2010, 2011 the Friendica Project
+# This file is distributed under the same license as the Friendica package.
 # 
 # Translators:
 #   <blackhalo@member.fsf.org>, 2011.
+# Carlos Solís <csolisr@gmail.com>, 2012.
 # David Martín Miranda, 2011.
-#   <juanma@kde.org.ar>, 2011.
+#   <juanma@kde.org.ar>, 2011, 2012.
+# Manuel Pérez <blackhalo@member.fsf.org>, 2011-2012.
 # Manuel Pérez Monís, 2011.
 # Mike Macgirvin, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2011-11-15 17:20+0100\n"
-"PO-Revision-Date: 2011-11-22 21:19+0000\n"
-"Last-Translator: blackhalo <blackhalo@member.fsf.org>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/friendica/team/es/)\n"
+"POT-Creation-Date: 2012-09-16 10:00-0700\n"
+"PO-Revision-Date: 2012-09-16 22:25+0000\n"
+"Last-Translator: Carlos Solís <csolisr@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../index.php:213 ../../mod/help.php:38
-msgid "Not Found"
-msgstr "No se ha encontrado"
+#: ../../mod/oexchange.php:25
+msgid "Post successful."
+msgstr "¡Publicado!"
 
-#: ../../index.php:216 ../../mod/help.php:41
-msgid "Page not found."
-msgstr "Página no encontrada."
-
-#: ../../index.php:279 ../../mod/profperm.php:19 ../../mod/group.php:67
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#: ../../index.php:280 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
-#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:137 ../../mod/profile_photo.php:148
-#: ../../mod/profile_photo.php:159 ../../mod/wall_attach.php:43
-#: ../../mod/suggest.php:28 ../../mod/regmod.php:111 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:229 ../../mod/settings.php:41
-#: ../../mod/settings.php:46 ../../mod/settings.php:376
-#: ../../mod/photos.php:123 ../../mod/photos.php:858 ../../mod/display.php:111
-#: ../../mod/editpost.php:10 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/contacts.php:115 ../../mod/register.php:27
-#: ../../mod/allfriends.php:9 ../../mod/install.php:96 ../../mod/network.php:6
-#: ../../mod/events.php:109 ../../mod/notifications.php:62
-#: ../../mod/crepair.php:113 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/notes.php:20 ../../mod/fsuggest.php:78 ../../mod/item.php:113
-#: ../../mod/message.php:9 ../../mod/message.php:42
-#: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:21
-#: ../../mod/group.php:19 ../../mod/attach.php:33 ../../mod/common.php:9
-#: ../../addon/facebook/facebook.php:331 ../../include/items.php:2874
-msgid "Permission denied."
-msgstr "Permiso denegado."
-
-#: ../../boot.php:419
-msgid "Delete this item?"
-msgstr "¿Eliminar este elemento?"
-
-#: ../../boot.php:420 ../../mod/photos.php:1202 ../../mod/photos.php:1241
-#: ../../mod/photos.php:1272 ../../include/conversation.php:433
-msgid "Comment"
-msgstr "Comentar"
-
-#: ../../boot.php:662
-msgid "Create a New Account"
-msgstr "Crear una nueva cuenta"
-
-#: ../../boot.php:663 ../../mod/register.php:530 ../../include/nav.php:77
-msgid "Register"
-msgstr "Registrarse"
-
-#: ../../boot.php:679 ../../include/nav.php:44
-msgid "Logout"
-msgstr "Salir"
-
-#: ../../boot.php:680 ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62
-msgid "Login"
-msgstr "Acceder"
-
-#: ../../boot.php:682
-msgid "Nickname or Email address: "
-msgstr "Apodo o dirección de email: "
-
-#: ../../boot.php:683
-msgid "Password: "
-msgstr "Contraseña: "
-
-#: ../../boot.php:686
-msgid "OpenID: "
-msgstr "OpenID:"
-
-#: ../../boot.php:692
-msgid "Forgot your password?"
-msgstr "¿Olvidó la contraseña?"
-
-#: ../../boot.php:693 ../../mod/lostpass.php:82
-msgid "Password Reset"
-msgstr "Restablecer la contraseña"
-
-#: ../../boot.php:815 ../../mod/profile.php:10 ../../mod/hcard.php:10
-msgid "No profile"
-msgstr "Nigún perfil"
-
-#: ../../boot.php:839
-msgid "Edit profile"
-msgstr "Editar perfil"
-
-#: ../../boot.php:890 ../../include/contact_widgets.php:9
-msgid "Connect"
-msgstr "Conectar"
-
-#: ../../boot.php:900 ../../include/nav.php:129
-msgid "Profiles"
-msgstr "Perfiles"
-
-#: ../../boot.php:900 ../../include/nav.php:129
-msgid "Manage/edit profiles"
-msgstr "Administrar/editar perfiles"
-
-#: ../../boot.php:906 ../../mod/profiles.php:462
-msgid "Change profile photo"
-msgstr "Cambiar foto del perfil"
-
-#: ../../boot.php:907 ../../mod/profiles.php:463
-msgid "Create New Profile"
-msgstr "Crear nuevo perfil"
-
-#: ../../boot.php:917 ../../mod/profiles.php:473
-msgid "Profile Image"
-msgstr "Imagen del Perfil"
-
-#: ../../boot.php:920 ../../mod/profiles.php:475
-msgid "visible to everybody"
-msgstr "Visible para todos"
-
-#: ../../boot.php:921 ../../mod/profiles.php:476
-msgid "Edit visibility"
-msgstr "Editar visibilidad"
-
-#: ../../boot.php:940 ../../mod/events.php:325 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:249
-msgid "Location:"
-msgstr "Localización:"
-
-#: ../../boot.php:942 ../../include/profile_advanced.php:17
-msgid "Gender:"
-msgstr "Género:"
-
-#: ../../boot.php:945 ../../include/profile_advanced.php:37
-msgid "Status:"
-msgstr "Estado:"
-
-#: ../../boot.php:947 ../../include/profile_advanced.php:45
-msgid "Homepage:"
-msgstr "Página de inicio:"
-
-#: ../../boot.php:1006 ../../boot.php:1068
-msgid "g A l F d"
-msgstr "g A l F d"
-
-#: ../../boot.php:1007 ../../boot.php:1069
-msgid "F d"
-msgstr "F d"
-
-#: ../../boot.php:1030
-msgid "Birthday Reminders"
-msgstr "Recordatorios de cumpleaños"
-
-#: ../../boot.php:1031
-msgid "Birthdays this week:"
-msgstr "Cumpleaños esta semana:"
-
-#: ../../boot.php:1047 ../../boot.php:1111
-msgid "[today]"
-msgstr "[hoy]"
-
-#: ../../boot.php:1092
-msgid "Event Reminders"
-msgstr "Recordatorios de eventos"
-
-#: ../../boot.php:1093
-msgid "Events this week:"
-msgstr "Eventos de esta semana:"
-
-#: ../../boot.php:1105
-msgid "[No description]"
-msgstr "[Sin descripción]"
-
-#: ../../boot.php:1282 ../../include/nav.php:47
-msgid "Status"
-msgstr "Estado"
-
-#: ../../boot.php:1287 ../../mod/profperm.php:103
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
-#: ../../include/nav.php:48
-msgid "Profile"
-msgstr "Perfil"
-
-#: ../../boot.php:1292 ../../include/nav.php:49
-msgid "Photos"
-msgstr "Fotografías"
-
-#: ../../boot.php:1300 ../../mod/events.php:117 ../../include/nav.php:50
-msgid "Events"
-msgstr "Eventos"
-
-#: ../../boot.php:1305 ../../mod/notes.php:44
-msgid "Personal Notes"
-msgstr "Notas personales"
-
-#: ../../mod/manage.php:37
-#, php-format
-msgid "Welcome back %s"
-msgstr "Bienvenido de nuevo %s"
-
-#: ../../mod/manage.php:87
-msgid "Manage Identities and/or Pages"
-msgstr "Administrar identidades y/o páginas"
-
-#: ../../mod/manage.php:90
-msgid ""
-"(Toggle between different identities or community/group pages which share "
-"your account details.)"
-msgstr ""
-"(Alternar entre las diferentes identidades o las páginas de "
-"comunidades/grupos que comparten los datos de su cuenta)."
-
-#: ../../mod/manage.php:92
-msgid "Select an identity to manage: "
-msgstr "Selecciona una identidad a gestionar:"
-
-#: ../../mod/manage.php:106 ../../mod/profiles.php:375
-#: ../../mod/settings.php:420 ../../mod/settings.php:559
-#: ../../mod/settings.php:707 ../../mod/photos.php:886
-#: ../../mod/photos.php:944 ../../mod/photos.php:1163
-#: ../../mod/photos.php:1203 ../../mod/photos.php:1242
-#: ../../mod/photos.php:1273 ../../mod/localtime.php:45
-#: ../../mod/invite.php:106 ../../mod/contacts.php:306
-#: ../../mod/install.php:137 ../../mod/events.php:330
-#: ../../mod/crepair.php:162 ../../mod/fsuggest.php:107
-#: ../../mod/admin.php:296 ../../mod/admin.php:461 ../../mod/admin.php:587
-#: ../../mod/admin.php:652 ../../mod/group.php:84 ../../mod/group.php:167
-#: ../../addon/tumblr/tumblr.php:89 ../../addon/twitter/twitter.php:179
-#: ../../addon/twitter/twitter.php:202 ../../addon/twitter/twitter.php:299
-#: ../../addon/statusnet/statusnet.php:282
-#: ../../addon/statusnet/statusnet.php:296
-#: ../../addon/statusnet/statusnet.php:322
-#: ../../addon/statusnet/statusnet.php:329
-#: ../../addon/statusnet/statusnet.php:351
-#: ../../addon/statusnet/statusnet.php:486 ../../addon/oembed/oembed.php:41
-#: ../../addon/uhremotestorage/uhremotestorage.php:58
-#: ../../addon/impressum/impressum.php:69
-#: ../../addon/facebook/facebook.php:404 ../../addon/nsfw/nsfw.php:53
-#: ../../addon/randplace/randplace.php:178 ../../addon/piwik/piwik.php:81
-#: ../../addon/wppost/wppost.php:101 ../../include/conversation.php:434
-msgid "Submit"
-msgstr "Envía"
-
-#: ../../mod/dirfind.php:23
-msgid "People Search"
-msgstr "Buscar personas"
-
-#: ../../mod/dirfind.php:57 ../../mod/match.php:57
-msgid "No matches"
-msgstr "Sin conincidencias"
-
-#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:113
-#, php-format
-msgid "Image exceeds size limit of %d"
-msgstr "El tamaño de la imagen supera el límite de %d"
-
-#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:122
-#: ../../mod/photos.php:647
-msgid "Unable to process image."
-msgstr "Imposible procesar la imagen."
-
-#: ../../mod/wall_upload.php:81 ../../mod/wall_upload.php:90
-#: ../../mod/wall_upload.php:97 ../../mod/item.php:299
-#: ../../include/message.php:82
-msgid "Wall Photos"
-msgstr "Foto del Muro"
-
-#: ../../mod/wall_upload.php:84 ../../mod/profile_photo.php:251
-#: ../../mod/photos.php:667
-msgid "Image upload failed."
-msgstr "Error al subir la imagen."
-
-#: ../../mod/profile.php:105 ../../mod/display.php:66
-msgid "Access to this profile has been restricted."
-msgstr "EL acceso a este perfil ha sido restringido."
-
-#: ../../mod/profile.php:127
-msgid "Tips for New Members"
-msgstr "Consejos para nuevos miembros"
-
-#: ../../mod/follow.php:20 ../../mod/dfrn_request.php:340
-msgid "Disallowed profile URL."
-msgstr "Dirección de perfil no permitida."
-
-#: ../../mod/follow.php:39
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr ""
-"Este sitio no está configurado para permitir la comunicación con otras "
-"redes."
-
-#: ../../mod/follow.php:40 ../../mod/follow.php:50
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr ""
-"No se ha descubierto protocolos de comunicación o fuentes compatibles."
-
-#: ../../mod/follow.php:48
-msgid "The profile address specified does not provide adequate information."
-msgstr ""
-"La dirección del perfil especificado no proporciona información adecuada."
-
-#: ../../mod/follow.php:52
-msgid "An author or name was not found."
-msgstr "No se ha encontrado un autor o nombre"
-
-#: ../../mod/follow.php:54
-msgid "No browser URL could be matched to this address."
-msgstr "Ninguna dirección URL concuerda con la suministrada."
-
-#: ../../mod/follow.php:61
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr ""
-"La dirección del perfil especificada pertenece a una red que ha sido "
-"deshabilitada en este sitio."
-
-#: ../../mod/follow.php:66
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr ""
-"Perfil limitado. Esta persona no podrá recibir notificaciones "
-"directas/personales de ti."
-
-#: ../../mod/follow.php:133
-msgid "Unable to retrieve contact information."
-msgstr "No ha sido posible recibir la información del contacto."
-
-#: ../../mod/follow.php:179
-msgid "following"
-msgstr "siguiendo"
-
-#: ../../mod/profile_photo.php:28
-msgid "Image uploaded but image cropping failed."
-msgstr "Imagen recibida, pero ha fallado al recortarla."
-
-#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
-#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170
-#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255
-#: ../../mod/photos.php:144 ../../mod/photos.php:591 ../../mod/photos.php:936
-#: ../../mod/photos.php:951 ../../mod/register.php:318
-#: ../../mod/register.php:325 ../../mod/register.php:332
-#: ../../addon/communityhome/communityhome.php:111
-msgid "Profile Photos"
-msgstr "Foto del perfil"
-
-#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr "Ha fallado la reducción de las dimensiones de la imagen [%s]."
-
-#: ../../mod/profile_photo.php:89
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr ""
-"Recargue la página o limpie la caché del navegador si la nueva foto no "
-"aparece inmediatamente."
-
-#: ../../mod/profile_photo.php:99
-msgid "Unable to process image"
-msgstr "Imposible procesar la imagen"
-
-#: ../../mod/profile_photo.php:203
-msgid "Upload File:"
-msgstr "Subir archivo:"
-
-#: ../../mod/profile_photo.php:204
-msgid "Upload Profile Photo"
-msgstr "Subir foto del Perfil"
-
-#: ../../mod/profile_photo.php:205
-msgid "Upload"
-msgstr "Subir"
-
-#: ../../mod/profile_photo.php:206 ../../mod/settings.php:686
-msgid "or"
-msgstr "o"
-
-#: ../../mod/profile_photo.php:206
-msgid "skip this step"
-msgstr "salta este paso"
-
-#: ../../mod/profile_photo.php:206
-msgid "select a photo from your photo albums"
-msgstr "elige una foto de tus álbumes"
-
-#: ../../mod/profile_photo.php:219
-msgid "Crop Image"
-msgstr "Recortar imagen"
-
-#: ../../mod/profile_photo.php:220
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Por favor, ajusta el recorte de la imagen para optimizarla."
-
-#: ../../mod/profile_photo.php:221
-msgid "Done Editing"
-msgstr "Editado"
-
-#: ../../mod/profile_photo.php:249
-msgid "Image uploaded successfully."
-msgstr "Imagen subida con éxito."
-
-#: ../../mod/home.php:23 ../../addon/communityhome/communityhome.php:179
-#, php-format
-msgid "Welcome to %s"
-msgstr "Bienvenido a %s"
-
-#: ../../mod/update_community.php:18 ../../mod/update_network.php:22
-#: ../../mod/update_profile.php:41 ../../mod/update_notes.php:41
+#: ../../mod/update_notes.php:41 ../../mod/update_community.php:18
+#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
 msgid "[Embedded content - reload page to view]"
 msgstr "[Contenido incrustado - recarga la página para verlo]"
 
-#: ../../mod/wall_attach.php:57
+#: ../../mod/crepair.php:102
+msgid "Contact settings applied."
+msgstr "Contacto configurado con éxito."
+
+#: ../../mod/crepair.php:104
+msgid "Contact update failed."
+msgstr "Error al actualizar el Contacto."
+
+#: ../../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:128 ../../mod/photos.php:972
+#: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:146
+#: ../../mod/settings.php:86 ../../mod/settings.php:525
+#: ../../mod/settings.php:530 ../../mod/manage.php:87 ../../mod/network.php:6
+#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
+#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
+#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126
+#: ../../mod/item.php:142 ../../mod/mood.php:114
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
+#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
+#: ../../mod/message.php:38 ../../mod/message.php:168
+#: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
+#: ../../mod/wall_upload.php:64 ../../mod/follow.php:9
+#: ../../mod/display.php:141 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:413 ../../mod/delegate.php:6
+#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
+#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
+#: ../../addon/fbpost/fbpost.php:165
+#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3908
+#: ../../index.php:317
+msgid "Permission denied."
+msgstr "Permiso denegado."
+
+#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20
+#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:118
+msgid "Contact not found."
+msgstr "Contacto no encontrado."
+
+#: ../../mod/crepair.php:135
+msgid "Repair Contact Settings"
+msgstr "Reparar la configuración del Contacto"
+
+#: ../../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>ADVERTENCIA: Esto es muy avanzado</strong> y si se introduce información incorrecta tu conexión con este contacto puede dejar 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 "Por favor usa el botón 'Atás' de tu navegador <strong>ahora</strong> si no tienes claro qué hacer en esta página."
+
+#: ../../mod/crepair.php:144
+msgid "Return to contact editor"
+msgstr "Volver al editor de contactos"
+
+#: ../../mod/crepair.php:148 ../../mod/settings.php:545
+#: ../../mod/settings.php:571 ../../mod/admin.php:690 ../../mod/admin.php:699
+msgid "Name"
+msgstr "Nombre"
+
+#: ../../mod/crepair.php:149
+msgid "Account Nickname"
+msgstr "Apodo de la cuenta"
+
+#: ../../mod/crepair.php:150
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@Etiqueta - Sobrescribe el Nombre/Apodo"
+
+#: ../../mod/crepair.php:151
+msgid "Account URL"
+msgstr "Dirección de la cuenta"
+
+#: ../../mod/crepair.php:152
+msgid "Friend Request URL"
+msgstr "Dirección de la solicitud de amistad"
+
+#: ../../mod/crepair.php:153
+msgid "Friend Confirm URL"
+msgstr "Dirección de confirmación de tu amigo "
+
+#: ../../mod/crepair.php:154
+msgid "Notification Endpoint URL"
+msgstr "Dirección URL de la notificación"
+
+#: ../../mod/crepair.php:155
+msgid "Poll/Feed URL"
+msgstr "Dirección del Sondeo/Fuentes"
+
+#: ../../mod/crepair.php:156
+msgid "New photo from this URL"
+msgstr "Nueva foto de esta dirección"
+
+#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
+#: ../../mod/events.php:439 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1081 ../../mod/photos.php:1338
+#: ../../mod/photos.php:1378 ../../mod/photos.php:1419
+#: ../../mod/photos.php:1451 ../../mod/install.php:246
+#: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
+#: ../../mod/content.php:691 ../../mod/contacts.php:348
+#: ../../mod/settings.php:543 ../../mod/settings.php:697
+#: ../../mod/settings.php:769 ../../mod/settings.php:976
+#: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
+#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:687
+#: ../../mod/admin.php:823 ../../mod/admin.php:1022 ../../mod/admin.php:1109
+#: ../../mod/profiles.php:583 ../../mod/invite.php:119
+#: ../../addon/fromgplus/fromgplus.php:40
+#: ../../addon/facebook/facebook.php:619
+#: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
+#: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76
+#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
+#: ../../addon/page/page.php:210 ../../addon/planets/planets.php:158
+#: ../../addon/uhremotestorage/uhremotestorage.php:89
+#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
+#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
+#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
+#: ../../addon/forumlist/forumlist.php:169
+#: ../../addon/impressum/impressum.php:83
+#: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
+#: ../../addon/qcomment/qcomment.php:61
+#: ../../addon/openstreetmap/openstreetmap.php:70
+#: ../../addon/group_text/group_text.php:84
+#: ../../addon/libravatar/libravatar.php:99
+#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:87
+#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
+#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95
+#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
+#: ../../addon/jappixmini/jappixmini.php:307
+#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:292
+#: ../../addon/statusnet/statusnet.php:318
+#: ../../addon/statusnet/statusnet.php:325
+#: ../../addon/statusnet/statusnet.php:353
+#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
+#: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394
+#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
+#: ../../addon/posterous/posterous.php:103
+#: ../../view/theme/cleanzero/config.php:80
+#: ../../view/theme/diabook/theme.php:757
+#: ../../view/theme/diabook/config.php:190
+#: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70
+#: ../../include/conversation.php:601 ../../object/Item.php:532
+msgid "Submit"
+msgstr "Envíar"
+
+#: ../../mod/help.php:30
+msgid "Help:"
+msgstr "Ayuda:"
+
+#: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225
+#: ../../include/nav.php:86
+msgid "Help"
+msgstr "Ayuda"
+
+#: ../../mod/help.php:38 ../../index.php:226
+msgid "Not Found"
+msgstr "No se ha encontrado"
+
+#: ../../mod/help.php:41 ../../index.php:229
+msgid "Page not found."
+msgstr "Página no encontrada."
+
+#: ../../mod/wall_attach.php:69
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "El tamaño del archivo excede el límite de %d"
 
-#: ../../mod/wall_attach.php:87 ../../mod/wall_attach.php:98
+#: ../../mod/wall_attach.php:110 ../../mod/wall_attach.php:121
 msgid "File upload failed."
 msgstr "Ha fallado la subida del archivo."
 
-#: ../../mod/suggest.php:36 ../../include/contact_widgets.php:35
-msgid "Friend Suggestions"
-msgstr "Sugerencias de amigos"
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
+msgstr "Solicitud de amistad enviada."
 
-#: ../../mod/suggest.php:42
-msgid ""
-"No suggestions. This works best when you have more than one contact/friend."
-msgstr ""
-"No hay sugerencias. Esto funciona mejor cuando tienes más de un "
-"contacto/amigo."
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
+msgstr "Sugerencias de amistad"
 
-#: ../../mod/suggest.php:55
-msgid "Ignore/Hide"
-msgstr "Ignorar/Ocultar"
-
-#: ../../mod/regmod.php:52 ../../mod/register.php:369
+#: ../../mod/fsuggest.php:99
 #, php-format
-msgid "Registration details for %s"
-msgstr "Detalles de registro para %s"
+msgid "Suggest a friend for %s"
+msgstr "Recomienda un amigo a %s"
 
-#: ../../mod/regmod.php:54 ../../mod/register.php:371
-#: ../../mod/register.php:425 ../../mod/dfrn_request.php:553
-#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
-#: ../../mod/dfrn_confirm.php:703 ../../include/items.php:1767
-#: ../../include/items.php:2114 ../../include/items.php:2440
-msgid "Administrator"
-msgstr "Administrador"
+#: ../../mod/events.php:66
+msgid "Event title and start time are required."
+msgstr "Título del evento y hora de inicio requeridas."
 
-#: ../../mod/regmod.php:61
-msgid "Account approved."
-msgstr "Cuenta aprobada."
+#: ../../mod/events.php:263
+msgid "l, F j"
+msgstr "l, F j"
 
-#: ../../mod/regmod.php:93
+#: ../../mod/events.php:285
+msgid "Edit event"
+msgstr "Editar evento"
+
+#: ../../mod/events.php:307 ../../include/text.php:1147
+msgid "link to source"
+msgstr "Enlace al original"
+
+#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
+#: ../../include/nav.php:52 ../../boot.php:1689
+msgid "Events"
+msgstr "Eventos"
+
+#: ../../mod/events.php:332
+msgid "Create New Event"
+msgstr "Crea un evento nuevo"
+
+#: ../../mod/events.php:333 ../../addon/dav/friendica/layout.fnk.php:263
+msgid "Previous"
+msgstr "Previo"
+
+#: ../../mod/events.php:334 ../../mod/install.php:205
+#: ../../addon/dav/friendica/layout.fnk.php:266
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../../mod/events.php:407
+msgid "hour:minute"
+msgstr "hora:minuto"
+
+#: ../../mod/events.php:417
+msgid "Event details"
+msgstr "Detalles del evento"
+
+#: ../../mod/events.php:418
 #, php-format
-msgid "Registration revoked for %s"
-msgstr "Registro anulado para %s"
-
-#: ../../mod/regmod.php:105
-msgid "Please login."
-msgstr "Por favor accede."
-
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:239
-#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62
-msgid "Profile not found."
-msgstr "Perfil no encontrado."
-
-#: ../../mod/profiles.php:28
-msgid "Profile Name is required."
-msgstr "Se necesita un nombre de perfil."
-
-#: ../../mod/profiles.php:198
-msgid "Profile updated."
-msgstr "Perfil actualizado."
-
-#: ../../mod/profiles.php:256
-msgid "Profile deleted."
-msgstr "Perfil eliminado."
-
-#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
-msgid "Profile-"
-msgstr "Perfil-"
-
-#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
-msgid "New profile created."
-msgstr "Nuevo perfil creado."
-
-#: ../../mod/profiles.php:309
-msgid "Profile unavailable to clone."
-msgstr "Imposible duplicar el perfil."
-
-#: ../../mod/profiles.php:356
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "¿Ocultar tu lista de contactos/amigos en este perfil?"
-
-#: ../../mod/profiles.php:357 ../../mod/settings.php:629
-#: ../../mod/settings.php:635 ../../mod/settings.php:643
-#: ../../mod/settings.php:647 ../../mod/settings.php:652
-#: ../../mod/settings.php:658 ../../mod/register.php:500
-#: ../../mod/dfrn_request.php:645 ../../mod/api.php:105
-msgid "Yes"
-msgstr "Sí"
-
-#: ../../mod/profiles.php:358 ../../mod/settings.php:629
-#: ../../mod/settings.php:635 ../../mod/settings.php:643
-#: ../../mod/settings.php:647 ../../mod/settings.php:652
-#: ../../mod/settings.php:658 ../../mod/register.php:501
-#: ../../mod/dfrn_request.php:646 ../../mod/api.php:106
-msgid "No"
-msgstr "No"
-
-#: ../../mod/profiles.php:374
-msgid "Edit Profile Details"
-msgstr "Editar detalles de tu perfil"
-
-#: ../../mod/profiles.php:376
-msgid "View this profile"
-msgstr "Ver este perfil"
-
-#: ../../mod/profiles.php:377
-msgid "Create a new profile using these settings"
-msgstr "¿Crear un nuevo perfil con esta configuración?"
-
-#: ../../mod/profiles.php:378
-msgid "Clone this profile"
-msgstr "Clonar este perfil"
-
-#: ../../mod/profiles.php:379
-msgid "Delete this profile"
-msgstr "Eliminar este perfil"
-
-#: ../../mod/profiles.php:380
-msgid "Profile Name:"
-msgstr "Nombres del perfil:"
-
-#: ../../mod/profiles.php:381
-msgid "Your Full Name:"
-msgstr "Tu nombre completo:"
-
-#: ../../mod/profiles.php:382
-msgid "Title/Description:"
-msgstr "Título/Descrición:"
-
-#: ../../mod/profiles.php:383
-msgid "Your Gender:"
-msgstr "Género:"
-
-#: ../../mod/profiles.php:384
-#, php-format
-msgid "Birthday (%s):"
-msgstr "Cumpleaños (%s):"
-
-#: ../../mod/profiles.php:385
-msgid "Street Address:"
-msgstr "Dirección"
-
-#: ../../mod/profiles.php:386
-msgid "Locality/City:"
-msgstr "Localidad/Ciudad:"
-
-#: ../../mod/profiles.php:387
-msgid "Postal/Zip Code:"
-msgstr "Código postal:"
-
-#: ../../mod/profiles.php:388
-msgid "Country:"
-msgstr "País"
-
-#: ../../mod/profiles.php:389
-msgid "Region/State:"
-msgstr "Región/Estado:"
-
-#: ../../mod/profiles.php:390
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr "<span class=\"heart\"&hearts;</span> Estado civil:"
-
-#: ../../mod/profiles.php:391
-msgid "Who: (if applicable)"
-msgstr "¿Quién? (si es aplicable)"
-
-#: ../../mod/profiles.php:392
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Ejemplos: cathy123, Cathy Williams, cathy@example.com"
-
-#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43
-msgid "Sexual Preference:"
-msgstr "Preferencia sexual:"
-
-#: ../../mod/profiles.php:394
-msgid "Homepage URL:"
-msgstr "Dirección de tu página web:"
-
-#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:47
-msgid "Political Views:"
-msgstr "Ideas políticas:"
-
-#: ../../mod/profiles.php:396
-msgid "Religious Views:"
-msgstr "Creencias religiosas"
-
-#: ../../mod/profiles.php:397
-msgid "Public Keywords:"
-msgstr "Palabras clave públicas:"
-
-#: ../../mod/profiles.php:398
-msgid "Private Keywords:"
-msgstr "Palabras clave privadas:"
-
-#: ../../mod/profiles.php:399
-msgid "Example: fishing photography software"
-msgstr "Ejemplo: pesca fotografía software"
-
-#: ../../mod/profiles.php:400
-msgid "(Used for suggesting potential friends, can be seen by others)"
-msgstr "(Utilizado para sugerir amigos potenciales, otros pueden verlo)"
-
-#: ../../mod/profiles.php:401
-msgid "(Used for searching profiles, never shown to others)"
-msgstr "(Utilizado para buscar perfiles, nunca se muestra a otros)"
-
-#: ../../mod/profiles.php:402
-msgid "Tell us about yourself..."
-msgstr "Háblanos sobre ti..."
-
-#: ../../mod/profiles.php:403
-msgid "Hobbies/Interests"
-msgstr "Aficiones/Intereses"
-
-#: ../../mod/profiles.php:404
-msgid "Contact information and Social Networks"
-msgstr "Informacioń de contacto y Redes sociales"
-
-#: ../../mod/profiles.php:405
-msgid "Musical interests"
-msgstr "Gustos musicales"
-
-#: ../../mod/profiles.php:406
-msgid "Books, literature"
-msgstr "Libros, literatura"
-
-#: ../../mod/profiles.php:407
-msgid "Television"
-msgstr "Televisión"
-
-#: ../../mod/profiles.php:408
-msgid "Film/dance/culture/entertainment"
-msgstr "Películas/baile/cultura/entretenimiento"
-
-#: ../../mod/profiles.php:409
-msgid "Love/romance"
-msgstr "Amor/Romance"
-
-#: ../../mod/profiles.php:410
-msgid "Work/employment"
-msgstr "Trabajo/ocupación"
-
-#: ../../mod/profiles.php:411
-msgid "School/education"
-msgstr "Escuela/estudios"
-
-#: ../../mod/profiles.php:416
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
-msgstr ""
-"Éste es tu perfil <strong>público</strong>.<br /><strong>Puede</strong> ser "
-"visto por cualquiera usando internet."
-
-#: ../../mod/profiles.php:426 ../../mod/directory.php:122
-msgid "Age: "
-msgstr "Edad: "
-
-#: ../../mod/profiles.php:461
-msgid "Edit/Manage Profiles"
-msgstr "Editar/Administrar perfiles"
-
-#: ../../mod/notice.php:15 ../../mod/display.php:28 ../../mod/display.php:115
-#: ../../mod/viewsrc.php:15 ../../mod/admin.php:111 ../../mod/admin.php:502
-#: ../../include/items.php:2786
-msgid "Item not found."
-msgstr "Elemento no encontrado."
-
-#: ../../mod/settings.php:9 ../../mod/photos.php:62
-msgid "everybody"
-msgstr "todos"
-
-#: ../../mod/settings.php:67
-msgid "Missing some important data!"
-msgstr "¡Faltan algunos datos importantes!"
-
-#: ../../mod/settings.php:70 ../../mod/settings.php:446 ../../mod/admin.php:62
-msgid "Update"
-msgstr "Actualizar"
-
-#: ../../mod/settings.php:165
-msgid "Failed to connect with email account using the settings provided."
-msgstr ""
-"Error al conectar con la cuenta de correo mediante la configuración "
-"suministrada."
-
-#: ../../mod/settings.php:170
-msgid "Email settings updated."
-msgstr "Configuración de correo electrónico actualizada."
-
-#: ../../mod/settings.php:188
-msgid "Passwords do not match. Password unchanged."
-msgstr "Las contraseñas no coinciden. La contraseña no ha sido modificada."
-
-#: ../../mod/settings.php:193
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr ""
-"No se permiten contraseñas vacías. La contraseña no ha sido modificada."
-
-#: ../../mod/settings.php:204
-msgid "Password changed."
-msgstr "Contraseña modificada."
-
-#: ../../mod/settings.php:206
-msgid "Password update failed. Please try again."
-msgstr ""
-"La actualización de la contraseña ha fallado. Por favor, prueba otra vez."
-
-#: ../../mod/settings.php:253
-msgid " Please use a shorter name."
-msgstr " Usa un nombre más corto."
-
-#: ../../mod/settings.php:255
-msgid " Name too short."
-msgstr " Nombre demasiado corto."
-
-#: ../../mod/settings.php:261
-msgid " Not valid email."
-msgstr " Correo no válido."
-
-#: ../../mod/settings.php:263
-msgid " Cannot change to that email."
-msgstr " No se puede usar ese correo."
-
-#: ../../mod/settings.php:323 ../../addon/twitter/twitter.php:294
-#: ../../addon/impressum/impressum.php:64
-#: ../../addon/facebook/facebook.php:320 ../../addon/piwik/piwik.php:94
-msgid "Settings updated."
-msgstr "Configuración actualizada."
-
-#: ../../mod/settings.php:382 ../../include/nav.php:128
-msgid "Account settings"
-msgstr "Configuración de tu cuenta"
-
-#: ../../mod/settings.php:387
-msgid "Connector settings"
-msgstr "Configuración del conector"
-
-#: ../../mod/settings.php:392
-msgid "Plugin settings"
-msgstr "Configuración de los módulos"
-
-#: ../../mod/settings.php:397
-msgid "Connections"
-msgstr "Conexiones"
-
-#: ../../mod/settings.php:402
-msgid "Export personal data"
-msgstr "Exportación de datos personales"
-
-#: ../../mod/settings.php:419 ../../mod/settings.php:445
-#: ../../mod/settings.php:478
-msgid "Add application"
-msgstr "Agregar aplicación"
-
-#: ../../mod/settings.php:421 ../../mod/settings.php:447
-#: ../../mod/dfrn_request.php:655 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:45
+msgid "Format is %s %s. Starting date and Title are required."
+msgstr "El formato es %s %s. Fecha de inicio y título son obligatorios."
+
+#: ../../mod/events.php:420
+msgid "Event Starts:"
+msgstr "Inicio del evento:"
+
+#: ../../mod/events.php:420 ../../mod/events.php:434
+msgid "Required"
+msgstr "Obligatorio"
+
+#: ../../mod/events.php:423
+msgid "Finish date/time is not known or not relevant"
+msgstr "La fecha/hora de finalización no es conocida o es irrelevante."
+
+#: ../../mod/events.php:425
+msgid "Event Finishes:"
+msgstr "Finalización del evento:"
+
+#: ../../mod/events.php:428
+msgid "Adjust for viewer timezone"
+msgstr "Ajuste de zona horaria"
+
+#: ../../mod/events.php:430
+msgid "Description:"
+msgstr "Descripción:"
+
+#: ../../mod/events.php:432 ../../mod/directory.php:134
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
+#: ../../boot.php:1226
+msgid "Location:"
+msgstr "Localización:"
+
+#: ../../mod/events.php:434
+msgid "Title:"
+msgstr "Título:"
+
+#: ../../mod/events.php:436
+msgid "Share this event"
+msgstr "Comparte este evento"
+
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136
+#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
+#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
+#: ../../include/conversation.php:1283
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../../mod/settings.php:422 ../../mod/settings.php:448
-#: ../../mod/crepair.php:144 ../../mod/admin.php:464 ../../mod/admin.php:473
-msgid "Name"
-msgstr "Nombre"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr "Etiqueta eliminada"
 
-#: ../../mod/settings.php:423 ../../mod/settings.php:449
-#: ../../addon/statusnet/statusnet.php:480
-msgid "Consumer Key"
-msgstr "Clave consumer"
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr "Eliminar etiqueta"
 
-#: ../../mod/settings.php:424 ../../mod/settings.php:450
-#: ../../addon/statusnet/statusnet.php:479
-msgid "Consumer Secret"
-msgstr "Secreto consumer"
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr "Selecciona una etiqueta para eliminar: "
 
-#: ../../mod/settings.php:425 ../../mod/settings.php:451
-msgid "Redirect"
-msgstr "Redirigir"
-
-#: ../../mod/settings.php:426 ../../mod/settings.php:452
-msgid "Icon url"
-msgstr "Dirección URL del ícono"
-
-#: ../../mod/settings.php:437
-msgid "You can't edit this application."
-msgstr "No puedes editar esta aplicación."
-
-#: ../../mod/settings.php:477
-msgid "Connected Apps"
-msgstr "Aplicaciones conectadas"
-
-#: ../../mod/settings.php:479 ../../mod/editpost.php:90
-#: ../../include/conversation.php:441 ../../include/group.php:190
-msgid "Edit"
-msgstr "Editar"
-
-#: ../../mod/settings.php:480 ../../mod/photos.php:1300
-#: ../../mod/admin.php:468 ../../mod/group.php:154
-#: ../../include/conversation.php:211 ../../include/conversation.php:454
-msgid "Delete"
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
+#: ../../addon/dav/common/wdcal_edit.inc.php:468
+msgid "Remove"
 msgstr "Eliminar"
 
-#: ../../mod/settings.php:481
-msgid "Client key starts with"
-msgstr "Clave de cliente comienza con"
-
-#: ../../mod/settings.php:482
-msgid "No name"
-msgstr "Sin nombre"
-
-#: ../../mod/settings.php:483
-msgid "Remove authorization"
-msgstr "Suprimir la autorización"
-
-#: ../../mod/settings.php:495
-msgid "No Plugin settings configured"
-msgstr "Ningún módulo ha sido configurado"
-
-#: ../../mod/settings.php:502 ../../addon/widgets/widgets.php:122
-msgid "Plugin Settings"
-msgstr "Configuración de los módulos"
-
-#: ../../mod/settings.php:515 ../../mod/settings.php:516
+#: ../../mod/dfrn_poll.php:99 ../../mod/dfrn_poll.php:530
 #, php-format
-msgid "Built-in support for %s connectivity is %s"
-msgstr "El soporte integrado para %s conexión es %s"
+msgid "%s welcomes %s"
+msgstr "%s te da la bienvenida a %s"
 
-#: ../../mod/settings.php:515 ../../mod/dfrn_request.php:651
-#: ../../include/contact_selectors.php:78
-msgid "Diaspora"
-msgstr "Diaspora"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Autorizar la conexión de la aplicación"
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:516
-msgid "enabled"
-msgstr "habilitado"
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Regresa a tu aplicación e introduce este código de seguridad:"
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:516
-msgid "disabled"
-msgstr "deshabilitado"
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr "Inicia sesión para continuar."
 
-#: ../../mod/settings.php:516
-msgid "StatusNet"
-msgstr "StatusNet"
-
-#: ../../mod/settings.php:542
-msgid "Connector Settings"
-msgstr "Configuración del conector"
-
-#: ../../mod/settings.php:548
-msgid "Email/Mailbox Setup"
-msgstr "Configuración del correo/buzón"
-
-#: ../../mod/settings.php:549
+#: ../../mod/api.php:104
 msgid ""
-"If you wish to communicate with email contacts using this service "
-"(optional), please specify how to connect to your mailbox."
-msgstr ""
-"Si quieres comunicarte con tus contactos de tu correo usando este servicio "
-"(opcional), por favor, especifica cómo conectar con tu buzón."
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "¿Quieres autorizar a esta aplicación el acceso a tus mensajes y contactos, y/o crear nuevas publicaciones para ti?"
 
-#: ../../mod/settings.php:550
-msgid "Last successful email check:"
-msgstr "Última comprobación del correo con éxito:"
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
+#: ../../mod/settings.php:892 ../../mod/settings.php:898
+#: ../../mod/settings.php:906 ../../mod/settings.php:910
+#: ../../mod/settings.php:915 ../../mod/settings.php:921
+#: ../../mod/settings.php:927 ../../mod/settings.php:933
+#: ../../mod/settings.php:963 ../../mod/settings.php:964
+#: ../../mod/settings.php:965 ../../mod/settings.php:966
+#: ../../mod/settings.php:967 ../../mod/register.php:236
+#: ../../mod/profiles.php:563
+msgid "Yes"
+msgstr "Sí"
 
-#: ../../mod/settings.php:551
-msgid "Email access is disabled on this site."
-msgstr "El acceso por correo está deshabilitado en esta web."
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
+#: ../../mod/settings.php:892 ../../mod/settings.php:898
+#: ../../mod/settings.php:906 ../../mod/settings.php:910
+#: ../../mod/settings.php:915 ../../mod/settings.php:921
+#: ../../mod/settings.php:927 ../../mod/settings.php:933
+#: ../../mod/settings.php:963 ../../mod/settings.php:964
+#: ../../mod/settings.php:965 ../../mod/settings.php:966
+#: ../../mod/settings.php:967 ../../mod/register.php:237
+#: ../../mod/profiles.php:564
+msgid "No"
+msgstr "No"
 
-#: ../../mod/settings.php:552
-msgid "IMAP server name:"
-msgstr "Nombre del servidor IMAP:"
-
-#: ../../mod/settings.php:553
-msgid "IMAP port:"
-msgstr "Puerto IMAP:"
-
-#: ../../mod/settings.php:554
-msgid "Security:"
-msgstr "Seguridad:"
-
-#: ../../mod/settings.php:554
-msgid "None"
-msgstr "Ninguna"
-
-#: ../../mod/settings.php:555
-msgid "Email login name:"
-msgstr "Nombre de usuario:"
-
-#: ../../mod/settings.php:556
-msgid "Email password:"
-msgstr "Contraseña:"
-
-#: ../../mod/settings.php:557
-msgid "Reply-to address:"
-msgstr "Dirección de respuesta:"
-
-#: ../../mod/settings.php:558
-msgid "Send public posts to all email contacts:"
-msgstr "Enviar publicaciones públicas a todos los contactos de correo:"
-
-#: ../../mod/settings.php:596 ../../mod/admin.php:126 ../../mod/admin.php:443
-msgid "Normal Account"
-msgstr "Cuenta normal"
-
-#: ../../mod/settings.php:597
-msgid "This account is a normal personal profile"
-msgstr "Esta cuenta es el perfil de una persona normal"
-
-#: ../../mod/settings.php:600 ../../mod/admin.php:127 ../../mod/admin.php:444
-msgid "Soapbox Account"
-msgstr "Cuenta tribuna"
-
-#: ../../mod/settings.php:601
-msgid "Automatically approve all connection/friend requests as read-only fans"
-msgstr ""
-"Aceptar automáticamente todas las peticiones de conexión/amistad como "
-"seguidores de solo-lectura"
-
-#: ../../mod/settings.php:604 ../../mod/admin.php:128 ../../mod/admin.php:445
-msgid "Community/Celebrity Account"
-msgstr "Cuenta de Sociedad/Celebridad"
-
-#: ../../mod/settings.php:605
-msgid ""
-"Automatically approve all connection/friend requests as read-write fans"
-msgstr ""
-"Aceptar automáticamente todas las peticiones de conexión/amistad como "
-"seguidores de lectura-escritura"
-
-#: ../../mod/settings.php:608 ../../mod/admin.php:129 ../../mod/admin.php:446
-msgid "Automatic Friend Account"
-msgstr "Cuenta de amistad automática"
-
-#: ../../mod/settings.php:609
-msgid "Automatically approve all connection/friend requests as friends"
-msgstr ""
-"Aceptar automáticamente todas las solicitudes de conexión/amistad como "
-"amigos"
-
-#: ../../mod/settings.php:619
-msgid "OpenID:"
-msgstr "OpenID"
-
-#: ../../mod/settings.php:619
-msgid "(Optional) Allow this OpenID to login to this account."
-msgstr "(Opcional) Permitir a este OpenID acceder a esta cuenta."
-
-#: ../../mod/settings.php:629
-msgid "Publish your default profile in your local site directory?"
-msgstr ""
-"¿Quieres publicar tu perfil predeterminado en el directorio del sitio local?"
-
-#: ../../mod/settings.php:635
-msgid "Publish your default profile in the global social directory?"
-msgstr ""
-"¿Quieres publicar tu perfil predeterminado en el directorio social de forma "
-"global?"
-
-#: ../../mod/settings.php:643
-msgid "Hide your contact/friend list from viewers of your default profile?"
-msgstr ""
-"¿Quieres ocultar tu lista de contactos/amigos en la vista de tu perfil "
-"predeterminado?"
-
-#: ../../mod/settings.php:647
-msgid "Hide profile details and all your messages from unknown viewers?"
-msgstr ""
-"¿Quieres ocultar los detalles de tu perfil y todos tus mensajes a los "
-"desconocidos?"
-
-#: ../../mod/settings.php:652
-msgid "Allow friends to post to your profile page?"
-msgstr "¿Permitir a los amigos publicar en su página de perfil?"
-
-#: ../../mod/settings.php:658
-msgid "Allow friends to tag your posts?"
-msgstr "¿Permitir a los amigos etiquetar tus publicaciones?"
-
-#: ../../mod/settings.php:667
-msgid "Profile is <strong>not published</strong>."
-msgstr "El perfil <strong>no está publicado</strong>."
-
-#: ../../mod/settings.php:691
-msgid "Your Identity Address is"
-msgstr "Tu dirección personal es"
-
-#: ../../mod/settings.php:705
-msgid "Account Settings"
-msgstr "Configuración de la cuenta"
-
-#: ../../mod/settings.php:713
-msgid "Password Settings"
-msgstr "Configuración de la contraseña"
-
-#: ../../mod/settings.php:714
-msgid "New Password:"
-msgstr "Contraseña nueva:"
-
-#: ../../mod/settings.php:715
-msgid "Confirm:"
-msgstr "Confirmar:"
-
-#: ../../mod/settings.php:715
-msgid "Leave password fields blank unless changing"
-msgstr "Deja la contraseña en blanco si no quieres cambiarla"
-
-#: ../../mod/settings.php:719
-msgid "Basic Settings"
-msgstr "Configuración básica"
-
-#: ../../mod/settings.php:720 ../../include/profile_advanced.php:15
-msgid "Full Name:"
-msgstr "Nombre completo:"
-
-#: ../../mod/settings.php:721
-msgid "Email Address:"
-msgstr "Dirección de correo electrónico:"
-
-#: ../../mod/settings.php:722
-msgid "Your Timezone:"
-msgstr "Zona horaria:"
-
-#: ../../mod/settings.php:723
-msgid "Default Post Location:"
-msgstr "Localización predeterminada:"
-
-#: ../../mod/settings.php:724
-msgid "Use Browser Location:"
-msgstr "Usar localización del navegador:"
-
-#: ../../mod/settings.php:725
-msgid "Display Theme:"
-msgstr "Utilizar tema:"
-
-#: ../../mod/settings.php:729
-msgid "Security and Privacy Settings"
-msgstr "Configuración de seguridad y privacidad"
-
-#: ../../mod/settings.php:731
-msgid "Maximum Friend Requests/Day:"
-msgstr "Máximo número de peticiones de amistad por día:"
-
-#: ../../mod/settings.php:731
-msgid "(to prevent spam abuse)"
-msgstr "(para prevenir el abuso de spam)"
-
-#: ../../mod/settings.php:732
-msgid "Default Post Permissions"
-msgstr "Permisos por defecto para las publicaciones"
-
-#: ../../mod/settings.php:733
-msgid "(click to open/close)"
-msgstr "(pulsa para abrir/cerrar)"
-
-#: ../../mod/settings.php:739
-msgid "Automatically expire posts after days:"
-msgstr "Las publicaciones expiran automáticamente después de (días):"
-
-#: ../../mod/settings.php:739
-msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr ""
-"Si lo dejas vacío no expirarán nunca. Las publicaciones que hayan expirado "
-"se borrarán"
-
-#: ../../mod/settings.php:748
-msgid "Notification Settings"
-msgstr "Configuración de notificaciones"
-
-#: ../../mod/settings.php:749
-msgid "Send a notification email when:"
-msgstr "Enviar notificación por correo cuando:"
-
-#: ../../mod/settings.php:750
-msgid "You receive an introduction"
-msgstr "Reciba una presentación"
-
-#: ../../mod/settings.php:751
-msgid "Your introductions are confirmed"
-msgstr "Mi presentación sea confirmada"
-
-#: ../../mod/settings.php:752
-msgid "Someone writes on your profile wall"
-msgstr "Alguien escriba en el muro de mi perfil"
-
-#: ../../mod/settings.php:753
-msgid "Someone writes a followup comment"
-msgstr "Algien escriba en un comentario que sigo "
-
-#: ../../mod/settings.php:754
-msgid "You receive a private message"
-msgstr "Reciba un mensaje privado"
-
-#: ../../mod/settings.php:758
-msgid "Advanced Page Settings"
-msgstr "Configuración avanzada"
-
-#: ../../mod/search.php:13 ../../mod/network.php:75
-msgid "Saved Searches"
-msgstr "Búsquedas guardadas"
-
-#: ../../mod/search.php:16 ../../mod/network.php:81
-msgid "Remove term"
-msgstr "Eliminar término"
-
-#: ../../mod/search.php:71 ../../mod/photos.php:752 ../../mod/display.php:7
-#: ../../mod/dfrn_request.php:594 ../../mod/directory.php:31
-#: ../../mod/viewcontacts.php:16 ../../mod/community.php:16
-msgid "Public access denied."
-msgstr "Acceso público denegado."
-
-#: ../../mod/search.php:83
-msgid "Search This Site"
-msgstr "Buscar en este sitio"
-
-#: ../../mod/search.php:125 ../../mod/community.php:60
-msgid "No results."
-msgstr "Sin resultados."
-
-#: ../../mod/photos.php:42
+#: ../../mod/photos.php:46 ../../boot.php:1682
 msgid "Photo Albums"
 msgstr "Álbum de Fotos"
 
-#: ../../mod/photos.php:50 ../../mod/photos.php:144 ../../mod/photos.php:866
-#: ../../mod/photos.php:936 ../../mod/photos.php:951 ../../mod/photos.php:1351
-#: ../../mod/photos.php:1363 ../../addon/communityhome/communityhome.php:110
+#: ../../mod/photos.php:54 ../../mod/photos.php:149 ../../mod/photos.php:986
+#: ../../mod/photos.php:1073 ../../mod/photos.php:1088
+#: ../../mod/photos.php:1530 ../../mod/photos.php:1542
+#: ../../addon/communityhome/communityhome.php:110
+#: ../../view/theme/diabook/theme.php:598
 msgid "Contact Photos"
 msgstr "Foto del contacto"
 
-#: ../../mod/photos.php:133
-msgid "Contact information unavailable"
-msgstr "Información del contacto no disponible"
-
-#: ../../mod/photos.php:154
-msgid "Album not found."
-msgstr "Álbum no encontrado."
-
-#: ../../mod/photos.php:172 ../../mod/photos.php:945
-msgid "Delete Album"
-msgstr "Eliminar álbum"
-
-#: ../../mod/photos.php:235 ../../mod/photos.php:1164
-msgid "Delete Photo"
-msgstr "Eliminar foto"
-
-#: ../../mod/photos.php:522
-msgid "was tagged in a"
-msgstr "ha sido etiquetado en"
-
-#: ../../mod/photos.php:522 ../../mod/tagger.php:70 ../../mod/like.php:127
-#: ../../addon/communityhome/communityhome.php:163
-#: ../../include/conversation.php:31 ../../include/diaspora.php:1211
-msgid "photo"
-msgstr "foto"
-
-#: ../../mod/photos.php:522
-msgid "by"
-msgstr "por"
-
-#: ../../mod/photos.php:625 ../../addon/js_upload/js_upload.php:312
-msgid "Image exceeds size limit of "
-msgstr "La imagen supera el limite de tamaño de "
-
-#: ../../mod/photos.php:633
-msgid "Image file is empty."
-msgstr "El archivo de imagen está vacío."
-
-#: ../../mod/photos.php:762
-msgid "No photos selected"
-msgstr "Ninguna foto seleccionada"
-
-#: ../../mod/photos.php:839
-msgid "Access to this item is restricted."
-msgstr "El acceso a este elemento está restringido."
-
-#: ../../mod/photos.php:893
-msgid "Upload Photos"
-msgstr "Subir fotos"
-
-#: ../../mod/photos.php:896 ../../mod/photos.php:940
-msgid "New album name: "
-msgstr "Nombre del nuevo álbum: "
-
-#: ../../mod/photos.php:897
-msgid "or existing album name: "
-msgstr "o nombre de un álbum existente: "
-
-#: ../../mod/photos.php:898
-msgid "Do not show a status post for this upload"
-msgstr "No mostrar un mensaje de estado de este envío"
-
-#: ../../mod/photos.php:900 ../../mod/photos.php:1159
-msgid "Permissions"
-msgstr "Permisos"
-
-#: ../../mod/photos.php:955
-msgid "Edit Album"
-msgstr "Modifica álbum"
-
-#: ../../mod/photos.php:965 ../../mod/photos.php:1381
-msgid "View Photo"
-msgstr "Ver foto"
-
-#: ../../mod/photos.php:1000
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
-
-#: ../../mod/photos.php:1002
-msgid "Photo not available"
-msgstr "Foto no disponible"
-
-#: ../../mod/photos.php:1052
-msgid "View photo"
-msgstr "Ver foto"
-
-#: ../../mod/photos.php:1052
-msgid "Edit photo"
-msgstr "Modificar foto"
-
-#: ../../mod/photos.php:1053
-msgid "Use as profile photo"
-msgstr "Usar como foto del perfil"
-
-#: ../../mod/photos.php:1059 ../../include/conversation.php:369
-msgid "Private Message"
-msgstr "Mensaje privado"
-
-#: ../../mod/photos.php:1070
-msgid "View Full Size"
-msgstr "Ver a tamaño completo"
-
-#: ../../mod/photos.php:1138
-msgid "Tags: "
-msgstr "Etiquetas: "
-
-#: ../../mod/photos.php:1141
-msgid "[Remove any tag]"
-msgstr "[Borrar todas las etiquetas]"
-
-#: ../../mod/photos.php:1152
-msgid "New album name"
-msgstr "Nuevo nombre del álbum"
-
-#: ../../mod/photos.php:1155
-msgid "Caption"
-msgstr "Título"
-
-#: ../../mod/photos.php:1157
-msgid "Add a Tag"
-msgstr "Añadir una etiqueta"
-
-#: ../../mod/photos.php:1161
-msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr ""
-"Ejemplo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-
-#: ../../mod/photos.php:1181 ../../include/conversation.php:416
-msgid "I like this (toggle)"
-msgstr "Me gusta esto (cambiar)"
-
-#: ../../mod/photos.php:1182 ../../include/conversation.php:417
-msgid "I don't like this (toggle)"
-msgstr "No me gusta esto (cambiar)"
-
-#: ../../mod/photos.php:1183 ../../include/conversation.php:814
-msgid "Share"
-msgstr "Compartir"
-
-#: ../../mod/photos.php:1184 ../../mod/editpost.php:99
-#: ../../mod/message.php:137 ../../mod/message.php:270
-#: ../../include/conversation.php:251 ../../include/conversation.php:578
-#: ../../include/conversation.php:823
-msgid "Please wait"
-msgstr "Por favor, espere"
-
-#: ../../mod/photos.php:1200 ../../mod/photos.php:1239
-#: ../../mod/photos.php:1270 ../../include/conversation.php:431
-msgid "This is you"
-msgstr "Eres tú"
-
-#: ../../mod/photos.php:1368
-msgid "Recent Photos"
-msgstr "Fotos recientes"
-
-#: ../../mod/photos.php:1372
+#: ../../mod/photos.php:61 ../../mod/photos.php:1104 ../../mod/photos.php:1580
 msgid "Upload New Photos"
 msgstr "Subir nuevas fotos"
 
-#: ../../mod/photos.php:1385
+#: ../../mod/photos.php:74 ../../mod/settings.php:23
+msgid "everybody"
+msgstr "todos"
+
+#: ../../mod/photos.php:138
+msgid "Contact information unavailable"
+msgstr "Información del contacto no disponible"
+
+#: ../../mod/photos.php:149 ../../mod/photos.php:653 ../../mod/photos.php:1073
+#: ../../mod/photos.php:1088 ../../mod/profile_photo.php:74
+#: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
+#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
+#: ../../mod/profile_photo.php:305
+#: ../../addon/communityhome/communityhome.php:111
+#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:324
+#: ../../include/user.php:331 ../../include/user.php:338
+msgid "Profile Photos"
+msgstr "Foto del perfil"
+
+#: ../../mod/photos.php:159
+msgid "Album not found."
+msgstr "Álbum no encontrado."
+
+#: ../../mod/photos.php:177 ../../mod/photos.php:1082
+msgid "Delete Album"
+msgstr "Eliminar álbum"
+
+#: ../../mod/photos.php:240 ../../mod/photos.php:1339
+msgid "Delete Photo"
+msgstr "Eliminar foto"
+
+#: ../../mod/photos.php:584
+msgid "was tagged in a"
+msgstr "ha sido etiquetado en"
+
+#: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/tagger.php:62
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1399
+#: ../../include/diaspora.php:1824 ../../include/conversation.php:125
+#: ../../include/conversation.php:255
+msgid "photo"
+msgstr "foto"
+
+#: ../../mod/photos.php:584
+msgid "by"
+msgstr "por"
+
+#: ../../mod/photos.php:689 ../../addon/js_upload/js_upload.php:315
+msgid "Image exceeds size limit of "
+msgstr "La imagen supera tamaño límite de "
+
+#: ../../mod/photos.php:697
+msgid "Image file is empty."
+msgstr "El archivo de imagen está vacío."
+
+#: ../../mod/photos.php:729 ../../mod/profile_photo.php:153
+#: ../../mod/wall_upload.php:110
+msgid "Unable to process image."
+msgstr "Imposible procesar la imagen."
+
+#: ../../mod/photos.php:756 ../../mod/profile_photo.php:301
+#: ../../mod/wall_upload.php:136
+msgid "Image upload failed."
+msgstr "Error al subir la imagen."
+
+#: ../../mod/photos.php:842 ../../mod/community.php:18
+#: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
+#: ../../mod/display.php:7 ../../mod/search.php:73 ../../mod/directory.php:31
+msgid "Public access denied."
+msgstr "Acceso público denegado."
+
+#: ../../mod/photos.php:852
+msgid "No photos selected"
+msgstr "Ninguna foto seleccionada"
+
+#: ../../mod/photos.php:953
+msgid "Access to this item is restricted."
+msgstr "El acceso a este elemento está restringido."
+
+#: ../../mod/photos.php:1015
+#, php-format
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+msgstr "Has usado %1$.2f MB de %2$.2f MB de tu álbum de fotos."
+
+#: ../../mod/photos.php:1018
+#, php-format
+msgid "You have used %1$.2f Mbytes of photo storage."
+msgstr "Has usado %1$.2f MB de tu álbum de fotos."
+
+#: ../../mod/photos.php:1024
+msgid "Upload Photos"
+msgstr "Subir fotos"
+
+#: ../../mod/photos.php:1028 ../../mod/photos.php:1077
+msgid "New album name: "
+msgstr "Nombre del nuevo álbum: "
+
+#: ../../mod/photos.php:1029
+msgid "or existing album name: "
+msgstr "o nombre de un álbum existente: "
+
+#: ../../mod/photos.php:1030
+msgid "Do not show a status post for this upload"
+msgstr "No actualizar tu estado con este envío"
+
+#: ../../mod/photos.php:1032 ../../mod/photos.php:1334
+msgid "Permissions"
+msgstr "Permisos"
+
+#: ../../mod/photos.php:1092
+msgid "Edit Album"
+msgstr "Modificar álbum"
+
+#: ../../mod/photos.php:1098
+msgid "Show Newest First"
+msgstr "Mostrar más nuevos primero"
+
+#: ../../mod/photos.php:1100
+msgid "Show Oldest First"
+msgstr "Mostrar más antiguos primero"
+
+#: ../../mod/photos.php:1124 ../../mod/photos.php:1563
+msgid "View Photo"
+msgstr "Ver foto"
+
+#: ../../mod/photos.php:1159
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
+
+#: ../../mod/photos.php:1161
+msgid "Photo not available"
+msgstr "Foto no disponible"
+
+#: ../../mod/photos.php:1217
+msgid "View photo"
+msgstr "Ver foto"
+
+#: ../../mod/photos.php:1217
+msgid "Edit photo"
+msgstr "Modificar foto"
+
+#: ../../mod/photos.php:1218
+msgid "Use as profile photo"
+msgstr "Usar como foto del perfil"
+
+#: ../../mod/photos.php:1224 ../../mod/content.php:601
+#: ../../include/conversation.php:428 ../../object/Item.php:103
+msgid "Private Message"
+msgstr "Mensaje privado"
+
+#: ../../mod/photos.php:1243
+msgid "View Full Size"
+msgstr "Ver a tamaño completo"
+
+#: ../../mod/photos.php:1311
+msgid "Tags: "
+msgstr "Etiquetas: "
+
+#: ../../mod/photos.php:1314
+msgid "[Remove any tag]"
+msgstr "[Borrar todas las etiquetas]"
+
+#: ../../mod/photos.php:1324
+msgid "Rotate CW (right)"
+msgstr "Girar a la derecha"
+
+#: ../../mod/photos.php:1325
+msgid "Rotate CCW (left)"
+msgstr "Girar a la izquierda"
+
+#: ../../mod/photos.php:1327
+msgid "New album name"
+msgstr "Nuevo nombre del álbum"
+
+#: ../../mod/photos.php:1330
+msgid "Caption"
+msgstr "Título"
+
+#: ../../mod/photos.php:1332
+msgid "Add a Tag"
+msgstr "Añadir una etiqueta"
+
+#: ../../mod/photos.php:1336
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Ejemplo: @juan, @Barbara_Ruiz, @julia@example.com, #California, #camping"
+
+#: ../../mod/photos.php:1356 ../../mod/content.php:665
+#: ../../include/conversation.php:575 ../../object/Item.php:185
+msgid "I like this (toggle)"
+msgstr "Me gusta esto (cambiar)"
+
+#: ../../mod/photos.php:1357 ../../mod/content.php:666
+#: ../../include/conversation.php:576 ../../object/Item.php:186
+msgid "I don't like this (toggle)"
+msgstr "No me gusta esto (cambiar)"
+
+#: ../../mod/photos.php:1358 ../../include/conversation.php:1244
+msgid "Share"
+msgstr "Compartir"
+
+#: ../../mod/photos.php:1359 ../../mod/editpost.php:112
+#: ../../mod/content.php:482 ../../mod/content.php:843
+#: ../../mod/wallmessage.php:152 ../../mod/message.php:293
+#: ../../mod/message.php:481 ../../include/conversation.php:671
+#: ../../include/conversation.php:921 ../../include/conversation.php:1263
+#: ../../object/Item.php:237
+msgid "Please wait"
+msgstr "Por favor, espera"
+
+#: ../../mod/photos.php:1375 ../../mod/photos.php:1416
+#: ../../mod/photos.php:1448 ../../mod/content.php:688
+#: ../../include/conversation.php:598 ../../object/Item.php:529
+msgid "This is you"
+msgstr "Este eres tú"
+
+#: ../../mod/photos.php:1377 ../../mod/photos.php:1418
+#: ../../mod/photos.php:1450 ../../mod/content.php:690
+#: ../../include/conversation.php:600 ../../boot.php:574
+#: ../../object/Item.php:531
+msgid "Comment"
+msgstr "Comentar"
+
+#: ../../mod/photos.php:1379 ../../mod/editpost.php:133
+#: ../../mod/content.php:700 ../../include/conversation.php:610
+#: ../../include/conversation.php:1281 ../../object/Item.php:541
+msgid "Preview"
+msgstr "Vista previa"
+
+#: ../../mod/photos.php:1479 ../../mod/content.php:439
+#: ../../mod/content.php:721 ../../mod/settings.php:606
+#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:694
+#: ../../include/conversation.php:440 ../../include/conversation.php:874
+#: ../../object/Item.php:116
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../../mod/photos.php:1569
 msgid "View Album"
-msgstr "Ver álbum"
+msgstr "Ver Álbum"
 
-#: ../../mod/newmember.php:6
-msgid "Welcome to Friendika"
-msgstr "Bienvenido a Friendika"
+#: ../../mod/photos.php:1578
+msgid "Recent Photos"
+msgstr "Fotos recientes"
 
-#: ../../mod/newmember.php:8
-msgid "New Member Checklist"
-msgstr "Listado de nuevos miembros"
+#: ../../mod/community.php:23
+msgid "Not available."
+msgstr "No disponible"
 
-#: ../../mod/newmember.php:12
+#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:133
+#: ../../include/nav.php:101
+msgid "Community"
+msgstr "Comunidad"
+
+#: ../../mod/community.php:63 ../../mod/community.php:88
+#: ../../mod/search.php:148 ../../mod/search.php:174
+msgid "No results."
+msgstr "Sin resultados."
+
+#: ../../mod/friendica.php:55
+msgid "This is Friendica, version"
+msgstr "Esto es Friendica, versión"
+
+#: ../../mod/friendica.php:56
+msgid "running at web location"
+msgstr "ejecutándose en la dirección web"
+
+#: ../../mod/friendica.php:58
 msgid ""
-"We would like to offer some tips and links to help make your experience "
-"enjoyable. Click any item to visit the relevant page."
-msgstr ""
-"Nos gustaría ofrecerte algunos trucos y consejos para ayudar a que tu "
-"experiencia sea placentera. Pulsa en cualquier elemento para visitar la "
-"página adecuada."
+"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
+"more about the Friendica project."
+msgstr "Por favor, visita <a href=\"http://friendica.com\">Friendica.com</a> para saber más sobre el proyecto Friendica."
 
-#: ../../mod/newmember.php:16
-msgid ""
-"On your <em>Settings</em> page -  change your initial password. Also make a "
-"note of your Identity Address. This will be useful in making friends."
-msgstr ""
-"En la página de <em>Configuración</em> - cambia la contraseña inicial. Toma "
-"nota de tu dirección personal. Te será útil para hacer amigos."
+#: ../../mod/friendica.php:60
+msgid "Bug reports and issues: please visit"
+msgstr "Reporte de fallos y problemas: por favor visita"
 
-#: ../../mod/newmember.php:18
+#: ../../mod/friendica.php:61
 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 ""
-"Revisa las demás configuraciones, especialmente la configuración de "
-"privacidad. Un listado de directorio no publicado es como tener un número de"
-" teléfono sin publicar. Normalmente querrás publicar tu listado, a menos que"
-" tus amigos y amigos potenciales sepan con ponerse en contacto contigo."
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
+msgstr "Sugerencias, elogios, donaciones, etc. por favor manda un correo a Info arroba Friendica punto com"
 
-#: ../../mod/newmember.php:20
-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 ""
-"Sube una foto para tu perfil si no lo has hecho aún. Los estudios han "
-"demostrado que la gente que usa fotos suyas reales tienen diez veces más "
-"éxito a la hora de entablar amistad que las que no."
+#: ../../mod/friendica.php:75
+msgid "Installed plugins/addons/apps:"
+msgstr "Módulos/extensiones/aplicaciones instalados:"
 
-#: ../../mod/newmember.php:23
-msgid ""
-"Authorise the Facebook Connector if you currently have a Facebook account "
-"and we will (optionally) import all your Facebook friends and conversations."
-msgstr ""
-"Autoriza la conexión con Facebook si ya tienes una cuenta en Facebook y "
-"nosotros (opcionalmente) importaremos tus amistades y conversaciones desde "
-"Facebook."
+#: ../../mod/friendica.php:88
+msgid "No installed plugins/addons/apps"
+msgstr "Módulos/extensiones/aplicaciones no instalados"
 
-#: ../../mod/newmember.php:28
-msgid ""
-"Enter your email access information on your Settings page if you wish to "
-"import and interact with friends or mailing lists from your email INBOX"
-msgstr ""
-"Introduce los datos sobre tu dirección de correo en la página de "
-"configuración si quieres importar y mantener un contacto con tus amistades o"
-" listas de correos desde tu buzón"
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
+msgstr "Elemento no encontrado"
 
-#: ../../mod/newmember.php:30
-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 ""
-"Edita tu perfil <strong>predeterminado</strong> como quieras. Revisa la "
-"configuración para ocultar tu lista de amigos o tu perfil a los visitantes "
-"desconocidos."
+#: ../../mod/editpost.php:36
+msgid "Edit post"
+msgstr "Editar publicación"
 
-#: ../../mod/newmember.php:32
-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 ""
-"Define en tu perfil público algunas palabras que describan tus intereses. "
-"Así podremos buscar otras personas con los mismos gustos y sugerirte "
-"posibles amigos."
+#: ../../mod/editpost.php:88 ../../include/conversation.php:1230
+msgid "Post to Email"
+msgstr "Publicar mediante correo electrónico"
 
-#: ../../mod/newmember.php:34
-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>Connect</em> dialog."
-msgstr ""
-"La página de tus Contactos es tu puerta de entrada para manejar tus "
-"relaciones de amistad y conectarte con amigos de otras redes sociales. "
-"Introduce la dirección de su perfil o dirección web en el campo "
-"<em>Conectar</em>."
+#: ../../mod/editpost.php:103 ../../mod/content.php:708
+#: ../../mod/settings.php:605 ../../include/conversation.php:433
+#: ../../object/Item.php:107
+msgid "Edit"
+msgstr "Editar"
 
-#: ../../mod/newmember.php:36
-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 ""
-"El Directorio te permite encontrar otras personas en esta red o en cualquier"
-" otro sitio federado. Busca algún enlace de <em>Conectar</em> o "
-"<em>Seguir</em> en su perfil. Proporciona tu direción personal si es "
-"necesario."
+#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
+#: ../../mod/message.php:291 ../../mod/message.php:478
+#: ../../include/conversation.php:1245
+msgid "Upload photo"
+msgstr "Subir foto"
 
-#: ../../mod/newmember.php:38
-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 vez que tengas algunos amigos, puedes organizarlos en grupos de "
-"conversación privados mediante la barra en tu página de Contactos y luego "
-"puedes interactuar con cada grupo por privado desde tu página de Red."
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1247
+msgid "Attach file"
+msgstr "Adjuntar archivo"
 
-#: ../../mod/newmember.php:40
+#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
+#: ../../mod/message.php:292 ../../mod/message.php:479
+#: ../../include/conversation.php:1249
+msgid "Insert web link"
+msgstr "Insertar enlace"
+
+#: ../../mod/editpost.php:107
+msgid "Insert YouTube video"
+msgstr "Insertar vídeo de YouTube"
+
+#: ../../mod/editpost.php:108
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Insertar vídeo Vorbis [.ogg]"
+
+#: ../../mod/editpost.php:109
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Insertar audio Vorbis [.ogg]"
+
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1255
+msgid "Set your location"
+msgstr "Configurar tu localización"
+
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1257
+msgid "Clear browser location"
+msgstr "Borrar la localización del navegador"
+
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1264
+msgid "Permission settings"
+msgstr "Configuración de permisos"
+
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1273
+msgid "CC: email addresses"
+msgstr "CC: dirección de correo electrónico"
+
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1274
+msgid "Public post"
+msgstr "Publicación pública"
+
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1260
+msgid "Set title"
+msgstr "Establecer el título"
+
+#: ../../mod/editpost.php:127 ../../include/conversation.php:1262
+msgid "Categories (comma-separated list)"
+msgstr "Categorías (lista separada por comas)"
+
+#: ../../mod/editpost.php:128 ../../include/conversation.php:1276
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com"
+
+#: ../../mod/dfrn_request.php:93
+msgid "This introduction has already been accepted."
+msgstr "Esta presentación ya ha sido aceptada."
+
+#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512
+msgid "Profile location is not valid or does not contain profile information."
+msgstr "La dirección del perfil no es válida o no contiene información del perfil."
+
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:517
+msgid "Warning: profile location has no identifiable owner name."
+msgstr "Aviso: La dirección del perfil no tiene un nombre de propietario identificable."
+
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:519
+msgid "Warning: profile location has no profile photo."
+msgstr "Aviso: la dirección del perfil no tiene foto de perfil."
+
+#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522
+#, 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] "no se encontró %d parámetro requerido en el lugar determinado"
+msgstr[1] "no se encontraron %d parámetros requeridos en el lugar determinado"
+
+#: ../../mod/dfrn_request.php:170
+msgid "Introduction complete."
+msgstr "Presentación completa."
+
+#: ../../mod/dfrn_request.php:209
+msgid "Unrecoverable protocol error."
+msgstr "Error de protocolo 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 ha recibido demasiadas solicitudes de conexión hoy."
+
+#: ../../mod/dfrn_request.php:263
+msgid "Spam protection measures have been invoked."
+msgstr "Han sido activadas las medidas de protección contra spam."
+
+#: ../../mod/dfrn_request.php:264
+msgid "Friends are advised to please try again in 24 hours."
+msgstr "Tus amigos serán avisados para que lo intenten de nuevo pasadas 24 horas."
+
+#: ../../mod/dfrn_request.php:326
+msgid "Invalid locator"
+msgstr "Localizador no válido"
+
+#: ../../mod/dfrn_request.php:335
+msgid "Invalid email address."
+msgstr "Dirección de correo incorrecta"
+
+#: ../../mod/dfrn_request.php:361
+msgid "This account has not been configured for email. Request failed."
+msgstr "Esta cuenta no ha sido configurada para el correo. Fallo de solicitud."
+
+#: ../../mod/dfrn_request.php:457
+msgid "Unable to resolve your name at the provided location."
+msgstr "No se ha podido resolver tu nombre en la dirección indicada."
+
+#: ../../mod/dfrn_request.php:470
+msgid "You have already introduced yourself here."
+msgstr "Ya te has presentado aquí."
+
+#: ../../mod/dfrn_request.php:474
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr "Al parecer, ya eres amigo de %s."
+
+#: ../../mod/dfrn_request.php:495
+msgid "Invalid profile URL."
+msgstr "Dirección de perfil no válida."
+
+#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27
+msgid "Disallowed profile URL."
+msgstr "Dirección de perfil no permitida."
+
+#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:123
+msgid "Failed to update contact record."
+msgstr "Error al actualizar el contacto."
+
+#: ../../mod/dfrn_request.php:591
+msgid "Your introduction has been sent."
+msgstr "Tu presentación ha sido enviada."
+
+#: ../../mod/dfrn_request.php:644
+msgid "Please login to confirm introduction."
+msgstr "Inicia sesión para confirmar la presentación."
+
+#: ../../mod/dfrn_request.php:658
 msgid ""
-"Our <strong>help</strong> pages may be consulted for detail on other program"
-" features and resources."
-msgstr ""
-"Puedes consultar nuestra página de <strong>Ayuda</strong> para más ayuda, "
-"información y recursos."
+"Incorrect identity currently logged in. Please login to "
+"<strong>this</strong> profile."
+msgstr "Sesión iniciada con la identificación incorrecta. Entra en <strong>este</strong> perfil."
+
+#: ../../mod/dfrn_request.php:669
+msgid "Hide this contact"
+msgstr "Ocultar este contacto"
+
+#: ../../mod/dfrn_request.php:672
+#, php-format
+msgid "Welcome home %s."
+msgstr "Bienvenido a casa %s"
+
+#: ../../mod/dfrn_request.php:673
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr "Por favor, confirma tu solicitud de presentación/conexión con %s."
+
+#: ../../mod/dfrn_request.php:674
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3287
+msgid "[Name Withheld]"
+msgstr "[Nombre oculto]"
+
+#: ../../mod/dfrn_request.php:810
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
+msgstr "Por favor introduce tu dirección ID de una de las siguientes redes sociales soportadas:"
+
+#: ../../mod/dfrn_request.php:826
+msgid "<strike>Connect as an email follower</strike> (Coming soon)"
+msgstr "<strike>Conecta como lector de correo</strike> (Disponible en breve)"
+
+#: ../../mod/dfrn_request.php:828
+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 aún no eres miembro de la red social libre <a href=\"http://dir.friendica.com/siteinfo\"> sigue este enlace para encontrar un servidor público de Friendica y unirte a nosotros</a>."
+
+#: ../../mod/dfrn_request.php:831
+msgid "Friend/Connection Request"
+msgstr "Solicitud de Amistad/Conexión"
+
+#: ../../mod/dfrn_request.php:832
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@identi.ca"
+msgstr "Ejemplos: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
+
+#: ../../mod/dfrn_request.php:833
+msgid "Please answer the following:"
+msgstr "Por favor responde lo siguiente:"
+
+#: ../../mod/dfrn_request.php:834
+#, php-format
+msgid "Does %s know you?"
+msgstr "¿%s te conoce?"
+
+#: ../../mod/dfrn_request.php:837
+msgid "Add a personal note:"
+msgstr "Añade una nota personal:"
+
+#: ../../mod/dfrn_request.php:839 ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../mod/dfrn_request.php:840
+msgid "StatusNet/Federated Social Web"
+msgstr "StatusNet/Web Social Federada"
+
+#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:640
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr "Diaspora*"
+
+#: ../../mod/dfrn_request.php:842
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search"
+" bar."
+msgstr "(En vez de usar este formulario, introduce %s en la barra de búsqueda de Diaspora."
+
+#: ../../mod/dfrn_request.php:843
+msgid "Your Identity Address:"
+msgstr "Dirección de tu perfil:"
+
+#: ../../mod/dfrn_request.php:846
+msgid "Submit Request"
+msgstr "Enviar solicitud"
+
+#: ../../mod/install.php:117
+msgid "Friendica Social Communications Server - Setup"
+msgstr "Servidor de Comunicaciones Sociales Friendica - Configuración"
+
+#: ../../mod/install.php:123
+msgid "Could not connect to database."
+msgstr "No es posible la conexión con la base de datos."
+
+#: ../../mod/install.php:127
+msgid "Could not create table."
+msgstr "No se puede crear la tabla."
+
+#: ../../mod/install.php:133
+msgid "Your Friendica site database has been installed."
+msgstr "La base de datos de su sitio web de Friendica ha sido instalada."
+
+#: ../../mod/install.php:138
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Puede que tengas que importar el archivo \"Database.sql\" manualmente usando phpmyadmin o mysql."
+
+#: ../../mod/install.php:139 ../../mod/install.php:204
+#: ../../mod/install.php:488
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Por favor, consulta el archivo \"INSTALL.txt\"."
+
+#: ../../mod/install.php:201
+msgid "System check"
+msgstr "Verificación del sistema"
+
+#: ../../mod/install.php:206
+msgid "Check again"
+msgstr "Compruebalo de nuevo"
+
+#: ../../mod/install.php:225
+msgid "Database connection"
+msgstr "Conexión con la base de datos"
+
+#: ../../mod/install.php:226
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "Con el fin de poder instalar Friendica, necesitamos saber cómo conectar con tu base de datos."
+
+#: ../../mod/install.php:227
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Por favor, contacta con tu proveedor de servicios o con el administrador de la página si tienes alguna pregunta sobre estas configuraciones."
+
+#: ../../mod/install.php:228
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "La base de datos que especifiques a continuación debería existir ya. Si no es el caso, debes crearla antes de continuar."
+
+#: ../../mod/install.php:232
+msgid "Database Server Name"
+msgstr "Nombre del servidor de la base de datos"
+
+#: ../../mod/install.php:233
+msgid "Database Login Name"
+msgstr "Usuario de la base de datos"
+
+#: ../../mod/install.php:234
+msgid "Database Login Password"
+msgstr "Contraseña de la base de datos"
+
+#: ../../mod/install.php:235
+msgid "Database Name"
+msgstr "Nombre de la base de datos"
+
+#: ../../mod/install.php:236 ../../mod/install.php:275
+msgid "Site administrator email address"
+msgstr "Dirección de correo del administrador de la web"
+
+#: ../../mod/install.php:236 ../../mod/install.php:275
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "La dirección de correo de tu cuenta debe coincidir con esta para poder usar el panel de administración de la web."
+
+#: ../../mod/install.php:240 ../../mod/install.php:278
+msgid "Please select a default timezone for your website"
+msgstr "Por favor, selecciona la zona horaria predeterminada para tu web"
+
+#: ../../mod/install.php:265
+msgid "Site settings"
+msgstr "Configuración de la página web"
+
+#: ../../mod/install.php:318
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "No se pudo encontrar una versión de la línea de comandos de PHP en la ruta del servidor web."
+
+#: ../../mod/install.php:319
+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 tienes una versión en línea de comandos de PHP instalada en el servidor no podrás ejecutar actualizaciones en segundo plano a través de cron. Ver <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</ a>"
+
+#: ../../mod/install.php:323
+msgid "PHP executable path"
+msgstr "Dirección al ejecutable PHP"
+
+#: ../../mod/install.php:323
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Introduce la ruta completa al ejecutable php. Puedes dejarlo en blanco y seguir con la instalación."
+
+#: ../../mod/install.php:328
+msgid "Command line PHP"
+msgstr "Línea de comandos PHP"
+
+#: ../../mod/install.php:337
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "La versión en línea de comandos de PHP en tu sistema no tiene \"register_argc_argv\" habilitado."
+
+#: ../../mod/install.php:338
+msgid "This is required for message delivery to work."
+msgstr "Esto es necesario para que funcione la entrega de mensajes."
+
+#: ../../mod/install.php:340
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
+
+#: ../../mod/install.php:361
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Error:  La función \"openssl_pkey_new\" en este sistema no es capaz de generar claves de cifrado"
+
+#: ../../mod/install.php:362
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Si se ejecuta en Windows, por favor consulta la sección \"http://www.php.net/manual/en/openssl.installation.php\"."
+
+#: ../../mod/install.php:364
+msgid "Generate encryption keys"
+msgstr "Generar claves de encriptación"
+
+#: ../../mod/install.php:371
+msgid "libCurl PHP module"
+msgstr "Módulo PHP libCurl"
+
+#: ../../mod/install.php:372
+msgid "GD graphics PHP module"
+msgstr "Módulo PHP gráficos GD"
+
+#: ../../mod/install.php:373
+msgid "OpenSSL PHP module"
+msgstr "Módulo PHP OpenSSL"
+
+#: ../../mod/install.php:374
+msgid "mysqli PHP module"
+msgstr "Módulo PHP mysqli"
+
+#: ../../mod/install.php:375
+msgid "mb_string PHP module"
+msgstr "Módulo PHP mb_string"
+
+#: ../../mod/install.php:380 ../../mod/install.php:382
+msgid "Apache mod_rewrite module"
+msgstr "Módulo mod_rewrite de Apache"
+
+#: ../../mod/install.php:380
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Error: El módulo de Apache mod-rewrite es necesario pero no está instalado."
+
+#: ../../mod/install.php:388
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Error: El módulo de PHP libcurl es necesario, pero no está instalado."
+
+#: ../../mod/install.php:392
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Error: El módulo de de PHP gráficos GD con soporte JPEG es necesario, pero no está instalado."
+
+#: ../../mod/install.php:396
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Error: El módulo de PHP openssl es necesario, pero  no está instalado."
+
+#: ../../mod/install.php:400
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Error: El módulo de PHP mysqli es necesario, pero no está instalado."
+
+#: ../../mod/install.php:404
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Error: El módulo de PHP mb_string es necesario, pero no está instalado."
+
+#: ../../mod/install.php:421
+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 "El programa de instalación web necesita ser capaz de crear un archivo llamado \".htconfig.php\" en la carpeta principal de tu servidor web y es incapaz de hacerlo."
+
+#: ../../mod/install.php:422
+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 "Se trata a menudo de una configuración de permisos, pues el servidor web puede que no sea capaz de escribir archivos en la carpeta, aunque tú sí puedas."
+
+#: ../../mod/install.php:423
+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 obtendremos un texto que debes guardar en un archivo llamado .htconfig.php en la carpeta de Friendica."
+
+#: ../../mod/install.php:424
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"INSTALL.txt\" for instructions."
+msgstr "Como alternativa, puedes saltarte estos pasos y realizar una instalación manual. Por favor, consulta el archivo \"INSTALL.txt\" para las instrucciones."
+
+#: ../../mod/install.php:427
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php tiene permiso de escritura"
+
+#: ../../mod/install.php:439
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr "La reescritura de la dirección en .htaccess no funcionó. Revisa la configuración."
+
+#: ../../mod/install.php:441
+msgid "Url rewrite is working"
+msgstr "Reescribiendo la dirección..."
+
+#: ../../mod/install.php:451
+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 "El archivo de configuración de base de datos \".htconfig.php\" no se pudo escribir. Por favor, utiliza el texto adjunto para crear un archivo de configuración en la raíz de tu servidor web."
+
+#: ../../mod/install.php:475
+msgid "Errors encountered creating database tables."
+msgstr "Se han encontrados errores creando las tablas de la base de datos."
+
+#: ../../mod/install.php:486
+msgid "<h1>What next</h1>"
+msgstr "<h1>¿Ahora qué?</h1>"
+
+#: ../../mod/install.php:487
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo"
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:227
+#: ../../include/bb2diaspora.php:390
 msgid "l F d, Y \\@ g:i A"
 msgstr "l F d, Y \\@ g:i A"
 
@@ -1465,9 +1223,7 @@ msgstr "Conversión horária"
 msgid ""
 "Friendika provides this service for sharing events with other networks and "
 "friends in unknown timezones."
-msgstr ""
-"Friendica ofrece este servicio para compartir eventos con otras redes y "
-"amigos en zonas horarias desconocidas."
+msgstr "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas."
 
 #: ../../mod/localtime.php:30
 #, php-format
@@ -1486,83 +1242,3338 @@ msgstr "Zona horaria local convertida: %s"
 
 #: ../../mod/localtime.php:41
 msgid "Please select your timezone:"
-msgstr "Por favor, seleccione su zona horaria:"
+msgstr "Por favor, selecciona tu zona horaria:"
 
-#: ../../mod/display.php:108
+#: ../../mod/poke.php:192
+msgid "Poke/Prod"
+msgstr "Toque/Empujón"
+
+#: ../../mod/poke.php:193
+msgid "poke, prod or do other things to somebody"
+msgstr "da un toque, empujón o similar a alguien"
+
+#: ../../mod/poke.php:194
+msgid "Recipient"
+msgstr "Receptor"
+
+#: ../../mod/poke.php:195
+msgid "Choose what you wish to do to recipient"
+msgstr "Elige qué desea hacer con el receptor"
+
+#: ../../mod/poke.php:198
+msgid "Make this post private"
+msgstr "Hacer esta publicación privada"
+
+#: ../../mod/match.php:12
+msgid "Profile Match"
+msgstr "Coincidencias de Perfil"
+
+#: ../../mod/match.php:20
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "No hay palabras clave que coincidan. Por favor, agrega algunas palabras claves en tu perfil predeterminado."
+
+#: ../../mod/match.php:57
+msgid "is interested in:"
+msgstr "estás interesado en:"
+
+#: ../../mod/match.php:58 ../../mod/suggest.php:59
+#: ../../include/contact_widgets.php:9 ../../boot.php:1164
+msgid "Connect"
+msgstr "Conectar"
+
+#: ../../mod/match.php:65 ../../mod/dirfind.php:60
+msgid "No matches"
+msgstr "Sin conincidencias"
+
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
+msgstr "Privacidad de la información remota no disponible."
+
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr "Visible para:"
+
+#: ../../mod/content.php:119 ../../mod/network.php:436
+msgid "No such group"
+msgstr "Ningún grupo"
+
+#: ../../mod/content.php:130 ../../mod/network.php:447
+msgid "Group is empty"
+msgstr "El grupo está vacío"
+
+#: ../../mod/content.php:134 ../../mod/network.php:451
+msgid "Group: "
+msgstr "Grupo: "
+
+#: ../../mod/content.php:438 ../../mod/content.php:720
+#: ../../include/conversation.php:439 ../../include/conversation.php:873
+#: ../../object/Item.php:115
+msgid "Select"
+msgstr "Seleccionar"
+
+#: ../../mod/content.php:455 ../../mod/content.php:813
+#: ../../mod/content.php:814 ../../include/conversation.php:639
+#: ../../include/conversation.php:640 ../../include/conversation.php:890
+#: ../../object/Item.php:206 ../../object/Item.php:207
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Ver perfil de %s @ %s"
+
+#: ../../mod/content.php:465 ../../mod/content.php:825
+#: ../../include/conversation.php:653 ../../include/conversation.php:904
+#: ../../object/Item.php:219
+#, php-format
+msgid "%s from %s"
+msgstr "%s de %s"
+
+#: ../../mod/content.php:480 ../../include/conversation.php:919
+msgid "View in context"
+msgstr "Verlo en contexto"
+
+#: ../../mod/content.php:586 ../../include/conversation.php:680
+#: ../../object/Item.php:256
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d comentario"
+msgstr[1] "%d comentarios"
+
+#: ../../mod/content.php:587 ../../addon/page/page.php:76
+#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
+#: ../../include/contact_widgets.php:195 ../../include/conversation.php:681
+#: ../../boot.php:575 ../../object/Item.php:257
+msgid "show more"
+msgstr "ver más"
+
+#: ../../mod/content.php:665 ../../include/conversation.php:575
+#: ../../object/Item.php:185
+msgid "like"
+msgstr "me gusta"
+
+#: ../../mod/content.php:666 ../../include/conversation.php:576
+#: ../../object/Item.php:186
+msgid "dislike"
+msgstr "no me gusta"
+
+#: ../../mod/content.php:668 ../../include/conversation.php:578
+#: ../../object/Item.php:188
+msgid "Share this"
+msgstr "Compartir esto"
+
+#: ../../mod/content.php:668 ../../include/conversation.php:578
+#: ../../object/Item.php:188
+msgid "share"
+msgstr "compartir"
+
+#: ../../mod/content.php:692 ../../include/conversation.php:602
+#: ../../object/Item.php:533
+msgid "Bold"
+msgstr "Negrita"
+
+#: ../../mod/content.php:693 ../../include/conversation.php:603
+#: ../../object/Item.php:534
+msgid "Italic"
+msgstr "Cursiva"
+
+#: ../../mod/content.php:694 ../../include/conversation.php:604
+#: ../../object/Item.php:535
+msgid "Underline"
+msgstr "Subrayado"
+
+#: ../../mod/content.php:695 ../../include/conversation.php:605
+#: ../../object/Item.php:536
+msgid "Quote"
+msgstr "Cita"
+
+#: ../../mod/content.php:696 ../../include/conversation.php:606
+#: ../../object/Item.php:537
+msgid "Code"
+msgstr "Código"
+
+#: ../../mod/content.php:697 ../../include/conversation.php:607
+#: ../../object/Item.php:538
+msgid "Image"
+msgstr "Imagen"
+
+#: ../../mod/content.php:698 ../../include/conversation.php:608
+#: ../../object/Item.php:539
+msgid "Link"
+msgstr "Enlace"
+
+#: ../../mod/content.php:699 ../../include/conversation.php:609
+#: ../../object/Item.php:540
+msgid "Video"
+msgstr "Vídeo"
+
+#: ../../mod/content.php:733 ../../include/conversation.php:539
+#: ../../object/Item.php:169
+msgid "add star"
+msgstr "Añadir estrella"
+
+#: ../../mod/content.php:734 ../../include/conversation.php:540
+#: ../../object/Item.php:170
+msgid "remove star"
+msgstr "Quitar estrella"
+
+#: ../../mod/content.php:735 ../../include/conversation.php:541
+#: ../../object/Item.php:171
+msgid "toggle star status"
+msgstr "Añadir a destacados"
+
+#: ../../mod/content.php:738 ../../include/conversation.php:544
+#: ../../object/Item.php:174
+msgid "starred"
+msgstr "marcados con estrellas"
+
+#: ../../mod/content.php:739 ../../include/conversation.php:545
+#: ../../object/Item.php:175
+msgid "add tag"
+msgstr "añadir etiqueta"
+
+#: ../../mod/content.php:743 ../../include/conversation.php:443
+#: ../../object/Item.php:119
+msgid "save to folder"
+msgstr "grabado en directorio"
+
+#: ../../mod/content.php:815 ../../include/conversation.php:641
+#: ../../object/Item.php:208
+msgid "to"
+msgstr "a"
+
+#: ../../mod/content.php:816 ../../include/conversation.php:642
+#: ../../object/Item.php:209
+msgid "Wall-to-Wall"
+msgstr "Muro-A-Muro"
+
+#: ../../mod/content.php:817 ../../include/conversation.php:643
+#: ../../object/Item.php:210
+msgid "via Wall-To-Wall:"
+msgstr "via Muro-A-Muro:"
+
+#: ../../mod/home.php:28 ../../addon/communityhome/communityhome.php:179
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bienvenido a %s"
+
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr "Solicitud de identificación no válida."
+
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:161
+#: ../../mod/notifications.php:207
+msgid "Discard"
+msgstr "Descartar"
+
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:321
+#: ../../mod/contacts.php:375
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../../mod/notifications.php:75
+msgid "System"
+msgstr "Sistema"
+
+#: ../../mod/notifications.php:80 ../../include/nav.php:113
+msgid "Network"
+msgstr "Red"
+
+#: ../../mod/notifications.php:85 ../../mod/network.php:300
+msgid "Personal"
+msgstr "Personal"
+
+#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:127
+#: ../../include/nav.php:77 ../../include/nav.php:115
+msgid "Home"
+msgstr "Inicio"
+
+#: ../../mod/notifications.php:95 ../../include/nav.php:121
+msgid "Introductions"
+msgstr "Presentaciones"
+
+#: ../../mod/notifications.php:100 ../../mod/message.php:176
+#: ../../include/nav.php:128
+msgid "Messages"
+msgstr "Mensajes"
+
+#: ../../mod/notifications.php:119
+msgid "Show Ignored Requests"
+msgstr "Mostrar peticiones ignoradas"
+
+#: ../../mod/notifications.php:119
+msgid "Hide Ignored Requests"
+msgstr "Ocultar peticiones ignoradas"
+
+#: ../../mod/notifications.php:145 ../../mod/notifications.php:191
+msgid "Notification type: "
+msgstr "Tipo de notificación: "
+
+#: ../../mod/notifications.php:146
+msgid "Friend Suggestion"
+msgstr "Propuestas de amistad"
+
+#: ../../mod/notifications.php:148
+#, php-format
+msgid "suggested by %s"
+msgstr "sugerido por %s"
+
+#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
+#: ../../mod/contacts.php:381
+msgid "Hide this contact from others"
+msgstr "Ocultar este contacto a los demás."
+
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
+msgid "Post a new friend activity"
+msgstr "Publica tu nueva amistad"
+
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
+msgid "if applicable"
+msgstr "Si corresponde"
+
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/admin.php:692
+msgid "Approve"
+msgstr "Aprobar"
+
+#: ../../mod/notifications.php:177
+msgid "Claims to be known to you: "
+msgstr "Dice conocerte: "
+
+#: ../../mod/notifications.php:177
+msgid "yes"
+msgstr "sí"
+
+#: ../../mod/notifications.php:177
+msgid "no"
+msgstr "no"
+
+#: ../../mod/notifications.php:184
+msgid "Approve as: "
+msgstr "Aprobar como: "
+
+#: ../../mod/notifications.php:185
+msgid "Friend"
+msgstr "Amigo"
+
+#: ../../mod/notifications.php:186
+msgid "Sharer"
+msgstr "Lector"
+
+#: ../../mod/notifications.php:186
+msgid "Fan/Admirer"
+msgstr "Fan/Admirador"
+
+#: ../../mod/notifications.php:192
+msgid "Friend/Connect Request"
+msgstr "Solicitud de Amistad/Conexión"
+
+#: ../../mod/notifications.php:192
+msgid "New Follower"
+msgstr "Nuevo seguidor"
+
+#: ../../mod/notifications.php:213
+msgid "No introductions."
+msgstr "Sin presentaciones."
+
+#: ../../mod/notifications.php:216 ../../include/nav.php:122
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: ../../mod/notifications.php:253 ../../mod/notifications.php:378
+#: ../../mod/notifications.php:465
+#, php-format
+msgid "%s liked %s's post"
+msgstr "A %s le gusta la publicación de %s"
+
+#: ../../mod/notifications.php:262 ../../mod/notifications.php:387
+#: ../../mod/notifications.php:474
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "A %s no le gusta la publicación de %s"
+
+#: ../../mod/notifications.php:276 ../../mod/notifications.php:401
+#: ../../mod/notifications.php:488
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s es ahora es amigo de %s"
+
+#: ../../mod/notifications.php:283 ../../mod/notifications.php:408
+#, php-format
+msgid "%s created a new post"
+msgstr "%s creó una nueva publicación"
+
+#: ../../mod/notifications.php:284 ../../mod/notifications.php:409
+#: ../../mod/notifications.php:497
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s comentó la publicación de %s"
+
+#: ../../mod/notifications.php:298
+msgid "No more network notifications."
+msgstr "No hay más notificaciones de red."
+
+#: ../../mod/notifications.php:302
+msgid "Network Notifications"
+msgstr "Notificaciones de Red"
+
+#: ../../mod/notifications.php:328 ../../mod/notify.php:61
+msgid "No more system notifications."
+msgstr "No hay más notificaciones del sistema."
+
+#: ../../mod/notifications.php:332 ../../mod/notify.php:65
+msgid "System Notifications"
+msgstr "Notificaciones del sistema"
+
+#: ../../mod/notifications.php:423
+msgid "No more personal notifications."
+msgstr "No hay más notificaciones personales."
+
+#: ../../mod/notifications.php:427
+msgid "Personal Notifications"
+msgstr "Notificaciones personales"
+
+#: ../../mod/notifications.php:504
+msgid "No more home notifications."
+msgstr "No hay más notificaciones de inicio."
+
+#: ../../mod/notifications.php:508
+msgid "Home Notifications"
+msgstr "Notificaciones de Inicio"
+
+#: ../../mod/contacts.php:84 ../../mod/contacts.php:164
+msgid "Could not access contact record."
+msgstr "No se pudo acceder a los datos del contacto."
+
+#: ../../mod/contacts.php:98
+msgid "Could not locate selected profile."
+msgstr "No se pudo encontrar el perfil seleccionado."
+
+#: ../../mod/contacts.php:121
+msgid "Contact updated."
+msgstr "Contacto actualizado."
+
+#: ../../mod/contacts.php:186
+msgid "Contact has been blocked"
+msgstr "El contacto ha sido bloqueado"
+
+#: ../../mod/contacts.php:186
+msgid "Contact has been unblocked"
+msgstr "El contacto ha sido desbloqueado"
+
+#: ../../mod/contacts.php:200
+msgid "Contact has been ignored"
+msgstr "El contacto ha sido ignorado"
+
+#: ../../mod/contacts.php:200
+msgid "Contact has been unignored"
+msgstr "El contacto ya no está ignorado"
+
+#: ../../mod/contacts.php:216
+msgid "Contact has been archived"
+msgstr "El contacto ha sido archivado"
+
+#: ../../mod/contacts.php:216
+msgid "Contact has been unarchived"
+msgstr "El contacto ya no está archivado"
+
+#: ../../mod/contacts.php:229
+msgid "Contact has been removed."
+msgstr "El contacto ha sido eliminado"
+
+#: ../../mod/contacts.php:263
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "Ahora tienes una amistad mutua con %s"
+
+#: ../../mod/contacts.php:267
+#, php-format
+msgid "You are sharing with %s"
+msgstr "Estás compartiendo con %s"
+
+#: ../../mod/contacts.php:272
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s está compartiendo contigo"
+
+#: ../../mod/contacts.php:289
+msgid "Private communications are not available for this contact."
+msgstr "Las comunicaciones privadas no está disponibles para este contacto."
+
+#: ../../mod/contacts.php:292
+msgid "Never"
+msgstr "Nunca"
+
+#: ../../mod/contacts.php:296
+msgid "(Update was successful)"
+msgstr "(La actualización se ha completado)"
+
+#: ../../mod/contacts.php:296
+msgid "(Update was not successful)"
+msgstr "(La actualización no se ha completado)"
+
+#: ../../mod/contacts.php:298
+msgid "Suggest friends"
+msgstr "Sugerir amigos"
+
+#: ../../mod/contacts.php:302
+#, php-format
+msgid "Network type: %s"
+msgstr "Tipo de red: %s"
+
+#: ../../mod/contacts.php:305 ../../include/contact_widgets.php:190
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] "%d contacto en común"
+msgstr[1] "%d contactos en común"
+
+#: ../../mod/contacts.php:310
+msgid "View all contacts"
+msgstr "Ver todos los contactos"
+
+#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
+#: ../../mod/admin.php:696
+msgid "Unblock"
+msgstr "Desbloquear"
+
+#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
+#: ../../mod/admin.php:695
+msgid "Block"
+msgstr "Bloquear"
+
+#: ../../mod/contacts.php:318
+msgid "Toggle Blocked status"
+msgstr "Cambiar bloqueados"
+
+#: ../../mod/contacts.php:321 ../../mod/contacts.php:375
+msgid "Unignore"
+msgstr "Quitar de Ignorados"
+
+#: ../../mod/contacts.php:324
+msgid "Toggle Ignored status"
+msgstr "Cambiar ignorados"
+
+#: ../../mod/contacts.php:328
+msgid "Unarchive"
+msgstr "Sin archivar"
+
+#: ../../mod/contacts.php:328
+msgid "Archive"
+msgstr "Archivo"
+
+#: ../../mod/contacts.php:331
+msgid "Toggle Archive status"
+msgstr "Cambiar archivados"
+
+#: ../../mod/contacts.php:334
+msgid "Repair"
+msgstr "Reparar"
+
+#: ../../mod/contacts.php:337
+msgid "Advanced Contact Settings"
+msgstr "Configuración avanzada"
+
+#: ../../mod/contacts.php:343
+msgid "Communications lost with this contact!"
+msgstr "¡Se ha perdido la comunicación con este contacto!"
+
+#: ../../mod/contacts.php:346
+msgid "Contact Editor"
+msgstr "Editor de contactos"
+
+#: ../../mod/contacts.php:349
+msgid "Profile Visibility"
+msgstr "Visibilidad del Perfil"
+
+#: ../../mod/contacts.php:350
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura."
+
+#: ../../mod/contacts.php:351
+msgid "Contact Information / Notes"
+msgstr "Información del Contacto / Notas"
+
+#: ../../mod/contacts.php:352
+msgid "Edit contact notes"
+msgstr "Editar notas del contacto"
+
+#: ../../mod/contacts.php:357 ../../mod/contacts.php:549
+#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Ver el perfil de %s [%s]"
+
+#: ../../mod/contacts.php:358
+msgid "Block/Unblock contact"
+msgstr "Boquear/Desbloquear contacto"
+
+#: ../../mod/contacts.php:359
+msgid "Ignore contact"
+msgstr "Ignorar contacto"
+
+#: ../../mod/contacts.php:360
+msgid "Repair URL settings"
+msgstr "Configuración de reparación de la dirección"
+
+#: ../../mod/contacts.php:361
+msgid "View conversations"
+msgstr "Ver conversaciones"
+
+#: ../../mod/contacts.php:363
+msgid "Delete contact"
+msgstr "Eliminar contacto"
+
+#: ../../mod/contacts.php:367
+msgid "Last update:"
+msgstr "Última actualización:"
+
+#: ../../mod/contacts.php:369
+msgid "Update public posts"
+msgstr "Actualizar publicaciones públicas"
+
+#: ../../mod/contacts.php:371 ../../mod/admin.php:1167
+msgid "Update now"
+msgstr "Actualizar ahora"
+
+#: ../../mod/contacts.php:378
+msgid "Currently blocked"
+msgstr "Bloqueados"
+
+#: ../../mod/contacts.php:379
+msgid "Currently ignored"
+msgstr "Ignorados"
+
+#: ../../mod/contacts.php:380
+msgid "Currently archived"
+msgstr "Archivados"
+
+#: ../../mod/contacts.php:381
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía <strong>pueden</strong> ser visibles."
+
+#: ../../mod/contacts.php:434
+msgid "Suggestions"
+msgstr "Sugerencias"
+
+#: ../../mod/contacts.php:437
+msgid "Suggest potential friends"
+msgstr "Amistades potenciales sugeridas"
+
+#: ../../mod/contacts.php:440 ../../mod/group.php:191
+msgid "All Contacts"
+msgstr "Todos los contactos"
+
+#: ../../mod/contacts.php:443
+msgid "Show all contacts"
+msgstr "Mostrar todos los contactos"
+
+#: ../../mod/contacts.php:446
+msgid "Unblocked"
+msgstr "Desbloqueados"
+
+#: ../../mod/contacts.php:449
+msgid "Only show unblocked contacts"
+msgstr "Mostrar solo contactos sin bloquear"
+
+#: ../../mod/contacts.php:453
+msgid "Blocked"
+msgstr "Bloqueados"
+
+#: ../../mod/contacts.php:456
+msgid "Only show blocked contacts"
+msgstr "Mostrar solo contactos bloqueados"
+
+#: ../../mod/contacts.php:460
+msgid "Ignored"
+msgstr "Ignorados"
+
+#: ../../mod/contacts.php:463
+msgid "Only show ignored contacts"
+msgstr "Mostrar solo contactos ignorados"
+
+#: ../../mod/contacts.php:467
+msgid "Archived"
+msgstr "Archivados"
+
+#: ../../mod/contacts.php:470
+msgid "Only show archived contacts"
+msgstr "Mostrar solo contactos archivados"
+
+#: ../../mod/contacts.php:474
+msgid "Hidden"
+msgstr "Ocultos"
+
+#: ../../mod/contacts.php:477
+msgid "Only show hidden contacts"
+msgstr "Mostrar solo contactos ocultos"
+
+#: ../../mod/contacts.php:525
+msgid "Mutual Friendship"
+msgstr "Amistad recíproca"
+
+#: ../../mod/contacts.php:529
+msgid "is a fan of yours"
+msgstr "es tu fan"
+
+#: ../../mod/contacts.php:533
+msgid "you are a fan of"
+msgstr "eres fan de"
+
+#: ../../mod/contacts.php:550 ../../mod/nogroup.php:41
+msgid "Edit contact"
+msgstr "Modificar contacto"
+
+#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:129
+#: ../../include/nav.php:139
+msgid "Contacts"
+msgstr "Contactos"
+
+#: ../../mod/contacts.php:575
+msgid "Search your contacts"
+msgstr "Buscar en tus contactos"
+
+#: ../../mod/contacts.php:576 ../../mod/directory.php:59
+msgid "Finding: "
+msgstr "Buscando: "
+
+#: ../../mod/contacts.php:577 ../../mod/directory.php:61
+#: ../../include/contact_widgets.php:33
+msgid "Find"
+msgstr "Buscar"
+
+#: ../../mod/lostpass.php:16
+msgid "No valid account found."
+msgstr "No se ha encontrado ninguna cuenta válida"
+
+#: ../../mod/lostpass.php:32
+msgid "Password reset request issued. Check your email."
+msgstr "Solicitud de restablecimiento de contraseña enviada. Revisa tu correo."
+
+#: ../../mod/lostpass.php:43
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Contraseña restablecida enviada a %s"
+
+#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
+#: ../../mod/register.php:90 ../../mod/register.php:144
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
+#: ../../addon/facebook/facebook.php:702
+#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
+#: ../../addon/public_server/public_server.php:62
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3296
+#: ../../boot.php:788
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../../mod/lostpass.php:65
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "La solicitud no puede ser verificada (deberías haberla proporcionado antes). Falló el restablecimiento de la contraseña."
+
+#: ../../mod/lostpass.php:83 ../../boot.php:925
+msgid "Password Reset"
+msgstr "Restablecer la contraseña"
+
+#: ../../mod/lostpass.php:84
+msgid "Your password has been reset as requested."
+msgstr "Tu contraseña ha sido restablecida como solicitaste."
+
+#: ../../mod/lostpass.php:85
+msgid "Your new password is"
+msgstr "Tu nueva contraseña es"
+
+#: ../../mod/lostpass.php:86
+msgid "Save or copy your new password - and then"
+msgstr "Guarda o copia tu nueva contraseña y luego"
+
+#: ../../mod/lostpass.php:87
+msgid "click here to login"
+msgstr "pulsa aquí para acceder"
+
+#: ../../mod/lostpass.php:88
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Puedes cambiar tu contraseña desde la página de <em>Configuración</em> después de acceder con éxito."
+
+#: ../../mod/lostpass.php:119
+msgid "Forgot your Password?"
+msgstr "¿Olvidaste tu contraseña?"
+
+#: ../../mod/lostpass.php:120
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Introduce tu correo para restablecer tu contraseña. Luego comprueba tu correo para las instrucciones adicionales."
+
+#: ../../mod/lostpass.php:121
+msgid "Nickname or Email: "
+msgstr "Apodo o Correo electrónico: "
+
+#: ../../mod/lostpass.php:122
+msgid "Reset"
+msgstr "Restablecer"
+
+#: ../../mod/settings.php:30 ../../include/nav.php:137
+msgid "Account settings"
+msgstr "Configuración de tu cuenta"
+
+#: ../../mod/settings.php:35
+msgid "Display settings"
+msgstr "Mostrar configuración"
+
+#: ../../mod/settings.php:41
+msgid "Connector settings"
+msgstr "Configuración del conector"
+
+#: ../../mod/settings.php:46
+msgid "Plugin settings"
+msgstr "Configuración de los módulos"
+
+#: ../../mod/settings.php:51
+msgid "Connected apps"
+msgstr "Aplicaciones conectadas"
+
+#: ../../mod/settings.php:56
+msgid "Export personal data"
+msgstr "Exportación de datos personales"
+
+#: ../../mod/settings.php:61
+msgid "Remove account"
+msgstr "Eliminar cuenta"
+
+#: ../../mod/settings.php:69 ../../mod/newmember.php:22
+#: ../../mod/admin.php:782 ../../mod/admin.php:987
+#: ../../addon/dav/friendica/layout.fnk.php:225
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
+msgid "Settings"
+msgstr "Configuración"
+
+#: ../../mod/settings.php:113
+msgid "Missing some important data!"
+msgstr "¡Faltan algunos datos importantes!"
+
+#: ../../mod/settings.php:116 ../../mod/settings.php:569
+msgid "Update"
+msgstr "Actualizar"
+
+#: ../../mod/settings.php:221
+msgid "Failed to connect with email account using the settings provided."
+msgstr "Error al conectar con la cuenta de correo mediante la configuración suministrada."
+
+#: ../../mod/settings.php:226
+msgid "Email settings updated."
+msgstr "Configuración de correo actualizada."
+
+#: ../../mod/settings.php:290
+msgid "Passwords do not match. Password unchanged."
+msgstr "Las contraseñas no coinciden. La contraseña no ha sido modificada."
+
+#: ../../mod/settings.php:295
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "No se permiten contraseñas vacías. La contraseña no ha sido modificada."
+
+#: ../../mod/settings.php:306
+msgid "Password changed."
+msgstr "Contraseña modificada."
+
+#: ../../mod/settings.php:308
+msgid "Password update failed. Please try again."
+msgstr "La actualización de la contraseña ha fallado. Por favor, prueba otra vez."
+
+#: ../../mod/settings.php:373
+msgid " Please use a shorter name."
+msgstr " Usa un nombre más corto."
+
+#: ../../mod/settings.php:375
+msgid " Name too short."
+msgstr " Nombre demasiado corto."
+
+#: ../../mod/settings.php:381
+msgid " Not valid email."
+msgstr " Correo no válido."
+
+#: ../../mod/settings.php:383
+msgid " Cannot change to that email."
+msgstr " No se puede usar ese correo."
+
+#: ../../mod/settings.php:437
+msgid "Private forum has no privacy permissions. Using default privacy group."
+msgstr "El foro privado no tiene permisos de privacidad. Usando el grupo de privacidad por defecto."
+
+#: ../../mod/settings.php:441
+msgid "Private forum has no privacy permissions and no default privacy group."
+msgstr "El foro privado no tiene permisos de privacidad ni grupo por defecto de privacidad."
+
+#: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495
+#: ../../addon/fbpost/fbpost.php:144 ../../addon/impressum/impressum.php:78
+#: ../../addon/openstreetmap/openstreetmap.php:80
+#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
+#: ../../addon/twitter/twitter.php:389
+msgid "Settings updated."
+msgstr "Configuración actualizada."
+
+#: ../../mod/settings.php:542 ../../mod/settings.php:568
+#: ../../mod/settings.php:604
+msgid "Add application"
+msgstr "Agregar aplicación"
+
+#: ../../mod/settings.php:546 ../../mod/settings.php:572
+#: ../../addon/statusnet/statusnet.php:570
+msgid "Consumer Key"
+msgstr "Clave del consumidor"
+
+#: ../../mod/settings.php:547 ../../mod/settings.php:573
+#: ../../addon/statusnet/statusnet.php:569
+msgid "Consumer Secret"
+msgstr "Secreto del consumidor"
+
+#: ../../mod/settings.php:548 ../../mod/settings.php:574
+msgid "Redirect"
+msgstr "Redirigir"
+
+#: ../../mod/settings.php:549 ../../mod/settings.php:575
+msgid "Icon url"
+msgstr "Dirección del ícono"
+
+#: ../../mod/settings.php:560
+msgid "You can't edit this application."
+msgstr "No puedes editar esta aplicación."
+
+#: ../../mod/settings.php:603
+msgid "Connected Apps"
+msgstr "Aplicaciones conectadas"
+
+#: ../../mod/settings.php:607
+msgid "Client key starts with"
+msgstr "Clave de cliente comienza por"
+
+#: ../../mod/settings.php:608
+msgid "No name"
+msgstr "Sin nombre"
+
+#: ../../mod/settings.php:609
+msgid "Remove authorization"
+msgstr "Suprimir la autorización"
+
+#: ../../mod/settings.php:620
+msgid "No Plugin settings configured"
+msgstr "No se ha configurado ningún módulo"
+
+#: ../../mod/settings.php:628 ../../addon/widgets/widgets.php:123
+msgid "Plugin Settings"
+msgstr "Configuración de los módulos"
+
+#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
+msgstr "El soporte integrado de conexión con %s está %s"
+
+#: ../../mod/settings.php:640 ../../mod/settings.php:641
+msgid "enabled"
+msgstr "habilitado"
+
+#: ../../mod/settings.php:640 ../../mod/settings.php:641
+msgid "disabled"
+msgstr "deshabilitado"
+
+#: ../../mod/settings.php:641
+msgid "StatusNet"
+msgstr "StatusNet"
+
+#: ../../mod/settings.php:673
+msgid "Email access is disabled on this site."
+msgstr "El acceso por correo está deshabilitado en esta web."
+
+#: ../../mod/settings.php:679
+msgid "Connector Settings"
+msgstr "Configuración del conector"
+
+#: ../../mod/settings.php:684
+msgid "Email/Mailbox Setup"
+msgstr "Configuración del correo/buzón"
+
+#: ../../mod/settings.php:685
+msgid ""
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
+msgstr "Si quieres comunicarte con tus contactos de correo usando este servicio (opcional), por favor, especifica cómo conectar con tu buzón."
+
+#: ../../mod/settings.php:686
+msgid "Last successful email check:"
+msgstr "Última comprobación del correo con éxito:"
+
+#: ../../mod/settings.php:688
+msgid "IMAP server name:"
+msgstr "Nombre del servidor IMAP:"
+
+#: ../../mod/settings.php:689
+msgid "IMAP port:"
+msgstr "Puerto IMAP:"
+
+#: ../../mod/settings.php:690
+msgid "Security:"
+msgstr "Seguridad:"
+
+#: ../../mod/settings.php:690 ../../mod/settings.php:695
+#: ../../addon/dav/common/wdcal_edit.inc.php:191
+msgid "None"
+msgstr "Ninguna"
+
+#: ../../mod/settings.php:691
+msgid "Email login name:"
+msgstr "Nombre de usuario:"
+
+#: ../../mod/settings.php:692
+msgid "Email password:"
+msgstr "Contraseña:"
+
+#: ../../mod/settings.php:693
+msgid "Reply-to address:"
+msgstr "Dirección de respuesta:"
+
+#: ../../mod/settings.php:694
+msgid "Send public posts to all email contacts:"
+msgstr "Enviar publicaciones públicas a todos los contactos de correo:"
+
+#: ../../mod/settings.php:695
+msgid "Action after import:"
+msgstr "Acción después de importar:"
+
+#: ../../mod/settings.php:695
+msgid "Mark as seen"
+msgstr "Marcar como leído"
+
+#: ../../mod/settings.php:695
+msgid "Move to folder"
+msgstr "Mover a un directorio"
+
+#: ../../mod/settings.php:696
+msgid "Move to folder:"
+msgstr "Mover al directorio:"
+
+#: ../../mod/settings.php:727 ../../mod/admin.php:402
+msgid "No special theme for mobile devices"
+msgstr "No hay tema especial para dispositivos móviles"
+
+#: ../../mod/settings.php:767
+msgid "Display Settings"
+msgstr "Mostrar Configuración"
+
+#: ../../mod/settings.php:773 ../../mod/settings.php:784
+msgid "Display Theme:"
+msgstr "Utilizar tema:"
+
+#: ../../mod/settings.php:774
+msgid "Mobile Theme:"
+msgstr "Tema móvil:"
+
+#: ../../mod/settings.php:775
+msgid "Update browser every xx seconds"
+msgstr "Actualizar navegador cada xx segundos"
+
+#: ../../mod/settings.php:775
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Mínimo 10 segundos, sin máximo"
+
+#: ../../mod/settings.php:776
+msgid "Number of items to display per page:"
+msgstr "Número de elementos a mostrar por página:"
+
+#: ../../mod/settings.php:776
+msgid "Maximum of 100 items"
+msgstr "Máximo 100 elementos"
+
+#: ../../mod/settings.php:777
+msgid "Don't show emoticons"
+msgstr "No mostrar emoticones"
+
+#: ../../mod/settings.php:853
+msgid "Normal Account Page"
+msgstr "Página de cuenta normal"
+
+#: ../../mod/settings.php:854
+msgid "This account is a normal personal profile"
+msgstr "Esta cuenta es el perfil personal normal"
+
+#: ../../mod/settings.php:857
+msgid "Soapbox Page"
+msgstr "Página de tribuna"
+
+#: ../../mod/settings.php:858
+msgid "Automatically approve all connection/friend requests as read-only fans"
+msgstr "Acepta automáticamente todas las peticiones de conexión/amistad como seguidores de solo-lectura"
+
+#: ../../mod/settings.php:861
+msgid "Community Forum/Celebrity Account"
+msgstr "Cuenta de Comunidad, Foro o Celebridad"
+
+#: ../../mod/settings.php:862
+msgid ""
+"Automatically approve all connection/friend requests as read-write fans"
+msgstr "Acepta automáticamente todas las peticiones de conexión/amistad como seguidores de lectura-escritura"
+
+#: ../../mod/settings.php:865
+msgid "Automatic Friend Page"
+msgstr "Página de Amistad autómatica"
+
+#: ../../mod/settings.php:866
+msgid "Automatically approve all connection/friend requests as friends"
+msgstr "Aceptar automáticamente todas las solicitudes de conexión/amistad como amigos"
+
+#: ../../mod/settings.php:869
+msgid "Private Forum [Experimental]"
+msgstr "Foro privado [Experimental]"
+
+#: ../../mod/settings.php:870
+msgid "Private forum - approved members only"
+msgstr "Foro privado - solo miembros"
+
+#: ../../mod/settings.php:882
+msgid "OpenID:"
+msgstr "OpenID:"
+
+#: ../../mod/settings.php:882
+msgid "(Optional) Allow this OpenID to login to this account."
+msgstr "(Opcional) Permitir a este OpenID acceder a esta cuenta."
+
+#: ../../mod/settings.php:892
+msgid "Publish your default profile in your local site directory?"
+msgstr "¿Quieres publicar tu perfil predeterminado en el directorio local del sitio?"
+
+#: ../../mod/settings.php:898
+msgid "Publish your default profile in the global social directory?"
+msgstr "¿Quieres publicar tu perfil predeterminado en el directorio social de forma global?"
+
+#: ../../mod/settings.php:906
+msgid "Hide your contact/friend list from viewers of your default profile?"
+msgstr "¿Quieres ocultar tu lista de contactos/amigos en la vista de tu perfil predeterminado?"
+
+#: ../../mod/settings.php:910
+msgid "Hide your profile details from unknown viewers?"
+msgstr "¿Quieres que los detalles de tu perfil permanezcan ocultos a los desconocidos?"
+
+#: ../../mod/settings.php:915
+msgid "Allow friends to post to your profile page?"
+msgstr "¿Permites que tus amigos publiquen en tu página de perfil?"
+
+#: ../../mod/settings.php:921
+msgid "Allow friends to tag your posts?"
+msgstr "¿Permites a los amigos etiquetar tus publicaciones?"
+
+#: ../../mod/settings.php:927
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "¿Nos permite recomendarte como amigo potencial a los nuevos miembros?"
+
+#: ../../mod/settings.php:933
+msgid "Permit unknown people to send you private mail?"
+msgstr "¿Permites que desconocidos te manden correos privados?"
+
+#: ../../mod/settings.php:941
+msgid "Profile is <strong>not published</strong>."
+msgstr "El perfil <strong>no está publicado</strong>."
+
+#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248
+msgid "or"
+msgstr "o"
+
+#: ../../mod/settings.php:949
+msgid "Your Identity Address is"
+msgstr "Tu dirección personal es"
+
+#: ../../mod/settings.php:960
+msgid "Automatically expire posts after this many days:"
+msgstr "Las publicaciones expirarán automáticamente después de estos días:"
+
+#: ../../mod/settings.php:960
+msgid "If empty, posts will not expire. Expired posts will be deleted"
+msgstr "Si lo dejas vacío no expirarán nunca. Las publicaciones que hayan expirado se borrarán"
+
+#: ../../mod/settings.php:961
+msgid "Advanced expiration settings"
+msgstr "Configuración avanzada de expiración"
+
+#: ../../mod/settings.php:962
+msgid "Advanced Expiration"
+msgstr "Expiración avanzada"
+
+#: ../../mod/settings.php:963
+msgid "Expire posts:"
+msgstr "¿Expiran las publicaciones?"
+
+#: ../../mod/settings.php:964
+msgid "Expire personal notes:"
+msgstr "¿Expiran las notas personales?"
+
+#: ../../mod/settings.php:965
+msgid "Expire starred posts:"
+msgstr "¿Expiran los favoritos?"
+
+#: ../../mod/settings.php:966
+msgid "Expire photos:"
+msgstr "¿Expiran las fotografías?"
+
+#: ../../mod/settings.php:967
+msgid "Only expire posts by others:"
+msgstr "Solo expiran los mensajes de los demás:"
+
+#: ../../mod/settings.php:974
+msgid "Account Settings"
+msgstr "Configuración de la cuenta"
+
+#: ../../mod/settings.php:982
+msgid "Password Settings"
+msgstr "Configuración de la contraseña"
+
+#: ../../mod/settings.php:983
+msgid "New Password:"
+msgstr "Contraseña nueva:"
+
+#: ../../mod/settings.php:984
+msgid "Confirm:"
+msgstr "Confirmar:"
+
+#: ../../mod/settings.php:984
+msgid "Leave password fields blank unless changing"
+msgstr "Deja la contraseña en blanco si no quieres cambiarla"
+
+#: ../../mod/settings.php:988
+msgid "Basic Settings"
+msgstr "Configuración básica"
+
+#: ../../mod/settings.php:989 ../../include/profile_advanced.php:15
+msgid "Full Name:"
+msgstr "Nombre completo:"
+
+#: ../../mod/settings.php:990
+msgid "Email Address:"
+msgstr "Dirección de correo:"
+
+#: ../../mod/settings.php:991
+msgid "Your Timezone:"
+msgstr "Zona horaria:"
+
+#: ../../mod/settings.php:992
+msgid "Default Post Location:"
+msgstr "Localización predeterminada:"
+
+#: ../../mod/settings.php:993
+msgid "Use Browser Location:"
+msgstr "Usar localización del navegador:"
+
+#: ../../mod/settings.php:996
+msgid "Security and Privacy Settings"
+msgstr "Configuración de seguridad y privacidad"
+
+#: ../../mod/settings.php:998
+msgid "Maximum Friend Requests/Day:"
+msgstr "Máximo número de peticiones de amistad por día:"
+
+#: ../../mod/settings.php:998 ../../mod/settings.php:1017
+msgid "(to prevent spam abuse)"
+msgstr "(para prevenir el abuso de spam)"
+
+#: ../../mod/settings.php:999
+msgid "Default Post Permissions"
+msgstr "Permisos por defecto para las publicaciones"
+
+#: ../../mod/settings.php:1000
+msgid "(click to open/close)"
+msgstr "(pulsa para abrir/cerrar)"
+
+#: ../../mod/settings.php:1017
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Número máximo de mensajes diarios para desconocidos:"
+
+#: ../../mod/settings.php:1020
+msgid "Notification Settings"
+msgstr "Configuración de notificaciones"
+
+#: ../../mod/settings.php:1021
+msgid "By default post a status message when:"
+msgstr "Publicar en tu estado cuando:"
+
+#: ../../mod/settings.php:1022
+msgid "accepting a friend request"
+msgstr "aceptes una solicitud de amistad"
+
+#: ../../mod/settings.php:1023
+msgid "joining a forum/community"
+msgstr "te unas a un foro/comunidad"
+
+#: ../../mod/settings.php:1024
+msgid "making an <em>interesting</em> profile change"
+msgstr "hagas un cambio <em>interesante</em> en tu perfil"
+
+#: ../../mod/settings.php:1025
+msgid "Send a notification email when:"
+msgstr "Enviar notificación por correo cuando:"
+
+#: ../../mod/settings.php:1026
+msgid "You receive an introduction"
+msgstr "Recibas una presentación"
+
+#: ../../mod/settings.php:1027
+msgid "Your introductions are confirmed"
+msgstr "Tu presentación sea confirmada"
+
+#: ../../mod/settings.php:1028
+msgid "Someone writes on your profile wall"
+msgstr "Alguien escriba en el muro de mi perfil"
+
+#: ../../mod/settings.php:1029
+msgid "Someone writes a followup comment"
+msgstr "Algien escriba en un comentario que sigo"
+
+#: ../../mod/settings.php:1030
+msgid "You receive a private message"
+msgstr "Recibas un mensaje privado"
+
+#: ../../mod/settings.php:1031
+msgid "You receive a friend suggestion"
+msgstr "Recibas una sugerencia de amistad"
+
+#: ../../mod/settings.php:1032
+msgid "You are tagged in a post"
+msgstr "Seas etiquetado en una publicación"
+
+#: ../../mod/settings.php:1033
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Te han tocado/empujado/etc. en una publicación"
+
+#: ../../mod/settings.php:1036
+msgid "Advanced Account/Page Type Settings"
+msgstr "Configuración avanzada de tipo de Cuenta/Página"
+
+#: ../../mod/settings.php:1037
+msgid "Change the behaviour of this account for special situations"
+msgstr "Cambiar el comportamiento de esta cuenta para situaciones especiales"
+
+#: ../../mod/manage.php:91
+msgid "Manage Identities and/or Pages"
+msgstr "Administrar identidades y/o páginas"
+
+#: ../../mod/manage.php:94
+msgid ""
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
+msgstr "Cambia entre diferentes identidades o páginas de Comunidad/Grupos que comparten los detalles de tu cuenta o sobre los que tienes permisos para administrar"
+
+#: ../../mod/manage.php:96
+msgid "Select an identity to manage: "
+msgstr "Selecciona una identidad a gestionar:"
+
+#: ../../mod/network.php:97
+msgid "Search Results For:"
+msgstr "Resultados de la busqueda para:"
+
+#: ../../mod/network.php:137 ../../mod/search.php:16
+msgid "Remove term"
+msgstr "Eliminar término"
+
+#: ../../mod/network.php:146 ../../mod/search.php:13
+msgid "Saved Searches"
+msgstr "Búsquedas guardadas"
+
+#: ../../mod/network.php:147 ../../include/group.php:244
+msgid "add"
+msgstr "añadir"
+
+#: ../../mod/network.php:287
+msgid "Commented Order"
+msgstr "Orden de comentarios"
+
+#: ../../mod/network.php:290
+msgid "Sort by Comment Date"
+msgstr "Ordenar por fecha de comentarios"
+
+#: ../../mod/network.php:293
+msgid "Posted Order"
+msgstr "Orden de publicación"
+
+#: ../../mod/network.php:296
+msgid "Sort by Post Date"
+msgstr "Ordenar por fecha de publicación"
+
+#: ../../mod/network.php:303
+msgid "Posts that mention or involve you"
+msgstr "Publicaciones que te mencionan o involucran"
+
+#: ../../mod/network.php:306
+msgid "New"
+msgstr "Nuevo"
+
+#: ../../mod/network.php:309
+msgid "Activity Stream - by date"
+msgstr "Corriente de actividad por fecha"
+
+#: ../../mod/network.php:312
+msgid "Starred"
+msgstr "Favoritos"
+
+#: ../../mod/network.php:315
+msgid "Favourite Posts"
+msgstr "Publicaciones favoritas"
+
+#: ../../mod/network.php:318
+msgid "Shared Links"
+msgstr "Enlaces compartidos"
+
+#: ../../mod/network.php:321
+msgid "Interesting Links"
+msgstr "Enlaces interesantes"
+
+#: ../../mod/network.php:388
+#, 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] "Aviso: este grupo contiene %s contacto con conexión no segura."
+msgstr[1] "Aviso: este grupo contiene %s contactos con conexiones no seguras."
+
+#: ../../mod/network.php:391
+msgid "Private messages to this group are at risk of public disclosure."
+msgstr "Los mensajes privados a este grupo corren el riesgo de ser mostrados públicamente."
+
+#: ../../mod/network.php:461
+msgid "Contact: "
+msgstr "Contacto: "
+
+#: ../../mod/network.php:463
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente."
+
+#: ../../mod/network.php:468
+msgid "Invalid contact."
+msgstr "Contacto erróneo."
+
+#: ../../mod/notes.php:44 ../../boot.php:1696
+msgid "Personal Notes"
+msgstr "Notas personales"
+
+#: ../../mod/notes.php:63 ../../mod/filer.php:30
+#: ../../addon/facebook/facebook.php:770
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:263
+#: ../../addon/fbpost/fbpost.php:267
+#: ../../addon/dav/friendica/layout.fnk.php:441
+#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681
+msgid "Save"
+msgstr "Guardar"
+
+#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Excedido el número máximo de mensajes para %s. El mensaje no se ha enviado."
+
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:59
+msgid "No recipient selected."
+msgstr "Ningún destinatario seleccionado"
+
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr "Imposible comprobar tu servidor de inicio."
+
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
+msgid "Message could not be sent."
+msgstr "El mensaje no ha podido ser enviado."
+
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
+msgid "Message collection failure."
+msgstr "Fallo en la recolección de mensajes."
+
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
+msgid "Message sent."
+msgstr "Mensaje enviado."
+
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
+msgstr "Sin receptor."
+
+#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
+#: ../../mod/message.php:242 ../../mod/message.php:250
+#: ../../include/conversation.php:1181 ../../include/conversation.php:1198
+msgid "Please enter a link URL:"
+msgstr "Introduce la dirección del enlace:"
+
+#: ../../mod/wallmessage.php:138 ../../mod/message.php:278
+msgid "Send Private Message"
+msgstr "Enviar mensaje privado"
+
+#: ../../mod/wallmessage.php:139
+#, 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 quieres que %s te responda, asegúrate de que la configuración de privacidad permite enviar correo privado a desconocidos."
+
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:279
+#: ../../mod/message.php:469
+msgid "To:"
+msgstr "Para:"
+
+#: ../../mod/wallmessage.php:141 ../../mod/message.php:284
+#: ../../mod/message.php:471
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: ../../mod/wallmessage.php:147 ../../mod/message.php:288
+#: ../../mod/message.php:474 ../../mod/invite.php:113
+msgid "Your message:"
+msgstr "Tu mensaje:"
+
+#: ../../mod/newmember.php:6
+msgid "Welcome to Friendica"
+msgstr "Bienvenido a Friendica "
+
+#: ../../mod/newmember.php:8
+msgid "New Member Checklist"
+msgstr "Listado de nuevos miembros"
+
+#: ../../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 "Nos gustaría ofrecerte algunos consejos y enlaces para ayudar a hacer tu experiencia más amena. Pulsa en cualquier elemento para visitar la página correspondiente. Un enlace a esta página será visible desde tu página de inicio durante las dos semanas siguientes a tu inscripción y luego desaparecerá."
+
+#: ../../mod/newmember.php:14
+msgid "Getting Started"
+msgstr "Empezando"
+
+#: ../../mod/newmember.php:18
+msgid "Friendica Walk-Through"
+msgstr "Visita guiada a 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 "En tu página de <em>Inicio Rápido</em> - busca una introducción breve para tus pestañas de perfil y red, haz algunas conexiones nuevas, y busca algunos grupos a los que unirte."
+
+#: ../../mod/newmember.php:26
+msgid "Go to Your Settings"
+msgstr "Ir a tus ajustes"
+
+#: ../../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 página de <em>Configuración</em> puedes cambiar tu contraseña inicial. También aparece tu ID (Identity Address). Es parecida a una dirección de correo y te servirá para conectar con gente de redes sociales libres."
+
+#: ../../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 "Revisa las otras configuraciones, especialmente la configuración de privacidad. Un listado de directorio sin publicar es como tener un número de teléfono sin publicar. Normalmente querrás publicar tu listado, a menos que tus amigos y amigos potenciales sepan cómo ponerse en contacto contigo."
+
+#: ../../mod/newmember.php:32 ../../mod/profperm.php:103
+#: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7
+#: ../../include/profile_advanced.php:84 ../../include/nav.php:50
+#: ../../boot.php:1672
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:244
+msgid "Upload Profile Photo"
+msgstr "Subir 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 "Sube una foto para tu perfil si no lo has hecho aún. Los estudios han demostrado que la gente que usa fotos suyas reales tienen diez veces más éxito a la hora de entablar amistad que las que no."
+
+#: ../../mod/newmember.php:38
+msgid "Edit Your Profile"
+msgstr "Editar tu 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 "Edita tu perfil <strong>predeterminado</strong> como quieras. Revisa la configuración para ocultar tu lista de amigos o tu perfil a los visitantes desconocidos."
+
+#: ../../mod/newmember.php:40
+msgid "Profile Keywords"
+msgstr "Palabras clave 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 "Define en tu perfil público algunas palabras que describan tus intereses. Así podremos buscar otras personas con los mismos gustos y sugerirte posibles amigos."
+
+#: ../../mod/newmember.php:44
+msgid "Connecting"
+msgstr "Conectando"
+
+#: ../../mod/newmember.php:49 ../../mod/newmember.php:51
+#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239
+#: ../../include/contact_selectors.php:81
+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 "Autoriza la conexión con Facebook si ya tienes una cuenta en Facebook y nosotros (opcionalmente) importaremos tus amistades y conversaciones desde Facebook."
+
+#: ../../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> este es tu propio servidor privado, instalar el conector de Facebook puede facilitar el paso hacia la red social libre."
+
+#: ../../mod/newmember.php:56
+msgid "Importing Emails"
+msgstr "Importando correos electrónicos"
+
+#: ../../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 "Introduce la información para acceder a tu correo en la página de Configuración del conector si quieres importar e interactuar con amigos o listas de correos del buzón de entrada de tu correo electrónico."
+
+#: ../../mod/newmember.php:58
+msgid "Go to Your Contacts Page"
+msgstr "Ir a tu página de contactos"
+
+#: ../../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 "Tu página de Contactos es el portal desde donde podrás manejar tus amistades y conectarte con amigos de otras redes. Normalmente introduces su dirección o la dirección de su sitio web en el recuadro \"Añadir contacto nuevo\"."
+
+#: ../../mod/newmember.php:60
+msgid "Go to Your Site's Directory"
+msgstr "Ir al directorio de tu sitio"
+
+#: ../../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 "El Directorio te permite encontrar otras personas en esta red o en cualquier otro sitio federado. Busca algún enlace de <em>Conectar</em> o <em>Seguir</em> en su perfil. Proporciona tu direción personal si es necesario."
+
+#: ../../mod/newmember.php:62
+msgid "Finding New People"
+msgstr "Encontrando nueva gente"
+
+#: ../../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 "En el panel lateral de la página de Contactos existen varias herramientas para encontrar nuevos amigos. Podemos filtrar personas por sus intereses, buscar personas por nombre o por sus intereses, y ofrecerte sugerencias basadas en sus relaciones de la red. En un sitio nuevo, las sugerencias de amigos por lo general comienzan pasadas las 24 horas."
+
+#: ../../mod/newmember.php:66 ../../include/group.php:239
+msgid "Groups"
+msgstr "Grupos"
+
+#: ../../mod/newmember.php:70
+msgid "Group Your Contacts"
+msgstr "Agrupa tus contactos"
+
+#: ../../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 vez que tengas algunos amigos, puedes organizarlos en grupos privados de conversación mediante el memnú en tu página de Contactos y luego puedes interactuar con cada grupo por separado desde tu página de Red."
+
+#: ../../mod/newmember.php:73
+msgid "Why Aren't My Posts Public?"
+msgstr "¿Por qué mis publicaciones no son públicas?"
+
+#: ../../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 respeta tu privacidad. Por defecto, tus publicaciones solo se mostrarán a personas que hayas añadido como amistades. Para más información, mira la sección de ayuda en el enlace de más arriba."
+
+#: ../../mod/newmember.php:78
+msgid "Getting Help"
+msgstr "Consiguiendo ayuda"
+
+#: ../../mod/newmember.php:82
+msgid "Go to the Help Section"
+msgstr "Ir a la sección de ayuda"
+
+#: ../../mod/newmember.php:82
+msgid ""
+"Our <strong>help</strong> pages may be consulted for detail on other program"
+" features and resources."
+msgstr "Puedes consultar nuestra página de <strong>Ayuda</strong> para más información y recursos de ayuda."
+
+#: ../../mod/attach.php:8
+msgid "Item not available."
+msgstr "Elemento no disponible."
+
+#: ../../mod/attach.php:20
+msgid "Item was not found."
+msgstr "Elemento no encontrado."
+
+#: ../../mod/group.php:29
+msgid "Group created."
+msgstr "Grupo creado."
+
+#: ../../mod/group.php:35
+msgid "Could not create group."
+msgstr "Imposible crear el grupo."
+
+#: ../../mod/group.php:47 ../../mod/group.php:137
+msgid "Group not found."
+msgstr "Grupo no encontrado."
+
+#: ../../mod/group.php:60
+msgid "Group name changed."
+msgstr "El nombre del grupo ha cambiado."
+
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:316
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: ../../mod/group.php:90
+msgid "Create a group of contacts/friends."
+msgstr "Crea un grupo de contactos/amigos."
+
+#: ../../mod/group.php:91 ../../mod/group.php:177
+msgid "Group Name: "
+msgstr "Nombre del grupo: "
+
+#: ../../mod/group.php:110
+msgid "Group removed."
+msgstr "Grupo eliminado."
+
+#: ../../mod/group.php:112
+msgid "Unable to remove group."
+msgstr "No se puede eliminar el grupo."
+
+#: ../../mod/group.php:176
+msgid "Group Editor"
+msgstr "Editor de grupos"
+
+#: ../../mod/group.php:189
+msgid "Members"
+msgstr "Miembros"
+
+#: ../../mod/group.php:221 ../../mod/profperm.php:105
+msgid "Click on a contact to add or remove."
+msgstr "Pulsa en un contacto para añadirlo o eliminarlo."
+
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+msgid "Invalid profile identifier."
+msgstr "Identificador de perfil no válido."
+
+#: ../../mod/profperm.php:101
+msgid "Profile Visibility Editor"
+msgstr "Editor de visibilidad del perfil"
+
+#: ../../mod/profperm.php:114
+msgid "Visible To"
+msgstr "Visible para"
+
+#: ../../mod/profperm.php:130
+msgid "All Contacts (with secure profile access)"
+msgstr "Todos los contactos (con perfil de acceso seguro)"
+
+#: ../../mod/viewcontacts.php:39
+msgid "No contacts."
+msgstr "Ningún contacto."
+
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:618
+msgid "View Contacts"
+msgstr "Ver contactos"
+
+#: ../../mod/register.php:88 ../../mod/regmod.php:52
+#, php-format
+msgid "Registration details for %s"
+msgstr "Detalles de registro para %s"
+
+#: ../../mod/register.php:96
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr "Te has registrado con éxito. Por favor, consulta tu correo para más información."
+
+#: ../../mod/register.php:100
+msgid "Failed to send email message. Here is the message that failed."
+msgstr "Error al enviar el mensaje de correo. Este es el mensaje no enviado."
+
+#: ../../mod/register.php:105
+msgid "Your registration can not be processed."
+msgstr "Tu registro no se puede procesar."
+
+#: ../../mod/register.php:142
+#, php-format
+msgid "Registration request at %s"
+msgstr "Solicitud de registro en %s"
+
+#: ../../mod/register.php:151
+msgid "Your registration is pending approval by the site owner."
+msgstr "Tu registro está pendiente de aprobación por el propietario del sitio."
+
+#: ../../mod/register.php:189
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Este sitio ha excedido el número de registros diarios permitidos. Inténtalo de nuevo mañana por favor."
+
+#: ../../mod/register.php:217
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr "Puedes (opcionalmente) rellenar este formulario a través de OpenID escribiendo tu OpenID y pulsando en \"Registrar\"."
+
+#: ../../mod/register.php:218
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
+msgstr "Si no estás familiarizado con OpenID, por favor deja ese campo en blanco y rellena el resto de los elementos."
+
+#: ../../mod/register.php:219
+msgid "Your OpenID (optional): "
+msgstr "Tu OpenID (opcional):"
+
+#: ../../mod/register.php:233
+msgid "Include your profile in member directory?"
+msgstr "¿Incluir tu perfil en el directorio de miembros?"
+
+#: ../../mod/register.php:253
+msgid "Membership on this site is by invitation only."
+msgstr "Sitio solo accesible mediante invitación."
+
+#: ../../mod/register.php:254
+msgid "Your invitation ID: "
+msgstr "ID de tu invitación: "
+
+#: ../../mod/register.php:257 ../../mod/admin.php:444
+msgid "Registration"
+msgstr "Registro"
+
+#: ../../mod/register.php:265
+msgid "Your Full Name (e.g. Joe Smith): "
+msgstr "Tu nombre completo (por ejemplo, Manuel Pérez): "
+
+#: ../../mod/register.php:266
+msgid "Your Email Address: "
+msgstr "Tu dirección de correo: "
+
+#: ../../mod/register.php:267
+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 "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este sitio va a ser \"<strong>apodo@$nombredelsitio</strong>\"."
+
+#: ../../mod/register.php:268
+msgid "Choose a nickname: "
+msgstr "Escoge un apodo: "
+
+#: ../../mod/register.php:271 ../../include/nav.php:81 ../../boot.php:887
+msgid "Register"
+msgstr "Registrarse"
+
+#: ../../mod/dirfind.php:26
+msgid "People Search"
+msgstr "Buscar personas"
+
+#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:62
+#: ../../addon/facebook/facebook.php:1594
+#: ../../addon/communityhome/communityhome.php:158
+#: ../../addon/communityhome/communityhome.php:167
+#: ../../view/theme/diabook/theme.php:565
+#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1824
+#: ../../include/conversation.php:120 ../../include/conversation.php:129
+#: ../../include/conversation.php:250 ../../include/conversation.php:259
+msgid "status"
+msgstr "estado"
+
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598
+#: ../../addon/communityhome/communityhome.php:172
+#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840
+#: ../../include/conversation.php:137
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "A %1$s le gusta %3$s de %2$s"
+
+#: ../../mod/like.php:164 ../../include/conversation.php:140
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "A %1$s no le gusta %3$s de %2$s"
+
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
+#: ../../mod/admin.php:731 ../../mod/admin.php:930 ../../mod/display.php:29
+#: ../../mod/display.php:145 ../../include/items.php:3774
+msgid "Item not found."
+msgstr "Elemento no encontrado."
+
+#: ../../mod/viewsrc.php:7
+msgid "Access denied."
+msgstr "Acceso denegado."
+
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
+#: ../../include/nav.php:51 ../../boot.php:1679
+msgid "Photos"
+msgstr "Fotografías"
+
+#: ../../mod/fbrowser.php:96
+msgid "Files"
+msgstr "Archivos"
+
+#: ../../mod/regmod.php:61
+msgid "Account approved."
+msgstr "Cuenta aprobada."
+
+#: ../../mod/regmod.php:98
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registro anulado para %s"
+
+#: ../../mod/regmod.php:110
+msgid "Please login."
+msgstr "Por favor accede."
+
+#: ../../mod/item.php:91
+msgid "Unable to locate original post."
+msgstr "No se puede encontrar la publicación original."
+
+#: ../../mod/item.php:275
+msgid "Empty post discarded."
+msgstr "Publicación vacía descartada."
+
+#: ../../mod/item.php:407 ../../mod/wall_upload.php:133
+#: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149
+#: ../../include/message.php:144
+msgid "Wall Photos"
+msgstr "Foto del Muro"
+
+#: ../../mod/item.php:820
+msgid "System error. Post not saved."
+msgstr "Error del sistema. Mensaje no guardado."
+
+#: ../../mod/item.php:845
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social "
+"network."
+msgstr "Este mensaje te lo ha enviado %s, miembro de la red social Friendica."
+
+#: ../../mod/item.php:847
+#, php-format
+msgid "You may visit them online at %s"
+msgstr "Los puedes visitar en línea en %s"
+
+#: ../../mod/item.php:848
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr "Por favor contacta con el remitente respondiendo a este mensaje si no deseas recibir estos mensajes."
+
+#: ../../mod/item.php:850
+#, php-format
+msgid "%s posted an update."
+msgstr "%s ha publicado una actualización."
+
+#: ../../mod/mood.php:62 ../../include/conversation.php:228
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr "%1$s está actualmente %2$s"
+
+#: ../../mod/mood.php:133
+msgid "Mood"
+msgstr "Ánimo"
+
+#: ../../mod/mood.php:134
+msgid "Set your current mood and tell your friends"
+msgstr "Coloca tu ánimo actual y cuéntaselo a tus amigos"
+
+#: ../../mod/profile_photo.php:44
+msgid "Image uploaded but image cropping failed."
+msgstr "Imagen recibida, pero ha fallado al recortarla."
+
+#: ../../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 "Ha fallado la reducción de las dimensiones de la imagen [%s]."
+
+#: ../../mod/profile_photo.php:118
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Recarga la página o limpia la caché del navegador si la foto nueva no aparece inmediatamente."
+
+#: ../../mod/profile_photo.php:128
+msgid "Unable to process image"
+msgstr "Imposible procesar la imagen"
+
+#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr "El tamaño de la imagen supera el límite de %d"
+
+#: ../../mod/profile_photo.php:242
+msgid "Upload File:"
+msgstr "Subir archivo:"
+
+#: ../../mod/profile_photo.php:243
+msgid "Select a profile:"
+msgstr "Elige un perfil:"
+
+#: ../../mod/profile_photo.php:245
+#: ../../addon/dav/friendica/layout.fnk.php:152
+msgid "Upload"
+msgstr "Subir"
+
+#: ../../mod/profile_photo.php:248
+msgid "skip this step"
+msgstr "saltar este paso"
+
+#: ../../mod/profile_photo.php:248
+msgid "select a photo from your photo albums"
+msgstr "elige una foto de tus álbumes"
+
+#: ../../mod/profile_photo.php:262
+msgid "Crop Image"
+msgstr "Recortar imagen"
+
+#: ../../mod/profile_photo.php:263
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Por favor, ajusta el recorte de la imagen para optimizarla."
+
+#: ../../mod/profile_photo.php:265
+msgid "Done Editing"
+msgstr "Editado"
+
+#: ../../mod/profile_photo.php:299
+msgid "Image uploaded successfully."
+msgstr "Imagen subida con éxito."
+
+#: ../../mod/hcard.php:10
+msgid "No profile"
+msgstr "Nigún perfil"
+
+#: ../../mod/removeme.php:45 ../../mod/removeme.php:48
+msgid "Remove My Account"
+msgstr "Eliminar mi cuenta"
+
+#: ../../mod/removeme.php:46
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr "Esto eliminará por completo tu cuenta. Una vez hecho no se puede deshacer."
+
+#: ../../mod/removeme.php:47
+msgid "Please enter your password for verification:"
+msgstr "Por favor, introduce tu contraseña para la verificación:"
+
+#: ../../mod/message.php:9 ../../include/nav.php:131
+msgid "New Message"
+msgstr "Nuevo mensaje"
+
+#: ../../mod/message.php:63
+msgid "Unable to locate contact information."
+msgstr "No se puede encontrar información del contacto."
+
+#: ../../mod/message.php:191
+msgid "Message deleted."
+msgstr "Mensaje eliminado."
+
+#: ../../mod/message.php:221
+msgid "Conversation removed."
+msgstr "Conversación eliminada."
+
+#: ../../mod/message.php:327
+msgid "No messages."
+msgstr "No hay mensajes."
+
+#: ../../mod/message.php:334
+#, php-format
+msgid "Unknown sender - %s"
+msgstr "Remitente desconocido - %s"
+
+#: ../../mod/message.php:337
+#, php-format
+msgid "You and %s"
+msgstr "Tú y %s"
+
+#: ../../mod/message.php:340
+#, php-format
+msgid "%s and You"
+msgstr "%s y Tú"
+
+#: ../../mod/message.php:350 ../../mod/message.php:462
+msgid "Delete conversation"
+msgstr "Eliminar conversación"
+
+#: ../../mod/message.php:353
+msgid "D, d M Y - g:i A"
+msgstr "D, d M Y - g:i A"
+
+#: ../../mod/message.php:356
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d mensaje"
+msgstr[1] "%d mensajes"
+
+#: ../../mod/message.php:391
+msgid "Message not available."
+msgstr "Mensaje no disponibile."
+
+#: ../../mod/message.php:444
+msgid "Delete message"
+msgstr "Borrar mensaje"
+
+#: ../../mod/message.php:464
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "No hay comunicaciones seguras disponibles. <strong>Podrías</strong> responder desde la página de perfil del remitente. "
+
+#: ../../mod/message.php:468
+msgid "Send Reply"
+msgstr "Enviar respuesta"
+
+#: ../../mod/allfriends.php:34
+#, php-format
+msgid "Friends of %s"
+msgstr "Amigos de %s"
+
+#: ../../mod/allfriends.php:40
+msgid "No friends to display."
+msgstr "No hay amigos para mostrar."
+
+#: ../../mod/admin.php:55
+msgid "Theme settings updated."
+msgstr "Configuración de la apariencia actualizada."
+
+#: ../../mod/admin.php:96 ../../mod/admin.php:442
+msgid "Site"
+msgstr "Sitio"
+
+#: ../../mod/admin.php:97 ../../mod/admin.php:686 ../../mod/admin.php:698
+msgid "Users"
+msgstr "Usuarios"
+
+#: ../../mod/admin.php:98 ../../mod/admin.php:780 ../../mod/admin.php:822
+msgid "Plugins"
+msgstr "Módulos"
+
+#: ../../mod/admin.php:99 ../../mod/admin.php:985 ../../mod/admin.php:1021
+msgid "Themes"
+msgstr "Temas"
+
+#: ../../mod/admin.php:100
+msgid "DB updates"
+msgstr "Actualizaciones de la Base de Datos"
+
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1108
+msgid "Logs"
+msgstr "Registros"
+
+#: ../../mod/admin.php:120 ../../include/nav.php:146
+msgid "Admin"
+msgstr "Admin"
+
+#: ../../mod/admin.php:121
+msgid "Plugin Features"
+msgstr "Características del módulo"
+
+#: ../../mod/admin.php:123
+msgid "User registrations waiting for confirmation"
+msgstr "Registro de usuarios esperando la confirmación"
+
+#: ../../mod/admin.php:183 ../../mod/admin.php:668
+msgid "Normal Account"
+msgstr "Cuenta normal"
+
+#: ../../mod/admin.php:184 ../../mod/admin.php:669
+msgid "Soapbox Account"
+msgstr "Cuenta tribuna"
+
+#: ../../mod/admin.php:185 ../../mod/admin.php:670
+msgid "Community/Celebrity Account"
+msgstr "Cuenta de Comunidad/Celebridad"
+
+#: ../../mod/admin.php:186 ../../mod/admin.php:671
+msgid "Automatic Friend Account"
+msgstr "Cuenta de amistad automática"
+
+#: ../../mod/admin.php:187
+msgid "Blog Account"
+msgstr "Cuenta de blog"
+
+#: ../../mod/admin.php:188
+msgid "Private Forum"
+msgstr "Foro privado"
+
+#: ../../mod/admin.php:207
+msgid "Message queues"
+msgstr "Cola de mensajes"
+
+#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:685
+#: ../../mod/admin.php:779 ../../mod/admin.php:821 ../../mod/admin.php:984
+#: ../../mod/admin.php:1020 ../../mod/admin.php:1107
+msgid "Administration"
+msgstr "Administración"
+
+#: ../../mod/admin.php:213
+msgid "Summary"
+msgstr "Resumen"
+
+#: ../../mod/admin.php:215
+msgid "Registered users"
+msgstr "Usuarios registrados"
+
+#: ../../mod/admin.php:217
+msgid "Pending registrations"
+msgstr "Pendientes de registro"
+
+#: ../../mod/admin.php:218
+msgid "Version"
+msgstr "Versión"
+
+#: ../../mod/admin.php:220
+msgid "Active plugins"
+msgstr "Módulos activos"
+
+#: ../../mod/admin.php:373
+msgid "Site settings updated."
+msgstr "Configuración de actualización."
+
+#: ../../mod/admin.php:428
+msgid "Closed"
+msgstr "Cerrado"
+
+#: ../../mod/admin.php:429
+msgid "Requires approval"
+msgstr "Requiere aprobación"
+
+#: ../../mod/admin.php:430
+msgid "Open"
+msgstr "Abierto"
+
+#: ../../mod/admin.php:434
+msgid "No SSL policy, links will track page SSL state"
+msgstr "No existe una política de SSL, los vínculos harán un seguimiento del estado de SSL en la página"
+
+#: ../../mod/admin.php:435
+msgid "Force all links to use SSL"
+msgstr "Forzar todos los enlaces a utilizar SSL"
+
+#: ../../mod/admin.php:436
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr "Certificación personal, usa SSL solo para enlaces locales (no recomendado)"
+
+#: ../../mod/admin.php:445
+msgid "File upload"
+msgstr "Subida de archivo"
+
+#: ../../mod/admin.php:446
+msgid "Policies"
+msgstr "Políticas"
+
+#: ../../mod/admin.php:447
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:567
+msgid "Site name"
+msgstr "Nombre del sitio"
+
+#: ../../mod/admin.php:452
+msgid "Banner/Logo"
+msgstr "Imagen/Logotipo"
+
+#: ../../mod/admin.php:453
+msgid "System language"
+msgstr "Idioma"
+
+#: ../../mod/admin.php:454
+msgid "System theme"
+msgstr "Tema"
+
+#: ../../mod/admin.php:454
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr "Tema por defecto del sistema, los usuarios podrán elegir el suyo propio en su configuración <a href='#' id='cnftheme'>cambiar configuración del tema</a>"
+
+#: ../../mod/admin.php:455
+msgid "Mobile system theme"
+msgstr "Tema de sistema móvil"
+
+#: ../../mod/admin.php:455
+msgid "Theme for mobile devices"
+msgstr "Tema para dispositivos móviles"
+
+#: ../../mod/admin.php:456
+msgid "SSL link policy"
+msgstr "Política de enlaces SSL"
+
+#: ../../mod/admin.php:456
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr "Determina si los enlaces generados deben ser forzados a utilizar SSL"
+
+#: ../../mod/admin.php:457
+msgid "Maximum image size"
+msgstr "Tamaño máximo de la imagen"
+
+#: ../../mod/admin.php:457
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Tamaño máximo en bytes de las imágenes a subir. Por defecto es 0, que quiere decir que no hay límite."
+
+#: ../../mod/admin.php:458
+msgid "Maximum image length"
+msgstr "Largo máximo de imagen"
+
+#: ../../mod/admin.php:458
+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íxeles del lado más largo de las imágenes subidas. Por defecto es -1, que significa que no hay límites."
+
+#: ../../mod/admin.php:459
+msgid "JPEG image quality"
+msgstr "Calidad de imagen JPEG"
+
+#: ../../mod/admin.php:459
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr "Los archivos JPEG subidos se guardarán con este ajuste de calidad [0-100]. Por defecto es 100, que es calidad máxima."
+
+#: ../../mod/admin.php:461
+msgid "Register policy"
+msgstr "Política de registros"
+
+#: ../../mod/admin.php:462
+msgid "Register text"
+msgstr "Términos"
+
+#: ../../mod/admin.php:462
+msgid "Will be displayed prominently on the registration page."
+msgstr "Se mostrará en un lugar destacado en la página de registro."
+
+#: ../../mod/admin.php:463
+msgid "Accounts abandoned after x days"
+msgstr "Cuentas abandonadas después de x días"
+
+#: ../../mod/admin.php:463
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "No gastará recursos del sistema creando sondeos a sitios externos para cuentas abandonadas. Introduce 0 para ningún límite temporal."
+
+#: ../../mod/admin.php:464
+msgid "Allowed friend domains"
+msgstr "Dominios amigos permitidos"
+
+#: ../../mod/admin.php:464
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Lista separada por comas de los dominios que están autorizados para establecer conexiones con este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio"
+
+#: ../../mod/admin.php:465
+msgid "Allowed email domains"
+msgstr "Dominios de correo permitidos"
+
+#: ../../mod/admin.php:465
+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 "Lista separada por comas de los dominios que están autorizados en las direcciones de correo para registrarse en este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio"
+
+#: ../../mod/admin.php:466
+msgid "Block public"
+msgstr "Bloqueo público"
+
+#: ../../mod/admin.php:466
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Marca para bloquear el acceso público a todas las páginas personales, aún siendo públicas, hasta que no hayas iniciado tu sesión."
+
+#: ../../mod/admin.php:467
+msgid "Force publish"
+msgstr "Forzar publicación"
+
+#: ../../mod/admin.php:467
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Marca para forzar que todos los perfiles de este sitio sean listados en el directorio del sitio."
+
+#: ../../mod/admin.php:468
+msgid "Global directory update URL"
+msgstr "Dirección de actualización del directorio global"
+
+#: ../../mod/admin.php:468
+msgid ""
+"URL to update the global directory. If this is not set, the global directory"
+" is completely unavailable to the application."
+msgstr "Dirección para actualizar el directorio global. Si no se establece ningún valor el directorio global será inaccesible para la aplicación."
+
+#: ../../mod/admin.php:469
+msgid "Allow threaded items"
+msgstr "Permitir elementos en hilo"
+
+#: ../../mod/admin.php:469
+msgid "Allow infinite level threading for items on this site."
+msgstr "Permitir infinitos niveles de hilo para los elementos de este sitio."
+
+#: ../../mod/admin.php:470
+msgid "Private posts by default for new users"
+msgstr "Publicaciones privadas por defecto para usuarios nuevos"
+
+#: ../../mod/admin.php:470
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
+msgstr "Ajusta los permisos de publicación por defecto a los miembros nuevos al grupo privado por defecto en vez del público."
+
+#: ../../mod/admin.php:472
+msgid "Block multiple registrations"
+msgstr "Bloquear registros multiples"
+
+#: ../../mod/admin.php:472
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr "Impedir que los usuarios registren cuentas adicionales para su uso como páginas."
+
+#: ../../mod/admin.php:473
+msgid "OpenID support"
+msgstr "Soporte OpenID"
+
+#: ../../mod/admin.php:473
+msgid "OpenID support for registration and logins."
+msgstr "Soporte OpenID para registros y accesos."
+
+#: ../../mod/admin.php:474
+msgid "Fullname check"
+msgstr "Comprobar Nombre completo"
+
+#: ../../mod/admin.php:474
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr "Fuerza a los usuarios a registrarse con un espacio entre su nombre y su apellido en el campo Nombre completo como medida anti-spam"
+
+#: ../../mod/admin.php:475
+msgid "UTF-8 Regular expressions"
+msgstr "Expresiones regulares UTF-8"
+
+#: ../../mod/admin.php:475
+msgid "Use PHP UTF8 regular expressions"
+msgstr "Usar expresiones regulares de UTF8 en PHP"
+
+#: ../../mod/admin.php:476
+msgid "Show Community Page"
+msgstr "Ver página de la Comunidad"
+
+#: ../../mod/admin.php:476
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr "Mostrar una página de Comunidad que resuma todas las publicaciones públicas recientes de este sitio."
+
+#: ../../mod/admin.php:477
+msgid "Enable OStatus support"
+msgstr "Permitir soporte OStatus"
+
+#: ../../mod/admin.php:477
+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 "Provee una compatibilidad con OStatus (identi.ca, status.net, etc.) Todas las comunicaciones mediante OStatus son públicas, por lo que se mostrarán avisos sobre la privacidad con frecuencia."
+
+#: ../../mod/admin.php:478
+msgid "Enable Diaspora support"
+msgstr "Habilitar el soporte para Diaspora*"
+
+#: ../../mod/admin.php:478
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Provee una compatibilidad con la red de Diaspora."
+
+#: ../../mod/admin.php:479
+msgid "Only allow Friendica contacts"
+msgstr "Permitir solo contactos de Friendica"
+
+#: ../../mod/admin.php:479
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr "Todos los contactos deben usar protocolos de Friendica. El resto de protocolos serán desactivados."
+
+#: ../../mod/admin.php:480
+msgid "Verify SSL"
+msgstr "Verificar SSL"
+
+#: ../../mod/admin.php:480
+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 quieres puedes activar la comprobación estricta de certificados. Esto significa que serás incapaz de conectar con ningún sitio que use certificados SSL autofirmados."
+
+#: ../../mod/admin.php:481
+msgid "Proxy user"
+msgstr "Usuario proxy"
+
+#: ../../mod/admin.php:482
+msgid "Proxy URL"
+msgstr "Dirección proxy"
+
+#: ../../mod/admin.php:483
+msgid "Network timeout"
+msgstr "Tiempo de espera de red"
+
+#: ../../mod/admin.php:483
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Valor en segundos. Usar 0 para dejarlo sin límites (no se recomienda)."
+
+#: ../../mod/admin.php:484
+msgid "Delivery interval"
+msgstr "Intervalo de actualización"
+
+#: ../../mod/admin.php:484
+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 "Retrasar la entrega de procesos en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendamos: 4-5 para los servidores compartidos, 2-3 para servidores privados virtuales, 0-1 para los grandes servidores dedicados."
+
+#: ../../mod/admin.php:485
+msgid "Poll interval"
+msgstr "Intervalo de sondeo"
+
+#: ../../mod/admin.php:485
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr "Retrasar los procesos en segundo plano de sondeo en esta cantidad de segundos para reducir la carga del sistema. Si es 0, se usará el intervalo de entrega."
+
+#: ../../mod/admin.php:486
+msgid "Maximum Load Average"
+msgstr "Promedio de carga máxima"
+
+#: ../../mod/admin.php:486
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Carga máxima del sistema antes de que la entrega y los procesos de sondeo sean retrasados - por defecto 50."
+
+#: ../../mod/admin.php:503
+msgid "Update has been marked successful"
+msgstr "La actualización se ha completado con éxito"
+
+#: ../../mod/admin.php:513
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr "%s ha fallado, comprueba los registros."
+
+#: ../../mod/admin.php:516
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "Actualización %s aplicada con éxito."
+
+#: ../../mod/admin.php:520
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr "La actualización %s no ha informado, se desconoce el estado."
+
+#: ../../mod/admin.php:523
+#, php-format
+msgid "Update function %s could not be found."
+msgstr "No se puede encontrar la función de actualización %s."
+
+#: ../../mod/admin.php:538
+msgid "No failed updates."
+msgstr "Actualizaciones sin fallos."
+
+#: ../../mod/admin.php:542
+msgid "Failed Updates"
+msgstr "Actualizaciones fallidas"
+
+#: ../../mod/admin.php:543
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr "No se incluyen las anteriores a la 1139, que no indicaban su estado."
+
+#: ../../mod/admin.php:544
+msgid "Mark success (if update was manually applied)"
+msgstr "Marcar como correcta (si actualizaste manualmente)"
+
+#: ../../mod/admin.php:545
+msgid "Attempt to execute this update step automatically"
+msgstr "Intentando ejecutar este paso automáticamente"
+
+#: ../../mod/admin.php:570
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "%s usuario bloqueado/desbloqueado"
+msgstr[1] "%s usuarios bloqueados/desbloqueados"
+
+#: ../../mod/admin.php:577
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s usuario eliminado"
+msgstr[1] "%s usuarios eliminados"
+
+#: ../../mod/admin.php:616
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Usuario '%s' eliminado"
+
+#: ../../mod/admin.php:624
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "Usuario '%s' desbloqueado"
+
+#: ../../mod/admin.php:624
+#, php-format
+msgid "User '%s' blocked"
+msgstr "Usuario '%s' bloqueado'"
+
+#: ../../mod/admin.php:688
+msgid "select all"
+msgstr "seleccionar todo"
+
+#: ../../mod/admin.php:689
+msgid "User registrations waiting for confirm"
+msgstr "Registro de usuarios esperando confirmación"
+
+#: ../../mod/admin.php:690
+msgid "Request date"
+msgstr "Solicitud de fecha"
+
+#: ../../mod/admin.php:690 ../../mod/admin.php:699
+#: ../../include/contact_selectors.php:79
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: ../../mod/admin.php:691
+msgid "No registrations."
+msgstr "Sin registros."
+
+#: ../../mod/admin.php:693
+msgid "Deny"
+msgstr "Denegado"
+
+#: ../../mod/admin.php:699
+msgid "Register date"
+msgstr "Fecha de registro"
+
+#: ../../mod/admin.php:699
+msgid "Last login"
+msgstr "Último acceso"
+
+#: ../../mod/admin.php:699
+msgid "Last item"
+msgstr "Último elemento"
+
+#: ../../mod/admin.php:699
+msgid "Account"
+msgstr "Cuenta"
+
+#: ../../mod/admin.php:701
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "¡Los usuarios seleccionados serán eliminados!\\n\\n¡Todo lo que hayan publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
+
+#: ../../mod/admin.php:702
+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 "¡El usuario {0} será eliminado!\\n\\n¡Todo lo que haya publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
+
+#: ../../mod/admin.php:743
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Módulo %s deshabilitado."
+
+#: ../../mod/admin.php:747
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Módulo %s habilitado."
+
+#: ../../mod/admin.php:757 ../../mod/admin.php:955
+msgid "Disable"
+msgstr "Desactivado"
+
+#: ../../mod/admin.php:759 ../../mod/admin.php:957
+msgid "Enable"
+msgstr "Activado"
+
+#: ../../mod/admin.php:781 ../../mod/admin.php:986
+msgid "Toggle"
+msgstr "Activar"
+
+#: ../../mod/admin.php:789 ../../mod/admin.php:996
+msgid "Author: "
+msgstr "Autor:"
+
+#: ../../mod/admin.php:790 ../../mod/admin.php:997
+msgid "Maintainer: "
+msgstr "Mantenedor: "
+
+#: ../../mod/admin.php:919
+msgid "No themes found."
+msgstr "No se encontraron temas."
+
+#: ../../mod/admin.php:978
+msgid "Screenshot"
+msgstr "Captura de pantalla"
+
+#: ../../mod/admin.php:1026
+msgid "[Experimental]"
+msgstr "[Experimental]"
+
+#: ../../mod/admin.php:1027
+msgid "[Unsupported]"
+msgstr "[Sin soporte]"
+
+#: ../../mod/admin.php:1054
+msgid "Log settings updated."
+msgstr "Configuración de registro actualizada."
+
+#: ../../mod/admin.php:1110
+msgid "Clear"
+msgstr "Limpiar"
+
+#: ../../mod/admin.php:1116
+msgid "Debugging"
+msgstr "Depuración"
+
+#: ../../mod/admin.php:1117
+msgid "Log file"
+msgstr "Archivo de registro"
+
+#: ../../mod/admin.php:1117
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr "Debes tener permiso de escritura en el servidor. Relacionado con tu directorio de inicio de Friendica."
+
+#: ../../mod/admin.php:1118
+msgid "Log level"
+msgstr "Nivel de registro"
+
+#: ../../mod/admin.php:1168
+msgid "Close"
+msgstr "Cerrado"
+
+#: ../../mod/admin.php:1174
+msgid "FTP Host"
+msgstr "Hospedaje FTP"
+
+#: ../../mod/admin.php:1175
+msgid "FTP Path"
+msgstr "Ruta FTP"
+
+#: ../../mod/admin.php:1176
+msgid "FTP User"
+msgstr "Usuario FTP"
+
+#: ../../mod/admin.php:1177
+msgid "FTP Password"
+msgstr "Contraseña FTP"
+
+#: ../../mod/profile.php:22 ../../boot.php:1074
+msgid "Requested profile is not available."
+msgstr "El perfil solicitado no está disponible."
+
+#: ../../mod/profile.php:152 ../../mod/display.php:77
+msgid "Access to this profile has been restricted."
+msgstr "El acceso a este perfil ha sido restringido."
+
+#: ../../mod/profile.php:177
+msgid "Tips for New Members"
+msgstr "Consejos para nuevos miembros"
+
+#: ../../mod/ping.php:185
+msgid "{0} wants to be your friend"
+msgstr "{0} quiere ser tu amigo"
+
+#: ../../mod/ping.php:190
+msgid "{0} sent you a message"
+msgstr "{0} te ha enviado un mensaje"
+
+#: ../../mod/ping.php:195
+msgid "{0} requested registration"
+msgstr "{0} solicitudes de registro"
+
+#: ../../mod/ping.php:201
+#, php-format
+msgid "{0} commented %s's post"
+msgstr "{0} comentó la publicación de %s"
+
+#: ../../mod/ping.php:206
+#, php-format
+msgid "{0} liked %s's post"
+msgstr "A {0} le ha gustado la publicación de %s"
+
+#: ../../mod/ping.php:211
+#, php-format
+msgid "{0} disliked %s's post"
+msgstr "A {0} no le ha gustado la publicación de %s"
+
+#: ../../mod/ping.php:216
+#, php-format
+msgid "{0} is now friends with %s"
+msgstr "{0} ahora es amigo de %s"
+
+#: ../../mod/ping.php:221
+msgid "{0} posted"
+msgstr "{0} publicado"
+
+#: ../../mod/ping.php:226
+#, php-format
+msgid "{0} tagged %s's post with #%s"
+msgstr "{0} etiquetó la publicación de %s como #%s"
+
+#: ../../mod/ping.php:232
+msgid "{0} mentioned you in a post"
+msgstr "{0} te mencionó en una publicación"
+
+#: ../../mod/nogroup.php:58
+msgid "Contacts who are not members of a group"
+msgstr "Contactos sin grupo"
+
+#: ../../mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
+msgstr "Error de protocolo OpenID. ID no devuelta."
+
+#: ../../mod/openid.php:53
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "Cuenta no encontrada y el registro OpenID no está permitido en ese sitio."
+
+#: ../../mod/openid.php:93 ../../include/auth.php:98
+#: ../../include/auth.php:161
+msgid "Login failed."
+msgstr "Accesso fallido."
+
+#: ../../mod/follow.php:27
+msgid "Contact added"
+msgstr "Contacto añadido"
+
+#: ../../mod/common.php:42
+msgid "Common Friends"
+msgstr "Amigos comunes"
+
+#: ../../mod/common.php:78
+msgid "No contacts in common."
+msgstr "Sin contactos en común."
+
+#: ../../mod/share.php:28
+msgid "link"
+msgstr "enlace"
+
+#: ../../mod/display.php:138
 msgid "Item has been removed."
 msgstr "El elemento ha sido eliminado."
 
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
-msgid "Item not found"
-msgstr "Elemento no encontrado"
+#: ../../mod/apps.php:4
+msgid "Applications"
+msgstr "Aplicaciones"
 
-#: ../../mod/editpost.php:32
-msgid "Edit post"
-msgstr "Editar publicación"
+#: ../../mod/apps.php:7
+msgid "No installed applications."
+msgstr "Sin aplicaciones"
 
-#: ../../mod/editpost.php:75 ../../include/conversation.php:800
-msgid "Post to Email"
-msgstr "Publicar mediante correo electrónico"
+#: ../../mod/search.php:85 ../../include/text.php:678
+#: ../../include/text.php:679 ../../include/nav.php:91
+msgid "Search"
+msgstr "Buscar"
 
-#: ../../mod/editpost.php:91 ../../mod/message.php:135
-#: ../../mod/message.php:268 ../../include/conversation.php:815
-msgid "Upload photo"
-msgstr "Subir foto"
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:423
+#: ../../mod/profiles.php:537 ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
+msgstr "Perfil no encontrado."
 
-#: ../../mod/editpost.php:92 ../../include/conversation.php:816
-msgid "Attach file"
-msgstr "Adjuntar archivo"
+#: ../../mod/profiles.php:31
+msgid "Profile Name is required."
+msgstr "Se necesita un nombre de perfil."
 
-#: ../../mod/editpost.php:93 ../../mod/message.php:136
-#: ../../mod/message.php:269 ../../include/conversation.php:817
-msgid "Insert web link"
-msgstr "Insertar enlace"
+#: ../../mod/profiles.php:160
+msgid "Marital Status"
+msgstr "Estado civil"
 
-#: ../../mod/editpost.php:94
-msgid "Insert YouTube video"
-msgstr "Insertar video de YouTube"
+#: ../../mod/profiles.php:164
+msgid "Romantic Partner"
+msgstr "Pareja sentimental"
 
-#: ../../mod/editpost.php:95
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Insertar video Vorbis [.ogg]"
+#: ../../mod/profiles.php:168
+msgid "Likes"
+msgstr "Me gusta"
 
-#: ../../mod/editpost.php:96
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Insertar audio Vorbis [.ogg]"
+#: ../../mod/profiles.php:172
+msgid "Dislikes"
+msgstr "No me gusta"
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:820
-msgid "Set your location"
-msgstr "Configura tu localización"
+#: ../../mod/profiles.php:176
+msgid "Work/Employment"
+msgstr "Trabajo/estudios"
 
-#: ../../mod/editpost.php:98 ../../include/conversation.php:821
-msgid "Clear browser location"
-msgstr "Borrar la localización del navegador"
+#: ../../mod/profiles.php:179
+msgid "Religion"
+msgstr "Religión"
 
-#: ../../mod/editpost.php:100 ../../include/conversation.php:824
-msgid "Permission settings"
-msgstr "Configuración de permisos"
+#: ../../mod/profiles.php:183
+msgid "Political Views"
+msgstr "Preferencias políticas"
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:832
-msgid "CC: email addresses"
-msgstr "CC: dirección de correo electrónico"
+#: ../../mod/profiles.php:187
+msgid "Gender"
+msgstr "Género"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:833
-msgid "Public post"
-msgstr "Post público"
+#: ../../mod/profiles.php:191
+msgid "Sexual Preference"
+msgstr "Orientación sexual"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:835
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com"
+#: ../../mod/profiles.php:195
+msgid "Homepage"
+msgstr "Página de inicio"
+
+#: ../../mod/profiles.php:199
+msgid "Interests"
+msgstr "Intereses"
+
+#: ../../mod/profiles.php:203
+msgid "Address"
+msgstr "Dirección"
+
+#: ../../mod/profiles.php:210 ../../addon/dav/common/wdcal_edit.inc.php:183
+msgid "Location"
+msgstr "Ubicación"
+
+#: ../../mod/profiles.php:293
+msgid "Profile updated."
+msgstr "Perfil actualizado."
+
+#: ../../mod/profiles.php:360
+msgid " and "
+msgstr " y "
+
+#: ../../mod/profiles.php:368
+msgid "public profile"
+msgstr "perfil público"
+
+#: ../../mod/profiles.php:371
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s cambió su %2$s a &ldquo;%3$s&rdquo;"
+
+#: ../../mod/profiles.php:372
+#, php-format
+msgid " - Visit %1$s's %2$s"
+msgstr " - Visita %1$s's %2$s"
+
+#: ../../mod/profiles.php:375
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s tiene una actualización %2$s, cambiando %3$s."
+
+#: ../../mod/profiles.php:442
+msgid "Profile deleted."
+msgstr "Perfil eliminado."
+
+#: ../../mod/profiles.php:460 ../../mod/profiles.php:494
+msgid "Profile-"
+msgstr "Perfil-"
+
+#: ../../mod/profiles.php:479 ../../mod/profiles.php:521
+msgid "New profile created."
+msgstr "Nuevo perfil creado."
+
+#: ../../mod/profiles.php:500
+msgid "Profile unavailable to clone."
+msgstr "Imposible duplicar el perfil."
+
+#: ../../mod/profiles.php:562
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "¿Ocultar tu lista de contactos/amigos en este perfil?"
+
+#: ../../mod/profiles.php:582
+msgid "Edit Profile Details"
+msgstr "Editar detalles de tu perfil"
+
+#: ../../mod/profiles.php:584
+msgid "View this profile"
+msgstr "Ver este perfil"
+
+#: ../../mod/profiles.php:585
+msgid "Create a new profile using these settings"
+msgstr "¿Crear un nuevo perfil con esta configuración?"
+
+#: ../../mod/profiles.php:586
+msgid "Clone this profile"
+msgstr "Clonar este perfil"
+
+#: ../../mod/profiles.php:587
+msgid "Delete this profile"
+msgstr "Eliminar este perfil"
+
+#: ../../mod/profiles.php:588
+msgid "Profile Name:"
+msgstr "Nombres del perfil:"
+
+#: ../../mod/profiles.php:589
+msgid "Your Full Name:"
+msgstr "Tu nombre completo:"
+
+#: ../../mod/profiles.php:590
+msgid "Title/Description:"
+msgstr "Título/Descrición:"
+
+#: ../../mod/profiles.php:591
+msgid "Your Gender:"
+msgstr "Género:"
+
+#: ../../mod/profiles.php:592
+#, php-format
+msgid "Birthday (%s):"
+msgstr "Cumpleaños (%s):"
+
+#: ../../mod/profiles.php:593
+msgid "Street Address:"
+msgstr "Dirección"
+
+#: ../../mod/profiles.php:594
+msgid "Locality/City:"
+msgstr "Localidad/Ciudad:"
+
+#: ../../mod/profiles.php:595
+msgid "Postal/Zip Code:"
+msgstr "Código postal:"
+
+#: ../../mod/profiles.php:596
+msgid "Country:"
+msgstr "País"
+
+#: ../../mod/profiles.php:597
+msgid "Region/State:"
+msgstr "Región/Estado:"
+
+#: ../../mod/profiles.php:598
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\"&hearts;</span> Estado civil:"
+
+#: ../../mod/profiles.php:599
+msgid "Who: (if applicable)"
+msgstr "¿Quién? (si es aplicable)"
+
+#: ../../mod/profiles.php:600
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Ejemplos: cathy123, Cathy Williams, cathy@example.com"
+
+#: ../../mod/profiles.php:601
+msgid "Since [date]:"
+msgstr "Desde [fecha]:"
+
+#: ../../mod/profiles.php:602 ../../include/profile_advanced.php:46
+msgid "Sexual Preference:"
+msgstr "Preferencia sexual:"
+
+#: ../../mod/profiles.php:603
+msgid "Homepage URL:"
+msgstr "Dirección de tu página:"
+
+#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:50
+msgid "Hometown:"
+msgstr "Ciudad de origen:"
+
+#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:54
+msgid "Political Views:"
+msgstr "Ideas políticas:"
+
+#: ../../mod/profiles.php:606
+msgid "Religious Views:"
+msgstr "Creencias religiosas:"
+
+#: ../../mod/profiles.php:607
+msgid "Public Keywords:"
+msgstr "Palabras clave públicas:"
+
+#: ../../mod/profiles.php:608
+msgid "Private Keywords:"
+msgstr "Palabras clave privadas:"
+
+#: ../../mod/profiles.php:609 ../../include/profile_advanced.php:62
+msgid "Likes:"
+msgstr "Me gusta:"
+
+#: ../../mod/profiles.php:610 ../../include/profile_advanced.php:64
+msgid "Dislikes:"
+msgstr "No me gusta:"
+
+#: ../../mod/profiles.php:611
+msgid "Example: fishing photography software"
+msgstr "Ejemplo: pesca fotografía software"
+
+#: ../../mod/profiles.php:612
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr "(Utilizadas para sugerir amigos potenciales, otros pueden verlo)"
+
+#: ../../mod/profiles.php:613
+msgid "(Used for searching profiles, never shown to others)"
+msgstr "(Utilizadas para buscar perfiles, nunca se muestra a otros)"
+
+#: ../../mod/profiles.php:614
+msgid "Tell us about yourself..."
+msgstr "Háblanos sobre ti..."
+
+#: ../../mod/profiles.php:615
+msgid "Hobbies/Interests"
+msgstr "Aficiones/Intereses"
+
+#: ../../mod/profiles.php:616
+msgid "Contact information and Social Networks"
+msgstr "Informacioń de contacto y Redes sociales"
+
+#: ../../mod/profiles.php:617
+msgid "Musical interests"
+msgstr "Gustos musicales"
+
+#: ../../mod/profiles.php:618
+msgid "Books, literature"
+msgstr "Libros, literatura"
+
+#: ../../mod/profiles.php:619
+msgid "Television"
+msgstr "Televisión"
+
+#: ../../mod/profiles.php:620
+msgid "Film/dance/culture/entertainment"
+msgstr "Películas/baile/cultura/entretenimiento"
+
+#: ../../mod/profiles.php:621
+msgid "Love/romance"
+msgstr "Amor/Romance"
+
+#: ../../mod/profiles.php:622
+msgid "Work/employment"
+msgstr "Trabajo/ocupación"
+
+#: ../../mod/profiles.php:623
+msgid "School/education"
+msgstr "Escuela/estudios"
+
+#: ../../mod/profiles.php:628
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
+msgstr "Éste es tu perfil <strong>público</strong>.<br /><strong>Puede</strong> ser visto por cualquier usuario de internet."
+
+#: ../../mod/profiles.php:638 ../../mod/directory.php:111
+msgid "Age: "
+msgstr "Edad: "
+
+#: ../../mod/profiles.php:677
+msgid "Edit/Manage Profiles"
+msgstr "Editar/Administrar perfiles"
+
+#: ../../mod/profiles.php:678 ../../boot.php:1192
+msgid "Change profile photo"
+msgstr "Cambiar foto del perfil"
+
+#: ../../mod/profiles.php:679 ../../boot.php:1193
+msgid "Create New Profile"
+msgstr "Crear nuevo perfil"
+
+#: ../../mod/profiles.php:690 ../../boot.php:1203
+msgid "Profile Image"
+msgstr "Imagen del Perfil"
+
+#: ../../mod/profiles.php:692 ../../boot.php:1206
+msgid "visible to everybody"
+msgstr "Visible para todos"
+
+#: ../../mod/profiles.php:693 ../../boot.php:1207
+msgid "Edit visibility"
+msgstr "Editar visibilidad"
+
+#: ../../mod/filer.php:29 ../../include/conversation.php:1185
+#: ../../include/conversation.php:1202
+msgid "Save to Folder:"
+msgstr "Guardar en directorio:"
+
+#: ../../mod/filer.php:29
+msgid "- select -"
+msgstr "- seleccionar -"
+
+#: ../../mod/tagger.php:95 ../../include/conversation.php:267
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s ha etiquetado el %3$s de %2$s con %4$s"
+
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr "No se han localizado delegados potenciales de la página."
+
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
+msgstr "Delegar la administración de la página"
+
+#: ../../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 "Los delegados tienen la capacidad de gestionar todos los aspectos de esta cuenta/página, excepto los ajustes básicos de la cuenta. Por favor, no delegues tu cuenta personal a nadie en quien no confíes completamente."
+
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
+msgstr "Administradores actuales de la página"
+
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr "Delegados actuales de la página"
+
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Delegados potenciales"
+
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Añadir"
+
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Sin entradas."
+
+#: ../../mod/babel.php:17
+msgid "Source (bbcode) text:"
+msgstr "Texto fuente (bbcode):"
+
+#: ../../mod/babel.php:23
+msgid "Source (Diaspora) text to convert to BBcode:"
+msgstr "Fuente (Diaspora) para pasar a BBcode:"
+
+#: ../../mod/babel.php:31
+msgid "Source input: "
+msgstr "Entrada: "
+
+#: ../../mod/babel.php:35
+msgid "bb2html: "
+msgstr "bb2html: "
+
+#: ../../mod/babel.php:39
+msgid "bb2html2bb: "
+msgstr "bb2html2bb: "
+
+#: ../../mod/babel.php:43
+msgid "bb2md: "
+msgstr "bb2md: "
+
+#: ../../mod/babel.php:47
+msgid "bb2md2html: "
+msgstr "bb2md2html: "
+
+#: ../../mod/babel.php:51
+msgid "bb2dia2bb: "
+msgstr "bb2dia2bb: "
+
+#: ../../mod/babel.php:55
+msgid "bb2md2html2bb: "
+msgstr "bb2md2html2bb: "
+
+#: ../../mod/babel.php:65
+msgid "Source input (Diaspora format): "
+msgstr "Fuente (formato Diaspora): "
+
+#: ../../mod/babel.php:70
+msgid "diaspora2bb: "
+msgstr "diaspora2bb: "
+
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626
+#: ../../include/contact_widgets.php:34
+msgid "Friend Suggestions"
+msgstr "Sugerencias de amigos"
+
+#: ../../mod/suggest.php:44
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas."
+
+#: ../../mod/suggest.php:61
+msgid "Ignore/Hide"
+msgstr "Ignorar/Ocultar"
+
+#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:624
+msgid "Global Directory"
+msgstr "Directorio global"
+
+#: ../../mod/directory.php:57
+msgid "Find on this site"
+msgstr "Buscar en este sitio"
+
+#: ../../mod/directory.php:60
+msgid "Site Directory"
+msgstr "Directorio del sitio"
+
+#: ../../mod/directory.php:114
+msgid "Gender: "
+msgstr "Género:"
+
+#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
+#: ../../boot.php:1228
+msgid "Gender:"
+msgstr "Género:"
+
+#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
+#: ../../boot.php:1231
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
+#: ../../boot.php:1233
+msgid "Homepage:"
+msgstr "Página de inicio:"
+
+#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58
+msgid "About:"
+msgstr "Acerca de:"
+
+#: ../../mod/directory.php:180
+msgid "No entries (some entries may be hidden)."
+msgstr "Sin entradas (algunas pueden que estén ocultas)."
 
 #: ../../mod/invite.php:35
 #, php-format
 msgid "%s : Not a valid email address."
-msgstr "%s : No es una dirección válida de correo."
+msgstr "%s : No es una dirección de correo válida."
 
 #: ../../mod/invite.php:59
-#, php-format
-msgid "Please join my network on %s"
-msgstr "Por favor únete a mi red social en %s"
+msgid "Please join us on Friendica"
+msgstr "Únete a nosotros en Friendica"
 
 #: ../../mod/invite.php:69
 #, php-format
@@ -1580,2393 +4591,1337 @@ msgstr[1] "%d mensajes enviados."
 msgid "You have no more invitations available"
 msgstr "No tienes más invitaciones disponibles"
 
-#: ../../mod/invite.php:99
-msgid "Send invitations"
-msgstr "Enviar invitaciones"
-
 #: ../../mod/invite.php:100
-msgid "Enter email addresses, one per line:"
-msgstr "Introduce las direcciones de correo, una por línea:"
-
-#: ../../mod/invite.php:101 ../../mod/message.php:132
-#: ../../mod/message.php:265
-msgid "Your message:"
-msgstr "Tu mensaje:"
+#, 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 para ver una lista de servidores públicos donde puedes darte de alta. Los miembros de otros servidores de Friendica pueden conectarse entre ellos, así como con miembros de otras redes sociales diferentes."
 
 #: ../../mod/invite.php:102
 #, php-format
-msgid "Please join my social network on %s"
-msgstr "Únete a mi red social en % s"
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr "Para aceptar la invitación visita y regístrate en %s o en cualquier otro servidor público de Friendica."
 
 #: ../../mod/invite.php:103
-msgid "To accept this invitation, please visit:"
-msgstr "Para aceptar esta invitación, por favor visita:"
+#, 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 "Los servidores de Friendica están interconectados para crear una enorme red social centrada en la privacidad y controlada por sus miembros. También se puede conectar con muchas redes sociales tradicionales. Mira en %s para poder ver un listado de servidores alternativos de Friendica donde puedes darte de alta."
 
-#: ../../mod/invite.php:104
+#: ../../mod/invite.php:106
+msgid ""
+"Our apologies. This system is not currently configured to connect with other"
+" public sites or invite members."
+msgstr "Discúlpanos. Este sistema no está configurado actualmente para conectar con otros servidores públicos o invitar nuevos miembros."
+
+#: ../../mod/invite.php:111
+msgid "Send invitations"
+msgstr "Enviar invitaciones"
+
+#: ../../mod/invite.php:112
+msgid "Enter email addresses, one per line:"
+msgstr "Introduce las direcciones de correo, una por línea:"
+
+#: ../../mod/invite.php:114
+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 cordialmente invitado a unirte a mi y a otros amigos en Friendica, creemos juntos una red social mejor."
+
+#: ../../mod/invite.php:116
 msgid "You will need to supply this invitation code: $invite_code"
 msgstr "Tienes que proporcionar el siguiente código: $invite_code"
 
-#: ../../mod/invite.php:104
+#: ../../mod/invite.php:116
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
-msgstr ""
-"Una vez registrado, por favor contacta conmigo a través de mi página de "
-"perfil en:"
+msgstr "Una vez registrado, por favor contacta conmigo a través de mi página de perfil en:"
 
-#: ../../mod/ping.php:146
-msgid "{0} wants to be your friend"
-msgstr "{0} quiere ser tu amigo"
-
-#: ../../mod/ping.php:151
-msgid "{0} sent you a message"
-msgstr "{0} le ha enviado un mensaje"
-
-#: ../../mod/ping.php:156
-msgid "{0} requested registration"
-msgstr "{0} solicitudes de registro"
-
-#: ../../mod/ping.php:162
-#, php-format
-msgid "{0} commented %s's post"
-msgstr "{0} comentó el post de %s"
-
-#: ../../mod/ping.php:167
-#, php-format
-msgid "{0} liked %s's post"
-msgstr "A {0} le ha gustado el post de %s"
-
-#: ../../mod/ping.php:172
-#, php-format
-msgid "{0} disliked %s's post"
-msgstr "A {0} no le ha gustado el post de %s"
-
-#: ../../mod/ping.php:177
-#, php-format
-msgid "{0} is now friends with %s"
-msgstr "{0} ahora es amigo de %s"
-
-#: ../../mod/ping.php:182
-msgid "{0} posted"
-msgstr "{0} publicado"
-
-#: ../../mod/ping.php:187
-#, php-format
-msgid "{0} tagged %s's post with #%s"
-msgstr "{0} etiquetó la publicación de %s como #%s"
-
-#: ../../mod/contacts.php:62 ../../mod/contacts.php:133
-msgid "Could not access contact record."
-msgstr "No se pudo acceder a los datos del contacto."
-
-#: ../../mod/contacts.php:76
-msgid "Could not locate selected profile."
-msgstr "No se pudo encontrar el perfil seleccionado."
-
-#: ../../mod/contacts.php:97
-msgid "Contact updated."
-msgstr "Contacto actualizado."
-
-#: ../../mod/contacts.php:99 ../../mod/dfrn_request.php:409
-msgid "Failed to update contact record."
-msgstr "Error al actualizar el contacto."
-
-#: ../../mod/contacts.php:155
-msgid "Contact has been blocked"
-msgstr "El contacto ha sido bloqueado"
-
-#: ../../mod/contacts.php:155
-msgid "Contact has been unblocked"
-msgstr "El contacto ha sido desbloqueado"
-
-#: ../../mod/contacts.php:169
-msgid "Contact has been ignored"
-msgstr "El contacto ha sido ignorado"
-
-#: ../../mod/contacts.php:169
-msgid "Contact has been unignored"
-msgstr "El contacto ya no está ignorado"
-
-#: ../../mod/contacts.php:190
-msgid "stopped following"
-msgstr "dejó de seguir"
-
-#: ../../mod/contacts.php:211
-msgid "Contact has been removed."
-msgstr "El contacto ha sido eliminado"
-
-#: ../../mod/contacts.php:232
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr "Ahora tiene una amistad mutua con %s"
-
-#: ../../mod/contacts.php:236
-#, php-format
-msgid "You are sharing with %s"
-msgstr "Usted está compartiendo con %s"
-
-#: ../../mod/contacts.php:241
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s está compartiendo con usted"
-
-#: ../../mod/contacts.php:258
-msgid "Private communications are not available for this contact."
-msgstr "Las comunicaciones privadas no está disponibles para este contacto."
-
-#: ../../mod/contacts.php:261
-msgid "Never"
-msgstr "Nunca"
-
-#: ../../mod/contacts.php:265
-msgid "(Update was successful)"
-msgstr "(La actualización se ha completado)"
-
-#: ../../mod/contacts.php:265
-msgid "(Update was not successful)"
-msgstr "(La actualización no se ha completado)"
-
-#: ../../mod/contacts.php:267
-msgid "Suggest friends"
-msgstr "Sugerir amigos"
-
-#: ../../mod/contacts.php:271
-#, php-format
-msgid "Network type: %s"
-msgstr "Tipo de red: %s"
-
-#: ../../mod/contacts.php:274
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] "%d contacto en común"
-msgstr[1] "%d contactos en común"
-
-#: ../../mod/contacts.php:279
-msgid "View all contacts"
-msgstr "Ver todos los contactos"
-
-#: ../../mod/contacts.php:284 ../../mod/contacts.php:331
-#: ../../mod/admin.php:470
-msgid "Unblock"
-msgstr "Desbloquear"
-
-#: ../../mod/contacts.php:284 ../../mod/contacts.php:331
-#: ../../mod/admin.php:469
-msgid "Block"
-msgstr "Bloquear"
-
-#: ../../mod/contacts.php:289 ../../mod/contacts.php:332
-msgid "Unignore"
-msgstr "Quitar de Ignorados"
-
-#: ../../mod/contacts.php:289 ../../mod/contacts.php:332
-#: ../../mod/notifications.php:47 ../../mod/notifications.php:143
-#: ../../mod/notifications.php:187
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: ../../mod/contacts.php:294
-msgid "Repair"
-msgstr "Reparar"
-
-#: ../../mod/contacts.php:304
-msgid "Contact Editor"
-msgstr "Editor de contactos"
-
-#: ../../mod/contacts.php:307
-msgid "Profile Visibility"
-msgstr "Visibilidad del Perfil"
-
-#: ../../mod/contacts.php:308
-#, php-format
+#: ../../mod/invite.php:118
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr ""
-"Por favor selecciona el perfil que quieras mostrar a %s cuando esté viendo  "
-"tu perfil de forma segura."
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendica.com"
+msgstr "Para más información sobre el Proyecto Friendica y sobre por qué pensamos que es algo importante, visita http://friendica.com"
 
-#: ../../mod/contacts.php:309
-msgid "Contact Information / Notes"
-msgstr "Información del Contacto / Notas"
-
-#: ../../mod/contacts.php:310
-msgid "Edit contact notes"
-msgstr "Editar notas de contacto"
-
-#: ../../mod/contacts.php:315 ../../mod/contacts.php:430
-#: ../../mod/viewcontacts.php:61
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "Ver el perfil de %s [%s]"
-
-#: ../../mod/contacts.php:316
-msgid "Block/Unblock contact"
-msgstr "Boquear/Desbloquear contacto"
-
-#: ../../mod/contacts.php:317
-msgid "Ignore contact"
-msgstr "Ignorar contacto"
-
-#: ../../mod/contacts.php:318
-msgid "Repair URL settings"
-msgstr "Configuración de URL de reparación"
-
-#: ../../mod/contacts.php:319
-msgid "View conversations"
-msgstr "Ver conversaciones"
-
-#: ../../mod/contacts.php:321
-msgid "Delete contact"
-msgstr "Eliminar contacto"
-
-#: ../../mod/contacts.php:325
-msgid "Last update:"
-msgstr "Última actualización:"
-
-#: ../../mod/contacts.php:326
-msgid "Update public posts"
-msgstr "Actualizar posts públicos"
-
-#: ../../mod/contacts.php:328 ../../mod/admin.php:701
-msgid "Update now"
-msgstr "Actualizar ahora"
-
-#: ../../mod/contacts.php:335
-msgid "Currently blocked"
-msgstr "Bloqueados"
-
-#: ../../mod/contacts.php:336
-msgid "Currently ignored"
-msgstr "Ignorados"
-
-#: ../../mod/contacts.php:364 ../../include/nav.php:130
-msgid "Contacts"
-msgstr "Contactos"
-
-#: ../../mod/contacts.php:366
-msgid "Show Blocked Connections"
-msgstr "Mostrar conexiones bloqueadas"
-
-#: ../../mod/contacts.php:366
-msgid "Hide Blocked Connections"
-msgstr "Esconder conexiones bloqueadas"
-
-#: ../../mod/contacts.php:368
-msgid "Search your contacts"
-msgstr "Buscar tus contactos"
-
-#: ../../mod/contacts.php:369 ../../mod/directory.php:65
-msgid "Finding: "
-msgstr "Buscando: "
-
-#: ../../mod/contacts.php:370 ../../mod/directory.php:67
-#: ../../include/contact_widgets.php:34
-msgid "Find"
-msgstr "Buscar"
-
-#: ../../mod/contacts.php:406
-msgid "Mutual Friendship"
-msgstr "Amistad recíproca"
-
-#: ../../mod/contacts.php:410
-msgid "is a fan of yours"
-msgstr "es tu fan"
-
-#: ../../mod/contacts.php:414
-msgid "you are a fan of"
-msgstr "eres fan de"
-
-#: ../../mod/contacts.php:431 ../../include/Contact.php:129
-#: ../../include/conversation.php:679
-msgid "Edit contact"
-msgstr "Modificar contacto"
-
-#: ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
-msgstr "Información sobre privacidad remota no disponible."
-
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
-msgstr "Visible para:"
-
-#: ../../mod/register.php:53
-msgid "An invitation is required."
-msgstr "Se necesita invitación."
-
-#: ../../mod/register.php:58
-msgid "Invitation could not be verified."
-msgstr "No se puede verificar la invitación."
-
-#: ../../mod/register.php:66
-msgid "Invalid OpenID url"
-msgstr "Dirección OpenID no válida"
-
-#: ../../mod/register.php:81
-msgid "Please enter the required information."
-msgstr "Por favor, introduce la información necesaria."
-
-#: ../../mod/register.php:95
-msgid "Please use a shorter name."
-msgstr "Por favor, usa un nombre más corto."
-
-#: ../../mod/register.php:97
-msgid "Name too short."
-msgstr "El nombre es demasiado corto."
-
-#: ../../mod/register.php:112
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "No parece que ese sea tu nombre completo."
-
-#: ../../mod/register.php:117
-msgid "Your email domain is not among those allowed on this site."
-msgstr ""
-"Tu dominio de correo electrónico no se encuentra entre los permitidos en "
-"este sitio."
-
-#: ../../mod/register.php:120
-msgid "Not a valid email address."
-msgstr "No es una dirección de correo electrónico válida."
-
-#: ../../mod/register.php:130
-msgid "Cannot use that email."
-msgstr "No se puede utilizar este correo electrónico."
-
-#: ../../mod/register.php:136
+#: ../../mod/dfrn_confirm.php:119
 msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
-msgstr ""
-"Tu \"apodo\" solo puede contener \"a-z\", \"0-9\", \"-\", y \"_\", y también"
-" debe empezar por una letra."
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "Esto puede ocurrir a veces si la conexión fue solicitada por ambas personas y ya hubiera sido aprobada."
 
-#: ../../mod/register.php:142 ../../mod/register.php:243
-msgid "Nickname is already registered. Please choose another."
-msgstr "Apodo ya registrado. Por favor, elije otro."
-
-#: ../../mod/register.php:161
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "ERROR GRAVE: La generación de claves de seguridad ha fallado."
-
-#: ../../mod/register.php:229
-msgid "An error occurred during registration. Please try again."
-msgstr ""
-"Se produjo un error durante el registro. Por favor, inténtalo de nuevo."
-
-#: ../../mod/register.php:265
-msgid "An error occurred creating your default profile. Please try again."
-msgstr ""
-"Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo."
-
-#: ../../mod/register.php:377
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr ""
-"Te has registrado con éxito. Por favor, consulta tu correo electrónico para "
-"obtener instrucciones adicionales."
-
-#: ../../mod/register.php:381
-msgid "Failed to send email message. Here is the message that failed."
-msgstr ""
-"Error al enviar el mensaje de correo electrónico. Este es el mensaje no "
-"enviado."
-
-#: ../../mod/register.php:386
-msgid "Your registration can not be processed."
-msgstr "Tu registro no se puede procesar."
-
-#: ../../mod/register.php:423
-#, php-format
-msgid "Registration request at %s"
-msgstr "Solicitud de registro en %s"
-
-#: ../../mod/register.php:432
-msgid "Your registration is pending approval by the site owner."
-msgstr ""
-"Tu registro está pendiente de aprobación por el propietario del sitio."
-
-#: ../../mod/register.php:481
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr ""
-"Puedes (opcionalmente) rellenar este formulario a través de OpenID mediante "
-"el suministro de tu OpenID y pulsando en 'Registrar'."
-
-#: ../../mod/register.php:482
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr ""
-"Si no estás familiarizado con OpenID, por favor deja ese campo en blanco y "
-"rellena el resto de los elementos."
-
-#: ../../mod/register.php:483
-msgid "Your OpenID (optional): "
-msgstr "Tu OpenID (opcional):"
-
-#: ../../mod/register.php:497
-msgid "Include your profile in member directory?"
-msgstr "¿Incluir tu perfil en el directorio de miembros?"
-
-#: ../../mod/register.php:512
-msgid "Membership on this site is by invitation only."
-msgstr "Sitio solo accesible mediante invitación."
-
-#: ../../mod/register.php:513
-msgid "Your invitation ID: "
-msgstr "ID de tu invitación: "
-
-#: ../../mod/register.php:516 ../../mod/admin.php:297
-msgid "Registration"
-msgstr "Registro"
-
-#: ../../mod/register.php:524
-msgid "Your Full Name (e.g. Joe Smith): "
-msgstr "Tu nombre completo (por ejemplo, Pepe Pulido):"
-
-#: ../../mod/register.php:525
-msgid "Your Email Address: "
-msgstr "Tu dirección de correo electrónico:"
-
-#: ../../mod/register.php:526
-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 ""
-"Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este "
-"sitio va a ser '<strong>apodo@$sitename</strong>'."
-
-#: ../../mod/register.php:527
-msgid "Choose a nickname: "
-msgstr "Escoge un apodo: "
-
-#: ../../mod/oexchange.php:27
-msgid "Post successful."
-msgstr "¡Publicado!"
-
-#: ../../mod/allfriends.php:34
-#, php-format
-msgid "Friends of %s"
-msgstr "Amigos de %s"
-
-#: ../../mod/allfriends.php:40
-msgid "No friends to display."
-msgstr "No hay amigos para mostrar."
-
-#: ../../mod/help.php:30
-msgid "Help:"
-msgstr "Ayuda:"
-
-#: ../../mod/help.php:34 ../../include/nav.php:82
-msgid "Help"
-msgstr "Ayuda"
-
-#: ../../mod/install.php:34
-msgid "Could not create/connect to database."
-msgstr "No se pudo crear o conectarse a la base de datos."
-
-#: ../../mod/install.php:39
-msgid "Connected to database."
-msgstr "Conectado a la base de datos."
-
-#: ../../mod/install.php:75
-msgid "Proceed with Installation"
-msgstr "Procediendo con la instalación"
-
-#: ../../mod/install.php:77
-msgid "Your Friendika site database has been installed."
-msgstr "La base de datos de Friendila ha sido instalada."
-
-#: ../../mod/install.php:78
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr ""
-"IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para "
-"el encuestador"
-
-#: ../../mod/install.php:79 ../../mod/install.php:89 ../../mod/install.php:207
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Por favor, consulte el archivo \"INSTALL.txt\"."
-
-#: ../../mod/install.php:81
-msgid "Proceed to registration"
-msgstr "Procediendo con el registro"
-
-#: ../../mod/install.php:87
-msgid "Database import failed."
-msgstr "La importación de la base de datos ha fallado."
-
-#: ../../mod/install.php:88
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr ""
-"Puede que tenga que importar el archivo \"Database.sql\" manualmente usando "
-"phpmyadmin o mysql."
-
-#: ../../mod/install.php:101
-msgid "Welcome to Friendika."
-msgstr "Bienvenido a Friendika."
-
-#: ../../mod/install.php:124
-msgid "Friendika Social Network"
-msgstr "Friendika Red Social"
-
-#: ../../mod/install.php:125
-msgid "Installation"
-msgstr "Instalación"
-
-#: ../../mod/install.php:126
-msgid ""
-"In order to install Friendika we need to know how to connect to your "
-"database."
-msgstr ""
-"Para proceder a la instalación de Friendika es necesario saber cómo conectar"
-" con tu base de datos."
-
-#: ../../mod/install.php:127
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr ""
-"Por favor contacta con tu proveedor de servicios o el administrador de "
-"lapágina si tienes alguna pregunta sobre estas cofiguraciones"
-
-#: ../../mod/install.php:128
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr ""
-"La base de datos que especifiques a continuación ya debería existir. Si no "
-"es el caso, debes crearla antes de continuar."
-
-#: ../../mod/install.php:129
-msgid "Database Server Name"
-msgstr "Nombre del servidor de la base de datos"
-
-#: ../../mod/install.php:130
-msgid "Database Login Name"
-msgstr "Usuario de la base de datos"
-
-#: ../../mod/install.php:131
-msgid "Database Login Password"
-msgstr "Contraseña de la base de datos"
-
-#: ../../mod/install.php:132
-msgid "Database Name"
-msgstr "Nombre de la base de datos"
-
-#: ../../mod/install.php:133
-msgid "Please select a default timezone for your website"
-msgstr "Por favor selecciona la zona horaria predeterminada para tu web"
-
-#: ../../mod/install.php:134
-msgid ""
-"Site administrator email address. Your account email address must match this"
-" in order to use the web admin panel."
-msgstr ""
-"Dirección de correo electrónico del administrador. La dirección de correo "
-"electrónico de tu cuenta debe cotejar esto para poder acceder al panel de "
-"administración."
-
-#: ../../mod/install.php:153
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr ""
-"No se pudo encontrar una versión de línea de comandos de PHP en la ruta del "
-"servidor web."
-
-#: ../../mod/install.php:154
-msgid ""
-"This is required. Please adjust the configuration file .htconfig.php "
-"accordingly."
-msgstr ""
-"Esto es necesario. Por favor, modifica el archivo de configuración. "
-"htconfig.php en consecuencia."
-
-#: ../../mod/install.php:161
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr ""
-"La versión en línea de comandos de PHP en tu sistema no tiene "
-"\"register_argc_argv\" habilitado."
-
-#: ../../mod/install.php:162
-msgid "This is required for message delivery to work."
-msgstr "Esto es necesario para el funcionamiento de la entrega de mensajes."
-
-#: ../../mod/install.php:184
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr ""
-"Error:  La función \"openssl_pkey_new\" en este sistema no es capaz de "
-"generar claves de cifrado"
-
-#: ../../mod/install.php:185
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr ""
-"Si se ejecuta en Windows, por favor consulte la sección "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-
-#: ../../mod/install.php:194
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr ""
-"Error: El módulo servidor web Apache mod-rewrite es necesario pero no está "
-"instalado."
-
-#: ../../mod/install.php:196
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Error: El módulo libcurl PHP es necesario, pero no está instalado."
-
-#: ../../mod/install.php:198
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr ""
-"Error: El módulo de gráficos GD de PHP con soporte JPEG es necesario, pero "
-"no está instalado."
-
-#: ../../mod/install.php:200
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Error: El módulo openssl PHP es necesario, pero  no está instalado."
-
-#: ../../mod/install.php:202
-msgid "Error: mysqli PHP module required but not installed."
-msgstr "Error: El módulo PHP mysqli es necesario, pero no está instalado."
-
-#: ../../mod/install.php:204
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Error: El módulo mb_string HPH es necesario, pero no está instalado."
-
-#: ../../mod/install.php:216
-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 ""
-"El programa de instalación web necesita ser capaz de crear un archivo "
-"llamado \". htconfig.php\" en la carpeta superior de tu servidor web y es "
-"incapaz de hacerlo."
-
-#: ../../mod/install.php:217
-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 ""
-"Esto es muy a menudo una configuración de permisos, pues el servidor web "
-"puede que no sea capaz de escribir archivos en la carpeta - incluso si tu "
-"puedes."
-
-#: ../../mod/install.php:218
-msgid ""
-"Please check with your site documentation or support people to see if this "
-"situation can be corrected."
-msgstr ""
-"Por favor, consulta el sitio de documentación o al soporte técnico para ver "
-"si esta situación se puede corregir."
-
-#: ../../mod/install.php:219
-msgid ""
-"If not, you may be required to perform a manual installation. Please see the"
-" file \"INSTALL.txt\" for instructions."
-msgstr ""
-"Si no, deberás proceder con la instalación manual. Por favor, consulta el "
-"archivo \"INSTALL.txt\"para obtener instrucciones."
-
-#: ../../mod/install.php:228
-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 ""
-"El archivo de configuración de base de datos \". htconfig.php\" No se pudo "
-"escribir. Por favor, utiliza el texto adjunto para crear un archivo de "
-"configuración en la raíz de tu servidor web."
-
-#: ../../mod/install.php:243
-msgid "Errors encountered creating database tables."
-msgstr "Errores encontrados creando las tablas de bases de datos."
-
-#: ../../mod/network.php:148
-msgid "Commented Order"
-msgstr "Orden de comentarios"
-
-#: ../../mod/network.php:153
-msgid "Posted Order"
-msgstr "Orden de publicación"
-
-#: ../../mod/network.php:159
-msgid "New"
-msgstr "Nuevo"
-
-#: ../../mod/network.php:164
-msgid "Starred"
-msgstr "Favoritos"
-
-#: ../../mod/network.php:169
-msgid "Bookmarks"
-msgstr "Marcadores"
-
-#: ../../mod/network.php:216
-#, 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] "Aviso: este grupo contiene %s contacto con conexión no segura."
-msgstr[1] "Aviso: este grupo contiene %s contactos con conexiones no seguras."
-
-#: ../../mod/network.php:219
-msgid "Private messages to this group are at risk of public disclosure."
-msgstr ""
-"Los mensajes privados a este grupo corren el riesgo de ser mostrados "
-"públicamente."
-
-#: ../../mod/network.php:292
-msgid "No such group"
-msgstr "Ningún grupo"
-
-#: ../../mod/network.php:303
-msgid "Group is empty"
-msgstr "El grupo está vacío"
-
-#: ../../mod/network.php:308
-msgid "Group: "
-msgstr "Grupo: "
-
-#: ../../mod/network.php:318
-msgid "Contact: "
-msgstr "Contacto: "
-
-#: ../../mod/network.php:320
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr ""
-"Los mensajes privados a esta persona corren el riesgo de ser mostrados "
-"públicamente."
-
-#: ../../mod/network.php:325
-msgid "Invalid contact."
-msgstr "Contacto erróneo."
-
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
-msgid "Invalid profile identifier."
-msgstr "Identificador de perfil no válido."
-
-#: ../../mod/profperm.php:101
-msgid "Profile Visibility Editor"
-msgstr "Editor de visibilidad del perfil"
-
-#: ../../mod/profperm.php:105 ../../mod/group.php:164
-msgid "Click on a contact to add or remove."
-msgstr "Pulsa en un contacto para añadirlo o eliminarlo."
-
-#: ../../mod/profperm.php:114
-msgid "Visible To"
-msgstr "Visible para"
-
-#: ../../mod/profperm.php:130
-msgid "All Contacts (with secure profile access)"
-msgstr "Todos los contactos (con perfil de acceso seguro)"
-
-#: ../../mod/events.php:61
-msgid "Event description and start time are required."
-msgstr "Se requiere una descripción del evento y la hora de inicio."
-
-#: ../../mod/events.php:207
-msgid "Create New Event"
-msgstr "Crea un evento nuevo"
-
-#: ../../mod/events.php:210
-msgid "Previous"
-msgstr "Previo"
-
-#: ../../mod/events.php:213
-msgid "Next"
-msgstr "Siguiente"
-
-#: ../../mod/events.php:220
-msgid "l, F j"
-msgstr "l, F j"
-
-#: ../../mod/events.php:232
-msgid "Edit event"
-msgstr "Editar evento"
-
-#: ../../mod/events.php:234 ../../include/text.php:857
-msgid "link to source"
-msgstr "Enlace al original"
-
-#: ../../mod/events.php:302
-msgid "hour:minute"
-msgstr "hora:minuto"
-
-#: ../../mod/events.php:311
-msgid "Event details"
-msgstr "Detalles del evento"
-
-#: ../../mod/events.php:312
-#, php-format
-msgid "Format is %s %s. Starting date and Description are required."
-msgstr ""
-"El formato es %s %s. Se requiere una fecha de inicio y una descripción."
-
-#: ../../mod/events.php:313
-msgid "Event Starts:"
-msgstr "Inicio del evento:"
-
-#: ../../mod/events.php:316
-msgid "Finish date/time is not known or not relevant"
-msgstr "La fecha/hora de finalización no es conocida o es irrelevante."
-
-#: ../../mod/events.php:318
-msgid "Event Finishes:"
-msgstr "Finalización del evento:"
-
-#: ../../mod/events.php:321
-msgid "Adjust for viewer timezone"
-msgstr "Ajuste de zona horaria"
-
-#: ../../mod/events.php:323
-msgid "Description:"
-msgstr "Descripción:"
-
-#: ../../mod/events.php:327
-msgid "Share this event"
-msgstr "Comparte este evento"
-
-#: ../../mod/notifications.php:26
-msgid "Invalid request identifier."
-msgstr "Solicitud de identificación no válida."
-
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:144
-#: ../../mod/notifications.php:188
-msgid "Discard"
-msgstr "Descartar"
-
-#: ../../mod/notifications.php:71 ../../include/nav.php:109
-msgid "Network"
-msgstr "Red"
-
-#: ../../mod/notifications.php:76 ../../include/nav.php:73
-#: ../../include/nav.php:111
-msgid "Home"
-msgstr "Inicio"
-
-#: ../../mod/notifications.php:81 ../../include/nav.php:117
-msgid "Introductions"
-msgstr "Introducciones"
-
-#: ../../mod/notifications.php:86 ../../mod/message.php:72
-#: ../../include/nav.php:122
-msgid "Messages"
-msgstr "Mensajes"
-
-#: ../../mod/notifications.php:105
-msgid "Show Ignored Requests"
-msgstr "Mostrar peticiones ignoradas"
-
-#: ../../mod/notifications.php:105
-msgid "Hide Ignored Requests"
-msgstr "Ocultar peticiones ignoradas"
-
-#: ../../mod/notifications.php:131 ../../mod/notifications.php:174
-msgid "Notification type: "
-msgstr "Tipo de notificación: "
-
-#: ../../mod/notifications.php:132
-msgid "Friend Suggestion"
-msgstr "Propuestas de amistad"
-
-#: ../../mod/notifications.php:134
-#, php-format
-msgid "suggested by %s"
-msgstr "sugerido por %s"
-
-#: ../../mod/notifications.php:140 ../../mod/notifications.php:185
-#: ../../mod/admin.php:466
-msgid "Approve"
-msgstr "Aprobar"
-
-#: ../../mod/notifications.php:160
-msgid "Claims to be known to you: "
-msgstr "Dice conocerte:"
-
-#: ../../mod/notifications.php:160
-msgid "yes"
-msgstr "sí"
-
-#: ../../mod/notifications.php:160
-msgid "no"
-msgstr "no"
-
-#: ../../mod/notifications.php:167
-msgid "Approve as: "
-msgstr "Aprobar como:"
-
-#: ../../mod/notifications.php:168
-msgid "Friend"
-msgstr "Amigo"
-
-#: ../../mod/notifications.php:169
-msgid "Sharer"
-msgstr "Partícipe"
-
-#: ../../mod/notifications.php:169
-msgid "Fan/Admirer"
-msgstr "Fan/Admirador"
-
-#: ../../mod/notifications.php:175
-msgid "Friend/Connect Request"
-msgstr "Solicitud de Amistad/Conexión"
-
-#: ../../mod/notifications.php:175
-msgid "New Follower"
-msgstr "Nuevo seguidor"
-
-#: ../../mod/notifications.php:194
-msgid "No notifications."
-msgstr "Ninguna notificación."
-
-#: ../../mod/notifications.php:197 ../../mod/notifications.php:283
-#: ../../mod/notifications.php:359 ../../include/nav.php:118
-msgid "Notifications"
-msgstr "Notificaciones"
-
-#: ../../mod/notifications.php:234 ../../mod/notifications.php:316
-#, php-format
-msgid "%s liked %s's post"
-msgstr "A %s le gusta el post de %s"
-
-#: ../../mod/notifications.php:243 ../../mod/notifications.php:325
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "A %s no le gusta el post de %s"
-
-#: ../../mod/notifications.php:257 ../../mod/notifications.php:339
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s es ahora es amigo de %s"
-
-#: ../../mod/notifications.php:264
-#, php-format
-msgid "%s created a new post"
-msgstr "%s creó un nuevo post"
-
-#: ../../mod/notifications.php:265 ../../mod/notifications.php:348
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s comentó en el post de %s"
-
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:355
-msgid "Nothing new!"
-msgstr "¡Nada nuevo!"
-
-#: ../../mod/crepair.php:100
-msgid "Contact settings applied."
-msgstr "Contacto configurado con éxito"
-
-#: ../../mod/crepair.php:102
-msgid "Contact update failed."
-msgstr "Error al actualizar el Contacto"
-
-#: ../../mod/crepair.php:127 ../../mod/fsuggest.php:20
-#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:114
-msgid "Contact not found."
-msgstr "Contacto no encontrado."
-
-#: ../../mod/crepair.php:133
-msgid "Repair Contact Settings"
-msgstr "Reparar la configuración del Contacto"
-
-#: ../../mod/crepair.php:135
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
-" information your communications with this contact may stop working."
-msgstr ""
-"<strong>ADVERTENCIA: Esto es muy avanzado</strong> y si se introduce "
-"información incorrecta su conexión con este contacto puede dejar de "
-"funcionar."
-
-#: ../../mod/crepair.php:136
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
-msgstr ""
-"Por favor usa el botón 'Atás' de tu navegador <strong>ahora</strong> si no "
-"tienes claro qué hacer en esta página."
-
-#: ../../mod/crepair.php:145
-msgid "Account Nickname"
-msgstr "Apodo de la cuenta"
-
-#: ../../mod/crepair.php:146
-msgid "@Tagname - overrides Name/Nickname"
-msgstr "@Etiqueta - Sobrescribe el Nombre/Apodo"
-
-#: ../../mod/crepair.php:147
-msgid "Account URL"
-msgstr "Dirección de la cuenta"
-
-#: ../../mod/crepair.php:148
-msgid "Friend Request URL"
-msgstr "Dirección de la solicitud de amistad"
-
-#: ../../mod/crepair.php:149
-msgid "Friend Confirm URL"
-msgstr "Dirección de confirmación de tu amigo "
-
-#: ../../mod/crepair.php:150
-msgid "Notification Endpoint URL"
-msgstr "Dirección URL de la notificación"
-
-#: ../../mod/crepair.php:151
-msgid "Poll/Feed URL"
-msgstr "Dirección de la Encuesta/Fuentes"
-
-#: ../../mod/crepair.php:152
-msgid "New photo from this URL"
-msgstr "Nueva foto de esta dirección URL"
-
-#: ../../mod/dfrn_request.php:92
-msgid "This introduction has already been accepted."
-msgstr "Esta presentación ya ha sido aceptada."
-
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:351
-msgid "Profile location is not valid or does not contain profile information."
-msgstr ""
-"La ubicación del perfil no es válida o no contiene la información del "
-"perfil."
-
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:356
-msgid "Warning: profile location has no identifiable owner name."
-msgstr ""
-"Aviso: La ubicación del perfil no tiene un nombre de propietario "
-"identificable."
-
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:358
-msgid "Warning: profile location has no profile photo."
-msgstr "Aviso: la ubicación del perfil no tiene foto de perfil."
-
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:361
-#, 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 parámetro requerido no se encontró en el lugar determinado"
-msgstr[1] "% d parámetros requeridos no se encontraron en el lugar determinado"
-
-#: ../../mod/dfrn_request.php:167
-msgid "Introduction complete."
-msgstr "Presentación completa."
-
-#: ../../mod/dfrn_request.php:191
-msgid "Unrecoverable protocol error."
-msgstr "Error de protocolo irrecuperable."
-
-#: ../../mod/dfrn_request.php:219
-msgid "Profile unavailable."
-msgstr "Perfil no disponible."
-
-#: ../../mod/dfrn_request.php:244
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr "% s ha recibido demasiadas solicitudes de conexión hoy."
-
-#: ../../mod/dfrn_request.php:245
-msgid "Spam protection measures have been invoked."
-msgstr "Han sido activadas las medidas de protección contra spam."
-
-#: ../../mod/dfrn_request.php:246
-msgid "Friends are advised to please try again in 24 hours."
-msgstr ""
-"Tus amigos serán avisados para que lo intenten de nuevo pasadas 24 horas."
-
-#: ../../mod/dfrn_request.php:276
-msgid "Invalid locator"
-msgstr "Localizador no válido"
-
-#: ../../mod/dfrn_request.php:296
-msgid "Unable to resolve your name at the provided location."
-msgstr "No se ha podido resolver tu nombre en la ubicación indicada."
-
-#: ../../mod/dfrn_request.php:309
-msgid "You have already introduced yourself here."
-msgstr "Ya te has presentado aquí."
-
-#: ../../mod/dfrn_request.php:313
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr "Al parecer, ya eres amigo de %s."
-
-#: ../../mod/dfrn_request.php:334
-msgid "Invalid profile URL."
-msgstr "Dirección de perfil no válida."
-
-#: ../../mod/dfrn_request.php:430
-msgid "Your introduction has been sent."
-msgstr "Su presentación ha sido enviada."
-
-#: ../../mod/dfrn_request.php:483
-msgid "Please login to confirm introduction."
-msgstr "Inicia sesión para confirmar la presentación."
-
-#: ../../mod/dfrn_request.php:497
-msgid ""
-"Incorrect identity currently logged in. Please login to "
-"<strong>this</strong> profile."
-msgstr ""
-"Sesión iniciada con la identificación incorrecta. Entra en "
-"<strong>este</strong> perfil."
-
-#: ../../mod/dfrn_request.php:509
-#, php-format
-msgid "Welcome home %s."
-msgstr "Bienvenido %s"
-
-#: ../../mod/dfrn_request.php:510
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr "Por favor, confirma tu solicitud de presentación/conexión con %s."
-
-#: ../../mod/dfrn_request.php:511
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: ../../mod/dfrn_request.php:544 ../../include/items.php:2431
-msgid "[Name Withheld]"
-msgstr "[Nombre oculto]"
-
-#: ../../mod/dfrn_request.php:551
-msgid "Introduction received at "
-msgstr "Presentación recibida en"
-
-#: ../../mod/dfrn_request.php:635
-#, php-format
-msgid ""
-"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
-"your Diaspora search bar."
-msgstr ""
-"Usuarios de Diaspora*: por favor no utilice este formulario. En su lugar, "
-"escriba \"%s\" en la barra de búsqueda de Diaspora*."
-
-#: ../../mod/dfrn_request.php:638
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"social networks:"
-msgstr ""
-"Por favor introduce la dirección de tu perfil para una de las siguientes "
-"redes sociales soportadas:"
-
-#: ../../mod/dfrn_request.php:641
-msgid "Friend/Connection Request"
-msgstr "Solicitud de Amistad/Conexión"
-
-#: ../../mod/dfrn_request.php:642
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
-msgstr ""
-"Ejemplos: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
-
-#: ../../mod/dfrn_request.php:643
-msgid "Please answer the following:"
-msgstr "Por favor responda lo siguiente:"
-
-#: ../../mod/dfrn_request.php:644
-#, php-format
-msgid "Does %s know you?"
-msgstr "¿%s te conoce?"
-
-#: ../../mod/dfrn_request.php:647
-msgid "Add a personal note:"
-msgstr "Agregar una nota personal:"
-
-#: ../../mod/dfrn_request.php:649 ../../include/contact_selectors.php:78
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../mod/dfrn_request.php:650
-msgid "StatusNet/Federated Social Web"
-msgstr "StatusNet/Federated Social Web"
-
-#: ../../mod/dfrn_request.php:652
-msgid "- please share from your own site as noted above"
-msgstr "- Por favor comparta desde tu propio sitio como se ha señalado"
-
-#: ../../mod/dfrn_request.php:653
-msgid "Your Identity Address:"
-msgstr "Dirección de tu perfil:"
-
-#: ../../mod/dfrn_request.php:654
-msgid "Submit Request"
-msgstr "Enviar solicitud"
-
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
-msgstr "Autorizar la conexión de la aplicación"
-
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Regrese a su aplicación e inserte este código de seguridad:"
-
-#: ../../mod/api.php:89
-msgid "Please login to continue."
-msgstr "Inicia sesión para 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 ""
-"¿Quiere autorizar a esta aplicación el acceso a sus mensajes y contactos, "
-"y/o crear nuevas publicaciones para usted?"
-
-#: ../../mod/tagger.php:70 ../../mod/like.php:127
-#: ../../addon/facebook/facebook.php:1024
-#: ../../addon/communityhome/communityhome.php:158
-#: ../../addon/communityhome/communityhome.php:167
-#: ../../include/conversation.php:26 ../../include/conversation.php:35
-#: ../../include/diaspora.php:1211
-msgid "status"
-msgstr "estado"
-
-#: ../../mod/tagger.php:103
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s etiquetados %2$s %3$s con %4$s"
-
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1028
-#: ../../addon/communityhome/communityhome.php:172
-#: ../../include/conversation.php:43 ../../include/diaspora.php:1227
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "A %1$s gusta %3$s de %2$s"
-
-#: ../../mod/like.php:146 ../../include/conversation.php:46
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "A %1$s no gusta %3$s de %2$s"
-
-#: ../../mod/lostpass.php:16
-msgid "No valid account found."
-msgstr "No se ha encontrado ninguna cuenta válida"
-
-#: ../../mod/lostpass.php:31
-msgid "Password reset request issued. Check your email."
-msgstr ""
-"Solicitud de restablecimiento de contraseña enviada. Revisa tu correo "
-"electrónico."
-
-#: ../../mod/lostpass.php:42
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Contraseña restablecida enviada a %s"
-
-#: ../../mod/lostpass.php:64
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr ""
-"La solicitud no puede ser verificada (deberías haberla proporcionado antes)."
-" Falló el restablecimiento de la contraseña."
-
-#: ../../mod/lostpass.php:83
-msgid "Your password has been reset as requested."
-msgstr "Tu contraseña ha sido restablecida como solicitaste."
-
-#: ../../mod/lostpass.php:84
-msgid "Your new password is"
-msgstr "Tu nueva contraseña es"
-
-#: ../../mod/lostpass.php:85
-msgid "Save or copy your new password - and then"
-msgstr "Guarda o copia tu nueva contraseña - y luego"
-
-#: ../../mod/lostpass.php:86
-msgid "click here to login"
-msgstr "pulsa aquí para acceder"
-
-#: ../../mod/lostpass.php:87
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr ""
-"Puedes cambiar tu contraseña desde la página de <em>Configuración</em> "
-"después de acceder con éxito."
-
-#: ../../mod/lostpass.php:118
-msgid "Forgot your Password?"
-msgstr "¿Olvidaste tu contraseña?"
-
-#: ../../mod/lostpass.php:119
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr ""
-"Introduce tu correo electrónico para restablecer tu contraseña. Luego "
-"comprueba tu correo para las instrucciones adicionales."
-
-#: ../../mod/lostpass.php:120
-msgid "Nickname or Email: "
-msgstr "Apodo o Correo electrónico: "
-
-#: ../../mod/lostpass.php:121
-msgid "Reset"
-msgstr "Restablecer"
-
-#: ../../mod/friendica.php:43
-msgid "This is Friendica, version"
-msgstr "Esto es Friendica, versión"
-
-#: ../../mod/friendica.php:44
-msgid "running at web location"
-msgstr "ejecutándose en la dirección web"
-
-#: ../../mod/friendica.php:46
-msgid ""
-"Please visit <a "
-"href=\"http://project.friendika.com\">Project.Friendika.com</a> to learn "
-"more about the Friendica project."
-msgstr ""
-"Por favor, visite <a "
-"href=\"http://project.friendika.com\">Project.Friendika.com</a> para saber "
-"más sobre el proyecto Friendica."
-
-#: ../../mod/friendica.php:48
-msgid "Bug reports and issues: please visit"
-msgstr "Reporte de fallos y bugs: por favor visita"
-
-#: ../../mod/friendica.php:49
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
-msgstr ""
-"Sugerencias, elogios, donaciones, etc - por favor mande un email a Info "
-"arroba Friendica punto com"
-
-#: ../../mod/friendica.php:54
-msgid "Installed plugins/addons/apps"
-msgstr "Módulos/extensiones/programas instalados"
-
-#: ../../mod/friendica.php:62
-msgid "No installed plugins/addons/apps"
-msgstr "Módulos/extensiones/programas no instalados"
-
-#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
-msgid "Remove My Account"
-msgstr "Eliminar mi cuenta"
-
-#: ../../mod/removeme.php:43
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr ""
-"Esto eliminará por completo tu cuenta. Una vez hecho esto no se puede "
-"deshacer."
-
-#: ../../mod/removeme.php:44
-msgid "Please enter your password for verification:"
-msgstr "Por favor, introduce tu contraseña para la verificación:"
-
-#: ../../mod/apps.php:4
-msgid "Applications"
-msgstr "Aplicaciones"
-
-#: ../../mod/apps.php:7
-msgid "No installed applications."
-msgstr "Sin aplicaciones"
-
-#: ../../mod/notes.php:63 ../../include/text.php:628
-msgid "Save"
-msgstr "Guardar"
-
-#: ../../mod/fsuggest.php:63
-msgid "Friend suggestion sent."
-msgstr "Solicitud de amistad enviada."
-
-#: ../../mod/fsuggest.php:97
-msgid "Suggest Friends"
-msgstr "Sugerencias de amistad"
-
-#: ../../mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Recomienda un amigo a %s"
-
-#: ../../mod/viewsrc.php:7
-msgid "Access denied."
-msgstr "Acceso denegado."
-
-#: ../../mod/directory.php:49
-msgid "Global Directory"
-msgstr "Directorio global"
-
-#: ../../mod/directory.php:55
-msgid "Normal site view"
-msgstr "Vista normal"
-
-#: ../../mod/directory.php:57
-msgid "Admin - View all site entries"
-msgstr "Administrador - Ver todas las entradas del sitio"
-
-#: ../../mod/directory.php:63
-msgid "Find on this site"
-msgstr "Buscar en este sitio"
-
-#: ../../mod/directory.php:66
-msgid "Site Directory"
-msgstr "Directorio del sitio"
-
-#: ../../mod/directory.php:125
-msgid "Gender: "
-msgstr "Género:"
-
-#: ../../mod/directory.php:151
-msgid "No entries (some entries may be hidden)."
-msgstr "Sin entradas (algunas pueden que estén ocultas)."
-
-#: ../../mod/admin.php:59 ../../mod/admin.php:295
-msgid "Site"
-msgstr "Sitio"
-
-#: ../../mod/admin.php:60 ../../mod/admin.php:460 ../../mod/admin.php:472
-msgid "Users"
-msgstr "Usuarios"
-
-#: ../../mod/admin.php:61 ../../mod/admin.php:549 ../../mod/admin.php:586
-msgid "Plugins"
-msgstr "Módulos"
-
-#: ../../mod/admin.php:76 ../../mod/admin.php:651
-msgid "Logs"
-msgstr "Registros"
-
-#: ../../mod/admin.php:81
-msgid "User registrations waiting for confirmation"
-msgstr "Registro de usuarios esperando la confirmación"
-
-#: ../../mod/admin.php:144 ../../mod/admin.php:294 ../../mod/admin.php:459
-#: ../../mod/admin.php:548 ../../mod/admin.php:585 ../../mod/admin.php:650
-msgid "Administration"
-msgstr "Administración"
-
-#: ../../mod/admin.php:145
-msgid "Summary"
-msgstr "Resumen"
-
-#: ../../mod/admin.php:146
-msgid "Registered users"
-msgstr "Usuarios registrados"
-
-#: ../../mod/admin.php:148
-msgid "Pending registrations"
-msgstr "Pendientes de registro"
-
-#: ../../mod/admin.php:149
-msgid "Version"
-msgstr "Versión"
-
-#: ../../mod/admin.php:151
-msgid "Active plugins"
-msgstr "Módulos activos"
-
-#: ../../mod/admin.php:243
-msgid "Site settings updated."
-msgstr "Configuración de actualización de sitio"
-
-#: ../../mod/admin.php:287
-msgid "Closed"
-msgstr "Cerrado"
-
-#: ../../mod/admin.php:288
-msgid "Requires approval"
-msgstr "Requiere aprovación"
-
-#: ../../mod/admin.php:289
-msgid "Open"
-msgstr "Abierto"
-
-#: ../../mod/admin.php:298
-msgid "File upload"
-msgstr "Subida de archivo"
-
-#: ../../mod/admin.php:299
-msgid "Policies"
-msgstr "Políticas"
-
-#: ../../mod/admin.php:300
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: ../../mod/admin.php:304 ../../addon/statusnet/statusnet.php:477
-msgid "Site name"
-msgstr "Nombre del sitio"
-
-#: ../../mod/admin.php:305
-msgid "Banner/Logo"
-msgstr "Banner/Logo"
-
-#: ../../mod/admin.php:306
-msgid "System language"
-msgstr "Idioma"
-
-#: ../../mod/admin.php:307
-msgid "System theme"
-msgstr "Tema"
-
-#: ../../mod/admin.php:309
-msgid "Maximum image size"
-msgstr "Tamaño máximo de la imagen"
-
-#: ../../mod/admin.php:311
-msgid "Register policy"
-msgstr "Política de registros"
-
-#: ../../mod/admin.php:312
-msgid "Register text"
-msgstr "Términos"
-
-#: ../../mod/admin.php:313
-msgid "Accounts abandoned after x days"
-msgstr "Cuentas abandonadas después de x días"
-
-#: ../../mod/admin.php:313
-msgid ""
-"Will not waste system resources polling external sites for abandoned "
-"accounts. Enter 0 for no time limit."
-msgstr ""
-"No gastará recursos del sistema creando encuestas desde sitios externos para"
-" cuentas abandonadas. Introduzca 0 para ningún límite temporal."
-
-#: ../../mod/admin.php:314
-msgid "Allowed friend domains"
-msgstr "Dominios amigos permitidos"
-
-#: ../../mod/admin.php:315
-msgid "Allowed email domains"
-msgstr "Dominios de correo permitidos"
-
-#: ../../mod/admin.php:316
-msgid "Block public"
-msgstr "Bloqueo público"
-
-#: ../../mod/admin.php:317
-msgid "Force publish"
-msgstr "Forzar publicación"
-
-#: ../../mod/admin.php:318
-msgid "Global directory update URL"
-msgstr "Dirección de actualización del directorio global"
-
-#: ../../mod/admin.php:320
-msgid "Block multiple registrations"
-msgstr "Bloquear multiples registros"
-
-#: ../../mod/admin.php:321
-msgid "OpenID support"
-msgstr "Soporte OpenID"
-
-#: ../../mod/admin.php:322
-msgid "Gravatar support"
-msgstr "Soporte Gravatar"
-
-#: ../../mod/admin.php:323
-msgid "Fullname check"
-msgstr "Comprobar Nombre completo"
-
-#: ../../mod/admin.php:324
-msgid "UTF-8 Regular expressions"
-msgstr "Expresiones regulares UTF-8"
-
-#: ../../mod/admin.php:325
-msgid "Show Community Page"
-msgstr "Ver página de la Comunidad"
-
-#: ../../mod/admin.php:326
-msgid "Enable OStatus support"
-msgstr "Permitir soporte OStatus"
-
-#: ../../mod/admin.php:327
-msgid "Enable Diaspora support"
-msgstr "Habilitar el soporte para Diaspora*"
-
-#: ../../mod/admin.php:328
-msgid "Only allow Friendika contacts"
-msgstr "Permitir solo contactos de Friendika"
-
-#: ../../mod/admin.php:329
-msgid "Verify SSL"
-msgstr "Verificar SSL"
-
-#: ../../mod/admin.php:330
-msgid "Proxy user"
-msgstr "Usuario proxy"
-
-#: ../../mod/admin.php:331
-msgid "Proxy URL"
-msgstr "Dirección proxy"
-
-#: ../../mod/admin.php:332
-msgid "Network timeout"
-msgstr "Tiempo de espera de red"
-
-#: ../../mod/admin.php:353
-#, php-format
-msgid "%s user blocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s usuario bloqueado"
-msgstr[1] "%s usuarios bloqueados"
-
-#: ../../mod/admin.php:360
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s usuario eliminado"
-msgstr[1] "%s usuarios eliminados"
-
-#: ../../mod/admin.php:394
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Usuario '%s' eliminado'"
-
-#: ../../mod/admin.php:401
-#, php-format
-msgid "User '%s' unblocked"
-msgstr "Usuario '%s' desbloqueado"
-
-#: ../../mod/admin.php:401
-#, php-format
-msgid "User '%s' blocked"
-msgstr "Usuario '%s' bloqueado'"
-
-#: ../../mod/admin.php:462
-msgid "select all"
-msgstr "seleccionar todo"
-
-#: ../../mod/admin.php:463
-msgid "User registrations waiting for confirm"
-msgstr "Registro de usuario esperando confirmación"
-
-#: ../../mod/admin.php:464
-msgid "Request date"
-msgstr "Solicitud de fecha"
-
-#: ../../mod/admin.php:464 ../../mod/admin.php:473
-#: ../../include/contact_selectors.php:78
-msgid "Email"
-msgstr "Correo electrónico"
-
-#: ../../mod/admin.php:465
-msgid "No registrations."
-msgstr "Ningún registro."
-
-#: ../../mod/admin.php:467
-msgid "Deny"
-msgstr "Denegado"
-
-#: ../../mod/admin.php:473
-msgid "Register date"
-msgstr "Fecha de registro"
-
-#: ../../mod/admin.php:473
-msgid "Last login"
-msgstr "Último acceso"
-
-#: ../../mod/admin.php:473
-msgid "Last item"
-msgstr "Último elemento"
-
-#: ../../mod/admin.php:473
-msgid "Account"
-msgstr "Cuenta"
-
-#: ../../mod/admin.php:475
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-"¡Los usuarios seleccionados serán eliminados!\\n\\n¡Todo lo que hayan "
-"publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
-
-#: ../../mod/admin.php:476
-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 ""
-"¡El usuario {0} será eliminado!\\n\\n¡Todo lo que haya publicado en este "
-"sitio se borrará para siempre!\\n\\n¿Estás seguro?"
-
-#: ../../mod/admin.php:512
-#, php-format
-msgid "Plugin %s disabled."
-msgstr "Módulo %s deshabilitado."
-
-#: ../../mod/admin.php:516
-#, php-format
-msgid "Plugin %s enabled."
-msgstr "Módulo %s habilitado."
-
-#: ../../mod/admin.php:526
-msgid "Disable"
-msgstr "Inhabilitado"
-
-#: ../../mod/admin.php:528
-msgid "Enable"
-msgstr "Habilitado"
-
-#: ../../mod/admin.php:550
-msgid "Toggle"
-msgstr "Activar"
-
-#: ../../mod/admin.php:551 ../../include/nav.php:128
-msgid "Settings"
-msgstr "Configuraciones"
-
-#: ../../mod/admin.php:613
-msgid "Log settings updated."
-msgstr "Registro de los parámetros de actualización"
-
-#: ../../mod/admin.php:653
-msgid "Clear"
-msgstr "Limpiar"
-
-#: ../../mod/admin.php:659
-msgid "Debugging"
-msgstr "Depuración"
-
-#: ../../mod/admin.php:660
-msgid "Log file"
-msgstr "Archivo de registro"
-
-#: ../../mod/admin.php:660
-msgid "Must be writable by web server. Relative to your Friendika index.php."
-msgstr ""
-"Debes permitirle la escritura al servidor web. Relacionado con Friendika "
-"index.php"
-
-#: ../../mod/admin.php:661
-msgid "Log level"
-msgstr "Nivel de registro"
-
-#: ../../mod/admin.php:702
-msgid "Close"
-msgstr "Cerrado"
-
-#: ../../mod/admin.php:708
-msgid "FTP Host"
-msgstr "Host FTP"
-
-#: ../../mod/admin.php:709
-msgid "FTP Path"
-msgstr "Ruta FTP"
-
-#: ../../mod/admin.php:710
-msgid "FTP User"
-msgstr "Usuario FTP"
-
-#: ../../mod/admin.php:711
-msgid "FTP Password"
-msgstr "Contraseña FTP"
-
-#: ../../mod/item.php:84
-msgid "Unable to locate original post."
-msgstr "No se puede encontrar la publicación original."
-
-#: ../../mod/item.php:199
-msgid "Empty post discarded."
-msgstr "Publicación vacía descartada."
-
-#: ../../mod/item.php:675 ../../mod/item.php:720 ../../mod/item.php:764
-#: ../../mod/item.php:807 ../../include/items.php:1769
-#: ../../include/items.php:2068 ../../include/items.php:2115
-#: ../../include/items.php:2227 ../../include/items.php:2273
-msgid "noreply"
-msgstr "no responder"
-
-#: ../../mod/item.php:719 ../../mod/item.php:806 ../../include/items.php:2272
-msgid "Administrator@"
-msgstr "Administrador@"
-
-#: ../../mod/item.php:722 ../../include/items.php:2117
-#: ../../include/items.php:2275
-#, php-format
-msgid "%s commented on an item at %s"
-msgstr "%s ha commentato un elemento en %s"
-
-#: ../../mod/item.php:809
-#, php-format
-msgid "%s posted to your profile wall at %s"
-msgstr "%s ha publicado en tu muro a las %s"
-
-#: ../../mod/item.php:843
-msgid "System error. Post not saved."
-msgstr "Error del sistema. Mensaje no guardado."
-
-#: ../../mod/item.php:868
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendika social "
-"network."
-msgstr ""
-"Este mensaje te ha sido enviado por %s, un miembro de la red social "
-"Friendika."
-
-#: ../../mod/item.php:870
-#, php-format
-msgid "You may visit them online at %s"
-msgstr "Los puedes visitar en línea en %s"
-
-#: ../../mod/item.php:871
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr ""
-"Por favor contacta con el remitente respondiendo a este mensaje si no deseas"
-" recibir estos mensajes."
-
-#: ../../mod/item.php:873
-#, php-format
-msgid "%s posted an update."
-msgstr "%s ha publicado una actualización."
-
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
-msgstr "Etiqueta eliminada"
-
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr "Eliminar etiqueta del elemento"
-
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr "Seleccione una etiqueta para eliminar:"
-
-#: ../../mod/tagrm.php:93
-msgid "Remove"
-msgstr "Eliminar"
-
-#: ../../mod/message.php:23
-msgid "No recipient selected."
-msgstr "Ningún destinatario seleccionado"
-
-#: ../../mod/message.php:26
-msgid "Unable to locate contact information."
-msgstr "No se puede encontrar información del contacto."
-
-#: ../../mod/message.php:29
-msgid "Message could not be sent."
-msgstr "El mensaje no ha podido ser enviado."
-
-#: ../../mod/message.php:31
-msgid "Message sent."
-msgstr "Mensaje enviado."
-
-#: ../../mod/message.php:51
-msgid "Inbox"
-msgstr "Entrada"
-
-#: ../../mod/message.php:56
-msgid "Outbox"
-msgstr "Enviados"
-
-#: ../../mod/message.php:61
-msgid "New Message"
-msgstr "Nuevo mensaje"
-
-#: ../../mod/message.php:87
-msgid "Message deleted."
-msgstr "Mensaje eliminado."
-
-#: ../../mod/message.php:103
-msgid "Conversation removed."
-msgstr "Conversación eliminada."
-
-#: ../../mod/message.php:119 ../../include/conversation.php:767
-msgid "Please enter a link URL:"
-msgstr "Introduce la dirección del enlace:"
-
-#: ../../mod/message.php:127
-msgid "Send Private Message"
-msgstr "Enviar mensaje privado"
-
-#: ../../mod/message.php:128 ../../mod/message.php:261
-msgid "To:"
-msgstr "Para:"
-
-#: ../../mod/message.php:129 ../../mod/message.php:262
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: ../../mod/message.php:170
-msgid "No messages."
-msgstr "No hay mensajes."
-
-#: ../../mod/message.php:183
-msgid "Delete conversation"
-msgstr "Eliminar conversación"
-
-#: ../../mod/message.php:186
-msgid "D, d M Y - g:i A"
-msgstr "D, d M Y - g:i A"
-
-#: ../../mod/message.php:213
-msgid "Message not available."
-msgstr "Mensaje no disponibile."
-
-#: ../../mod/message.php:250
-msgid "Delete message"
-msgstr "Borrar mensaje"
-
-#: ../../mod/message.php:260
-msgid "Send Reply"
-msgstr "Enviar respuesta"
-
-#: ../../mod/dfrn_confirm.php:234
+#: ../../mod/dfrn_confirm.php:237
 msgid "Response from remote site was not understood."
 msgstr "La respuesta desde el sitio remoto no ha sido entendida."
 
-#: ../../mod/dfrn_confirm.php:243
+#: ../../mod/dfrn_confirm.php:246
 msgid "Unexpected response from remote site: "
-msgstr "Respuesta inesperada desde el sitio remoto:"
+msgstr "Respuesta inesperada desde el sitio remoto: "
 
-#: ../../mod/dfrn_confirm.php:251
+#: ../../mod/dfrn_confirm.php:254
 msgid "Confirmation completed successfully."
 msgstr "Confirmación completada con éxito."
 
-#: ../../mod/dfrn_confirm.php:253 ../../mod/dfrn_confirm.php:267
-#: ../../mod/dfrn_confirm.php:274
+#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
+#: ../../mod/dfrn_confirm.php:277
 msgid "Remote site reported: "
-msgstr "El sito remoto informó:"
+msgstr "El sito remoto informó: "
 
-#: ../../mod/dfrn_confirm.php:265
+#: ../../mod/dfrn_confirm.php:268
 msgid "Temporary failure. Please wait and try again."
 msgstr "Error temporal. Por favor, espere y vuelva a intentarlo."
 
-#: ../../mod/dfrn_confirm.php:272
+#: ../../mod/dfrn_confirm.php:275
 msgid "Introduction failed or was revoked."
 msgstr "La presentación ha fallado o ha sido anulada."
 
-#: ../../mod/dfrn_confirm.php:409
+#: ../../mod/dfrn_confirm.php:420
 msgid "Unable to set contact photo."
 msgstr "Imposible establecer la foto del contacto."
 
-#: ../../mod/dfrn_confirm.php:459 ../../include/conversation.php:79
-#: ../../include/diaspora.php:477
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:608
+#: ../../include/conversation.php:173
 #, php-format
 msgid "%1$s is now friends with %2$s"
-msgstr "%1$s es ahora amigo de %2$s"
+msgstr "%1$s ahora es amigo de %2$s"
 
-#: ../../mod/dfrn_confirm.php:530
+#: ../../mod/dfrn_confirm.php:562
 #, php-format
 msgid "No user record found for '%s' "
-msgstr "No se ha encontrado a ningún '%s'"
+msgstr "No se ha encontrado a ningún '%s' "
 
-#: ../../mod/dfrn_confirm.php:540
+#: ../../mod/dfrn_confirm.php:572
 msgid "Our site encryption key is apparently messed up."
 msgstr "Nuestra clave de cifrado del sitio es aparentemente un lío."
 
-#: ../../mod/dfrn_confirm.php:551
+#: ../../mod/dfrn_confirm.php:583
 msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr ""
-"Se ha proporcionado una dirección vacía o no hemos podido descifrarla."
+msgstr "Se ha proporcionado una dirección vacía o no hemos podido descifrarla."
 
-#: ../../mod/dfrn_confirm.php:572
+#: ../../mod/dfrn_confirm.php:604
 msgid "Contact record was not found for you on our site."
 msgstr "El contacto no se ha encontrado en nuestra base de datos."
 
-#: ../../mod/dfrn_confirm.php:586
+#: ../../mod/dfrn_confirm.php:618
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
-msgstr ""
-"La clave pública del sitio no está disponible en los datos del contacto para"
-" URL %s."
+msgstr "La clave pública del sitio no está disponible en los datos del contacto para %s."
 
-#: ../../mod/dfrn_confirm.php:606
+#: ../../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 identificación proporcionada por el sistema es un duplicado de nuestro "
-"sistema. Debería funcionar si lo intentas de nuevo."
+msgstr "La identificación proporcionada por el sistema es un duplicado de nuestro sistema. Debería funcionar si lo intentas de nuevo."
 
-#: ../../mod/dfrn_confirm.php:617
+#: ../../mod/dfrn_confirm.php:649
 msgid "Unable to set your contact credentials on our system."
-msgstr ""
-"No se puede establecer las credenciales de tu contacto en nuestro sistema."
+msgstr "No se puede establecer las credenciales de tu contacto en nuestro sistema."
 
-#: ../../mod/dfrn_confirm.php:671
+#: ../../mod/dfrn_confirm.php:716
 msgid "Unable to update your contact profile details on our system"
-msgstr ""
-"No se puede actualizar los datos de tu perfil de contacto en nuestro sistema"
+msgstr "No se puede actualizar los datos de tu perfil de contacto en nuestro sistema"
 
-#: ../../mod/dfrn_confirm.php:701
+#: ../../mod/dfrn_confirm.php:750
 #, php-format
 msgid "Connection accepted at %s"
-msgstr "Conexión aceptada en % s"
+msgstr "Conexión aceptada en %s"
 
-#: ../../mod/openid.php:63 ../../mod/openid.php:123 ../../include/auth.php:122
-#: ../../include/auth.php:147 ../../include/auth.php:201
-msgid "Login failed."
-msgstr "Accesso fallido."
-
-#: ../../mod/openid.php:79 ../../include/auth.php:217
-msgid "Welcome "
-msgstr "Bienvenido"
-
-#: ../../mod/openid.php:80 ../../include/auth.php:218
-msgid "Please upload a profile photo."
-msgstr "Por favor sube una foto para tu perfil."
-
-#: ../../mod/openid.php:83 ../../include/auth.php:221
-msgid "Welcome back "
-msgstr "Bienvenido de nuevo"
-
-#: ../../mod/dfrn_poll.php:90 ../../mod/dfrn_poll.php:516
+#: ../../mod/dfrn_confirm.php:799
 #, php-format
-msgid "%s welcomes %s"
-msgstr "%s te da la bienvenida a %s"
+msgid "%1$s has joined %2$s"
+msgstr "%1$s se ha unido a %2$s"
 
-#: ../../mod/viewcontacts.php:25 ../../include/text.php:567
-msgid "View Contacts"
-msgstr "Ver contactos"
+#: ../../addon/fromgplus/fromgplus.php:29
+msgid "Google+ Import Settings"
+msgstr "Configuración de la importación de Google+"
 
-#: ../../mod/viewcontacts.php:40
-msgid "No contacts."
-msgstr "Ningún contacto."
+#: ../../addon/fromgplus/fromgplus.php:32
+msgid "Enable Google+ Import"
+msgstr "Habilitar la importación de Google+"
 
-#: ../../mod/group.php:27
-msgid "Group created."
-msgstr "Grupo creado."
+#: ../../addon/fromgplus/fromgplus.php:35
+msgid "Google Account ID"
+msgstr "ID de la cuenta de Google"
 
-#: ../../mod/group.php:33
-msgid "Could not create group."
-msgstr "Imposible crear el grupo."
+#: ../../addon/fromgplus/fromgplus.php:55
+msgid "Google+ Import Settings saved."
+msgstr "Configuración de la importación de Google+ guardada."
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
-msgid "Group not found."
-msgstr "Grupo no encontrado."
+#: ../../addon/facebook/facebook.php:523
+msgid "Facebook disabled"
+msgstr "Facebook deshabilitado"
 
-#: ../../mod/group.php:56
-msgid "Group name changed."
-msgstr "El nombre del grupo ha cambiado."
+#: ../../addon/facebook/facebook.php:528
+msgid "Updating contacts"
+msgstr "Actualizando contactos"
 
-#: ../../mod/group.php:82
-msgid "Create a group of contacts/friends."
-msgstr "Crea un grupo de contactos/amigos."
+#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:192
+msgid "Facebook API key is missing."
+msgstr "Falta la clave API de Facebook."
 
-#: ../../mod/group.php:83 ../../mod/group.php:166
-msgid "Group Name: "
-msgstr "Nombre del grupo: "
+#: ../../addon/facebook/facebook.php:558
+msgid "Facebook Connect"
+msgstr "Conexión con Facebook"
 
-#: ../../mod/group.php:98
-msgid "Group removed."
-msgstr "Grupo eliminado."
+#: ../../addon/facebook/facebook.php:564
+msgid "Install Facebook connector for this account."
+msgstr "Instalar el conector de Facebook para esta cuenta."
 
-#: ../../mod/group.php:100
-msgid "Unable to remove group."
-msgstr "No se puede eliminar el grupo."
+#: ../../addon/facebook/facebook.php:571
+msgid "Remove Facebook connector"
+msgstr "Eliminar el conector de Facebook"
 
-#: ../../mod/group.php:165
-msgid "Group Editor"
-msgstr "Editor de grupos"
-
-#: ../../mod/group.php:179
-msgid "Members"
-msgstr "Miembros"
-
-#: ../../mod/group.php:194
-msgid "All Contacts"
-msgstr "Todos los contactos"
-
-#: ../../mod/attach.php:8
-msgid "Item not available."
-msgstr "Elemento no disponible."
-
-#: ../../mod/attach.php:20
-msgid "Item was not found."
-msgstr "Elemento no encontrado."
-
-#: ../../mod/common.php:34
-msgid "Common Friends"
-msgstr "Amigos comunes"
-
-#: ../../mod/common.php:42
-msgid "No friends in common."
-msgstr "No hay amigos en común."
-
-#: ../../mod/match.php:10
-msgid "Profile Match"
-msgstr "Coincidencias de Perfil"
-
-#: ../../mod/match.php:18
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr ""
-"No hay palabras clave que coincidan. Por favor, agrega palabras claves a tu "
-"perfil predeterminado."
-
-#: ../../mod/community.php:21
-msgid "Not available."
-msgstr "No disponible"
-
-#: ../../mod/community.php:30 ../../include/nav.php:97
-msgid "Community"
-msgstr "Comunidad"
-
-#: ../../mod/community.php:87
+#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:217
 msgid ""
-"Shared content is covered by the <a "
-"href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons "
-"Attribution 3.0</a> license."
-msgstr ""
-"El contenido en común está cubierto por la licencia <a "
-"href=\"http://creativecommons.org/licenses/by/3.0/deed.it\">Creative Commons"
-" Atribución 3.0</a>."
+"Re-authenticate [This is necessary whenever your Facebook password is "
+"changed.]"
+msgstr "Volver a identificarse [Esto es necesario cada vez que tu contraseña de Facebook cambie.]"
 
-#: ../../addon/tumblr/tumblr.php:35
-msgid "Post to Tumblr"
-msgstr "Publicar en Tumblr"
+#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:224
+msgid "Post to Facebook by default"
+msgstr "Publicar en Facebook de forma predeterminada"
 
-#: ../../addon/tumblr/tumblr.php:66
-msgid "Tumblr Post Settings"
-msgstr "Configuración de publicación en Tumblr"
-
-#: ../../addon/tumblr/tumblr.php:68
-msgid "Enable Tumblr Post Plugin"
-msgstr "Habilitar el plugin de publicación en Tumblr"
-
-#: ../../addon/tumblr/tumblr.php:73
-msgid "Tumblr login"
-msgstr "Tumblr - inicio de sesión"
-
-#: ../../addon/tumblr/tumblr.php:78
-msgid "Tumblr password"
-msgstr "Tumblr - contraseña"
-
-#: ../../addon/tumblr/tumblr.php:83
-msgid "Post to Tumblr by default"
-msgstr "Publicar a Tumblr por defecto"
-
-#: ../../addon/tumblr/tumblr.php:174 ../../addon/wppost/wppost.php:171
-msgid "Post from Friendica"
-msgstr "Publicar desde Friendica"
-
-#: ../../addon/twitter/twitter.php:78
-msgid "Post to Twitter"
-msgstr "Publicar en Twitter"
-
-#: ../../addon/twitter/twitter.php:123
-msgid "Twitter settings updated."
-msgstr "Actualización de la configuración de Twitter"
-
-#: ../../addon/twitter/twitter.php:145
-msgid "Twitter Posting Settings"
-msgstr "Configuración de publicaciones en Twitter"
-
-#: ../../addon/twitter/twitter.php:152
+#: ../../addon/facebook/facebook.php:589
 msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
-msgstr ""
-"No se ha encontrado ningún par de claves para Twitter. Póngase en contacto "
-"con el administrador del sitio."
+"Facebook friend linking has been disabled on this site. The following "
+"settings will have no effect."
+msgstr "El enlace con los contactos de Facebook ha sido desactivado en este servidor. La configuración no tendrá efecto alguno."
 
-#: ../../addon/twitter/twitter.php:171
+#: ../../addon/facebook/facebook.php:593
 msgid ""
-"At this Friendika 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 esta instancia de Friendika el plugin de Twitter fue habilitado, pero aún"
-" no has vinculado tu cuenta a tu cuenta de Twitter. Para ello haz clic en el"
-" botón de abajo para obtener un PIN de Twitter, que tiene que copiar en el "
-"cuadro de entrada y enviar el formulario. Solo sus posts "
-"<strong>públicos</strong> se publicarán en Twitter."
+"Facebook friend linking has been disabled on this site. If you disable it, "
+"you will be unable to re-enable it."
+msgstr "El enlace con los contactos de Facebook ha sido desactivado en este servidor. Si se desactiva no podrá volver a reactivarse."
 
-#: ../../addon/twitter/twitter.php:172
-msgid "Log in with Twitter"
-msgstr "Acceder con Twitter"
+#: ../../addon/facebook/facebook.php:596
+msgid "Link all your Facebook friends and conversations on this website"
+msgstr "Vincula a todos tus amigos de Facebook y las conversaciones con este sitio"
 
-#: ../../addon/twitter/twitter.php:174
-msgid "Copy the PIN from Twitter here"
-msgstr "Copia el PIN de Twitter aquí"
-
-#: ../../addon/twitter/twitter.php:188 ../../addon/statusnet/statusnet.php:337
-msgid "Currently connected to: "
-msgstr "Actualmente conectado a:"
-
-#: ../../addon/twitter/twitter.php:189
+#: ../../addon/facebook/facebook.php:598
 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 lo habilitas todas tus publicaciones <strong>públicas</strong> serán "
-"publicadas en la cuenta de Twitter asociada. Puedes elegir hacerlo por "
-"defecto (aquí) o individualmente para cada publicación usando las opciones "
-"cuando escribes."
+"Facebook conversations consist of your <em>profile wall</em> and your friend"
+" <em>stream</em>."
+msgstr "Las conversaciones de Facebook consisten en tu <em>muro</em>, tu <em>perfil</em> y las <em>publicaciones</em> de tus amigos."
 
-#: ../../addon/twitter/twitter.php:191
-msgid "Allow posting to Twitter"
-msgstr "Permitir publicar en Twitter"
+#: ../../addon/facebook/facebook.php:599
+msgid "On this website, your Facebook friend stream is only visible to you."
+msgstr "En esta página las publicaciones de tus amigos de Facebook solo son visibles para ti."
 
-#: ../../addon/twitter/twitter.php:194
-msgid "Send public postings to Twitter by default"
-msgstr "Enviar publicaciones públicas a Twitter por defecto"
-
-#: ../../addon/twitter/twitter.php:199 ../../addon/statusnet/statusnet.php:348
-msgid "Clear OAuth configuration"
-msgstr "Borrar la configuración de OAuth"
-
-#: ../../addon/twitter/twitter.php:301
-msgid "Consumer key"
-msgstr "Clave consumer"
-
-#: ../../addon/twitter/twitter.php:302
-msgid "Consumer secret"
-msgstr "Secreto consumer"
-
-#: ../../addon/statusnet/statusnet.php:141
-msgid "Post to StatusNet"
-msgstr "Publicar en StatusNet"
-
-#: ../../addon/statusnet/statusnet.php:183
+#: ../../addon/facebook/facebook.php:600
 msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
-msgstr ""
-"Por favor contacta con el administrador de tu web.<br />La dirección API "
-"suministrada no es válida."
+"The following settings determine the privacy of your Facebook profile wall "
+"on this website."
+msgstr "La siguiente configuración determina la privacidad del muro de tu perfil de Facebook en este sitio."
 
-#: ../../addon/statusnet/statusnet.php:211
-msgid "We could not contact the StatusNet API with the Path you entered."
-msgstr "No podemos contantar con StatusNet en la ruta que has especificado."
-
-#: ../../addon/statusnet/statusnet.php:238
-msgid "StatusNet settings updated."
-msgstr "Actualición de la configuración de StatusNet."
-
-#: ../../addon/statusnet/statusnet.php:261
-msgid "StatusNet Posting Settings"
-msgstr "Configuración de envío a StatusNet"
-
-#: ../../addon/statusnet/statusnet.php:275
-msgid "Globally Available StatusNet OAuthKeys"
-msgstr "StatusNet OAuthKeys disponibles para todos"
-
-#: ../../addon/statusnet/statusnet.php:276
+#: ../../addon/facebook/facebook.php:604
 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 ""
-"Existen pares de valores OAuthKey preconfigurados para algunos servidores. "
-"Si usas uno de ellos, por favor usa estas credenciales. De los contrario no "
-"dudes en conectar con cualquiera otra instancia de StatusNet (ver a "
-"continuación)."
+"On this website your Facebook profile wall conversations will only be "
+"visible to you"
+msgstr "En este sitio las publicaciones del muro de Facebook solo son visibles para ti"
 
-#: ../../addon/statusnet/statusnet.php:284
-msgid "Provide your own OAuth Credentials"
-msgstr "Proporciona tus propias credenciales OAuth"
+#: ../../addon/facebook/facebook.php:609
+msgid "Do not import your Facebook profile wall conversations"
+msgstr "No importar las conversaciones de tu muro de Facebook"
 
-#: ../../addon/statusnet/statusnet.php:285
+#: ../../addon/facebook/facebook.php:611
 msgid ""
-"No consumer key pair for StatusNet found. Register your Friendika 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 "
-"Friendika installation at your favorited StatusNet installation."
-msgstr ""
-"No se ha encontrado ningún par de claves para StatusNet. Registra tu cuenta "
-"de Friendika como cliente de escritorio en tu cuenta de StatusNet, copia la "
-"clave consumer aquí y escribe la dirección de la base API.<br />Antes de "
-"registrar tu propio par de claves OAuth, pregunta al administrador si ya hay"
-" un par de claves para esta instalación de Friendika en tu instalación "
-"StatusNet favorita."
+"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 decides conectar las conversaciones y dejar ambas casillas sin marcar, el muro de tu perfil de Facebook se fusionará con el muro de tu perfil en este sitio y la configuración de privacidad en este sitio será utilizada para determinar quién puede ver las conversaciones."
 
-#: ../../addon/statusnet/statusnet.php:287
-msgid "OAuth Consumer Key"
-msgstr "OAuth Consumer Key"
+#: ../../addon/facebook/facebook.php:616
+msgid "Comma separated applications to ignore"
+msgstr "Aplicaciones a ignorar separadas por comas"
 
-#: ../../addon/statusnet/statusnet.php:290
-msgid "OAuth Consumer Secret"
-msgstr "OAuth Consumer Secret"
+#: ../../addon/facebook/facebook.php:700
+msgid "Problems with Facebook Real-Time Updates"
+msgstr "Hay problemas con las actualizaciones en tiempo real de Facebook"
 
-#: ../../addon/statusnet/statusnet.php:293
-msgid "Base API Path (remember the trailing /)"
-msgstr "Dirección de base para la API (recordar el / al final)"
+#: ../../addon/facebook/facebook.php:729
+msgid "Facebook Connector Settings"
+msgstr "Configuración de conexión a Facebook"
 
-#: ../../addon/statusnet/statusnet.php:314
+#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:255
+msgid "Facebook API Key"
+msgstr "Llave API de Facebook"
+
+#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:262
 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 ""
-"Para conectarse a tu cuenta de StatusNet haga clic en el botón abajo para "
-"obtener un PIN de StatusNet, que tiene que copiar en el cuadro de entrada y "
-"enviar el formulario. Solo sus posts <strong>públicos</strong> se publicarán"
-" en StatusNet."
+"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: parece que la App-ID y el -Secret ya están configurados en tu archivo .htconfig.php. Al estar configurados allí, no se usará este formulario.<br><br>"
 
-#: ../../addon/statusnet/statusnet.php:315
-msgid "Log in with StatusNet"
-msgstr "Inicia sesión con StatusNet"
-
-#: ../../addon/statusnet/statusnet.php:317
-msgid "Copy the security code from StatusNet here"
-msgstr "Copia el código de seguridad de StatusNet aquí"
-
-#: ../../addon/statusnet/statusnet.php:323
-msgid "Cancel Connection Process"
-msgstr "Cancelar la conexión en proceso"
-
-#: ../../addon/statusnet/statusnet.php:325
-msgid "Current StatusNet API is"
-msgstr "El estado actual de la API de StatusNet es"
-
-#: ../../addon/statusnet/statusnet.php:326
-msgid "Cancel StatusNet Connection"
-msgstr "Cancelar conexión con StatusNet"
-
-#: ../../addon/statusnet/statusnet.php:338
+#: ../../addon/facebook/facebook.php:759
 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 lo habilitas todas tus publicaciones </strong>públicas</strong> podrán "
-"ser publicadas en la cuenta asociada de StatusNet. Pudes elegir hacerlo por "
-"defecto (aquí) o para cada publicación individualmente en las opciones de "
-"publicacion cuando la estás escribiendo."
+"Error: the given API Key seems to be incorrect (the application access token"
+" could not be retrieved)."
+msgstr "Error: la llave API proporcionada parece incorrecta (no se pudo recuperar la ficha de acceso a la aplicación)."
 
-#: ../../addon/statusnet/statusnet.php:340
-msgid "Allow posting to StatusNet"
-msgstr "Permitir publicaciones en StatusNet"
+#: ../../addon/facebook/facebook.php:761
+msgid "The given API Key seems to work correctly."
+msgstr "La Llave API proporcionada parece funcionar correctamente."
 
-#: ../../addon/statusnet/statusnet.php:343
-msgid "Send public postings to StatusNet by default"
-msgstr "Enviar publicaciones públicas a StatusNet por defecto"
+#: ../../addon/facebook/facebook.php:763
+msgid ""
+"The correctness of the API Key could not be detected. Something strange's "
+"going on."
+msgstr "No se ha podido detectar una llave API correcta. Algo raro está pasando."
 
-#: ../../addon/statusnet/statusnet.php:478
-msgid "API URL"
-msgstr "Dirección de la API"
+#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:264
+msgid "App-ID / API-Key"
+msgstr "Añadir ID / Llave API"
 
-#: ../../addon/oembed/oembed.php:30
-msgid "OEmbed settings updated"
-msgstr "Actualizar la configuración de OEmbed"
+#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:265
+msgid "Application secret"
+msgstr "Secreto de la aplicación"
 
-#: ../../addon/oembed/oembed.php:43
-msgid "Use OEmbed for YouTube videos"
-msgstr "Usar OEmbed para los vídeos de YouTube"
+#: ../../addon/facebook/facebook.php:768
+#, php-format
+msgid "Polling Interval in minutes (minimum %1$s minutes)"
+msgstr "Intervalo del sondeo en minutos (mínimo %1$s minutos)"
 
-#: ../../addon/oembed/oembed.php:71
-msgid "URL to embed:"
-msgstr "Dirección del recurso:"
+#: ../../addon/facebook/facebook.php:769
+msgid ""
+"Synchronize comments (no comments on Facebook are missed, at the cost of "
+"increased system load)"
+msgstr "Sincronizar comentarios (no se perderán comentarios de Facebook, pero se incrementará la carga del sistema)"
+
+#: ../../addon/facebook/facebook.php:773
+msgid "Real-Time Updates"
+msgstr "Actualizaciones en tiempo real"
+
+#: ../../addon/facebook/facebook.php:777
+msgid "Real-Time Updates are activated."
+msgstr "Actualizaciones en tiempo real activada."
+
+#: ../../addon/facebook/facebook.php:778
+msgid "Deactivate Real-Time Updates"
+msgstr "Desactivar actualizaciones en tiempo real"
+
+#: ../../addon/facebook/facebook.php:780
+msgid "Real-Time Updates not activated."
+msgstr "Actualizaciones en tiempo real desactivada."
+
+#: ../../addon/facebook/facebook.php:780
+msgid "Activate Real-Time Updates"
+msgstr "Activar actualizaciones en tiempo real"
+
+#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282
+#: ../../addon/dav/friendica/layout.fnk.php:361
+msgid "The new values have been saved."
+msgstr "Los nuevos valores se han guardado."
+
+#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:301
+msgid "Post to Facebook"
+msgstr "Publicar en Facebook"
+
+#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:399
+msgid ""
+"Post to Facebook cancelled because of multi-network access permission "
+"conflict."
+msgstr "Publicación en Facebook cancelada debido a un conflicto con los permisos de acceso a la multi-red."
+
+#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:610
+msgid "View on Friendica"
+msgstr "Ver en Friendica"
+
+#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:643
+msgid "Facebook post failed. Queued for retry."
+msgstr "Publicación en Facebook errónea. Reintentando..."
+
+#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:683
+msgid "Your Facebook connection became invalid. Please Re-authenticate."
+msgstr "Tu conexión con Facebook ha sido invalidada. Por favor vuelve a identificarte."
+
+#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:684
+msgid "Facebook connection became invalid"
+msgstr "La conexión con Facebook ha sido invalidada"
+
+#: ../../addon/facebook/facebook.php:1224 ../../addon/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 "Hola %1$s,\n\nLa conexión entre tu cuenta de %2$s y Facebook se ha roto. Normalmente esto suele ocurrir si has cambiado tu contraseña de Facebook. Para volver a establecerla, tienes que %3$sidentificarte de nuevo en el conector de Facebook%4$s."
+
+#: ../../addon/snautofollow/snautofollow.php:32
+msgid "StatusNet AutoFollow settings updated."
+msgstr "Configuración para seguir automáticamente en StatusNet actualizada."
+
+#: ../../addon/snautofollow/snautofollow.php:56
+msgid "StatusNet AutoFollow Settings"
+msgstr "Configuración para el seguimiento automático en StatusNet"
+
+#: ../../addon/snautofollow/snautofollow.php:58
+msgid "Automatically follow any StatusNet followers/mentioners"
+msgstr "Seguir automáticamente a cualquiera que me siga/mencione en StatusNet"
+
+#: ../../addon/bg/bg.php:51
+msgid "Bg settings updated."
+msgstr "Ajustes de fondo actualizados."
+
+#: ../../addon/bg/bg.php:82
+msgid "Bg Settings"
+msgstr "Ajustes de fondo"
+
+#: ../../addon/bg/bg.php:84 ../../addon/numfriends/numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr "¿Cuántos contactos quieres mostrar en la barra lateral de tu perfil?"
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:260
+msgid "Lifetime of the cache (in hours)"
+msgstr "Vida útil de la caché (en horas)"
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:265
+msgid "Cache Statistics"
+msgstr "Estadísticas de la caché"
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:268
+msgid "Number of items"
+msgstr "Número de ítems"
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:270
+msgid "Size of the cache"
+msgstr "Tamaño de la caché"
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:272
+msgid "Delete the whole cache"
+msgstr "Borrar toda la caché"
+
+#: ../../addon/fbpost/fbpost.php:172
+msgid "Facebook Post disabled"
+msgstr "Facebook deshabilitado"
+
+#: ../../addon/fbpost/fbpost.php:199
+msgid "Facebook Post"
+msgstr "Facebook"
+
+#: ../../addon/fbpost/fbpost.php:205
+msgid "Install Facebook Post connector for this account."
+msgstr "Instalar el conector de Facebook para esta cuenta."
+
+#: ../../addon/fbpost/fbpost.php:212
+msgid "Remove Facebook Post connector"
+msgstr "Eliminar el conector de Facebook"
+
+#: ../../addon/fbpost/fbpost.php:240
+msgid "Facebook Post Settings"
+msgstr "Configuración de conexión a Facebook"
+
+#: ../../addon/widgets/widget_like.php:58
+#, php-format
+msgid "%d person likes this"
+msgid_plural "%d people like this"
+msgstr[0] "a %d persona le gusta esto"
+msgstr[1] "a %d personas les gusta esto"
+
+#: ../../addon/widgets/widget_like.php:61
+#, php-format
+msgid "%d person doesn't like this"
+msgid_plural "%d people don't like this"
+msgstr[0] "a %d persona no le gusta esto"
+msgstr[1] "a %d personas no les gusta esto"
+
+#: ../../addon/widgets/widget_friendheader.php:40
+msgid "Get added to this list!"
+msgstr "¡Añadido a la lista!"
+
+#: ../../addon/widgets/widgets.php:56
+msgid "Generate new key"
+msgstr "Generar clave nueva"
+
+#: ../../addon/widgets/widgets.php:59
+msgid "Widgets key"
+msgstr "Clave de aplicaciones"
+
+#: ../../addon/widgets/widgets.php:61
+msgid "Widgets available"
+msgstr "Aplicaciones disponibles"
+
+#: ../../addon/widgets/widget_friends.php:40
+msgid "Connect on Friendica!"
+msgstr "¡Conéctate en Friendica!"
+
+#: ../../addon/morepokes/morepokes.php:19
+msgid "bitchslap"
+msgstr "abofetear fuerte"
+
+#: ../../addon/morepokes/morepokes.php:19
+msgid "bitchslapped"
+msgstr "abofeteó fuertemente a"
+
+#: ../../addon/morepokes/morepokes.php:20
+msgid "shag"
+msgstr "picar"
+
+#: ../../addon/morepokes/morepokes.php:20
+msgid "shagged"
+msgstr "picó a"
+
+#: ../../addon/morepokes/morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr "hacer algo obsceno y biológico a"
+
+#: ../../addon/morepokes/morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr "hizo algo obsceno y biológico a"
+
+#: ../../addon/morepokes/morepokes.php:22
+msgid "point out the poke feature to"
+msgstr "señalar la habilidad de toques a"
+
+#: ../../addon/morepokes/morepokes.php:22
+msgid "pointed out the poke feature to"
+msgstr "señaló la habilidad de toques a"
+
+#: ../../addon/morepokes/morepokes.php:23
+msgid "declare undying love for"
+msgstr "declarar amor incondicional a"
+
+#: ../../addon/morepokes/morepokes.php:23
+msgid "declared undying love for"
+msgstr "declaró amor incondicional a"
+
+#: ../../addon/morepokes/morepokes.php:24
+msgid "patent"
+msgstr "patentar"
+
+#: ../../addon/morepokes/morepokes.php:24
+msgid "patented"
+msgstr "patentó"
+
+#: ../../addon/morepokes/morepokes.php:25
+msgid "stroke beard"
+msgstr "acariciar barba"
+
+#: ../../addon/morepokes/morepokes.php:25
+msgid "stroked their beard at"
+msgstr "acarició su barba a"
+
+#: ../../addon/morepokes/morepokes.php:26
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr "deplorar los bajos estándares de educación secundaria y terciaria moderna a"
+
+#: ../../addon/morepokes/morepokes.php:26
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education "
+"to"
+msgstr "deplora los bajos estándares de educación secundaria y terciaria moderna a"
+
+#: ../../addon/morepokes/morepokes.php:27
+msgid "hug"
+msgstr "abrazar"
+
+#: ../../addon/morepokes/morepokes.php:27
+msgid "hugged"
+msgstr "abrazó a"
+
+#: ../../addon/morepokes/morepokes.php:28
+msgid "kiss"
+msgstr "besar"
+
+#: ../../addon/morepokes/morepokes.php:28
+msgid "kissed"
+msgstr "besó a"
+
+#: ../../addon/morepokes/morepokes.php:29
+msgid "raise eyebrows at"
+msgstr "alzar las cejas a"
+
+#: ../../addon/morepokes/morepokes.php:29
+msgid "raised their eyebrows at"
+msgstr "alzó sus cejas a"
+
+#: ../../addon/morepokes/morepokes.php:30
+msgid "insult"
+msgstr "insultar"
+
+#: ../../addon/morepokes/morepokes.php:30
+msgid "insulted"
+msgstr "insultó a"
+
+#: ../../addon/morepokes/morepokes.php:31
+msgid "praise"
+msgstr "alabar"
+
+#: ../../addon/morepokes/morepokes.php:31
+msgid "praised"
+msgstr "alabó a"
+
+#: ../../addon/morepokes/morepokes.php:32
+msgid "be dubious of"
+msgstr "dudar de"
+
+#: ../../addon/morepokes/morepokes.php:32
+msgid "was dubious of"
+msgstr "dudó de"
+
+#: ../../addon/morepokes/morepokes.php:33
+msgid "eat"
+msgstr "comer"
+
+#: ../../addon/morepokes/morepokes.php:33
+msgid "ate"
+msgstr "comió"
+
+#: ../../addon/morepokes/morepokes.php:34
+msgid "giggle and fawn at"
+msgstr "reír y carcajearse de"
+
+#: ../../addon/morepokes/morepokes.php:34
+msgid "giggled and fawned at"
+msgstr "rió y se carcajeó de"
+
+#: ../../addon/morepokes/morepokes.php:35
+msgid "doubt"
+msgstr "dudar"
+
+#: ../../addon/morepokes/morepokes.php:35
+msgid "doubted"
+msgstr "dudó"
+
+#: ../../addon/morepokes/morepokes.php:36
+msgid "glare"
+msgstr "mirar fijamente"
+
+#: ../../addon/morepokes/morepokes.php:36
+msgid "glared at"
+msgstr "miró fijamente a"
+
+#: ../../addon/yourls/yourls.php:55
+msgid "YourLS Settings"
+msgstr "Tu configuración LS"
+
+#: ../../addon/yourls/yourls.php:57
+msgid "URL: http://"
+msgstr "Dirección: http://"
+
+#: ../../addon/yourls/yourls.php:62
+msgid "Username:"
+msgstr "Nombre de Usuario:"
+
+#: ../../addon/yourls/yourls.php:67
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: ../../addon/yourls/yourls.php:72
+msgid "Use SSL "
+msgstr "Usar SSL "
+
+#: ../../addon/yourls/yourls.php:92
+msgid "yourls Settings saved."
+msgstr "La configuración se ha guardado."
+
+#: ../../addon/ljpost/ljpost.php:39
+msgid "Post to LiveJournal"
+msgstr "Publicar en Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr "Configuración de las publicaciones en Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:72
+msgid "Enable LiveJournal Post Plugin"
+msgstr "Activar el módulo de publicación en Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:77
+msgid "LiveJournal username"
+msgstr "Nombre de usuario de Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:82
+msgid "LiveJournal password"
+msgstr "Contraseña de Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:87
+msgid "Post to LiveJournal by default"
+msgstr "Publicar en Livejournal por defecto"
+
+#: ../../addon/nsfw/nsfw.php:47
+msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgstr "Configuración \"Not Safe For Work\" (Filtro de contenido de carácter general)"
+
+#: ../../addon/nsfw/nsfw.php:49
+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 "Este complemento busca las palabras clave que especifiques y oculta cualquier comentario que contenga dichas claves, para que no aparezcan en momentos inoportunos, como por ejemplo, material sexual. Se considera de buena educación y correcto etiquetar los desnudos con #NSFW.  Este filtro puede servir para filtrar otro contenido, así que te puede servir como un filtro de carácter general, escogiendo las palabras clave adecuadas."
+
+#: ../../addon/nsfw/nsfw.php:50
+msgid "Enable Content filter"
+msgstr "Activar el filtro de contenido"
+
+#: ../../addon/nsfw/nsfw.php:53
+msgid "Comma separated list of keywords to hide"
+msgstr "Palabras clave para ocultar, lista separada por comas"
+
+#: ../../addon/nsfw/nsfw.php:58
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Usa /expresión/ para proporcionar expresiones regulares"
+
+#: ../../addon/nsfw/nsfw.php:74
+msgid "NSFW Settings saved."
+msgstr "Configuración NSFW guardada."
+
+#: ../../addon/nsfw/nsfw.php:121
+#, php-format
+msgid "%s - Click to open/close"
+msgstr "%s - Pulsa aquí para abrir/cerrar"
+
+#: ../../addon/page/page.php:61 ../../addon/page/page.php:91
+#: ../../addon/forumlist/forumlist.php:54
+msgid "Forums"
+msgstr "Foros"
+
+#: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:88
+msgid "Forums:"
+msgstr "Foros:"
+
+#: ../../addon/page/page.php:165
+msgid "Page settings updated."
+msgstr "Configuración de la página actualizada"
+
+#: ../../addon/page/page.php:194
+msgid "Page Settings"
+msgstr "Configuración de la página"
+
+#: ../../addon/page/page.php:196 ../../addon/forumlist/forumlist.php:155
+msgid "How many forums to display on sidebar without paging"
+msgstr "¿Cuántos foros se mostrarán en la barra lateral?"
+
+#: ../../addon/page/page.php:199
+msgid "Randomise Page/Forum list"
+msgstr "Lista de Página/Foro al azar"
+
+#: ../../addon/page/page.php:202
+msgid "Show pages/forums on profile page"
+msgstr "Mostrar páginas/foros en tu perfil"
+
+#: ../../addon/planets/planets.php:150
+msgid "Planets Settings"
+msgstr "Configuración de Planets"
+
+#: ../../addon/planets/planets.php:152
+msgid "Enable Planets Plugin"
+msgstr "Activar el módulo de planetas Planets"
+
+#: ../../addon/communityhome/communityhome.php:28
+#: ../../addon/communityhome/communityhome.php:34
+#: ../../addon/communityhome/twillingham/communityhome.php:28
+#: ../../addon/communityhome/twillingham/communityhome.php:34
+#: ../../include/nav.php:64 ../../boot.php:912
+msgid "Login"
+msgstr "Acceder"
+
+#: ../../addon/communityhome/communityhome.php:29
+#: ../../addon/communityhome/twillingham/communityhome.php:29
+msgid "OpenID"
+msgstr "OpenID"
+
+#: ../../addon/communityhome/communityhome.php:38
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
+msgstr "Últimos usuarios"
+
+#: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/twillingham/communityhome.php:81
+msgid "Most active users"
+msgstr "Usuarios más activos"
+
+#: ../../addon/communityhome/communityhome.php:98
+msgid "Latest photos"
+msgstr "Últimas fotos"
+
+#: ../../addon/communityhome/communityhome.php:133
+msgid "Latest likes"
+msgstr "Últimos me gusta"
+
+#: ../../addon/communityhome/communityhome.php:155
+#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1397
+#: ../../include/conversation.php:117 ../../include/conversation.php:247
+msgid "event"
+msgstr "evento"
+
+#: ../../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 "Sin acceso"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:30
+#: ../../addon/dav/common/wdcal_edit.inc.php:738
+msgid "Could not open component for editing"
+msgstr "No se puede abrir para editar"
+
+#: ../../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 "Volver al calendario"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:144
+msgid "Event data"
+msgstr "Datos del evento"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:146
+#: ../../addon/dav/friendica/main.php:239
+msgid "Calendar"
+msgstr "Calendario"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:163
+msgid "Special color"
+msgstr "Color especial"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:169
+msgid "Subject"
+msgstr "Asunto"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:173
+msgid "Starts"
+msgstr "Comienzo"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:178
+msgid "Ends"
+msgstr "Final"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:185
+msgid "Description"
+msgstr "Descripción"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:188
+msgid "Recurrence"
+msgstr "Recurrencia"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:190
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:194
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr "Diariamente"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:197
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Semanalmente"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:200
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "Mensualmente"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:203
+msgid "Yearly"
+msgstr "Anual"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:214
+#: ../../include/datetime.php:288
+msgid "days"
+msgstr "días"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:215
+#: ../../include/datetime.php:287
+msgid "weeks"
+msgstr "semanas"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:216
+#: ../../include/datetime.php:286
+msgid "months"
+msgstr "meses"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:217
+#: ../../include/datetime.php:285
+msgid "years"
+msgstr "años"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:218
+msgid "Interval"
+msgstr "Intérvalo"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:218
+msgid "All %select% %time%"
+msgstr "Todos %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
+msgid "Days"
+msgstr "Días"
+
+#: ../../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:917
+msgid "Sunday"
+msgstr "Domingo"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:235
+#: ../../addon/dav/common/wdcal_edit.inc.php:274
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917
+msgid "Monday"
+msgstr "Lunes"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:238
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917
+msgid "Tuesday"
+msgstr "Martes"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:241
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:244
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917
+msgid "Thursday"
+msgstr "Jueves"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:247
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917
+msgid "Friday"
+msgstr "Viernes"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:250
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917
+msgid "Saturday"
+msgstr "Sábado"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:297
+msgid "First day of week:"
+msgstr "Primer día de la semana:"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:350
+#: ../../addon/dav/common/wdcal_edit.inc.php:373
+msgid "Day of month"
+msgstr "Día del mes"
+
+#: ../../addon/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
+msgid "#num#th-last of each month"
+msgstr "#num#º antes del último de cada mes"
+
+#: ../../addon/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
+msgid "#num#th-last #wkday# of each month"
+msgstr "#num#º antes del último #wkday# de cada mes"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:372
+#: ../../addon/dav/friendica/layout.fnk.php:255
+msgid "Month"
+msgstr "Mes"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:377
+msgid "#num#th of the given month"
+msgstr "#num#º del mes dado"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:380
+msgid "#num#th-last of the given month"
+msgstr "#num#º antes del último del mes dado"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:383
+msgid "#num#th #wkday# of the given month"
+msgstr "#num#º #wkday# del mes dado"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:386
+msgid "#num#th-last #wkday# of the given month"
+msgstr "#num#º antes del último #wkday# del mes dado"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:413
+msgid "Repeat until"
+msgstr "Repetir hasta"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:417
+msgid "Infinite"
+msgstr "Infinito"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:420
+msgid "Until the following date"
+msgstr "Hasta la fecha siguiente"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:423
+msgid "Number of times"
+msgstr "Número de veces"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:429
+msgid "Exceptions"
+msgstr "Excepciones"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:432
+msgid "none"
+msgstr "ninguno"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:449
+msgid "Notification"
+msgstr "Notificación"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:466
+msgid "Notify by"
+msgstr "Notificar por"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:469
+msgid "E-Mail"
+msgstr "Correo electrónico"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:470
+msgid "On Friendica / Display"
+msgstr "Sobre Friendica / Mostrar"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:474
+msgid "Time"
+msgstr "Hora"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:478
+msgid "Hours"
+msgstr "Horas"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:479
+msgid "Minutes"
+msgstr "Minutos"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:480
+msgid "Seconds"
+msgstr "Segundos"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:482
+msgid "Weeks"
+msgstr "Semanas"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:485
+msgid "before the"
+msgstr "antes de"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:486
+msgid "start of the event"
+msgstr "inicio del evento"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:487
+msgid "end of the event"
+msgstr "final del evento"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:492
+msgid "Add a notification"
+msgstr "Añadir una notificación"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:687
+msgid "The event #name# will start at #date"
+msgstr "El evento #name# comenzará el #date"
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:696
+msgid "#name# is about to begin."
+msgstr "#name# está a punto de comenzar."
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:769
+msgid "Saved"
+msgstr "Guardado"
+
+#: ../../addon/dav/common/wdcal_configuration.php:148
+msgid "U.S. Time Format (mm/dd/YYYY)"
+msgstr "Hora, formato anglosajón (mm/dd/aaaa)"
+
+#: ../../addon/dav/common/wdcal_configuration.php:243
+msgid "German Time Format (dd.mm.YYYY)"
+msgstr "Hora, formato europeo (dd.mm.aaaa)"
+
+#: ../../addon/dav/common/dav_caldav_backend_private.inc.php:39
+msgid "Private Events"
+msgstr "Eventos privados"
+
+#: ../../addon/dav/common/dav_carddav_backend_private.inc.php:46
+msgid "Private Addressbooks"
+msgstr "Libretas de direcciones privada"
+
+#: ../../addon/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php:36
+msgid "Friendica-Native events"
+msgstr "Eventos nativos de Friendica"
+
+#: ../../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 "Contactos de Friendica"
+
+#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:60
+msgid "Your Friendica-Contacts"
+msgstr "Tus Contactos de Friendica"
+
+#: ../../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 "Algo salió mal al importar el archivo. Lo sentimos. Puede que algunos eventos se hayan importado."
+
+#: ../../addon/dav/friendica/layout.fnk.php:131
+msgid "Something went wrong when trying to import the file. Sorry."
+msgstr "Algo salió mal al importar el archivo. Lo sentimos."
+
+#: ../../addon/dav/friendica/layout.fnk.php:134
+msgid "The ICS-File has been imported."
+msgstr "El archivo ICS ha sido importado."
+
+#: ../../addon/dav/friendica/layout.fnk.php:138
+msgid "No file was uploaded."
+msgstr "No se ha importado ningún archivo."
+
+#: ../../addon/dav/friendica/layout.fnk.php:147
+msgid "Import a ICS-file"
+msgstr "Importar archivo ICS"
+
+#: ../../addon/dav/friendica/layout.fnk.php:150
+msgid "ICS-File"
+msgstr "Archivo ICS"
+
+#: ../../addon/dav/friendica/layout.fnk.php:151
+msgid "Overwrite all #num# existing events"
+msgstr "Sobreescribir los #num# eventos existentes"
+
+#: ../../addon/dav/friendica/layout.fnk.php:228
+msgid "New event"
+msgstr "Evento nuevo"
+
+#: ../../addon/dav/friendica/layout.fnk.php:232
+msgid "Today"
+msgstr "Hoy"
+
+#: ../../addon/dav/friendica/layout.fnk.php:241
+msgid "Day"
+msgstr "Día"
+
+#: ../../addon/dav/friendica/layout.fnk.php:248
+msgid "Week"
+msgstr "Semana"
+
+#: ../../addon/dav/friendica/layout.fnk.php:260
+msgid "Reload"
+msgstr "Recargar"
+
+#: ../../addon/dav/friendica/layout.fnk.php:271
+msgid "Date"
+msgstr "Fecha"
+
+#: ../../addon/dav/friendica/layout.fnk.php:313
+msgid "Error"
+msgstr "Error"
+
+#: ../../addon/dav/friendica/layout.fnk.php:380
+msgid "The calendar has been updated."
+msgstr "El calendario ha sido actualizado."
+
+#: ../../addon/dav/friendica/layout.fnk.php:393
+msgid "The new calendar has been created."
+msgstr "Se ha creado un nuevo calendario."
+
+#: ../../addon/dav/friendica/layout.fnk.php:417
+msgid "The calendar has been deleted."
+msgstr "El calendario se ha borrado."
+
+#: ../../addon/dav/friendica/layout.fnk.php:424
+msgid "Calendar Settings"
+msgstr "Configuración del Calendario"
+
+#: ../../addon/dav/friendica/layout.fnk.php:430
+msgid "Date format"
+msgstr "Formato de fecha"
+
+#: ../../addon/dav/friendica/layout.fnk.php:439
+msgid "Time zone"
+msgstr "Zona horaria"
+
+#: ../../addon/dav/friendica/layout.fnk.php:445
+msgid "Calendars"
+msgstr "Calendarios"
+
+#: ../../addon/dav/friendica/layout.fnk.php:487
+msgid "Create a new calendar"
+msgstr "Crear un nuevo calendario"
+
+#: ../../addon/dav/friendica/layout.fnk.php:496
+msgid "Limitations"
+msgstr "Limitaciones"
+
+#: ../../addon/dav/friendica/layout.fnk.php:500
+#: ../../addon/libravatar/libravatar.php:82
+msgid "Warning"
+msgstr "Aviso"
+
+#: ../../addon/dav/friendica/layout.fnk.php:504
+msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
+msgstr "Sincronización (iPhone, Thunderbird Lightning, Android...)"
+
+#: ../../addon/dav/friendica/layout.fnk.php:511
+msgid "Synchronizing this calendar with the iPhone"
+msgstr "Sincronizar este calendario con iPhone"
+
+#: ../../addon/dav/friendica/layout.fnk.php:522
+msgid "Synchronizing your Friendica-Contacts with the iPhone"
+msgstr "Sincronizar tus contactos de Friendica con iPhone"
+
+#: ../../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 "La versión actual de este módulo no se ha ajustado correctamente. Por favor contacta al administrador de sistema de tu instalación de Friendica para arreglarlo."
+
+#: ../../addon/dav/friendica/main.php:242
+msgid "Extended calendar with CalDAV-support"
+msgstr "Calendario ampliado con soporte CalDAV"
+
+#: ../../addon/dav/friendica/main.php:279
+#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
+#: ../../include/enotify.php:28 ../../include/notifier.php:710
+msgid "noreply"
+msgstr "no responder"
+
+#: ../../addon/dav/friendica/main.php:282
+msgid "Notification: "
+msgstr "Notificación:"
+
+#: ../../addon/dav/friendica/main.php:309
+msgid "The database tables have been installed."
+msgstr "Se han instalado las tablas de la base de datos."
+
+#: ../../addon/dav/friendica/main.php:310
+msgid "An error occurred during the installation."
+msgstr "Ha ocurrido un error durante la instalación."
+
+#: ../../addon/dav/friendica/main.php:316
+msgid "The database tables have been updated."
+msgstr "Las tablas de la base de datos han sido actualizadas."
+
+#: ../../addon/dav/friendica/main.php:317
+msgid "An error occurred during the update."
+msgstr "Ocurrió un error durante la actualización."
+
+#: ../../addon/dav/friendica/main.php:333
+msgid "No system-wide settings yet."
+msgstr "No se han configurado aún los ajustes del sistema."
+
+#: ../../addon/dav/friendica/main.php:336
+msgid "Database status"
+msgstr "Estado de la base de datos"
+
+#: ../../addon/dav/friendica/main.php:339
+msgid "Installed"
+msgstr "Instalada"
+
+#: ../../addon/dav/friendica/main.php:343
+msgid "Upgrade needed"
+msgstr "Actualización necesaria"
+
+#: ../../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 "Por favor respalda todos los datos de calendario (las tablas que comienzan con dav_*) antes de continuar. Aunque todos los eventos de calendario <i>deberían</i> convertirse a la nueva estructura de base de datos, siempre es seguro tener un respaldo. Abajo, puedes ver las consultas a la base de datos que se realizarán cuando presiones el botón de 'actualizar'."
+
+#: ../../addon/dav/friendica/main.php:343
+msgid "Upgrade"
+msgstr "Actualizada"
+
+#: ../../addon/dav/friendica/main.php:346
+msgid "Not installed"
+msgstr "Sin instalar"
+
+#: ../../addon/dav/friendica/main.php:346
+msgid "Install"
+msgstr "Instalar"
+
+#: ../../addon/dav/friendica/main.php:350
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../../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 "Ha ocurrido algo muy malo. No puedo recuperarme automáticamente de este estado, lo siento. Por favor ve al manejador de fondo de la base de datos, respalda los datos, y borra todas las tablas que comienzan con 'dav_' manualmente. Después de eso, esta rutina de instalación debería de ser capaz de reinicializar las tablas automáticamente."
+
+#: ../../addon/dav/friendica/main.php:355
+msgid "Troubleshooting"
+msgstr "Problemas"
+
+#: ../../addon/dav/friendica/main.php:356
+msgid "Manual creation of the database tables:"
+msgstr "Manual para la creación de las tablas de la base de datos:"
+
+#: ../../addon/dav/friendica/main.php:357
+msgid "Show SQL-statements"
+msgstr "Mostrar declaraciones SQL"
+
+#: ../../addon/dav/friendica/calendar.friendica.fnk.php:206
+msgid "Private Calendar"
+msgstr "Calendario privado"
+
+#: ../../addon/dav/friendica/calendar.friendica.fnk.php:207
+msgid "Friendica Events: Mine"
+msgstr "Eventos de Friendica: Propios"
+
+#: ../../addon/dav/friendica/calendar.friendica.fnk.php:208
+msgid "Friendica Events: Contacts"
+msgstr "Eventos de Friendica: Contactos"
+
+#: ../../addon/dav/friendica/calendar.friendica.fnk.php:248
+msgid "Private Addresses"
+msgstr "Direcciones privadas"
+
+#: ../../addon/dav/friendica/calendar.friendica.fnk.php:249
+msgid "Friendica Contacts"
+msgstr "Contactos de Friendica"
+
+#: ../../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 "Permitir el uso de tu ID de Friendica (%s) para conexiones de almacenamiento externo sin alojamiento activado (como OwnCloud). Mira <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:85
+msgid "Template URL (with {category})"
+msgstr "Dirección de la plantilla (con {categoría})"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:86
+msgid "OAuth end-point"
+msgstr "Punto final OAuth"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:87
+msgid "Api"
+msgstr "API"
+
+#: ../../addon/membersince/membersince.php:18
+msgid "Member since:"
+msgstr "Miembro desde:"
 
 #: ../../addon/tictac/tictac.php:20
 msgid "Three Dimensional Tic-Tac-Toe"
@@ -3988,26 +5943,19 @@ msgstr "Nuevo juego con handicap"
 msgid ""
 "Three dimensional tic-tac-toe is just like the traditional game except that "
 "it is played on multiple levels simultaneously. "
-msgstr ""
-"Tres en Raya tridimensional es como el juego tradicional, excepto que se "
-"juega en varios niveles simultáneamente."
+msgstr "Tres en Raya tridimensional es como el juego tradicional, excepto que se juega en varios niveles simultáneamente."
 
 #: ../../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 ""
-"En este caso hay tres niveles. Ganarás por conseguir tres en raya en "
-"cualquier nivel, así como arriba, abajo y en diagonal a través de los "
-"diferentes niveles."
+msgstr "En este caso hay tres niveles. Ganarás por conseguir tres en raya en cualquier nivel, así como arriba, abajo y en diagonal a través de los diferentes niveles."
 
 #: ../../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 ""
-"El juego con handicap desactiva la posición central en el nivel medio porque"
-" el jugador reclama que este cuadrado tiene a menudo una ventaja injusta."
+msgstr "El juego con handicap desactiva la posición central en el nivel medio porque el jugador que la ocupa tiene a menudo una ventaja injusta."
 
 #: ../../addon/tictac/tictac.php:182
 msgid "You go first..."
@@ -4029,297 +5977,120 @@ msgstr "¡Empate!"
 msgid "I won!"
 msgstr "¡He ganado!"
 
-#: ../../addon/uhremotestorage/uhremotestorage.php:56
-#, php-format
-msgid ""
-"Allow to use your friendika id (%s) to connecto to external unhosted-enabled"
-" storage (like ownCloud)"
-msgstr ""
-"Permitir el uso de su ID de friendica (%s) para conectar a fuentes externas "
-"de almacenamiento sin anfitrión habilitado (como ownCloud)"
-
-#: ../../addon/uhremotestorage/uhremotestorage.php:57
-msgid "Unhosted DAV storage url"
-msgstr "Dirección url de almacenamiento DAV sin anfitrión"
-
-#: ../../addon/impressum/impressum.php:25
-msgid "Impressum"
-msgstr "Impressum"
-
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:40
-#: ../../addon/impressum/impressum.php:70
-msgid "Site Owner"
-msgstr "Propietario"
-
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:74
-msgid "Email Address"
-msgstr "Dirección de correo"
-
-#: ../../addon/impressum/impressum.php:43
-#: ../../addon/impressum/impressum.php:72
-msgid "Postal Address"
-msgstr "Dirección"
-
-#: ../../addon/impressum/impressum.php:49
-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 necesita ser configurado.<br />Por favor añade al menos la "
-"variable <tt>propietario<tt> a tu archivo de configuración. Para otras "
-"variables lee el archivo README."
-
-#: ../../addon/impressum/impressum.php:71
-msgid "Site Owners Profile"
-msgstr "Perfil del propietario del sitio"
-
-#: ../../addon/impressum/impressum.php:73
-msgid "Notes"
-msgstr "Notas"
-
-#: ../../addon/facebook/facebook.php:337
-msgid "Facebook disabled"
-msgstr "Facebook deshabilitado"
-
-#: ../../addon/facebook/facebook.php:342
-msgid "Updating contacts"
-msgstr "Actualizando contactos"
-
-#: ../../addon/facebook/facebook.php:351
-msgid "Facebook API key is missing."
-msgstr "Falta la clave API de Facebook."
-
-#: ../../addon/facebook/facebook.php:358
-msgid "Facebook Connect"
-msgstr "Conexión con Facebook"
-
-#: ../../addon/facebook/facebook.php:364
-msgid "Install Facebook connector for this account."
-msgstr "Instalar el conector de Facebook para esta cuenta."
-
-#: ../../addon/facebook/facebook.php:371
-msgid "Remove Facebook connector"
-msgstr "Eliminar el conector de Facebook"
-
-#: ../../addon/facebook/facebook.php:376
-msgid ""
-"Re-authenticate [This is necessary whenever your Facebook password is "
-"changed.]"
-msgstr ""
-"Volver a identificarse [Esto es necesario cada vez que su contraseña de "
-"Facebook cambie.]"
-
-#: ../../addon/facebook/facebook.php:383
-msgid "Post to Facebook by default"
-msgstr "Publicar en Facebook de forma predeterminada"
-
-#: ../../addon/facebook/facebook.php:387
-msgid "Link all your Facebook friends and conversations on this website"
-msgstr ""
-"Vincule a todos tus amigos de Facebook y las conversaciones en este sitio "
-"web"
-
-#: ../../addon/facebook/facebook.php:389
-msgid ""
-"Facebook conversations consist of your <em>profile wall</em> and your friend"
-" <em>stream</em>."
-msgstr ""
-"Las conversaciones de Facebook consisten en su <em>muro</em> su "
-"<em>perfil</em> y las <em>publicaciones</em> de su amigo."
-
-#: ../../addon/facebook/facebook.php:390
-msgid "On this website, your Facebook friend stream is only visible to you."
-msgstr ""
-"En esta página web, las publicaciones de su amigo de Facebook solo son "
-"visibles para usted."
-
-#: ../../addon/facebook/facebook.php:391
-msgid ""
-"The following settings determine the privacy of your Facebook profile wall "
-"on this website."
-msgstr ""
-"La siguiente configuración determina la privacidad del muro de su perfil de "
-"Facebook en este sitio web."
-
-#: ../../addon/facebook/facebook.php:395
-msgid ""
-"On this website your Facebook profile wall conversations will only be "
-"visible to you"
-msgstr ""
-"En este sitio web las publicaciones del muro de Facebook solo son visibles "
-"para usted"
-
-#: ../../addon/facebook/facebook.php:400
-msgid "Do not import your Facebook profile wall conversations"
-msgstr "No importar las conversaciones de su muro de Facebook"
-
-#: ../../addon/facebook/facebook.php:402
-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 decide conectar las conversaciones y dejar ambas casillas sin marcar, el "
-"muro de su perfil de Facebook se fusionará con el muro de su perfil en este "
-"sitio web y la configuración de privacidad en este sitio serán utilizados "
-"para determinar quién puede ver las conversaciones."
-
-#: ../../addon/facebook/facebook.php:469
-#: ../../include/contact_selectors.php:78
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../addon/facebook/facebook.php:470
-msgid "Facebook Connector Settings"
-msgstr "Configuración de conexión a Facebook"
-
-#: ../../addon/facebook/facebook.php:484
-msgid "Post to Facebook"
-msgstr "Publicar en Facebook"
-
-#: ../../addon/facebook/facebook.php:561
-msgid ""
-"Post to Facebook cancelled because of multi-network access permission "
-"conflict."
-msgstr ""
-"Publicación en Facebook cancelada debido a un conflicto con los permisos de "
-"acceso a la multi-red."
-
-#: ../../addon/facebook/facebook.php:624
-msgid "Image: "
-msgstr "Imagen: "
-
-#: ../../addon/facebook/facebook.php:700
-msgid "View on Friendika"
-msgstr "Ver en Friendika"
-
-#: ../../addon/facebook/facebook.php:724
-msgid "Facebook post failed. Queued for retry."
-msgstr "Publicación en Facebook errónea. Reintentando..."
-
-#: ../../addon/widgets/widgets.php:55
-msgid "Generate new key"
-msgstr "Generar clave nueva"
-
-#: ../../addon/widgets/widgets.php:58
-msgid "Widgets key"
-msgstr "Clave de aplicación"
-
-#: ../../addon/widgets/widgets.php:60
-msgid "Widgets available"
-msgstr "Aplicación disponible"
-
-#: ../../addon/widgets/widget_friends.php:40
-msgid "Connect on Friendika!"
-msgstr "¡Conectado en Friendika!"
-
-#: ../../addon/widgets/widget_like.php:58
-#, php-format
-msgid "%d person likes this"
-msgid_plural "%d people like this"
-msgstr[0] "a %d persona le gusta esto"
-msgstr[1] "a %d personas les gusta esto"
-
-#: ../../addon/widgets/widget_like.php:61
-#, php-format
-msgid "%d person doesn't like this"
-msgid_plural "%d people don't like this"
-msgstr[0] "a %d persona no le gusta esto"
-msgstr[1] "a %d personas no les gusta esto"
-
-#: ../../addon/buglink/buglink.php:15
-msgid "Report Bug"
-msgstr "Informe de errores"
-
-#: ../../addon/nsfw/nsfw.php:47
-msgid "\"Not Safe For Work\" Settings"
-msgstr "Configuración «No apto para el trabajo» (NSFW)"
-
-#: ../../addon/nsfw/nsfw.php:49
-msgid "Comma separated words to treat as NSFW"
-msgstr "Palabras separadas por comas para tratarlo como NSFW"
-
-#: ../../addon/nsfw/nsfw.php:66
-msgid "NSFW Settings saved."
-msgstr "Configuración NSFW guardada."
-
-#: ../../addon/nsfw/nsfw.php:102
-#, php-format
-msgid "%s - Click to open/close"
-msgstr "%s - Haga clic para abrir/cerrar"
-
-#: ../../addon/communityhome/communityhome.php:29
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../../addon/communityhome/communityhome.php:38
-msgid "Last users"
-msgstr "Últimos usuarios"
-
-#: ../../addon/communityhome/communityhome.php:81
-msgid "Most active users"
-msgstr "Usuarios más activos"
-
-#: ../../addon/communityhome/communityhome.php:98
-msgid "Last photos"
-msgstr "Últimas fotos"
-
-#: ../../addon/communityhome/communityhome.php:133
-msgid "Last likes"
-msgstr "Últimos \"me gusta\""
-
-#: ../../addon/communityhome/communityhome.php:155
-#: ../../include/conversation.php:23
-msgid "event"
-msgstr "evento"
-
-#: ../../addon/membersince/membersince.php:17
-#, php-format
-msgid " - Member since: %s"
-msgstr "- Miembro desde: %s"
-
-#: ../../addon/randplace/randplace.php:170
+#: ../../addon/randplace/randplace.php:169
 msgid "Randplace Settings"
 msgstr "Configuración de Randplace"
 
-#: ../../addon/randplace/randplace.php:172
+#: ../../addon/randplace/randplace.php:171
 msgid "Enable Randplace Plugin"
-msgstr "Activar el módulo Randplace"
+msgstr "Activar el módulo de lugar aleatorio Randplace"
 
-#: ../../addon/piwik/piwik.php:70
-msgid ""
-"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
-"analytics tool."
-msgstr ""
-"Este sitio web realiza un seguimiento mediante la herramienta de análisis <a"
-" href='http://www.piwik.org'>Piwik</a>."
+#: ../../addon/dwpost/dwpost.php:39
+msgid "Post to Dreamwidth"
+msgstr "Publicar en Dreamwidth"
 
-#: ../../addon/piwik/piwik.php:73
+#: ../../addon/dwpost/dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr "Configuración de las publicaciones en Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:72
+msgid "Enable dreamwidth Post Plugin"
+msgstr "Activar el módulo de publicación en Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:77
+msgid "dreamwidth username"
+msgstr "Nombre de usuario de Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:82
+msgid "dreamwidth password"
+msgstr "Contraseña de Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:87
+msgid "Post to dreamwidth by default"
+msgstr "Publicar en Dreamwidth por defecto"
+
+#: ../../addon/drpost/drpost.php:35
+msgid "Post to Drupal"
+msgstr "Publicar en Drupal"
+
+#: ../../addon/drpost/drpost.php:72
+msgid "Drupal Post Settings"
+msgstr "Configuración de las publicaciones en Drupal"
+
+#: ../../addon/drpost/drpost.php:74
+msgid "Enable Drupal Post Plugin"
+msgstr "Activar el módulo de publicación en Drupal"
+
+#: ../../addon/drpost/drpost.php:79
+msgid "Drupal username"
+msgstr "Nombre de usuario de Drupal"
+
+#: ../../addon/drpost/drpost.php:84
+msgid "Drupal password"
+msgstr "Contraseña de Drupal"
+
+#: ../../addon/drpost/drpost.php:89
+msgid "Post Type - article,page,or blog"
+msgstr "Tipo de publicación: artículo, página o blog"
+
+#: ../../addon/drpost/drpost.php:94
+msgid "Drupal site URL"
+msgstr "Dirección de Drupal"
+
+#: ../../addon/drpost/drpost.php:99
+msgid "Drupal site uses clean URLS"
+msgstr "El sitio de Drupal usa direcciones URL simples"
+
+#: ../../addon/drpost/drpost.php:104
+msgid "Post to Drupal by default"
+msgstr "Publicar en Drupal por defecto"
+
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:201
+#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189
+msgid "Post from Friendica"
+msgstr "Publicado desde Friendica"
+
+#: ../../addon/startpage/startpage.php:83
+msgid "Startpage Settings"
+msgstr "Configuración de página inicial"
+
+#: ../../addon/startpage/startpage.php:85
+msgid "Home page to load after login  - leave blank for profile wall"
+msgstr "Página por defecto, dejálo en blanco para cargar tu perfil"
+
+#: ../../addon/startpage/startpage.php:88
+msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
+msgstr "Ejemplos: &quot;red&quot; o &quot;notificaciones/sistema&quot;"
+
+#: ../../addon/geonames/geonames.php:143
+msgid "Geonames settings updated."
+msgstr "Configuración de Geonames actualizada."
+
+#: ../../addon/geonames/geonames.php:179
+msgid "Geonames Settings"
+msgstr "Configuración de Geonames"
+
+#: ../../addon/geonames/geonames.php:181
+msgid "Enable Geonames Plugin"
+msgstr "Activar el complemento de nombres geográficos Geonames"
+
+#: ../../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 "Tu cuenta de %s expirará en pocos días."
+
+#: ../../addon/public_server/public_server.php:127
+msgid "Your Friendica account is about to expire."
+msgstr "Tu cuenta de Friendica está a punto de expirar."
+
+#: ../../addon/public_server/public_server.php:128
 #, 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 quieres que tus visitas sean registradas de esta manera usted <a "
-"href='%s'>puede establecer una cookie para evitar que Piwik realice un "
-"seguimiento de las visitas del sitio</a> (opt-out)."
-
-#: ../../addon/piwik/piwik.php:82
-msgid "Piwik Base URL"
-msgstr "Dirección base Piwik"
-
-#: ../../addon/piwik/piwik.php:83
-msgid "Site ID"
-msgstr "ID del sitio"
-
-#: ../../addon/piwik/piwik.php:84
-msgid "Show opt-out cookie link?"
-msgstr "¿Mostrar enlace a las cookies?"
+"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 "Hola %1$s,\n\nTu cuenta en %2$s expirará en menos de 5 días. Puedes mantenerla iniciando tu sesión una vez cada 30 días"
 
 #: ../../addon/js_upload/js_upload.php:43
 msgid "Upload a file"
@@ -4333,53 +6104,1183 @@ msgstr "Arrastra los archivos aquí para subirlos"
 msgid "Failed"
 msgstr "Falló"
 
-#: ../../addon/js_upload/js_upload.php:294
+#: ../../addon/js_upload/js_upload.php:297
 msgid "No files were uploaded."
-msgstr "No hay archivos subidos."
+msgstr "No se han subido archivos aún."
 
-#: ../../addon/js_upload/js_upload.php:300
+#: ../../addon/js_upload/js_upload.php:303
 msgid "Uploaded file is empty"
 msgstr "El archivo subido está vacío"
 
-#: ../../addon/js_upload/js_upload.php:323
+#: ../../addon/js_upload/js_upload.php:326
 msgid "File has an invalid extension, it should be one of "
 msgstr "El archivo tiene una extensión no válida, debería ser una de "
 
-#: ../../addon/js_upload/js_upload.php:334
+#: ../../addon/js_upload/js_upload.php:337
 msgid "Upload was cancelled, or server error encountered"
 msgstr "La subida ha sido cancelada, o se encontró un error del servidor"
 
-#: ../../addon/wppost/wppost.php:41
+#: ../../addon/oembed.old/oembed.php:30
+msgid "OEmbed settings updated"
+msgstr "Actualizar la configuración de OEmbed"
+
+#: ../../addon/oembed.old/oembed.php:43
+msgid "Use OEmbed for YouTube videos"
+msgstr "Usar OEmbed para los vídeos de YouTube"
+
+#: ../../addon/oembed.old/oembed.php:71
+msgid "URL to embed:"
+msgstr "Dirección del recurso:"
+
+#: ../../addon/forumlist/forumlist.php:57
+msgid "show/hide"
+msgstr "mostrar/ocultar"
+
+#: ../../addon/forumlist/forumlist.php:72
+msgid "No forum subscriptions"
+msgstr "Foro sin suscrpciones"
+
+#: ../../addon/forumlist/forumlist.php:124
+msgid "Forumlist settings updated."
+msgstr "Ajustes de lista de foros actualizados."
+
+#: ../../addon/forumlist/forumlist.php:153
+msgid "Forumlist Settings"
+msgstr "Ajustes de lista de foros"
+
+#: ../../addon/forumlist/forumlist.php:158
+msgid "Randomise Forumlist/Forum list"
+msgstr "Aleatorizar lista de foros"
+
+#: ../../addon/forumlist/forumlist.php:161
+msgid "Show forumlists/forums on profile forumlist"
+msgstr "Mostrar lista de foros en perfil forumlist"
+
+#: ../../addon/impressum/impressum.php:37
+msgid "Impressum"
+msgstr "Términos y Política del sitio"
+
+#: ../../addon/impressum/impressum.php:50
+#: ../../addon/impressum/impressum.php:52
+#: ../../addon/impressum/impressum.php:84
+msgid "Site Owner"
+msgstr "Propietario"
+
+#: ../../addon/impressum/impressum.php:50
+#: ../../addon/impressum/impressum.php:88
+msgid "Email Address"
+msgstr "Dirección de correo"
+
+#: ../../addon/impressum/impressum.php:55
+#: ../../addon/impressum/impressum.php:86
+msgid "Postal Address"
+msgstr "Dirección"
+
+#: ../../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 necesita ser configurado.<br />Por favor añade al menos la variable <tt>propietario<tt> a tu archivo de configuración. Para otras variables lee el archivo README."
+
+#: ../../addon/impressum/impressum.php:84
+msgid "The page operators name."
+msgstr "Nombre del operador de la página."
+
+#: ../../addon/impressum/impressum.php:85
+msgid "Site Owners Profile"
+msgstr "Perfil del propietario del sitio"
+
+#: ../../addon/impressum/impressum.php:85
+msgid "Profile address of the operator."
+msgstr "Dirección del perfil del operador."
+
+#: ../../addon/impressum/impressum.php:86
+msgid "How to contact the operator via snail mail. You can use BBCode here."
+msgstr "Cómo contactar con el operador vía correo postal. BBCode permitido."
+
+#: ../../addon/impressum/impressum.php:87
+msgid "Notes"
+msgstr "Notas"
+
+#: ../../addon/impressum/impressum.php:87
+msgid ""
+"Additional notes that are displayed beneath the contact information. You can"
+" use BBCode here."
+msgstr "Notas adicionales que se mostrarán bajo la información del contacto. BBCode permitido."
+
+#: ../../addon/impressum/impressum.php:88
+msgid "How to contact the operator via email. (will be displayed obfuscated)"
+msgstr "Cómo contactar con el operador vía email (aparecerá oculto)"
+
+#: ../../addon/impressum/impressum.php:89
+msgid "Footer note"
+msgstr "Nota a pie"
+
+#: ../../addon/impressum/impressum.php:89
+msgid "Text for the footer. You can use BBCode here."
+msgstr "Texto para el Pie de página. BBCode permitido."
+
+#: ../../addon/buglink/buglink.php:15
+msgid "Report Bug"
+msgstr "Informe de errores"
+
+#: ../../addon/notimeline/notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "Configuración Sin Linea Temporal actualizada."
+
+#: ../../addon/notimeline/notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "Configuración Sin Linea Temporal"
+
+#: ../../addon/notimeline/notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr "Desactivar el selector de archivos en el muro del perfil"
+
+#: ../../addon/blockem/blockem.php:51
+msgid "\"Blockem\" Settings"
+msgstr "Configuración de \"Blockem\""
+
+#: ../../addon/blockem/blockem.php:53
+msgid "Comma separated profile URLS to block"
+msgstr "Direcciones separadas por coma de los perfiles a bloquear"
+
+#: ../../addon/blockem/blockem.php:70
+msgid "BLOCKEM Settings saved."
+msgstr "Configuracion Blockem guardada."
+
+#: ../../addon/blockem/blockem.php:105
+#, php-format
+msgid "Blocked %s - Click to open/close"
+msgstr "%s bloqueado. Pulsa aquí para mostrar/ocultar"
+
+#: ../../addon/blockem/blockem.php:160
+msgid "Unblock Author"
+msgstr "Desbloquear Autor"
+
+#: ../../addon/blockem/blockem.php:162
+msgid "Block Author"
+msgstr "Bloquear Autor"
+
+#: ../../addon/blockem/blockem.php:194
+msgid "blockem settings updated"
+msgstr "Configuración de Blockem actualizada"
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-)"
+msgstr ":-)"
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-("
+msgstr ":-("
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid "lol"
+msgstr "XD"
+
+#: ../../addon/qcomment/qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr "Configuración de Qcomment"
+
+#: ../../addon/qcomment/qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to"
+" provide simple replies."
+msgstr "Qcomments son comentarios rápidos que se encuentran cerca del cuadro de texto, a veces ocultos. Pulsa en ellos para dar respuestas simples."
+
+#: ../../addon/qcomment/qcomment.php:57
+msgid "Enter quick comments, one per line"
+msgstr "Introduce comentarios rápidos, uno por línea"
+
+#: ../../addon/qcomment/qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Configuración de Qcomment guardada."
+
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid "Tile Server URL"
+msgstr "Dirección del servidor"
+
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
+"target=\"_blank\">public tile servers</a>"
+msgstr "Un listado de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">servidores públicos</a>"
+
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "Default zoom"
+msgstr "Zoom por defecto"
+
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "Nivel de zoom predeterminado. (1:mínimo, 18:máximo)"
+
+#: ../../addon/group_text/group_text.php:46
+#: ../../addon/editplain/editplain.php:46
+msgid "Editplain settings updated."
+msgstr "Configuración del Editor de texto plano actualizada."
+
+#: ../../addon/group_text/group_text.php:76
+msgid "Group Text"
+msgstr "Texto agrupado"
+
+#: ../../addon/group_text/group_text.php:78
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Usar selector de grupos solo texto (sin imágenes) en el menú \"editar grupo\""
+
+#: ../../addon/libravatar/libravatar.php:14
+msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
+msgstr "Libravatar puede no haberse instalado correctamente.<br>Requiere PHP >=5.3"
+
+#: ../../addon/libravatar/libravatar.php:73
+#: ../../addon/gravatar/gravatar.php:71
+msgid "generic profile image"
+msgstr "imagen genérica del perfil"
+
+#: ../../addon/libravatar/libravatar.php:74
+#: ../../addon/gravatar/gravatar.php:72
+msgid "random geometric pattern"
+msgstr "patrón geométrico aleatorio"
+
+#: ../../addon/libravatar/libravatar.php:75
+#: ../../addon/gravatar/gravatar.php:73
+msgid "monster face"
+msgstr "monstruosa"
+
+#: ../../addon/libravatar/libravatar.php:76
+#: ../../addon/gravatar/gravatar.php:74
+msgid "computer generated face"
+msgstr "generada por ordenador"
+
+#: ../../addon/libravatar/libravatar.php:77
+#: ../../addon/gravatar/gravatar.php:75
+msgid "retro arcade style face"
+msgstr "estilo retro arcade"
+
+#: ../../addon/libravatar/libravatar.php:83
+#, php-format
+msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+msgstr "Tu versión de PHP %s, menor que la requerida (PHP >=5.3)."
+
+#: ../../addon/libravatar/libravatar.php:84
+msgid "This addon is not functional on your server."
+msgstr "Esta funcionalidad no está activa en tu servidor."
+
+#: ../../addon/libravatar/libravatar.php:93
+#: ../../addon/gravatar/gravatar.php:89
+msgid "Information"
+msgstr "Información"
+
+#: ../../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 "El complemento Gravatar está instalado. Por favor, desactiva dicho complemento.<br>El complemento Libravatar usará Gravatar si no encuentra nada en Libravatar."
+
+#: ../../addon/libravatar/libravatar.php:100
+#: ../../addon/gravatar/gravatar.php:96
+msgid "Default avatar image"
+msgstr "Imagen del avatar por defecto"
+
+#: ../../addon/libravatar/libravatar.php:100
+msgid "Select default avatar image if none was found. See README"
+msgstr "Elige una imagen para tu avatar si no se encuentra ninguna (ver README)"
+
+#: ../../addon/libravatar/libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr "Configuración de Libravatar actualizada."
+
+#: ../../addon/libertree/libertree.php:36
+msgid "Post to libertree"
+msgstr "Publicar en Libertree"
+
+#: ../../addon/libertree/libertree.php:67
+msgid "libertree Post Settings"
+msgstr "Configuración de la publicación en Libertree"
+
+#: ../../addon/libertree/libertree.php:69
+msgid "Enable Libertree Post Plugin"
+msgstr "Activar el módulo de publicación en Libertree"
+
+#: ../../addon/libertree/libertree.php:74
+msgid "Libertree API token"
+msgstr "Ficha API de Libertree"
+
+#: ../../addon/libertree/libertree.php:79
+msgid "Libertree site URL"
+msgstr "Dirección de Libertree"
+
+#: ../../addon/libertree/libertree.php:84
+msgid "Post to Libertree by default"
+msgstr "Publicar en Libertree por defecto"
+
+#: ../../addon/altpager/altpager.php:46
+msgid "Altpager settings updated."
+msgstr "Configuración de paginador alternativo actualizada."
+
+#: ../../addon/altpager/altpager.php:79
+msgid "Alternate Pagination Setting"
+msgstr "Configuración de paginación alternativa"
+
+#: ../../addon/altpager/altpager.php:81
+msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
+msgstr "¿Usar \"más nuevo\" y \"más antiguo\" en vez de números en las páginas?"
+
+#: ../../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 "El complemento MathJax renderiza las fórmulas matemáticas escritas usando la sintaxis de LaTeX rodeadas por el habitual $ $ o un bloque de eqnarray en las publicaciones de tu muro, pestaña de red y correo privado."
+
+#: ../../addon/mathjax/mathjax.php:38
+msgid "Use the MathJax renderer"
+msgstr "Usar renderizado Mathjax"
+
+#: ../../addon/mathjax/mathjax.php:74
+msgid "MathJax Base URL"
+msgstr "Dirección base de Mathjax"
+
+#: ../../addon/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 dirección para el archivo javascript debe estar incluida para usar Mathjax. Puede ser Mathjax CDN o cualquier otra instalación de Mathjax."
+
+#: ../../addon/editplain/editplain.php:76
+msgid "Editplain Settings"
+msgstr "Configuración del Editor de texto plano"
+
+#: ../../addon/editplain/editplain.php:78
+msgid "Disable richtext status editor"
+msgstr "Desactivar el editor de texto enriquecido"
+
+#: ../../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 "El complemento Libravatar también está instalado. Por favor desactiva este complemento o el complemento de Gravatar.<br>El complemento Libravatar usará Gravatar si no encuentra nada en Libravatar."
+
+#: ../../addon/gravatar/gravatar.php:96
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr "Selecionar la imagen del avatar por defecto si no se ha encontrado ninguna en Gravatar. Mira el README"
+
+#: ../../addon/gravatar/gravatar.php:97
+msgid "Rating of images"
+msgstr "Valoración de las imágenes"
+
+#: ../../addon/gravatar/gravatar.php:97
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr "Selecciona el avatar de clasificación apropiado para tu sitio. Ver README"
+
+#: ../../addon/gravatar/gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "Configuración de Gravatar actualizada."
+
+#: ../../addon/testdrive/testdrive.php:95
+msgid "Your Friendica test account is about to expire."
+msgstr "Tu cuenta de prueba de Friendica está a punto de expirar."
+
+#: ../../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 "Hola %1$s,\n\nTu cuenta de prueba en %2$s expirará en menos de 5 días. Esperamos que hayas disfrutado de la experiencia y te decidas a unirte a la red social de Friendica. Dispones de un listado de servidores disponibles en http://dir.friendica.com/siteinfo Para saber más sobre cómo crear tu propio servidor de Friendica puedes visitar la web del Proyecto Friendica en http://friendica.com."
+
+#: ../../addon/pageheader/pageheader.php:50
+msgid "\"pageheader\" Settings"
+msgstr "Configuración de cabecera"
+
+#: ../../addon/pageheader/pageheader.php:68
+msgid "pageheader Settings saved."
+msgstr "Configuración de cabecera de página guardada."
+
+#: ../../addon/ijpost/ijpost.php:39
+msgid "Post to Insanejournal"
+msgstr "Publicar en Insanejournal"
+
+#: ../../addon/ijpost/ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr "Configuración de publicación en Insanejournal"
+
+#: ../../addon/ijpost/ijpost.php:72
+msgid "Enable InsaneJournal Post Plugin"
+msgstr "Activar el módulo de publicación en Insanejournal"
+
+#: ../../addon/ijpost/ijpost.php:77
+msgid "InsaneJournal username"
+msgstr "Nombre de usuario de Insanejournal"
+
+#: ../../addon/ijpost/ijpost.php:82
+msgid "InsaneJournal password"
+msgstr "Contraseña de Insanejournal"
+
+#: ../../addon/ijpost/ijpost.php:87
+msgid "Post to InsaneJournal by default"
+msgstr "Publicar en Insanejournal por defecto"
+
+#: ../../addon/jappixmini/jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr "Ajustes de complemento Jappix Mini"
+
+#: ../../addon/jappixmini/jappixmini.php:268
+msgid "Activate addon"
+msgstr "Activar complemento"
+
+#: ../../addon/jappixmini/jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr "<em>No</em> insertar la aplicación de chat Jappixmini en la interfaz web"
+
+#: ../../addon/jappixmini/jappixmini.php:274
+msgid "Jabber username"
+msgstr "Nombre de usuario de Jabber"
+
+#: ../../addon/jappixmini/jappixmini.php:277
+msgid "Jabber server"
+msgstr "Servidor de Jabber"
+
+#: ../../addon/jappixmini/jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr "Anfitrión BOSH de Jabber"
+
+#: ../../addon/jappixmini/jappixmini.php:285
+msgid "Jabber password"
+msgstr "Contraseña de Jabber"
+
+#: ../../addon/jappixmini/jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Encriptar contraseña de Jabber con la contraseña de Friendica (recomendado)"
+
+#: ../../addon/jappixmini/jappixmini.php:293
+msgid "Friendica password"
+msgstr "Contraseña de Friendica"
+
+#: ../../addon/jappixmini/jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Aprobar peticiones de suscripción de contactos de Friendica automáticamente"
+
+#: ../../addon/jappixmini/jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr "Suscribirse a contactos de Friendica automáticamente"
+
+#: ../../addon/jappixmini/jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Purgar los contactos de la lista interna de direcciones de Jabber"
+
+#: ../../addon/jappixmini/jappixmini.php:308
+msgid "Add contact"
+msgstr "Añadir contacto"
+
+#: ../../addon/viewsrc/viewsrc.php:37
+msgid "View Source"
+msgstr "Ver fuente"
+
+#: ../../addon/statusnet/statusnet.php:134
+msgid "Post to StatusNet"
+msgstr "Publicar en StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:176
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
+msgstr "Por favor, contacta con el administrador de tu web.<br />La dirección API suministrada no es válida."
+
+#: ../../addon/statusnet/statusnet.php:204
+msgid "We could not contact the StatusNet API with the Path you entered."
+msgstr "No podemos contantar con StatusNet en la ruta que has especificado."
+
+#: ../../addon/statusnet/statusnet.php:232
+msgid "StatusNet settings updated."
+msgstr "Actualición de la configuración de StatusNet."
+
+#: ../../addon/statusnet/statusnet.php:257
+msgid "StatusNet Posting Settings"
+msgstr "Configuración de envío a StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:271
+msgid "Globally Available StatusNet OAuthKeys"
+msgstr "StatusNet OAuthKeys disponibles para todos"
+
+#: ../../addon/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 "Existen pares de valores OAuthKey preconfigurados para algunos servidores. Si usas uno de ellos, por favor usa estas credenciales. De los contrario no dudes en conectar con cualquiera otra instancia de StatusNet (ver a continuación)."
+
+#: ../../addon/statusnet/statusnet.php:280
+msgid "Provide your own OAuth Credentials"
+msgstr "Proporciona tus propias credenciales OAuth"
+
+#: ../../addon/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 se ha encontrado ningún par de claves consumer para StatusNet. Registra tu cuenta de Friendica como un cliente de escritorio en tu cuenta de StatusNet, copia el par de claves consumer aquí e introduce la dirección de la API.<br />Antes de registrar tu propio par de claves OAuth pregunta a tu administrador si ya existe un par de claves para esa instalación de Friendica en tu instalación StatusNet favorita."
+
+#: ../../addon/statusnet/statusnet.php:283
+msgid "OAuth Consumer Key"
+msgstr "Clave OAuth del usuario"
+
+#: ../../addon/statusnet/statusnet.php:286
+msgid "OAuth Consumer Secret"
+msgstr "Secreto OAuth del usuario"
+
+#: ../../addon/statusnet/statusnet.php:289
+msgid "Base API Path (remember the trailing /)"
+msgstr "Dirección de la API (recordar el / al final)"
+
+#: ../../addon/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 "Para conectarte a tu cuenta de StatusNet haz clic en el botón abajo para obtener un PIN de StatusNet, que tienes que copiar en el cuadro de entrada y enviar el formulario. Solo tus publicaciones <strong>públicas</strong> se publicarán en StatusNet."
+
+#: ../../addon/statusnet/statusnet.php:311
+msgid "Log in with StatusNet"
+msgstr "Inicia sesión en StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:313
+msgid "Copy the security code from StatusNet here"
+msgstr "Copia el código de seguridad de StatusNet aquí"
+
+#: ../../addon/statusnet/statusnet.php:319
+msgid "Cancel Connection Process"
+msgstr "Cancelar la conexión en proceso"
+
+#: ../../addon/statusnet/statusnet.php:321
+msgid "Current StatusNet API is"
+msgstr "El estado actual de la API de StatusNet es"
+
+#: ../../addon/statusnet/statusnet.php:322
+msgid "Cancel StatusNet Connection"
+msgstr "Cancelar conexión con StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
+msgid "Currently connected to: "
+msgstr "Actualmente conectado a:"
+
+#: ../../addon/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 lo habilitas todas tus publicaciones </strong>públicas</strong> podrán ser publicadas en la cuenta asociada de StatusNet. Pudes elegir hacerlo por defecto (aquí) o para cada publicación individualmente en las opciones de publicacion cuando las escribes."
+
+#: ../../addon/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>: Debido a tus opciones de privacidad (<em>¿Ocultar los detalles de tu perfil de espectadores desconocidos?</ em>) el vínculo potencialmente incluido en publicaciones públicas que se transmiten a StatusNet conducirá al visitante a una página en blanco que informa a los visitantes que el acceso a tu perfil es restringido."
+
+#: ../../addon/statusnet/statusnet.php:339
+msgid "Allow posting to StatusNet"
+msgstr "Permitir publicaciones en StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:342
+msgid "Send public postings to StatusNet by default"
+msgstr "Enviar publicaciones públicas a StatusNet por defecto"
+
+#: ../../addon/statusnet/statusnet.php:345
+msgid "Send linked #-tags and @-names to StatusNet"
+msgstr "Enviar a StatusNet las #-etiquetas y @-nombres"
+
+#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
+msgid "Clear OAuth configuration"
+msgstr "Borrar la configuración de OAuth"
+
+#: ../../addon/statusnet/statusnet.php:568
+msgid "API URL"
+msgstr "Dirección de la API"
+
+#: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
+msgid "Infinite Improbability Drive"
+msgstr "Unidad de improbabilidad infinita"
+
+#: ../../addon/tumblr/tumblr.php:36
+msgid "Post to Tumblr"
+msgstr "Publicar en Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:67
+msgid "Tumblr Post Settings"
+msgstr "Configuración de publicación en Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:69
+msgid "Enable Tumblr Post Plugin"
+msgstr "Habilitar el módulo de publicación en Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:74
+msgid "Tumblr login"
+msgstr "Tumblr - inicio de sesión"
+
+#: ../../addon/tumblr/tumblr.php:79
+msgid "Tumblr password"
+msgstr "Tumblr - contraseña"
+
+#: ../../addon/tumblr/tumblr.php:84
+msgid "Post to Tumblr by default"
+msgstr "Publicar en Tumblr por defecto"
+
+#: ../../addon/numfriends/numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Configuración del Contador de contactos actualizada"
+
+#: ../../addon/numfriends/numfriends.php:77
+msgid "Numfriends Settings"
+msgstr "Configuración del Contador de contactos"
+
+#: ../../addon/gnot/gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Configuración de Gnot actualizada."
+
+#: ../../addon/gnot/gnot.php:79
+msgid "Gnot Settings"
+msgstr "Configuración de Gnot"
+
+#: ../../addon/gnot/gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr "Permitir el enhebrado en las notificaciones de comentarios de correo en Gmail y hacer anónima la línea de \"Asunto\"."
+
+#: ../../addon/gnot/gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr "¿Activar este módulo/extensión?"
+
+#: ../../addon/gnot/gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr "[Friendica:Notificación] Comentario en la conversación de #%d"
+
+#: ../../addon/wppost/wppost.php:42
 msgid "Post to Wordpress"
 msgstr "Publicar en Wordpress"
 
-#: ../../addon/wppost/wppost.php:73
+#: ../../addon/wppost/wppost.php:76
 msgid "WordPress Post Settings"
 msgstr "Configuración de publicación en Wordpres"
 
-#: ../../addon/wppost/wppost.php:75
+#: ../../addon/wppost/wppost.php:78
 msgid "Enable WordPress Post Plugin"
-msgstr "Habilitar el plugin de publicación en Wordpress"
+msgstr "Habilitar el módulo de publicación en Wordpress"
 
-#: ../../addon/wppost/wppost.php:80
+#: ../../addon/wppost/wppost.php:83
 msgid "WordPress username"
 msgstr "WordPress - nombre de usuario"
 
-#: ../../addon/wppost/wppost.php:85
+#: ../../addon/wppost/wppost.php:88
 msgid "WordPress password"
 msgstr "WordPress - contraseña"
 
-#: ../../addon/wppost/wppost.php:90
+#: ../../addon/wppost/wppost.php:93
 msgid "WordPress API URL"
 msgstr "WordPress - dirección API"
 
-#: ../../addon/wppost/wppost.php:95
+#: ../../addon/wppost/wppost.php:98
 msgid "Post to WordPress by default"
 msgstr "Publicar a WordPress por defecto"
 
-#: ../../include/notifier.php:616 ../../include/delivery.php:415
-msgid "(no subject)"
-msgstr "(sin asunto)"
+#: ../../addon/wppost/wppost.php:103
+msgid "Provide a backlink to the Friendica post"
+msgstr "Añade un enlace de vuelta a la publicación de Friendica"
+
+#: ../../addon/wppost/wppost.php:207
+msgid "Read the original post and comment stream on Friendica"
+msgstr "Leer la publicación original y los comentarios en Friendica"
+
+#: ../../addon/showmore/showmore.php:38
+msgid "\"Show more\" Settings"
+msgstr "Configuración de \"Muéstrame más\""
+
+#: ../../addon/showmore/showmore.php:41
+msgid "Enable Show More"
+msgstr "Activar Muéstrame más"
+
+#: ../../addon/showmore/showmore.php:44
+msgid "Cutting posts after how much characters"
+msgstr "Cortar las publicaciones después de cuántos caracteres"
+
+#: ../../addon/showmore/showmore.php:65
+msgid "Show More Settings saved."
+msgstr "Configuración de Muéstrame más guardada."
+
+#: ../../addon/piwik/piwik.php:79
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
+msgstr "Este sitio realiza un seguimiento mediante la herramienta de análisis <a href='http://www.piwik.org'>Piwik</a>."
+
+#: ../../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 "Si no quieres que tus visitas sean registradas de esta manera <a href='%s'>puedes establecer una cookie para evitar que Piwik realice un seguimiento de las visitas del sitio</a> (opt-out)."
+
+#: ../../addon/piwik/piwik.php:90
+msgid "Piwik Base URL"
+msgstr "Dirección base Piwik"
+
+#: ../../addon/piwik/piwik.php:90
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr "Ruta absoluta a tu instalación de Piwik (sin el protocolo (http/s) pero con la barra)."
+
+#: ../../addon/piwik/piwik.php:91
+msgid "Site ID"
+msgstr "ID del sitio"
+
+#: ../../addon/piwik/piwik.php:92
+msgid "Show opt-out cookie link?"
+msgstr "¿Mostrar enlace a las cookies?"
+
+#: ../../addon/piwik/piwik.php:93
+msgid "Asynchronous tracking"
+msgstr "Seguimiento asíncrono"
+
+#: ../../addon/twitter/twitter.php:73
+msgid "Post to Twitter"
+msgstr "Publicar en Twitter"
+
+#: ../../addon/twitter/twitter.php:122
+msgid "Twitter settings updated."
+msgstr "Actualización de la configuración de Twitter"
+
+#: ../../addon/twitter/twitter.php:146
+msgid "Twitter Posting Settings"
+msgstr "Configuración de publicaciones en Twitter"
+
+#: ../../addon/twitter/twitter.php:153
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "No se ha encontrado ningún par de claves para Twitter. Póngase en contacto con el administrador del sitio."
+
+#: ../../addon/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 esta instalación de Friendica el módulo de Twitter está activo pero aún no has conectado tu cuenta con la de Twitter. Para hacerlo, pulsa en el siguiente botón para obtener un PIN de Twitter, que deberás introducir en la casilla de abajo y enviar el formulario. Unicamente el contenido <strong>público</strong> que publiques será publicado en Twitter."
+
+#: ../../addon/twitter/twitter.php:173
+msgid "Log in with Twitter"
+msgstr "Acceder con Twitter"
+
+#: ../../addon/twitter/twitter.php:175
+msgid "Copy the PIN from Twitter here"
+msgstr "Copia el PIN de Twitter aquí"
+
+#: ../../addon/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 lo habilitas todas tus publicaciones <strong>públicas</strong> serán publicadas en la cuenta de Twitter asociada. Puedes elegir hacerlo por defecto (aquí) o individualmente para cada publicación usando las opciones cuando escribas."
+
+#: ../../addon/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>: Debido a tus opciones de privacidad (<em>¿Ocultar los detalles de tu perfil de espectadores desconocidos?</ em>) el vínculo potencialmente incluido en publicaciones públicas que se transmiten a Twitter conducirá al visitante a una página en blanco que informa a los visitantes que el acceso a tu perfil es restringido."
+
+#: ../../addon/twitter/twitter.php:195
+msgid "Allow posting to Twitter"
+msgstr "Permitir publicar en Twitter"
+
+#: ../../addon/twitter/twitter.php:198
+msgid "Send public postings to Twitter by default"
+msgstr "Enviar publicaciones públicas a Twitter por defecto"
+
+#: ../../addon/twitter/twitter.php:201
+msgid "Send linked #-tags and @-names to Twitter"
+msgstr "Enviar a Twitter las #-etiquetas y @-nombres"
+
+#: ../../addon/twitter/twitter.php:396
+msgid "Consumer key"
+msgstr "Clave del usuario"
+
+#: ../../addon/twitter/twitter.php:397
+msgid "Consumer secret"
+msgstr "Secreto del usuario"
+
+#: ../../addon/irc/irc.php:44
+msgid "IRC Settings"
+msgstr "Configuración IRC"
+
+#: ../../addon/irc/irc.php:46
+msgid "Channel(s) to auto connect (comma separated)"
+msgstr "Conectar automáticamente a (canales separados por coma)"
+
+#: ../../addon/irc/irc.php:51
+msgid "Popular Channels (comma separated)"
+msgstr "Canales populares (separados por coma)"
+
+#: ../../addon/irc/irc.php:69
+msgid "IRC settings saved."
+msgstr "Configuración de IRC guardada."
+
+#: ../../addon/irc/irc.php:74
+msgid "IRC Chatroom"
+msgstr "Sala de Chat IRC"
+
+#: ../../addon/irc/irc.php:96
+msgid "Popular Channels"
+msgstr "Canales populares"
+
+#: ../../addon/blogger/blogger.php:42
+msgid "Post to blogger"
+msgstr "Publícar en Blogger"
+
+#: ../../addon/blogger/blogger.php:74
+msgid "Blogger Post Settings"
+msgstr "Configuración de las publicaciones en Blogger"
+
+#: ../../addon/blogger/blogger.php:76
+msgid "Enable Blogger Post Plugin"
+msgstr "Activar el módulo de publicación en Blogger"
+
+#: ../../addon/blogger/blogger.php:81
+msgid "Blogger username"
+msgstr "Nombre de usuario de Blogger"
+
+#: ../../addon/blogger/blogger.php:86
+msgid "Blogger password"
+msgstr "Contraseña de Blogger"
+
+#: ../../addon/blogger/blogger.php:91
+msgid "Blogger API URL"
+msgstr "Dirección de la API de Blogger"
+
+#: ../../addon/blogger/blogger.php:96
+msgid "Post to Blogger by default"
+msgstr "Publicar en Blogger por defecto"
+
+#: ../../addon/posterous/posterous.php:37
+msgid "Post to Posterous"
+msgstr "Publicar en Posterous"
+
+#: ../../addon/posterous/posterous.php:70
+msgid "Posterous Post Settings"
+msgstr "Configuración de las publicaciones en Posterous"
+
+#: ../../addon/posterous/posterous.php:72
+msgid "Enable Posterous Post Plugin"
+msgstr "Activar el módulo de publicación en Posterous"
+
+#: ../../addon/posterous/posterous.php:77
+msgid "Posterous login"
+msgstr "Entrar en Posterous"
+
+#: ../../addon/posterous/posterous.php:82
+msgid "Posterous password"
+msgstr "Contraseña de Posterous"
+
+#: ../../addon/posterous/posterous.php:87
+msgid "Posterous site ID"
+msgstr "ID de Posterous"
+
+#: ../../addon/posterous/posterous.php:92
+msgid "Posterous API token"
+msgstr "API de Posterous"
+
+#: ../../addon/posterous/posterous.php:97
+msgid "Post to Posterous by default"
+msgstr "Publicar en Posterous por defecto"
+
+#: ../../view/theme/cleanzero/config.php:82
+#: ../../view/theme/diabook/config.php:192
+#: ../../view/theme/quattro/config.php:55 ../../view/theme/dispy/config.php:72
+msgid "Theme settings"
+msgstr "Configuración del Tema"
+
+#: ../../view/theme/cleanzero/config.php:83
+msgid "Set resize level for images in posts and comments (width and height)"
+msgstr "Configurar el tamaño de las imágenes en las publicaciones"
+
+#: ../../view/theme/cleanzero/config.php:84
+#: ../../view/theme/diabook/config.php:193
+#: ../../view/theme/dispy/config.php:73
+msgid "Set font-size for posts and comments"
+msgstr "Tamaño del texto para publicaciones y comentarios"
+
+#: ../../view/theme/cleanzero/config.php:85
+msgid "Set theme width"
+msgstr "Establecer el ancho para el tema"
+
+#: ../../view/theme/cleanzero/config.php:86
+#: ../../view/theme/quattro/config.php:57
+msgid "Color scheme"
+msgstr "Esquema de color"
+
+#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:49
+#: ../../include/nav.php:115
+msgid "Your posts and conversations"
+msgstr "Tus publicaciones y conversaciones"
+
+#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:50
+msgid "Your profile page"
+msgstr "Tu página de perfil"
+
+#: ../../view/theme/diabook/theme.php:129
+msgid "Your contacts"
+msgstr "Tus contactos"
+
+#: ../../view/theme/diabook/theme.php:130 ../../include/nav.php:51
+msgid "Your photos"
+msgstr "Tus fotos"
+
+#: ../../view/theme/diabook/theme.php:131 ../../include/nav.php:52
+msgid "Your events"
+msgstr "Tus eventos"
+
+#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
+msgid "Personal notes"
+msgstr "Notas personales"
+
+#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
+msgid "Your personal photos"
+msgstr "Tus fotos personales"
+
+#: ../../view/theme/diabook/theme.php:134
+#: ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:747
+#: ../../view/theme/diabook/config.php:201
+msgid "Community Pages"
+msgstr "Páginas de Comunidad"
+
+#: ../../view/theme/diabook/theme.php:490
+#: ../../view/theme/diabook/theme.php:749
+#: ../../view/theme/diabook/config.php:203
+msgid "Community Profiles"
+msgstr "Perfiles de la Comunidad"
+
+#: ../../view/theme/diabook/theme.php:511
+#: ../../view/theme/diabook/theme.php:754
+#: ../../view/theme/diabook/config.php:208
+msgid "Last users"
+msgstr "Últimos usuarios"
+
+#: ../../view/theme/diabook/theme.php:540
+#: ../../view/theme/diabook/theme.php:756
+#: ../../view/theme/diabook/config.php:210
+msgid "Last likes"
+msgstr "Últimos \"me gusta\""
+
+#: ../../view/theme/diabook/theme.php:585
+#: ../../view/theme/diabook/theme.php:755
+#: ../../view/theme/diabook/config.php:209
+msgid "Last photos"
+msgstr "Últimas fotos"
+
+#: ../../view/theme/diabook/theme.php:622
+#: ../../view/theme/diabook/theme.php:752
+#: ../../view/theme/diabook/config.php:206
+msgid "Find Friends"
+msgstr "Buscar amigos"
+
+#: ../../view/theme/diabook/theme.php:623
+msgid "Local Directory"
+msgstr "Directorio local"
+
+#: ../../view/theme/diabook/theme.php:625 ../../include/contact_widgets.php:35
+msgid "Similar Interests"
+msgstr "Intereses similares"
+
+#: ../../view/theme/diabook/theme.php:627 ../../include/contact_widgets.php:37
+msgid "Invite Friends"
+msgstr "Invitar amigos"
+
+#: ../../view/theme/diabook/theme.php:678
+#: ../../view/theme/diabook/theme.php:748
+#: ../../view/theme/diabook/config.php:202
+msgid "Earth Layers"
+msgstr "Minimapa"
+
+#: ../../view/theme/diabook/theme.php:683
+msgid "Set zoomfactor for Earth Layers"
+msgstr "Configurar zoom en Minimapa"
+
+#: ../../view/theme/diabook/theme.php:684
+#: ../../view/theme/diabook/config.php:199
+msgid "Set longitude (X) for Earth Layers"
+msgstr "Configurar longitud (X) en Minimapa"
+
+#: ../../view/theme/diabook/theme.php:685
+#: ../../view/theme/diabook/config.php:200
+msgid "Set latitude (Y) for Earth Layers"
+msgstr "Configurar latitud (Y) en Minimapa"
+
+#: ../../view/theme/diabook/theme.php:698
+#: ../../view/theme/diabook/theme.php:750
+#: ../../view/theme/diabook/config.php:204
+msgid "Help or @NewHere ?"
+msgstr "¿Ayuda o @NuevoAquí?"
+
+#: ../../view/theme/diabook/theme.php:705
+#: ../../view/theme/diabook/theme.php:751
+#: ../../view/theme/diabook/config.php:205
+msgid "Connect Services"
+msgstr "Servicios conectados"
+
+#: ../../view/theme/diabook/theme.php:712
+#: ../../view/theme/diabook/theme.php:753
+msgid "Last Tweets"
+msgstr "Últimos tweets"
+
+#: ../../view/theme/diabook/theme.php:715
+#: ../../view/theme/diabook/config.php:197
+msgid "Set twitter search term"
+msgstr "Establecer término de búsqueda en Twitter"
+
+#: ../../view/theme/diabook/theme.php:735
+#: ../../view/theme/diabook/theme.php:736
+#: ../../view/theme/diabook/theme.php:737
+#: ../../view/theme/diabook/theme.php:738
+#: ../../view/theme/diabook/theme.php:739
+#: ../../view/theme/diabook/theme.php:740
+#: ../../view/theme/diabook/theme.php:741
+#: ../../view/theme/diabook/theme.php:742
+#: ../../view/theme/diabook/theme.php:743
+#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:288
+msgid "don't show"
+msgstr "no mostrar"
+
+#: ../../view/theme/diabook/theme.php:735
+#: ../../view/theme/diabook/theme.php:736
+#: ../../view/theme/diabook/theme.php:737
+#: ../../view/theme/diabook/theme.php:738
+#: ../../view/theme/diabook/theme.php:739
+#: ../../view/theme/diabook/theme.php:740
+#: ../../view/theme/diabook/theme.php:741
+#: ../../view/theme/diabook/theme.php:742
+#: ../../view/theme/diabook/theme.php:743
+#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:287
+msgid "show"
+msgstr "mostrar"
+
+#: ../../view/theme/diabook/theme.php:745
+msgid "Show/hide boxes at right-hand column:"
+msgstr "Mostrar/Ocultar casillas en la columna derecha:"
+
+#: ../../view/theme/diabook/config.php:194
+#: ../../view/theme/dispy/config.php:74
+msgid "Set line-height for posts and comments"
+msgstr "Altura para las publicaciones y comentarios"
+
+#: ../../view/theme/diabook/config.php:195
+msgid "Set resolution for middle column"
+msgstr "Resolución para la columna central"
+
+#: ../../view/theme/diabook/config.php:196
+msgid "Set color scheme"
+msgstr "Configurar esquema de color"
+
+#: ../../view/theme/diabook/config.php:198
+msgid "Set zoomfactor for Earth Layer"
+msgstr "Establecer zoom para Minimapa"
+
+#: ../../view/theme/diabook/config.php:207
+msgid "Last tweets"
+msgstr "Últimos tweets"
+
+#: ../../view/theme/quattro/config.php:56
+msgid "Alignment"
+msgstr "Alineación"
+
+#: ../../view/theme/quattro/config.php:56
+msgid "Left"
+msgstr "Izquierda"
+
+#: ../../view/theme/quattro/config.php:56
+msgid "Center"
+msgstr "Centrado"
+
+#: ../../view/theme/dispy/config.php:75
+msgid "Set colour scheme"
+msgstr "Configurar esquema de color"
+
+#: ../../include/profile_advanced.php:22
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: ../../include/profile_advanced.php:23
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/profile_advanced.php:30
+msgid "Birthday:"
+msgstr "Fecha de nacimiento:"
+
+#: ../../include/profile_advanced.php:34
+msgid "Age:"
+msgstr "Edad:"
+
+#: ../../include/profile_advanced.php:43
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "por %1$d %2$s"
+
+#: ../../include/profile_advanced.php:52
+msgid "Tags:"
+msgstr "Etiquetas:"
+
+#: ../../include/profile_advanced.php:56
+msgid "Religion:"
+msgstr "Religión:"
+
+#: ../../include/profile_advanced.php:60
+msgid "Hobbies/Interests:"
+msgstr "Aficiones/Intereses:"
+
+#: ../../include/profile_advanced.php:67
+msgid "Contact information and Social Networks:"
+msgstr "Información de contacto y Redes sociales:"
+
+#: ../../include/profile_advanced.php:69
+msgid "Musical interests:"
+msgstr "Intereses musicales:"
+
+#: ../../include/profile_advanced.php:71
+msgid "Books, literature:"
+msgstr "Libros, literatura:"
+
+#: ../../include/profile_advanced.php:73
+msgid "Television:"
+msgstr "Televisión:"
+
+#: ../../include/profile_advanced.php:75
+msgid "Film/dance/culture/entertainment:"
+msgstr "Películas/baile/cultura/entretenimiento:"
+
+#: ../../include/profile_advanced.php:77
+msgid "Love/Romance:"
+msgstr "Amor/Romance:"
+
+#: ../../include/profile_advanced.php:79
+msgid "Work/employment:"
+msgstr "Trabajo/ocupación:"
+
+#: ../../include/profile_advanced.php:81
+msgid "School/education:"
+msgstr "Escuela/estudios:"
 
 #: ../../include/contact_selectors.php:32
 msgid "Unknown | Not categorised"
@@ -4417,19 +7318,7 @@ msgstr "Cada hora"
 msgid "Twice daily"
 msgstr "Dos veces al día"
 
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "Diariamente"
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Semanalmente"
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "Mensualmente"
-
-#: ../../include/contact_selectors.php:78
+#: ../../include/contact_selectors.php:77
 msgid "OStatus"
 msgstr "OStatus"
 
@@ -4437,10 +7326,22 @@ msgstr "OStatus"
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/contact_selectors.php:78
+#: ../../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/profile_selectors.php:6
 msgid "Male"
 msgstr "Hombre"
@@ -4467,7 +7368,7 @@ msgstr "Mayormente Mujer"
 
 #: ../../include/profile_selectors.php:6
 msgid "Transgender"
-msgstr "Transgénero"
+msgstr "Transgenérico"
 
 #: ../../include/profile_selectors.php:6
 msgid "Intersex"
@@ -4497,737 +7398,616 @@ msgstr "Otro"
 msgid "Undecided"
 msgstr "Indeciso"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "Males"
 msgstr "Hombres"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "Females"
 msgstr "Mujeres"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "Gay"
 msgstr "Gay"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "Lesbian"
 msgstr "Lesbiana"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "No Preference"
 msgstr "Sin preferencias"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "Bisexual"
 msgstr "Bisexual"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "Autosexual"
 msgstr "Autosexual"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "Abstinent"
-msgstr "Abstinente"
+msgstr "Célibe"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "Virgin"
 msgstr "Virgen"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "Deviant"
 msgstr "Desviado"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "Fetish"
 msgstr "Fetichista"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "Oodles"
-msgstr "Orgías"
+msgstr "Orgiástico"
 
-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:23
 msgid "Nonsexual"
 msgstr "Asexual"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Single"
 msgstr "Soltero"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Lonely"
 msgstr "Solitario"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Available"
 msgstr "Disponible"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Unavailable"
 msgstr "No disponible"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
+msgid "Has crush"
+msgstr "Enamorado"
+
+#: ../../include/profile_selectors.php:42
+msgid "Infatuated"
+msgstr "Loco/a por alguien"
+
+#: ../../include/profile_selectors.php:42
 msgid "Dating"
 msgstr "De citas"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Unfaithful"
 msgstr "Infiel"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Sex Addict"
 msgstr "Adicto al sexo"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42 ../../include/user.php:278
+#: ../../include/user.php:282
 msgid "Friends"
 msgstr "Amigos"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Friends/Benefits"
 msgstr "Amigos con beneficios"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Casual"
 msgstr "Casual"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Engaged"
 msgstr "Comprometido/a"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Married"
 msgstr "Casado/a"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily married"
+msgstr "Casado imaginario"
+
+#: ../../include/profile_selectors.php:42
 msgid "Partners"
 msgstr "Socios"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Cohabiting"
 msgstr "Cohabitando"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
+msgid "Common law"
+msgstr "Pareja de hecho"
+
+#: ../../include/profile_selectors.php:42
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../../include/profile_selectors.php:33
-msgid "Not Looking"
-msgstr "No estoy buscando"
+#: ../../include/profile_selectors.php:42
+msgid "Not looking"
+msgstr "No busca relación"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Swinger"
 msgstr "Swinger"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Betrayed"
 msgstr "Traicionado/a"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Separated"
 msgstr "Separado/a"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Unstable"
 msgstr "Inestable"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Divorced"
 msgstr "Divorciado/a"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily divorced"
+msgstr "Divorciado imaginario"
+
+#: ../../include/profile_selectors.php:42
 msgid "Widowed"
 msgstr "Viudo/a"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Uncertain"
 msgstr "Incierto"
 
-#: ../../include/profile_selectors.php:33
-msgid "Complicated"
-msgstr "Complicado"
+#: ../../include/profile_selectors.php:42
+msgid "It's complicated"
+msgstr "Es complicado"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Don't care"
 msgstr "No te importa"
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:42
 msgid "Ask me"
 msgstr "Pregúntame"
 
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:233
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:396
 msgid "Starts:"
 msgstr "Inicio:"
 
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:241
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:404
 msgid "Finishes:"
 msgstr "Final:"
 
-#: ../../include/acl_selectors.php:279
-msgid "Visible to everybody"
-msgstr "Visible para cualquiera"
+#: ../../include/delivery.php:457 ../../include/notifier.php:703
+msgid "(no subject)"
+msgstr "(sin asunto)"
 
-#: ../../include/acl_selectors.php:280
-msgid "show"
-msgstr "mostrar"
+#: ../../include/Scrape.php:576
+msgid " on Last.fm"
+msgstr "en Last.fm"
 
-#: ../../include/acl_selectors.php:281
-msgid "don't show"
-msgstr "no mostrar"
-
-#: ../../include/auth.php:27
-msgid "Logged out."
-msgstr "Sesión terminada"
-
-#: ../../include/bbcode.php:147
-msgid "Image/photo"
-msgstr "Imagen/Foto"
-
-#: ../../include/poller.php:457
-msgid "From: "
-msgstr "De:"
-
-#: ../../include/Contact.php:125 ../../include/conversation.php:675
-msgid "View status"
-msgstr "Ver estado"
-
-#: ../../include/Contact.php:126 ../../include/conversation.php:676
-msgid "View profile"
-msgstr "Ver perfirl"
-
-#: ../../include/Contact.php:127 ../../include/conversation.php:677
-msgid "View photos"
-msgstr "Ver fotos"
-
-#: ../../include/Contact.php:128 ../../include/Contact.php:141
-#: ../../include/conversation.php:678
-msgid "View recent"
-msgstr "Ver recientes"
-
-#: ../../include/Contact.php:130 ../../include/Contact.php:141
-#: ../../include/conversation.php:680
-msgid "Send PM"
-msgstr "Enviar mensaje privado"
-
-#: ../../include/datetime.php:44 ../../include/datetime.php:46
-msgid "Miscellaneous"
-msgstr "Varios"
-
-#: ../../include/datetime.php:105 ../../include/datetime.php:237
-msgid "year"
-msgstr "año"
-
-#: ../../include/datetime.php:110 ../../include/datetime.php:238
-msgid "month"
-msgstr "mes"
-
-#: ../../include/datetime.php:115 ../../include/datetime.php:240
-msgid "day"
-msgstr "día"
-
-#: ../../include/datetime.php:228
-msgid "never"
-msgstr "nunca"
-
-#: ../../include/datetime.php:234
-msgid "less than a second ago"
-msgstr "hace menos de un segundo"
-
-#: ../../include/datetime.php:237
-msgid "years"
-msgstr "años"
-
-#: ../../include/datetime.php:238
-msgid "months"
-msgstr "meses"
-
-#: ../../include/datetime.php:239
-msgid "week"
-msgstr "semana"
-
-#: ../../include/datetime.php:239
-msgid "weeks"
-msgstr "semanas"
-
-#: ../../include/datetime.php:240
-msgid "days"
-msgstr "días"
-
-#: ../../include/datetime.php:241
-msgid "hour"
-msgstr "hora"
-
-#: ../../include/datetime.php:241
-msgid "hours"
-msgstr "horas"
-
-#: ../../include/datetime.php:242
-msgid "minute"
-msgstr "minuto"
-
-#: ../../include/datetime.php:242
-msgid "minutes"
-msgstr "minutos"
-
-#: ../../include/datetime.php:243
-msgid "second"
-msgstr "segundo"
-
-#: ../../include/datetime.php:243
-msgid "seconds"
-msgstr "segundos"
-
-#: ../../include/datetime.php:250
-msgid " ago"
-msgstr " hace"
-
-#: ../../include/datetime.php:421 ../../include/profile_advanced.php:30
-#: ../../include/items.php:1215
-msgid "Birthday:"
-msgstr "Fecha de nacimiento:"
-
-#: ../../include/profile_advanced.php:22
-msgid "j F, Y"
-msgstr "j F, Y"
-
-#: ../../include/profile_advanced.php:23
-msgid "j F"
-msgstr "j F"
-
-#: ../../include/profile_advanced.php:34
-msgid "Age:"
-msgstr "Edad:"
-
-#: ../../include/profile_advanced.php:49
-msgid "Religion:"
-msgstr "Religión:"
-
-#: ../../include/profile_advanced.php:51
-msgid "About:"
-msgstr "Acerca de:"
-
-#: ../../include/profile_advanced.php:53
-msgid "Hobbies/Interests:"
-msgstr "Aficiones/Intereses:"
-
-#: ../../include/profile_advanced.php:55
-msgid "Contact information and Social Networks:"
-msgstr "Información de contacto y Redes sociales:"
-
-#: ../../include/profile_advanced.php:57
-msgid "Musical interests:"
-msgstr "Intereses musicales:"
-
-#: ../../include/profile_advanced.php:59
-msgid "Books, literature:"
-msgstr "Libros, literatura:"
-
-#: ../../include/profile_advanced.php:61
-msgid "Television:"
-msgstr "Televisión:"
-
-#: ../../include/profile_advanced.php:63
-msgid "Film/dance/culture/entertainment:"
-msgstr "Películas/baile/cultura/entretenimiento:"
-
-#: ../../include/profile_advanced.php:65
-msgid "Love/Romance:"
-msgstr "Amor/Romance:"
-
-#: ../../include/profile_advanced.php:67
-msgid "Work/employment:"
-msgstr "Trabajo/ocupación:"
-
-#: ../../include/profile_advanced.php:69
-msgid "School/education:"
-msgstr "Escuela/estudios:"
-
-#: ../../include/text.php:232
+#: ../../include/text.php:243
 msgid "prev"
 msgstr "ant."
 
-#: ../../include/text.php:234
+#: ../../include/text.php:245
 msgid "first"
 msgstr "primera"
 
-#: ../../include/text.php:263
+#: ../../include/text.php:274
 msgid "last"
 msgstr "última"
 
-#: ../../include/text.php:266
+#: ../../include/text.php:277
 msgid "next"
 msgstr "sig."
 
-#: ../../include/text.php:546
+#: ../../include/text.php:295
+msgid "newer"
+msgstr "más nuevo"
+
+#: ../../include/text.php:299
+msgid "older"
+msgstr "más antiguo"
+
+#: ../../include/text.php:597
 msgid "No contacts"
 msgstr "Sin contactos"
 
-#: ../../include/text.php:555
+#: ../../include/text.php:606
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d Contacto"
 msgstr[1] "%d Contactos"
 
-#: ../../include/text.php:626 ../../include/nav.php:87
-msgid "Search"
-msgstr "Buscar"
+#: ../../include/text.php:719
+msgid "poke"
+msgstr "tocar"
 
-#: ../../include/text.php:709
-msgid "Monday"
-msgstr "Lunes"
+#: ../../include/text.php:719 ../../include/conversation.php:212
+msgid "poked"
+msgstr "tocó a"
 
-#: ../../include/text.php:709
-msgid "Tuesday"
-msgstr "Martes"
+#: ../../include/text.php:720
+msgid "ping"
+msgstr "hacer \"ping\""
 
-#: ../../include/text.php:709
-msgid "Wednesday"
-msgstr "Miércoles"
+#: ../../include/text.php:720
+msgid "pinged"
+msgstr "hizo \"ping\" a"
 
-#: ../../include/text.php:709
-msgid "Thursday"
-msgstr "Jueves"
+#: ../../include/text.php:721
+msgid "prod"
+msgstr "empujar"
 
-#: ../../include/text.php:709
-msgid "Friday"
-msgstr "Viernes"
+#: ../../include/text.php:721
+msgid "prodded"
+msgstr "empujó a"
 
-#: ../../include/text.php:709
-msgid "Saturday"
-msgstr "Sábado"
+#: ../../include/text.php:722
+msgid "slap"
+msgstr "abofetear"
 
-#: ../../include/text.php:709
-msgid "Sunday"
-msgstr "Domingo"
+#: ../../include/text.php:722
+msgid "slapped"
+msgstr "abofeteó a"
 
-#: ../../include/text.php:713
+#: ../../include/text.php:723
+msgid "finger"
+msgstr "meter dedo"
+
+#: ../../include/text.php:723
+msgid "fingered"
+msgstr "le metió un dedo a"
+
+#: ../../include/text.php:724
+msgid "rebuff"
+msgstr "desairar"
+
+#: ../../include/text.php:724
+msgid "rebuffed"
+msgstr "desairó a"
+
+#: ../../include/text.php:736
+msgid "happy"
+msgstr "feliz"
+
+#: ../../include/text.php:737
+msgid "sad"
+msgstr "triste"
+
+#: ../../include/text.php:738
+msgid "mellow"
+msgstr "sentimental"
+
+#: ../../include/text.php:739
+msgid "tired"
+msgstr "cansado"
+
+#: ../../include/text.php:740
+msgid "perky"
+msgstr "alegre"
+
+#: ../../include/text.php:741
+msgid "angry"
+msgstr "furioso"
+
+#: ../../include/text.php:742
+msgid "stupified"
+msgstr "estupefacto"
+
+#: ../../include/text.php:743
+msgid "puzzled"
+msgstr "extrañado"
+
+#: ../../include/text.php:744
+msgid "interested"
+msgstr "interesado"
+
+#: ../../include/text.php:745
+msgid "bitter"
+msgstr "rencoroso"
+
+#: ../../include/text.php:746
+msgid "cheerful"
+msgstr "jovial"
+
+#: ../../include/text.php:747
+msgid "alive"
+msgstr "vivo"
+
+#: ../../include/text.php:748
+msgid "annoyed"
+msgstr "enojado"
+
+#: ../../include/text.php:749
+msgid "anxious"
+msgstr "ansioso"
+
+#: ../../include/text.php:750
+msgid "cranky"
+msgstr "irritable"
+
+#: ../../include/text.php:751
+msgid "disturbed"
+msgstr "perturbado"
+
+#: ../../include/text.php:752
+msgid "frustrated"
+msgstr "frustrado"
+
+#: ../../include/text.php:753
+msgid "motivated"
+msgstr "motivado"
+
+#: ../../include/text.php:754
+msgid "relaxed"
+msgstr "relajado"
+
+#: ../../include/text.php:755
+msgid "surprised"
+msgstr "sorprendido"
+
+#: ../../include/text.php:921
 msgid "January"
 msgstr "Enero"
 
-#: ../../include/text.php:713
+#: ../../include/text.php:921
 msgid "February"
 msgstr "Febrero"
 
-#: ../../include/text.php:713
+#: ../../include/text.php:921
 msgid "March"
 msgstr "Marzo"
 
-#: ../../include/text.php:713
+#: ../../include/text.php:921
 msgid "April"
 msgstr "Abril"
 
-#: ../../include/text.php:713
+#: ../../include/text.php:921
 msgid "May"
 msgstr "Mayo"
 
-#: ../../include/text.php:713
+#: ../../include/text.php:921
 msgid "June"
 msgstr "Junio"
 
-#: ../../include/text.php:713
+#: ../../include/text.php:921
 msgid "July"
 msgstr "Julio"
 
-#: ../../include/text.php:713
+#: ../../include/text.php:921
 msgid "August"
 msgstr "Agosto"
 
-#: ../../include/text.php:713
+#: ../../include/text.php:921
 msgid "September"
 msgstr "Septiembre"
 
-#: ../../include/text.php:713
+#: ../../include/text.php:921
 msgid "October"
 msgstr "Octubre"
 
-#: ../../include/text.php:713
+#: ../../include/text.php:921
 msgid "November"
 msgstr "Noviembre"
 
-#: ../../include/text.php:713
+#: ../../include/text.php:921
 msgid "December"
 msgstr "Diciembre"
 
-#: ../../include/text.php:783
+#: ../../include/text.php:1007
 msgid "bytes"
 msgstr "bytes"
 
-#: ../../include/text.php:875
-msgid "Select an alternate language"
-msgstr "Elige otro idioma"
+#: ../../include/text.php:1027 ../../include/text.php:1042
+msgid "remove"
+msgstr "eliminar"
 
-#: ../../include/text.php:887
+#: ../../include/text.php:1027 ../../include/text.php:1042
+msgid "[remove]"
+msgstr "[eliminar]"
+
+#: ../../include/text.php:1030
+msgid "Categories:"
+msgstr "Categorías:"
+
+#: ../../include/text.php:1045
+msgid "Filed under:"
+msgstr "Archivado en:"
+
+#: ../../include/text.php:1061 ../../include/text.php:1073
+msgid "Click to open/close"
+msgstr "Pulsa para abrir/cerrar"
+
+#: ../../include/text.php:1179 ../../include/user.php:236
 msgid "default"
 msgstr "predeterminado"
 
-#: ../../include/nav.php:44
-msgid "End this session"
-msgstr "Terminar esta sesión"
+#: ../../include/text.php:1191
+msgid "Select an alternate language"
+msgstr "Elige otro idioma"
 
-#: ../../include/nav.php:47 ../../include/nav.php:111
-msgid "Your posts and conversations"
-msgstr "Tus publicaciones y conversaciones"
+#: ../../include/text.php:1401
+msgid "activity"
+msgstr "Actividad"
 
-#: ../../include/nav.php:48
-msgid "Your profile page"
-msgstr "Su página de perfil"
+#: ../../include/text.php:1403
+msgid "comment"
+msgstr "Comentario"
 
-#: ../../include/nav.php:49
-msgid "Your photos"
-msgstr "Sus fotos"
+#: ../../include/text.php:1404
+msgid "post"
+msgstr "Publicación"
 
-#: ../../include/nav.php:50
-msgid "Your events"
-msgstr "Sus eventos"
+#: ../../include/text.php:1559
+msgid "Item filed"
+msgstr "Elemento archivado"
 
-#: ../../include/nav.php:51
-msgid "Personal notes"
-msgstr "Notas personales"
+#: ../../include/diaspora.php:691
+msgid "Sharing notification from Diaspora network"
+msgstr "Compartir notificaciones con la red Diaspora*"
 
-#: ../../include/nav.php:51
-msgid "Your personal photos"
-msgstr "Sus fotos personales"
+#: ../../include/diaspora.php:2202
+msgid "Attachments:"
+msgstr "Archivos adjuntos:"
 
-#: ../../include/nav.php:62
-msgid "Sign in"
-msgstr "Date de alta"
-
-#: ../../include/nav.php:73
-msgid "Home Page"
-msgstr "Página de inicio"
-
-#: ../../include/nav.php:77
-msgid "Create an account"
-msgstr "Crea una cuenta"
-
-#: ../../include/nav.php:82
-msgid "Help and documentation"
-msgstr "Ayuda y documentación"
-
-#: ../../include/nav.php:85
-msgid "Apps"
-msgstr "Aplicaciones"
-
-#: ../../include/nav.php:85
-msgid "Addon applications, utilities, games"
-msgstr "APlicaciones, utilidades, juegos"
-
-#: ../../include/nav.php:87
-msgid "Search site content"
-msgstr " Busca contenido en la página"
-
-#: ../../include/nav.php:97
-msgid "Conversations on this site"
-msgstr "Conversaciones en este sitio"
-
-#: ../../include/nav.php:99
-msgid "Directory"
-msgstr "Directorio"
-
-#: ../../include/nav.php:99
-msgid "People directory"
-msgstr "Directorio de gente"
-
-#: ../../include/nav.php:109
-msgid "Conversations from your friends"
-msgstr "Conversaciones de tus amigos"
-
-#: ../../include/nav.php:117
-msgid "Friend Requests"
-msgstr "Solicitudes de amistad"
-
-#: ../../include/nav.php:122
-msgid "Private mail"
-msgstr "Correo privado"
-
-#: ../../include/nav.php:125
-msgid "Manage"
-msgstr "Administrar"
-
-#: ../../include/nav.php:125
-msgid "Manage other pages"
-msgstr "Administrar otras páginas"
-
-#: ../../include/nav.php:130
-msgid "Manage/edit friends and contacts"
-msgstr "Administrar/editar amigos y contactos"
-
-#: ../../include/nav.php:137
-msgid "Admin"
-msgstr "Admin"
-
-#: ../../include/nav.php:137
-msgid "Site setup and configuration"
-msgstr "Opciones y configuración del sitio"
-
-#: ../../include/nav.php:160
-msgid "Nothing new here"
-msgstr "Nada nuevo aquí"
-
-#: ../../include/conversation.php:210 ../../include/conversation.php:453
-msgid "Select"
-msgstr "Seleccionar"
-
-#: ../../include/conversation.php:225 ../../include/conversation.php:550
-#: ../../include/conversation.php:551
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Ver perfil de %s @ %s"
-
-#: ../../include/conversation.php:234 ../../include/conversation.php:562
-#, php-format
-msgid "%s from %s"
-msgstr "%s de %s"
-
-#: ../../include/conversation.php:250
-msgid "View in context"
-msgstr "Verlo en contexto"
-
-#: ../../include/conversation.php:356
-#, php-format
-msgid "See all %d comments"
-msgstr "Ver los %d comentarios"
-
-#: ../../include/conversation.php:416
-msgid "like"
-msgstr "me gusta"
-
-#: ../../include/conversation.php:417
-msgid "dislike"
-msgstr "no me gusta"
-
-#: ../../include/conversation.php:419
-msgid "Share this"
-msgstr "Compartir esto"
-
-#: ../../include/conversation.php:419
-msgid "share"
-msgstr "compartir"
-
-#: ../../include/conversation.php:463
-msgid "add star"
-msgstr "Añadir estrella"
-
-#: ../../include/conversation.php:464
-msgid "remove star"
-msgstr "Quitar estrella"
-
-#: ../../include/conversation.php:465
-msgid "toggle star status"
-msgstr "Añadir a destacados"
-
-#: ../../include/conversation.php:468
-msgid "starred"
-msgstr "marcados con estrellas"
-
-#: ../../include/conversation.php:469
-msgid "add tag"
-msgstr "añadir etiqueta"
-
-#: ../../include/conversation.php:552
-msgid "to"
-msgstr "a"
-
-#: ../../include/conversation.php:553
-msgid "Wall-to-Wall"
-msgstr "Muro-A-Muro"
-
-#: ../../include/conversation.php:554
-msgid "via Wall-To-Wall:"
-msgstr "via Muro-A-Muro:"
-
-#: ../../include/conversation.php:600
-msgid "Delete Selected Items"
-msgstr "Eliminar el elemento seleccionado"
-
-#: ../../include/conversation.php:730
-#, php-format
-msgid "%s likes this."
-msgstr "A %s le gusta esto."
-
-#: ../../include/conversation.php:730
-#, php-format
-msgid "%s doesn't like this."
-msgstr "A %s no le gusta esto."
-
-#: ../../include/conversation.php:734
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgstr "Le gusta a <span %1$s>%2$d personas</span>."
-
-#: ../../include/conversation.php:736
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgstr "No le gusta a <span %1$s>%2$d personas</span>."
-
-#: ../../include/conversation.php:742
-msgid "and"
-msgstr "y"
-
-#: ../../include/conversation.php:745
-#, php-format
-msgid ", and %d other people"
-msgstr ", y otras %d personas"
-
-#: ../../include/conversation.php:746
-#, php-format
-msgid "%s like this."
-msgstr "Le gusta a %s."
-
-#: ../../include/conversation.php:746
-#, php-format
-msgid "%s don't like this."
-msgstr "No le gusta a %s."
-
-#: ../../include/conversation.php:766
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Visible para <strong>cualquiera</strong>"
-
-#: ../../include/conversation.php:768
-msgid "Please enter a video link/URL:"
-msgstr "Por favor, introduzca la URL/enlace del vídeo:"
-
-#: ../../include/conversation.php:769
-msgid "Please enter an audio link/URL:"
-msgstr "Por favor, introduzca la URL/enlace del audio:"
-
-#: ../../include/conversation.php:770
-msgid "Tag term:"
-msgstr "Etiquetar:"
-
-#: ../../include/conversation.php:771
-msgid "Where are you right now?"
-msgstr "¿Dónde estás ahora?"
-
-#: ../../include/conversation.php:772
-msgid "Enter a title for this item"
-msgstr "Introduce un título para este elemento"
-
-#: ../../include/conversation.php:818
-msgid "Insert video link"
-msgstr "Insertar enlace del vídeo"
-
-#: ../../include/conversation.php:819
-msgid "Insert audio link"
-msgstr "Inserte un vínculo del audio"
-
-#: ../../include/conversation.php:822
-msgid "Set title"
-msgstr "Establecer el título"
-
-#: ../../include/bb2diaspora.php:51
+#: ../../include/network.php:849
 msgid "view full size"
 msgstr "Ver a tamaño completo"
 
-#: ../../include/bb2diaspora.php:102
-msgid "image/photo"
-msgstr "imagen/foto"
+#: ../../include/oembed.php:137
+msgid "Embedded content"
+msgstr "Contenido integrado"
 
-#: ../../include/dba.php:31
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr ""
-"No se puede encontrar información de DNS para el servidor de base de datos "
-"'%s'"
+#: ../../include/oembed.php:146
+msgid "Embedding disabled"
+msgstr "Contenido incrustrado desabilitado"
+
+#: ../../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 grupo eliminado con este nombre fue restablecido. Los permisos existentes <strong>pueden</strong> aplicarse a este grupo y a sus futuros miembros. Si esto no es lo que pretendes, por favor, crea otro grupo con un nombre diferente."
+
+#: ../../include/group.php:176
+msgid "Default privacy group for new contacts"
+msgstr "Grupo por defecto para nuevos contactos"
+
+#: ../../include/group.php:195
+msgid "Everybody"
+msgstr "Todo el mundo"
+
+#: ../../include/group.php:218
+msgid "edit"
+msgstr "editar"
+
+#: ../../include/group.php:240
+msgid "Edit group"
+msgstr "Editar grupo"
+
+#: ../../include/group.php:241
+msgid "Create a new group"
+msgstr "Crear un nuevo grupo"
+
+#: ../../include/group.php:242
+msgid "Contacts not in any group"
+msgstr "Contactos sin grupo"
+
+#: ../../include/nav.php:46 ../../boot.php:911
+msgid "Logout"
+msgstr "Salir"
+
+#: ../../include/nav.php:46
+msgid "End this session"
+msgstr "Cerrar la sesión"
+
+#: ../../include/nav.php:49 ../../boot.php:1665
+msgid "Status"
+msgstr "Estado"
+
+#: ../../include/nav.php:64
+msgid "Sign in"
+msgstr "Date de alta"
+
+#: ../../include/nav.php:77
+msgid "Home Page"
+msgstr "Página de inicio"
+
+#: ../../include/nav.php:81
+msgid "Create an account"
+msgstr "Crea una cuenta"
+
+#: ../../include/nav.php:86
+msgid "Help and documentation"
+msgstr "Ayuda y documentación"
+
+#: ../../include/nav.php:89
+msgid "Apps"
+msgstr "Aplicaciones"
+
+#: ../../include/nav.php:89
+msgid "Addon applications, utilities, games"
+msgstr "Aplicaciones, utilidades, juegos"
+
+#: ../../include/nav.php:91
+msgid "Search site content"
+msgstr " Busca contenido en la página"
+
+#: ../../include/nav.php:101
+msgid "Conversations on this site"
+msgstr "Conversaciones en este sitio"
+
+#: ../../include/nav.php:103
+msgid "Directory"
+msgstr "Directorio"
+
+#: ../../include/nav.php:103
+msgid "People directory"
+msgstr "Directorio de usuarios"
+
+#: ../../include/nav.php:113
+msgid "Conversations from your friends"
+msgstr "Conversaciones de tus amigos"
+
+#: ../../include/nav.php:121
+msgid "Friend Requests"
+msgstr "Solicitudes de amistad"
+
+#: ../../include/nav.php:123
+msgid "See all notifications"
+msgstr "Ver todas las notificaciones"
+
+#: ../../include/nav.php:124
+msgid "Mark all system notifications seen"
+msgstr "Marcar todas las notificaciones del sistema como leídas"
+
+#: ../../include/nav.php:128
+msgid "Private mail"
+msgstr "Correo privado"
+
+#: ../../include/nav.php:129
+msgid "Inbox"
+msgstr "Entrada"
+
+#: ../../include/nav.php:130
+msgid "Outbox"
+msgstr "Enviados"
+
+#: ../../include/nav.php:134
+msgid "Manage"
+msgstr "Administrar"
+
+#: ../../include/nav.php:134
+msgid "Manage other pages"
+msgstr "Administrar otras páginas"
+
+#: ../../include/nav.php:138 ../../boot.php:1186
+msgid "Profiles"
+msgstr "Perfiles"
+
+#: ../../include/nav.php:138 ../../boot.php:1186
+msgid "Manage/edit profiles"
+msgstr "Administrar/editar perfiles"
+
+#: ../../include/nav.php:139
+msgid "Manage/edit friends and contacts"
+msgstr "Administrar/editar amigos y contactos"
+
+#: ../../include/nav.php:146
+msgid "Site setup and configuration"
+msgstr "Opciones y configuración del sitio"
+
+#: ../../include/nav.php:170
+msgid "Nothing new here"
+msgstr "Nada nuevo por aquí"
 
 #: ../../include/contact_widgets.php:6
 msgid "Add New Contact"
@@ -5235,97 +8015,766 @@ msgstr "Añadir nuevo contacto"
 
 #: ../../include/contact_widgets.php:7
 msgid "Enter address or web location"
-msgstr "Escriba la dirección o página web"
+msgstr "Escribe la dirección o página web"
 
 #: ../../include/contact_widgets.php:8
 msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Ejemplo: bob@ejemplo.com, http://ejemplo.com/barbara"
+msgstr "Ejemplo: miguel@ejemplo.com, http://ejemplo.com/miguel"
 
-#: ../../include/contact_widgets.php:18
-msgid "Invite Friends"
-msgstr "Invitar amigos"
-
-#: ../../include/contact_widgets.php:24
+#: ../../include/contact_widgets.php:23
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] "%d invitación disponible"
 msgstr[1] "%d invitaviones disponibles"
 
-#: ../../include/contact_widgets.php:30
+#: ../../include/contact_widgets.php:29
 msgid "Find People"
 msgstr "Buscar personas"
 
-#: ../../include/contact_widgets.php:31
+#: ../../include/contact_widgets.php:30
 msgid "Enter name or interest"
-msgstr "Introduzca nombre o intereses"
+msgstr "Introduzce nombre o intereses"
 
-#: ../../include/contact_widgets.php:32
+#: ../../include/contact_widgets.php:31
 msgid "Connect/Follow"
 msgstr "Conectar/Seguir"
 
-#: ../../include/contact_widgets.php:33
+#: ../../include/contact_widgets.php:32
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Ejemplos: Robert Morgenstein, Pesca"
 
 #: ../../include/contact_widgets.php:36
-msgid "Similar Interests"
-msgstr "Intereses similares"
+msgid "Random Profile"
+msgstr "Perfil aleatorio"
 
-#: ../../include/items.php:1829
-msgid "New mail received at "
-msgstr "Nuevo correo recibido en "
+#: ../../include/contact_widgets.php:68
+msgid "Networks"
+msgstr "Redes"
 
-#: ../../include/items.php:2438
-msgid "A new person is sharing with you at "
-msgstr "Una nueva persona está compartiendo con usted en"
+#: ../../include/contact_widgets.php:71
+msgid "All Networks"
+msgstr "Todas las redes"
 
-#: ../../include/items.php:2438
-msgid "You have a new follower at "
-msgstr "Tienes un nuevo seguidor en "
+#: ../../include/contact_widgets.php:98
+msgid "Saved Folders"
+msgstr "Directorios guardados"
 
-#: ../../include/message.php:13
+#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
+msgid "Everything"
+msgstr "Todo"
+
+#: ../../include/contact_widgets.php:126
+msgid "Categories"
+msgstr "Categorías"
+
+#: ../../include/auth.php:35
+msgid "Logged out."
+msgstr "Sesión finalizada"
+
+#: ../../include/auth.php:114
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Se ha encontrado un problema para acceder con el OpenID que has escrito. Verifica que lo hayas escrito correctamente."
+
+#: ../../include/auth.php:114
+msgid "The error message was:"
+msgstr "El mensaje del error fue:"
+
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#: ../../include/datetime.php:153 ../../include/datetime.php:285
+msgid "year"
+msgstr "año"
+
+#: ../../include/datetime.php:158 ../../include/datetime.php:286
+msgid "month"
+msgstr "mes"
+
+#: ../../include/datetime.php:163 ../../include/datetime.php:288
+msgid "day"
+msgstr "día"
+
+#: ../../include/datetime.php:276
+msgid "never"
+msgstr "nunca"
+
+#: ../../include/datetime.php:282
+msgid "less than a second ago"
+msgstr "hace menos de un segundo"
+
+#: ../../include/datetime.php:287
+msgid "week"
+msgstr "semana"
+
+#: ../../include/datetime.php:289
+msgid "hour"
+msgstr "hora"
+
+#: ../../include/datetime.php:289
+msgid "hours"
+msgstr "horas"
+
+#: ../../include/datetime.php:290
+msgid "minute"
+msgstr "minuto"
+
+#: ../../include/datetime.php:290
+msgid "minutes"
+msgstr "minutos"
+
+#: ../../include/datetime.php:291
+msgid "second"
+msgstr "segundo"
+
+#: ../../include/datetime.php:291
+msgid "seconds"
+msgstr "segundos"
+
+#: ../../include/datetime.php:300
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr "hace %1$d %2$s"
+
+#: ../../include/datetime.php:472 ../../include/items.php:1683
+#, php-format
+msgid "%s's birthday"
+msgstr "Cumpleaños de %s"
+
+#: ../../include/datetime.php:473 ../../include/items.php:1684
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Feliz cumpleaños %s"
+
+#: ../../include/onepoll.php:399
+msgid "From: "
+msgstr "De: "
+
+#: ../../include/bbcode.php:185 ../../include/bbcode.php:406
+msgid "Image/photo"
+msgstr "Imagen/Foto"
+
+#: ../../include/bbcode.php:371 ../../include/bbcode.php:391
+msgid "$1 wrote:"
+msgstr "$1 escribió:"
+
+#: ../../include/bbcode.php:410 ../../include/bbcode.php:411
+msgid "Encrypted content"
+msgstr "Contenido cifrado"
+
+#: ../../include/dba.php:41
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "No se puede encontrar información DNS para la base de datos del servidor '%s'"
+
+#: ../../include/message.php:15 ../../include/message.php:171
 msgid "[no subject]"
 msgstr "[sin asunto]"
 
-#: ../../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 grupo eliminado con este nombre fue restablecido. Los permisos existentes"
-" <strong>pueden</strong> aplicarse a este grupo y a sus futuros miembros. Si"
-" esto no es lo que pretende, por favor, cree otro grupo con un nombre "
-"diferente."
+#: ../../include/acl_selectors.php:286
+msgid "Visible to everybody"
+msgstr "Visible para cualquiera"
 
-#: ../../include/group.php:165
-msgid "Create a new group"
-msgstr "Crear un nuevo grupo"
+#: ../../include/enotify.php:16
+msgid "Friendica Notification"
+msgstr "Notificación de Friendica"
 
-#: ../../include/group.php:166
-msgid "Everybody"
-msgstr "Todo el mundo"
+#: ../../include/enotify.php:19
+msgid "Thank You,"
+msgstr "Gracias,"
 
-#: ../../include/diaspora.php:544
-msgid "Sharing notification from Diaspora network"
-msgstr "Conpartir notificaciones con la red Diaspora*"
-
-#: ../../include/diaspora.php:1527
-msgid "Attachments:"
-msgstr "Archivos adjuntos:"
-
-#: ../../include/diaspora.php:1710
+#: ../../include/enotify.php:21
 #, php-format
-msgid "[Relayed] Comment authored by %s from network %s"
-msgstr "[Retransmitido] Comentario escrito por %s desde %s"
+msgid "%s Administrator"
+msgstr "%s Administrador"
 
-#: ../../include/oembed.php:122
-msgid "Embedded content"
-msgstr "Contenido integrado"
+#: ../../include/enotify.php:40
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
 
-#: ../../include/oembed.php:131
-msgid "Embedding disabled"
-msgstr "Incrustaciones desabilitadas"
+#: ../../include/enotify.php:44
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr "[Friendica:Notificación] Nuevo correo recibido de %s"
 
+#: ../../include/enotify.php:46
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
+msgstr "%1$s te ha enviado un mensaje privado desde %2$s."
 
+#: ../../include/enotify.php:47
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s te ha enviado %2$s."
+
+#: ../../include/enotify.php:47
+msgid "a private message"
+msgstr "un mensaje privado"
+
+#: ../../include/enotify.php:48
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Por favor, visita %s para ver y/o responder a tus mensajes privados."
+
+#: ../../include/enotify.php:89
+#, php-format
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
+msgstr "%1$s comentó en [url=%2$s]a %3$s[/url]"
+
+#: ../../include/enotify.php:96
+#, php-format
+msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
+msgstr "%1$s comentó en [url=%2$s] %4$s de %3$s[/url]"
+
+#: ../../include/enotify.php:104
+#, php-format
+msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
+msgstr "%1$s comentó en [url=%2$s] tu %3$s[/url]"
+
+#: ../../include/enotify.php:114
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Friendica:Notificación] Comentario en la conversación de #%1$d por %2$s"
+
+#: ../../include/enotify.php:115
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s ha comentado en una conversación/elemento que sigues."
+
+#: ../../include/enotify.php:118 ../../include/enotify.php:133
+#: ../../include/enotify.php:146 ../../include/enotify.php:164
+#: ../../include/enotify.php:177
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Por favor, visita %s para ver y/o responder a la conversación."
+
+#: ../../include/enotify.php:125
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica:Notificación] %s publicó en tu muro"
+
+#: ../../include/enotify.php:127
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$s publicó en tu perfil de %2$s"
+
+#: ../../include/enotify.php:129
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr "%1$s publicó en [url=%2$s]tu muro[/url]"
+
+#: ../../include/enotify.php:140
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr "[Friendica:Notificación] %s te ha nombrado"
+
+#: ../../include/enotify.php:141
+#, php-format
+msgid "%1$s tagged you at %2$s"
+msgstr "%1$s te ha nombrado en %2$s"
+
+#: ../../include/enotify.php:142
+#, php-format
+msgid "%1$s [url=%2$s]tagged you[/url]."
+msgstr "%1$s [url=%2$s]te nombró[/url]."
+
+#: ../../include/enotify.php:154
+#, php-format
+msgid "[Friendica:Notify] %1$s poked you"
+msgstr "[Friendica:Notify] %1$s te dio un toque"
+
+#: ../../include/enotify.php:155
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr "%1$s te dio un toque en %2$s"
+
+#: ../../include/enotify.php:156
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr "%1$s [url=%2$s]te dio un toque[/url]."
+
+#: ../../include/enotify.php:171
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr "[Friendica:Notificación] %s ha etiquetado tu publicación"
+
+#: ../../include/enotify.php:172
+#, php-format
+msgid "%1$s tagged your post at %2$s"
+msgstr "%1$s ha etiquetado tu publicación en %2$s"
+
+#: ../../include/enotify.php:173
+#, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
+msgstr "%1$s ha etiquetado [url=%2$s]tu publicación[/url]"
+
+#: ../../include/enotify.php:184
+msgid "[Friendica:Notify] Introduction received"
+msgstr "[Friendica:Notificación] Presentación recibida"
+
+#: ../../include/enotify.php:185
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr "Has recibido una presentación de '%1$s' en %2$s"
+
+#: ../../include/enotify.php:186
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr "Has recibido [url=%1$s]una presentación[/url] de %2$s."
+
+#: ../../include/enotify.php:189 ../../include/enotify.php:207
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Puedes visitar su perfil en %s"
+
+#: ../../include/enotify.php:191
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "Visita %s para aceptar o rechazar la presentación por favor."
+
+#: ../../include/enotify.php:198
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr "[Friendica:Notificación] Sugerencia de amigo recibida"
+
+#: ../../include/enotify.php:199
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr "Has recibido una sugerencia de amigo de '%1$s' en %2$s"
+
+#: ../../include/enotify.php:200
+#, php-format
+msgid ""
+"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr "Has recibido [url=%1$s]una sugerencia de amigo[/url] en %2$s de %3$s."
+
+#: ../../include/enotify.php:205
+msgid "Name:"
+msgstr "Nombre: "
+
+#: ../../include/enotify.php:206
+msgid "Photo:"
+msgstr "Foto: "
+
+#: ../../include/enotify.php:209
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Visita %s para aceptar o rechazar la sugerencia por favor."
+
+#: ../../include/follow.php:32
+msgid "Connect URL missing."
+msgstr "Falta el conector URL."
+
+#: ../../include/follow.php:59
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Este sitio no está configurado para permitir la comunicación con otras redes."
+
+#: ../../include/follow.php:60 ../../include/follow.php:80
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "No se ha descubierto protocolos de comunicación o fuentes compatibles."
+
+#: ../../include/follow.php:78
+msgid "The profile address specified does not provide adequate information."
+msgstr "La dirección del perfil especificado no proporciona información adecuada."
+
+#: ../../include/follow.php:82
+msgid "An author or name was not found."
+msgstr "No se ha encontrado un autor o nombre."
+
+#: ../../include/follow.php:84
+msgid "No browser URL could be matched to this address."
+msgstr "Ninguna dirección concuerda con la suministrada."
+
+#: ../../include/follow.php:86
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "Imposible identificar la dirección @ con algún protocolo conocido o dirección de contacto."
+
+#: ../../include/follow.php:87
+msgid "Use mailto: in front of address to force email check."
+msgstr "Escribe mailto: al principio de la dirección para forzar el envío."
+
+#: ../../include/follow.php:93
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "La dirección del perfil especificada pertenece a una red que ha sido deshabilitada en este sitio."
+
+#: ../../include/follow.php:103
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Perfil limitado. Esta persona no podrá recibir notificaciones directas/personales tuyas."
+
+#: ../../include/follow.php:205
+msgid "Unable to retrieve contact information."
+msgstr "No ha sido posible recibir la información del contacto."
+
+#: ../../include/follow.php:259
+msgid "following"
+msgstr "siguiendo"
+
+#: ../../include/items.php:3294
+msgid "A new person is sharing with you at "
+msgstr "Una nueva persona está compartiendo contigo en "
+
+#: ../../include/items.php:3294
+msgid "You have a new follower at "
+msgstr "Tienes un nuevo seguidor en "
+
+#: ../../include/items.php:3975
+msgid "Archives"
+msgstr "Archivos"
+
+#: ../../include/user.php:38
+msgid "An invitation is required."
+msgstr "Se necesita invitación."
+
+#: ../../include/user.php:43
+msgid "Invitation could not be verified."
+msgstr "No se puede verificar la invitación."
+
+#: ../../include/user.php:51
+msgid "Invalid OpenID url"
+msgstr "Dirección OpenID no válida"
+
+#: ../../include/user.php:66
+msgid "Please enter the required information."
+msgstr "Por favor, introduce la información necesaria."
+
+#: ../../include/user.php:80
+msgid "Please use a shorter name."
+msgstr "Por favor, usa un nombre más corto."
+
+#: ../../include/user.php:82
+msgid "Name too short."
+msgstr "El nombre es demasiado corto."
+
+#: ../../include/user.php:97
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "No parece que ese sea tu nombre completo."
+
+#: ../../include/user.php:102
+msgid "Your email domain is not among those allowed on this site."
+msgstr "Tu dominio de correo no se encuentra entre los permitidos en este sitio."
+
+#: ../../include/user.php:105
+msgid "Not a valid email address."
+msgstr "No es una dirección de correo electrónico válida."
+
+#: ../../include/user.php:115
+msgid "Cannot use that email."
+msgstr "No se puede utilizar este correo electrónico."
+
+#: ../../include/user.php:121
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
+msgstr "Tu \"apodo\" solo puede contener \"a-z\", \"0-9\", \"-\", y \"_\" y debe empezar por una letra."
+
+#: ../../include/user.php:127 ../../include/user.php:225
+msgid "Nickname is already registered. Please choose another."
+msgstr "Apodo ya registrado. Por favor, elije otro."
+
+#: ../../include/user.php:137
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr "El apodo ya ha sido registrado alguna vez y no puede volver a usarse. Por favor, utiliza otro."
+
+#: ../../include/user.php:153
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "ERROR GRAVE: La generación de claves de seguridad ha fallado."
+
+#: ../../include/user.php:211
+msgid "An error occurred during registration. Please try again."
+msgstr "Se produjo un error durante el registro. Por favor, inténtalo de nuevo."
+
+#: ../../include/user.php:246
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo."
+
+#: ../../include/security.php:22
+msgid "Welcome "
+msgstr "Bienvenido "
+
+#: ../../include/security.php:23
+msgid "Please upload a profile photo."
+msgstr "Por favor sube una foto para tu perfil."
+
+#: ../../include/security.php:26
+msgid "Welcome back "
+msgstr "Bienvenido de nuevo "
+
+#: ../../include/security.php:344
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo."
+
+#: ../../include/Contact.php:111
+msgid "stopped following"
+msgstr "dejó de seguir"
+
+#: ../../include/Contact.php:220 ../../include/conversation.php:1082
+msgid "Poke"
+msgstr "Toque"
+
+#: ../../include/Contact.php:221 ../../include/conversation.php:1076
+msgid "View Status"
+msgstr "Ver estado"
+
+#: ../../include/Contact.php:222 ../../include/conversation.php:1077
+msgid "View Profile"
+msgstr "Ver perfil"
+
+#: ../../include/Contact.php:223 ../../include/conversation.php:1078
+msgid "View Photos"
+msgstr "Ver fotos"
+
+#: ../../include/Contact.php:224 ../../include/Contact.php:237
+#: ../../include/conversation.php:1079
+msgid "Network Posts"
+msgstr "Publicaciones en la red"
+
+#: ../../include/Contact.php:225 ../../include/Contact.php:237
+#: ../../include/conversation.php:1080
+msgid "Edit Contact"
+msgstr "Editar contacto"
+
+#: ../../include/Contact.php:226 ../../include/Contact.php:237
+#: ../../include/conversation.php:1081
+msgid "Send PM"
+msgstr "Enviar mensaje privado"
+
+#: ../../include/conversation.php:208
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s le dio un toque a %2$s"
+
+#: ../../include/conversation.php:292
+msgid "post/item"
+msgstr "publicación/tema"
+
+#: ../../include/conversation.php:293
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s ha marcado %3$s de %2$s como Favorito"
+
+#: ../../include/conversation.php:982
+msgid "Delete Selected Items"
+msgstr "Eliminar el elemento seleccionado"
+
+#: ../../include/conversation.php:1140
+#, php-format
+msgid "%s likes this."
+msgstr "A %s le gusta esto."
+
+#: ../../include/conversation.php:1140
+#, php-format
+msgid "%s doesn't like this."
+msgstr "A %s no le gusta esto."
+
+#: ../../include/conversation.php:1144
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgstr "Le gusta a <span %1$s>%2$d personas</span>."
+
+#: ../../include/conversation.php:1146
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgstr "No le gusta a <span %1$s>%2$d personas</span>."
+
+#: ../../include/conversation.php:1152
+msgid "and"
+msgstr "y"
+
+#: ../../include/conversation.php:1155
+#, php-format
+msgid ", and %d other people"
+msgstr " y a otras %d personas"
+
+#: ../../include/conversation.php:1156
+#, php-format
+msgid "%s like this."
+msgstr "Le gusta a %s."
+
+#: ../../include/conversation.php:1156
+#, php-format
+msgid "%s don't like this."
+msgstr "No le gusta a %s."
+
+#: ../../include/conversation.php:1180 ../../include/conversation.php:1197
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Visible para <strong>cualquiera</strong>"
+
+#: ../../include/conversation.php:1182 ../../include/conversation.php:1199
+msgid "Please enter a video link/URL:"
+msgstr "Por favor, introduce la URL/enlace del vídeo:"
+
+#: ../../include/conversation.php:1183 ../../include/conversation.php:1200
+msgid "Please enter an audio link/URL:"
+msgstr "Por favor, introduce la URL/enlace del audio:"
+
+#: ../../include/conversation.php:1184 ../../include/conversation.php:1201
+msgid "Tag term:"
+msgstr "Etiquetar:"
+
+#: ../../include/conversation.php:1186 ../../include/conversation.php:1203
+msgid "Where are you right now?"
+msgstr "¿Dónde estás ahora?"
+
+#: ../../include/conversation.php:1246
+msgid "upload photo"
+msgstr "subir imagen"
+
+#: ../../include/conversation.php:1248
+msgid "attach file"
+msgstr "adjuntar archivo"
+
+#: ../../include/conversation.php:1250
+msgid "web link"
+msgstr "enlace web"
+
+#: ../../include/conversation.php:1251
+msgid "Insert video link"
+msgstr "Insertar enlace del vídeo"
+
+#: ../../include/conversation.php:1252
+msgid "video link"
+msgstr "enlace de video"
+
+#: ../../include/conversation.php:1253
+msgid "Insert audio link"
+msgstr "Insertar vínculo del audio"
+
+#: ../../include/conversation.php:1254
+msgid "audio link"
+msgstr "enlace de audio"
+
+#: ../../include/conversation.php:1256
+msgid "set location"
+msgstr "establecer tu ubicación"
+
+#: ../../include/conversation.php:1258
+msgid "clear location"
+msgstr "limpiar la localización"
+
+#: ../../include/conversation.php:1265
+msgid "permissions"
+msgstr "permisos"
+
+#: ../../include/plugin.php:400 ../../include/plugin.php:402
+msgid "Click here to upgrade."
+msgstr "Pulsa aquí para actualizar."
+
+#: ../../include/plugin.php:408
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Esta acción excede los límites permitidos por tu subscripción."
+
+#: ../../include/plugin.php:413
+msgid "This action is not available under your subscription plan."
+msgstr "Esta acción no está permitida para tu subscripción."
+
+#: ../../boot.php:573
+msgid "Delete this item?"
+msgstr "¿Eliminar este elemento?"
+
+#: ../../boot.php:576
+msgid "show fewer"
+msgstr "ver menos"
+
+#: ../../boot.php:783
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "Falló la actualización de %s. Mira los registros de errores."
+
+#: ../../boot.php:785
+#, php-format
+msgid "Update Error at %s"
+msgstr "Error actualizado en %s"
+
+#: ../../boot.php:886
+msgid "Create a New Account"
+msgstr "Crear una nueva cuenta"
+
+#: ../../boot.php:914
+msgid "Nickname or Email address: "
+msgstr "Apodo o dirección de email: "
+
+#: ../../boot.php:915
+msgid "Password: "
+msgstr "Contraseña: "
+
+#: ../../boot.php:918
+msgid "Or login using OpenID: "
+msgstr "O inicia sesión usando OpenID: "
+
+#: ../../boot.php:924
+msgid "Forgot your password?"
+msgstr "¿Olvidaste la contraseña?"
+
+#: ../../boot.php:1035
+msgid "Requested account is not available."
+msgstr "La cuenta solicitada no está disponible."
+
+#: ../../boot.php:1112
+msgid "Edit profile"
+msgstr "Editar perfil"
+
+#: ../../boot.php:1178
+msgid "Message"
+msgstr "Mensaje"
+
+#: ../../boot.php:1300 ../../boot.php:1386
+msgid "g A l F d"
+msgstr "g A l F d"
+
+#: ../../boot.php:1301 ../../boot.php:1387
+msgid "F d"
+msgstr "F d"
+
+#: ../../boot.php:1346 ../../boot.php:1427
+msgid "[today]"
+msgstr "[hoy]"
+
+#: ../../boot.php:1358
+msgid "Birthday Reminders"
+msgstr "Recordatorios de cumpleaños"
+
+#: ../../boot.php:1359
+msgid "Birthdays this week:"
+msgstr "Cumpleaños esta semana:"
+
+#: ../../boot.php:1420
+msgid "[No description]"
+msgstr "[Sin descripción]"
+
+#: ../../boot.php:1438
+msgid "Event Reminders"
+msgstr "Recordatorios de eventos"
+
+#: ../../boot.php:1439
+msgid "Events this week:"
+msgstr "Eventos de esta semana:"
+
+#: ../../boot.php:1668
+msgid "Status Messages and Posts"
+msgstr "Mensajes de Estado y Publicaciones"
+
+#: ../../boot.php:1675
+msgid "Profile Details"
+msgstr "Detalles del Perfil"
+
+#: ../../boot.php:1692
+msgid "Events and Calendar"
+msgstr "Eventos y Calendario"
+
+#: ../../boot.php:1699
+msgid "Only You Can See This"
+msgstr "Únicamente tú puedes ver esto"
diff --git a/view/es/strings.php b/view/es/strings.php
index d2b8e240eb..5dd15fb6f7 100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
@@ -1,111 +1,944 @@
 <?php
 
 function string_plural_select_es($n){
-	return ($n != 1);
+	return ($n != 1);;
 }
 ;
+$a->strings["Post successful."] = "¡Publicado!";
+$a->strings["[Embedded content - reload page to view]"] = "[Contenido incrustado - recarga la página para verlo]";
+$a->strings["Contact settings applied."] = "Contacto configurado con éxito.";
+$a->strings["Contact update failed."] = "Error al actualizar el Contacto.";
+$a->strings["Permission denied."] = "Permiso denegado.";
+$a->strings["Contact not found."] = "Contacto no encontrado.";
+$a->strings["Repair Contact Settings"] = "Reparar la configuración del Contacto";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ADVERTENCIA: Esto es muy avanzado</strong> y si se introduce información incorrecta tu conexión con este contacto puede dejar de funcionar.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Por favor usa el botón 'Atás' de tu navegador <strong>ahora</strong> si no tienes claro qué hacer en esta página.";
+$a->strings["Return to contact editor"] = "Volver al editor de contactos";
+$a->strings["Name"] = "Nombre";
+$a->strings["Account Nickname"] = "Apodo de la cuenta";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Etiqueta - Sobrescribe el Nombre/Apodo";
+$a->strings["Account URL"] = "Dirección de la cuenta";
+$a->strings["Friend Request URL"] = "Dirección de la solicitud de amistad";
+$a->strings["Friend Confirm URL"] = "Dirección de confirmación de tu amigo ";
+$a->strings["Notification Endpoint URL"] = "Dirección URL de la notificación";
+$a->strings["Poll/Feed URL"] = "Dirección del Sondeo/Fuentes";
+$a->strings["New photo from this URL"] = "Nueva foto de esta dirección";
+$a->strings["Submit"] = "Envíar";
+$a->strings["Help:"] = "Ayuda:";
+$a->strings["Help"] = "Ayuda";
 $a->strings["Not Found"] = "No se ha encontrado";
 $a->strings["Page not found."] = "Página no encontrada.";
-$a->strings["Permission denied"] = "Permiso denegado";
-$a->strings["Permission denied."] = "Permiso denegado.";
-$a->strings["Delete this item?"] = "¿Eliminar este elemento?";
-$a->strings["Comment"] = "Comentar";
-$a->strings["Create a New Account"] = "Crear una nueva cuenta";
-$a->strings["Register"] = "Registrarse";
-$a->strings["Logout"] = "Salir";
-$a->strings["Login"] = "Acceder";
-$a->strings["Nickname or Email address: "] = "Apodo o dirección de email: ";
-$a->strings["Password: "] = "Contraseña: ";
-$a->strings["OpenID: "] = "OpenID:";
-$a->strings["Forgot your password?"] = "¿Olvidó la contraseña?";
-$a->strings["Password Reset"] = "Restablecer la contraseña";
-$a->strings["No profile"] = "Nigún perfil";
-$a->strings["Edit profile"] = "Editar perfil";
-$a->strings["Connect"] = "Conectar";
-$a->strings["Profiles"] = "Perfiles";
-$a->strings["Manage/edit profiles"] = "Administrar/editar perfiles";
-$a->strings["Change profile photo"] = "Cambiar foto del perfil";
-$a->strings["Create New Profile"] = "Crear nuevo perfil";
-$a->strings["Profile Image"] = "Imagen del Perfil";
-$a->strings["visible to everybody"] = "Visible para todos";
-$a->strings["Edit visibility"] = "Editar visibilidad";
-$a->strings["Location:"] = "Localización:";
-$a->strings["Gender:"] = "Género:";
-$a->strings["Status:"] = "Estado:";
-$a->strings["Homepage:"] = "Página de inicio:";
-$a->strings["g A l F d"] = "g A l F d";
-$a->strings["F d"] = "F d";
-$a->strings["Birthday Reminders"] = "Recordatorios de cumpleaños";
-$a->strings["Birthdays this week:"] = "Cumpleaños esta semana:";
-$a->strings["[today]"] = "[hoy]";
-$a->strings["Event Reminders"] = "Recordatorios de eventos";
-$a->strings["Events this week:"] = "Eventos de esta semana:";
-$a->strings["[No description]"] = "[Sin descripción]";
-$a->strings["Status"] = "Estado";
-$a->strings["Profile"] = "Perfil";
-$a->strings["Photos"] = "Fotografías";
+$a->strings["File exceeds size limit of %d"] = "El tamaño del archivo excede el límite de %d";
+$a->strings["File upload failed."] = "Ha fallado la subida del archivo.";
+$a->strings["Friend suggestion sent."] = "Solicitud de amistad enviada.";
+$a->strings["Suggest Friends"] = "Sugerencias de amistad";
+$a->strings["Suggest a friend for %s"] = "Recomienda un amigo a %s";
+$a->strings["Event title and start time are required."] = "Título del evento y hora de inicio requeridas.";
+$a->strings["l, F j"] = "l, F j";
+$a->strings["Edit event"] = "Editar evento";
+$a->strings["link to source"] = "Enlace al original";
 $a->strings["Events"] = "Eventos";
-$a->strings["Personal Notes"] = "Notas personales";
-$a->strings["Welcome back %s"] = "Bienvenido de nuevo %s";
-$a->strings["Manage Identities and/or Pages"] = "Administrar identidades y/o páginas";
-$a->strings["(Toggle between different identities or community/group pages which share your account details.)"] = "(Alternar entre las diferentes identidades o las páginas de comunidades/grupos que comparten los datos de su cuenta).";
-$a->strings["Select an identity to manage: "] = "Selecciona una identidad a gestionar:";
-$a->strings["Submit"] = "Envía";
-$a->strings["People Search"] = "Buscar personas";
-$a->strings["No matches"] = "Sin conincidencias";
-$a->strings["Image exceeds size limit of %d"] = "El tamaño de la imagen supera el límite de %d";
-$a->strings["Unable to process image."] = "Imposible procesar la imagen.";
-$a->strings["Wall Photos"] = "Foto del Muro";
-$a->strings["Image upload failed."] = "Error al subir la imagen.";
-$a->strings["Access to this profile has been restricted."] = "EL acceso a este perfil ha sido restringido.";
-$a->strings["Tips for New Members"] = "Consejos para nuevos miembros";
-$a->strings["Disallowed profile URL."] = "Dirección de perfil no permitida.";
-$a->strings["This site is not configured to allow communications with other networks."] = "Este sitio no está configurado para permitir la comunicación con otras redes.";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "No se ha descubierto protocolos de comunicación o fuentes compatibles.";
-$a->strings["The profile address specified does not provide adequate information."] = "La dirección del perfil especificado no proporciona información adecuada.";
-$a->strings["An author or name was not found."] = "No se ha encontrado un autor o nombre";
-$a->strings["No browser URL could be matched to this address."] = "Ninguna dirección URL concuerda con la suministrada.";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "La dirección del perfil especificada pertenece a una red que ha sido deshabilitada en este sitio.";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Perfil limitado. Esta persona no podrá recibir notificaciones directas/personales de ti.";
-$a->strings["Unable to retrieve contact information."] = "No ha sido posible recibir la información del contacto.";
-$a->strings["following"] = "siguiendo";
-$a->strings["Image uploaded but image cropping failed."] = "Imagen recibida, pero ha fallado al recortarla.";
+$a->strings["Create New Event"] = "Crea un evento nuevo";
+$a->strings["Previous"] = "Previo";
+$a->strings["Next"] = "Siguiente";
+$a->strings["hour:minute"] = "hora:minuto";
+$a->strings["Event details"] = "Detalles del evento";
+$a->strings["Format is %s %s. Starting date and Title are required."] = "El formato es %s %s. Fecha de inicio y título son obligatorios.";
+$a->strings["Event Starts:"] = "Inicio del evento:";
+$a->strings["Required"] = "Obligatorio";
+$a->strings["Finish date/time is not known or not relevant"] = "La fecha/hora de finalización no es conocida o es irrelevante.";
+$a->strings["Event Finishes:"] = "Finalización del evento:";
+$a->strings["Adjust for viewer timezone"] = "Ajuste de zona horaria";
+$a->strings["Description:"] = "Descripción:";
+$a->strings["Location:"] = "Localización:";
+$a->strings["Title:"] = "Título:";
+$a->strings["Share this event"] = "Comparte este evento";
+$a->strings["Cancel"] = "Cancelar";
+$a->strings["Tag removed"] = "Etiqueta eliminada";
+$a->strings["Remove Item Tag"] = "Eliminar etiqueta";
+$a->strings["Select a tag to remove: "] = "Selecciona una etiqueta para eliminar: ";
+$a->strings["Remove"] = "Eliminar";
+$a->strings["%s welcomes %s"] = "%s te da la bienvenida a %s";
+$a->strings["Authorize application connection"] = "Autorizar la conexión de la aplicación";
+$a->strings["Return to your app and insert this Securty Code:"] = "Regresa a tu aplicación e introduce este código de seguridad:";
+$a->strings["Please login to continue."] = "Inicia sesión para continuar.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "¿Quieres autorizar a esta aplicación el acceso a tus mensajes y contactos, y/o crear nuevas publicaciones para ti?";
+$a->strings["Yes"] = "Sí";
+$a->strings["No"] = "No";
+$a->strings["Photo Albums"] = "Álbum de Fotos";
+$a->strings["Contact Photos"] = "Foto del contacto";
+$a->strings["Upload New Photos"] = "Subir nuevas fotos";
+$a->strings["everybody"] = "todos";
+$a->strings["Contact information unavailable"] = "Información del contacto no disponible";
 $a->strings["Profile Photos"] = "Foto del perfil";
-$a->strings["Image size reduction [%s] failed."] = "Ha fallado la reducción de las dimensiones de la imagen [%s].";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recargue la página o limpie la caché del navegador si la nueva foto no aparece inmediatamente.";
-$a->strings["Unable to process image"] = "Imposible procesar la imagen";
-$a->strings["Upload File:"] = "Subir archivo:";
-$a->strings["Upload Profile Photo"] = "Subir foto del Perfil";
-$a->strings["Upload"] = "Subir";
+$a->strings["Album not found."] = "Álbum no encontrado.";
+$a->strings["Delete Album"] = "Eliminar álbum";
+$a->strings["Delete Photo"] = "Eliminar foto";
+$a->strings["was tagged in a"] = "ha sido etiquetado en";
+$a->strings["photo"] = "foto";
+$a->strings["by"] = "por";
+$a->strings["Image exceeds size limit of "] = "La imagen supera tamaño límite de ";
+$a->strings["Image file is empty."] = "El archivo de imagen está vacío.";
+$a->strings["Unable to process image."] = "Imposible procesar la imagen.";
+$a->strings["Image upload failed."] = "Error al subir la imagen.";
+$a->strings["Public access denied."] = "Acceso público denegado.";
+$a->strings["No photos selected"] = "Ninguna foto seleccionada";
+$a->strings["Access to this item is restricted."] = "El acceso a este elemento está restringido.";
+$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Has usado %1$.2f MB de %2$.2f MB de tu álbum de fotos.";
+$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Has usado %1$.2f MB de tu álbum de fotos.";
+$a->strings["Upload Photos"] = "Subir fotos";
+$a->strings["New album name: "] = "Nombre del nuevo álbum: ";
+$a->strings["or existing album name: "] = "o nombre de un álbum existente: ";
+$a->strings["Do not show a status post for this upload"] = "No actualizar tu estado con este envío";
+$a->strings["Permissions"] = "Permisos";
+$a->strings["Edit Album"] = "Modificar álbum";
+$a->strings["Show Newest First"] = "Mostrar más nuevos primero";
+$a->strings["Show Oldest First"] = "Mostrar más antiguos primero";
+$a->strings["View Photo"] = "Ver foto";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permiso denegado. El acceso a este elemento puede estar restringido.";
+$a->strings["Photo not available"] = "Foto no disponible";
+$a->strings["View photo"] = "Ver foto";
+$a->strings["Edit photo"] = "Modificar foto";
+$a->strings["Use as profile photo"] = "Usar como foto del perfil";
+$a->strings["Private Message"] = "Mensaje privado";
+$a->strings["View Full Size"] = "Ver a tamaño completo";
+$a->strings["Tags: "] = "Etiquetas: ";
+$a->strings["[Remove any tag]"] = "[Borrar todas las etiquetas]";
+$a->strings["Rotate CW (right)"] = "Girar a la derecha";
+$a->strings["Rotate CCW (left)"] = "Girar a la izquierda";
+$a->strings["New album name"] = "Nuevo nombre del álbum";
+$a->strings["Caption"] = "Título";
+$a->strings["Add a Tag"] = "Añadir una etiqueta";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Ejemplo: @juan, @Barbara_Ruiz, @julia@example.com, #California, #camping";
+$a->strings["I like this (toggle)"] = "Me gusta esto (cambiar)";
+$a->strings["I don't like this (toggle)"] = "No me gusta esto (cambiar)";
+$a->strings["Share"] = "Compartir";
+$a->strings["Please wait"] = "Por favor, espera";
+$a->strings["This is you"] = "Este eres tú";
+$a->strings["Comment"] = "Comentar";
+$a->strings["Preview"] = "Vista previa";
+$a->strings["Delete"] = "Eliminar";
+$a->strings["View Album"] = "Ver Álbum";
+$a->strings["Recent Photos"] = "Fotos recientes";
+$a->strings["Not available."] = "No disponible";
+$a->strings["Community"] = "Comunidad";
+$a->strings["No results."] = "Sin resultados.";
+$a->strings["This is Friendica, version"] = "Esto es Friendica, versión";
+$a->strings["running at web location"] = "ejecutándose en la dirección web";
+$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Por favor, visita <a href=\"http://friendica.com\">Friendica.com</a> para saber más sobre el proyecto Friendica.";
+$a->strings["Bug reports and issues: please visit"] = "Reporte de fallos y problemas: por favor visita";
+$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Sugerencias, elogios, donaciones, etc. por favor manda un correo a Info arroba Friendica punto com";
+$a->strings["Installed plugins/addons/apps:"] = "Módulos/extensiones/aplicaciones instalados:";
+$a->strings["No installed plugins/addons/apps"] = "Módulos/extensiones/aplicaciones no instalados";
+$a->strings["Item not found"] = "Elemento no encontrado";
+$a->strings["Edit post"] = "Editar publicación";
+$a->strings["Post to Email"] = "Publicar mediante correo electrónico";
+$a->strings["Edit"] = "Editar";
+$a->strings["Upload photo"] = "Subir foto";
+$a->strings["Attach file"] = "Adjuntar archivo";
+$a->strings["Insert web link"] = "Insertar enlace";
+$a->strings["Insert YouTube video"] = "Insertar vídeo de YouTube";
+$a->strings["Insert Vorbis [.ogg] video"] = "Insertar vídeo Vorbis [.ogg]";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Insertar audio Vorbis [.ogg]";
+$a->strings["Set your location"] = "Configurar tu localización";
+$a->strings["Clear browser location"] = "Borrar la localización del navegador";
+$a->strings["Permission settings"] = "Configuración de permisos";
+$a->strings["CC: email addresses"] = "CC: dirección de correo electrónico";
+$a->strings["Public post"] = "Publicación pública";
+$a->strings["Set title"] = "Establecer el título";
+$a->strings["Categories (comma-separated list)"] = "Categorías (lista separada por comas)";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com";
+$a->strings["This introduction has already been accepted."] = "Esta presentación ya ha sido aceptada.";
+$a->strings["Profile location is not valid or does not contain profile information."] = "La dirección del perfil no es válida o no contiene información del perfil.";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Aviso: La dirección del perfil no tiene un nombre de propietario identificable.";
+$a->strings["Warning: profile location has no profile photo."] = "Aviso: la dirección del perfil no tiene foto de perfil.";
+$a->strings["%d required parameter was not found at the given location"] = array(
+	0 => "no se encontró %d parámetro requerido en el lugar determinado",
+	1 => "no se encontraron %d parámetros requeridos en el lugar determinado",
+);
+$a->strings["Introduction complete."] = "Presentación completa.";
+$a->strings["Unrecoverable protocol error."] = "Error de protocolo irrecuperable.";
+$a->strings["Profile unavailable."] = "Perfil no disponible.";
+$a->strings["%s has received too many connection requests today."] = "%s ha recibido demasiadas solicitudes de conexión hoy.";
+$a->strings["Spam protection measures have been invoked."] = "Han sido activadas las medidas de protección contra spam.";
+$a->strings["Friends are advised to please try again in 24 hours."] = "Tus amigos serán avisados para que lo intenten de nuevo pasadas 24 horas.";
+$a->strings["Invalid locator"] = "Localizador no válido";
+$a->strings["Invalid email address."] = "Dirección de correo incorrecta";
+$a->strings["This account has not been configured for email. Request failed."] = "Esta cuenta no ha sido configurada para el correo. Fallo de solicitud.";
+$a->strings["Unable to resolve your name at the provided location."] = "No se ha podido resolver tu nombre en la dirección indicada.";
+$a->strings["You have already introduced yourself here."] = "Ya te has presentado aquí.";
+$a->strings["Apparently you are already friends with %s."] = "Al parecer, ya eres amigo de %s.";
+$a->strings["Invalid profile URL."] = "Dirección de perfil no válida.";
+$a->strings["Disallowed profile URL."] = "Dirección de perfil no permitida.";
+$a->strings["Failed to update contact record."] = "Error al actualizar el contacto.";
+$a->strings["Your introduction has been sent."] = "Tu presentación ha sido enviada.";
+$a->strings["Please login to confirm introduction."] = "Inicia sesión para confirmar la presentación.";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Sesión iniciada con la identificación incorrecta. Entra en <strong>este</strong> perfil.";
+$a->strings["Hide this contact"] = "Ocultar este contacto";
+$a->strings["Welcome home %s."] = "Bienvenido a casa %s";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Por favor, confirma tu solicitud de presentación/conexión con %s.";
+$a->strings["Confirm"] = "Confirmar";
+$a->strings["[Name Withheld]"] = "[Nombre oculto]";
+$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Por favor introduce tu dirección ID de una de las siguientes redes sociales soportadas:";
+$a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "<strike>Conecta como lector de correo</strike> (Disponible en breve)";
+$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 aún no eres miembro de la red social libre <a href=\"http://dir.friendica.com/siteinfo\"> sigue este enlace para encontrar un servidor público de Friendica y unirte a nosotros</a>.";
+$a->strings["Friend/Connection Request"] = "Solicitud de Amistad/Conexión";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Ejemplos: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
+$a->strings["Please answer the following:"] = "Por favor responde lo siguiente:";
+$a->strings["Does %s know you?"] = "¿%s te conoce?";
+$a->strings["Add a personal note:"] = "Añade una nota personal:";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Web Social Federada";
+$a->strings["Diaspora"] = "Diaspora*";
+$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = "(En vez de usar este formulario, introduce %s en la barra de búsqueda de Diaspora.";
+$a->strings["Your Identity Address:"] = "Dirección de tu perfil:";
+$a->strings["Submit Request"] = "Enviar solicitud";
+$a->strings["Friendica Social Communications Server - Setup"] = "Servidor de Comunicaciones Sociales Friendica - Configuración";
+$a->strings["Could not connect to database."] = "No es posible la conexión con la base de datos.";
+$a->strings["Could not create table."] = "No se puede crear la tabla.";
+$a->strings["Your Friendica site database has been installed."] = "La base de datos de su sitio web de Friendica ha sido instalada.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Puede que tengas que importar el archivo \"Database.sql\" manualmente usando phpmyadmin o mysql.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Por favor, consulta el archivo \"INSTALL.txt\".";
+$a->strings["System check"] = "Verificación del sistema";
+$a->strings["Check again"] = "Compruebalo de nuevo";
+$a->strings["Database connection"] = "Conexión con la base de datos";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Con el fin de poder instalar Friendica, necesitamos saber cómo conectar con tu base de datos.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Por favor, contacta con tu proveedor de servicios o con el administrador de la página si tienes alguna pregunta sobre estas configuraciones.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de datos que especifiques a continuación debería existir ya. Si no es el caso, debes crearla antes de continuar.";
+$a->strings["Database Server Name"] = "Nombre del servidor de la base de datos";
+$a->strings["Database Login Name"] = "Usuario de la base de datos";
+$a->strings["Database Login Password"] = "Contraseña de la base de datos";
+$a->strings["Database Name"] = "Nombre de la base de datos";
+$a->strings["Site administrator email address"] = "Dirección de correo del administrador de la web";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "La dirección de correo de tu cuenta debe coincidir con esta para poder usar el panel de administración de la web.";
+$a->strings["Please select a default timezone for your website"] = "Por favor, selecciona la zona horaria predeterminada para tu web";
+$a->strings["Site settings"] = "Configuración de la página web";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No se pudo encontrar una versión de la línea 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 tienes una versión en línea de comandos de PHP instalada en el servidor no podrás ejecutar actualizaciones en segundo plano a través de cron. Ver <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</ a>";
+$a->strings["PHP executable path"] = "Dirección al ejecutable PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Introduce la ruta completa al ejecutable php. Puedes dejarlo en blanco y seguir con la instalación.";
+$a->strings["Command line PHP"] = "Línea de comandos PHP";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versión en línea de comandos de PHP en tu sistema no tiene \"register_argc_argv\" habilitado.";
+$a->strings["This is required for message delivery to work."] = "Esto es necesario para que funcione la entrega de mensajes.";
+$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ón \"openssl_pkey_new\" en este sistema no es capaz de generar claves de cifrado";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si se ejecuta en Windows, por favor consulta la sección \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Generar claves de encriptación";
+$a->strings["libCurl PHP module"] = "Módulo PHP libCurl";
+$a->strings["GD graphics PHP module"] = "Módulo PHP gráficos GD";
+$a->strings["OpenSSL PHP module"] = "Módulo PHP OpenSSL";
+$a->strings["mysqli PHP module"] = "Módulo PHP mysqli";
+$a->strings["mb_string PHP module"] = "Módulo PHP mb_string";
+$a->strings["Apache mod_rewrite module"] = "Módulo mod_rewrite de Apache";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: El módulo de Apache mod-rewrite es necesario pero no está instalado.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Error: El módulo de PHP libcurl es necesario, pero no está instalado.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: El módulo de de PHP gráficos GD con soporte JPEG es necesario, pero no está instalado.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Error: El módulo de PHP openssl es necesario, pero  no está instalado.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Error: El módulo de PHP mysqli es necesario, pero no está instalado.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Error: El módulo de PHP mb_string es necesario, pero no está instalado.";
+$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."] = "El programa de instalación web necesita ser capaz de crear un archivo llamado \".htconfig.php\" en la carpeta principal de tu servidor web y es incapaz de hacerlo.";
+$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."] = "Se trata a menudo de una configuración de permisos, pues el servidor web puede que no sea capaz de escribir archivos en la carpeta, aunque tú sí puedas.";
+$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 obtendremos un texto que debes guardar en un archivo llamado .htconfig.php en la carpeta de Friendica.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Como alternativa, puedes saltarte estos pasos y realizar una instalación manual. Por favor, consulta el archivo \"INSTALL.txt\" para las instrucciones.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php tiene permiso de escritura";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "La reescritura de la dirección en .htaccess no funcionó. Revisa la configuración.";
+$a->strings["Url rewrite is working"] = "Reescribiendo la dirección...";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "El archivo de configuración de base de datos \".htconfig.php\" no se pudo escribir. Por favor, utiliza el texto adjunto para crear un archivo de configuración en la raíz de tu servidor web.";
+$a->strings["Errors encountered creating database tables."] = "Se han encontrados errores creando las tablas de la base de datos.";
+$a->strings["<h1>What next</h1>"] = "<h1>¿Ahora qué?</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo";
+$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
+$a->strings["Time Conversion"] = "Conversión horária";
+$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas.";
+$a->strings["UTC time: %s"] = "Tiempo UTC: %s";
+$a->strings["Current timezone: %s"] = "Zona horaria actual: %s";
+$a->strings["Converted localtime: %s"] = "Zona horaria local convertida: %s";
+$a->strings["Please select your timezone:"] = "Por favor, selecciona tu zona horaria:";
+$a->strings["Poke/Prod"] = "Toque/Empujón";
+$a->strings["poke, prod or do other things to somebody"] = "da un toque, empujón o similar a alguien";
+$a->strings["Recipient"] = "Receptor";
+$a->strings["Choose what you wish to do to recipient"] = "Elige qué desea hacer con el receptor";
+$a->strings["Make this post private"] = "Hacer esta publicación privada";
+$a->strings["Profile Match"] = "Coincidencias de Perfil";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave que coincidan. Por favor, agrega algunas palabras claves en tu perfil predeterminado.";
+$a->strings["is interested in:"] = "estás interesado en:";
+$a->strings["Connect"] = "Conectar";
+$a->strings["No matches"] = "Sin conincidencias";
+$a->strings["Remote privacy information not available."] = "Privacidad de la información remota no disponible.";
+$a->strings["Visible to:"] = "Visible para:";
+$a->strings["No such group"] = "Ningún grupo";
+$a->strings["Group is empty"] = "El grupo está vacío";
+$a->strings["Group: "] = "Grupo: ";
+$a->strings["Select"] = "Seleccionar";
+$a->strings["View %s's profile @ %s"] = "Ver perfil de %s @ %s";
+$a->strings["%s from %s"] = "%s de %s";
+$a->strings["View in context"] = "Verlo en contexto";
+$a->strings["%d comment"] = array(
+	0 => "%d comentario",
+	1 => "%d comentarios",
+);
+$a->strings["show more"] = "ver más";
+$a->strings["like"] = "me gusta";
+$a->strings["dislike"] = "no me gusta";
+$a->strings["Share this"] = "Compartir esto";
+$a->strings["share"] = "compartir";
+$a->strings["Bold"] = "Negrita";
+$a->strings["Italic"] = "Cursiva";
+$a->strings["Underline"] = "Subrayado";
+$a->strings["Quote"] = "Cita";
+$a->strings["Code"] = "Código";
+$a->strings["Image"] = "Imagen";
+$a->strings["Link"] = "Enlace";
+$a->strings["Video"] = "Vídeo";
+$a->strings["add star"] = "Añadir estrella";
+$a->strings["remove star"] = "Quitar estrella";
+$a->strings["toggle star status"] = "Añadir a destacados";
+$a->strings["starred"] = "marcados con estrellas";
+$a->strings["add tag"] = "añadir etiqueta";
+$a->strings["save to folder"] = "grabado en directorio";
+$a->strings["to"] = "a";
+$a->strings["Wall-to-Wall"] = "Muro-A-Muro";
+$a->strings["via Wall-To-Wall:"] = "via Muro-A-Muro:";
+$a->strings["Welcome to %s"] = "Bienvenido a %s";
+$a->strings["Invalid request identifier."] = "Solicitud de identificación no válida.";
+$a->strings["Discard"] = "Descartar";
+$a->strings["Ignore"] = "Ignorar";
+$a->strings["System"] = "Sistema";
+$a->strings["Network"] = "Red";
+$a->strings["Personal"] = "Personal";
+$a->strings["Home"] = "Inicio";
+$a->strings["Introductions"] = "Presentaciones";
+$a->strings["Messages"] = "Mensajes";
+$a->strings["Show Ignored Requests"] = "Mostrar peticiones ignoradas";
+$a->strings["Hide Ignored Requests"] = "Ocultar peticiones ignoradas";
+$a->strings["Notification type: "] = "Tipo de notificación: ";
+$a->strings["Friend Suggestion"] = "Propuestas de amistad";
+$a->strings["suggested by %s"] = "sugerido por %s";
+$a->strings["Hide this contact from others"] = "Ocultar este contacto a los demás.";
+$a->strings["Post a new friend activity"] = "Publica tu nueva amistad";
+$a->strings["if applicable"] = "Si corresponde";
+$a->strings["Approve"] = "Aprobar";
+$a->strings["Claims to be known to you: "] = "Dice conocerte: ";
+$a->strings["yes"] = "sí";
+$a->strings["no"] = "no";
+$a->strings["Approve as: "] = "Aprobar como: ";
+$a->strings["Friend"] = "Amigo";
+$a->strings["Sharer"] = "Lector";
+$a->strings["Fan/Admirer"] = "Fan/Admirador";
+$a->strings["Friend/Connect Request"] = "Solicitud de Amistad/Conexión";
+$a->strings["New Follower"] = "Nuevo seguidor";
+$a->strings["No introductions."] = "Sin presentaciones.";
+$a->strings["Notifications"] = "Notificaciones";
+$a->strings["%s liked %s's post"] = "A %s le gusta la publicación de %s";
+$a->strings["%s disliked %s's post"] = "A %s no le gusta la publicación de %s";
+$a->strings["%s is now friends with %s"] = "%s es ahora es amigo de %s";
+$a->strings["%s created a new post"] = "%s creó una nueva publicación";
+$a->strings["%s commented on %s's post"] = "%s comentó la publicación de %s";
+$a->strings["No more network notifications."] = "No hay más notificaciones de red.";
+$a->strings["Network Notifications"] = "Notificaciones de Red";
+$a->strings["No more system notifications."] = "No hay más notificaciones del sistema.";
+$a->strings["System Notifications"] = "Notificaciones del sistema";
+$a->strings["No more personal notifications."] = "No hay más notificaciones personales.";
+$a->strings["Personal Notifications"] = "Notificaciones personales";
+$a->strings["No more home notifications."] = "No hay más notificaciones de inicio.";
+$a->strings["Home Notifications"] = "Notificaciones de Inicio";
+$a->strings["Could not access contact record."] = "No se pudo acceder a los datos del contacto.";
+$a->strings["Could not locate selected profile."] = "No se pudo encontrar el perfil seleccionado.";
+$a->strings["Contact updated."] = "Contacto actualizado.";
+$a->strings["Contact has been blocked"] = "El contacto ha sido bloqueado";
+$a->strings["Contact has been unblocked"] = "El contacto ha sido desbloqueado";
+$a->strings["Contact has been ignored"] = "El contacto ha sido ignorado";
+$a->strings["Contact has been unignored"] = "El contacto ya no está ignorado";
+$a->strings["Contact has been archived"] = "El contacto ha sido archivado";
+$a->strings["Contact has been unarchived"] = "El contacto ya no está archivado";
+$a->strings["Contact has been removed."] = "El contacto ha sido eliminado";
+$a->strings["You are mutual friends with %s"] = "Ahora tienes una amistad mutua con %s";
+$a->strings["You are sharing with %s"] = "Estás compartiendo con %s";
+$a->strings["%s is sharing with you"] = "%s está compartiendo contigo";
+$a->strings["Private communications are not available for this contact."] = "Las comunicaciones privadas no está disponibles para este contacto.";
+$a->strings["Never"] = "Nunca";
+$a->strings["(Update was successful)"] = "(La actualización se ha completado)";
+$a->strings["(Update was not successful)"] = "(La actualización no se ha completado)";
+$a->strings["Suggest friends"] = "Sugerir amigos";
+$a->strings["Network type: %s"] = "Tipo de red: %s";
+$a->strings["%d contact in common"] = array(
+	0 => "%d contacto en común",
+	1 => "%d contactos en común",
+);
+$a->strings["View all contacts"] = "Ver todos los contactos";
+$a->strings["Unblock"] = "Desbloquear";
+$a->strings["Block"] = "Bloquear";
+$a->strings["Toggle Blocked status"] = "Cambiar bloqueados";
+$a->strings["Unignore"] = "Quitar de Ignorados";
+$a->strings["Toggle Ignored status"] = "Cambiar ignorados";
+$a->strings["Unarchive"] = "Sin archivar";
+$a->strings["Archive"] = "Archivo";
+$a->strings["Toggle Archive status"] = "Cambiar archivados";
+$a->strings["Repair"] = "Reparar";
+$a->strings["Advanced Contact Settings"] = "Configuración avanzada";
+$a->strings["Communications lost with this contact!"] = "¡Se ha perdido la comunicación con este contacto!";
+$a->strings["Contact Editor"] = "Editor de contactos";
+$a->strings["Profile Visibility"] = "Visibilidad del Perfil";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura.";
+$a->strings["Contact Information / Notes"] = "Información del Contacto / Notas";
+$a->strings["Edit contact notes"] = "Editar notas del contacto";
+$a->strings["Visit %s's profile [%s]"] = "Ver el perfil de %s [%s]";
+$a->strings["Block/Unblock contact"] = "Boquear/Desbloquear contacto";
+$a->strings["Ignore contact"] = "Ignorar contacto";
+$a->strings["Repair URL settings"] = "Configuración de reparación de la dirección";
+$a->strings["View conversations"] = "Ver conversaciones";
+$a->strings["Delete contact"] = "Eliminar contacto";
+$a->strings["Last update:"] = "Última actualización:";
+$a->strings["Update public posts"] = "Actualizar publicaciones públicas";
+$a->strings["Update now"] = "Actualizar ahora";
+$a->strings["Currently blocked"] = "Bloqueados";
+$a->strings["Currently ignored"] = "Ignorados";
+$a->strings["Currently archived"] = "Archivados";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía <strong>pueden</strong> ser visibles.";
+$a->strings["Suggestions"] = "Sugerencias";
+$a->strings["Suggest potential friends"] = "Amistades potenciales sugeridas";
+$a->strings["All Contacts"] = "Todos los contactos";
+$a->strings["Show all contacts"] = "Mostrar todos los contactos";
+$a->strings["Unblocked"] = "Desbloqueados";
+$a->strings["Only show unblocked contacts"] = "Mostrar solo contactos sin bloquear";
+$a->strings["Blocked"] = "Bloqueados";
+$a->strings["Only show blocked contacts"] = "Mostrar solo contactos bloqueados";
+$a->strings["Ignored"] = "Ignorados";
+$a->strings["Only show ignored contacts"] = "Mostrar solo contactos ignorados";
+$a->strings["Archived"] = "Archivados";
+$a->strings["Only show archived contacts"] = "Mostrar solo contactos archivados";
+$a->strings["Hidden"] = "Ocultos";
+$a->strings["Only show hidden contacts"] = "Mostrar solo contactos ocultos";
+$a->strings["Mutual Friendship"] = "Amistad recíproca";
+$a->strings["is a fan of yours"] = "es tu fan";
+$a->strings["you are a fan of"] = "eres fan de";
+$a->strings["Edit contact"] = "Modificar contacto";
+$a->strings["Contacts"] = "Contactos";
+$a->strings["Search your contacts"] = "Buscar en tus contactos";
+$a->strings["Finding: "] = "Buscando: ";
+$a->strings["Find"] = "Buscar";
+$a->strings["No valid account found."] = "No se ha encontrado ninguna cuenta válida";
+$a->strings["Password reset request issued. Check your email."] = "Solicitud de restablecimiento de contraseña enviada. Revisa tu correo.";
+$a->strings["Password reset requested at %s"] = "Contraseña restablecida enviada a %s";
+$a->strings["Administrator"] = "Administrador";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La solicitud no puede ser verificada (deberías haberla proporcionado antes). Falló el restablecimiento de la contraseña.";
+$a->strings["Password Reset"] = "Restablecer la contraseña";
+$a->strings["Your password has been reset as requested."] = "Tu contraseña ha sido restablecida como solicitaste.";
+$a->strings["Your new password is"] = "Tu nueva contraseña es";
+$a->strings["Save or copy your new password - and then"] = "Guarda o copia tu nueva contraseña y luego";
+$a->strings["click here to login"] = "pulsa aquí para acceder";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puedes cambiar tu contraseña desde la página de <em>Configuración</em> después de acceder con éxito.";
+$a->strings["Forgot your Password?"] = "¿Olvidaste tu contraseña?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introduce tu correo para restablecer tu contraseña. Luego comprueba tu correo para las instrucciones adicionales.";
+$a->strings["Nickname or Email: "] = "Apodo o Correo electrónico: ";
+$a->strings["Reset"] = "Restablecer";
+$a->strings["Account settings"] = "Configuración de tu cuenta";
+$a->strings["Display settings"] = "Mostrar configuración";
+$a->strings["Connector settings"] = "Configuración del conector";
+$a->strings["Plugin settings"] = "Configuración de los módulos";
+$a->strings["Connected apps"] = "Aplicaciones conectadas";
+$a->strings["Export personal data"] = "Exportación de datos personales";
+$a->strings["Remove account"] = "Eliminar cuenta";
+$a->strings["Settings"] = "Configuración";
+$a->strings["Missing some important data!"] = "¡Faltan algunos datos importantes!";
+$a->strings["Update"] = "Actualizar";
+$a->strings["Failed to connect with email account using the settings provided."] = "Error al conectar con la cuenta de correo mediante la configuración suministrada.";
+$a->strings["Email settings updated."] = "Configuración de correo actualizada.";
+$a->strings["Passwords do not match. Password unchanged."] = "Las contraseñas no coinciden. La contraseña no ha sido modificada.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "No se permiten contraseñas vacías. La contraseña no ha sido modificada.";
+$a->strings["Password changed."] = "Contraseña modificada.";
+$a->strings["Password update failed. Please try again."] = "La actualización de la contraseña ha fallado. Por favor, prueba otra vez.";
+$a->strings[" Please use a shorter name."] = " Usa un nombre más corto.";
+$a->strings[" Name too short."] = " Nombre demasiado corto.";
+$a->strings[" Not valid email."] = " Correo no válido.";
+$a->strings[" Cannot change to that email."] = " No se puede usar ese correo.";
+$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "El foro privado no tiene permisos de privacidad. Usando el grupo de privacidad por defecto.";
+$a->strings["Private forum has no privacy permissions and no default privacy group."] = "El foro privado no tiene permisos de privacidad ni grupo por defecto de privacidad.";
+$a->strings["Settings updated."] = "Configuración actualizada.";
+$a->strings["Add application"] = "Agregar aplicación";
+$a->strings["Consumer Key"] = "Clave del consumidor";
+$a->strings["Consumer Secret"] = "Secreto del consumidor";
+$a->strings["Redirect"] = "Redirigir";
+$a->strings["Icon url"] = "Dirección del ícono";
+$a->strings["You can't edit this application."] = "No puedes editar esta aplicación.";
+$a->strings["Connected Apps"] = "Aplicaciones conectadas";
+$a->strings["Client key starts with"] = "Clave de cliente comienza por";
+$a->strings["No name"] = "Sin nombre";
+$a->strings["Remove authorization"] = "Suprimir la autorización";
+$a->strings["No Plugin settings configured"] = "No se ha configurado ningún módulo";
+$a->strings["Plugin Settings"] = "Configuración de los módulos";
+$a->strings["Built-in support for %s connectivity is %s"] = "El soporte integrado de conexión con %s está %s";
+$a->strings["enabled"] = "habilitado";
+$a->strings["disabled"] = "deshabilitado";
+$a->strings["StatusNet"] = "StatusNet";
+$a->strings["Email access is disabled on this site."] = "El acceso por correo está deshabilitado en esta web.";
+$a->strings["Connector Settings"] = "Configuración del conector";
+$a->strings["Email/Mailbox Setup"] = "Configuración del correo/buzón";
+$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Si quieres comunicarte con tus contactos de correo usando este servicio (opcional), por favor, especifica cómo conectar con tu buzón.";
+$a->strings["Last successful email check:"] = "Última comprobación del correo con éxito:";
+$a->strings["IMAP server name:"] = "Nombre del servidor IMAP:";
+$a->strings["IMAP port:"] = "Puerto IMAP:";
+$a->strings["Security:"] = "Seguridad:";
+$a->strings["None"] = "Ninguna";
+$a->strings["Email login name:"] = "Nombre de usuario:";
+$a->strings["Email password:"] = "Contraseña:";
+$a->strings["Reply-to address:"] = "Dirección de respuesta:";
+$a->strings["Send public posts to all email contacts:"] = "Enviar publicaciones públicas a todos los contactos de correo:";
+$a->strings["Action after import:"] = "Acción después de importar:";
+$a->strings["Mark as seen"] = "Marcar como leído";
+$a->strings["Move to folder"] = "Mover a un directorio";
+$a->strings["Move to folder:"] = "Mover al directorio:";
+$a->strings["No special theme for mobile devices"] = "No hay tema especial para dispositivos móviles";
+$a->strings["Display Settings"] = "Mostrar Configuración";
+$a->strings["Display Theme:"] = "Utilizar tema:";
+$a->strings["Mobile Theme:"] = "Tema móvil:";
+$a->strings["Update browser every xx seconds"] = "Actualizar navegador cada xx segundos";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Mínimo 10 segundos, sin máximo";
+$a->strings["Number of items to display per page:"] = "Número de elementos a mostrar por página:";
+$a->strings["Maximum of 100 items"] = "Máximo 100 elementos";
+$a->strings["Don't show emoticons"] = "No mostrar emoticones";
+$a->strings["Normal Account Page"] = "Página de cuenta normal";
+$a->strings["This account is a normal personal profile"] = "Esta cuenta es el perfil personal normal";
+$a->strings["Soapbox Page"] = "Página de tribuna";
+$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Acepta automáticamente todas las peticiones de conexión/amistad como seguidores de solo-lectura";
+$a->strings["Community Forum/Celebrity Account"] = "Cuenta de Comunidad, Foro o Celebridad";
+$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Acepta automáticamente todas las peticiones de conexión/amistad como seguidores de lectura-escritura";
+$a->strings["Automatic Friend Page"] = "Página de Amistad autómatica";
+$a->strings["Automatically approve all connection/friend requests as friends"] = "Aceptar automáticamente todas las solicitudes de conexión/amistad como amigos";
+$a->strings["Private Forum [Experimental]"] = "Foro privado [Experimental]";
+$a->strings["Private forum - approved members only"] = "Foro privado - solo miembros";
+$a->strings["OpenID:"] = "OpenID:";
+$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Opcional) Permitir a este OpenID acceder a esta cuenta.";
+$a->strings["Publish your default profile in your local site directory?"] = "¿Quieres publicar tu perfil predeterminado en el directorio local del sitio?";
+$a->strings["Publish your default profile in the global social directory?"] = "¿Quieres publicar tu perfil predeterminado en el directorio social de forma global?";
+$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "¿Quieres ocultar tu lista de contactos/amigos en la vista de tu perfil predeterminado?";
+$a->strings["Hide your profile details from unknown viewers?"] = "¿Quieres que los detalles de tu perfil permanezcan ocultos a los desconocidos?";
+$a->strings["Allow friends to post to your profile page?"] = "¿Permites que tus amigos publiquen en tu página de perfil?";
+$a->strings["Allow friends to tag your posts?"] = "¿Permites a los amigos etiquetar tus publicaciones?";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "¿Nos permite recomendarte como amigo potencial a los nuevos miembros?";
+$a->strings["Permit unknown people to send you private mail?"] = "¿Permites que desconocidos te manden correos privados?";
+$a->strings["Profile is <strong>not published</strong>."] = "El perfil <strong>no está publicado</strong>.";
 $a->strings["or"] = "o";
-$a->strings["skip this step"] = "salta este paso";
+$a->strings["Your Identity Address is"] = "Tu dirección personal es";
+$a->strings["Automatically expire posts after this many days:"] = "Las publicaciones expirarán automáticamente después de estos días:";
+$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Si lo dejas vacío no expirarán nunca. Las publicaciones que hayan expirado se borrarán";
+$a->strings["Advanced expiration settings"] = "Configuración avanzada de expiración";
+$a->strings["Advanced Expiration"] = "Expiración avanzada";
+$a->strings["Expire posts:"] = "¿Expiran las publicaciones?";
+$a->strings["Expire personal notes:"] = "¿Expiran las notas personales?";
+$a->strings["Expire starred posts:"] = "¿Expiran los favoritos?";
+$a->strings["Expire photos:"] = "¿Expiran las fotografías?";
+$a->strings["Only expire posts by others:"] = "Solo expiran los mensajes de los demás:";
+$a->strings["Account Settings"] = "Configuración de la cuenta";
+$a->strings["Password Settings"] = "Configuración de la contraseña";
+$a->strings["New Password:"] = "Contraseña nueva:";
+$a->strings["Confirm:"] = "Confirmar:";
+$a->strings["Leave password fields blank unless changing"] = "Deja la contraseña en blanco si no quieres cambiarla";
+$a->strings["Basic Settings"] = "Configuración básica";
+$a->strings["Full Name:"] = "Nombre completo:";
+$a->strings["Email Address:"] = "Dirección de correo:";
+$a->strings["Your Timezone:"] = "Zona horaria:";
+$a->strings["Default Post Location:"] = "Localización predeterminada:";
+$a->strings["Use Browser Location:"] = "Usar localización del navegador:";
+$a->strings["Security and Privacy Settings"] = "Configuración de seguridad y privacidad";
+$a->strings["Maximum Friend Requests/Day:"] = "Máximo número de peticiones de amistad por día:";
+$a->strings["(to prevent spam abuse)"] = "(para prevenir el abuso de spam)";
+$a->strings["Default Post Permissions"] = "Permisos por defecto para las publicaciones";
+$a->strings["(click to open/close)"] = "(pulsa para abrir/cerrar)";
+$a->strings["Maximum private messages per day from unknown people:"] = "Número máximo de mensajes diarios para desconocidos:";
+$a->strings["Notification Settings"] = "Configuración de notificaciones";
+$a->strings["By default post a status message when:"] = "Publicar en tu estado cuando:";
+$a->strings["accepting a friend request"] = "aceptes una solicitud de amistad";
+$a->strings["joining a forum/community"] = "te unas a un foro/comunidad";
+$a->strings["making an <em>interesting</em> profile change"] = "hagas un cambio <em>interesante</em> en tu perfil";
+$a->strings["Send a notification email when:"] = "Enviar notificación por correo cuando:";
+$a->strings["You receive an introduction"] = "Recibas una presentación";
+$a->strings["Your introductions are confirmed"] = "Tu presentación sea confirmada";
+$a->strings["Someone writes on your profile wall"] = "Alguien escriba en el muro de mi perfil";
+$a->strings["Someone writes a followup comment"] = "Algien escriba en un comentario que sigo";
+$a->strings["You receive a private message"] = "Recibas un mensaje privado";
+$a->strings["You receive a friend suggestion"] = "Recibas una sugerencia de amistad";
+$a->strings["You are tagged in a post"] = "Seas etiquetado en una publicación";
+$a->strings["You are poked/prodded/etc. in a post"] = "Te han tocado/empujado/etc. en una publicación";
+$a->strings["Advanced Account/Page Type Settings"] = "Configuración avanzada de tipo de Cuenta/Página";
+$a->strings["Change the behaviour of this account for special situations"] = "Cambiar el comportamiento de esta cuenta para situaciones especiales";
+$a->strings["Manage Identities and/or Pages"] = "Administrar identidades y/o páginas";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Cambia entre diferentes identidades o páginas de Comunidad/Grupos que comparten los detalles de tu cuenta o sobre los que tienes permisos para administrar";
+$a->strings["Select an identity to manage: "] = "Selecciona una identidad a gestionar:";
+$a->strings["Search Results For:"] = "Resultados de la busqueda para:";
+$a->strings["Remove term"] = "Eliminar término";
+$a->strings["Saved Searches"] = "Búsquedas guardadas";
+$a->strings["add"] = "añadir";
+$a->strings["Commented Order"] = "Orden de comentarios";
+$a->strings["Sort by Comment Date"] = "Ordenar por fecha de comentarios";
+$a->strings["Posted Order"] = "Orden de publicación";
+$a->strings["Sort by Post Date"] = "Ordenar por fecha de publicación";
+$a->strings["Posts that mention or involve you"] = "Publicaciones que te mencionan o involucran";
+$a->strings["New"] = "Nuevo";
+$a->strings["Activity Stream - by date"] = "Corriente de actividad por fecha";
+$a->strings["Starred"] = "Favoritos";
+$a->strings["Favourite Posts"] = "Publicaciones favoritas";
+$a->strings["Shared Links"] = "Enlaces compartidos";
+$a->strings["Interesting Links"] = "Enlaces interesantes";
+$a->strings["Warning: This group contains %s member from an insecure network."] = array(
+	0 => "Aviso: este grupo contiene %s contacto con conexión no segura.",
+	1 => "Aviso: este grupo contiene %s contactos con conexiones no seguras.",
+);
+$a->strings["Private messages to this group are at risk of public disclosure."] = "Los mensajes privados a este grupo corren el riesgo de ser mostrados públicamente.";
+$a->strings["Contact: "] = "Contacto: ";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente.";
+$a->strings["Invalid contact."] = "Contacto erróneo.";
+$a->strings["Personal Notes"] = "Notas personales";
+$a->strings["Save"] = "Guardar";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Excedido el número máximo de mensajes para %s. El mensaje no se ha enviado.";
+$a->strings["No recipient selected."] = "Ningún destinatario seleccionado";
+$a->strings["Unable to check your home location."] = "Imposible comprobar tu servidor de inicio.";
+$a->strings["Message could not be sent."] = "El mensaje no ha podido ser enviado.";
+$a->strings["Message collection failure."] = "Fallo en la recolección de mensajes.";
+$a->strings["Message sent."] = "Mensaje enviado.";
+$a->strings["No recipient."] = "Sin receptor.";
+$a->strings["Please enter a link URL:"] = "Introduce la dirección del enlace:";
+$a->strings["Send Private Message"] = "Enviar mensaje privado";
+$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 quieres que %s te responda, asegúrate de que la configuración de privacidad permite enviar correo privado a desconocidos.";
+$a->strings["To:"] = "Para:";
+$a->strings["Subject:"] = "Asunto:";
+$a->strings["Your message:"] = "Tu mensaje:";
+$a->strings["Welcome to Friendica"] = "Bienvenido a Friendica ";
+$a->strings["New Member Checklist"] = "Listado de nuevos miembros";
+$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."] = "Nos gustaría ofrecerte algunos consejos y enlaces para ayudar a hacer tu experiencia más amena. Pulsa en cualquier elemento para visitar la página correspondiente. Un enlace a esta página será visible desde tu página de inicio durante las dos semanas siguientes a tu inscripción y luego desaparecerá.";
+$a->strings["Getting Started"] = "Empezando";
+$a->strings["Friendica Walk-Through"] = "Visita guiada a 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."] = "En tu página de <em>Inicio Rápido</em> - busca una introducción breve para tus pestañas de perfil y red, haz algunas conexiones nuevas, y busca algunos grupos a los que unirte.";
+$a->strings["Go to Your Settings"] = "Ir a tus ajustes";
+$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 página de <em>Configuración</em> puedes cambiar tu contraseña inicial. También aparece tu ID (Identity Address). Es parecida a una dirección de correo y te servirá para conectar con gente de redes sociales libres.";
+$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."] = "Revisa las otras configuraciones, especialmente la configuración de privacidad. Un listado de directorio sin publicar es como tener un número de teléfono sin publicar. Normalmente querrás publicar tu listado, a menos que tus amigos y amigos potenciales sepan cómo ponerse en contacto contigo.";
+$a->strings["Profile"] = "Perfil";
+$a->strings["Upload Profile Photo"] = "Subir 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."] = "Sube una foto para tu perfil si no lo has hecho aún. Los estudios han demostrado que la gente que usa fotos suyas reales tienen diez veces más éxito a la hora de entablar amistad que las que no.";
+$a->strings["Edit Your Profile"] = "Editar tu 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."] = "Edita tu perfil <strong>predeterminado</strong> como quieras. Revisa la configuración para ocultar tu lista de amigos o tu perfil a los visitantes desconocidos.";
+$a->strings["Profile Keywords"] = "Palabras clave 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."] = "Define en tu perfil público algunas palabras que describan tus intereses. Así podremos buscar otras personas con los mismos gustos y sugerirte posibles amigos.";
+$a->strings["Connecting"] = "Conectando";
+$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."] = "Autoriza la conexión con Facebook si ya tienes una cuenta en Facebook y nosotros (opcionalmente) importaremos tus amistades y conversaciones desde Facebook.";
+$a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Si</em> este es tu propio servidor privado, instalar el conector de Facebook puede facilitar el paso hacia la red social libre.";
+$a->strings["Importing Emails"] = "Importando correos electrónicos";
+$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"] = "Introduce la información para acceder a tu correo en la página de Configuración del conector si quieres importar e interactuar con amigos o listas de correos del buzón de entrada de tu correo electrónico.";
+$a->strings["Go to Your Contacts Page"] = "Ir a tu página de contactos";
+$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."] = "Tu página de Contactos es el portal desde donde podrás manejar tus amistades y conectarte con amigos de otras redes. Normalmente introduces su dirección o la dirección de su sitio web en el recuadro \"Añadir contacto nuevo\".";
+$a->strings["Go to Your Site's Directory"] = "Ir al directorio de tu sitio";
+$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."] = "El Directorio te permite encontrar otras personas en esta red o en cualquier otro sitio federado. Busca algún enlace de <em>Conectar</em> o <em>Seguir</em> en su perfil. Proporciona tu direción personal si es necesario.";
+$a->strings["Finding New People"] = "Encontrando nueva gente";
+$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."] = "En el panel lateral de la página de Contactos existen varias herramientas para encontrar nuevos amigos. Podemos filtrar personas por sus intereses, buscar personas por nombre o por sus intereses, y ofrecerte sugerencias basadas en sus relaciones de la red. En un sitio nuevo, las sugerencias de amigos por lo general comienzan pasadas las 24 horas.";
+$a->strings["Groups"] = "Grupos";
+$a->strings["Group Your Contacts"] = "Agrupa tus contactos";
+$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 vez que tengas algunos amigos, puedes organizarlos en grupos privados de conversación mediante el memnú en tu página de Contactos y luego puedes interactuar con cada grupo por separado desde tu página de Red.";
+$a->strings["Why Aren't My Posts Public?"] = "¿Por qué mis publicaciones no son públicas?";
+$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 respeta tu privacidad. Por defecto, tus publicaciones solo se mostrarán a personas que hayas añadido como amistades. Para más información, mira la sección de ayuda en el enlace de más arriba.";
+$a->strings["Getting Help"] = "Consiguiendo ayuda";
+$a->strings["Go to the Help Section"] = "Ir a la sección de ayuda";
+$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Puedes consultar nuestra página de <strong>Ayuda</strong> para más información y recursos de ayuda.";
+$a->strings["Item not available."] = "Elemento no disponible.";
+$a->strings["Item was not found."] = "Elemento no encontrado.";
+$a->strings["Group created."] = "Grupo creado.";
+$a->strings["Could not create group."] = "Imposible crear el grupo.";
+$a->strings["Group not found."] = "Grupo no encontrado.";
+$a->strings["Group name changed."] = "El nombre del grupo ha cambiado.";
+$a->strings["Permission denied"] = "Permiso denegado";
+$a->strings["Create a group of contacts/friends."] = "Crea un grupo de contactos/amigos.";
+$a->strings["Group Name: "] = "Nombre del grupo: ";
+$a->strings["Group removed."] = "Grupo eliminado.";
+$a->strings["Unable to remove group."] = "No se puede eliminar el grupo.";
+$a->strings["Group Editor"] = "Editor de grupos";
+$a->strings["Members"] = "Miembros";
+$a->strings["Click on a contact to add or remove."] = "Pulsa en un contacto para añadirlo o eliminarlo.";
+$a->strings["Invalid profile identifier."] = "Identificador de perfil no válido.";
+$a->strings["Profile Visibility Editor"] = "Editor de visibilidad del perfil";
+$a->strings["Visible To"] = "Visible para";
+$a->strings["All Contacts (with secure profile access)"] = "Todos los contactos (con perfil de acceso seguro)";
+$a->strings["No contacts."] = "Ningún contacto.";
+$a->strings["View Contacts"] = "Ver contactos";
+$a->strings["Registration details for %s"] = "Detalles de registro para %s";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Te has registrado con éxito. Por favor, consulta tu correo para más información.";
+$a->strings["Failed to send email message. Here is the message that failed."] = "Error al enviar el mensaje de correo. Este es el mensaje no enviado.";
+$a->strings["Your registration can not be processed."] = "Tu registro no se puede procesar.";
+$a->strings["Registration request at %s"] = "Solicitud de registro en %s";
+$a->strings["Your registration is pending approval by the site owner."] = "Tu registro está pendiente de aprobación por el propietario del sitio.";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Este sitio ha excedido el número de registros diarios permitidos. Inténtalo de nuevo mañana por favor.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Puedes (opcionalmente) rellenar este formulario a través de OpenID escribiendo tu OpenID y pulsando en \"Registrar\".";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si no estás familiarizado con OpenID, por favor deja ese campo en blanco y rellena el resto de los elementos.";
+$a->strings["Your OpenID (optional): "] = "Tu OpenID (opcional):";
+$a->strings["Include your profile in member directory?"] = "¿Incluir tu perfil en el directorio de miembros?";
+$a->strings["Membership on this site is by invitation only."] = "Sitio solo accesible mediante invitación.";
+$a->strings["Your invitation ID: "] = "ID de tu invitación: ";
+$a->strings["Registration"] = "Registro";
+$a->strings["Your Full Name (e.g. Joe Smith): "] = "Tu nombre completo (por ejemplo, Manuel Pérez): ";
+$a->strings["Your Email Address: "] = "Tu dirección de correo: ";
+$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>'."] = "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este sitio va a ser \"<strong>apodo@\$nombredelsitio</strong>\".";
+$a->strings["Choose a nickname: "] = "Escoge un apodo: ";
+$a->strings["Register"] = "Registrarse";
+$a->strings["People Search"] = "Buscar personas";
+$a->strings["status"] = "estado";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gusta %3\$s de %2\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no le gusta %3\$s de %2\$s";
+$a->strings["Item not found."] = "Elemento no encontrado.";
+$a->strings["Access denied."] = "Acceso denegado.";
+$a->strings["Photos"] = "Fotografías";
+$a->strings["Files"] = "Archivos";
+$a->strings["Account approved."] = "Cuenta aprobada.";
+$a->strings["Registration revoked for %s"] = "Registro anulado para %s";
+$a->strings["Please login."] = "Por favor accede.";
+$a->strings["Unable to locate original post."] = "No se puede encontrar la publicación original.";
+$a->strings["Empty post discarded."] = "Publicación vacía descartada.";
+$a->strings["Wall Photos"] = "Foto del Muro";
+$a->strings["System error. Post not saved."] = "Error del sistema. Mensaje no guardado.";
+$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Este mensaje te lo ha enviado %s, miembro de la red social Friendica.";
+$a->strings["You may visit them online at %s"] = "Los puedes visitar en línea en %s";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Por favor contacta con el remitente respondiendo a este mensaje si no deseas recibir estos mensajes.";
+$a->strings["%s posted an update."] = "%s ha publicado una actualización.";
+$a->strings["%1\$s is currently %2\$s"] = "%1\$s está actualmente %2\$s";
+$a->strings["Mood"] = "Ánimo";
+$a->strings["Set your current mood and tell your friends"] = "Coloca tu ánimo actual y cuéntaselo a tus amigos";
+$a->strings["Image uploaded but image cropping failed."] = "Imagen recibida, pero ha fallado al recortarla.";
+$a->strings["Image size reduction [%s] failed."] = "Ha fallado la reducción de las dimensiones de la imagen [%s].";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recarga la página o limpia la caché del navegador si la foto nueva no aparece inmediatamente.";
+$a->strings["Unable to process image"] = "Imposible procesar la imagen";
+$a->strings["Image exceeds size limit of %d"] = "El tamaño de la imagen supera el límite de %d";
+$a->strings["Upload File:"] = "Subir archivo:";
+$a->strings["Select a profile:"] = "Elige un perfil:";
+$a->strings["Upload"] = "Subir";
+$a->strings["skip this step"] = "saltar este paso";
 $a->strings["select a photo from your photo albums"] = "elige una foto de tus álbumes";
 $a->strings["Crop Image"] = "Recortar imagen";
 $a->strings["Please adjust the image cropping for optimum viewing."] = "Por favor, ajusta el recorte de la imagen para optimizarla.";
 $a->strings["Done Editing"] = "Editado";
 $a->strings["Image uploaded successfully."] = "Imagen subida con éxito.";
-$a->strings["Welcome to %s"] = "Bienvenido a %s";
-$a->strings["[Embedded content - reload page to view]"] = "[Contenido incrustado - recarga la página para verlo]";
-$a->strings["File exceeds size limit of %d"] = "El tamaño del archivo excede el límite de %d";
-$a->strings["File upload failed."] = "Ha fallado la subida del archivo.";
-$a->strings["Friend Suggestions"] = "Sugerencias de amigos";
-$a->strings["No suggestions. This works best when you have more than one contact/friend."] = "No hay sugerencias. Esto funciona mejor cuando tienes más de un contacto/amigo.";
-$a->strings["Ignore/Hide"] = "Ignorar/Ocultar";
-$a->strings["Registration details for %s"] = "Detalles de registro para %s";
-$a->strings["Administrator"] = "Administrador";
-$a->strings["Account approved."] = "Cuenta aprobada.";
-$a->strings["Registration revoked for %s"] = "Registro anulado para %s";
-$a->strings["Please login."] = "Por favor accede.";
+$a->strings["No profile"] = "Nigún perfil";
+$a->strings["Remove My Account"] = "Eliminar mi cuenta";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Esto eliminará por completo tu cuenta. Una vez hecho no se puede deshacer.";
+$a->strings["Please enter your password for verification:"] = "Por favor, introduce tu contraseña para la verificación:";
+$a->strings["New Message"] = "Nuevo mensaje";
+$a->strings["Unable to locate contact information."] = "No se puede encontrar información del contacto.";
+$a->strings["Message deleted."] = "Mensaje eliminado.";
+$a->strings["Conversation removed."] = "Conversación eliminada.";
+$a->strings["No messages."] = "No hay mensajes.";
+$a->strings["Unknown sender - %s"] = "Remitente desconocido - %s";
+$a->strings["You and %s"] = "Tú y %s";
+$a->strings["%s and You"] = "%s y Tú";
+$a->strings["Delete conversation"] = "Eliminar conversación";
+$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
+$a->strings["%d message"] = array(
+	0 => "%d mensaje",
+	1 => "%d mensajes",
+);
+$a->strings["Message not available."] = "Mensaje no disponibile.";
+$a->strings["Delete message"] = "Borrar mensaje";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "No hay comunicaciones seguras disponibles. <strong>Podrías</strong> responder desde la página de perfil del remitente. ";
+$a->strings["Send Reply"] = "Enviar respuesta";
+$a->strings["Friends of %s"] = "Amigos de %s";
+$a->strings["No friends to display."] = "No hay amigos para mostrar.";
+$a->strings["Theme settings updated."] = "Configuración de la apariencia actualizada.";
+$a->strings["Site"] = "Sitio";
+$a->strings["Users"] = "Usuarios";
+$a->strings["Plugins"] = "Módulos";
+$a->strings["Themes"] = "Temas";
+$a->strings["DB updates"] = "Actualizaciones de la Base de Datos";
+$a->strings["Logs"] = "Registros";
+$a->strings["Admin"] = "Admin";
+$a->strings["Plugin Features"] = "Características del módulo";
+$a->strings["User registrations waiting for confirmation"] = "Registro de usuarios esperando la confirmación";
+$a->strings["Normal Account"] = "Cuenta normal";
+$a->strings["Soapbox Account"] = "Cuenta tribuna";
+$a->strings["Community/Celebrity Account"] = "Cuenta de Comunidad/Celebridad";
+$a->strings["Automatic Friend Account"] = "Cuenta de amistad automática";
+$a->strings["Blog Account"] = "Cuenta de blog";
+$a->strings["Private Forum"] = "Foro privado";
+$a->strings["Message queues"] = "Cola de mensajes";
+$a->strings["Administration"] = "Administración";
+$a->strings["Summary"] = "Resumen";
+$a->strings["Registered users"] = "Usuarios registrados";
+$a->strings["Pending registrations"] = "Pendientes de registro";
+$a->strings["Version"] = "Versión";
+$a->strings["Active plugins"] = "Módulos activos";
+$a->strings["Site settings updated."] = "Configuración de actualización.";
+$a->strings["Closed"] = "Cerrado";
+$a->strings["Requires approval"] = "Requiere aprobación";
+$a->strings["Open"] = "Abierto";
+$a->strings["No SSL policy, links will track page SSL state"] = "No existe una política de SSL, los vínculos harán un seguimiento del estado de SSL en la página";
+$a->strings["Force all links to use SSL"] = "Forzar todos los enlaces a utilizar SSL";
+$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Certificación personal, usa SSL solo para enlaces locales (no recomendado)";
+$a->strings["File upload"] = "Subida de archivo";
+$a->strings["Policies"] = "Políticas";
+$a->strings["Advanced"] = "Avanzado";
+$a->strings["Site name"] = "Nombre del sitio";
+$a->strings["Banner/Logo"] = "Imagen/Logotipo";
+$a->strings["System language"] = "Idioma";
+$a->strings["System theme"] = "Tema";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Tema por defecto del sistema, los usuarios podrán elegir el suyo propio en su configuración <a href='#' id='cnftheme'>cambiar configuración del tema</a>";
+$a->strings["Mobile system theme"] = "Tema de sistema móvil";
+$a->strings["Theme for mobile devices"] = "Tema para dispositivos móviles";
+$a->strings["SSL link policy"] = "Política de enlaces SSL";
+$a->strings["Determines whether generated links should be forced to use SSL"] = "Determina si los enlaces generados deben ser forzados a utilizar SSL";
+$a->strings["Maximum image size"] = "Tamaño máximo de la imagen";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Tamaño máximo en bytes de las imágenes a subir. Por defecto es 0, que quiere decir que no hay límite.";
+$a->strings["Maximum image length"] = "Largo máximo de imagen";
+$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íxeles del lado más largo de las imágenes subidas. Por defecto es -1, que significa que no hay límites.";
+$a->strings["JPEG image quality"] = "Calidad de imagen JPEG";
+$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Los archivos JPEG subidos se guardarán con este ajuste de calidad [0-100]. Por defecto es 100, que es calidad máxima.";
+$a->strings["Register policy"] = "Política de registros";
+$a->strings["Register text"] = "Términos";
+$a->strings["Will be displayed prominently on the registration page."] = "Se mostrará en un lugar destacado en la página de registro.";
+$a->strings["Accounts abandoned after x days"] = "Cuentas abandonadas después de x días";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creando sondeos a sitios externos para cuentas abandonadas. Introduce 0 para ningún límite temporal.";
+$a->strings["Allowed friend domains"] = "Dominios amigos permitidos";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Lista separada por comas de los dominios que están autorizados para establecer conexiones con este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio";
+$a->strings["Allowed email domains"] = "Dominios de correo permitidos";
+$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"] = "Lista separada por comas de los dominios que están autorizados en las direcciones de correo para registrarse en este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio";
+$a->strings["Block public"] = "Bloqueo público";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Marca para bloquear el acceso público a todas las páginas personales, aún siendo públicas, hasta que no hayas iniciado tu sesión.";
+$a->strings["Force publish"] = "Forzar publicación";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Marca para forzar que todos los perfiles de este sitio sean listados en el directorio del sitio.";
+$a->strings["Global directory update URL"] = "Dirección de actualización del directorio global";
+$a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "Dirección para actualizar el directorio global. Si no se establece ningún valor el directorio global será inaccesible para la aplicación.";
+$a->strings["Allow threaded items"] = "Permitir elementos en hilo";
+$a->strings["Allow infinite level threading for items on this site."] = "Permitir infinitos niveles de hilo para los elementos de este sitio.";
+$a->strings["Private posts by default for new users"] = "Publicaciones privadas por defecto para usuarios nuevos";
+$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Ajusta los permisos de publicación por defecto a los miembros nuevos al grupo privado por defecto en vez del público.";
+$a->strings["Block multiple registrations"] = "Bloquear registros multiples";
+$a->strings["Disallow users to register additional accounts for use as pages."] = "Impedir que los usuarios registren cuentas adicionales para su uso como páginas.";
+$a->strings["OpenID support"] = "Soporte OpenID";
+$a->strings["OpenID support for registration and logins."] = "Soporte OpenID para registros y accesos.";
+$a->strings["Fullname check"] = "Comprobar Nombre completo";
+$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Fuerza a los usuarios a registrarse con un espacio entre su nombre y su apellido en el campo Nombre completo como medida anti-spam";
+$a->strings["UTF-8 Regular expressions"] = "Expresiones regulares UTF-8";
+$a->strings["Use PHP UTF8 regular expressions"] = "Usar expresiones regulares de UTF8 en PHP";
+$a->strings["Show Community Page"] = "Ver página de la Comunidad";
+$a->strings["Display a Community page showing all recent public postings on this site."] = "Mostrar una página de Comunidad que resuma todas las publicaciones públicas recientes de este sitio.";
+$a->strings["Enable OStatus support"] = "Permitir soporte 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."] = "Provee una compatibilidad con OStatus (identi.ca, status.net, etc.) Todas las comunicaciones mediante OStatus son públicas, por lo que se mostrarán avisos sobre la privacidad con frecuencia.";
+$a->strings["Enable Diaspora support"] = "Habilitar el soporte para Diaspora*";
+$a->strings["Provide built-in Diaspora network compatibility."] = "Provee una compatibilidad con la red de Diaspora.";
+$a->strings["Only allow Friendica contacts"] = "Permitir solo contactos de Friendica";
+$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Todos los contactos deben usar protocolos de Friendica. El resto de protocolos serán desactivados.";
+$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 quieres puedes activar la comprobación estricta de certificados. Esto significa que serás incapaz de conectar con ningún sitio que use certificados SSL autofirmados.";
+$a->strings["Proxy user"] = "Usuario proxy";
+$a->strings["Proxy URL"] = "Dirección proxy";
+$a->strings["Network timeout"] = "Tiempo de espera de red";
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valor en segundos. Usar 0 para dejarlo sin límites (no se recomienda).";
+$a->strings["Delivery interval"] = "Intervalo de actualización";
+$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."] = "Retrasar la entrega de procesos en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendamos: 4-5 para los servidores compartidos, 2-3 para servidores privados virtuales, 0-1 para los grandes servidores dedicados.";
+$a->strings["Poll interval"] = "Intervalo de sondeo";
+$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Retrasar los procesos en segundo plano de sondeo en esta cantidad de segundos para reducir la carga del sistema. Si es 0, se usará el intervalo de entrega.";
+$a->strings["Maximum Load Average"] = "Promedio de carga máxima";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que la entrega y los procesos de sondeo sean retrasados - por defecto 50.";
+$a->strings["Update has been marked successful"] = "La actualización se ha completado con éxito";
+$a->strings["Executing %s failed. Check system logs."] = "%s ha fallado, comprueba los registros.";
+$a->strings["Update %s was successfully applied."] = "Actualización %s aplicada con éxito.";
+$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "La actualización %s no ha informado, se desconoce el estado.";
+$a->strings["Update function %s could not be found."] = "No se puede encontrar la función de actualización %s.";
+$a->strings["No failed updates."] = "Actualizaciones sin fallos.";
+$a->strings["Failed Updates"] = "Actualizaciones fallidas";
+$a->strings["This does not include updates prior to 1139, which did not return a status."] = "No se incluyen las anteriores a la 1139, que no indicaban su estado.";
+$a->strings["Mark success (if update was manually applied)"] = "Marcar como correcta (si actualizaste manualmente)";
+$a->strings["Attempt to execute this update step automatically"] = "Intentando ejecutar este paso automáticamente";
+$a->strings["%s user blocked/unblocked"] = array(
+	0 => "%s usuario bloqueado/desbloqueado",
+	1 => "%s usuarios bloqueados/desbloqueados",
+);
+$a->strings["%s user deleted"] = array(
+	0 => "%s usuario eliminado",
+	1 => "%s usuarios eliminados",
+);
+$a->strings["User '%s' deleted"] = "Usuario '%s' eliminado";
+$a->strings["User '%s' unblocked"] = "Usuario '%s' desbloqueado";
+$a->strings["User '%s' blocked"] = "Usuario '%s' bloqueado'";
+$a->strings["select all"] = "seleccionar todo";
+$a->strings["User registrations waiting for confirm"] = "Registro de usuarios esperando confirmación";
+$a->strings["Request date"] = "Solicitud de fecha";
+$a->strings["Email"] = "Correo electrónico";
+$a->strings["No registrations."] = "Sin registros.";
+$a->strings["Deny"] = "Denegado";
+$a->strings["Register date"] = "Fecha de registro";
+$a->strings["Last login"] = "Último acceso";
+$a->strings["Last item"] = "Último elemento";
+$a->strings["Account"] = "Cuenta";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "¡Los usuarios seleccionados serán eliminados!\\n\\n¡Todo lo que hayan publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?";
+$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?"] = "¡El usuario {0} será eliminado!\\n\\n¡Todo lo que haya publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?";
+$a->strings["Plugin %s disabled."] = "Módulo %s deshabilitado.";
+$a->strings["Plugin %s enabled."] = "Módulo %s habilitado.";
+$a->strings["Disable"] = "Desactivado";
+$a->strings["Enable"] = "Activado";
+$a->strings["Toggle"] = "Activar";
+$a->strings["Author: "] = "Autor:";
+$a->strings["Maintainer: "] = "Mantenedor: ";
+$a->strings["No themes found."] = "No se encontraron temas.";
+$a->strings["Screenshot"] = "Captura de pantalla";
+$a->strings["[Experimental]"] = "[Experimental]";
+$a->strings["[Unsupported]"] = "[Sin soporte]";
+$a->strings["Log settings updated."] = "Configuración de registro actualizada.";
+$a->strings["Clear"] = "Limpiar";
+$a->strings["Debugging"] = "Depuración";
+$a->strings["Log file"] = "Archivo de registro";
+$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Debes tener permiso de escritura en el servidor. Relacionado con tu directorio de inicio de Friendica.";
+$a->strings["Log level"] = "Nivel de registro";
+$a->strings["Close"] = "Cerrado";
+$a->strings["FTP Host"] = "Hospedaje FTP";
+$a->strings["FTP Path"] = "Ruta FTP";
+$a->strings["FTP User"] = "Usuario FTP";
+$a->strings["FTP Password"] = "Contraseña FTP";
+$a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
+$a->strings["Access to this profile has been restricted."] = "El acceso a este perfil ha sido restringido.";
+$a->strings["Tips for New Members"] = "Consejos para nuevos miembros";
+$a->strings["{0} wants to be your friend"] = "{0} quiere ser tu amigo";
+$a->strings["{0} sent you a message"] = "{0} te ha enviado un mensaje";
+$a->strings["{0} requested registration"] = "{0} solicitudes de registro";
+$a->strings["{0} commented %s's post"] = "{0} comentó la publicación de %s";
+$a->strings["{0} liked %s's post"] = "A {0} le ha gustado la publicación de %s";
+$a->strings["{0} disliked %s's post"] = "A {0} no le ha gustado la publicación de %s";
+$a->strings["{0} is now friends with %s"] = "{0} ahora es amigo de %s";
+$a->strings["{0} posted"] = "{0} publicado";
+$a->strings["{0} tagged %s's post with #%s"] = "{0} etiquetó la publicación de %s como #%s";
+$a->strings["{0} mentioned you in a post"] = "{0} te mencionó en una publicación";
+$a->strings["Contacts who are not members of a group"] = "Contactos sin grupo";
+$a->strings["OpenID protocol error. No ID returned."] = "Error de protocolo OpenID. ID no devuelta.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Cuenta no encontrada y el registro OpenID no está permitido en ese sitio.";
+$a->strings["Login failed."] = "Accesso fallido.";
+$a->strings["Contact added"] = "Contacto añadido";
+$a->strings["Common Friends"] = "Amigos comunes";
+$a->strings["No contacts in common."] = "Sin contactos en común.";
+$a->strings["link"] = "enlace";
+$a->strings["Item has been removed."] = "El elemento ha sido eliminado.";
+$a->strings["Applications"] = "Aplicaciones";
+$a->strings["No installed applications."] = "Sin aplicaciones";
+$a->strings["Search"] = "Buscar";
 $a->strings["Profile not found."] = "Perfil no encontrado.";
 $a->strings["Profile Name is required."] = "Se necesita un nombre de perfil.";
+$a->strings["Marital Status"] = "Estado civil";
+$a->strings["Romantic Partner"] = "Pareja sentimental";
+$a->strings["Likes"] = "Me gusta";
+$a->strings["Dislikes"] = "No me gusta";
+$a->strings["Work/Employment"] = "Trabajo/estudios";
+$a->strings["Religion"] = "Religión";
+$a->strings["Political Views"] = "Preferencias políticas";
+$a->strings["Gender"] = "Género";
+$a->strings["Sexual Preference"] = "Orientación sexual";
+$a->strings["Homepage"] = "Página de inicio";
+$a->strings["Interests"] = "Intereses";
+$a->strings["Address"] = "Dirección";
+$a->strings["Location"] = "Ubicación";
 $a->strings["Profile updated."] = "Perfil actualizado.";
+$a->strings[" and "] = " y ";
+$a->strings["public profile"] = "perfil público";
+$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s cambió su %2\$s a &ldquo;%3\$s&rdquo;";
+$a->strings[" - Visit %1\$s's %2\$s"] = " - Visita %1\$s's %2\$s";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s tiene una actualización %2\$s, cambiando %3\$s.";
 $a->strings["Profile deleted."] = "Perfil eliminado.";
 $a->strings["Profile-"] = "Perfil-";
 $a->strings["New profile created."] = "Nuevo perfil creado.";
 $a->strings["Profile unavailable to clone."] = "Imposible duplicar el perfil.";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "¿Ocultar tu lista de contactos/amigos en este perfil?";
-$a->strings["Yes"] = "Sí";
-$a->strings["No"] = "No";
 $a->strings["Edit Profile Details"] = "Editar detalles de tu perfil";
 $a->strings["View this profile"] = "Ver este perfil";
 $a->strings["Create a new profile using these settings"] = "¿Crear un nuevo perfil con esta configuración?";
@@ -124,15 +957,19 @@ $a->strings["Region/State:"] = "Región/Estado:";
 $a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\"&hearts;</span> Estado civil:";
 $a->strings["Who: (if applicable)"] = "¿Quién? (si es aplicable)";
 $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Ejemplos: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Since [date]:"] = "Desde [fecha]:";
 $a->strings["Sexual Preference:"] = "Preferencia sexual:";
-$a->strings["Homepage URL:"] = "Dirección de tu página web:";
+$a->strings["Homepage URL:"] = "Dirección de tu página:";
+$a->strings["Hometown:"] = "Ciudad de origen:";
 $a->strings["Political Views:"] = "Ideas políticas:";
-$a->strings["Religious Views:"] = "Creencias religiosas";
+$a->strings["Religious Views:"] = "Creencias religiosas:";
 $a->strings["Public Keywords:"] = "Palabras clave públicas:";
 $a->strings["Private Keywords:"] = "Palabras clave privadas:";
+$a->strings["Likes:"] = "Me gusta:";
+$a->strings["Dislikes:"] = "No me gusta:";
 $a->strings["Example: fishing photography software"] = "Ejemplo: pesca fotografía software";
-$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Utilizado para sugerir amigos potenciales, otros pueden verlo)";
-$a->strings["(Used for searching profiles, never shown to others)"] = "(Utilizado para buscar perfiles, nunca se muestra a otros)";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Utilizadas para sugerir amigos potenciales, otros pueden verlo)";
+$a->strings["(Used for searching profiles, never shown to others)"] = "(Utilizadas para buscar perfiles, nunca se muestra a otros)";
 $a->strings["Tell us about yourself..."] = "Háblanos sobre ti...";
 $a->strings["Hobbies/Interests"] = "Aficiones/Intereses";
 $a->strings["Contact information and Social Networks"] = "Informacioń de contacto y Redes sociales";
@@ -143,767 +980,147 @@ $a->strings["Film/dance/culture/entertainment"] = "Películas/baile/cultura/entr
 $a->strings["Love/romance"] = "Amor/Romance";
 $a->strings["Work/employment"] = "Trabajo/ocupación";
 $a->strings["School/education"] = "Escuela/estudios";
-$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Éste es tu perfil <strong>público</strong>.<br /><strong>Puede</strong> ser visto por cualquiera usando internet.";
+$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Éste es tu perfil <strong>público</strong>.<br /><strong>Puede</strong> ser visto por cualquier usuario de internet.";
 $a->strings["Age: "] = "Edad: ";
 $a->strings["Edit/Manage Profiles"] = "Editar/Administrar perfiles";
-$a->strings["Item not found."] = "Elemento no encontrado.";
-$a->strings["everybody"] = "todos";
-$a->strings["Missing some important data!"] = "¡Faltan algunos datos importantes!";
-$a->strings["Update"] = "Actualizar";
-$a->strings["Failed to connect with email account using the settings provided."] = "Error al conectar con la cuenta de correo mediante la configuración suministrada.";
-$a->strings["Email settings updated."] = "Configuración de correo electrónico actualizada.";
-$a->strings["Passwords do not match. Password unchanged."] = "Las contraseñas no coinciden. La contraseña no ha sido modificada.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "No se permiten contraseñas vacías. La contraseña no ha sido modificada.";
-$a->strings["Password changed."] = "Contraseña modificada.";
-$a->strings["Password update failed. Please try again."] = "La actualización de la contraseña ha fallado. Por favor, prueba otra vez.";
-$a->strings[" Please use a shorter name."] = " Usa un nombre más corto.";
-$a->strings[" Name too short."] = " Nombre demasiado corto.";
-$a->strings[" Not valid email."] = " Correo no válido.";
-$a->strings[" Cannot change to that email."] = " No se puede usar ese correo.";
-$a->strings["Settings updated."] = "Configuración actualizada.";
-$a->strings["Account settings"] = "Configuración de tu cuenta";
-$a->strings["Connector settings"] = "Configuración del conector";
-$a->strings["Plugin settings"] = "Configuración de los módulos";
-$a->strings["Connections"] = "Conexiones";
-$a->strings["Export personal data"] = "Exportación de datos personales";
-$a->strings["Add application"] = "Agregar aplicación";
-$a->strings["Cancel"] = "Cancelar";
-$a->strings["Name"] = "Nombre";
-$a->strings["Consumer Key"] = "Clave consumer";
-$a->strings["Consumer Secret"] = "Secreto consumer";
-$a->strings["Redirect"] = "Redirigir";
-$a->strings["Icon url"] = "Dirección URL del ícono";
-$a->strings["You can't edit this application."] = "No puedes editar esta aplicación.";
-$a->strings["Connected Apps"] = "Aplicaciones conectadas";
-$a->strings["Edit"] = "Editar";
-$a->strings["Delete"] = "Eliminar";
-$a->strings["Client key starts with"] = "Clave de cliente comienza con";
-$a->strings["No name"] = "Sin nombre";
-$a->strings["Remove authorization"] = "Suprimir la autorización";
-$a->strings["No Plugin settings configured"] = "Ningún módulo ha sido configurado";
-$a->strings["Plugin Settings"] = "Configuración de los módulos";
-$a->strings["Built-in support for %s connectivity is %s"] = "El soporte integrado para %s conexión es %s";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["enabled"] = "habilitado";
-$a->strings["disabled"] = "deshabilitado";
-$a->strings["StatusNet"] = "StatusNet";
-$a->strings["Connector Settings"] = "Configuración del conector";
-$a->strings["Email/Mailbox Setup"] = "Configuración del correo/buzón";
-$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Si quieres comunicarte con tus contactos de tu correo usando este servicio (opcional), por favor, especifica cómo conectar con tu buzón.";
-$a->strings["Last successful email check:"] = "Última comprobación del correo con éxito:";
-$a->strings["Email access is disabled on this site."] = "El acceso por correo está deshabilitado en esta web.";
-$a->strings["IMAP server name:"] = "Nombre del servidor IMAP:";
-$a->strings["IMAP port:"] = "Puerto IMAP:";
-$a->strings["Security:"] = "Seguridad:";
-$a->strings["None"] = "Ninguna";
-$a->strings["Email login name:"] = "Nombre de usuario:";
-$a->strings["Email password:"] = "Contraseña:";
-$a->strings["Reply-to address:"] = "Dirección de respuesta:";
-$a->strings["Send public posts to all email contacts:"] = "Enviar publicaciones públicas a todos los contactos de correo:";
-$a->strings["Normal Account"] = "Cuenta normal";
-$a->strings["This account is a normal personal profile"] = "Esta cuenta es el perfil de una persona normal";
-$a->strings["Soapbox Account"] = "Cuenta tribuna";
-$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Aceptar automáticamente todas las peticiones de conexión/amistad como seguidores de solo-lectura";
-$a->strings["Community/Celebrity Account"] = "Cuenta de Sociedad/Celebridad";
-$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Aceptar automáticamente todas las peticiones de conexión/amistad como seguidores de lectura-escritura";
-$a->strings["Automatic Friend Account"] = "Cuenta de amistad automática";
-$a->strings["Automatically approve all connection/friend requests as friends"] = "Aceptar automáticamente todas las solicitudes de conexión/amistad como amigos";
-$a->strings["OpenID:"] = "OpenID";
-$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Opcional) Permitir a este OpenID acceder a esta cuenta.";
-$a->strings["Publish your default profile in your local site directory?"] = "¿Quieres publicar tu perfil predeterminado en el directorio del sitio local?";
-$a->strings["Publish your default profile in the global social directory?"] = "¿Quieres publicar tu perfil predeterminado en el directorio social de forma global?";
-$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "¿Quieres ocultar tu lista de contactos/amigos en la vista de tu perfil predeterminado?";
-$a->strings["Hide profile details and all your messages from unknown viewers?"] = "¿Quieres ocultar los detalles de tu perfil y todos tus mensajes a los desconocidos?";
-$a->strings["Allow friends to post to your profile page?"] = "¿Permitir a los amigos publicar en su página de perfil?";
-$a->strings["Allow friends to tag your posts?"] = "¿Permitir a los amigos etiquetar tus publicaciones?";
-$a->strings["Profile is <strong>not published</strong>."] = "El perfil <strong>no está publicado</strong>.";
-$a->strings["Your Identity Address is"] = "Tu dirección personal es";
-$a->strings["Account Settings"] = "Configuración de la cuenta";
-$a->strings["Password Settings"] = "Configuración de la contraseña";
-$a->strings["New Password:"] = "Contraseña nueva:";
-$a->strings["Confirm:"] = "Confirmar:";
-$a->strings["Leave password fields blank unless changing"] = "Deja la contraseña en blanco si no quieres cambiarla";
-$a->strings["Basic Settings"] = "Configuración básica";
-$a->strings["Full Name:"] = "Nombre completo:";
-$a->strings["Email Address:"] = "Dirección de correo electrónico:";
-$a->strings["Your Timezone:"] = "Zona horaria:";
-$a->strings["Default Post Location:"] = "Localización predeterminada:";
-$a->strings["Use Browser Location:"] = "Usar localización del navegador:";
-$a->strings["Display Theme:"] = "Utilizar tema:";
-$a->strings["Security and Privacy Settings"] = "Configuración de seguridad y privacidad";
-$a->strings["Maximum Friend Requests/Day:"] = "Máximo número de peticiones de amistad por día:";
-$a->strings["(to prevent spam abuse)"] = "(para prevenir el abuso de spam)";
-$a->strings["Default Post Permissions"] = "Permisos por defecto para las publicaciones";
-$a->strings["(click to open/close)"] = "(pulsa para abrir/cerrar)";
-$a->strings["Automatically expire posts after days:"] = "Las publicaciones expiran automáticamente después de (días):";
-$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Si lo dejas vacío no expirarán nunca. Las publicaciones que hayan expirado se borrarán";
-$a->strings["Notification Settings"] = "Configuración de notificaciones";
-$a->strings["Send a notification email when:"] = "Enviar notificación por correo cuando:";
-$a->strings["You receive an introduction"] = "Reciba una presentación";
-$a->strings["Your introductions are confirmed"] = "Mi presentación sea confirmada";
-$a->strings["Someone writes on your profile wall"] = "Alguien escriba en el muro de mi perfil";
-$a->strings["Someone writes a followup comment"] = "Algien escriba en un comentario que sigo ";
-$a->strings["You receive a private message"] = "Reciba un mensaje privado";
-$a->strings["Advanced Page Settings"] = "Configuración avanzada";
-$a->strings["Saved Searches"] = "Búsquedas guardadas";
-$a->strings["Remove term"] = "Eliminar término";
-$a->strings["Public access denied."] = "Acceso público denegado.";
-$a->strings["Search This Site"] = "Buscar en este sitio";
-$a->strings["No results."] = "Sin resultados.";
-$a->strings["Photo Albums"] = "Álbum de Fotos";
-$a->strings["Contact Photos"] = "Foto del contacto";
-$a->strings["Contact information unavailable"] = "Información del contacto no disponible";
-$a->strings["Album not found."] = "Álbum no encontrado.";
-$a->strings["Delete Album"] = "Eliminar álbum";
-$a->strings["Delete Photo"] = "Eliminar foto";
-$a->strings["was tagged in a"] = "ha sido etiquetado en";
-$a->strings["photo"] = "foto";
-$a->strings["by"] = "por";
-$a->strings["Image exceeds size limit of "] = "La imagen supera el limite de tamaño de ";
-$a->strings["Image file is empty."] = "El archivo de imagen está vacío.";
-$a->strings["No photos selected"] = "Ninguna foto seleccionada";
-$a->strings["Access to this item is restricted."] = "El acceso a este elemento está restringido.";
-$a->strings["Upload Photos"] = "Subir fotos";
-$a->strings["New album name: "] = "Nombre del nuevo álbum: ";
-$a->strings["or existing album name: "] = "o nombre de un álbum existente: ";
-$a->strings["Do not show a status post for this upload"] = "No mostrar un mensaje de estado de este envío";
-$a->strings["Permissions"] = "Permisos";
-$a->strings["Edit Album"] = "Modifica álbum";
-$a->strings["View Photo"] = "Ver foto";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Permiso denegado. El acceso a este elemento puede estar restringido.";
-$a->strings["Photo not available"] = "Foto no disponible";
-$a->strings["View photo"] = "Ver foto";
-$a->strings["Edit photo"] = "Modificar foto";
-$a->strings["Use as profile photo"] = "Usar como foto del perfil";
-$a->strings["Private Message"] = "Mensaje privado";
-$a->strings["View Full Size"] = "Ver a tamaño completo";
-$a->strings["Tags: "] = "Etiquetas: ";
-$a->strings["[Remove any tag]"] = "[Borrar todas las etiquetas]";
-$a->strings["New album name"] = "Nuevo nombre del álbum";
-$a->strings["Caption"] = "Título";
-$a->strings["Add a Tag"] = "Añadir una etiqueta";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Ejemplo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
-$a->strings["I like this (toggle)"] = "Me gusta esto (cambiar)";
-$a->strings["I don't like this (toggle)"] = "No me gusta esto (cambiar)";
-$a->strings["Share"] = "Compartir";
-$a->strings["Please wait"] = "Por favor, espere";
-$a->strings["This is you"] = "Eres tú";
-$a->strings["Recent Photos"] = "Fotos recientes";
-$a->strings["Upload New Photos"] = "Subir nuevas fotos";
-$a->strings["View Album"] = "Ver álbum";
-$a->strings["Welcome to Friendika"] = "Bienvenido a Friendika";
-$a->strings["New Member Checklist"] = "Listado de nuevos miembros";
-$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."] = "Nos gustaría ofrecerte algunos trucos y consejos para ayudar a que tu experiencia sea placentera. Pulsa en cualquier elemento para visitar la página adecuada.";
-$a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This will be useful in making friends."] = "En la página de <em>Configuración</em> - cambia la contraseña inicial. Toma nota de tu dirección personal. Te será útil para hacer amigos.";
-$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."] = "Revisa las demás configuraciones, especialmente la configuración de privacidad. Un listado de directorio no publicado es como tener un número de teléfono sin publicar. Normalmente querrás publicar tu listado, a menos que tus amigos y amigos potenciales sepan con ponerse en contacto contigo.";
-$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."] = "Sube una foto para tu perfil si no lo has hecho aún. Los estudios han demostrado que la gente que usa fotos suyas reales tienen diez veces más éxito a la hora de entablar amistad que las que no.";
-$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Autoriza la conexión con Facebook si ya tienes una cuenta en Facebook y nosotros (opcionalmente) importaremos tus amistades y conversaciones desde Facebook.";
-$a->strings["Enter your email access information on your Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Introduce los datos sobre tu dirección de correo en la página de configuración si quieres importar y mantener un contacto con tus amistades o listas de correos desde tu buzón";
-$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."] = "Edita tu perfil <strong>predeterminado</strong> como quieras. Revisa la configuración para ocultar tu lista de amigos o tu perfil a los visitantes desconocidos.";
-$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."] = "Define en tu perfil público algunas palabras que describan tus intereses. Así podremos buscar otras personas con los mismos gustos y sugerirte posibles amigos.";
-$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>Connect</em> dialog."] = "La página de tus Contactos es tu puerta de entrada para manejar tus relaciones de amistad y conectarte con amigos de otras redes sociales. Introduce la dirección de su perfil o dirección web en el campo <em>Conectar</em>.";
-$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."] = "El Directorio te permite encontrar otras personas en esta red o en cualquier otro sitio federado. Busca algún enlace de <em>Conectar</em> o <em>Seguir</em> en su perfil. Proporciona tu direción personal si es necesario.";
-$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 vez que tengas algunos amigos, puedes organizarlos en grupos de conversación privados mediante la barra en tu página de Contactos y luego puedes interactuar con cada grupo por privado desde tu página de Red.";
-$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Puedes consultar nuestra página de <strong>Ayuda</strong> para más ayuda, información y recursos.";
-$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
-$a->strings["Time Conversion"] = "Conversión horária";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas.";
-$a->strings["UTC time: %s"] = "Tiempo UTC: %s";
-$a->strings["Current timezone: %s"] = "Zona horaria actual: %s";
-$a->strings["Converted localtime: %s"] = "Zona horaria local convertida: %s";
-$a->strings["Please select your timezone:"] = "Por favor, seleccione su zona horaria:";
-$a->strings["Item has been removed."] = "El elemento ha sido eliminado.";
-$a->strings["Item not found"] = "Elemento no encontrado";
-$a->strings["Edit post"] = "Editar publicación";
-$a->strings["Post to Email"] = "Publicar mediante correo electrónico";
-$a->strings["Upload photo"] = "Subir foto";
-$a->strings["Attach file"] = "Adjuntar archivo";
-$a->strings["Insert web link"] = "Insertar enlace";
-$a->strings["Insert YouTube video"] = "Insertar video de YouTube";
-$a->strings["Insert Vorbis [.ogg] video"] = "Insertar video Vorbis [.ogg]";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Insertar audio Vorbis [.ogg]";
-$a->strings["Set your location"] = "Configura tu localización";
-$a->strings["Clear browser location"] = "Borrar la localización del navegador";
-$a->strings["Permission settings"] = "Configuración de permisos";
-$a->strings["CC: email addresses"] = "CC: dirección de correo electrónico";
-$a->strings["Public post"] = "Post público";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com";
-$a->strings["%s : Not a valid email address."] = "%s : No es una dirección válida de correo.";
-$a->strings["Please join my network on %s"] = "Por favor únete a mi red social en %s";
+$a->strings["Change profile photo"] = "Cambiar foto del perfil";
+$a->strings["Create New Profile"] = "Crear nuevo perfil";
+$a->strings["Profile Image"] = "Imagen del Perfil";
+$a->strings["visible to everybody"] = "Visible para todos";
+$a->strings["Edit visibility"] = "Editar visibilidad";
+$a->strings["Save to Folder:"] = "Guardar en directorio:";
+$a->strings["- select -"] = "- seleccionar -";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado el %3\$s de %2\$s con %4\$s";
+$a->strings["No potential page delegates located."] = "No se han localizado delegados potenciales de la página.";
+$a->strings["Delegate Page Management"] = "Delegar la administración de la página";
+$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."] = "Los delegados tienen la capacidad de gestionar todos los aspectos de esta cuenta/página, excepto los ajustes básicos de la cuenta. Por favor, no delegues tu cuenta personal a nadie en quien no confíes completamente.";
+$a->strings["Existing Page Managers"] = "Administradores actuales de la página";
+$a->strings["Existing Page Delegates"] = "Delegados actuales de la página";
+$a->strings["Potential Delegates"] = "Delegados potenciales";
+$a->strings["Add"] = "Añadir";
+$a->strings["No entries."] = "Sin entradas.";
+$a->strings["Source (bbcode) text:"] = "Texto fuente (bbcode):";
+$a->strings["Source (Diaspora) text to convert to BBcode:"] = "Fuente (Diaspora) para pasar a BBcode:";
+$a->strings["Source input: "] = "Entrada: ";
+$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): "] = "Fuente (formato Diaspora): ";
+$a->strings["diaspora2bb: "] = "diaspora2bb: ";
+$a->strings["Friend Suggestions"] = "Sugerencias de amigos";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas.";
+$a->strings["Ignore/Hide"] = "Ignorar/Ocultar";
+$a->strings["Global Directory"] = "Directorio global";
+$a->strings["Find on this site"] = "Buscar en este sitio";
+$a->strings["Site Directory"] = "Directorio del sitio";
+$a->strings["Gender: "] = "Género:";
+$a->strings["Gender:"] = "Género:";
+$a->strings["Status:"] = "Estado:";
+$a->strings["Homepage:"] = "Página de inicio:";
+$a->strings["About:"] = "Acerca de:";
+$a->strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas pueden que estén ocultas).";
+$a->strings["%s : Not a valid email address."] = "%s : No es una dirección de correo válida.";
+$a->strings["Please join us on Friendica"] = "Únete a nosotros en Friendica";
 $a->strings["%s : Message delivery failed."] = "%s : Ha fallado la entrega del mensaje.";
 $a->strings["%d message sent."] = array(
 	0 => "%d mensaje enviado.",
 	1 => "%d mensajes enviados.",
 );
 $a->strings["You have no more invitations available"] = "No tienes más invitaciones 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 para ver una lista de servidores públicos donde puedes darte de alta. Los miembros de otros servidores de Friendica pueden conectarse entre ellos, así como con miembros de otras redes sociales diferentes.";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Para aceptar la invitación visita y regístrate en %s o en cualquier otro servidor público de 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."] = "Los servidores de Friendica están interconectados para crear una enorme red social centrada en la privacidad y controlada por sus miembros. También se puede conectar con muchas redes sociales tradicionales. Mira en %s para poder ver un listado de servidores alternativos de Friendica donde puedes darte de alta.";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Discúlpanos. Este sistema no está configurado actualmente para conectar con otros servidores públicos o invitar nuevos miembros.";
 $a->strings["Send invitations"] = "Enviar invitaciones";
 $a->strings["Enter email addresses, one per line:"] = "Introduce las direcciones de correo, una por línea:";
-$a->strings["Your message:"] = "Tu mensaje:";
-$a->strings["Please join my social network on %s"] = "Únete a mi red social en % s";
-$a->strings["To accept this invitation, please visit:"] = "Para aceptar esta invitación, por favor visita:";
+$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 cordialmente invitado a unirte a mi y a otros amigos en Friendica, creemos juntos una red social mejor.";
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "Tienes que proporcionar el siguiente código: \$invite_code";
 $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Una vez registrado, por favor contacta conmigo a través de mi página de perfil en:";
-$a->strings["{0} wants to be your friend"] = "{0} quiere ser tu amigo";
-$a->strings["{0} sent you a message"] = "{0} le ha enviado un mensaje";
-$a->strings["{0} requested registration"] = "{0} solicitudes de registro";
-$a->strings["{0} commented %s's post"] = "{0} comentó el post de %s";
-$a->strings["{0} liked %s's post"] = "A {0} le ha gustado el post de %s";
-$a->strings["{0} disliked %s's post"] = "A {0} no le ha gustado el post de %s";
-$a->strings["{0} is now friends with %s"] = "{0} ahora es amigo de %s";
-$a->strings["{0} posted"] = "{0} publicado";
-$a->strings["{0} tagged %s's post with #%s"] = "{0} etiquetó la publicación de %s como #%s";
-$a->strings["Could not access contact record."] = "No se pudo acceder a los datos del contacto.";
-$a->strings["Could not locate selected profile."] = "No se pudo encontrar el perfil seleccionado.";
-$a->strings["Contact updated."] = "Contacto actualizado.";
-$a->strings["Failed to update contact record."] = "Error al actualizar el contacto.";
-$a->strings["Contact has been blocked"] = "El contacto ha sido bloqueado";
-$a->strings["Contact has been unblocked"] = "El contacto ha sido desbloqueado";
-$a->strings["Contact has been ignored"] = "El contacto ha sido ignorado";
-$a->strings["Contact has been unignored"] = "El contacto ya no está ignorado";
-$a->strings["stopped following"] = "dejó de seguir";
-$a->strings["Contact has been removed."] = "El contacto ha sido eliminado";
-$a->strings["You are mutual friends with %s"] = "Ahora tiene una amistad mutua con %s";
-$a->strings["You are sharing with %s"] = "Usted está compartiendo con %s";
-$a->strings["%s is sharing with you"] = "%s está compartiendo con usted";
-$a->strings["Private communications are not available for this contact."] = "Las comunicaciones privadas no está disponibles para este contacto.";
-$a->strings["Never"] = "Nunca";
-$a->strings["(Update was successful)"] = "(La actualización se ha completado)";
-$a->strings["(Update was not successful)"] = "(La actualización no se ha completado)";
-$a->strings["Suggest friends"] = "Sugerir amigos";
-$a->strings["Network type: %s"] = "Tipo de red: %s";
-$a->strings["%d contact in common"] = array(
-	0 => "%d contacto en común",
-	1 => "%d contactos en común",
-);
-$a->strings["View all contacts"] = "Ver todos los contactos";
-$a->strings["Unblock"] = "Desbloquear";
-$a->strings["Block"] = "Bloquear";
-$a->strings["Unignore"] = "Quitar de Ignorados";
-$a->strings["Ignore"] = "Ignorar";
-$a->strings["Repair"] = "Reparar";
-$a->strings["Contact Editor"] = "Editor de contactos";
-$a->strings["Profile Visibility"] = "Visibilidad del Perfil";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor selecciona el perfil que quieras mostrar a %s cuando esté viendo  tu perfil de forma segura.";
-$a->strings["Contact Information / Notes"] = "Información del Contacto / Notas";
-$a->strings["Edit contact notes"] = "Editar notas de contacto";
-$a->strings["Visit %s's profile [%s]"] = "Ver el perfil de %s [%s]";
-$a->strings["Block/Unblock contact"] = "Boquear/Desbloquear contacto";
-$a->strings["Ignore contact"] = "Ignorar contacto";
-$a->strings["Repair URL settings"] = "Configuración de URL de reparación";
-$a->strings["View conversations"] = "Ver conversaciones";
-$a->strings["Delete contact"] = "Eliminar contacto";
-$a->strings["Last update:"] = "Última actualización:";
-$a->strings["Update public posts"] = "Actualizar posts públicos";
-$a->strings["Update now"] = "Actualizar ahora";
-$a->strings["Currently blocked"] = "Bloqueados";
-$a->strings["Currently ignored"] = "Ignorados";
-$a->strings["Contacts"] = "Contactos";
-$a->strings["Show Blocked Connections"] = "Mostrar conexiones bloqueadas";
-$a->strings["Hide Blocked Connections"] = "Esconder conexiones bloqueadas";
-$a->strings["Search your contacts"] = "Buscar tus contactos";
-$a->strings["Finding: "] = "Buscando: ";
-$a->strings["Find"] = "Buscar";
-$a->strings["Mutual Friendship"] = "Amistad recíproca";
-$a->strings["is a fan of yours"] = "es tu fan";
-$a->strings["you are a fan of"] = "eres fan de";
-$a->strings["Edit contact"] = "Modificar contacto";
-$a->strings["Remote privacy information not available."] = "Información sobre privacidad remota no disponible.";
-$a->strings["Visible to:"] = "Visible para:";
-$a->strings["An invitation is required."] = "Se necesita invitación.";
-$a->strings["Invitation could not be verified."] = "No se puede verificar la invitación.";
-$a->strings["Invalid OpenID url"] = "Dirección OpenID no válida";
-$a->strings["Please enter the required information."] = "Por favor, introduce la información necesaria.";
-$a->strings["Please use a shorter name."] = "Por favor, usa un nombre más corto.";
-$a->strings["Name too short."] = "El nombre es demasiado corto.";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "No parece que ese sea tu nombre completo.";
-$a->strings["Your email domain is not among those allowed on this site."] = "Tu dominio de correo electrónico no se encuentra entre los permitidos en este sitio.";
-$a->strings["Not a valid email address."] = "No es una dirección de correo electrónico válida.";
-$a->strings["Cannot use that email."] = "No se puede utilizar este correo electrónico.";
-$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Tu \"apodo\" solo puede contener \"a-z\", \"0-9\", \"-\", y \"_\", y también debe empezar por una letra.";
-$a->strings["Nickname is already registered. Please choose another."] = "Apodo ya registrado. Por favor, elije otro.";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERROR GRAVE: La generación de claves de seguridad ha fallado.";
-$a->strings["An error occurred during registration. Please try again."] = "Se produjo un error durante el registro. Por favor, inténtalo de nuevo.";
-$a->strings["An error occurred creating your default profile. Please try again."] = "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo.";
-$a->strings["Registration successful. Please check your email for further instructions."] = "Te has registrado con éxito. Por favor, consulta tu correo electrónico para obtener instrucciones adicionales.";
-$a->strings["Failed to send email message. Here is the message that failed."] = "Error al enviar el mensaje de correo electrónico. Este es el mensaje no enviado.";
-$a->strings["Your registration can not be processed."] = "Tu registro no se puede procesar.";
-$a->strings["Registration request at %s"] = "Solicitud de registro en %s";
-$a->strings["Your registration is pending approval by the site owner."] = "Tu registro está pendiente de aprobación por el propietario del sitio.";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Puedes (opcionalmente) rellenar este formulario a través de OpenID mediante el suministro de tu OpenID y pulsando en 'Registrar'.";
-$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si no estás familiarizado con OpenID, por favor deja ese campo en blanco y rellena el resto de los elementos.";
-$a->strings["Your OpenID (optional): "] = "Tu OpenID (opcional):";
-$a->strings["Include your profile in member directory?"] = "¿Incluir tu perfil en el directorio de miembros?";
-$a->strings["Membership on this site is by invitation only."] = "Sitio solo accesible mediante invitación.";
-$a->strings["Your invitation ID: "] = "ID de tu invitación: ";
-$a->strings["Registration"] = "Registro";
-$a->strings["Your Full Name (e.g. Joe Smith): "] = "Tu nombre completo (por ejemplo, Pepe Pulido):";
-$a->strings["Your Email Address: "] = "Tu dirección de correo electrónico:";
-$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>'."] = "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este sitio va a ser '<strong>apodo@\$sitename</strong>'.";
-$a->strings["Choose a nickname: "] = "Escoge un apodo: ";
-$a->strings["Post successful."] = "¡Publicado!";
-$a->strings["Friends of %s"] = "Amigos de %s";
-$a->strings["No friends to display."] = "No hay amigos para mostrar.";
-$a->strings["Help:"] = "Ayuda:";
-$a->strings["Help"] = "Ayuda";
-$a->strings["Could not create/connect to database."] = "No se pudo crear o conectarse a la base de datos.";
-$a->strings["Connected to database."] = "Conectado a la base de datos.";
-$a->strings["Proceed with Installation"] = "Procediendo con la instalación";
-$a->strings["Your Friendika site database has been installed."] = "La base de datos de Friendila ha sido instalada.";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el encuestador";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Por favor, consulte el archivo \"INSTALL.txt\".";
-$a->strings["Proceed to registration"] = "Procediendo con el registro";
-$a->strings["Database import failed."] = "La importación de la base de datos ha fallado.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Puede que tenga que importar el archivo \"Database.sql\" manualmente usando phpmyadmin o mysql.";
-$a->strings["Welcome to Friendika."] = "Bienvenido a Friendika.";
-$a->strings["Friendika Social Network"] = "Friendika Red Social";
-$a->strings["Installation"] = "Instalación";
-$a->strings["In order to install Friendika we need to know how to connect to your database."] = "Para proceder a la instalación de Friendika es necesario saber cómo conectar con tu base de datos.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Por favor contacta con tu proveedor de servicios o el administrador de lapágina si tienes alguna pregunta sobre estas cofiguraciones";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de datos que especifiques a continuación ya debería existir. Si no es el caso, debes crearla antes de continuar.";
-$a->strings["Database Server Name"] = "Nombre del servidor de la base de datos";
-$a->strings["Database Login Name"] = "Usuario de la base de datos";
-$a->strings["Database Login Password"] = "Contraseña de la base de datos";
-$a->strings["Database Name"] = "Nombre de la base de datos";
-$a->strings["Please select a default timezone for your website"] = "Por favor selecciona la zona horaria predeterminada para tu web";
-$a->strings["Site administrator email address. Your account email address must match this in order to use the web admin panel."] = "Dirección de correo electrónico del administrador. La dirección de correo electrónico de tu cuenta debe cotejar esto para poder acceder al panel de administración.";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No se pudo encontrar una versión de línea de comandos de PHP en la ruta del servidor web.";
-$a->strings["This is required. Please adjust the configuration file .htconfig.php accordingly."] = "Esto es necesario. Por favor, modifica el archivo de configuración. htconfig.php en consecuencia.";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versión en línea de comandos de PHP en tu sistema no tiene \"register_argc_argv\" habilitado.";
-$a->strings["This is required for message delivery to work."] = "Esto es necesario para el funcionamiento de la entrega de mensajes.";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error:  La función \"openssl_pkey_new\" en este sistema no es capaz de generar claves de cifrado";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si se ejecuta en Windows, por favor consulte la sección \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: El módulo servidor web Apache mod-rewrite es necesario pero no está instalado.";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Error: El módulo libcurl PHP es necesario, pero no está instalado.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: El módulo de gráficos GD de PHP con soporte JPEG es necesario, pero no está instalado.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Error: El módulo openssl PHP es necesario, pero  no está instalado.";
-$a->strings["Error: mysqli PHP module required but not installed."] = "Error: El módulo PHP mysqli es necesario, pero no está instalado.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Error: El módulo mb_string HPH es necesario, pero no está instalado.";
-$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."] = "El programa de instalación web necesita ser capaz de crear un archivo llamado \". htconfig.php\" en la carpeta superior de tu servidor web y es incapaz de hacerlo.";
-$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."] = "Esto es muy a menudo una configuración de permisos, pues el servidor web puede que no sea capaz de escribir archivos en la carpeta - incluso si tu puedes.";
-$a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Por favor, consulta el sitio de documentación o al soporte técnico para ver si esta situación se puede corregir.";
-$a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Si no, deberás proceder con la instalación manual. Por favor, consulta el archivo \"INSTALL.txt\"para obtener instrucciones.";
-$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."] = "El archivo de configuración de base de datos \". htconfig.php\" No se pudo escribir. Por favor, utiliza el texto adjunto para crear un archivo de configuración en la raíz de tu servidor web.";
-$a->strings["Errors encountered creating database tables."] = "Errores encontrados creando las tablas de bases de datos.";
-$a->strings["Commented Order"] = "Orden de comentarios";
-$a->strings["Posted Order"] = "Orden de publicación";
-$a->strings["New"] = "Nuevo";
-$a->strings["Starred"] = "Favoritos";
-$a->strings["Bookmarks"] = "Marcadores";
-$a->strings["Warning: This group contains %s member from an insecure network."] = array(
-	0 => "Aviso: este grupo contiene %s contacto con conexión no segura.",
-	1 => "Aviso: este grupo contiene %s contactos con conexiones no seguras.",
-);
-$a->strings["Private messages to this group are at risk of public disclosure."] = "Los mensajes privados a este grupo corren el riesgo de ser mostrados públicamente.";
-$a->strings["No such group"] = "Ningún grupo";
-$a->strings["Group is empty"] = "El grupo está vacío";
-$a->strings["Group: "] = "Grupo: ";
-$a->strings["Contact: "] = "Contacto: ";
-$a->strings["Private messages to this person are at risk of public disclosure."] = "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente.";
-$a->strings["Invalid contact."] = "Contacto erróneo.";
-$a->strings["Invalid profile identifier."] = "Identificador de perfil no válido.";
-$a->strings["Profile Visibility Editor"] = "Editor de visibilidad del perfil";
-$a->strings["Click on a contact to add or remove."] = "Pulsa en un contacto para añadirlo o eliminarlo.";
-$a->strings["Visible To"] = "Visible para";
-$a->strings["All Contacts (with secure profile access)"] = "Todos los contactos (con perfil de acceso seguro)";
-$a->strings["Event description and start time are required."] = "Se requiere una descripción del evento y la hora de inicio.";
-$a->strings["Create New Event"] = "Crea un evento nuevo";
-$a->strings["Previous"] = "Previo";
-$a->strings["Next"] = "Siguiente";
-$a->strings["l, F j"] = "l, F j";
-$a->strings["Edit event"] = "Editar evento";
-$a->strings["link to source"] = "Enlace al original";
-$a->strings["hour:minute"] = "hora:minuto";
-$a->strings["Event details"] = "Detalles del evento";
-$a->strings["Format is %s %s. Starting date and Description are required."] = "El formato es %s %s. Se requiere una fecha de inicio y una descripción.";
-$a->strings["Event Starts:"] = "Inicio del evento:";
-$a->strings["Finish date/time is not known or not relevant"] = "La fecha/hora de finalización no es conocida o es irrelevante.";
-$a->strings["Event Finishes:"] = "Finalización del evento:";
-$a->strings["Adjust for viewer timezone"] = "Ajuste de zona horaria";
-$a->strings["Description:"] = "Descripción:";
-$a->strings["Share this event"] = "Comparte este evento";
-$a->strings["Invalid request identifier."] = "Solicitud de identificación no válida.";
-$a->strings["Discard"] = "Descartar";
-$a->strings["Network"] = "Red";
-$a->strings["Home"] = "Inicio";
-$a->strings["Introductions"] = "Introducciones";
-$a->strings["Messages"] = "Mensajes";
-$a->strings["Show Ignored Requests"] = "Mostrar peticiones ignoradas";
-$a->strings["Hide Ignored Requests"] = "Ocultar peticiones ignoradas";
-$a->strings["Notification type: "] = "Tipo de notificación: ";
-$a->strings["Friend Suggestion"] = "Propuestas de amistad";
-$a->strings["suggested by %s"] = "sugerido por %s";
-$a->strings["Approve"] = "Aprobar";
-$a->strings["Claims to be known to you: "] = "Dice conocerte:";
-$a->strings["yes"] = "sí";
-$a->strings["no"] = "no";
-$a->strings["Approve as: "] = "Aprobar como:";
-$a->strings["Friend"] = "Amigo";
-$a->strings["Sharer"] = "Partícipe";
-$a->strings["Fan/Admirer"] = "Fan/Admirador";
-$a->strings["Friend/Connect Request"] = "Solicitud de Amistad/Conexión";
-$a->strings["New Follower"] = "Nuevo seguidor";
-$a->strings["No notifications."] = "Ninguna notificación.";
-$a->strings["Notifications"] = "Notificaciones";
-$a->strings["%s liked %s's post"] = "A %s le gusta el post de %s";
-$a->strings["%s disliked %s's post"] = "A %s no le gusta el post de %s";
-$a->strings["%s is now friends with %s"] = "%s es ahora es amigo de %s";
-$a->strings["%s created a new post"] = "%s creó un nuevo post";
-$a->strings["%s commented on %s's post"] = "%s comentó en el post de %s";
-$a->strings["Nothing new!"] = "¡Nada nuevo!";
-$a->strings["Contact settings applied."] = "Contacto configurado con éxito";
-$a->strings["Contact update failed."] = "Error al actualizar el Contacto";
-$a->strings["Contact not found."] = "Contacto no encontrado.";
-$a->strings["Repair Contact Settings"] = "Reparar la configuración del Contacto";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ADVERTENCIA: Esto es muy avanzado</strong> y si se introduce información incorrecta su conexión con este contacto puede dejar de funcionar.";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Por favor usa el botón 'Atás' de tu navegador <strong>ahora</strong> si no tienes claro qué hacer en esta página.";
-$a->strings["Account Nickname"] = "Apodo de la cuenta";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@Etiqueta - Sobrescribe el Nombre/Apodo";
-$a->strings["Account URL"] = "Dirección de la cuenta";
-$a->strings["Friend Request URL"] = "Dirección de la solicitud de amistad";
-$a->strings["Friend Confirm URL"] = "Dirección de confirmación de tu amigo ";
-$a->strings["Notification Endpoint URL"] = "Dirección URL de la notificación";
-$a->strings["Poll/Feed URL"] = "Dirección de la Encuesta/Fuentes";
-$a->strings["New photo from this URL"] = "Nueva foto de esta dirección URL";
-$a->strings["This introduction has already been accepted."] = "Esta presentación ya ha sido aceptada.";
-$a->strings["Profile location is not valid or does not contain profile information."] = "La ubicación del perfil no es válida o no contiene la información del perfil.";
-$a->strings["Warning: profile location has no identifiable owner name."] = "Aviso: La ubicación del perfil no tiene un nombre de propietario identificable.";
-$a->strings["Warning: profile location has no profile photo."] = "Aviso: la ubicación del perfil no tiene foto de perfil.";
-$a->strings["%d required parameter was not found at the given location"] = array(
-	0 => "% d parámetro requerido no se encontró en el lugar determinado",
-	1 => "% d parámetros requeridos no se encontraron en el lugar determinado",
-);
-$a->strings["Introduction complete."] = "Presentación completa.";
-$a->strings["Unrecoverable protocol error."] = "Error de protocolo irrecuperable.";
-$a->strings["Profile unavailable."] = "Perfil no disponible.";
-$a->strings["%s has received too many connection requests today."] = "% s ha recibido demasiadas solicitudes de conexión hoy.";
-$a->strings["Spam protection measures have been invoked."] = "Han sido activadas las medidas de protección contra spam.";
-$a->strings["Friends are advised to please try again in 24 hours."] = "Tus amigos serán avisados para que lo intenten de nuevo pasadas 24 horas.";
-$a->strings["Invalid locator"] = "Localizador no válido";
-$a->strings["Unable to resolve your name at the provided location."] = "No se ha podido resolver tu nombre en la ubicación indicada.";
-$a->strings["You have already introduced yourself here."] = "Ya te has presentado aquí.";
-$a->strings["Apparently you are already friends with %s."] = "Al parecer, ya eres amigo de %s.";
-$a->strings["Invalid profile URL."] = "Dirección de perfil no válida.";
-$a->strings["Your introduction has been sent."] = "Su presentación ha sido enviada.";
-$a->strings["Please login to confirm introduction."] = "Inicia sesión para confirmar la presentación.";
-$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Sesión iniciada con la identificación incorrecta. Entra en <strong>este</strong> perfil.";
-$a->strings["Welcome home %s."] = "Bienvenido %s";
-$a->strings["Please confirm your introduction/connection request to %s."] = "Por favor, confirma tu solicitud de presentación/conexión con %s.";
-$a->strings["Confirm"] = "Confirmar";
-$a->strings["[Name Withheld]"] = "[Nombre oculto]";
-$a->strings["Introduction received at "] = "Presentación recibida en";
-$a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = "Usuarios de Diaspora*: por favor no utilice este formulario. En su lugar, escriba \"%s\" en la barra de búsqueda de Diaspora*.";
-$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Por favor introduce la dirección de tu perfil para una de las siguientes redes sociales soportadas:";
-$a->strings["Friend/Connection Request"] = "Solicitud de Amistad/Conexión";
-$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Ejemplos: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
-$a->strings["Please answer the following:"] = "Por favor responda lo siguiente:";
-$a->strings["Does %s know you?"] = "¿%s te conoce?";
-$a->strings["Add a personal note:"] = "Agregar una nota personal:";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
-$a->strings["- please share from your own site as noted above"] = "- Por favor comparta desde tu propio sitio como se ha señalado";
-$a->strings["Your Identity Address:"] = "Dirección de tu perfil:";
-$a->strings["Submit Request"] = "Enviar solicitud";
-$a->strings["Authorize application connection"] = "Autorizar la conexión de la aplicación";
-$a->strings["Return to your app and insert this Securty Code:"] = "Regrese a su aplicación e inserte este código de seguridad:";
-$a->strings["Please login to continue."] = "Inicia sesión para continuar.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "¿Quiere autorizar a esta aplicación el acceso a sus mensajes y contactos, y/o crear nuevas publicaciones para usted?";
-$a->strings["status"] = "estado";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s etiquetados %2\$s %3\$s con %4\$s";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s gusta %3\$s de %2\$s";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no gusta %3\$s de %2\$s";
-$a->strings["No valid account found."] = "No se ha encontrado ninguna cuenta válida";
-$a->strings["Password reset request issued. Check your email."] = "Solicitud de restablecimiento de contraseña enviada. Revisa tu correo electrónico.";
-$a->strings["Password reset requested at %s"] = "Contraseña restablecida enviada a %s";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La solicitud no puede ser verificada (deberías haberla proporcionado antes). Falló el restablecimiento de la contraseña.";
-$a->strings["Your password has been reset as requested."] = "Tu contraseña ha sido restablecida como solicitaste.";
-$a->strings["Your new password is"] = "Tu nueva contraseña es";
-$a->strings["Save or copy your new password - and then"] = "Guarda o copia tu nueva contraseña - y luego";
-$a->strings["click here to login"] = "pulsa aquí para acceder";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puedes cambiar tu contraseña desde la página de <em>Configuración</em> después de acceder con éxito.";
-$a->strings["Forgot your Password?"] = "¿Olvidaste tu contraseña?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introduce tu correo electrónico para restablecer tu contraseña. Luego comprueba tu correo para las instrucciones adicionales.";
-$a->strings["Nickname or Email: "] = "Apodo o Correo electrónico: ";
-$a->strings["Reset"] = "Restablecer";
-$a->strings["This is Friendica, version"] = "Esto es Friendica, versión";
-$a->strings["running at web location"] = "ejecutándose en la dirección web";
-$a->strings["Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</a> to learn more about the Friendica project."] = "Por favor, visite <a href=\"http://project.friendika.com\">Project.Friendika.com</a> para saber más sobre el proyecto Friendica.";
-$a->strings["Bug reports and issues: please visit"] = "Reporte de fallos y bugs: por favor visita";
-$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Sugerencias, elogios, donaciones, etc - por favor mande un email a Info arroba Friendica punto com";
-$a->strings["Installed plugins/addons/apps"] = "Módulos/extensiones/programas instalados";
-$a->strings["No installed plugins/addons/apps"] = "Módulos/extensiones/programas no instalados";
-$a->strings["Remove My Account"] = "Eliminar mi cuenta";
-$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Esto eliminará por completo tu cuenta. Una vez hecho esto no se puede deshacer.";
-$a->strings["Please enter your password for verification:"] = "Por favor, introduce tu contraseña para la verificación:";
-$a->strings["Applications"] = "Aplicaciones";
-$a->strings["No installed applications."] = "Sin aplicaciones";
-$a->strings["Save"] = "Guardar";
-$a->strings["Friend suggestion sent."] = "Solicitud de amistad enviada.";
-$a->strings["Suggest Friends"] = "Sugerencias de amistad";
-$a->strings["Suggest a friend for %s"] = "Recomienda un amigo a %s";
-$a->strings["Access denied."] = "Acceso denegado.";
-$a->strings["Global Directory"] = "Directorio global";
-$a->strings["Normal site view"] = "Vista normal";
-$a->strings["Admin - View all site entries"] = "Administrador - Ver todas las entradas del sitio";
-$a->strings["Find on this site"] = "Buscar en este sitio";
-$a->strings["Site Directory"] = "Directorio del sitio";
-$a->strings["Gender: "] = "Género:";
-$a->strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas pueden que estén ocultas).";
-$a->strings["Site"] = "Sitio";
-$a->strings["Users"] = "Usuarios";
-$a->strings["Plugins"] = "Módulos";
-$a->strings["Logs"] = "Registros";
-$a->strings["User registrations waiting for confirmation"] = "Registro de usuarios esperando la confirmación";
-$a->strings["Administration"] = "Administración";
-$a->strings["Summary"] = "Resumen";
-$a->strings["Registered users"] = "Usuarios registrados";
-$a->strings["Pending registrations"] = "Pendientes de registro";
-$a->strings["Version"] = "Versión";
-$a->strings["Active plugins"] = "Módulos activos";
-$a->strings["Site settings updated."] = "Configuración de actualización de sitio";
-$a->strings["Closed"] = "Cerrado";
-$a->strings["Requires approval"] = "Requiere aprovación";
-$a->strings["Open"] = "Abierto";
-$a->strings["File upload"] = "Subida de archivo";
-$a->strings["Policies"] = "Políticas";
-$a->strings["Advanced"] = "Avanzado";
-$a->strings["Site name"] = "Nombre del sitio";
-$a->strings["Banner/Logo"] = "Banner/Logo";
-$a->strings["System language"] = "Idioma";
-$a->strings["System theme"] = "Tema";
-$a->strings["Maximum image size"] = "Tamaño máximo de la imagen";
-$a->strings["Register policy"] = "Política de registros";
-$a->strings["Register text"] = "Términos";
-$a->strings["Accounts abandoned after x days"] = "Cuentas abandonadas después de x días";
-$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creando encuestas desde sitios externos para cuentas abandonadas. Introduzca 0 para ningún límite temporal.";
-$a->strings["Allowed friend domains"] = "Dominios amigos permitidos";
-$a->strings["Allowed email domains"] = "Dominios de correo permitidos";
-$a->strings["Block public"] = "Bloqueo público";
-$a->strings["Force publish"] = "Forzar publicación";
-$a->strings["Global directory update URL"] = "Dirección de actualización del directorio global";
-$a->strings["Block multiple registrations"] = "Bloquear multiples registros";
-$a->strings["OpenID support"] = "Soporte OpenID";
-$a->strings["Gravatar support"] = "Soporte Gravatar";
-$a->strings["Fullname check"] = "Comprobar Nombre completo";
-$a->strings["UTF-8 Regular expressions"] = "Expresiones regulares UTF-8";
-$a->strings["Show Community Page"] = "Ver página de la Comunidad";
-$a->strings["Enable OStatus support"] = "Permitir soporte OStatus";
-$a->strings["Enable Diaspora support"] = "Habilitar el soporte para Diaspora*";
-$a->strings["Only allow Friendika contacts"] = "Permitir solo contactos de Friendika";
-$a->strings["Verify SSL"] = "Verificar SSL";
-$a->strings["Proxy user"] = "Usuario proxy";
-$a->strings["Proxy URL"] = "Dirección proxy";
-$a->strings["Network timeout"] = "Tiempo de espera de red";
-$a->strings["%s user blocked"] = array(
-	0 => "%s usuario bloqueado",
-	1 => "%s usuarios bloqueados",
-);
-$a->strings["%s user deleted"] = array(
-	0 => "%s usuario eliminado",
-	1 => "%s usuarios eliminados",
-);
-$a->strings["User '%s' deleted"] = "Usuario '%s' eliminado'";
-$a->strings["User '%s' unblocked"] = "Usuario '%s' desbloqueado";
-$a->strings["User '%s' blocked"] = "Usuario '%s' bloqueado'";
-$a->strings["select all"] = "seleccionar todo";
-$a->strings["User registrations waiting for confirm"] = "Registro de usuario esperando confirmación";
-$a->strings["Request date"] = "Solicitud de fecha";
-$a->strings["Email"] = "Correo electrónico";
-$a->strings["No registrations."] = "Ningún registro.";
-$a->strings["Deny"] = "Denegado";
-$a->strings["Register date"] = "Fecha de registro";
-$a->strings["Last login"] = "Último acceso";
-$a->strings["Last item"] = "Último elemento";
-$a->strings["Account"] = "Cuenta";
-$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "¡Los usuarios seleccionados serán eliminados!\\n\\n¡Todo lo que hayan publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?";
-$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?"] = "¡El usuario {0} será eliminado!\\n\\n¡Todo lo que haya publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?";
-$a->strings["Plugin %s disabled."] = "Módulo %s deshabilitado.";
-$a->strings["Plugin %s enabled."] = "Módulo %s habilitado.";
-$a->strings["Disable"] = "Inhabilitado";
-$a->strings["Enable"] = "Habilitado";
-$a->strings["Toggle"] = "Activar";
-$a->strings["Settings"] = "Configuraciones";
-$a->strings["Log settings updated."] = "Registro de los parámetros de actualización";
-$a->strings["Clear"] = "Limpiar";
-$a->strings["Debugging"] = "Depuración";
-$a->strings["Log file"] = "Archivo de registro";
-$a->strings["Must be writable by web server. Relative to your Friendika index.php."] = "Debes permitirle la escritura al servidor web. Relacionado con Friendika index.php";
-$a->strings["Log level"] = "Nivel de registro";
-$a->strings["Close"] = "Cerrado";
-$a->strings["FTP Host"] = "Host FTP";
-$a->strings["FTP Path"] = "Ruta FTP";
-$a->strings["FTP User"] = "Usuario FTP";
-$a->strings["FTP Password"] = "Contraseña FTP";
-$a->strings["Unable to locate original post."] = "No se puede encontrar la publicación original.";
-$a->strings["Empty post discarded."] = "Publicación vacía descartada.";
-$a->strings["noreply"] = "no responder";
-$a->strings["Administrator@"] = "Administrador@";
-$a->strings["%s commented on an item at %s"] = "%s ha commentato un elemento en %s";
-$a->strings["%s posted to your profile wall at %s"] = "%s ha publicado en tu muro a las %s";
-$a->strings["System error. Post not saved."] = "Error del sistema. Mensaje no guardado.";
-$a->strings["This message was sent to you by %s, a member of the Friendika social network."] = "Este mensaje te ha sido enviado por %s, un miembro de la red social Friendika.";
-$a->strings["You may visit them online at %s"] = "Los puedes visitar en línea en %s";
-$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Por favor contacta con el remitente respondiendo a este mensaje si no deseas recibir estos mensajes.";
-$a->strings["%s posted an update."] = "%s ha publicado una actualización.";
-$a->strings["Tag removed"] = "Etiqueta eliminada";
-$a->strings["Remove Item Tag"] = "Eliminar etiqueta del elemento";
-$a->strings["Select a tag to remove: "] = "Seleccione una etiqueta para eliminar:";
-$a->strings["Remove"] = "Eliminar";
-$a->strings["No recipient selected."] = "Ningún destinatario seleccionado";
-$a->strings["Unable to locate contact information."] = "No se puede encontrar información del contacto.";
-$a->strings["Message could not be sent."] = "El mensaje no ha podido ser enviado.";
-$a->strings["Message sent."] = "Mensaje enviado.";
-$a->strings["Inbox"] = "Entrada";
-$a->strings["Outbox"] = "Enviados";
-$a->strings["New Message"] = "Nuevo mensaje";
-$a->strings["Message deleted."] = "Mensaje eliminado.";
-$a->strings["Conversation removed."] = "Conversación eliminada.";
-$a->strings["Please enter a link URL:"] = "Introduce la dirección del enlace:";
-$a->strings["Send Private Message"] = "Enviar mensaje privado";
-$a->strings["To:"] = "Para:";
-$a->strings["Subject:"] = "Asunto:";
-$a->strings["No messages."] = "No hay mensajes.";
-$a->strings["Delete conversation"] = "Eliminar conversación";
-$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
-$a->strings["Message not available."] = "Mensaje no disponibile.";
-$a->strings["Delete message"] = "Borrar mensaje";
-$a->strings["Send Reply"] = "Enviar respuesta";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Para más información sobre el Proyecto Friendica y sobre por qué pensamos que es algo importante, visita http://friendica.com";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Esto puede ocurrir a veces si la conexión fue solicitada por ambas personas y ya hubiera sido aprobada.";
 $a->strings["Response from remote site was not understood."] = "La respuesta desde el sitio remoto no ha sido entendida.";
-$a->strings["Unexpected response from remote site: "] = "Respuesta inesperada desde el sitio remoto:";
+$a->strings["Unexpected response from remote site: "] = "Respuesta inesperada desde el sitio remoto: ";
 $a->strings["Confirmation completed successfully."] = "Confirmación completada con éxito.";
-$a->strings["Remote site reported: "] = "El sito remoto informó:";
+$a->strings["Remote site reported: "] = "El sito remoto informó: ";
 $a->strings["Temporary failure. Please wait and try again."] = "Error temporal. Por favor, espere y vuelva a intentarlo.";
 $a->strings["Introduction failed or was revoked."] = "La presentación ha fallado o ha sido anulada.";
 $a->strings["Unable to set contact photo."] = "Imposible establecer la foto del contacto.";
-$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s es ahora amigo de %2\$s";
-$a->strings["No user record found for '%s' "] = "No se ha encontrado a ningún '%s'";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s ahora es amigo de %2\$s";
+$a->strings["No user record found for '%s' "] = "No se ha encontrado a ningún '%s' ";
 $a->strings["Our site encryption key is apparently messed up."] = "Nuestra clave de cifrado del sitio es aparentemente un lío.";
 $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Se ha proporcionado una dirección vacía o no hemos podido descifrarla.";
 $a->strings["Contact record was not found for you on our site."] = "El contacto no se ha encontrado en nuestra base de datos.";
-$a->strings["Site public key not available in contact record for URL %s."] = "La clave pública del sitio no está disponible en los datos del contacto para URL %s.";
+$a->strings["Site public key not available in contact record for URL %s."] = "La clave pública del sitio no está disponible en los datos del contacto para %s.";
 $a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "La identificación proporcionada por el sistema es un duplicado de nuestro sistema. Debería funcionar si lo intentas de nuevo.";
 $a->strings["Unable to set your contact credentials on our system."] = "No se puede establecer las credenciales de tu contacto en nuestro sistema.";
 $a->strings["Unable to update your contact profile details on our system"] = "No se puede actualizar los datos de tu perfil de contacto en nuestro sistema";
-$a->strings["Connection accepted at %s"] = "Conexión aceptada en % s";
-$a->strings["Login failed."] = "Accesso fallido.";
-$a->strings["Welcome "] = "Bienvenido";
-$a->strings["Please upload a profile photo."] = "Por favor sube una foto para tu perfil.";
-$a->strings["Welcome back "] = "Bienvenido de nuevo";
-$a->strings["%s welcomes %s"] = "%s te da la bienvenida a %s";
-$a->strings["View Contacts"] = "Ver contactos";
-$a->strings["No contacts."] = "Ningún contacto.";
-$a->strings["Group created."] = "Grupo creado.";
-$a->strings["Could not create group."] = "Imposible crear el grupo.";
-$a->strings["Group not found."] = "Grupo no encontrado.";
-$a->strings["Group name changed."] = "El nombre del grupo ha cambiado.";
-$a->strings["Create a group of contacts/friends."] = "Crea un grupo de contactos/amigos.";
-$a->strings["Group Name: "] = "Nombre del grupo: ";
-$a->strings["Group removed."] = "Grupo eliminado.";
-$a->strings["Unable to remove group."] = "No se puede eliminar el grupo.";
-$a->strings["Group Editor"] = "Editor de grupos";
-$a->strings["Members"] = "Miembros";
-$a->strings["All Contacts"] = "Todos los contactos";
-$a->strings["Item not available."] = "Elemento no disponible.";
-$a->strings["Item was not found."] = "Elemento no encontrado.";
-$a->strings["Common Friends"] = "Amigos comunes";
-$a->strings["No friends in common."] = "No hay amigos en común.";
-$a->strings["Profile Match"] = "Coincidencias de Perfil";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave que coincidan. Por favor, agrega palabras claves a tu perfil predeterminado.";
-$a->strings["Not available."] = "No disponible";
-$a->strings["Community"] = "Comunidad";
-$a->strings["Shared content is covered by the <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."] = "El contenido en común está cubierto por la licencia <a href=\"http://creativecommons.org/licenses/by/3.0/deed.it\">Creative Commons Atribución 3.0</a>.";
-$a->strings["Post to Tumblr"] = "Publicar en Tumblr";
-$a->strings["Tumblr Post Settings"] = "Configuración de publicación en Tumblr";
-$a->strings["Enable Tumblr Post Plugin"] = "Habilitar el plugin de publicación en Tumblr";
-$a->strings["Tumblr login"] = "Tumblr - inicio de sesión";
-$a->strings["Tumblr password"] = "Tumblr - contraseña";
-$a->strings["Post to Tumblr by default"] = "Publicar a Tumblr por defecto";
-$a->strings["Post from Friendica"] = "Publicar desde Friendica";
-$a->strings["Post to Twitter"] = "Publicar en Twitter";
-$a->strings["Twitter settings updated."] = "Actualización de la configuración de Twitter";
-$a->strings["Twitter Posting Settings"] = "Configuración de publicaciones en Twitter";
-$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No se ha encontrado ningún par de claves para Twitter. Póngase en contacto con el administrador del sitio.";
-$a->strings["At this Friendika 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 esta instancia de Friendika el plugin de Twitter fue habilitado, pero aún no has vinculado tu cuenta a tu cuenta de Twitter. Para ello haz clic en el botón de abajo para obtener un PIN de Twitter, que tiene que copiar en el cuadro de entrada y enviar el formulario. Solo sus posts <strong>públicos</strong> se publicarán en Twitter.";
-$a->strings["Log in with Twitter"] = "Acceder con Twitter";
-$a->strings["Copy the PIN from Twitter here"] = "Copia el PIN de Twitter aquí";
-$a->strings["Currently connected to: "] = "Actualmente conectado a:";
-$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 lo habilitas todas tus publicaciones <strong>públicas</strong> serán publicadas en la cuenta de Twitter asociada. Puedes elegir hacerlo por defecto (aquí) o individualmente para cada publicación usando las opciones cuando escribes.";
-$a->strings["Allow posting to Twitter"] = "Permitir publicar en Twitter";
-$a->strings["Send public postings to Twitter by default"] = "Enviar publicaciones públicas a Twitter por defecto";
-$a->strings["Clear OAuth configuration"] = "Borrar la configuración de OAuth";
-$a->strings["Consumer key"] = "Clave consumer";
-$a->strings["Consumer secret"] = "Secreto consumer";
-$a->strings["Post to StatusNet"] = "Publicar en StatusNet";
-$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Por favor contacta con el administrador de tu web.<br />La dirección API suministrada no es válida.";
-$a->strings["We could not contact the StatusNet API with the Path you entered."] = "No podemos contantar con StatusNet en la ruta que has especificado.";
-$a->strings["StatusNet settings updated."] = "Actualición de la configuración de StatusNet.";
-$a->strings["StatusNet Posting Settings"] = "Configuración de envío a StatusNet";
-$a->strings["Globally Available StatusNet OAuthKeys"] = "StatusNet OAuthKeys disponibles para todos";
-$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)."] = "Existen pares de valores OAuthKey preconfigurados para algunos servidores. Si usas uno de ellos, por favor usa estas credenciales. De los contrario no dudes en conectar con cualquiera otra instancia de StatusNet (ver a continuación).";
-$a->strings["Provide your own OAuth Credentials"] = "Proporciona tus propias credenciales OAuth";
-$a->strings["No consumer key pair for StatusNet found. Register your Friendika 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 Friendika installation at your favorited StatusNet installation."] = "No se ha encontrado ningún par de claves para StatusNet. Registra tu cuenta de Friendika como cliente de escritorio en tu cuenta de StatusNet, copia la clave consumer aquí y escribe la dirección de la base API.<br />Antes de registrar tu propio par de claves OAuth, pregunta al administrador si ya hay un par de claves para esta instalación de Friendika en tu instalación StatusNet favorita.";
-$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
-$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret";
-$a->strings["Base API Path (remember the trailing /)"] = "Dirección de base para la API (recordar el / 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."] = "Para conectarse a tu cuenta de StatusNet haga clic en el botón abajo para obtener un PIN de StatusNet, que tiene que copiar en el cuadro de entrada y enviar el formulario. Solo sus posts <strong>públicos</strong> se publicarán en StatusNet.";
-$a->strings["Log in with StatusNet"] = "Inicia sesión con StatusNet";
-$a->strings["Copy the security code from StatusNet here"] = "Copia el código de seguridad de StatusNet aquí";
-$a->strings["Cancel Connection Process"] = "Cancelar la conexión en proceso";
-$a->strings["Current StatusNet API is"] = "El estado actual de la API de StatusNet es";
-$a->strings["Cancel StatusNet Connection"] = "Cancelar conexión con StatusNet";
-$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 lo habilitas todas tus publicaciones </strong>públicas</strong> podrán ser publicadas en la cuenta asociada de StatusNet. Pudes elegir hacerlo por defecto (aquí) o para cada publicación individualmente en las opciones de publicacion cuando la estás escribiendo.";
-$a->strings["Allow posting to StatusNet"] = "Permitir publicaciones en StatusNet";
-$a->strings["Send public postings to StatusNet by default"] = "Enviar publicaciones públicas a StatusNet por defecto";
-$a->strings["API URL"] = "Dirección de la API";
-$a->strings["OEmbed settings updated"] = "Actualizar la configuración de OEmbed";
-$a->strings["Use OEmbed for YouTube videos"] = "Usar OEmbed para los vídeos de YouTube";
-$a->strings["URL to embed:"] = "Dirección del recurso:";
-$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tres en Raya tridimensional";
-$a->strings["3D Tic-Tac-Toe"] = "Tres en Raya 3D";
-$a->strings["New game"] = "Nueva partida";
-$a->strings["New game with handicap"] = "Nuevo juego con handicap";
-$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Tres en Raya tridimensional es como el juego tradicional, excepto que se juega en varios niveles simultáneamente.";
-$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 este caso hay tres niveles. Ganarás por conseguir tres en raya en cualquier nivel, así como arriba, abajo y en diagonal a través de los diferentes niveles.";
-$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 juego con handicap desactiva la posición central en el nivel medio porque el jugador reclama que este cuadrado tiene a menudo una ventaja injusta.";
-$a->strings["You go first..."] = "Comienzas tú...";
-$a->strings["I'm going first this time..."] = "Yo voy primero esta vez...";
-$a->strings["You won!"] = "¡Has ganado!";
-$a->strings["\"Cat\" game!"] = "¡Empate!";
-$a->strings["I won!"] = "¡He ganado!";
-$a->strings["Allow to use your friendika id (%s) to connecto to external unhosted-enabled storage (like ownCloud)"] = "Permitir el uso de su ID de friendica (%s) para conectar a fuentes externas de almacenamiento sin anfitrión habilitado (como ownCloud)";
-$a->strings["Unhosted DAV storage url"] = "Dirección url de almacenamiento DAV sin anfitrión";
-$a->strings["Impressum"] = "Impressum";
-$a->strings["Site Owner"] = "Propietario";
-$a->strings["Email Address"] = "Dirección de correo";
-$a->strings["Postal Address"] = "Dirección";
-$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 necesita ser configurado.<br />Por favor añade al menos la variable <tt>propietario<tt> a tu archivo de configuración. Para otras variables lee el archivo README.";
-$a->strings["Site Owners Profile"] = "Perfil del propietario del sitio";
-$a->strings["Notes"] = "Notas";
+$a->strings["Connection accepted at %s"] = "Conexión aceptada en %s";
+$a->strings["%1\$s has joined %2\$s"] = "%1\$s se ha unido a %2\$s";
+$a->strings["Google+ Import Settings"] = "Configuración de la importación de Google+";
+$a->strings["Enable Google+ Import"] = "Habilitar la importación de Google+";
+$a->strings["Google Account ID"] = "ID de la cuenta de Google";
+$a->strings["Google+ Import Settings saved."] = "Configuración de la importación de Google+ guardada.";
 $a->strings["Facebook disabled"] = "Facebook deshabilitado";
 $a->strings["Updating contacts"] = "Actualizando contactos";
 $a->strings["Facebook API key is missing."] = "Falta la clave API de Facebook.";
 $a->strings["Facebook Connect"] = "Conexión con Facebook";
 $a->strings["Install Facebook connector for this account."] = "Instalar el conector de Facebook para esta cuenta.";
 $a->strings["Remove Facebook connector"] = "Eliminar el conector de Facebook";
-$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Volver a identificarse [Esto es necesario cada vez que su contraseña de Facebook cambie.]";
+$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Volver a identificarse [Esto es necesario cada vez que tu contraseña de Facebook cambie.]";
 $a->strings["Post to Facebook by default"] = "Publicar en Facebook de forma predeterminada";
-$a->strings["Link all your Facebook friends and conversations on this website"] = "Vincule a todos tus amigos de Facebook y las conversaciones en este sitio web";
-$a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Las conversaciones de Facebook consisten en su <em>muro</em> su <em>perfil</em> y las <em>publicaciones</em> de su amigo.";
-$a->strings["On this website, your Facebook friend stream is only visible to you."] = "En esta página web, las publicaciones de su amigo de Facebook solo son visibles para usted.";
-$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "La siguiente configuración determina la privacidad del muro de su perfil de Facebook en este sitio web.";
-$a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "En este sitio web las publicaciones del muro de Facebook solo son visibles para usted";
-$a->strings["Do not import your Facebook profile wall conversations"] = "No importar las conversaciones de su muro 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 decide conectar las conversaciones y dejar ambas casillas sin marcar, el muro de su perfil de Facebook se fusionará con el muro de su perfil en este sitio web y la configuración de privacidad en este sitio serán utilizados para determinar quién puede ver las conversaciones.";
-$a->strings["Facebook"] = "Facebook";
+$a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "El enlace con los contactos de Facebook ha sido desactivado en este servidor. La configuración no tendrá efecto alguno.";
+$a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "El enlace con los contactos de Facebook ha sido desactivado en este servidor. Si se desactiva no podrá volver a reactivarse.";
+$a->strings["Link all your Facebook friends and conversations on this website"] = "Vincula a todos tus amigos de Facebook y las conversaciones con este sitio";
+$a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Las conversaciones de Facebook consisten en tu <em>muro</em>, tu <em>perfil</em> y las <em>publicaciones</em> de tus amigos.";
+$a->strings["On this website, your Facebook friend stream is only visible to you."] = "En esta página las publicaciones de tus amigos de Facebook solo son visibles para ti.";
+$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "La siguiente configuración determina la privacidad del muro de tu perfil de Facebook en este sitio.";
+$a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "En este sitio las publicaciones del muro de Facebook solo son visibles para ti";
+$a->strings["Do not import your Facebook profile wall conversations"] = "No importar las conversaciones de tu muro 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 decides conectar las conversaciones y dejar ambas casillas sin marcar, el muro de tu perfil de Facebook se fusionará con el muro de tu perfil en este sitio y la configuración de privacidad en este sitio será utilizada para determinar quién puede ver las conversaciones.";
+$a->strings["Comma separated applications to ignore"] = "Aplicaciones a ignorar separadas por comas";
+$a->strings["Problems with Facebook Real-Time Updates"] = "Hay problemas con las actualizaciones en tiempo real de Facebook";
 $a->strings["Facebook Connector Settings"] = "Configuración de conexión a Facebook";
+$a->strings["Facebook API Key"] = "Llave API de Facebook";
+$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: parece que la App-ID y el -Secret ya están configurados en tu archivo .htconfig.php. Al estar configurados allí, no se usará este formulario.<br><br>";
+$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Error: la llave API proporcionada parece incorrecta (no se pudo recuperar la ficha de acceso a la aplicación).";
+$a->strings["The given API Key seems to work correctly."] = "La Llave API proporcionada parece funcionar correctamente.";
+$a->strings["The correctness of the API Key could not be detected. Something strange's going on."] = "No se ha podido detectar una llave API correcta. Algo raro está pasando.";
+$a->strings["App-ID / API-Key"] = "Añadir ID / Llave API";
+$a->strings["Application secret"] = "Secreto de la aplicación";
+$a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Intervalo del sondeo en minutos (mínimo %1\$s minutos)";
+$a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "Sincronizar comentarios (no se perderán comentarios de Facebook, pero se incrementará la carga del sistema)";
+$a->strings["Real-Time Updates"] = "Actualizaciones en tiempo real";
+$a->strings["Real-Time Updates are activated."] = "Actualizaciones en tiempo real activada.";
+$a->strings["Deactivate Real-Time Updates"] = "Desactivar actualizaciones en tiempo real";
+$a->strings["Real-Time Updates not activated."] = "Actualizaciones en tiempo real desactivada.";
+$a->strings["Activate Real-Time Updates"] = "Activar actualizaciones en tiempo real";
+$a->strings["The new values have been saved."] = "Los nuevos valores se han guardado.";
 $a->strings["Post to Facebook"] = "Publicar en Facebook";
 $a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "Publicación en Facebook cancelada debido a un conflicto con los permisos de acceso a la multi-red.";
-$a->strings["Image: "] = "Imagen: ";
-$a->strings["View on Friendika"] = "Ver en Friendika";
+$a->strings["View on Friendica"] = "Ver en Friendica";
 $a->strings["Facebook post failed. Queued for retry."] = "Publicación en Facebook errónea. Reintentando...";
-$a->strings["Generate new key"] = "Generar clave nueva";
-$a->strings["Widgets key"] = "Clave de aplicación";
-$a->strings["Widgets available"] = "Aplicación disponible";
-$a->strings["Connect on Friendika!"] = "¡Conectado en Friendika!";
+$a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Tu conexión con Facebook ha sido invalidada. Por favor vuelve a identificarte.";
+$a->strings["Facebook connection became invalid"] = "La conexión con Facebook ha sido invalidada";
+$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."] = "Hola %1\$s,\n\nLa conexión entre tu cuenta de %2\$s y Facebook se ha roto. Normalmente esto suele ocurrir si has cambiado tu contraseña de Facebook. Para volver a establecerla, tienes que %3\$sidentificarte de nuevo en el conector de Facebook%4\$s.";
+$a->strings["StatusNet AutoFollow settings updated."] = "Configuración para seguir automáticamente en StatusNet actualizada.";
+$a->strings["StatusNet AutoFollow Settings"] = "Configuración para el seguimiento automático en StatusNet";
+$a->strings["Automatically follow any StatusNet followers/mentioners"] = "Seguir automáticamente a cualquiera que me siga/mencione en StatusNet";
+$a->strings["Bg settings updated."] = "Ajustes de fondo actualizados.";
+$a->strings["Bg Settings"] = "Ajustes de fondo";
+$a->strings["How many contacts to display on profile sidebar"] = "¿Cuántos contactos quieres mostrar en la barra lateral de tu perfil?";
+$a->strings["Lifetime of the cache (in hours)"] = "Vida útil de la caché (en horas)";
+$a->strings["Cache Statistics"] = "Estadísticas de la caché";
+$a->strings["Number of items"] = "Número de ítems";
+$a->strings["Size of the cache"] = "Tamaño de la caché";
+$a->strings["Delete the whole cache"] = "Borrar toda la caché";
+$a->strings["Facebook Post disabled"] = "Facebook deshabilitado";
+$a->strings["Facebook Post"] = "Facebook";
+$a->strings["Install Facebook Post connector for this account."] = "Instalar el conector de Facebook para esta cuenta.";
+$a->strings["Remove Facebook Post connector"] = "Eliminar el conector de Facebook";
+$a->strings["Facebook Post Settings"] = "Configuración de conexión a Facebook";
 $a->strings["%d person likes this"] = array(
 	0 => "a %d persona le gusta esto",
 	1 => "a %d personas les gusta esto",
@@ -912,40 +1129,513 @@ $a->strings["%d person doesn't like this"] = array(
 	0 => "a %d persona no le gusta esto",
 	1 => "a %d personas no les gusta esto",
 );
-$a->strings["Report Bug"] = "Informe de errores";
-$a->strings["\"Not Safe For Work\" Settings"] = "Configuración «No apto para el trabajo» (NSFW)";
-$a->strings["Comma separated words to treat as NSFW"] = "Palabras separadas por comas para tratarlo como NSFW";
+$a->strings["Get added to this list!"] = "¡Añadido a la lista!";
+$a->strings["Generate new key"] = "Generar clave nueva";
+$a->strings["Widgets key"] = "Clave de aplicaciones";
+$a->strings["Widgets available"] = "Aplicaciones disponibles";
+$a->strings["Connect on Friendica!"] = "¡Conéctate en Friendica!";
+$a->strings["bitchslap"] = "abofetear fuerte";
+$a->strings["bitchslapped"] = "abofeteó fuertemente a";
+$a->strings["shag"] = "picar";
+$a->strings["shagged"] = "picó a";
+$a->strings["do something obscenely biological to"] = "hacer algo obsceno y biológico a";
+$a->strings["did something obscenely biological to"] = "hizo algo obsceno y biológico a";
+$a->strings["point out the poke feature to"] = "señalar la habilidad de toques a";
+$a->strings["pointed out the poke feature to"] = "señaló la habilidad de toques a";
+$a->strings["declare undying love for"] = "declarar amor incondicional a";
+$a->strings["declared undying love for"] = "declaró amor incondicional a";
+$a->strings["patent"] = "patentar";
+$a->strings["patented"] = "patentó";
+$a->strings["stroke beard"] = "acariciar barba";
+$a->strings["stroked their beard at"] = "acarició su barba a";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "deplorar los bajos estándares de educación secundaria y terciaria moderna a";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "deplora los bajos estándares de educación secundaria y terciaria moderna a";
+$a->strings["hug"] = "abrazar";
+$a->strings["hugged"] = "abrazó a";
+$a->strings["kiss"] = "besar";
+$a->strings["kissed"] = "besó a";
+$a->strings["raise eyebrows at"] = "alzar las cejas a";
+$a->strings["raised their eyebrows at"] = "alzó sus cejas a";
+$a->strings["insult"] = "insultar";
+$a->strings["insulted"] = "insultó a";
+$a->strings["praise"] = "alabar";
+$a->strings["praised"] = "alabó a";
+$a->strings["be dubious of"] = "dudar de";
+$a->strings["was dubious of"] = "dudó de";
+$a->strings["eat"] = "comer";
+$a->strings["ate"] = "comió";
+$a->strings["giggle and fawn at"] = "reír y carcajearse de";
+$a->strings["giggled and fawned at"] = "rió y se carcajeó de";
+$a->strings["doubt"] = "dudar";
+$a->strings["doubted"] = "dudó";
+$a->strings["glare"] = "mirar fijamente";
+$a->strings["glared at"] = "miró fijamente a";
+$a->strings["YourLS Settings"] = "Tu configuración LS";
+$a->strings["URL: http://"] = "Dirección: http://";
+$a->strings["Username:"] = "Nombre de Usuario:";
+$a->strings["Password:"] = "Contraseña:";
+$a->strings["Use SSL "] = "Usar SSL ";
+$a->strings["yourls Settings saved."] = "La configuración se ha guardado.";
+$a->strings["Post to LiveJournal"] = "Publicar en Livejournal";
+$a->strings["LiveJournal Post Settings"] = "Configuración de las publicaciones en Livejournal";
+$a->strings["Enable LiveJournal Post Plugin"] = "Activar el módulo de publicación en Livejournal";
+$a->strings["LiveJournal username"] = "Nombre de usuario de Livejournal";
+$a->strings["LiveJournal password"] = "Contraseña de Livejournal";
+$a->strings["Post to LiveJournal by default"] = "Publicar en Livejournal por defecto";
+$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Configuración \"Not Safe For Work\" (Filtro de contenido de carácter 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."] = "Este complemento busca las palabras clave que especifiques y oculta cualquier comentario que contenga dichas claves, para que no aparezcan en momentos inoportunos, como por ejemplo, material sexual. Se considera de buena educación y correcto etiquetar los desnudos con #NSFW.  Este filtro puede servir para filtrar otro contenido, así que te puede servir como un filtro de carácter general, escogiendo las palabras clave adecuadas.";
+$a->strings["Enable Content filter"] = "Activar el filtro de contenido";
+$a->strings["Comma separated list of keywords to hide"] = "Palabras clave para ocultar, lista separada por comas";
+$a->strings["Use /expression/ to provide regular expressions"] = "Usa /expresión/ para proporcionar expresiones regulares";
 $a->strings["NSFW Settings saved."] = "Configuración NSFW guardada.";
-$a->strings["%s - Click to open/close"] = "%s - Haga clic para abrir/cerrar";
+$a->strings["%s - Click to open/close"] = "%s - Pulsa aquí para abrir/cerrar";
+$a->strings["Forums"] = "Foros";
+$a->strings["Forums:"] = "Foros:";
+$a->strings["Page settings updated."] = "Configuración de la página actualizada";
+$a->strings["Page Settings"] = "Configuración de la página";
+$a->strings["How many forums to display on sidebar without paging"] = "¿Cuántos foros se mostrarán en la barra lateral?";
+$a->strings["Randomise Page/Forum list"] = "Lista de Página/Foro al azar";
+$a->strings["Show pages/forums on profile page"] = "Mostrar páginas/foros en tu perfil";
+$a->strings["Planets Settings"] = "Configuración de Planets";
+$a->strings["Enable Planets Plugin"] = "Activar el módulo de planetas Planets";
+$a->strings["Login"] = "Acceder";
 $a->strings["OpenID"] = "OpenID";
-$a->strings["Last users"] = "Últimos usuarios";
+$a->strings["Latest users"] = "Últimos usuarios";
 $a->strings["Most active users"] = "Usuarios más activos";
-$a->strings["Last photos"] = "Últimas fotos";
-$a->strings["Last likes"] = "Últimos \"me gusta\"";
+$a->strings["Latest photos"] = "Últimas fotos";
+$a->strings["Latest likes"] = "Últimos me gusta";
 $a->strings["event"] = "evento";
-$a->strings[" - Member since: %s"] = "- Miembro desde: %s";
+$a->strings["No access"] = "Sin acceso";
+$a->strings["Could not open component for editing"] = "No se puede abrir para editar";
+$a->strings["Go back to the calendar"] = "Volver al calendario";
+$a->strings["Event data"] = "Datos del evento";
+$a->strings["Calendar"] = "Calendario";
+$a->strings["Special color"] = "Color especial";
+$a->strings["Subject"] = "Asunto";
+$a->strings["Starts"] = "Comienzo";
+$a->strings["Ends"] = "Final";
+$a->strings["Description"] = "Descripción";
+$a->strings["Recurrence"] = "Recurrencia";
+$a->strings["Frequency"] = "Frecuencia";
+$a->strings["Daily"] = "Diariamente";
+$a->strings["Weekly"] = "Semanalmente";
+$a->strings["Monthly"] = "Mensualmente";
+$a->strings["Yearly"] = "Anual";
+$a->strings["days"] = "días";
+$a->strings["weeks"] = "semanas";
+$a->strings["months"] = "meses";
+$a->strings["years"] = "años";
+$a->strings["Interval"] = "Intérvalo";
+$a->strings["All %select% %time%"] = "Todos %select% %time%";
+$a->strings["Days"] = "Días";
+$a->strings["Sunday"] = "Domingo";
+$a->strings["Monday"] = "Lunes";
+$a->strings["Tuesday"] = "Martes";
+$a->strings["Wednesday"] = "Miércoles";
+$a->strings["Thursday"] = "Jueves";
+$a->strings["Friday"] = "Viernes";
+$a->strings["Saturday"] = "Sábado";
+$a->strings["First day of week:"] = "Primer día de la semana:";
+$a->strings["Day of month"] = "Día del mes";
+$a->strings["#num#th of each month"] = "#num#º de cada mes";
+$a->strings["#num#th-last of each month"] = "#num#º antes del último 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#º antes del último #wkday# de cada mes";
+$a->strings["Month"] = "Mes";
+$a->strings["#num#th of the given month"] = "#num#º del mes dado";
+$a->strings["#num#th-last of the given month"] = "#num#º antes del último del mes dado";
+$a->strings["#num#th #wkday# of the given month"] = "#num#º #wkday# del mes dado";
+$a->strings["#num#th-last #wkday# of the given month"] = "#num#º antes del último #wkday# del mes dado";
+$a->strings["Repeat until"] = "Repetir hasta";
+$a->strings["Infinite"] = "Infinito";
+$a->strings["Until the following date"] = "Hasta la fecha siguiente";
+$a->strings["Number of times"] = "Número de veces";
+$a->strings["Exceptions"] = "Excepciones";
+$a->strings["none"] = "ninguno";
+$a->strings["Notification"] = "Notificación";
+$a->strings["Notify by"] = "Notificar por";
+$a->strings["E-Mail"] = "Correo electrónico";
+$a->strings["On Friendica / Display"] = "Sobre Friendica / Mostrar";
+$a->strings["Time"] = "Hora";
+$a->strings["Hours"] = "Horas";
+$a->strings["Minutes"] = "Minutos";
+$a->strings["Seconds"] = "Segundos";
+$a->strings["Weeks"] = "Semanas";
+$a->strings["before the"] = "antes de";
+$a->strings["start of the event"] = "inicio del evento";
+$a->strings["end of the event"] = "final del evento";
+$a->strings["Add a notification"] = "Añadir una notificación";
+$a->strings["The event #name# will start at #date"] = "El evento #name# comenzará el #date";
+$a->strings["#name# is about to begin."] = "#name# está a punto de comenzar.";
+$a->strings["Saved"] = "Guardado";
+$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "Hora, formato anglosajón (mm/dd/aaaa)";
+$a->strings["German Time Format (dd.mm.YYYY)"] = "Hora, formato europeo (dd.mm.aaaa)";
+$a->strings["Private Events"] = "Eventos privados";
+$a->strings["Private Addressbooks"] = "Libretas de direcciones privada";
+$a->strings["Friendica-Native events"] = "Eventos nativos de Friendica";
+$a->strings["Friendica-Contacts"] = "Contactos de Friendica";
+$a->strings["Your Friendica-Contacts"] = "Tus Contactos de Friendica";
+$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Algo salió mal al importar el archivo. Lo sentimos. Puede que algunos eventos se hayan importado.";
+$a->strings["Something went wrong when trying to import the file. Sorry."] = "Algo salió mal al importar el archivo. Lo sentimos.";
+$a->strings["The ICS-File has been imported."] = "El archivo ICS ha sido importado.";
+$a->strings["No file was uploaded."] = "No se ha importado ningún archivo.";
+$a->strings["Import a ICS-file"] = "Importar archivo ICS";
+$a->strings["ICS-File"] = "Archivo ICS";
+$a->strings["Overwrite all #num# existing events"] = "Sobreescribir los #num# eventos existentes";
+$a->strings["New event"] = "Evento nuevo";
+$a->strings["Today"] = "Hoy";
+$a->strings["Day"] = "Día";
+$a->strings["Week"] = "Semana";
+$a->strings["Reload"] = "Recargar";
+$a->strings["Date"] = "Fecha";
+$a->strings["Error"] = "Error";
+$a->strings["The calendar has been updated."] = "El calendario ha sido actualizado.";
+$a->strings["The new calendar has been created."] = "Se ha creado un nuevo calendario.";
+$a->strings["The calendar has been deleted."] = "El calendario se ha borrado.";
+$a->strings["Calendar Settings"] = "Configuración del Calendario";
+$a->strings["Date format"] = "Formato de fecha";
+$a->strings["Time zone"] = "Zona horaria";
+$a->strings["Calendars"] = "Calendarios";
+$a->strings["Create a new calendar"] = "Crear un nuevo calendario";
+$a->strings["Limitations"] = "Limitaciones";
+$a->strings["Warning"] = "Aviso";
+$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Sincronización (iPhone, Thunderbird Lightning, Android...)";
+$a->strings["Synchronizing this calendar with the iPhone"] = "Sincronizar este calendario con iPhone";
+$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sincronizar tus contactos de Friendica con 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."] = "La versión actual de este módulo no se ha ajustado correctamente. Por favor contacta al administrador de sistema de tu instalación de Friendica para arreglarlo.";
+$a->strings["Extended calendar with CalDAV-support"] = "Calendario ampliado con soporte CalDAV";
+$a->strings["noreply"] = "no responder";
+$a->strings["Notification: "] = "Notificación:";
+$a->strings["The database tables have been installed."] = "Se han instalado las tablas de la base de datos.";
+$a->strings["An error occurred during the installation."] = "Ha ocurrido un error durante la instalación.";
+$a->strings["The database tables have been updated."] = "Las tablas de la base de datos han sido actualizadas.";
+$a->strings["An error occurred during the update."] = "Ocurrió un error durante la actualización.";
+$a->strings["No system-wide settings yet."] = "No se han configurado aún los ajustes del sistema.";
+$a->strings["Database status"] = "Estado de la base de datos";
+$a->strings["Installed"] = "Instalada";
+$a->strings["Upgrade needed"] = "Actualización necesaria";
+$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."] = "Por favor respalda todos los datos de calendario (las tablas que comienzan con dav_*) antes de continuar. Aunque todos los eventos de calendario <i>deberían</i> convertirse a la nueva estructura de base de datos, siempre es seguro tener un respaldo. Abajo, puedes ver las consultas a la base de datos que se realizarán cuando presiones el botón de 'actualizar'.";
+$a->strings["Upgrade"] = "Actualizada";
+$a->strings["Not installed"] = "Sin instalar";
+$a->strings["Install"] = "Instalar";
+$a->strings["Unknown"] = "Desconocido";
+$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."] = "Ha ocurrido algo muy malo. No puedo recuperarme automáticamente de este estado, lo siento. Por favor ve al manejador de fondo de la base de datos, respalda los datos, y borra todas las tablas que comienzan con 'dav_' manualmente. Después de eso, esta rutina de instalación debería de ser capaz de reinicializar las tablas automáticamente.";
+$a->strings["Troubleshooting"] = "Problemas";
+$a->strings["Manual creation of the database tables:"] = "Manual para la creación de las tablas de la base de datos:";
+$a->strings["Show SQL-statements"] = "Mostrar declaraciones SQL";
+$a->strings["Private Calendar"] = "Calendario privado";
+$a->strings["Friendica Events: Mine"] = "Eventos de Friendica: Propios";
+$a->strings["Friendica Events: Contacts"] = "Eventos de Friendica: Contactos";
+$a->strings["Private Addresses"] = "Direcciones privadas";
+$a->strings["Friendica Contacts"] = "Contactos de 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>"] = "Permitir el uso de tu ID de Friendica (%s) para conexiones de almacenamiento externo sin alojamiento activado (como OwnCloud). Mira <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
+$a->strings["Template URL (with {category})"] = "Dirección de la plantilla (con {categoría})";
+$a->strings["OAuth end-point"] = "Punto final OAuth";
+$a->strings["Api"] = "API";
+$a->strings["Member since:"] = "Miembro desde:";
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tres en Raya tridimensional";
+$a->strings["3D Tic-Tac-Toe"] = "Tres en Raya 3D";
+$a->strings["New game"] = "Nueva partida";
+$a->strings["New game with handicap"] = "Nuevo juego con handicap";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Tres en Raya tridimensional es como el juego tradicional, excepto que se juega en varios niveles simultáneamente.";
+$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 este caso hay tres niveles. Ganarás por conseguir tres en raya en cualquier nivel, así como arriba, abajo y en diagonal a través de los diferentes niveles.";
+$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 juego con handicap desactiva la posición central en el nivel medio porque el jugador que la ocupa tiene a menudo una ventaja injusta.";
+$a->strings["You go first..."] = "Comienzas tú...";
+$a->strings["I'm going first this time..."] = "Yo voy primero esta vez...";
+$a->strings["You won!"] = "¡Has ganado!";
+$a->strings["\"Cat\" game!"] = "¡Empate!";
+$a->strings["I won!"] = "¡He ganado!";
 $a->strings["Randplace Settings"] = "Configuración de Randplace";
-$a->strings["Enable Randplace Plugin"] = "Activar el módulo Randplace";
-$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Este sitio web realiza un seguimiento mediante la herramienta de análisis <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 quieres que tus visitas sean registradas de esta manera usted <a href='%s'>puede establecer una cookie para evitar que Piwik realice un seguimiento de las visitas del sitio</a> (opt-out).";
-$a->strings["Piwik Base URL"] = "Dirección base Piwik";
-$a->strings["Site ID"] = "ID del sitio";
-$a->strings["Show opt-out cookie link?"] = "¿Mostrar enlace a las cookies?";
+$a->strings["Enable Randplace Plugin"] = "Activar el módulo de lugar aleatorio Randplace";
+$a->strings["Post to Dreamwidth"] = "Publicar en Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Configuración de las publicaciones en Dreamwidth";
+$a->strings["Enable dreamwidth Post Plugin"] = "Activar el módulo de publicación en Dreamwidth";
+$a->strings["dreamwidth username"] = "Nombre de usuario de Dreamwidth";
+$a->strings["dreamwidth password"] = "Contraseña de Dreamwidth";
+$a->strings["Post to dreamwidth by default"] = "Publicar en Dreamwidth por defecto";
+$a->strings["Post to Drupal"] = "Publicar en Drupal";
+$a->strings["Drupal Post Settings"] = "Configuración de las publicaciones en Drupal";
+$a->strings["Enable Drupal Post Plugin"] = "Activar el módulo de publicación en Drupal";
+$a->strings["Drupal username"] = "Nombre de usuario de Drupal";
+$a->strings["Drupal password"] = "Contraseña de Drupal";
+$a->strings["Post Type - article,page,or blog"] = "Tipo de publicación: artículo, página o blog";
+$a->strings["Drupal site URL"] = "Dirección de Drupal";
+$a->strings["Drupal site uses clean URLS"] = "El sitio de Drupal usa direcciones URL simples";
+$a->strings["Post to Drupal by default"] = "Publicar en Drupal por defecto";
+$a->strings["Post from Friendica"] = "Publicado desde Friendica";
+$a->strings["Startpage Settings"] = "Configuración de página inicial";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "Página por defecto, dejálo en blanco para cargar tu perfil";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Ejemplos: &quot;red&quot; o &quot;notificaciones/sistema&quot;";
+$a->strings["Geonames settings updated."] = "Configuración de Geonames actualizada.";
+$a->strings["Geonames Settings"] = "Configuración de Geonames";
+$a->strings["Enable Geonames Plugin"] = "Activar el complemento de nombres geográficos Geonames";
+$a->strings["Your account on %s will expire in a few days."] = "Tu cuenta de %s expirará en pocos días.";
+$a->strings["Your Friendica account is about to expire."] = "Tu cuenta de Friendica está a punto de expirar.";
+$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"] = "Hola %1\$s,\n\nTu cuenta en %2\$s expirará en menos de 5 días. Puedes mantenerla iniciando tu sesión una vez cada 30 días";
 $a->strings["Upload a file"] = "Subir un archivo";
 $a->strings["Drop files here to upload"] = "Arrastra los archivos aquí para subirlos";
 $a->strings["Failed"] = "Falló";
-$a->strings["No files were uploaded."] = "No hay archivos subidos.";
+$a->strings["No files were uploaded."] = "No se han subido archivos aún.";
 $a->strings["Uploaded file is empty"] = "El archivo subido está vacío";
 $a->strings["File has an invalid extension, it should be one of "] = "El archivo tiene una extensión no válida, debería ser una de ";
 $a->strings["Upload was cancelled, or server error encountered"] = "La subida ha sido cancelada, o se encontró un error del servidor";
+$a->strings["OEmbed settings updated"] = "Actualizar la configuración de OEmbed";
+$a->strings["Use OEmbed for YouTube videos"] = "Usar OEmbed para los vídeos de YouTube";
+$a->strings["URL to embed:"] = "Dirección del recurso:";
+$a->strings["show/hide"] = "mostrar/ocultar";
+$a->strings["No forum subscriptions"] = "Foro sin suscrpciones";
+$a->strings["Forumlist settings updated."] = "Ajustes de lista de foros actualizados.";
+$a->strings["Forumlist Settings"] = "Ajustes de lista de foros";
+$a->strings["Randomise Forumlist/Forum list"] = "Aleatorizar lista de foros";
+$a->strings["Show forumlists/forums on profile forumlist"] = "Mostrar lista de foros en perfil forumlist";
+$a->strings["Impressum"] = "Términos y Política del sitio";
+$a->strings["Site Owner"] = "Propietario";
+$a->strings["Email Address"] = "Dirección de correo";
+$a->strings["Postal Address"] = "Dirección";
+$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 necesita ser configurado.<br />Por favor añade al menos la variable <tt>propietario<tt> a tu archivo de configuración. Para otras variables lee el archivo README.";
+$a->strings["The page operators name."] = "Nombre del operador de la página.";
+$a->strings["Site Owners Profile"] = "Perfil del propietario del sitio";
+$a->strings["Profile address of the operator."] = "Dirección del perfil del operador.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Cómo contactar con el operador vía correo postal. BBCode permitido.";
+$a->strings["Notes"] = "Notas";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Notas adicionales que se mostrarán bajo la información del contacto. BBCode permitido.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Cómo contactar con el operador vía email (aparecerá oculto)";
+$a->strings["Footer note"] = "Nota a pie";
+$a->strings["Text for the footer. You can use BBCode here."] = "Texto para el Pie de página. BBCode permitido.";
+$a->strings["Report Bug"] = "Informe de errores";
+$a->strings["No Timeline settings updated."] = "Configuración Sin Linea Temporal actualizada.";
+$a->strings["No Timeline Settings"] = "Configuración Sin Linea Temporal";
+$a->strings["Disable Archive selector on profile wall"] = "Desactivar el selector de archivos en el muro del perfil";
+$a->strings["\"Blockem\" Settings"] = "Configuración de \"Blockem\"";
+$a->strings["Comma separated profile URLS to block"] = "Direcciones separadas por coma de los perfiles a bloquear";
+$a->strings["BLOCKEM Settings saved."] = "Configuracion Blockem guardada.";
+$a->strings["Blocked %s - Click to open/close"] = "%s bloqueado. Pulsa aquí para mostrar/ocultar";
+$a->strings["Unblock Author"] = "Desbloquear Autor";
+$a->strings["Block Author"] = "Bloquear Autor";
+$a->strings["blockem settings updated"] = "Configuración de Blockem actualizada";
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "XD";
+$a->strings["Quick Comment Settings"] = "Configuración de Qcomment";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Qcomments son comentarios rápidos que se encuentran cerca del cuadro de texto, a veces ocultos. Pulsa en ellos para dar respuestas simples.";
+$a->strings["Enter quick comments, one per line"] = "Introduce comentarios rápidos, uno por línea";
+$a->strings["Quick Comment settings saved."] = "Configuración de Qcomment guardada.";
+$a->strings["Tile Server URL"] = "Dirección del servidor";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Un listado de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">servidores públicos</a>";
+$a->strings["Default zoom"] = "Zoom por defecto";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Nivel de zoom predeterminado. (1:mínimo, 18:máximo)";
+$a->strings["Editplain settings updated."] = "Configuración del Editor de texto plano actualizada.";
+$a->strings["Group Text"] = "Texto agrupado";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Usar selector de grupos solo texto (sin imágenes) en el menú \"editar grupo\"";
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Libravatar puede no haberse instalado correctamente.<br>Requiere PHP >=5.3";
+$a->strings["generic profile image"] = "imagen genérica del perfil";
+$a->strings["random geometric pattern"] = "patrón geométrico aleatorio";
+$a->strings["monster face"] = "monstruosa";
+$a->strings["computer generated face"] = "generada por ordenador";
+$a->strings["retro arcade style face"] = "estilo retro arcade";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Tu versión de PHP %s, menor que la requerida (PHP >=5.3).";
+$a->strings["This addon is not functional on your server."] = "Esta funcionalidad no está activa en tu servidor.";
+$a->strings["Information"] = "Información";
+$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 complemento Gravatar está instalado. Por favor, desactiva dicho complemento.<br>El complemento Libravatar usará Gravatar si no encuentra nada en Libravatar.";
+$a->strings["Default avatar image"] = "Imagen del avatar por defecto";
+$a->strings["Select default avatar image if none was found. See README"] = "Elige una imagen para tu avatar si no se encuentra ninguna (ver README)";
+$a->strings["Libravatar settings updated."] = "Configuración de Libravatar actualizada.";
+$a->strings["Post to libertree"] = "Publicar en Libertree";
+$a->strings["libertree Post Settings"] = "Configuración de la publicación en Libertree";
+$a->strings["Enable Libertree Post Plugin"] = "Activar el módulo de publicación en Libertree";
+$a->strings["Libertree API token"] = "Ficha API de Libertree";
+$a->strings["Libertree site URL"] = "Dirección de Libertree";
+$a->strings["Post to Libertree by default"] = "Publicar en Libertree por defecto";
+$a->strings["Altpager settings updated."] = "Configuración de paginador alternativo actualizada.";
+$a->strings["Alternate Pagination Setting"] = "Configuración de paginación alternativa";
+$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "¿Usar \"más nuevo\" y \"más antiguo\" en vez de números en las páginas?";
+$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 complemento MathJax renderiza las fórmulas matemáticas escritas usando la sintaxis de LaTeX rodeadas por el habitual $ $ o un bloque de eqnarray en las publicaciones de tu muro, pestaña de red y correo privado.";
+$a->strings["Use the MathJax renderer"] = "Usar renderizado Mathjax";
+$a->strings["MathJax Base URL"] = "Dirección 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 dirección para el archivo javascript debe estar incluida para usar Mathjax. Puede ser Mathjax CDN o cualquier otra instalación de Mathjax.";
+$a->strings["Editplain Settings"] = "Configuración del Editor de texto plano";
+$a->strings["Disable richtext status editor"] = "Desactivar el editor de texto enriquecido";
+$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."] = "El complemento Libravatar también está instalado. Por favor desactiva este complemento o el complemento de Gravatar.<br>El complemento Libravatar usará Gravatar si no encuentra nada en Libravatar.";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Selecionar la imagen del avatar por defecto si no se ha encontrado ninguna en Gravatar. Mira el README";
+$a->strings["Rating of images"] = "Valoración de las imágenes";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Selecciona el avatar de clasificación apropiado para tu sitio. Ver README";
+$a->strings["Gravatar settings updated."] = "Configuración de Gravatar actualizada.";
+$a->strings["Your Friendica test account is about to expire."] = "Tu cuenta de prueba de Friendica está a punto de 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\nTu cuenta de prueba en %2\$s expirará en menos de 5 días. Esperamos que hayas disfrutado de la experiencia y te decidas a unirte a la red social de Friendica. Dispones de un listado de servidores disponibles en http://dir.friendica.com/siteinfo Para saber más sobre cómo crear tu propio servidor de Friendica puedes visitar la web del Proyecto Friendica en http://friendica.com.";
+$a->strings["\"pageheader\" Settings"] = "Configuración de cabecera";
+$a->strings["pageheader Settings saved."] = "Configuración de cabecera de página guardada.";
+$a->strings["Post to Insanejournal"] = "Publicar en Insanejournal";
+$a->strings["InsaneJournal Post Settings"] = "Configuración de publicación en Insanejournal";
+$a->strings["Enable InsaneJournal Post Plugin"] = "Activar el módulo de publicación en Insanejournal";
+$a->strings["InsaneJournal username"] = "Nombre de usuario de Insanejournal";
+$a->strings["InsaneJournal password"] = "Contraseña de Insanejournal";
+$a->strings["Post to InsaneJournal by default"] = "Publicar en Insanejournal por defecto";
+$a->strings["Jappix Mini addon settings"] = "Ajustes de complemento Jappix Mini";
+$a->strings["Activate addon"] = "Activar complemento";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "<em>No</em> insertar la aplicación de chat Jappixmini en la interfaz web";
+$a->strings["Jabber username"] = "Nombre de usuario de Jabber";
+$a->strings["Jabber server"] = "Servidor de Jabber";
+$a->strings["Jabber BOSH host"] = "Anfitrión BOSH de Jabber";
+$a->strings["Jabber password"] = "Contraseña de Jabber";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Encriptar contraseña de Jabber con la contraseña de Friendica (recomendado)";
+$a->strings["Friendica password"] = "Contraseña de Friendica";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Aprobar peticiones de suscripción de contactos de Friendica automáticamente";
+$a->strings["Subscribe to Friendica contacts automatically"] = "Suscribirse a contactos de Friendica automáticamente";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "Purgar los contactos de la lista interna de direcciones de Jabber";
+$a->strings["Add contact"] = "Añadir contacto";
+$a->strings["View Source"] = "Ver fuente";
+$a->strings["Post to StatusNet"] = "Publicar en StatusNet";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Por favor, contacta con el administrador de tu web.<br />La dirección API suministrada no es válida.";
+$a->strings["We could not contact the StatusNet API with the Path you entered."] = "No podemos contantar con StatusNet en la ruta que has especificado.";
+$a->strings["StatusNet settings updated."] = "Actualición de la configuración de StatusNet.";
+$a->strings["StatusNet Posting Settings"] = "Configuración de envío a StatusNet";
+$a->strings["Globally Available StatusNet OAuthKeys"] = "StatusNet OAuthKeys disponibles para todos";
+$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)."] = "Existen pares de valores OAuthKey preconfigurados para algunos servidores. Si usas uno de ellos, por favor usa estas credenciales. De los contrario no dudes en conectar con cualquiera otra instancia de StatusNet (ver a continuación).";
+$a->strings["Provide your own OAuth Credentials"] = "Proporciona tus propias credenciales 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 se ha encontrado ningún par de claves consumer para StatusNet. Registra tu cuenta de Friendica como un cliente de escritorio en tu cuenta de StatusNet, copia el par de claves consumer aquí e introduce la dirección de la API.<br />Antes de registrar tu propio par de claves OAuth pregunta a tu administrador si ya existe un par de claves para esa instalación de Friendica en tu instalación StatusNet favorita.";
+$a->strings["OAuth Consumer Key"] = "Clave OAuth del usuario";
+$a->strings["OAuth Consumer Secret"] = "Secreto OAuth del usuario";
+$a->strings["Base API Path (remember the trailing /)"] = "Dirección de la API (recordar el / 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."] = "Para conectarte a tu cuenta de StatusNet haz clic en el botón abajo para obtener un PIN de StatusNet, que tienes que copiar en el cuadro de entrada y enviar el formulario. Solo tus publicaciones <strong>públicas</strong> se publicarán en StatusNet.";
+$a->strings["Log in with StatusNet"] = "Inicia sesión en StatusNet";
+$a->strings["Copy the security code from StatusNet here"] = "Copia el código de seguridad de StatusNet aquí";
+$a->strings["Cancel Connection Process"] = "Cancelar la conexión en proceso";
+$a->strings["Current StatusNet API is"] = "El estado actual de la API de StatusNet es";
+$a->strings["Cancel StatusNet Connection"] = "Cancelar conexión con StatusNet";
+$a->strings["Currently connected to: "] = "Actualmente conectado 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 lo habilitas todas tus publicaciones </strong>públicas</strong> podrán ser publicadas en la cuenta asociada de StatusNet. Pudes elegir hacerlo por defecto (aquí) o para cada publicación individualmente en las opciones de publicacion cuando las escribes.";
+$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>: Debido a tus opciones de privacidad (<em>¿Ocultar los detalles de tu perfil de espectadores desconocidos?</ em>) el vínculo potencialmente incluido en publicaciones públicas que se transmiten a StatusNet conducirá al visitante a una página en blanco que informa a los visitantes que el acceso a tu perfil es restringido.";
+$a->strings["Allow posting to StatusNet"] = "Permitir publicaciones en StatusNet";
+$a->strings["Send public postings to StatusNet by default"] = "Enviar publicaciones públicas a StatusNet por defecto";
+$a->strings["Send linked #-tags and @-names to StatusNet"] = "Enviar a StatusNet las #-etiquetas y @-nombres";
+$a->strings["Clear OAuth configuration"] = "Borrar la configuración de OAuth";
+$a->strings["API URL"] = "Dirección de la API";
+$a->strings["Infinite Improbability Drive"] = "Unidad de improbabilidad infinita";
+$a->strings["Post to Tumblr"] = "Publicar en Tumblr";
+$a->strings["Tumblr Post Settings"] = "Configuración de publicación en Tumblr";
+$a->strings["Enable Tumblr Post Plugin"] = "Habilitar el módulo de publicación en Tumblr";
+$a->strings["Tumblr login"] = "Tumblr - inicio de sesión";
+$a->strings["Tumblr password"] = "Tumblr - contraseña";
+$a->strings["Post to Tumblr by default"] = "Publicar en Tumblr por defecto";
+$a->strings["Numfriends settings updated."] = "Configuración del Contador de contactos actualizada";
+$a->strings["Numfriends Settings"] = "Configuración del Contador de contactos";
+$a->strings["Gnot settings updated."] = "Configuración de Gnot actualizada.";
+$a->strings["Gnot Settings"] = "Configuración de Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permitir el enhebrado en las notificaciones de comentarios de correo en Gmail y hacer anónima la línea de \"Asunto\".";
+$a->strings["Enable this plugin/addon?"] = "¿Activar este módulo/extensión?";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notificación] Comentario en la conversación de #%d";
 $a->strings["Post to Wordpress"] = "Publicar en Wordpress";
 $a->strings["WordPress Post Settings"] = "Configuración de publicación en Wordpres";
-$a->strings["Enable WordPress Post Plugin"] = "Habilitar el plugin de publicación en Wordpress";
+$a->strings["Enable WordPress Post Plugin"] = "Habilitar el módulo de publicación en Wordpress";
 $a->strings["WordPress username"] = "WordPress - nombre de usuario";
 $a->strings["WordPress password"] = "WordPress - contraseña";
 $a->strings["WordPress API URL"] = "WordPress - dirección API";
 $a->strings["Post to WordPress by default"] = "Publicar a WordPress por defecto";
-$a->strings["(no subject)"] = "(sin asunto)";
+$a->strings["Provide a backlink to the Friendica post"] = "Añade un enlace de vuelta a la publicación de Friendica";
+$a->strings["Read the original post and comment stream on Friendica"] = "Leer la publicación original y los comentarios en Friendica";
+$a->strings["\"Show more\" Settings"] = "Configuración de \"Muéstrame más\"";
+$a->strings["Enable Show More"] = "Activar Muéstrame más";
+$a->strings["Cutting posts after how much characters"] = "Cortar las publicaciones después de cuántos caracteres";
+$a->strings["Show More Settings saved."] = "Configuración de Muéstrame más guardada.";
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Este sitio realiza un seguimiento mediante la herramienta de análisis <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 quieres que tus visitas sean registradas de esta manera <a href='%s'>puedes establecer una cookie para evitar que Piwik realice un seguimiento de las visitas del sitio</a> (opt-out).";
+$a->strings["Piwik Base URL"] = "Dirección base Piwik";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Ruta absoluta a tu instalación de Piwik (sin el protocolo (http/s) pero con la barra).";
+$a->strings["Site ID"] = "ID del sitio";
+$a->strings["Show opt-out cookie link?"] = "¿Mostrar enlace a las cookies?";
+$a->strings["Asynchronous tracking"] = "Seguimiento asíncrono";
+$a->strings["Post to Twitter"] = "Publicar en Twitter";
+$a->strings["Twitter settings updated."] = "Actualización de la configuración de Twitter";
+$a->strings["Twitter Posting Settings"] = "Configuración de publicaciones en Twitter";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No se ha encontrado ningún par de claves para Twitter. Póngase en contacto con el administrador del sitio.";
+$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 esta instalación de Friendica el módulo de Twitter está activo pero aún no has conectado tu cuenta con la de Twitter. Para hacerlo, pulsa en el siguiente botón para obtener un PIN de Twitter, que deberás introducir en la casilla de abajo y enviar el formulario. Unicamente el contenido <strong>público</strong> que publiques será publicado en Twitter.";
+$a->strings["Log in with Twitter"] = "Acceder con Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Copia el 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 lo habilitas todas tus publicaciones <strong>públicas</strong> serán publicadas en la cuenta de Twitter asociada. Puedes elegir hacerlo por defecto (aquí) o individualmente para cada publicación usando las opciones cuando escribas.";
+$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>: Debido a tus opciones de privacidad (<em>¿Ocultar los detalles de tu perfil de espectadores desconocidos?</ em>) el vínculo potencialmente incluido en publicaciones públicas que se transmiten a Twitter conducirá al visitante a una página en blanco que informa a los visitantes que el acceso a tu perfil es restringido.";
+$a->strings["Allow posting to Twitter"] = "Permitir publicar en Twitter";
+$a->strings["Send public postings to Twitter by default"] = "Enviar publicaciones públicas a Twitter por defecto";
+$a->strings["Send linked #-tags and @-names to Twitter"] = "Enviar a Twitter las #-etiquetas y @-nombres";
+$a->strings["Consumer key"] = "Clave del usuario";
+$a->strings["Consumer secret"] = "Secreto del usuario";
+$a->strings["IRC Settings"] = "Configuración IRC";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Conectar automáticamente a (canales separados por coma)";
+$a->strings["Popular Channels (comma separated)"] = "Canales populares (separados por coma)";
+$a->strings["IRC settings saved."] = "Configuración de IRC guardada.";
+$a->strings["IRC Chatroom"] = "Sala de Chat IRC";
+$a->strings["Popular Channels"] = "Canales populares";
+$a->strings["Post to blogger"] = "Publícar en Blogger";
+$a->strings["Blogger Post Settings"] = "Configuración de las publicaciones en Blogger";
+$a->strings["Enable Blogger Post Plugin"] = "Activar el módulo de publicación en Blogger";
+$a->strings["Blogger username"] = "Nombre de usuario de Blogger";
+$a->strings["Blogger password"] = "Contraseña de Blogger";
+$a->strings["Blogger API URL"] = "Dirección de la API de Blogger";
+$a->strings["Post to Blogger by default"] = "Publicar en Blogger por defecto";
+$a->strings["Post to Posterous"] = "Publicar en Posterous";
+$a->strings["Posterous Post Settings"] = "Configuración de las publicaciones en Posterous";
+$a->strings["Enable Posterous Post Plugin"] = "Activar el módulo de publicación en Posterous";
+$a->strings["Posterous login"] = "Entrar en Posterous";
+$a->strings["Posterous password"] = "Contraseña de Posterous";
+$a->strings["Posterous site ID"] = "ID de Posterous";
+$a->strings["Posterous API token"] = "API de Posterous";
+$a->strings["Post to Posterous by default"] = "Publicar en Posterous por defecto";
+$a->strings["Theme settings"] = "Configuración del Tema";
+$a->strings["Set resize level for images in posts and comments (width and height)"] = "Configurar el tamaño de las imágenes en las publicaciones";
+$a->strings["Set font-size for posts and comments"] = "Tamaño del texto para publicaciones y comentarios";
+$a->strings["Set theme width"] = "Establecer el ancho para el tema";
+$a->strings["Color scheme"] = "Esquema de color";
+$a->strings["Your posts and conversations"] = "Tus publicaciones y conversaciones";
+$a->strings["Your profile page"] = "Tu página de perfil";
+$a->strings["Your contacts"] = "Tus contactos";
+$a->strings["Your photos"] = "Tus fotos";
+$a->strings["Your events"] = "Tus eventos";
+$a->strings["Personal notes"] = "Notas personales";
+$a->strings["Your personal photos"] = "Tus fotos personales";
+$a->strings["Community Pages"] = "Páginas de Comunidad";
+$a->strings["Community Profiles"] = "Perfiles de la Comunidad";
+$a->strings["Last users"] = "Últimos usuarios";
+$a->strings["Last likes"] = "Últimos \"me gusta\"";
+$a->strings["Last photos"] = "Últimas fotos";
+$a->strings["Find Friends"] = "Buscar amigos";
+$a->strings["Local Directory"] = "Directorio local";
+$a->strings["Similar Interests"] = "Intereses similares";
+$a->strings["Invite Friends"] = "Invitar amigos";
+$a->strings["Earth Layers"] = "Minimapa";
+$a->strings["Set zoomfactor for Earth Layers"] = "Configurar zoom en Minimapa";
+$a->strings["Set longitude (X) for Earth Layers"] = "Configurar longitud (X) en Minimapa";
+$a->strings["Set latitude (Y) for Earth Layers"] = "Configurar latitud (Y) en Minimapa";
+$a->strings["Help or @NewHere ?"] = "¿Ayuda o @NuevoAquí?";
+$a->strings["Connect Services"] = "Servicios conectados";
+$a->strings["Last Tweets"] = "Últimos tweets";
+$a->strings["Set twitter search term"] = "Establecer término de búsqueda en Twitter";
+$a->strings["don't show"] = "no mostrar";
+$a->strings["show"] = "mostrar";
+$a->strings["Show/hide boxes at right-hand column:"] = "Mostrar/Ocultar casillas en la columna derecha:";
+$a->strings["Set line-height for posts and comments"] = "Altura para las publicaciones y comentarios";
+$a->strings["Set resolution for middle column"] = "Resolución para la columna central";
+$a->strings["Set color scheme"] = "Configurar esquema de color";
+$a->strings["Set zoomfactor for Earth Layer"] = "Establecer zoom para Minimapa";
+$a->strings["Last tweets"] = "Últimos tweets";
+$a->strings["Alignment"] = "Alineación";
+$a->strings["Left"] = "Izquierda";
+$a->strings["Center"] = "Centrado";
+$a->strings["Set colour scheme"] = "Configurar esquema de color";
+$a->strings["j F, Y"] = "j F, Y";
+$a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Fecha de nacimiento:";
+$a->strings["Age:"] = "Edad:";
+$a->strings["for %1\$d %2\$s"] = "por %1\$d %2\$s";
+$a->strings["Tags:"] = "Etiquetas:";
+$a->strings["Religion:"] = "Religión:";
+$a->strings["Hobbies/Interests:"] = "Aficiones/Intereses:";
+$a->strings["Contact information and Social Networks:"] = "Información de contacto y Redes sociales:";
+$a->strings["Musical interests:"] = "Intereses musicales:";
+$a->strings["Books, literature:"] = "Libros, literatura:";
+$a->strings["Television:"] = "Televisión:";
+$a->strings["Film/dance/culture/entertainment:"] = "Películas/baile/cultura/entretenimiento:";
+$a->strings["Love/Romance:"] = "Amor/Romance:";
+$a->strings["Work/employment:"] = "Trabajo/ocupación:";
+$a->strings["School/education:"] = "Escuela/estudios:";
 $a->strings["Unknown | Not categorised"] = "Desconocido | No clasificado";
 $a->strings["Block immediately"] = "Bloquear inmediatamente";
 $a->strings["Shady, spammer, self-marketer"] = "Sospechoso, spammer, auto-publicidad";
@@ -955,19 +1645,19 @@ $a->strings["Reputable, has my trust"] = "Buena reputación, tiene mi confianza"
 $a->strings["Frequently"] = "Frequentemente";
 $a->strings["Hourly"] = "Cada hora";
 $a->strings["Twice daily"] = "Dos veces al día";
-$a->strings["Daily"] = "Diariamente";
-$a->strings["Weekly"] = "Semanalmente";
-$a->strings["Monthly"] = "Mensualmente";
 $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["Male"] = "Hombre";
 $a->strings["Female"] = "Mujer";
 $a->strings["Currently Male"] = "Actualmente Hombre";
 $a->strings["Currently Female"] = "Actualmente Mujer";
 $a->strings["Mostly Male"] = "Mayormente Hombre";
 $a->strings["Mostly Female"] = "Mayormente Mujer";
-$a->strings["Transgender"] = "Transgénero";
+$a->strings["Transgender"] = "Transgenérico";
 $a->strings["Intersex"] = "Bisexual";
 $a->strings["Transsexual"] = "Transexual";
 $a->strings["Hermaphrodite"] = "Hermafrodita";
@@ -982,16 +1672,18 @@ $a->strings["Lesbian"] = "Lesbiana";
 $a->strings["No Preference"] = "Sin preferencias";
 $a->strings["Bisexual"] = "Bisexual";
 $a->strings["Autosexual"] = "Autosexual";
-$a->strings["Abstinent"] = "Abstinente";
+$a->strings["Abstinent"] = "Célibe";
 $a->strings["Virgin"] = "Virgen";
 $a->strings["Deviant"] = "Desviado";
 $a->strings["Fetish"] = "Fetichista";
-$a->strings["Oodles"] = "Orgías";
+$a->strings["Oodles"] = "Orgiástico";
 $a->strings["Nonsexual"] = "Asexual";
 $a->strings["Single"] = "Soltero";
 $a->strings["Lonely"] = "Solitario";
 $a->strings["Available"] = "Disponible";
 $a->strings["Unavailable"] = "No disponible";
+$a->strings["Has crush"] = "Enamorado";
+$a->strings["Infatuated"] = "Loco/a por alguien";
 $a->strings["Dating"] = "De citas";
 $a->strings["Unfaithful"] = "Infiel";
 $a->strings["Sex Addict"] = "Adicto al sexo";
@@ -1000,83 +1692,70 @@ $a->strings["Friends/Benefits"] = "Amigos con beneficios";
 $a->strings["Casual"] = "Casual";
 $a->strings["Engaged"] = "Comprometido/a";
 $a->strings["Married"] = "Casado/a";
+$a->strings["Imaginarily married"] = "Casado imaginario";
 $a->strings["Partners"] = "Socios";
 $a->strings["Cohabiting"] = "Cohabitando";
+$a->strings["Common law"] = "Pareja de hecho";
 $a->strings["Happy"] = "Feliz";
-$a->strings["Not Looking"] = "No estoy buscando";
+$a->strings["Not looking"] = "No busca relación";
 $a->strings["Swinger"] = "Swinger";
 $a->strings["Betrayed"] = "Traicionado/a";
 $a->strings["Separated"] = "Separado/a";
 $a->strings["Unstable"] = "Inestable";
 $a->strings["Divorced"] = "Divorciado/a";
+$a->strings["Imaginarily divorced"] = "Divorciado imaginario";
 $a->strings["Widowed"] = "Viudo/a";
 $a->strings["Uncertain"] = "Incierto";
-$a->strings["Complicated"] = "Complicado";
+$a->strings["It's complicated"] = "Es complicado";
 $a->strings["Don't care"] = "No te importa";
 $a->strings["Ask me"] = "Pregúntame";
 $a->strings["Starts:"] = "Inicio:";
 $a->strings["Finishes:"] = "Final:";
-$a->strings["Visible to everybody"] = "Visible para cualquiera";
-$a->strings["show"] = "mostrar";
-$a->strings["don't show"] = "no mostrar";
-$a->strings["Logged out."] = "Sesión terminada";
-$a->strings["Image/photo"] = "Imagen/Foto";
-$a->strings["From: "] = "De:";
-$a->strings["View status"] = "Ver estado";
-$a->strings["View profile"] = "Ver perfirl";
-$a->strings["View photos"] = "Ver fotos";
-$a->strings["View recent"] = "Ver recientes";
-$a->strings["Send PM"] = "Enviar mensaje privado";
-$a->strings["Miscellaneous"] = "Varios";
-$a->strings["year"] = "año";
-$a->strings["month"] = "mes";
-$a->strings["day"] = "día";
-$a->strings["never"] = "nunca";
-$a->strings["less than a second ago"] = "hace menos de un segundo";
-$a->strings["years"] = "años";
-$a->strings["months"] = "meses";
-$a->strings["week"] = "semana";
-$a->strings["weeks"] = "semanas";
-$a->strings["days"] = "días";
-$a->strings["hour"] = "hora";
-$a->strings["hours"] = "horas";
-$a->strings["minute"] = "minuto";
-$a->strings["minutes"] = "minutos";
-$a->strings["second"] = "segundo";
-$a->strings["seconds"] = "segundos";
-$a->strings[" ago"] = " hace";
-$a->strings["Birthday:"] = "Fecha de nacimiento:";
-$a->strings["j F, Y"] = "j F, Y";
-$a->strings["j F"] = "j F";
-$a->strings["Age:"] = "Edad:";
-$a->strings["Religion:"] = "Religión:";
-$a->strings["About:"] = "Acerca de:";
-$a->strings["Hobbies/Interests:"] = "Aficiones/Intereses:";
-$a->strings["Contact information and Social Networks:"] = "Información de contacto y Redes sociales:";
-$a->strings["Musical interests:"] = "Intereses musicales:";
-$a->strings["Books, literature:"] = "Libros, literatura:";
-$a->strings["Television:"] = "Televisión:";
-$a->strings["Film/dance/culture/entertainment:"] = "Películas/baile/cultura/entretenimiento:";
-$a->strings["Love/Romance:"] = "Amor/Romance:";
-$a->strings["Work/employment:"] = "Trabajo/ocupación:";
-$a->strings["School/education:"] = "Escuela/estudios:";
+$a->strings["(no subject)"] = "(sin asunto)";
+$a->strings[" on Last.fm"] = "en Last.fm";
 $a->strings["prev"] = "ant.";
 $a->strings["first"] = "primera";
 $a->strings["last"] = "última";
 $a->strings["next"] = "sig.";
+$a->strings["newer"] = "más nuevo";
+$a->strings["older"] = "más antiguo";
 $a->strings["No contacts"] = "Sin contactos";
 $a->strings["%d Contact"] = array(
 	0 => "%d Contacto",
 	1 => "%d Contactos",
 );
-$a->strings["Search"] = "Buscar";
-$a->strings["Monday"] = "Lunes";
-$a->strings["Tuesday"] = "Martes";
-$a->strings["Wednesday"] = "Miércoles";
-$a->strings["Thursday"] = "Jueves";
-$a->strings["Friday"] = "Viernes";
-$a->strings["Saturday"] = "Sábado";
-$a->strings["Sunday"] = "Domingo";
+$a->strings["poke"] = "tocar";
+$a->strings["poked"] = "tocó a";
+$a->strings["ping"] = "hacer \"ping\"";
+$a->strings["pinged"] = "hizo \"ping\" a";
+$a->strings["prod"] = "empujar";
+$a->strings["prodded"] = "empujó a";
+$a->strings["slap"] = "abofetear";
+$a->strings["slapped"] = "abofeteó a";
+$a->strings["finger"] = "meter dedo";
+$a->strings["fingered"] = "le metió un dedo a";
+$a->strings["rebuff"] = "desairar";
+$a->strings["rebuffed"] = "desairó a";
+$a->strings["happy"] = "feliz";
+$a->strings["sad"] = "triste";
+$a->strings["mellow"] = "sentimental";
+$a->strings["tired"] = "cansado";
+$a->strings["perky"] = "alegre";
+$a->strings["angry"] = "furioso";
+$a->strings["stupified"] = "estupefacto";
+$a->strings["puzzled"] = "extrañado";
+$a->strings["interested"] = "interesado";
+$a->strings["bitter"] = "rencoroso";
+$a->strings["cheerful"] = "jovial";
+$a->strings["alive"] = "vivo";
+$a->strings["annoyed"] = "enojado";
+$a->strings["anxious"] = "ansioso";
+$a->strings["cranky"] = "irritable";
+$a->strings["disturbed"] = "perturbado";
+$a->strings["frustrated"] = "frustrado";
+$a->strings["motivated"] = "motivado";
+$a->strings["relaxed"] = "relajado";
+$a->strings["surprised"] = "sorprendido";
 $a->strings["January"] = "Enero";
 $a->strings["February"] = "Febrero";
 $a->strings["March"] = "Marzo";
@@ -1090,94 +1769,231 @@ $a->strings["October"] = "Octubre";
 $a->strings["November"] = "Noviembre";
 $a->strings["December"] = "Diciembre";
 $a->strings["bytes"] = "bytes";
-$a->strings["Select an alternate language"] = "Elige otro idioma";
+$a->strings["remove"] = "eliminar";
+$a->strings["[remove]"] = "[eliminar]";
+$a->strings["Categories:"] = "Categorías:";
+$a->strings["Filed under:"] = "Archivado en:";
+$a->strings["Click to open/close"] = "Pulsa para abrir/cerrar";
 $a->strings["default"] = "predeterminado";
-$a->strings["End this session"] = "Terminar esta sesión";
-$a->strings["Your posts and conversations"] = "Tus publicaciones y conversaciones";
-$a->strings["Your profile page"] = "Su página de perfil";
-$a->strings["Your photos"] = "Sus fotos";
-$a->strings["Your events"] = "Sus eventos";
-$a->strings["Personal notes"] = "Notas personales";
-$a->strings["Your personal photos"] = "Sus fotos personales";
+$a->strings["Select an alternate language"] = "Elige otro idioma";
+$a->strings["activity"] = "Actividad";
+$a->strings["comment"] = "Comentario";
+$a->strings["post"] = "Publicación";
+$a->strings["Item filed"] = "Elemento archivado";
+$a->strings["Sharing notification from Diaspora network"] = "Compartir notificaciones con la red Diaspora*";
+$a->strings["Attachments:"] = "Archivos adjuntos:";
+$a->strings["view full size"] = "Ver a tamaño completo";
+$a->strings["Embedded content"] = "Contenido integrado";
+$a->strings["Embedding disabled"] = "Contenido incrustrado desabilitado";
+$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 grupo eliminado con este nombre fue restablecido. Los permisos existentes <strong>pueden</strong> aplicarse a este grupo y a sus futuros miembros. Si esto no es lo que pretendes, por favor, crea otro grupo con un nombre diferente.";
+$a->strings["Default privacy group for new contacts"] = "Grupo por defecto para nuevos contactos";
+$a->strings["Everybody"] = "Todo el mundo";
+$a->strings["edit"] = "editar";
+$a->strings["Edit group"] = "Editar grupo";
+$a->strings["Create a new group"] = "Crear un nuevo grupo";
+$a->strings["Contacts not in any group"] = "Contactos sin grupo";
+$a->strings["Logout"] = "Salir";
+$a->strings["End this session"] = "Cerrar la sesión";
+$a->strings["Status"] = "Estado";
 $a->strings["Sign in"] = "Date de alta";
 $a->strings["Home Page"] = "Página de inicio";
 $a->strings["Create an account"] = "Crea una cuenta";
 $a->strings["Help and documentation"] = "Ayuda y documentación";
 $a->strings["Apps"] = "Aplicaciones";
-$a->strings["Addon applications, utilities, games"] = "APlicaciones, utilidades, juegos";
+$a->strings["Addon applications, utilities, games"] = "Aplicaciones, utilidades, juegos";
 $a->strings["Search site content"] = " Busca contenido en la página";
 $a->strings["Conversations on this site"] = "Conversaciones en este sitio";
 $a->strings["Directory"] = "Directorio";
-$a->strings["People directory"] = "Directorio de gente";
+$a->strings["People directory"] = "Directorio de usuarios";
 $a->strings["Conversations from your friends"] = "Conversaciones de tus amigos";
 $a->strings["Friend Requests"] = "Solicitudes de amistad";
+$a->strings["See all notifications"] = "Ver todas las notificaciones";
+$a->strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas";
 $a->strings["Private mail"] = "Correo privado";
+$a->strings["Inbox"] = "Entrada";
+$a->strings["Outbox"] = "Enviados";
 $a->strings["Manage"] = "Administrar";
 $a->strings["Manage other pages"] = "Administrar otras páginas";
+$a->strings["Profiles"] = "Perfiles";
+$a->strings["Manage/edit profiles"] = "Administrar/editar perfiles";
 $a->strings["Manage/edit friends and contacts"] = "Administrar/editar amigos y contactos";
-$a->strings["Admin"] = "Admin";
 $a->strings["Site setup and configuration"] = "Opciones y configuración del sitio";
-$a->strings["Nothing new here"] = "Nada nuevo aquí";
-$a->strings["Select"] = "Seleccionar";
-$a->strings["View %s's profile @ %s"] = "Ver perfil de %s @ %s";
-$a->strings["%s from %s"] = "%s de %s";
-$a->strings["View in context"] = "Verlo en contexto";
-$a->strings["See all %d comments"] = "Ver los %d comentarios";
-$a->strings["like"] = "me gusta";
-$a->strings["dislike"] = "no me gusta";
-$a->strings["Share this"] = "Compartir esto";
-$a->strings["share"] = "compartir";
-$a->strings["add star"] = "Añadir estrella";
-$a->strings["remove star"] = "Quitar estrella";
-$a->strings["toggle star status"] = "Añadir a destacados";
-$a->strings["starred"] = "marcados con estrellas";
-$a->strings["add tag"] = "añadir etiqueta";
-$a->strings["to"] = "a";
-$a->strings["Wall-to-Wall"] = "Muro-A-Muro";
-$a->strings["via Wall-To-Wall:"] = "via Muro-A-Muro:";
+$a->strings["Nothing new here"] = "Nada nuevo por aquí";
+$a->strings["Add New Contact"] = "Añadir nuevo contacto";
+$a->strings["Enter address or web location"] = "Escribe la dirección o página web";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Ejemplo: miguel@ejemplo.com, http://ejemplo.com/miguel";
+$a->strings["%d invitation available"] = array(
+	0 => "%d invitación disponible",
+	1 => "%d invitaviones disponibles",
+);
+$a->strings["Find People"] = "Buscar personas";
+$a->strings["Enter name or interest"] = "Introduzce nombre o intereses";
+$a->strings["Connect/Follow"] = "Conectar/Seguir";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Ejemplos: Robert Morgenstein, Pesca";
+$a->strings["Random Profile"] = "Perfil aleatorio";
+$a->strings["Networks"] = "Redes";
+$a->strings["All Networks"] = "Todas las redes";
+$a->strings["Saved Folders"] = "Directorios guardados";
+$a->strings["Everything"] = "Todo";
+$a->strings["Categories"] = "Categorías";
+$a->strings["Logged out."] = "Sesión finalizada";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Se ha encontrado un problema para acceder con el OpenID que has escrito. Verifica que lo hayas escrito correctamente.";
+$a->strings["The error message was:"] = "El mensaje del error fue:";
+$a->strings["Miscellaneous"] = "Varios";
+$a->strings["year"] = "año";
+$a->strings["month"] = "mes";
+$a->strings["day"] = "día";
+$a->strings["never"] = "nunca";
+$a->strings["less than a second ago"] = "hace menos de un segundo";
+$a->strings["week"] = "semana";
+$a->strings["hour"] = "hora";
+$a->strings["hours"] = "horas";
+$a->strings["minute"] = "minuto";
+$a->strings["minutes"] = "minutos";
+$a->strings["second"] = "segundo";
+$a->strings["seconds"] = "segundos";
+$a->strings["%1\$d %2\$s ago"] = "hace %1\$d %2\$s";
+$a->strings["%s's birthday"] = "Cumpleaños de %s";
+$a->strings["Happy Birthday %s"] = "Feliz cumpleaños %s";
+$a->strings["From: "] = "De: ";
+$a->strings["Image/photo"] = "Imagen/Foto";
+$a->strings["$1 wrote:"] = "$1 escribió:";
+$a->strings["Encrypted content"] = "Contenido cifrado";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "No se puede encontrar información DNS para la base de datos del servidor '%s'";
+$a->strings["[no subject]"] = "[sin asunto]";
+$a->strings["Visible to everybody"] = "Visible para cualquiera";
+$a->strings["Friendica Notification"] = "Notificación de Friendica";
+$a->strings["Thank You,"] = "Gracias,";
+$a->strings["%s Administrator"] = "%s Administrador";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notificación] Nuevo correo recibido de %s";
+$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s te ha enviado un mensaje privado desde %2\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s te ha enviado %2\$s.";
+$a->strings["a private message"] = "un mensaje privado";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor, visita %s para ver y/o responder a tus mensajes privados.";
+$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s comentó en [url=%2\$s]a %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s comentó en [url=%2\$s] %4\$s de %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s comentó en [url=%2\$s] tu %3\$s[/url]";
+$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Notificación] Comentario en la conversación de #%1\$d por %2\$s";
+$a->strings["%s commented on an item/conversation you have been following."] = "%s ha comentado en una conversación/elemento que sigues.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Por favor, visita %s para ver y/o responder a la conversación.";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notificación] %s publicó en tu muro";
+$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s publicó en tu perfil de %2\$s";
+$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s publicó en [url=%2\$s]tu muro[/url]";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notificación] %s te ha nombrado";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s te ha nombrado en %2\$s";
+$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]te nombró[/url].";
+$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notify] %1\$s te dio un toque";
+$a->strings["%1\$s poked you at %2\$s"] = "%1\$s te dio un toque en %2\$s";
+$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]te dio un toque[/url].";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notificación] %s ha etiquetado tu publicación";
+$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s ha etiquetado tu publicación en %2\$s";
+$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s ha etiquetado [url=%2\$s]tu publicación[/url]";
+$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Notificación] Presentación recibida";
+$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Has recibido una presentación de '%1\$s' en %2\$s";
+$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Has recibido [url=%1\$s]una presentación[/url] de %2\$s.";
+$a->strings["You may visit their profile at %s"] = "Puedes visitar su perfil en %s";
+$a->strings["Please visit %s to approve or reject the introduction."] = "Visita %s para aceptar o rechazar la presentación por favor.";
+$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Notificación] Sugerencia de amigo recibida";
+$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Has recibido una sugerencia de amigo de '%1\$s' en %2\$s";
+$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Has recibido [url=%1\$s]una sugerencia de amigo[/url] en %2\$s de %3\$s.";
+$a->strings["Name:"] = "Nombre: ";
+$a->strings["Photo:"] = "Foto: ";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Visita %s para aceptar o rechazar la sugerencia por favor.";
+$a->strings["Connect URL missing."] = "Falta el conector URL.";
+$a->strings["This site is not configured to allow communications with other networks."] = "Este sitio no está configurado para permitir la comunicación con otras redes.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "No se ha descubierto protocolos de comunicación o fuentes compatibles.";
+$a->strings["The profile address specified does not provide adequate information."] = "La dirección del perfil especificado no proporciona información adecuada.";
+$a->strings["An author or name was not found."] = "No se ha encontrado un autor o nombre.";
+$a->strings["No browser URL could be matched to this address."] = "Ninguna dirección concuerda con la suministrada.";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Imposible identificar la dirección @ con algún protocolo conocido o dirección de contacto.";
+$a->strings["Use mailto: in front of address to force email check."] = "Escribe mailto: al principio de la dirección para forzar el envío.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "La dirección del perfil especificada pertenece a una red que ha sido deshabilitada en este sitio.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Perfil limitado. Esta persona no podrá recibir notificaciones directas/personales tuyas.";
+$a->strings["Unable to retrieve contact information."] = "No ha sido posible recibir la información del contacto.";
+$a->strings["following"] = "siguiendo";
+$a->strings["A new person is sharing with you at "] = "Una nueva persona está compartiendo contigo en ";
+$a->strings["You have a new follower at "] = "Tienes un nuevo seguidor en ";
+$a->strings["Archives"] = "Archivos";
+$a->strings["An invitation is required."] = "Se necesita invitación.";
+$a->strings["Invitation could not be verified."] = "No se puede verificar la invitación.";
+$a->strings["Invalid OpenID url"] = "Dirección OpenID no válida";
+$a->strings["Please enter the required information."] = "Por favor, introduce la información necesaria.";
+$a->strings["Please use a shorter name."] = "Por favor, usa un nombre más corto.";
+$a->strings["Name too short."] = "El nombre es demasiado corto.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "No parece que ese sea tu nombre completo.";
+$a->strings["Your email domain is not among those allowed on this site."] = "Tu dominio de correo no se encuentra entre los permitidos en este sitio.";
+$a->strings["Not a valid email address."] = "No es una dirección de correo electrónico válida.";
+$a->strings["Cannot use that email."] = "No se puede utilizar este correo electrónico.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Tu \"apodo\" solo puede contener \"a-z\", \"0-9\", \"-\", y \"_\" y debe empezar por una letra.";
+$a->strings["Nickname is already registered. Please choose another."] = "Apodo ya registrado. Por favor, elije otro.";
+$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "El apodo ya ha sido registrado alguna vez y no puede volver a usarse. Por favor, utiliza otro.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERROR GRAVE: La generación de claves de seguridad ha fallado.";
+$a->strings["An error occurred during registration. Please try again."] = "Se produjo un error durante el registro. Por favor, inténtalo de nuevo.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo.";
+$a->strings["Welcome "] = "Bienvenido ";
+$a->strings["Please upload a profile photo."] = "Por favor sube una foto para tu perfil.";
+$a->strings["Welcome back "] = "Bienvenido de nuevo ";
+$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."] = "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo.";
+$a->strings["stopped following"] = "dejó de seguir";
+$a->strings["Poke"] = "Toque";
+$a->strings["View Status"] = "Ver estado";
+$a->strings["View Profile"] = "Ver perfil";
+$a->strings["View Photos"] = "Ver fotos";
+$a->strings["Network Posts"] = "Publicaciones en la red";
+$a->strings["Edit Contact"] = "Editar contacto";
+$a->strings["Send PM"] = "Enviar mensaje privado";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s le dio un toque a %2\$s";
+$a->strings["post/item"] = "publicación/tema";
+$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s ha marcado %3\$s de %2\$s como Favorito";
 $a->strings["Delete Selected Items"] = "Eliminar el elemento seleccionado";
 $a->strings["%s likes this."] = "A %s le gusta esto.";
 $a->strings["%s doesn't like this."] = "A %s no le gusta esto.";
 $a->strings["<span  %1\$s>%2\$d people</span> like this."] = "Le gusta a <span %1\$s>%2\$d personas</span>.";
 $a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "No le gusta a <span %1\$s>%2\$d personas</span>.";
 $a->strings["and"] = "y";
-$a->strings[", and %d other people"] = ", y otras %d personas";
+$a->strings[", and %d other people"] = " y a otras %d personas";
 $a->strings["%s like this."] = "Le gusta a %s.";
 $a->strings["%s don't like this."] = "No le gusta a %s.";
 $a->strings["Visible to <strong>everybody</strong>"] = "Visible para <strong>cualquiera</strong>";
-$a->strings["Please enter a video link/URL:"] = "Por favor, introduzca la URL/enlace del vídeo:";
-$a->strings["Please enter an audio link/URL:"] = "Por favor, introduzca la URL/enlace del audio:";
+$a->strings["Please enter a video link/URL:"] = "Por favor, introduce la URL/enlace del vídeo:";
+$a->strings["Please enter an audio link/URL:"] = "Por favor, introduce la URL/enlace del audio:";
 $a->strings["Tag term:"] = "Etiquetar:";
 $a->strings["Where are you right now?"] = "¿Dónde estás ahora?";
-$a->strings["Enter a title for this item"] = "Introduce un título para este elemento";
+$a->strings["upload photo"] = "subir imagen";
+$a->strings["attach file"] = "adjuntar archivo";
+$a->strings["web link"] = "enlace web";
 $a->strings["Insert video link"] = "Insertar enlace del vídeo";
-$a->strings["Insert audio link"] = "Inserte un vínculo del audio";
-$a->strings["Set title"] = "Establecer el título";
-$a->strings["view full size"] = "Ver a tamaño completo";
-$a->strings["image/photo"] = "imagen/foto";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "No se puede encontrar información de DNS para el servidor de base de datos '%s'";
-$a->strings["Add New Contact"] = "Añadir nuevo contacto";
-$a->strings["Enter address or web location"] = "Escriba la dirección o página web";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Ejemplo: bob@ejemplo.com, http://ejemplo.com/barbara";
-$a->strings["Invite Friends"] = "Invitar amigos";
-$a->strings["%d invitation available"] = array(
-	0 => "%d invitación disponible",
-	1 => "%d invitaviones disponibles",
-);
-$a->strings["Find People"] = "Buscar personas";
-$a->strings["Enter name or interest"] = "Introduzca nombre o intereses";
-$a->strings["Connect/Follow"] = "Conectar/Seguir";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Ejemplos: Robert Morgenstein, Pesca";
-$a->strings["Similar Interests"] = "Intereses similares";
-$a->strings["New mail received at "] = "Nuevo correo recibido en ";
-$a->strings["A new person is sharing with you at "] = "Una nueva persona está compartiendo con usted en";
-$a->strings["You have a new follower at "] = "Tienes un nuevo seguidor en ";
-$a->strings["[no subject]"] = "[sin asunto]";
-$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 grupo eliminado con este nombre fue restablecido. Los permisos existentes <strong>pueden</strong> aplicarse a este grupo y a sus futuros miembros. Si esto no es lo que pretende, por favor, cree otro grupo con un nombre diferente.";
-$a->strings["Create a new group"] = "Crear un nuevo grupo";
-$a->strings["Everybody"] = "Todo el mundo";
-$a->strings["Sharing notification from Diaspora network"] = "Conpartir notificaciones con la red Diaspora*";
-$a->strings["Attachments:"] = "Archivos adjuntos:";
-$a->strings["[Relayed] Comment authored by %s from network %s"] = "[Retransmitido] Comentario escrito por %s desde %s";
-$a->strings["Embedded content"] = "Contenido integrado";
-$a->strings["Embedding disabled"] = "Incrustaciones desabilitadas";
+$a->strings["video link"] = "enlace de video";
+$a->strings["Insert audio link"] = "Insertar vínculo del audio";
+$a->strings["audio link"] = "enlace de audio";
+$a->strings["set location"] = "establecer tu ubicación";
+$a->strings["clear location"] = "limpiar la localización";
+$a->strings["permissions"] = "permisos";
+$a->strings["Click here to upgrade."] = "Pulsa aquí para actualizar.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Esta acción excede los límites permitidos por tu subscripción.";
+$a->strings["This action is not available under your subscription plan."] = "Esta acción no está permitida para tu subscripción.";
+$a->strings["Delete this item?"] = "¿Eliminar este elemento?";
+$a->strings["show fewer"] = "ver menos";
+$a->strings["Update %s failed. See error logs."] = "Falló la actualización de %s. Mira los registros de errores.";
+$a->strings["Update Error at %s"] = "Error actualizado en %s";
+$a->strings["Create a New Account"] = "Crear una nueva cuenta";
+$a->strings["Nickname or Email address: "] = "Apodo o dirección de email: ";
+$a->strings["Password: "] = "Contraseña: ";
+$a->strings["Or login using OpenID: "] = "O inicia sesión usando OpenID: ";
+$a->strings["Forgot your password?"] = "¿Olvidaste la contraseña?";
+$a->strings["Requested account is not available."] = "La cuenta solicitada no está disponible.";
+$a->strings["Edit profile"] = "Editar perfil";
+$a->strings["Message"] = "Mensaje";
+$a->strings["g A l F d"] = "g A l F d";
+$a->strings["F d"] = "F d";
+$a->strings["[today]"] = "[hoy]";
+$a->strings["Birthday Reminders"] = "Recordatorios de cumpleaños";
+$a->strings["Birthdays this week:"] = "Cumpleaños esta semana:";
+$a->strings["[No description]"] = "[Sin descripción]";
+$a->strings["Event Reminders"] = "Recordatorios de eventos";
+$a->strings["Events this week:"] = "Eventos de esta semana:";
+$a->strings["Status Messages and Posts"] = "Mensajes de Estado y Publicaciones";
+$a->strings["Profile Details"] = "Detalles del Perfil";
+$a->strings["Events and Calendar"] = "Eventos y Calendario";
+$a->strings["Only You Can See This"] = "Únicamente tú puedes ver esto";
diff --git a/view/follow.tpl b/view/follow.tpl
index 259e74a931..d6f3261307 100644
--- a/view/follow.tpl
+++ b/view/follow.tpl
@@ -1,7 +1,7 @@
 <div id="follow-sidebar" class="widget">
 	<h3>$connect</h3>
 	<div id="connect-desc">$desc</div>
-	<form action="follow" method="post" />
+	<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/opensearch.tpl b/view/opensearch.tpl
index 374fcaac95..4b5c01bc90 100644
--- a/view/opensearch.tpl
+++ b/view/opensearch.tpl
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-	<ShortName>Friendika@$nodename</ShortName>
-	<Description>Search in Friendika@$nodename</Description>
-	<Contact>http://bugs.friendika.com/</Contact>
-	<Image height="16" width="16" type="image/png">$baseurl/images/friendika-16.png</Image>
-	<Image height="64" width="64" type="image/png">$baseurl/images/friendika-64.png</Image>
+	<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"
diff --git a/view/profile_photo.tpl b/view/profile_photo.tpl
index 0b3a1cac17..04ee8f9167 100644
--- a/view/profile_photo.tpl
+++ b/view/profile_photo.tpl
@@ -8,6 +8,13 @@
 <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>
diff --git a/view/theme/cleanzero/nav.tpl b/view/theme/cleanzero/nav.tpl
index 9fe5ac0fe5..65f0185919 100644
--- a/view/theme/cleanzero/nav.tpl
+++ b/view/theme/cleanzero/nav.tpl
@@ -71,3 +71,15 @@
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{4}"><a href="{0}"><img 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/darkzero/style.css b/view/theme/darkzero/style.css
index dda180bbd2..8b570a84fb 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -23,13 +23,23 @@ div.wall-item-content-wrapper.shiny {  background-image: url('shiny.png'); }
 nav #banner #logo-text a { color: #ffffff; }
 
 .wall-item-content-wrapper { 
-border: 1px solid #444444; 
-background: #444;  
-
+	border: 1px solid #444444; 
+	background: #444444;  
+}
+.wall-item-outside-wrapper.threaded > .wall-item-content-wrapper {
+	-moz-border-radius: 3px 3px 0px;
+	border-radius: 3px 3px 0px;	
 }
 .wall-item-tools {	background-color: #444444;   background-image: none;}
-.comment-wwedit-wrapper{ background-color: #444444; }
-.toplevel_item > .wall-item-comment-wrapper > .comment-wwedit-wrapper{ background-color: #333333; }
+.comment-wwedit-wrapper{
+	background-color: #333333;
+}
+.comment-wwedit-wrapper.threaded {
+	border: solid #444444;
+	border-width: 0px 3px 3px;
+	-moz-border-radius: 0px 0px 3px 3px;
+	border-radius: 0px 0px 3px 3px;	
+}
 .comment-edit-preview{ color: #000000; }
 .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
 .photo-top-album-name{ background-color: #333333; }
diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index e6b469bff0..dcb65589c1 100644
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -45,11 +45,19 @@ function insertFormatting(comment,BBcode,id) {
 	return true;
 }
 
-function cmtBbOpen(id) {
-	$(".comment-edit-bb-" + id).show();
+function cmtBbOpen(comment, id) {
+	if($(comment).hasClass('comment-edit-text-full')) {
+		$(".comment-edit-bb-" + id).show();
+		return true;
+	}
+	return false;
 }
-function cmtBbClose(id) {
-	$(".comment-edit-bb-" + id).hide();
+function cmtBbClose(comment, id) {
+	if($(comment).hasClass('comment-edit-text-empty')) {
+		$(".comment-edit-bb-" + id).hide();
+		return true;
+	}
+	return false;
 }
 
 $(document).ready(function() {
@@ -96,4 +104,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
-}
\ No newline at end of file
+}
diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl
index 0ab7de78e7..08952aad65 100644
--- a/view/theme/diabook/bottom.tpl
+++ b/view/theme/diabook/bottom.tpl
@@ -130,7 +130,7 @@ $(document).ready(function() {
 	$(".comment-edit-bb-" + id).hide();
 	}
 	
-	$(document).ready(function(){
+	/*$(document).ready(function(){
 	var doctitle = document.title;
 	function checkNotify() {
 	if(document.getElementById("notify-update").innerHTML != "")
@@ -139,7 +139,17 @@ $(document).ready(function() {
 	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/dispy/bottom.tpl b/view/theme/dispy/bottom.tpl
index 0bcc3aca41..82f0201703 100644
--- a/view/theme/dispy/bottom.tpl
+++ b/view/theme/dispy/bottom.tpl
@@ -56,4 +56,16 @@ function checkNotify() {
     };
     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/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl
index f64ae753b6..87e0605712 100755
--- a/view/theme/duepuntozero/comment_item.tpl
+++ b/view/theme/duepuntozero/comment_item.tpl
@@ -1,10 +1,9 @@
+		{{ 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 $threaded }}
-			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-			{{ else }}
+		{{ endif }}
 			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-			{{ endif }}
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
 				<input type="hidden" name="parent" value="$parent" />
@@ -43,7 +42,7 @@
 						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>			
+				<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>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 5207cedf0d..030ecdbe1f 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -932,7 +932,6 @@ input#dfrn-url {
 	position: relative;
 	-moz-border-radius: 3px;
 	border-radius: 3px;	
-
 }
 
 .tread-wrapper .tread-wrapper {
@@ -1196,6 +1195,10 @@ input#dfrn-url {
 	width: 100px;
 	float: left;
 }
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-photo {
+	width: 40px;
+}
+
 .comment-edit-photo img {
 	width: 25px;
 }
@@ -1215,6 +1218,10 @@ input#dfrn-url {
 	margin: 10px 0px 10px 110px;
 }
 
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-submit-wrapper > .comment-edit-submit {
+	margin-left: 50px;
+}
+
 #profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
 	margin-top: 15px;
@@ -1758,12 +1765,16 @@ input#dfrn-url {
 
 .comment-edit-text-empty {
 	color: gray;
-	height: 30px;
+	height: 2em;
 	width: 175px;
 	overflow: auto;
 	margin-bottom: 10px;
 }
 
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty {
+	height: 1.5em;
+}
+
 .comment-edit-text-full {
 	color: black;
 	height: 150px;
@@ -3046,7 +3057,8 @@ aside input[type='text'] {
 [class^="comment-edit-bb"] {
 	list-style: none;
 	display: none;
-	margin: 0px 0 -5px 60px;
+	margin: 0px 0 -5px 0px;
+	padding: 0px;
 	width: 75%;
 }
 [class^="comment-edit-bb"] > li {
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 2498852f97..5b87dcd420 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -34,11 +34,19 @@ function insertFormatting(comment,BBcode,id) {
 	return true;
 }
 
-function cmtBbOpen(id) {
-	$(".comment-edit-bb-" + id).show();
+function cmtBbOpen(comment, id) {
+	if($(comment).hasClass('comment-edit-text-full')) {
+		$(".comment-edit-bb-" + id).show();
+		return true;
+	}
+	return false;
 }
 function cmtBbClose(comment, id) {
-	$(".comment-edit-bb-" + id).hide();
+//	if($(comment).hasClass('comment-edit-text-empty')) {
+//		$(".comment-edit-bb-" + id).hide();
+//		return true;
+//	}
+	return false;
 }
 $(document).ready(function() {
 
diff --git a/view/theme/frost-mobile/acl_selector.tpl b/view/theme/frost-mobile/acl_selector.tpl
index 9fd7dd7ab3..327f18b65f 100644
--- a/view/theme/frost-mobile/acl_selector.tpl
+++ b/view/theme/frost-mobile/acl_selector.tpl
@@ -19,4 +19,5 @@
 	window.allowGID = $allowgid;
 	window.denyCID = $denycid;
 	window.denyGID = $denygid;
+	window.aclInit = "true";
 </script>
diff --git a/view/theme/frost-mobile/admin_site.tpl b/view/theme/frost-mobile/admin_site.tpl
index 91aeda0357..087de4f7db 100644
--- a/view/theme/frost-mobile/admin_site.tpl
+++ b/view/theme/frost-mobile/admin_site.tpl
@@ -40,7 +40,7 @@
 	{{ 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_public }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 	
diff --git a/view/theme/frost-mobile/default.php b/view/theme/frost-mobile/default.php
index d076c10f07..c2a20255f6 100644
--- a/view/theme/frost-mobile/default.php
+++ b/view/theme/frost-mobile/default.php
@@ -21,6 +21,9 @@
 	<section><?php if(x($page,'content')) echo $page['content']; ?>
 	</section>
 	</div>
+	<footer>
+	<a href="<?php echo $a->get_baseurl() ?>/toggle_mobile?off=1&address=<?php echo curPageURL() ?>">toggle mobile</a>
+	</footer>
 
 	<?php } else { ?>
 	<div class='main-container'>
@@ -33,7 +36,10 @@
 		</div>
 		<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
 		<?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>
-		<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+		<footer>
+		<a href="<?php echo $a->get_baseurl() ?>/toggle_mobile?off=1&address=<?php echo curPageURL() ?>">toggle mobile</a>
+		<?php if(x($page,'footer')) echo $page['footer']; ?>
+		</footer>
 <!--		</div>-->
 	</div>
 	<?php } ?>
diff --git a/view/theme/frost-mobile/end.tpl b/view/theme/frost-mobile/end.tpl
index 9932181336..623b99a240 100644
--- a/view/theme/frost-mobile/end.tpl
+++ b/view/theme/frost-mobile/end.tpl
@@ -5,8 +5,6 @@
 <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/js/jquery.divgrow-1.3.1.min.js" ></script>
 <script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
@@ -16,5 +14,4 @@
 <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/theme.min.js"></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/head.tpl b/view/theme/frost-mobile/head.tpl
index a849f44593..111f5f6173 100644
--- a/view/theme/frost-mobile/head.tpl
+++ b/view/theme/frost-mobile/head.tpl
@@ -27,4 +27,7 @@
 	var updateInterval = $update_interval;
 	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
 </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/main.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/images/noglobe.png b/view/theme/frost-mobile/images/noglobe.png
new file mode 100644
index 0000000000..b5aceb6d5f
Binary files /dev/null and b/view/theme/frost-mobile/images/noglobe.png differ
diff --git a/view/theme/frost-mobile/jot_geotag.tpl b/view/theme/frost-mobile/jot_geotag.tpl
new file mode 100644
index 0000000000..3f8bee91a7
--- /dev/null
+++ b/view/theme/frost-mobile/jot_geotag.tpl
@@ -0,0 +1,11 @@
+
+	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/js/main.js b/view/theme/frost-mobile/js/main.js
index aaa69e7078..a84b087304 100644
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -78,7 +78,7 @@
  			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('section').show();
+					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;
@@ -100,13 +100,13 @@
 			if (menu.css("display") == "none") {
 				$j(this).parent().addClass("selected");
 				menu.show();
-				if (menu.attr('id') == "nav-notifications-menu" ) $j('section').hide();
+				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('section').show();
+				if (menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').show();
 				last_popup_menu = null;
 				last_popup_button = null;
 			}
@@ -315,6 +315,22 @@
 				prev = ident;
 			});
 
+
+			var bimgs = $j(".wall-item-body > img").not(function() { return this.complete; });
+			var bimgcount = bimgs.length;
+
+			if (bimgcount) {
+				bimgs.load(function() {
+					bimgcount--;
+					if (! bimgcount) {
+						collapseHeight();
+
+					}
+				});
+			} else {
+				collapseHeight();
+			}
+
 			// reset vars for inserting individual items
 
 			/*prev = 'live-' + src;
@@ -349,22 +365,6 @@
 			}
 			/* autocomplete @nicknames */
 			$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
-
-			var bimgs = $j(".wall-item-body > img").not(function() { return this.complete; });
-			var bimgcount = bimgs.length;
-
-			if (bimgcount) {
-				bimgs.load(function() {
-					bimgcount--;
-					if (! bimgcount) {
-						collapseHeight();
-
-					}
-				});
-			} else {
-				collapseHeight();
-			}
-
 		});
 	}
 
diff --git a/view/theme/frost-mobile/js/main.min.js b/view/theme/frost-mobile/js/main.min.js
index 95f99dce75..f45e505621 100644
--- a/view/theme/frost-mobile/js/main.min.js
+++ b/view/theme/frost-mobile/js/main.min.js
@@ -1 +1 @@
-function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".toplevel_item",e).each(function(){var e=$j(this).attr("id");$j("#"+e).length==0&&profile_page==1?($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this))):($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+e).replaceWith($j(this))),prev=e}),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");var t=$j(".wall-item-body > img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight()})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>310&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:300,showBrackets:!1,speed:0}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY)t.x=e.touches[0].pageX,t.y=e.touches[0].pageY;else if(e.touches[0].clientX||e.touches[0].clientY)t.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.touches[0].x||e.touches[0].y)t.touches[0].x=e.touches[0].x,t.touches[0].y=e.touches[0].y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$j("body .fakelink").css("cursor","wait"),$j.get("group/"+e+"/"+t+"?t="+n,function(e){$j("#group-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$j("body .fakelink").css("cursor","wait"),$j.get("profperm/"+e+"/"+t,function(e){$j("#prof-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$j("body").css("cursor","wait"),$j.get("contactgroup/"+e+"/"+t,function(e){$j("body").css("cursor","auto")})}function checkboxhighlight(e){$j(e).is(":checked")?$j(e).addClass("checkeditem"):$j(e).removeClass("checkeditem")}function notifyMarkAll(){$j.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}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:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$j(e).val(),$j.getJSON("pretheme?f=&theme="+theme,function(e){$j("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+"</div>")})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_menu.attr("id")=="nav-notifications-menu"&&$j("section").show(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$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(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),$j("img[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:(menu.css("display")=="none"?($j(this).parent().addClass("selected"),menu.show(),menu.attr("id")=="nav-notifications-menu"&&$j("section").hide(),last_popup_menu=menu,last_popup_button=$j(this).parent()):($j(this).parent().removeClass("selected"),menu.hide(),menu.attr("id")=="nav-notifications-menu"&&$j("section").show(),last_popup_menu=null,last_popup_button=null),!1)}),$j("html").click(function(t){e(t)});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:1500})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate()});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)};
\ No newline at end of file
+function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".toplevel_item",e).each(function(){var e=$j(this).attr("id");$j("#"+e).length==0&&profile_page==1?($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this))):($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+e).replaceWith($j(this))),prev=e});var t=$j(".wall-item-body > img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight(),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>310&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:300,showBrackets:!1,speed:0}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY)t.x=e.touches[0].pageX,t.y=e.touches[0].pageY;else if(e.touches[0].clientX||e.touches[0].clientY)t.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.touches[0].x||e.touches[0].y)t.touches[0].x=e.touches[0].x,t.touches[0].y=e.touches[0].y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$j("body .fakelink").css("cursor","wait"),$j.get("group/"+e+"/"+t+"?t="+n,function(e){$j("#group-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$j("body .fakelink").css("cursor","wait"),$j.get("profperm/"+e+"/"+t,function(e){$j("#prof-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$j("body").css("cursor","wait"),$j.get("contactgroup/"+e+"/"+t,function(e){$j("body").css("cursor","auto")})}function checkboxhighlight(e){$j(e).is(":checked")?$j(e).addClass("checkeditem"):$j(e).removeClass("checkeditem")}function notifyMarkAll(){$j.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}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:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$j(e).val(),$j.getJSON("pretheme?f=&theme="+theme,function(e){$j("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+"</div>")})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),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.ajaxSetup({cache:!1}),msie=$j.browser.msie,$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(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),$j("img[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:(menu.css("display")=="none"?($j(this).parent().addClass("selected"),menu.show(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").hide(),last_popup_menu=menu,last_popup_button=$j(this).parent()):($j(this).parent().removeClass("selected"),menu.hide(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_menu=null,last_popup_button=null),!1)}),$j("html").click(function(t){e(t)});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:1500})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate()});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)};
\ No newline at end of file
diff --git a/view/theme/frost-mobile/js/theme.js b/view/theme/frost-mobile/js/theme.js
index e9024cf5a3..571720e7c4 100644
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@@ -49,7 +49,7 @@ $j(document).ready(function() {
 		}
 	}
 
-	if(typeof acl=="undefined"){
+	if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
 		acl = new ACL(
 			baseurl+"/acl",
 			[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
diff --git a/view/theme/frost-mobile/js/theme.min.js b/view/theme/frost-mobile/js/theme.min.js
index b54cb1bc91..60dad6220b 100644
--- a/view/theme/frost-mobile/js/theme.min.js
+++ b/view/theme/frost-mobile/js/theme.min.js
@@ -1 +1 @@
-function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j(".comment-edit-bb-"+e).show()}function cmtBbClose(e){$j(".comment-edit-bb-"+e).hide()}function initEditor(e){if(editor==0){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var e=$j("#profile-jot-acl-wrapper").parent();return e.css("display")=="none"?e.show():e.hide(),!1}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}}else typeof e!="undefined"&&e()}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function wallInitEditor(){var e=window.editSelect;e!="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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.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:!0,onEndCrop:e})})}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function showEvent(e){}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){$j.get("filer/",function(t){var n=$j("#id_term_label",t).text();reply=prompt(n),reply&&reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1)})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}}$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser);if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var e=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),t=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var e=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),window.autoCompleteType=="display-head"&&$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var n=location.href.replace(baseurl,"").split("/");n.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",n[2],n[3]-1);var r=location.hash.split("-");r.length==2&&r[0]=="#link"&&showEvent(r[1])}(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var i=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var i=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});i.setOptions({params:{type:"a"}});break;default:}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),$j(".popupbox").click(function(){var e=$j($j(this).attr("href")).parent();return e.css("display")=="none"?e.show():e.hide(),!1})}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})});var editor=!1,textlen=0,plaintext="none",ispublic=window.isPublic;switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}typeof window.geoTag=="function"&&window.geoTag();
\ No newline at end of file
+function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j(".comment-edit-bb-"+e).show()}function cmtBbClose(e){$j(".comment-edit-bb-"+e).hide()}function initEditor(e){if(editor==0){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var e=$j("#profile-jot-acl-wrapper").parent();return e.css("display")=="none"?e.show():e.hide(),!1}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}}else typeof e!="undefined"&&e()}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function wallInitEditor(){var e=window.editSelect;e!="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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.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:!0,onEndCrop:e})})}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function showEvent(e){}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){$j.get("filer/",function(t){var n=$j("#id_term_label",t).text();reply=prompt(n),reply&&reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1)})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}}$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser);if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var e=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),t=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var e=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}typeof window.aclInit!="undefined"&&typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),window.autoCompleteType=="display-head"&&$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var n=location.href.replace(baseurl,"").split("/");n.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",n[2],n[3]-1);var r=location.hash.split("-");r.length==2&&r[0]=="#link"&&showEvent(r[1])}(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var i=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var i=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});i.setOptions({params:{type:"a"}});break;default:}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),$j(".popupbox").click(function(){var e=$j($j(this).attr("href")).parent();return e.css("display")=="none"?e.show():e.hide(),!1})}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})});var editor=!1,textlen=0,plaintext="none",ispublic=window.isPublic;switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}typeof window.geoTag=="function"&&window.geoTag();
\ No newline at end of file
diff --git a/view/theme/frost-mobile/login-style.css b/view/theme/frost-mobile/login-style.css
index 5c07aba772..37661cfbc7 100644
--- a/view/theme/frost-mobile/login-style.css
+++ b/view/theme/frost-mobile/login-style.css
@@ -152,3 +152,9 @@ div.section-wrapper {
 #login-submit-wrapper {
 	text-align: center;
 }
+
+footer {
+	text-align: center;
+	padding-top: 3em;
+	padding-bottom: 1em;
+}
diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css
index ef08bcb3f1..aefe35071f 100644
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -12,7 +12,7 @@ html {
 /*	width: 320px;*/
 	margin-left: auto;
 	margin-right: auto;
-	overflow-x:hidden;
+/*	overflow-x:hidden;*/
 }
 
 body {
@@ -104,7 +104,7 @@ blockquote {
 #panel {
 	background-color: ivory;
 	position: absolute;
-	z-index: 2;
+/*	z-index: 2;*/
 	width: 30%;
 	padding: 25px;
 	border: 1px solid #444;
@@ -256,7 +256,7 @@ nav .nav-link {
 	-webkit-box-shadow: 3px 3px 5px #555;
 	box-shadow: 3px 3px 5px #555;
 
-	z-index: 10000;
+	z-index: 100;
 }
 
 #network-menu-list {
@@ -393,8 +393,8 @@ section {
 
 /* footer */
 footer {
-    display: none;
-
+	text-align: center;
+	padding-bottom: 1em;
 }
 
 .birthday-today, .event-today {
@@ -1206,7 +1206,7 @@ input#dfrn-url {
 	position: absolute;
 	left: 0px; top:110px;
 	display: none;
-	z-index: 10000;
+/*	z-index: 10000;*/
 }
 .wall-item-photo-menu { margin:0px; padding: 0px; list-style: none }
 .wall-item-photo-menu li a { display: block; padding: 2px; }
@@ -1236,7 +1236,7 @@ input#dfrn-url {
     position: absolute;
     left: 75px;
     top: 80px;
-    z-index: 100;
+/*    z-index: 100;*/
 }
 .wall-item-wrapper {
 	margin-left:10px;
@@ -1351,12 +1351,23 @@ input#dfrn-url {
 }
 
 .wall-item-content img {
+	display: block;
+	margin-top: 10px;
+	margin-right: auto;
+	margin-left: auto;
 	max-width: 290px;
 	border-radius: 7px;
 /*	-moz-border-radius: 7px;*/
 	-webkit-border-radius: 7px;
 }
 
+.wall-item-content img.smiley {
+	display: inline;
+	margin: auto;
+	border-radius: 0;
+	-webkit-border-radius: 0;
+}
+
 .comment .wall-item-content img {
 	max-width: 280px;
 }
@@ -1415,6 +1426,7 @@ input#dfrn-url {
 	background-repeat: repeat-x;*/
    	padding: 5px 5px 0px;
 	height: 32px;
+
 }
 .wall-item-author {
 /*	margin-top: 10px;*/
@@ -2025,7 +2037,7 @@ input#dfrn-url {
 	position: absolute;
 	left: -30px; top: 80px;
 	display: none;
-	z-index: 10000;
+	z-index: 101;
 /*	-moz-box-shadow: 3px 3px 5px #555;*/
 	-webkit-box-shadow: 3px 3px 5px #555;
 	box-shadow: 3px 3px 5px #555;
@@ -3393,6 +3405,7 @@ aside input[type='text'] {
 	text-decoration: none;
 }
 .field .onoff .off {
+
 	border-color:#666666;
 	padding-left: 40px;
 	background-position: left center;
@@ -3595,7 +3608,13 @@ aside input[type='text'] {
 	background-image: url('images/globe.png');
 	background-repeat: no-repeat;
 }
-.noglobe { background-position: -16px -16px;}
+/*.noglobe { background-position: -16px -16px;}*/
+.icon.noglobe {
+	display: block; width: 24px; height: 24px;
+	background-size: 100% 100%;
+	background-image: url('images/noglobe.png');
+	background-repeat: no-repeat;
+}
 .no { background-position: -32px -16px;}
 .pause { background-position: -48px -16px;}
 .play { background-position: -64px -16px;}
@@ -3810,7 +3829,7 @@ aside input[type='text'] {
 	max-height:150px;
 	background-color:#ffffff;
 	overflow:auto;
-	z-index:100000;
+	z-index:102;
 	border:1px solid #cccccc;
 }
 .acpopupitem {
@@ -3884,16 +3903,15 @@ ul.notifications-menu-popup {
 	display: none;
 	width: 10em;
 	margin: 0px;
-	padding: 0px;
+	padding: 0px 0.3em;
 	list-style: none;
-	z-index: 100000;
-	right: -55px;
+	right: -60px;
 }
 #nav-notifications-menu {
 	width: 300px;
 /*	max-height: 400px;*/
 	height: auto;
-	overflow-y: scroll;overflow-style:scrollbar;
+/*	overflow-y: scroll;overflow-style:scrollbar;*/
 	background-color:#FFFFFF;
 /*	-moz-border-radius: 5px;*/
 	-webkit-border-radius: 5px;
@@ -3902,6 +3920,7 @@ ul.notifications-menu-popup {
 /*	-moz-box-shadow: 3px 3px 5px #555;*/
 	-webkit-box-shadow: 3px 3px 5px #555;
 	box-shadow: 3px 3px 5px #555;
+/*	z-index: 103;*/
 }
 #nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
 #nav-notifications-menu img { float: left; margin-right: 5px; }
diff --git a/view/theme/frost-mobile/theme.php b/view/theme/frost-mobile/theme.php
index 018c50a88a..b4ae1fcf96 100644
--- a/view/theme/frost-mobile/theme.php
+++ b/view/theme/frost-mobile/theme.php
@@ -4,7 +4,7 @@
  * Name: Frost--mobile version
  * Description: Like frosted glass
  * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
- * Version: Version 0.2.11
+ * Version: Version 0.2.12
  * Author: Zach P <techcity@f.shmuz.in>
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
diff --git a/view/theme/frost/acl_selector.tpl b/view/theme/frost/acl_selector.tpl
index 9fd7dd7ab3..327f18b65f 100644
--- a/view/theme/frost/acl_selector.tpl
+++ b/view/theme/frost/acl_selector.tpl
@@ -19,4 +19,5 @@
 	window.allowGID = $allowgid;
 	window.denyCID = $denycid;
 	window.denyGID = $denygid;
+	window.aclInit = "true";
 </script>
diff --git a/view/theme/frost/admin_site.tpl b/view/theme/frost/admin_site.tpl
index 91aeda0357..087de4f7db 100644
--- a/view/theme/frost/admin_site.tpl
+++ b/view/theme/frost/admin_site.tpl
@@ -40,7 +40,7 @@
 	{{ 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_public }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 	
diff --git a/view/theme/frost/filebrowser.tpl b/view/theme/frost/filebrowser.tpl
new file mode 100644
index 0000000000..e9eafde1e6
--- /dev/null
+++ b/view/theme/frost/filebrowser.tpl
@@ -0,0 +1,84 @@
+<!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/images/noglobe.png b/view/theme/frost/images/noglobe.png
new file mode 100644
index 0000000000..b5aceb6d5f
Binary files /dev/null and b/view/theme/frost/images/noglobe.png differ
diff --git a/view/theme/frost/jot.tpl b/view/theme/frost/jot.tpl
index da47414ae2..e7a89d8e07 100644
--- a/view/theme/frost/jot.tpl
+++ b/view/theme/frost/jot.tpl
@@ -60,6 +60,8 @@
   	$jotplugins
 	</div>
 
+<!--	<span id="jot-display-location" style="display: none;"></span>-->
+
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 	</div> 
diff --git a/view/theme/frost/jot_geotag.tpl b/view/theme/frost/jot_geotag.tpl
new file mode 100644
index 0000000000..3f8bee91a7
--- /dev/null
+++ b/view/theme/frost/jot_geotag.tpl
@@ -0,0 +1,11 @@
+
+	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/js/theme.js b/view/theme/frost/js/theme.js
index 7c7e3c1d24..37d06c80cb 100644
--- a/view/theme/frost/js/theme.js
+++ b/view/theme/frost/js/theme.js
@@ -17,7 +17,7 @@ $j(document).ready(function() {
     });*/
 
 
-	if(typeof acl=="undefined"){
+	if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
 		acl = new ACL(
 			baseurl+"/acl",
 			[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
@@ -935,6 +935,37 @@ function jotAudioURL() {
 
 
 function jotGetLocation() {
+
+/*	if(navigator.geolocation) {
+
+		navigator.geolocation.getCurrentPosition(function(position) {
+			var lat = position.coords.latitude;
+			var lng = position.coords.longitude;
+
+			$j.ajax({
+				type: 'GET',
+				url: 'http://nominatim.openstreetmap.org/reverse?format=json&lat='+lat+'&lon='+lng,
+				jsonp: 'json_callback',
+				contentType: 'application/json',
+				dataType: 'jsonp',
+				success: function(json) {
+					console.log(json);
+					var locationDisplay = json.address.building+', '+json.address.city+', '+json.address.state;
+					$j('#jot-location').val(locationDisplay);
+					$j('#jot-display-location').html('Location: '+locationDisplay);
+					$j('#jot-display-location').show();
+				}
+			});
+		});
+
+	}
+	else {
+		reply = prompt(window.whereAreU, $j('#jot-location').val());
+		if(reply && reply.length) {
+			$j('#jot-location').val(reply);
+		}
+	}*/
+
 	reply = prompt(window.whereAreU, $j('#jot-location').val());
 	if(reply && reply.length) {
 		$j('#jot-location').val(reply);
diff --git a/view/theme/frost/js/theme.min.js b/view/theme/frost/js/theme.min.js
index 8c5cd16ada..c04d99b5ab 100644
--- a/view/theme/frost/js/theme.min.js
+++ b/view/theme/frost/js/theme.min.js
@@ -1 +1 @@
-function showEvent(e){$j.get(baseurl+"/events/?id="+e,function(e){$j.fancybox(e)})}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.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:!0,onEndCrop:e})})}function showNavMenu(e){window.navMenuTimeout[e+"-closing"]?(window.navMenuTimeout[e+"-closing"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-opening"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideDown("fast").show(),window.navMenuTimeout[e+"-opening"]=!1},200))}function hideNavMenu(e){window.navMenuTimeout[e+"-opening"]?(window.navMenuTimeout[e+"-opening"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-closing"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideUp("fast"),window.navMenuTimeout[e+"-closing"]=!1},500))}function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j("#comment-edit-bb-"+e).show()}function cmtBbClose(e){$j("#comment-edit-bb-"+e).hide()}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function initEditor(e){if(editor==0){$j("#profile-jot-text-loading").show();if(plaintext=="none"){$j("#profile-jot-text-loading").hide(),$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"elastic",transitionOut:"elastic"}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:window.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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser",setup:function(t){cPopup=null,t.onKeyDown.add(function(e,t){cPopup!==null&&cPopup.onkey(t)}),t.onKeyUp.add(function(e,t){var n=tinyMCE.activeEditor.getContent();match=n.match(/@([^ \n]+)$/),match!==null?(cPopup===null&&(cPopup=new ACPopup(this,baseurl+"/acl")),cPopup.ready&&match[1]!==cPopup.searchText&&cPopup.search(match[1]),cPopup.ready||(cPopup=null)):cPopup!==null&&(cPopup.close(),cPopup=null),textlen=n.length,textlen!=0&&$j("#jot-perms-icon").is(".unlock")?$j("#profile-jot-desc").html(ispublic):$j("#profile-jot-desc").html("&nbsp;"),textlen<=140&&($j("#character-counter").removeClass("red"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("grey")),textlen>140&&textlen<=420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("red"),$j("#character-counter").addClass("orange")),textlen>420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("red")),$j("#character-counter").text(textlen)}),t.onInit.add(function(t){t.pasteAsPlainText=!0,$j("#profile-jot-text-loading").hide(),$j(".jothidden").show(),typeof e!="undefined"&&e()})}}),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"})}else typeof e!="undefined"&&e()}function msgInitEditor(){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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function profInitEditor(){tinyMCE.init({theme:"advanced",mode:window.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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function eventInitEditor(){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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function contactInitEditor(){tinyMCE.init({theme:"advanced",mode:window.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:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css"})}function wallInitEditor(){var e=window.editSelect;e!="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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function deleteCheckedItems(){var e="";$j(".item-select").each(function(){$j(this).is(":checked")&&(e.length!=0?e=e+","+$j(this).val():e=$j(this).val())}),$j.post("item",{dropitems:e},function(e){window.location.reload()})}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){var t=$j("input").css("border-color");$j.get("filer/",function(n){$j.fancybox(n),$j("#id_term").keypress(function(){$j(this).css("border-color",t)}),$j("#select_term").change(function(){$j("#id_term").css("border-color",t)}),$j("#filer_save").click(function(t){return t.preventDefault(),reply=$j("#id_term").val(),reply&&reply.length?(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1,$j.fancybox.close()):$j("#id_term").css("border-color","#FF0000"),!1})})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}else tinyMCE.execCommand("mceInsertRawHTML",!1,e)}$j(document).ready(function(){window.navMenuTimeout={"#network-menu-list-timeout":null,"#contacts-menu-list-timeout":null,"#system-menu-list-timeout":null,"#network-menu-list-opening":!1,"#contacts-menu-list-opening":!1,"#system-menu-list-opening":!1,"#network-menu-list-closing":!1,"#contacts-menu-list-closing":!1,"#system-menu-list-closing":!1},typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser),$j(".nav-menu-link").hover(function(){showNavMenu($j(this).attr("rel"))},function(){hideNavMenu($j(this).attr("rel"))}),$j(".group-edit-icon").hover(function(){$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".sidebar-group-element").hover(function(){id=$j(this).attr("id"),$j("#edit-"+id).addClass("icon"),$j("#edit-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#edit-"+id).removeClass("icon"),$j("#edit-"+id).addClass("iconspacer")}),$j(".savedsearchdrop").hover(function(){$j(this).addClass("drop"),$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("drop"),$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".savedsearchterm").hover(function(){id=$j(this).attr("id"),$j("#drop-"+id).addClass("icon"),$j("#drop-"+id).addClass("drophide"),$j("#drop-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#drop-"+id).removeClass("icon"),$j("#drop-"+id).removeClass("drophide"),$j("#drop-"+id).addClass("iconspacer")}),window.autoCompleteType=="display-head"&&$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var e=location.href.replace(baseurl,"").split("/");e.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",e[2],e[3]-1);var t=location.hash.split("-");t.length==2&&t[0]=="#link"&&showEvent(t[1])}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var n=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var n=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});n.setOptions({params:{type:"a"}});break;default:}if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var r=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),i=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var r=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})}),$j(function(){$j("#cnftheme").fancybox({width:800,autoDimensions:!1,onStart:function(){var e=$j("#id_theme :selected").val(),t=$j("#id_theme_mobile :selected").val();$j("#cnftheme").attr("href",baseurl+"/admin/themes/"+e)},onComplete:function(){$j("div#fancybox-content form").submit(function(e){var t=$j(this).attr("action"),n={};return $j(this).find("input").each(function(){n[$j(this).attr("name")]=$j(this).val()}),$j(this).find("select").each(function(){n[$j(this).attr("name")]=$j(this).children(":selected").val()}),console.log(":)",t,n),$j.post(t,n,function(e){timer&&clearTimeout(timer),NavUpdate(),$j.fancybox.close()}),!1})}})}),typeof window.photoEdit!="undefined"&&$j(document).keydown(function(e){window.prevLink!=""&&e.ctrlKey&&e.keyCode==37&&(e.preventDefault(),window.location.href=window.prevLink),window.nextLink!=""&&e.ctrlKey&&e.keyCode==39&&(e.preventDefault(),window.location.href=window.nextLink)});switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}var editor=!1,textlen=0,plaintext=window.editSelect,ispublic=window.isPublic;typeof window.geoTag=="function"&&window.geoTag();
\ No newline at end of file
+function showEvent(e){$j.get(baseurl+"/events/?id="+e,function(e){$j.fancybox(e)})}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.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:!0,onEndCrop:e})})}function showNavMenu(e){window.navMenuTimeout[e+"-closing"]?(window.navMenuTimeout[e+"-closing"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-opening"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideDown("fast").show(),window.navMenuTimeout[e+"-opening"]=!1},200))}function hideNavMenu(e){window.navMenuTimeout[e+"-opening"]?(window.navMenuTimeout[e+"-opening"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-closing"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideUp("fast"),window.navMenuTimeout[e+"-closing"]=!1},500))}function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j("#comment-edit-bb-"+e).show()}function cmtBbClose(e){$j("#comment-edit-bb-"+e).hide()}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function initEditor(e){if(editor==0){$j("#profile-jot-text-loading").show();if(plaintext=="none"){$j("#profile-jot-text-loading").hide(),$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"elastic",transitionOut:"elastic"}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:window.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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser",setup:function(t){cPopup=null,t.onKeyDown.add(function(e,t){cPopup!==null&&cPopup.onkey(t)}),t.onKeyUp.add(function(e,t){var n=tinyMCE.activeEditor.getContent();match=n.match(/@([^ \n]+)$/),match!==null?(cPopup===null&&(cPopup=new ACPopup(this,baseurl+"/acl")),cPopup.ready&&match[1]!==cPopup.searchText&&cPopup.search(match[1]),cPopup.ready||(cPopup=null)):cPopup!==null&&(cPopup.close(),cPopup=null),textlen=n.length,textlen!=0&&$j("#jot-perms-icon").is(".unlock")?$j("#profile-jot-desc").html(ispublic):$j("#profile-jot-desc").html("&nbsp;"),textlen<=140&&($j("#character-counter").removeClass("red"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("grey")),textlen>140&&textlen<=420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("red"),$j("#character-counter").addClass("orange")),textlen>420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("red")),$j("#character-counter").text(textlen)}),t.onInit.add(function(t){t.pasteAsPlainText=!0,$j("#profile-jot-text-loading").hide(),$j(".jothidden").show(),typeof e!="undefined"&&e()})}}),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"})}else typeof e!="undefined"&&e()}function msgInitEditor(){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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function profInitEditor(){tinyMCE.init({theme:"advanced",mode:window.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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function eventInitEditor(){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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function contactInitEditor(){tinyMCE.init({theme:"advanced",mode:window.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:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css"})}function wallInitEditor(){var e=window.editSelect;e!="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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function deleteCheckedItems(){var e="";$j(".item-select").each(function(){$j(this).is(":checked")&&(e.length!=0?e=e+","+$j(this).val():e=$j(this).val())}),$j.post("item",{dropitems:e},function(e){window.location.reload()})}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){var t=$j("input").css("border-color");$j.get("filer/",function(n){$j.fancybox(n),$j("#id_term").keypress(function(){$j(this).css("border-color",t)}),$j("#select_term").change(function(){$j("#id_term").css("border-color",t)}),$j("#filer_save").click(function(t){return t.preventDefault(),reply=$j("#id_term").val(),reply&&reply.length?(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1,$j.fancybox.close()):$j("#id_term").css("border-color","#FF0000"),!1})})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}else tinyMCE.execCommand("mceInsertRawHTML",!1,e)}$j(document).ready(function(){window.navMenuTimeout={"#network-menu-list-timeout":null,"#contacts-menu-list-timeout":null,"#system-menu-list-timeout":null,"#network-menu-list-opening":!1,"#contacts-menu-list-opening":!1,"#system-menu-list-opening":!1,"#network-menu-list-closing":!1,"#contacts-menu-list-closing":!1,"#system-menu-list-closing":!1},typeof window.aclInit!="undefined"&&typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser),$j(".nav-menu-link").hover(function(){showNavMenu($j(this).attr("rel"))},function(){hideNavMenu($j(this).attr("rel"))}),$j(".group-edit-icon").hover(function(){$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".sidebar-group-element").hover(function(){id=$j(this).attr("id"),$j("#edit-"+id).addClass("icon"),$j("#edit-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#edit-"+id).removeClass("icon"),$j("#edit-"+id).addClass("iconspacer")}),$j(".savedsearchdrop").hover(function(){$j(this).addClass("drop"),$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("drop"),$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".savedsearchterm").hover(function(){id=$j(this).attr("id"),$j("#drop-"+id).addClass("icon"),$j("#drop-"+id).addClass("drophide"),$j("#drop-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#drop-"+id).removeClass("icon"),$j("#drop-"+id).removeClass("drophide"),$j("#drop-"+id).addClass("iconspacer")}),window.autoCompleteType=="display-head"&&$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var e=location.href.replace(baseurl,"").split("/");e.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",e[2],e[3]-1);var t=location.hash.split("-");t.length==2&&t[0]=="#link"&&showEvent(t[1])}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var n=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var n=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});n.setOptions({params:{type:"a"}});break;default:}if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var r=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),i=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var r=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})}),$j(function(){$j("#cnftheme").fancybox({width:800,autoDimensions:!1,onStart:function(){var e=$j("#id_theme :selected").val(),t=$j("#id_theme_mobile :selected").val();$j("#cnftheme").attr("href",baseurl+"/admin/themes/"+e)},onComplete:function(){$j("div#fancybox-content form").submit(function(e){var t=$j(this).attr("action"),n={};return $j(this).find("input").each(function(){n[$j(this).attr("name")]=$j(this).val()}),$j(this).find("select").each(function(){n[$j(this).attr("name")]=$j(this).children(":selected").val()}),console.log(":)",t,n),$j.post(t,n,function(e){timer&&clearTimeout(timer),NavUpdate(),$j.fancybox.close()}),!1})}})}),typeof window.photoEdit!="undefined"&&$j(document).keydown(function(e){window.prevLink!=""&&e.ctrlKey&&e.keyCode==37&&(e.preventDefault(),window.location.href=window.prevLink),window.nextLink!=""&&e.ctrlKey&&e.keyCode==39&&(e.preventDefault(),window.location.href=window.nextLink)});switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}var editor=!1,textlen=0,plaintext=window.editSelect,ispublic=window.isPublic;typeof window.geoTag=="function"&&window.geoTag();
\ No newline at end of file
diff --git a/view/theme/frost/nav.tpl b/view/theme/frost/nav.tpl
index 89e1168ab7..755f8a628f 100644
--- a/view/theme/frost/nav.tpl
+++ b/view/theme/frost/nav.tpl
@@ -8,7 +8,7 @@
 <!--	<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" href="$nav.settings.0" title="Main Menu">
-	<img class="system-menu-link" src="/view/theme/frost/images/menu.png">
+	<img class="system-menu-link" src="$baseurl/view/theme/frost/images/menu.png">
 	</a>
 	<ul id="system-menu-list" class="nav-menu-list">
 		{{ if $nav.login }}
@@ -57,7 +57,7 @@
 <!--	<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="/view/theme/frost/images/notifications.png">
+	<img rel="#nav-notifications-menu" src="$baseurl/view/theme/frost/images/notifications.png">
 	</a>
 	<span id="notify-update" class="nav-ajax-left"></span>
 	<ul id="nav-notifications-menu" class="notifications-menu-popup">
@@ -71,7 +71,7 @@
 <!--	<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" href="$nav.contacts.0" title="Contacts">
-	<img class="contacts-menu-link" src="/view/theme/frost/images/contacts.png">
+	<img class="contacts-menu-link" src="$baseurl/view/theme/frost/images/contacts.png">
 	</a>
 	{{ if $nav.introductions }}
 	<span id="intro-update" class="nav-ajax-left"></span>
@@ -95,7 +95,7 @@
 <!--	<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="/view/theme/frost/images/message.png">
+	<img src="$baseurl/view/theme/frost/images/message.png">
 	</a>
 	<span id="mail-update" class="nav-ajax-left"></span>
 	</div>
@@ -104,7 +104,7 @@
 <!--	<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="network-menu-link nav-link" href="$nav.network.0" title="Network">
-	<img class="network-menu-link" src="/view/theme/frost/images/network.png">
+	<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>
diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index bc0d57f0c2..6eaa17e8ba 100644
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -1309,9 +1309,18 @@ input#dfrn-url {
 }
 
 .wall-item-content img {
+	display: block;
+	margin-top: 10px;
+	margin-right: auto;
+	margin-left: auto;
 	max-width: 100%;
 }
 
+.wall-item-content img.smiley {
+	display: inline;
+	margin: auto;
+}
+
 .divgrow-showmore {
 	display: block;
 	clear: both;
@@ -3418,7 +3427,13 @@ aside input[type='text'] {
 	background-image: url('images/globe.png');
 	background-repeat: no-repeat;
 }
-.noglobe { background-position: -16px -16px;}
+/*.noglobe { background-position: -16px -16px;}*/
+.icon.noglobe {
+	display: block; width: 24px; height: 24px;
+	background-size: 100% 100%;
+	background-image: url('images/noglobe.png');
+	background-repeat: no-repeat;
+}
 .no { background-position: -32px -16px;}
 .pause { background-position: -48px -16px;}
 .play { background-position: -64px -16px;}
diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php
index 7133c36e0e..3bcedd5de9 100644
--- a/view/theme/frost/theme.php
+++ b/view/theme/frost/theme.php
@@ -4,7 +4,7 @@
  * Name: Frost
  * Description: Like frosted glass
  * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
- * Version: Version 0.2.9
+ * Version: Version 0.2.10
  * Author: Zach P <techcity@f.shmuz.in>
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
index c261a78ecb..e3d5b78102 100644
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -44,6 +44,7 @@ function theme_admin_post(&$a){
 function quattro_form(&$a, $align, $color){
 	$colors = array(
 		"dark"=>"Quattro", 
+		"lilac"=>"Lilac", 
 		"green"=>"Green"
 	);
 	
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 0bb2cd10eb..533d151762 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -735,6 +735,22 @@ aside #profile-extra-links li {
   margin: 0px;
   list-style: none;
 }
+aside #wallmessage-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+  margin-top: 3px;
+}
+aside #wallmessage-link:hover {
+  text-decoration: none;
+  background-color: #19aeff;
+}
 aside #dfrn-request-link {
   display: block;
   -moz-border-radius: 5px 5px 5px 5px;
@@ -1140,6 +1156,9 @@ section {
   opacity: 0.5;
 }
 .wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
   background: #FFFFFF;
   border: 2px solid #364e59;
   height: 25px;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 4897471eac..429da809d4 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -735,6 +735,22 @@ aside #profile-extra-links li {
   margin: 0px;
   list-style: none;
 }
+aside #wallmessage-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #009100 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+  margin-top: 3px;
+}
+aside #wallmessage-link:hover {
+  text-decoration: none;
+  background-color: #ccff42;
+}
 aside #dfrn-request-link {
   display: block;
   -moz-border-radius: 5px 5px 5px 5px;
@@ -1140,6 +1156,9 @@ section {
   opacity: 0.5;
 }
 .wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
   background: #FFFFFF;
   border: 2px solid #364e59;
   height: 25px;
diff --git a/view/theme/quattro/lilac/Makefile b/view/theme/quattro/lilac/Makefile
new file mode 100644
index 0000000000..989da60c72
--- /dev/null
+++ b/view/theme/quattro/lilac/Makefile
@@ -0,0 +1,4 @@
+##
+
+style.css : style.less colors.less ../icons.less ../quattro.less
+	lessc style.less > style.css
diff --git a/view/theme/quattro/lilac/colors.less b/view/theme/quattro/lilac/colors.less
new file mode 100644
index 0000000000..2df0e41f1e
--- /dev/null
+++ b/view/theme/quattro/lilac/colors.less
@@ -0,0 +1,117 @@
+// Quattro Theme LESS file
+
+// "Echo" palette from Inkscape
+@Yellow1 : #fce94f;
+@Blue1:rgb(25,174,255);
+@Blue2:rgb(0,132,200);
+@Blue3:rgb(0,92,148);
+@Red1:rgb(255,65,65);
+@Red2:rgb(220,0,0);
+@Red3:rgb(181,0,0);
+@Orange1:rgb(255,255,62);
+@Orange2:rgb(255,153,0);
+@Orange3:rgb(255,102,0);
+@Brown1:rgb(255,192,34);
+@Brown2:rgb(184,129,0);
+@Brown3:rgb(128,77,0);
+@Green1:rgb(204,255,66);
+@Green2:rgb(154,222,0);
+@Green3:rgb(0,145,0);
+@Green4:rgb(221,255,221);
+@Purple1:rgb(241,202,255);
+@Purple2:rgb(215,108,255);
+@Purple3:rgb(186,0,255);
+@Metalic1:rgb(189,205,212);
+@Metalic2:rgb(158,171,176);
+@Metalic3:rgb(54,78,89);
+@Metalic4:rgb(14,35,46);
+@Grey1:rgb(255,255,255);
+@Grey2:rgb(204,204,204);
+@Grey3:rgb(153,153,153);
+@Grey4:rgb(102,102,102);
+@Grey5:rgb(45,45,45);
+@lilac:      #86608e;
+@lilacComp:  #cbd38d;
+@lilacDark:  #521f5c;
+@lilacBright:#c0a3c7;
+@lilacVBright:#F6ECF9;
+
+
+// Theme colors
+@BodyBackground: @lilacVBright;
+@BodyColor:	@Grey5;
+
+@Link: @lilacDark;
+@LinkHover: @lilac;
+@LinkVisited: @lilac;
+
+
+@ButtonColor: @Grey1;
+@ButtonBackgroundColor: @Grey5;
+
+@Banner: @Grey1;
+
+@NavbarBackground:@lilacDark;
+@NavbarSelectedBg:@lilacComp;
+@NavbarSelectedBorder: @Metalic2;
+@NavbarNotifBg: @lilac;
+
+@Menu: @Grey5;
+@MenuBg: @Grey1;
+@MenuBorder: @Metalic3;
+@MenuItem: @Grey5;
+@MenuItemHoverBg: @lilacBright;
+@MenuItemSeparator: @Metalic2;
+@MenuEmpty: @Metalic2;
+@MenuItemDetail: @Metalic2;
+
+@AsideBorder: @Metalic1;
+@AsideConnect: @Grey1;
+@AsideConnectBg: @lilacDark;
+@AsideConnectHoverBg: @lilac;
+@VCardLabelColor: @Grey3;
+
+@InfoColor: @Grey1;
+@InfoBackgroundColor: @Metalic3;
+
+@NoticeColor: @Grey1;
+@NoticeBackgroundColor: #511919;
+
+@FieldHelpColor: @Grey3;
+
+@ThreadBackgroundColor: #eff0f1;
+@ThreadBottomBorderColor: @Grey2;
+@ShinyBorderColor: @lilacBright;
+
+@BlockquoteBackgroundColor: #FFFFFF;
+@BlockquoteBorderColor: #e6e6e6;
+
+@CommentBoxEmptyColor: @Grey3;
+@CommentBoxEmptyBorderColor: @Grey3;
+@CommentBoxFullColor: @Grey5;
+@CommentBoxFullBorderColor: @Grey5;
+
+@TagColor: @Grey1;
+
+@JotToolsBackgroundColor: @lilacDark;
+@JotToolsBorderColor: @Metalic2;
+@JotToolsOverBackgroundColor: @lilac;
+@JotToolsOverBorderColor: @Metalic1;
+@JotToolsText: @Grey2;
+@JotSubmitBackgroundColor: @Grey2;
+@JotSubmitText: @Grey4;
+@JotSubmitOverBackgroundColor: @lilacDark;
+@JotSubmitOverText: @Grey4;
+@JotPermissionUnlockBackgroundColor: @Grey2;
+@JotPermissionLockBackgroundColor: @Grey4;
+@JotLoadingBackgroundColor: @Grey1;
+@JotPreviewBackgroundColor: @lilacBright;
+
+@MessageNewBackgroundColor: @Blue1;
+@MessageNewBorderColor: @Blue3;
+@MessageNewColor: @Grey1;
+
+@MailListBackgroundColor: #f6f7f8;
+
+@MailDisplaySubjectColor: @Grey5;
+@MailDisplaySubjectBackgroundColor: #f6f7f8;
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
new file mode 100644
index 0000000000..c6229e8858
--- /dev/null
+++ b/view/theme/quattro/lilac/style.css
@@ -0,0 +1,2149 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ **/
+/* icons */
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  background-position: left center;
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+  min-width: 22px;
+  height: 22px;
+}
+.icon.text {
+  text-indent: 0px;
+}
+.icon.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.like {
+  background-image: url("icons/like.png");
+}
+.icon.dislike {
+  background-image: url("icons/dislike.png");
+}
+.icon.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.star {
+  background-image: url("../../../images/icons/22/star.png");
+}
+.icon.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.plugin {
+  background-image: url("../../../images/icons/22/plugin.png");
+}
+.icon.type-unkn {
+  background-image: url("../../../images/icons/22/zip.png");
+}
+.icon.type-audio {
+  background-image: url("../../../images/icons/22/audio.png");
+}
+.icon.type-video {
+  background-image: url("../../../images/icons/22/video.png");
+}
+.icon.type-image {
+  background-image: url("../../../images/icons/22/image.png");
+}
+.icon.type-text {
+  background-image: url("../../../images/icons/22/text.png");
+}
+.icon.language {
+  background-image: url("icons/language.png");
+}
+.icon.text {
+  padding: 10px 0px 0px 25px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.like {
+  background-image: url("icons/like.png");
+}
+.icon.s10.dislike {
+  background-image: url("icons/dislike.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/icons/10/star.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.plugin {
+  background-image: url("../../../images/icons/10/plugin.png");
+}
+.icon.s10.type-unkn {
+  background-image: url("../../../images/icons/10/zip.png");
+}
+.icon.s10.type-audio {
+  background-image: url("../../../images/icons/10/audio.png");
+}
+.icon.s10.type-video {
+  background-image: url("../../../images/icons/10/video.png");
+}
+.icon.s10.type-image {
+  background-image: url("../../../images/icons/10/image.png");
+}
+.icon.s10.type-text {
+  background-image: url("../../../images/icons/10/text.png");
+}
+.icon.s10.language {
+  background-image: url("icons/language.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.like {
+  background-image: url("icons/like.png");
+}
+.icon.s16.dislike {
+  background-image: url("icons/dislike.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}
+.icon.s16.star {
+  background-image: url("../../../images/icons/16/star.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.plugin {
+  background-image: url("../../../images/icons/16/plugin.png");
+}
+.icon.s16.type-unkn {
+  background-image: url("../../../images/icons/16/zip.png");
+}
+.icon.s16.type-audio {
+  background-image: url("../../../images/icons/16/audio.png");
+}
+.icon.s16.type-video {
+  background-image: url("../../../images/icons/16/video.png");
+}
+.icon.s16.type-image {
+  background-image: url("../../../images/icons/16/image.png");
+}
+.icon.s16.type-text {
+  background-image: url("../../../images/icons/16/text.png");
+}
+.icon.s16.language {
+  background-image: url("icons/language.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.like {
+  background-image: url("icons/like.png");
+}
+.icon.s22.dislike {
+  background-image: url("icons/dislike.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/icons/22/star.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.plugin {
+  background-image: url("../../../images/icons/22/plugin.png");
+}
+.icon.s22.type-unkn {
+  background-image: url("../../../images/icons/22/zip.png");
+}
+.icon.s22.type-audio {
+  background-image: url("../../../images/icons/22/audio.png");
+}
+.icon.s22.type-video {
+  background-image: url("../../../images/icons/22/video.png");
+}
+.icon.s22.type-image {
+  background-image: url("../../../images/icons/22/image.png");
+}
+.icon.s22.type-text {
+  background-image: url("../../../images/icons/22/text.png");
+}
+.icon.s22.language {
+  background-image: url("icons/language.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.like {
+  background-image: url("icons/like.png");
+}
+.icon.s48.dislike {
+  background-image: url("icons/dislike.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/icons/48/star.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+.icon.s48.plugin {
+  background-image: url("../../../images/icons/48/plugin.png");
+}
+.icon.s48.type-unkn {
+  background-image: url("../../../images/icons/48/zip.png");
+}
+.icon.s48.type-audio {
+  background-image: url("../../../images/icons/48/audio.png");
+}
+.icon.s48.type-video {
+  background-image: url("../../../images/icons/48/video.png");
+}
+.icon.s48.type-image {
+  background-image: url("../../../images/icons/48/image.png");
+}
+.icon.s48.type-text {
+  background-image: url("../../../images/icons/48/text.png");
+}
+.icon.s48.language {
+  background-image: url("icons/language.png");
+}
+.icon.on {
+  background-image: url("icons/addon_on.png");
+  min-width: 16px;
+  height: 16px;
+  background-position: 0px 0px;
+}
+.icon.off {
+  background-image: url("icons/addon_off.png");
+  width: 16px;
+  height: 16px;
+  background-position: 0px 0px;
+}
+/* global */
+body {
+  font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
+  font-size: 11px;
+  background-color: #f6ecf9;
+  color: #2d2d2d;
+  margin: 50px 0px 0px 0px;
+  display: table;
+}
+h4 {
+  font-size: 1.1em;
+}
+a,
+a:link {
+  color: #521f5c;
+  text-decoration: none;
+}
+a:visited {
+  color: #86608e;
+  text-decoration: none;
+}
+a:hover {
+  color: #86608e;
+  text-decoration: underline;
+}
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #521f5c;
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  color: #86608e;
+  text-decoration: underline;
+}
+blockquote {
+  background: #ffffff;
+  padding: 1em;
+  margin-left: 1em;
+  border-left: 1em solid #e6e6e6;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+textarea {
+  font-size: 20px;
+}
+#panel {
+  position: absolute;
+  width: 10em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool > img {
+  float: left;
+}
+/* popup notifications */
+#jGrowl.top-right {
+  top: 30px;
+  right: 15px;
+}
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 43%;
+  right: 43%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  /*width: 100%; height: 12px; */
+
+  z-index: 110;
+  color: #ffffff;
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: center;
+  width: 100%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+header #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+header #banner #logo-text {
+  font-size: 22px;
+}
+/* nav */
+nav {
+  width: 100%;
+  height: 32px;
+  position: fixed;
+  left: 0px;
+  top: 0px;
+  padding: 0px;
+  background-color: #521f5c;
+  color: #ffffff;
+  z-index: 100;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  padding: 0px;
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 10px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon.selected {
+  background-color: #cbd38d;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 14px;
+  border-bottom: 3px solid #521f5c;
+}
+nav .nav-menu.selected {
+  border-bottom: 3px solid #9eabb0;
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #86608e;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  padding: 1px 3px;
+  top: 0px;
+  right: -10px;
+  min-width: 15px;
+  text-align: right;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu {
+  float: right;
+}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+nav #nav-notifications-linkmenu.on .icon.s22.notify,
+nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_on.png");
+}
+nav #nav-apps-link.selected {
+  background-color: #cbd38d;
+}
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 10em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #c0a3c7;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+ul.menu-popup .toolbar {
+  background-color: #9eabb0;
+  height: auto;
+  overflow: auto;
+}
+ul.menu-popup .toolbar a {
+  float: right;
+}
+ul.menu-popup .toolbar a:hover {
+  background-color: #ffffff;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #c0a3c7;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+/* aside 230px*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 200px;
+  padding: 0px 10px 0px 20px;
+  border-right: 1px solid #bdcdd4;
+}
+aside .profile-edit-side-div {
+  display: none;
+}
+aside .vcard .fn {
+  font-size: 16px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  width: 35%;
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 4px;
+  width: 60%;
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #wallmessage-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #521f5c url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+  margin-top: 3px;
+}
+aside #wallmessage-link:hover {
+  text-decoration: none;
+  background-color: #86608e;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #521f5c url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #86608e;
+}
+aside #profiles-menu {
+  width: 20em;
+}
+#contact-block {
+  overflow: auto;
+  height: auto;
+  /*.contact-block-div { width:60px; height: 60px; }*/
+
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: hidden;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  width: 48px;
+  height: 48px;
+}
+/* group member */
+#contact-edit-drop-link,
+.mail-list-delete-wrapper,
+.group-delete-wrapper {
+  float: right;
+  margin-right: 50px;
+}
+#contact-edit-drop-link .drophide,
+.mail-list-delete-wrapper .drophide,
+.group-delete-wrapper .drophide {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  opacity: 0.3;
+  position: relative;
+  top: -50px;
+}
+#contact-edit-drop-link .drop,
+.mail-list-delete-wrapper .drop,
+.group-delete-wrapper .drop {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  position: relative;
+  top: -50px;
+}
+/*
+#group-members {
+	margin-top: 20px;
+	padding: 10px;
+	height: 250px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+#group-members-end {
+	clear: both;
+}
+#group-all-contacts {
+	padding: 10px;
+	height: 450px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+#group-all-contacts-end {
+	clear: both;
+	margin-bottom: 10px;
+}
+.contact-block-div {
+	float: left;
+	width: 60px;
+	height: 60px;
+}*/
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget input.action {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget:hover .title .action {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget .tool:hover .action {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget .tool:hover .action.ticked {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+.widget .tool.selected {
+  background: url('../../../images/selected.png') no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section 800px */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 770px;
+  padding: 0px 20px 0px 10px;
+}
+.sparkle {
+  cursor: url('icons/lock.cur'), pointer;
+}
+/* wall item */
+.tread-wrapper {
+  background-color: #eff0f1;
+  position: relative;
+  padding: 10px;
+  margin-bottom: 20px;
+  width: 750px;
+  border-bottom: 1px solid #cccccc;
+}
+.wall-item-decor {
+  position: absolute;
+  left: 97%;
+  top: -10px;
+  width: 16px;
+}
+.unstarred {
+  display: none;
+}
+.wall-item-container {
+  display: table;
+  width: 750px;
+}
+.wall-item-container .wall-item-item,
+.wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-container .wall-item-bottom {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container:hover .wall-item-bottom {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 60px;
+}
+.wall-item-container .wall-item-location {
+  word-wrap: break-word;
+  width: 50px;
+}
+.wall-item-container .wall-item-content {
+  display: table-cell;
+  font-size: 12px;
+  max-width: 720px;
+  word-wrap: break-word;
+}
+.wall-item-container .wall-item-content img {
+  max-width: 710px;
+}
+.wall-item-container .wall-item-links,
+.wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon,
+.wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-links .icon:hover,
+.wall-item-container .wall-item-actions .icon:hover {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-ago {
+  padding-right: 40px;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  float: left;
+  width: 20em;
+  margin-top: 0.5em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-top: 0.5em;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 3em;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 15%;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment .contact-photo-wrapper {
+  margin-left: 16px;
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+}
+.wall-item-container.comment .contact-photo-menu-button {
+  top: 15px !important;
+  left: 0px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+/* 'tag' item type */
+.wall-item-container.item-tag .wall-item-content {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container.item-tag .contact-photo-wrapper {
+  margin-left: 32px;
+}
+.wall-item-container.item-tag .contact-photo {
+  width: 16px;
+  height: 16px;
+}
+.wall-item-container.item-tag .contact-photo-menu-button {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-comment-wrapper {
+  margin: 1em 2em 1em 60px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 1em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #999999;
+  padding: 0.3em;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 20px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.threaded .wall-item-comment-wrapper {
+  margin-left: 0px;
+}
+.comment-edit-preview {
+  width: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+  background-color: #c0a3c7;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview .contact-photo-menu-button {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 90%;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 90%;
+  padding: 0;
+  margin: 10px 0;
+  background-color: #c0a3c7;
+  border-bottom: 0px;
+}
+.comment-edit-preview .wall-item-conv {
+  display: none;
+}
+.shiny {
+  border-right: 10px solid #c0a3c7;
+}
+#jot-preview-content .tread-wrapper {
+  background-color: #c0a3c7;
+}
+.hide-comments-outer {
+  margin-bottom: 0.8em;
+}
+.wall-item-tags {
+  padding-top: 5px;
+}
+.tag {
+  background: url("../../../images/tag_b.png") no-repeat center left;
+  color: #ffffff;
+  padding-left: 3px;
+}
+.tag a {
+  padding-right: 8px;
+  background: url("../../../images/tag.png") no-repeat center right;
+  color: #ffffff;
+}
+.filesavetags {
+  padding: 3px 0px 3px 0px;
+  opacity: 0.5;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: 25px;
+  height: 25px;
+}
+/* threaded comments */
+.children {
+  margin-top: 1em;
+}
+.children .hide-comments-outer {
+  margin-left: 60px;
+}
+.children .wwto {
+  display: none;
+}
+.children .comment-edit-preview {
+  width: 660px;
+}
+.children .comment-edit-preview .wall-item-container {
+  width: 610px;
+}
+.children .children {
+  margin-left: 40px;
+}
+.children .children .wall-item-container {
+  width: 710px;
+}
+.children .children .comment-edit-preview {
+  width: 620px;
+}
+.children .children .comment-edit-preview .wall-item-container {
+  width: 620px;
+}
+.children .children .children .wall-item-container {
+  width: 670px;
+}
+.children .children .children .comment-edit-preview {
+  width: 580px;
+}
+.children .children .children .comment-edit-preview .wall-item-container {
+  width: 580px;
+}
+.children .children .children .children .wall-item-container {
+  width: 630px;
+}
+.children .children .children .children .comment-edit-preview {
+  width: 540px;
+}
+.children .children .children .children .comment-edit-preview .wall-item-container {
+  width: 540px;
+}
+.children .children .children .children .children .wall-item-container {
+  width: 590px;
+}
+.children .children .children .children .children .comment-edit-preview {
+  width: 500px;
+}
+.children .children .children .children .children .comment-edit-preview .wall-item-container {
+  width: 500px;
+}
+.children .children .children .children .children .children {
+  margin-left: 0px;
+}
+.children .children .children .children .children .children .hide-comments-outer {
+  margin-left: 0px;
+}
+/*.threaded .hide-comments-outer { margin-left: 20px; }*/
+span[id^="showmore-teaser"] {
+  background: url("showmore-bg.jpg") no-repeat center bottom;
+}
+span[id^="showmore-wrap"] {
+  border-top: 1px solid #999999;
+  color: #999999;
+  display: block;
+  text-align: center;
+  background-color: #eff0f1;
+}
+#pause {
+  position: fixed;
+  bottom: 5px;
+  right: 5px;
+}
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  position: absolute;
+  left: -2px;
+  top: 31px;
+}
+.contact-wrapper {
+  float: left;
+  width: 300px;
+  height: 90px;
+  padding-right: 10px;
+  margin: 0 10px 10px 0px;
+}
+.contact-wrapper .contact-photo-wrapper {
+  float: left;
+  margin-right: 10px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  font-weight: bold;
+  padding-top: 15px;
+}
+.contact-details {
+  color: #999999;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 100%;
+  margin: 0px 2em 20px 0px;
+}
+#jot .profile-jot-text {
+  height: 1em;
+  width: 99%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #999999;
+  padding: 0.3em;
+}
+#jot .profile-jot-text:focus {
+  font-size: 20px;
+}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 770px;
+  background-color: #521f5c;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #86608e;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #521f5c;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #ffffff;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#jot #jot-title {
+  border: 0px;
+  margin: 0px;
+  height: 20px;
+  width: 500px;
+  font-weight: bold;
+  border: 1px solid #f6ecf9;
+}
+#jot #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#jot #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 40px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot #jot-category {
+  border: 0px;
+  margin: 0px;
+  height: 20px;
+  width: 200px;
+  border: 1px solid #f6ecf9;
+}
+#jot #jot-category:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-category:focus {
+  border: 1px solid #999999;
+}
+/** buttons **/
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons **/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 20px;
+}
+ul.tabs li .active {
+  border-bottom: 1px solid #86608e;
+}
+/** group editor **/
+#group-edit-desc {
+  margin-top: 1em;
+  color: #999999;
+}
+#group-update-wrapper {
+  height: auto;
+  overflow: auto;
+}
+#group-update-wrapper #group {
+  width: 300px;
+  float: left;
+  margin-right: 20px;
+}
+#group-update-wrapper #contacts {
+  width: 300px;
+  float: left;
+}
+#group-update-wrapper #group-separator {
+  display: none;
+}
+#group-update-wrapper .contact_list {
+  height: 300px;
+  border: 1px solid #364e59;
+  overflow: auto;
+}
+#group-update-wrapper .contact_list .contact-block-div {
+  width: 50px;
+  height: 50px;
+  float: left;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input,
+.field textarea {
+  width: 400px;
+}
+.field input[type="checkbox"],
+.field input[type="radio"] {
+  width: auto;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #999999;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#profile-edit-links li {
+  list-style: none;
+  margin-top: 10px;
+}
+#profile-edit-default-desc {
+  color: #FF0000;
+  border: 1px solid #FF8888;
+  background-color: #FFEEEE;
+  padding: 7px;
+}
+#profile-edit-profile-name-label,
+#profile-edit-name-label,
+#profile-edit-pdesc-label,
+#profile-edit-gender-label,
+#profile-edit-dob-label,
+#profile-edit-address-label,
+#profile-edit-locality-label,
+#profile-edit-region-label,
+#profile-edit-postal-code-label,
+#profile-edit-country-name-label,
+#profile-edit-marital-label,
+#profile-edit-with-label,
+#profile-edit-sexual-label,
+#profile-edit-politic-label,
+#profile-edit-religion-label,
+#profile-edit-pubkeywords-label,
+#profile-edit-prvkeywords-label,
+#profile-edit-gender-select,
+#profile-edit-homepage-label {
+  float: left;
+  width: 175px;
+  padding-top: 7px;
+}
+#profile-edit-profile-name,
+#profile-edit-name,
+#gender-select,
+#profile-edit-pdesc,
+#profile-edit-gender,
+#profile-edit-dob,
+#profile-edit-address,
+#profile-edit-locality,
+#profile-edit-region,
+#profile-edit-postal-code,
+#profile-edit-country-name,
+#profile-edit-marital,
+#profile-edit-with,
+#profile-edit-sexual,
+#profile-edit-politic,
+#profile-edit-religion,
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords,
+#profile-edit-homepage {
+  margin-top: 5px;
+}
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 50px;
+  float: left;
+}
+/* photo albums */
+#photo-edit-link-wrap {
+  margin-bottom: 10px;
+}
+#album-edit-link {
+  border-right: 1px solid #364e59;
+  float: left;
+  padding-right: 5px;
+  margin-right: 5px;
+}
+#photo-edit-link,
+#album-edit-link a {
+  background: url("../../../images/icons/16/edit.png") no-repeat left center;
+  padding-left: 18px;
+}
+#photo-toprofile-link {
+  background: url("../../../images/icons/16/user.png") no-repeat left center;
+  padding-left: 18px;
+}
+.photos-upload-link a,
+#photo-top-upload-link {
+  background: url("../../../images/icons/16/add.png") no-repeat left center;
+  padding-left: 18px;
+}
+.photo-top-image-wrapper,
+.photo-album-image-wrapper {
+  float: left;
+  margin: 0px 10px 10px 0px;
+  width: 150px;
+  height: 150px;
+  position: relative;
+  overflow: hidden;
+}
+.photo-top-image-wrapper img,
+.photo-album-image-wrapper img {
+  width: 150px;
+}
+.photo-top-image-wrapper .photo-top-album-name,
+.photo-album-image-wrapper .photo-top-album-name,
+.photo-top-image-wrapper .caption,
+.photo-album-image-wrapper .caption {
+  position: absolute;
+  color: #2d2d2d;
+  background-color: #ffffff;
+  width: 100%;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -webkit-transition: all 0.5s ease-in-out;
+  -moz-transition: all 0.5s ease-in-out;
+  -o-transition: all 0.5s ease-in-out;
+  -ms-transition: all 0.5s ease-in-out;
+  transition: all 0.5s ease-in-out;
+  bottom: -150px;
+}
+.photo-top-image-wrapper:hover .photo-top-album-name,
+.photo-album-image-wrapper:hover .photo-top-album-name,
+.photo-top-image-wrapper:hover .caption,
+.photo-album-image-wrapper:hover .caption {
+  bottom: 0px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -webkit-transition: all 0.5s ease-in-out;
+  -moz-transition: all 0.5s ease-in-out;
+  -o-transition: all 0.5s ease-in-out;
+  -ms-transition: all 0.5s ease-in-out;
+  transition: all 0.5s ease-in-out;
+}
+#photo-photo {
+  display: block;
+  width: 660px;
+  padding: 50px;
+  margin-bottom: 0px;
+  text-align: center;
+  background-color: #999999;
+}
+#photo-photo img {
+  max-width: 560px;
+}
+#photo-album-title {
+  background: url("../../../images/icons/22/image.png") no-repeat top left;
+  padding-left: 23px;
+  min-height: 22px;
+}
+#photo-album-title a {
+  display: block;
+  padding-top: 5px;
+}
+#photo-caption {
+  display: block;
+  width: 660px;
+  min-height: 55px;
+  background-color: #cccccc;
+  padding: 0 50px 0 50px;
+}
+#photo-next-link > a > div {
+  background: url("icons/next.png") no-repeat center center;
+  float: right;
+  width: 50px;
+  height: 50px;
+}
+#photo-prev-link > a > div {
+  background: url("icons/prev.png") no-repeat center center;
+  float: left;
+  width: 50px;
+  height: 50px;
+}
+#photo-like-div {
+  display: block;
+  width: 660px;
+  height: 30px;
+  background-color: #cccccc;
+  padding: 0 50px 0 50px;
+}
+#photo-like-div .icon {
+  float: left;
+}
+#photo-like-div .like-rotator {
+  float: right;
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+/* messages */
+#message-new {
+  background: #19aeff;
+  border: 1px solid #005c94;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+#mail-display-subject:hover .mail-delete {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+/* theme screenshot */
+.screenshot,
+#theme-preview {
+  position: absolute;
+  width: 202px;
+  left: 70%;
+  top: 50px;
+}
+.screenshot img,
+#theme-preview img {
+  width: 200px;
+  height: 150px;
+}
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+.pager {
+  margin-top: 25px;
+  clear: both;
+}
+/**
+ * ADMIN
+ */
+#pending-update {
+  float: right;
+  color: #ffffff;
+  font-weight: bold;
+  background-color: #FF0000;
+  padding: 0em 0.3em;
+}
+#adminpage dl {
+  clear: left;
+  margin-bottom: 2px;
+  padding-bottom: 2px;
+  border-bottom: 1px solid black;
+}
+#adminpage dt {
+  width: 200px;
+  float: left;
+  font-weight: bold;
+}
+#adminpage dd {
+  margin-left: 200px;
+}
+#adminpage h3 {
+  border-bottom: 1px solid #cccccc;
+}
+#adminpage .field label {
+  font-weight: bold;
+}
+#adminpage .submit {
+  clear: left;
+  text-align: right;
+}
+#adminpage #pluginslist {
+  margin: 0px;
+  padding: 0px;
+}
+#adminpage .plugin {
+  list-style: none;
+  display: block;
+  border: 1px solid #888888;
+  padding: 1em;
+  margin-bottom: 5px;
+  clear: left;
+}
+#adminpage .plugin desc {
+  margin-left: 2.5em;
+}
+#adminpage .toggleplugin {
+  float: left;
+  margin-right: 1em;
+}
+#adminpage table {
+  width: 100%;
+  border-bottom: 1px solid #000000;
+  margin: 5px 0px;
+}
+#adminpage table th {
+  text-align: left;
+}
+#adminpage table td .icon {
+  float: left;
+}
+#adminpage table tr:hover {
+  background-color: #bbc7d7;
+}
+#adminpage table#users img {
+  width: 16px;
+  height: 16px;
+}
+#adminpage .selectall {
+  text-align: right;
+}
+/* edit buttons for comments */
+.icon.dim {
+  opacity: 0.3;
+  filter: alpha(opacity=30);
+}
+.comment-edit-bb {
+  list-style: none;
+  display: none;
+  margin: 0px;
+  padding: 0px;
+  width: 75%;
+}
+.comment-edit-bb > li {
+  display: inline-block;
+  margin: 10px 10px 0 0;
+  visibility: none;
+}
+.editicon {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  background-image: url(icons/bbedit.png);
+  text-decoration: none;
+}
+.editicon :hover {
+  background-color: #ccc;
+}
+.boldbb {
+  background-position: 0px 0px;
+}
+.boldbb:hover {
+  background-position: 0px -16px;
+}
+.italicbb {
+  background-position: -16px 0px;
+}
+.italicbb:hover {
+  background-position: -16px -16px;
+}
+.underlinebb {
+  background-position: -32px 0px;
+}
+.underlinebb:hover {
+  background-position: -32px -16px;
+}
+.quotebb {
+  background-position: -48px 0px;
+}
+.quotebb:hover {
+  background-position: -48px -16px;
+}
+.codebb {
+  background-position: -64px 0px;
+}
+.codebb:hover {
+  background-position: -64px -16px;
+}
+.imagebb {
+  background-position: -80px 0px;
+}
+.imagebb:hover {
+  background-position: -80px -16px;
+}
+.urlbb {
+  background-position: -96px 0px;
+}
+.urlbb:hover {
+  background-position: -96px -16px;
+}
+.videobb {
+  background-position: -112px 0px;
+}
+.videobb:hover {
+  background-position: -112px -16px;
+}
diff --git a/view/theme/quattro/lilac/style.less b/view/theme/quattro/lilac/style.less
new file mode 100644
index 0000000000..7d81e788a9
--- /dev/null
+++ b/view/theme/quattro/lilac/style.less
@@ -0,0 +1,14 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ **/
+// Less file http://lesscss.org/
+// compile with lessc
+// $ lessc style.less > style.css
+
+@import "colors";
+@import "../icons";
+@import "../quattro";
+
+
+
+
diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl
index cbb7dcc745..e7264cfecf 100644
--- a/view/theme/quattro/profile_vcard.tpl
+++ b/view/theme/quattro/profile_vcard.tpl
@@ -56,6 +56,9 @@
 			{{ 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>
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 84aa13ac03..51fdfcf7c4 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -314,6 +314,18 @@ aside {
 		li { padding: 0px; margin: 0px; list-style: none; }
 	}
 
+	#wallmessage-link {
+		display: block;
+		.rounded();
+		color: @AsideConnect;
+		background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center;
+		font-weight: bold;
+		text-transform:uppercase;
+		padding: 4px 2px 2px 35px;
+                margin-top: 3px;
+		
+		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
+	}
 	#dfrn-request-link {
 		display: block;
 		.rounded();
diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
index 9887008606..65a92c1845 100644
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -37,13 +37,22 @@ function insertFormatting(comment,BBcode,id) {
 	return true;
 }
 
-function cmtBbOpen(id) {
-	$(".comment-edit-bb-" + id).show();
+function cmtBbOpen(comment, id) {
+	if($(comment).hasClass('comment-edit-text-full')) {
+		$(".comment-edit-bb-" + id).show();
+		return true;
+	}
+	return false;
 }
-function cmtBbClose(id) {
-	$(".comment-edit-bb-" + id).hide();
+function cmtBbClose(comment, id) {
+//	if($(comment).hasClass('comment-edit-text-empty')) {
+//		$(".comment-edit-bb-" + id).hide();
+//		return true;
+//	}
+	return false;
 }
 
+
 function hidecal() {
 	if(editor) return;
 	$('.fc').hide();
diff --git a/view/theme/smoothly/arrow.png b/view/theme/smoothly/arrow.png
new file mode 100644
index 0000000000..1fabe88b64
Binary files /dev/null and b/view/theme/smoothly/arrow.png differ
diff --git a/view/theme/smoothly/bottom.tpl b/view/theme/smoothly/bottom.tpl
new file mode 100644
index 0000000000..347d87094b
--- /dev/null
+++ b/view/theme/smoothly/bottom.tpl
@@ -0,0 +1,52 @@
+<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/categories_widget.tpl b/view/theme/smoothly/categories_widget.tpl
new file mode 100644
index 0000000000..773f3d7d69
--- /dev/null
+++ b/view/theme/smoothly/categories_widget.tpl
@@ -0,0 +1,12 @@
+<div id="categories-sidebar" class="widget">
+	<h3>$title</h3>
+	<div id="nets-desc">$desc</div>
+	
+	<ul class="categories-ul">
+		<li class="widget-list"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
+		{{ for $terms as $term }}
+			<li class="widget-list"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php
new file mode 100644
index 0000000000..a136a82d35
--- /dev/null
+++ b/view/theme/smoothly/default.php
@@ -0,0 +1,30 @@
+<!DOCTYPE html >
+<html>
+<head>
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body>
+	<header>
+		<?php if(x($page, 'header')) echo $page['header']; ?>
+	</header>
+
+	<?php if(x($page,'nav')) echo $page['nav']; ?>
+
+	<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+
+	<section><?php if(x($page,'content')) echo $page['content']; ?>
+		<div id="page-footer"></div>
+	</section>
+
+	<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']; ?>
+	</footer>
+
+	<?php if (x($page, 'bottom')) echo $page['bottom']; ?>
+</body>
+</html>
+
diff --git a/view/theme/smoothly/down.png b/view/theme/smoothly/down.png
new file mode 100644
index 0000000000..ab6f9fd49e
Binary files /dev/null and b/view/theme/smoothly/down.png differ
diff --git a/view/theme/smoothly/events_reminder.tpl b/view/theme/smoothly/events_reminder.tpl
new file mode 100644
index 0000000000..0a12d3ee47
--- /dev/null
+++ b/view/theme/smoothly/events_reminder.tpl
@@ -0,0 +1,41 @@
+<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){
+				$.fancybox(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>
+
+<br />
+<div id="events-reminder"></div>
+<br />
diff --git a/view/theme/smoothly/follow.tpl b/view/theme/smoothly/follow.tpl
index 9c8a6bf3f2..09258b9c30 100644
--- a/view/theme/smoothly/follow.tpl
+++ b/view/theme/smoothly/follow.tpl
@@ -1,7 +1,7 @@
 <div id="follow-sidebar" class="widget">
 	<h3>$connect</h3>
 	<div id="connect-desc">$desc</div>
-	<form action="follow" method="post" />
+	<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/footer.tpl b/view/theme/smoothly/footer.tpl
new file mode 100644
index 0000000000..25058a7ff7
--- /dev/null
+++ b/view/theme/smoothly/footer.tpl
@@ -0,0 +1,3 @@
+<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/smoothly/generic_links_widget.tpl b/view/theme/smoothly/generic_links_widget.tpl
new file mode 100644
index 0000000000..a1159f5bc8
--- /dev/null
+++ b/view/theme/smoothly/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div class="widget{{ if $class }} $class{{ endif }}">
+	{{if $title}}<h3>$title</h3>{{endif}}
+	{{if $desc}}<div class="desc">$desc</div>{{endif}}
+	
+	<ul>
+		{{ for $items as $item }}
+			<li class="widget-list"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/theme/smoothly/group_edit.tpl b/view/theme/smoothly/group_edit.tpl
deleted file mode 100644
index a8b3f92a07..0000000000
--- a/view/theme/smoothly/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/smoothly/header.tpl b/view/theme/smoothly/header.tpl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/view/theme/smoothly/jot.tpl b/view/theme/smoothly/jot.tpl
index 5f711cf242..437eec4373 100644
--- a/view/theme/smoothly/jot.tpl
+++ b/view/theme/smoothly/jot.tpl
@@ -14,11 +14,18 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
+		<div id="jot-title-wrap">
+			<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		</div>
+		<div id="jot-category-wrap">
+			<input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" />
+		</div>
 		<div id="jot-text-wrap">
-                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-                <textarea rows="5" cols="88" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+                	<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;" >
@@ -47,7 +54,7 @@
 
 	<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: $visitor;" >
+		<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>
 
diff --git a/view/theme/smoothly/js/jquery.autogrow.textarea.js b/view/theme/smoothly/js/jquery.autogrow.textarea.js
new file mode 100644
index 0000000000..806e34f512
--- /dev/null
+++ b/view/theme/smoothly/js/jquery.autogrow.textarea.js
@@ -0,0 +1,46 @@
+(function($) {
+
+    /*
+     * Auto-growing textareas; technique ripped from Facebook
+     */
+    $.fn.autogrow = function(options) {
+        
+        this.filter('textarea').each(function() {
+            
+            var $this       = $(this),
+                minHeight   = $this.height(),
+                lineHeight  = $this.css('lineHeight');
+            
+            var shadow = $('<div></div>').css({
+                position:   'absolute',
+                top:        -10000,
+                left:       -10000,
+                width:      $(this).width(),
+                fontSize:   $this.css('fontSize'),
+                fontFamily: $this.css('fontFamily'),
+                lineHeight: $this.css('lineHeight'),
+                resize:     'none'
+            }).appendTo(document.body);
+            
+            var update = function() {
+                
+                var val = this.value.replace(/</g, '&lt;')
+                                    .replace(/>/g, '&gt;')
+                                    .replace(/&/g, '&amp;')
+                                    .replace(/\n/g, '<br/>');
+                
+                shadow.html(val);
+                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
+            }
+            
+            $(this).change(update).keyup(update).keydown(update);
+            
+            update.apply(this);
+            
+        });
+        
+        return this;
+        
+    }
+    
+})(jQuery);
\ No newline at end of file
diff --git a/view/theme/smoothly/js/modernizr.custom.2.5.3.js b/view/theme/smoothly/js/modernizr.custom.2.5.3.js
new file mode 100644
index 0000000000..2502348b19
--- /dev/null
+++ b/view/theme/smoothly/js/modernizr.custom.2.5.3.js
@@ -0,0 +1,989 @@
+/* Modernizr 2.5.3 (Custom Build) | MIT & BSD
+ * Build: http://www.modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexbox_legacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-printshiv-mq-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
+ */
+;
+
+
+
+window.Modernizr = (function( window, document, undefined ) {
+
+    var version = '2.5.3',
+
+    Modernizr = {},
+
+
+    docElement = document.documentElement,
+
+    mod = 'modernizr',
+    modElem = document.createElement(mod),
+    mStyle = modElem.style,
+
+    inputElem  = document.createElement('input')  ,
+
+    smile = ':)',
+
+    toString = {}.toString,
+
+    prefixes = ' -webkit- -moz- -o- -ms- '.split(' '),
+
+
+
+    omPrefixes = 'Webkit Moz O ms',
+
+    cssomPrefixes = omPrefixes.split(' '),
+
+    domPrefixes = omPrefixes.toLowerCase().split(' '),
+
+    ns = {'svg': 'http://www.w3.org/2000/svg'},
+
+    tests = {},
+    inputs = {},
+    attrs = {},
+
+    classes = [],
+
+    slice = classes.slice,
+
+    featureName, 
+
+
+    injectElementWithStyles = function( rule, callback, nodes, testnames ) {
+
+      var style, ret, node,
+          div = document.createElement('div'),
+                body = document.body, 
+                fakeBody = body ? body : document.createElement('body');
+
+      if ( parseInt(nodes, 10) ) {
+                      while ( nodes-- ) {
+              node = document.createElement('div');
+              node.id = testnames ? testnames[nodes] : mod + (nodes + 1);
+              div.appendChild(node);
+          }
+      }
+
+                style = ['&#173;','<style>', rule, '</style>'].join('');
+      div.id = mod;
+          (body ? div : fakeBody).innerHTML += style;
+      fakeBody.appendChild(div);
+      if(!body){
+                fakeBody.style.background = "";
+          docElement.appendChild(fakeBody);
+      }
+
+      ret = callback(div, rule);
+        !body ? fakeBody.parentNode.removeChild(fakeBody) : div.parentNode.removeChild(div);
+
+      return !!ret;
+
+    },
+
+    testMediaQuery = function( mq ) {
+
+      var matchMedia = window.matchMedia || window.msMatchMedia;
+      if ( matchMedia ) {
+        return matchMedia(mq).matches;
+      }
+
+      var bool;
+
+      injectElementWithStyles('@media ' + mq + ' { #' + mod + ' { position: absolute; } }', function( node ) {
+        bool = (window.getComputedStyle ?
+                  getComputedStyle(node, null) :
+                  node.currentStyle)['position'] == 'absolute';
+      });
+
+      return bool;
+
+     },
+ 
+
+    isEventSupported = (function() {
+
+      var TAGNAMES = {
+        'select': 'input', 'change': 'input',
+        'submit': 'form', 'reset': 'form',
+        'error': 'img', 'load': 'img', 'abort': 'img'
+      };
+
+      function isEventSupported( eventName, element ) {
+
+        element = element || document.createElement(TAGNAMES[eventName] || 'div');
+        eventName = 'on' + eventName;
+
+            var isSupported = eventName in element;
+
+        if ( !isSupported ) {
+                if ( !element.setAttribute ) {
+            element = document.createElement('div');
+          }
+          if ( element.setAttribute && element.removeAttribute ) {
+            element.setAttribute(eventName, '');
+            isSupported = is(element[eventName], 'function');
+
+                    if ( !is(element[eventName], 'undefined') ) {
+              element[eventName] = undefined;
+            }
+            element.removeAttribute(eventName);
+          }
+        }
+
+        element = null;
+        return isSupported;
+      }
+      return isEventSupported;
+    })(),
+
+
+    _hasOwnProperty = ({}).hasOwnProperty, hasOwnProperty;
+
+    if ( !is(_hasOwnProperty, 'undefined') && !is(_hasOwnProperty.call, 'undefined') ) {
+      hasOwnProperty = function (object, property) {
+        return _hasOwnProperty.call(object, property);
+      };
+    }
+    else {
+      hasOwnProperty = function (object, property) { 
+        return ((property in object) && is(object.constructor.prototype[property], 'undefined'));
+      };
+    }
+
+
+    if (!Function.prototype.bind) {
+      Function.prototype.bind = function bind(that) {
+
+        var target = this;
+
+        if (typeof target != "function") {
+            throw new TypeError();
+        }
+
+        var args = slice.call(arguments, 1),
+            bound = function () {
+
+            if (this instanceof bound) {
+
+              var F = function(){};
+              F.prototype = target.prototype;
+              var self = new F;
+
+              var result = target.apply(
+                  self,
+                  args.concat(slice.call(arguments))
+              );
+              if (Object(result) === result) {
+                  return result;
+              }
+              return self;
+
+            } else {
+
+              return target.apply(
+                  that,
+                  args.concat(slice.call(arguments))
+              );
+
+            }
+
+        };
+
+        return bound;
+      };
+    }
+
+    function setCss( str ) {
+        mStyle.cssText = str;
+    }
+
+    function setCssAll( str1, str2 ) {
+        return setCss(prefixes.join(str1 + ';') + ( str2 || '' ));
+    }
+
+    function is( obj, type ) {
+        return typeof obj === type;
+    }
+
+    function contains( str, substr ) {
+        return !!~('' + str).indexOf(substr);
+    }
+
+    function testProps( props, prefixed ) {
+        for ( var i in props ) {
+            if ( mStyle[ props[i] ] !== undefined ) {
+                return prefixed == 'pfx' ? props[i] : true;
+            }
+        }
+        return false;
+    }
+
+    function testDOMProps( props, obj, elem ) {
+        for ( var i in props ) {
+            var item = obj[props[i]];
+            if ( item !== undefined) {
+
+                            if (elem === false) return props[i];
+
+                            if (is(item, 'function')){
+                                return item.bind(elem || obj);
+                }
+
+                            return item;
+            }
+        }
+        return false;
+    }
+
+    function testPropsAll( prop, prefixed, elem ) {
+
+        var ucProp  = prop.charAt(0).toUpperCase() + prop.substr(1),
+            props   = (prop + ' ' + cssomPrefixes.join(ucProp + ' ') + ucProp).split(' ');
+
+            if(is(prefixed, "string") || is(prefixed, "undefined")) {
+          return testProps(props, prefixed);
+
+            } else {
+          props = (prop + ' ' + (domPrefixes).join(ucProp + ' ') + ucProp).split(' ');
+          return testDOMProps(props, prefixed, elem);
+        }
+    }
+
+    var testBundle = (function( styles, tests ) {
+        var style = styles.join(''),
+            len = tests.length;
+
+        injectElementWithStyles(style, function( node, rule ) {
+            var style = document.styleSheets[document.styleSheets.length - 1],
+                                                    cssText = style ? (style.cssRules && style.cssRules[0] ? style.cssRules[0].cssText : style.cssText || '') : '',
+                children = node.childNodes, hash = {};
+
+            while ( len-- ) {
+                hash[children[len].id] = children[len];
+            }
+
+                       Modernizr['touch'] = ('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch || (hash['touch'] && hash['touch'].offsetTop) === 9; 
+             Modernizr['csstransforms3d'] = (hash['csstransforms3d'] && hash['csstransforms3d'].offsetLeft) === 9 && hash['csstransforms3d'].offsetHeight === 3;                  Modernizr['generatedcontent'] = (hash['generatedcontent'] && hash['generatedcontent'].offsetHeight) >= 1;                       Modernizr['fontface'] = /src/i.test(cssText) &&
+                                                                  cssText.indexOf(rule.split(' ')[0]) === 0;            }, len, tests);
+
+    })([
+                    '@font-face {font-family:"font";src:url("https://")}'                    ,['@media (',prefixes.join('touch-enabled),('),mod,')',
+                                '{#touch{top:9px;position:absolute}}'].join('')            ,['@media (',prefixes.join('transform-3d),('),mod,')',
+                                '{#csstransforms3d{left:9px;position:absolute;height:3px;}}'].join('')
+
+        ,['#generatedcontent:after{content:"',smile,'";visibility:hidden}'].join('')  
+    ],
+      [
+                'fontface'                         ,'touch'                 ,'csstransforms3d'  
+        ,'generatedcontent' 
+
+    ]);    tests['flexbox'] = function() {
+      return testPropsAll('flexOrder');
+    };
+
+
+    tests['flexbox-legacy'] = function() {
+        return testPropsAll('boxDirection');
+    };
+
+
+    tests['canvas'] = function() {
+        var elem = document.createElement('canvas');
+        return !!(elem.getContext && elem.getContext('2d'));
+    };
+
+    tests['canvastext'] = function() {
+        return !!(Modernizr['canvas'] && is(document.createElement('canvas').getContext('2d').fillText, 'function'));
+    };    tests['touch'] = function() {
+        return Modernizr['touch'];
+    };
+
+    tests['geolocation'] = function() {
+        return !!navigator.geolocation;
+    };
+
+    tests['postmessage'] = function() {
+      return !!window.postMessage;
+    };
+
+
+    tests['websqldatabase'] = function() {
+      return !!window.openDatabase;
+    };
+
+    tests['indexedDB'] = function() {
+      return !!testPropsAll("indexedDB",window);
+    };
+
+    tests['hashchange'] = function() {
+      return isEventSupported('hashchange', window) && (document.documentMode === undefined || document.documentMode > 7);
+    };
+
+    tests['history'] = function() {
+      return !!(window.history && history.pushState);
+    };
+
+    tests['draganddrop'] = function() {
+        var div = document.createElement('div');
+        return ('draggable' in div) || ('ondragstart' in div && 'ondrop' in div);
+    };
+
+    tests['websockets'] = function() {
+        for ( var i = -1, len = cssomPrefixes.length; ++i < len; ){
+          if ( window[cssomPrefixes[i] + 'WebSocket'] ){
+            return true;
+          }
+        }
+        return 'WebSocket' in window;
+    };
+
+
+    tests['rgba'] = function() {
+        setCss('background-color:rgba(150,255,150,.5)');
+
+        return contains(mStyle.backgroundColor, 'rgba');
+    };
+
+    tests['hsla'] = function() {
+            setCss('background-color:hsla(120,40%,100%,.5)');
+
+        return contains(mStyle.backgroundColor, 'rgba') || contains(mStyle.backgroundColor, 'hsla');
+    };
+
+    tests['multiplebgs'] = function() {
+                setCss('background:url(https://),url(https://),red url(https://)');
+
+            return /(url\s*\(.*?){3}/.test(mStyle.background);
+    };
+    tests['backgroundsize'] = function() {
+        return testPropsAll('backgroundSize');
+    };
+
+    tests['borderimage'] = function() {
+        return testPropsAll('borderImage');
+    };
+
+
+
+    tests['borderradius'] = function() {
+        return testPropsAll('borderRadius');
+    };
+
+    tests['boxshadow'] = function() {
+        return testPropsAll('boxShadow');
+    };
+
+    tests['textshadow'] = function() {
+        return document.createElement('div').style.textShadow === '';
+    };
+
+
+    tests['opacity'] = function() {
+                setCssAll('opacity:.55');
+
+                    return /^0.55$/.test(mStyle.opacity);
+    };
+
+
+    tests['cssanimations'] = function() {
+        return testPropsAll('animationName');
+    };
+
+
+    tests['csscolumns'] = function() {
+        return testPropsAll('columnCount');
+    };
+
+
+    tests['cssgradients'] = function() {
+        var str1 = 'background-image:',
+            str2 = 'gradient(linear,left top,right bottom,from(#9f9),to(white));',
+            str3 = 'linear-gradient(left top,#9f9, white);';
+
+        setCss(
+                       (str1 + '-webkit- '.split(' ').join(str2 + str1) 
+                       + prefixes.join(str3 + str1)).slice(0, -str1.length)
+        );
+
+        return contains(mStyle.backgroundImage, 'gradient');
+    };
+
+
+    tests['cssreflections'] = function() {
+        return testPropsAll('boxReflect');
+    };
+
+
+    tests['csstransforms'] = function() {
+        return !!testPropsAll('transform');
+    };
+
+
+    tests['csstransforms3d'] = function() {
+
+        var ret = !!testPropsAll('perspective');
+
+                        if ( ret && 'webkitPerspective' in docElement.style ) {
+
+                      ret = Modernizr['csstransforms3d'];
+        }
+        return ret;
+    };
+
+
+    tests['csstransitions'] = function() {
+        return testPropsAll('transition');
+    };
+
+
+
+    tests['fontface'] = function() {
+        return Modernizr['fontface'];
+    };
+
+    tests['generatedcontent'] = function() {
+        return Modernizr['generatedcontent'];
+    };
+    tests['video'] = function() {
+        var elem = document.createElement('video'),
+            bool = false;
+
+            try {
+            if ( bool = !!elem.canPlayType ) {
+                bool      = new Boolean(bool);
+                bool.ogg  = elem.canPlayType('video/ogg; codecs="theora"')      .replace(/^no$/,'');
+
+                bool.h264 = elem.canPlayType('video/mp4; codecs="avc1.42E01E"') .replace(/^no$/,'');
+
+                bool.webm = elem.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,'');
+            }
+
+        } catch(e) { }
+
+        return bool;
+    };
+
+    tests['audio'] = function() {
+        var elem = document.createElement('audio'),
+            bool = false;
+
+        try { 
+            if ( bool = !!elem.canPlayType ) {
+                bool      = new Boolean(bool);
+                bool.ogg  = elem.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,'');
+                bool.mp3  = elem.canPlayType('audio/mpeg;')               .replace(/^no$/,'');
+
+                                                    bool.wav  = elem.canPlayType('audio/wav; codecs="1"')     .replace(/^no$/,'');
+                bool.m4a  = ( elem.canPlayType('audio/x-m4a;')            || 
+                              elem.canPlayType('audio/aac;'))             .replace(/^no$/,'');
+            }
+        } catch(e) { }
+
+        return bool;
+    };
+
+
+    tests['localstorage'] = function() {
+        try {
+            localStorage.setItem(mod, mod);
+            localStorage.removeItem(mod);
+            return true;
+        } catch(e) {
+            return false;
+        }
+    };
+
+    tests['sessionstorage'] = function() {
+        try {
+            sessionStorage.setItem(mod, mod);
+            sessionStorage.removeItem(mod);
+            return true;
+        } catch(e) {
+            return false;
+        }
+    };
+
+
+    tests['webworkers'] = function() {
+        return !!window.Worker;
+    };
+
+
+    tests['applicationcache'] = function() {
+        return !!window.applicationCache;
+    };
+
+
+    tests['svg'] = function() {
+        return !!document.createElementNS && !!document.createElementNS(ns.svg, 'svg').createSVGRect;
+    };
+
+    tests['inlinesvg'] = function() {
+      var div = document.createElement('div');
+      div.innerHTML = '<svg/>';
+      return (div.firstChild && div.firstChild.namespaceURI) == ns.svg;
+    };
+
+    tests['smil'] = function() {
+        return !!document.createElementNS && /SVGAnimate/.test(toString.call(document.createElementNS(ns.svg, 'animate')));
+    };
+
+
+    tests['svgclippaths'] = function() {
+        return !!document.createElementNS && /SVGClipPath/.test(toString.call(document.createElementNS(ns.svg, 'clipPath')));
+    };
+
+    function webforms() {
+                                            Modernizr['input'] = (function( props ) {
+            for ( var i = 0, len = props.length; i < len; i++ ) {
+                attrs[ props[i] ] = !!(props[i] in inputElem);
+            }
+            if (attrs.list){
+                                  attrs.list = !!(document.createElement('datalist') && window.HTMLDataListElement);
+            }
+            return attrs;
+        })('autocomplete autofocus list placeholder max min multiple pattern required step'.split(' '));
+                            Modernizr['inputtypes'] = (function(props) {
+
+            for ( var i = 0, bool, inputElemType, defaultView, len = props.length; i < len; i++ ) {
+
+                inputElem.setAttribute('type', inputElemType = props[i]);
+                bool = inputElem.type !== 'text';
+
+                                                    if ( bool ) {
+
+                    inputElem.value         = smile;
+                    inputElem.style.cssText = 'position:absolute;visibility:hidden;';
+
+                    if ( /^range$/.test(inputElemType) && inputElem.style.WebkitAppearance !== undefined ) {
+
+                      docElement.appendChild(inputElem);
+                      defaultView = document.defaultView;
+
+                                        bool =  defaultView.getComputedStyle &&
+                              defaultView.getComputedStyle(inputElem, null).WebkitAppearance !== 'textfield' &&
+                                                                                  (inputElem.offsetHeight !== 0);
+
+                      docElement.removeChild(inputElem);
+
+                    } else if ( /^(search|tel)$/.test(inputElemType) ){
+                                                                                    } else if ( /^(url|email)$/.test(inputElemType) ) {
+                                        bool = inputElem.checkValidity && inputElem.checkValidity() === false;
+
+                    } else if ( /^color$/.test(inputElemType) ) {
+                                                                docElement.appendChild(inputElem);
+                        docElement.offsetWidth;
+                        bool = inputElem.value != smile;
+                        docElement.removeChild(inputElem);
+
+                    } else {
+                                        bool = inputElem.value != smile;
+                    }
+                }
+
+                inputs[ props[i] ] = !!bool;
+            }
+            return inputs;
+        })('search tel url email datetime date month week time datetime-local number range color'.split(' '));
+        }
+    for ( var feature in tests ) {
+        if ( hasOwnProperty(tests, feature) ) {
+                                    featureName  = feature.toLowerCase();
+            Modernizr[featureName] = tests[feature]();
+
+            classes.push((Modernizr[featureName] ? '' : 'no-') + featureName);
+        }
+    }
+
+    Modernizr.input || webforms();    setCss('');
+    modElem = inputElem = null;
+
+
+    Modernizr._version      = version;
+
+    Modernizr._prefixes     = prefixes;
+    Modernizr._domPrefixes  = domPrefixes;
+    Modernizr._cssomPrefixes  = cssomPrefixes;
+
+    Modernizr.mq            = testMediaQuery;
+
+    Modernizr.hasEvent      = isEventSupported;
+
+    Modernizr.testProp      = function(prop){
+        return testProps([prop]);
+    };
+
+    Modernizr.testAllProps  = testPropsAll;
+
+
+    Modernizr.testStyles    = injectElementWithStyles;
+    return Modernizr;
+
+})(this, this.document);
+/*! HTML5 Shiv v3.4 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */
+;(function(window, document) {
+
+  /** Preset options */
+  var options = window.html5 || {};
+
+  /** Used to skip problem elements */
+  var reSkip = /^<|^(?:button|form|map|select|textarea)$/i;
+
+  /** Detect whether the browser supports default html5 styles */
+  var supportsHtml5Styles;
+
+  /** Detect whether the browser supports unknown elements */
+  var supportsUnknownElements;
+
+  (function() {
+    var a = document.createElement('a');
+
+    a.innerHTML = '<xyz></xyz>';
+
+    //if the hidden property is implemented we can assume, that the browser supports HTML5 Styles
+    supportsHtml5Styles = ('hidden' in a);
+    supportsUnknownElements = a.childNodes.length == 1 || (function() {
+      // assign a false positive if unable to shiv
+      try {
+        (document.createElement)('a');
+      } catch(e) {
+        return true;
+      }
+      var frag = document.createDocumentFragment();
+      return (
+        typeof frag.cloneNode == 'undefined' ||
+        typeof frag.createDocumentFragment == 'undefined' ||
+        typeof frag.createElement == 'undefined'
+      );
+    }());
+
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * Creates a style sheet with the given CSS text and adds it to the document.
+   * @private
+   * @param {Document} ownerDocument The document.
+   * @param {String} cssText The CSS text.
+   * @returns {StyleSheet} The style element.
+   */
+  function addStyleSheet(ownerDocument, cssText) {
+    var p = ownerDocument.createElement('p'),
+        parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement;
+
+    p.innerHTML = 'x<style>' + cssText + '</style>';
+    return parent.insertBefore(p.lastChild, parent.firstChild);
+  }
+
+  /**
+   * Returns the value of `html5.elements` as an array.
+   * @private
+   * @returns {Array} An array of shived element node names.
+   */
+  function getElements() {
+    var elements = html5.elements;
+    return typeof elements == 'string' ? elements.split(' ') : elements;
+  }
+
+  /**
+   * Shivs the `createElement` and `createDocumentFragment` methods of the document.
+   * @private
+   * @param {Document|DocumentFragment} ownerDocument The document.
+   */
+  function shivMethods(ownerDocument) {
+    var cache = {},
+        docCreateElement = ownerDocument.createElement,
+        docCreateFragment = ownerDocument.createDocumentFragment,
+        frag = docCreateFragment();
+
+    ownerDocument.createElement = function(nodeName) {
+      // Avoid adding some elements to fragments in IE < 9 because
+      // * Attributes like `name` or `type` cannot be set/changed once an element
+      //   is inserted into a document/fragment
+      // * Link elements with `src` attributes that are inaccessible, as with
+      //   a 403 response, will cause the tab/window to crash
+      // * Script elements appended to fragments will execute when their `src`
+      //   or `text` property is set
+      var node = (cache[nodeName] || (cache[nodeName] = docCreateElement(nodeName))).cloneNode();
+      return html5.shivMethods && node.canHaveChildren && !reSkip.test(nodeName) ? frag.appendChild(node) : node;
+    };
+
+    ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' +
+      'var n=f.cloneNode(),c=n.createElement;' +
+      'h.shivMethods&&(' +
+        // unroll the `createElement` calls
+        getElements().join().replace(/\w+/g, function(nodeName) {
+          cache[nodeName] = docCreateElement(nodeName);
+          frag.createElement(nodeName);
+          return 'c("' + nodeName + '")';
+        }) +
+      ');return n}'
+    )(html5, frag);
+  }
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * Shivs the given document.
+   * @memberOf html5
+   * @param {Document} ownerDocument The document to shiv.
+   * @returns {Document} The shived document.
+   */
+  function shivDocument(ownerDocument) {
+    var shived;
+    if (ownerDocument.documentShived) {
+      return ownerDocument;
+    }
+    if (html5.shivCSS && !supportsHtml5Styles) {
+      shived = !!addStyleSheet(ownerDocument,
+        // corrects block display not defined in IE6/7/8/9
+        'article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}' +
+        // corrects audio display not defined in IE6/7/8/9
+        'audio{display:none}' +
+        // corrects canvas and video display not defined in IE6/7/8/9
+        'canvas,video{display:inline-block;*display:inline;*zoom:1}' +
+        // corrects 'hidden' attribute and audio[controls] display not present in IE7/8/9
+        '[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}' +
+        // adds styling not present in IE6/7/8/9
+        'mark{background:#FF0;color:#000}'
+      );
+    }
+    if (!supportsUnknownElements) {
+      shived = !shivMethods(ownerDocument);
+    }
+    if (shived) {
+      ownerDocument.documentShived = shived;
+    }
+    return ownerDocument;
+  }
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * The `html5` object is exposed so that more elements can be shived and
+   * existing shiving can be detected on iframes.
+   * @type Object
+   * @example
+   *
+   * // options can be changed before the script is included
+   * html5 = { 'elements': 'mark section', 'shivCSS': false, 'shivMethods': false };
+   */
+  var html5 = {
+
+    /**
+     * An array or space separated string of node names of the elements to shiv.
+     * @memberOf html5
+     * @type Array|String
+     */
+    'elements': options.elements || 'abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video',
+
+    /**
+     * A flag to indicate that the HTML5 style sheet should be inserted.
+     * @memberOf html5
+     * @type Boolean
+     */
+    'shivCSS': !(options.shivCSS === false),
+
+    /**
+     * A flag to indicate that the document's `createElement` and `createDocumentFragment`
+     * methods should be overwritten.
+     * @memberOf html5
+     * @type Boolean
+     */
+    'shivMethods': !(options.shivMethods === false),
+
+    /**
+     * A string to describe the type of `html5` object ("default" or "default print").
+     * @memberOf html5
+     * @type String
+     */
+    'type': 'default',
+
+    // shivs the document according to the specified `html5` object options
+    'shivDocument': shivDocument
+  };
+
+  /*--------------------------------------------------------------------------*/
+
+  // expose html5
+  window.html5 = html5;
+
+  // shiv the document
+  shivDocument(document);
+
+  /*------------------------------- Print Shiv -------------------------------*/
+
+  /** Used to filter media types */
+  var reMedia = /^$|\b(?:all|print)\b/;
+
+  /** Used to namespace printable elements */
+  var shivNamespace = 'html5shiv';
+
+  /** Detect whether the browser supports shivable style sheets */
+  var supportsShivableSheets = !supportsUnknownElements && (function() {
+    // assign a false negative if unable to shiv
+    var docEl = document.documentElement;
+    return !(
+      typeof document.namespaces == 'undefined' ||
+      typeof document.parentWindow == 'undefined' ||
+      typeof docEl.applyElement == 'undefined' ||
+      typeof docEl.removeNode == 'undefined' ||
+      typeof window.attachEvent == 'undefined'
+    );
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * Wraps all HTML5 elements in the given document with printable elements.
+   * (eg. the "header" element is wrapped with the "html5shiv:header" element)
+   * @private
+   * @param {Document} ownerDocument The document.
+   * @returns {Array} An array wrappers added.
+   */
+  function addWrappers(ownerDocument) {
+    var node,
+        nodes = ownerDocument.getElementsByTagName('*'),
+        index = nodes.length,
+        reElements = RegExp('^(?:' + getElements().join('|') + ')$', 'i'),
+        result = [];
+
+    while (index--) {
+      node = nodes[index];
+      if (reElements.test(node.nodeName)) {
+        result.push(node.applyElement(createWrapper(node)));
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Creates a printable wrapper for the given element.
+   * @private
+   * @param {Element} element The element.
+   * @returns {Element} The wrapper.
+   */
+  function createWrapper(element) {
+    var node,
+        nodes = element.attributes,
+        index = nodes.length,
+        wrapper = element.ownerDocument.createElement(shivNamespace + ':' + element.nodeName);
+
+    // copy element attributes to the wrapper
+    while (index--) {
+      node = nodes[index];
+      node.specified && wrapper.setAttribute(node.nodeName, node.nodeValue);
+    }
+    // copy element styles to the wrapper
+    wrapper.style.cssText = element.style.cssText;
+    return wrapper;
+  }
+
+  /**
+   * Shivs the given CSS text.
+   * (eg. header{} becomes html5shiv\:header{})
+   * @private
+   * @param {String} cssText The CSS text to shiv.
+   * @returns {String} The shived CSS text.
+   */
+  function shivCssText(cssText) {
+    var pair,
+        parts = cssText.split('{'),
+        index = parts.length,
+        reElements = RegExp('(^|[\\s,>+~])(' + getElements().join('|') + ')(?=[[\\s,>+~#.:]|$)', 'gi'),
+        replacement = '$1' + shivNamespace + '\\:$2';
+
+    while (index--) {
+      pair = parts[index] = parts[index].split('}');
+      pair[pair.length - 1] = pair[pair.length - 1].replace(reElements, replacement);
+      parts[index] = pair.join('}');
+    }
+    return parts.join('{');
+  }
+
+  /**
+   * Removes the given wrappers, leaving the original elements.
+   * @private
+   * @params {Array} wrappers An array of printable wrappers.
+   */
+  function removeWrappers(wrappers) {
+    var index = wrappers.length;
+    while (index--) {
+      wrappers[index].removeNode();
+    }
+  }
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * Shivs the given document for print.
+   * @memberOf html5
+   * @param {Document} ownerDocument The document to shiv.
+   * @returns {Document} The shived document.
+   */
+  function shivPrint(ownerDocument) {
+    var shivedSheet,
+        wrappers,
+        namespaces = ownerDocument.namespaces,
+        ownerWindow = ownerDocument.parentWindow;
+
+    if (!supportsShivableSheets || ownerDocument.printShived) {
+      return ownerDocument;
+    }
+    if (typeof namespaces[shivNamespace] == 'undefined') {
+      namespaces.add(shivNamespace);
+    }
+
+    ownerWindow.attachEvent('onbeforeprint', function() {
+      var imports,
+          length,
+          sheet,
+          collection = ownerDocument.styleSheets,
+          cssText = [],
+          index = collection.length,
+          sheets = Array(index);
+
+      // convert styleSheets collection to an array
+      while (index--) {
+        sheets[index] = collection[index];
+      }
+      // concat all style sheet CSS text
+      while ((sheet = sheets.pop())) {
+        // IE does not enforce a same origin policy for external style sheets
+        if (!sheet.disabled && reMedia.test(sheet.media)) {
+          for (imports = sheet.imports, index = 0, length = imports.length; index < length; index++) {
+            sheets.push(imports[index]);
+          }
+          try {
+            cssText.push(sheet.cssText);
+          } catch(er){}
+        }
+      }
+      // wrap all HTML5 elements with printable elements and add the shived style sheet
+      cssText = shivCssText(cssText.reverse().join(''));
+      wrappers = addWrappers(ownerDocument);
+      shivedSheet = addStyleSheet(ownerDocument, cssText);
+    });
+
+    ownerWindow.attachEvent('onafterprint', function() {
+      // remove wrappers, leaving the original elements, and remove the shived style sheet
+      removeWrappers(wrappers);
+      shivedSheet.removeNode(true);
+    });
+
+    ownerDocument.printShived = true;
+    return ownerDocument;
+  }
+
+  /*--------------------------------------------------------------------------*/
+
+  // expose API
+  html5.type += ' print';
+  html5.shivPrint = shivPrint;
+
+  // shiv for print
+  shivPrint(document);
+
+}(this, document));/*yepnope1.5.3|WTFPL*/
+(function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&o.call(a.opera)=="[object Opera]",l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,i){var j=b(a),l=j.autoCallback;j.url.split(".").pop().split("?").shift(),j.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]||h),j.instead?j.instead(a,e,f,g,i):(y[j.url]?j.noexec=!0:y[j.url]=1,f.load(j.url,j.forceCSS||!j.forceJS&&"css"==j.url.split(".").pop().split("?").shift()?"c":c,j.noexec,j.attrs,j.timeout),(d(e)||d(l))&&f.load(function(){k(),e&&e(j.origUrl,i,g),l&&l(j.origUrl,i,g),y[j.url]=2})))}function i(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var j,l,m=this.yepnope.loader;if(e(a))g(a,0,m,0);else if(w(a))for(j=0;j<a.length;j++)l=a[j],e(l)?g(l,0,m,0):w(l)?B(l):Object(l)===l&&i(l,m);else Object(a)===a&&i(a,m)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}})(this,document);
+Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0));};
+;
\ No newline at end of file
diff --git a/view/theme/smoothly/js/modernizr.custom.2.5.3.min.js b/view/theme/smoothly/js/modernizr.custom.2.5.3.min.js
new file mode 100644
index 0000000000..1ce20bdb85
--- /dev/null
+++ b/view/theme/smoothly/js/modernizr.custom.2.5.3.min.js
@@ -0,0 +1,4 @@
+/* Modernizr 2.5.3 (Custom Build) | MIT & BSD
+ * Build: http://www.modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexbox_legacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-printshiv-mq-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
+ */
+;window.Modernizr=function(a,b,c){function C(a){i.cssText=a}function D(a,b){return C(m.join(a+";")+(b||""))}function E(a,b){return typeof a===b}function F(a,b){return!!~(""+a).indexOf(b)}function G(a,b){for(var d in a)if(i[a[d]]!==c)return b=="pfx"?a[d]:!0;return!1}function H(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:E(f,"function")?f.bind(d||b):f}return!1}function I(a,b,c){var d=a.charAt(0).toUpperCase()+a.substr(1),e=(a+" "+o.join(d+" ")+d).split(" ");return E(b,"string")||E(b,"undefined")?G(e,b):(e=(a+" "+p.join(d+" ")+d).split(" "),H(e,b,c))}function K(){e.input=function(c){for(var d=0,e=c.length;d<e;d++)t[c[d]]=c[d]in j;return t.list&&(t.list=!!b.createElement("datalist")&&!!a.HTMLDataListElement),t}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,g,h,i=a.length;d<i;d++)j.setAttribute("type",g=a[d]),e=j.type!=="text",e&&(j.value=k,j.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(g)&&j.style.WebkitAppearance!==c?(f.appendChild(j),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(j,null).WebkitAppearance!=="textfield"&&j.offsetHeight!==0,f.removeChild(j)):/^(search|tel)$/.test(g)||(/^(url|email)$/.test(g)?e=j.checkValidity&&j.checkValidity()===!1:/^color$/.test(g)?(f.appendChild(j),f.offsetWidth,e=j.value!=k,f.removeChild(j)):e=j.value!=k)),s[a[d]]=!!e;return s}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var d="2.5.3",e={},f=b.documentElement,g="modernizr",h=b.createElement(g),i=h.style,j=b.createElement("input"),k=":)",l={}.toString,m=" -webkit- -moz- -o- -ms- ".split(" "),n="Webkit Moz O ms",o=n.split(" "),p=n.toLowerCase().split(" "),q={svg:"http://www.w3.org/2000/svg"},r={},s={},t={},u=[],v=u.slice,w,x=function(a,c,d,e){var h,i,j,k=b.createElement("div"),l=b.body,m=l?l:b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:g+(d+1),k.appendChild(j);return h=["&#173;","<style>",a,"</style>"].join(""),k.id=g,(l?k:m).innerHTML+=h,m.appendChild(k),l||(m.style.background="",f.appendChild(m)),i=c(k,a),l?k.parentNode.removeChild(k):m.parentNode.removeChild(m),!!i},y=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return x("@media "+b+" { #"+g+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},z=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=E(e[d],"function"),E(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),A={}.hasOwnProperty,B;!E(A,"undefined")&&!E(A.call,"undefined")?B=function(a,b){return A.call(a,b)}:B=function(a,b){return b in a&&E(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=v.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(v.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(v.call(arguments)))};return e});var J=function(c,d){var f=c.join(""),g=d.length;x(f,function(c,d){var f=b.styleSheets[b.styleSheets.length-1],h=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"",i=c.childNodes,j={};while(g--)j[i[g].id]=i[g];e.touch="ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch||(j.touch&&j.touch.offsetTop)===9,e.csstransforms3d=(j.csstransforms3d&&j.csstransforms3d.offsetLeft)===9&&j.csstransforms3d.offsetHeight===3,e.generatedcontent=(j.generatedcontent&&j.generatedcontent.offsetHeight)>=1,e.fontface=/src/i.test(h)&&h.indexOf(d.split(" ")[0])===0},g,d)}(['@font-face {font-family:"font";src:url("https://")}',["@media (",m.join("touch-enabled),("),g,")","{#touch{top:9px;position:absolute}}"].join(""),["@media (",m.join("transform-3d),("),g,")","{#csstransforms3d{left:9px;position:absolute;height:3px;}}"].join(""),['#generatedcontent:after{content:"',k,'";visibility:hidden}'].join("")],["fontface","touch","csstransforms3d","generatedcontent"]);r.flexbox=function(){return I("flexOrder")},r["flexbox-legacy"]=function(){return I("boxDirection")},r.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},r.canvastext=function(){return!!e.canvas&&!!E(b.createElement("canvas").getContext("2d").fillText,"function")},r.touch=function(){return e.touch},r.geolocation=function(){return!!navigator.geolocation},r.postmessage=function(){return!!a.postMessage},r.websqldatabase=function(){return!!a.openDatabase},r.indexedDB=function(){return!!I("indexedDB",a)},r.hashchange=function(){return z("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},r.history=function(){return!!a.history&&!!history.pushState},r.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},r.websockets=function(){for(var b=-1,c=o.length;++b<c;)if(a[o[b]+"WebSocket"])return!0;return"WebSocket"in a},r.rgba=function(){return C("background-color:rgba(150,255,150,.5)"),F(i.backgroundColor,"rgba")},r.hsla=function(){return C("background-color:hsla(120,40%,100%,.5)"),F(i.backgroundColor,"rgba")||F(i.backgroundColor,"hsla")},r.multiplebgs=function(){return C("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(i.background)},r.backgroundsize=function(){return I("backgroundSize")},r.borderimage=function(){return I("borderImage")},r.borderradius=function(){return I("borderRadius")},r.boxshadow=function(){return I("boxShadow")},r.textshadow=function(){return b.createElement("div").style.textShadow===""},r.opacity=function(){return D("opacity:.55"),/^0.55$/.test(i.opacity)},r.cssanimations=function(){return I("animationName")},r.csscolumns=function(){return I("columnCount")},r.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return C((a+"-webkit- ".split(" ").join(b+a)+m.join(c+a)).slice(0,-a.length)),F(i.backgroundImage,"gradient")},r.cssreflections=function(){return I("boxReflect")},r.csstransforms=function(){return!!I("transform")},r.csstransforms3d=function(){var a=!!I("perspective");return a&&"webkitPerspective"in f.style&&(a=e.csstransforms3d),a},r.csstransitions=function(){return I("transition")},r.fontface=function(){return e.fontface},r.generatedcontent=function(){return e.generatedcontent},r.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},r.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},r.localstorage=function(){try{return localStorage.setItem(g,g),localStorage.removeItem(g),!0}catch(a){return!1}},r.sessionstorage=function(){try{return sessionStorage.setItem(g,g),sessionStorage.removeItem(g),!0}catch(a){return!1}},r.webworkers=function(){return!!a.Worker},r.applicationcache=function(){return!!a.applicationCache},r.svg=function(){return!!b.createElementNS&&!!b.createElementNS(q.svg,"svg").createSVGRect},r.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==q.svg},r.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(l.call(b.createElementNS(q.svg,"animate")))},r.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(l.call(b.createElementNS(q.svg,"clipPath")))};for(var L in r)B(r,L)&&(w=L.toLowerCase(),e[w]=r[L](),u.push((e[w]?"":"no-")+w));return e.input||K(),C(""),h=j=null,e._version=d,e._prefixes=m,e._domPrefixes=p,e._cssomPrefixes=o,e.mq=y,e.hasEvent=z,e.testProp=function(a){return G([a])},e.testAllProps=I,e.testStyles=x,e}(this,this.document),function(a,b){function g(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function h(){var a=k.elements;return typeof a=="string"?a.split(" "):a}function i(a){var b={},c=a.createElement,e=a.createDocumentFragment,f=e();a.createElement=function(a){var e=(b[a]||(b[a]=c(a))).cloneNode();return k.shivMethods&&e.canHaveChildren&&!d.test(a)?f.appendChild(e):e},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+h().join().replace(/\w+/g,function(a){return b[a]=c(a),f.createElement(a),'c("'+a+'")'})+");return n}")(k,f)}function j(a){var b;return a.documentShived?a:(k.shivCSS&&!e&&(b=!!g(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),f||(b=!i(a)),b&&(a.documentShived=b),a)}function o(a){var b,c=a.getElementsByTagName("*"),d=c.length,e=RegExp("^(?:"+h().join("|")+")$","i"),f=[];while(d--)b=c[d],e.test(b.nodeName)&&f.push(b.applyElement(p(b)));return f}function p(a){var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(m+":"+a.nodeName);while(d--)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function q(a){var b,c=a.split("{"),d=c.length,e=RegExp("(^|[\\s,>+~])("+h().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),f="$1"+m+"\\:$2";while(d--)b=c[d]=c[d].split("}"),b[b.length-1]=b[b.length-1].replace(e,f),c[d]=b.join("}");return c.join("{")}function r(a){var b=a.length;while(b--)a[b].removeNode()}function s(a){var b,c,d=a.namespaces,e=a.parentWindow;return!n||a.printShived?a:(typeof d[m]=="undefined"&&d.add(m),e.attachEvent("onbeforeprint",function(){var d,e,f,h=a.styleSheets,i=[],j=h.length,k=Array(j);while(j--)k[j]=h[j];while(f=k.pop())if(!f.disabled&&l.test(f.media)){for(d=f.imports,j=0,e=d.length;j<e;j++)k.push(d[j]);try{i.push(f.cssText)}catch(m){}}i=q(i.reverse().join("")),c=o(a),b=g(a,i)}),e.attachEvent("onafterprint",function(){r(c),b.removeNode(!0)}),a.printShived=!0,a)}var c=a.html5||{},d=/^<|^(?:button|form|map|select|textarea)$/i,e,f;(function(){var a=b.createElement("a");a.innerHTML="<xyz></xyz>",e="hidden"in a,f=a.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var c=b.createDocumentFragment();return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined"}()})();var k={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:j};a.html5=k,j(b);var l=/^$|\b(?:all|print)\b/,m="html5shiv",n=!f&&function(){var c=b.documentElement;return typeof b.namespaces!="undefined"&&typeof b.parentWindow!="undefined"&&typeof c.applyElement!="undefined"&&typeof c.removeNode!="undefined"&&typeof a.attachEvent!="undefined"}();k.type+=" print",k.shivPrint=s,s(b)}(this,document),function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&o.call(a.opera)=="[object Opera]",l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,i){var j=b(a),l=j.autoCallback;j.url.split(".").pop().split("?").shift(),j.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]||h),j.instead?j.instead(a,e,f,g,i):(y[j.url]?j.noexec=!0:y[j.url]=1,f.load(j.url,j.forceCSS||!j.forceJS&&"css"==j.url.split(".").pop().split("?").shift()?"c":c,j.noexec,j.attrs,j.timeout),(d(e)||d(l))&&f.load(function(){k(),e&&e(j.origUrl,i,g),l&&l(j.origUrl,i,g),y[j.url]=2})))}function i(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var j,l,m=this.yepnope.loader;if(e(a))g(a,0,m,0);else if(w(a))for(j=0;j<a.length;j++)l=a[j],e(l)?g(l,0,m,0):w(l)?B(l):Object(l)===l&&i(l,m);else Object(a)===a&&i(a,m)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
\ No newline at end of file
diff --git a/view/theme/smoothly/message_side.tpl b/view/theme/smoothly/message_side.tpl
new file mode 100644
index 0000000000..a35c74ed99
--- /dev/null
+++ b/view/theme/smoothly/message_side.tpl
@@ -0,0 +1,13 @@
+<div id="message-sidebar" class="widget">
+	<br />
+	<div id="side-invite-link" class="side-link" ><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/theme/smoothly/nav.tpl b/view/theme/smoothly/nav.tpl
index 43cc7bca00..d7dd6aeebe 100644
--- a/view/theme/smoothly/nav.tpl
+++ b/view/theme/smoothly/nav.tpl
@@ -1,6 +1,4 @@
 <nav>
-	$langselector
-
 	<span id="banner">$banner</span>
 
 	<div id="notifications">	
@@ -58,9 +56,25 @@
 	</div>
 </nav>
 
+<div id="scrollup" >
+<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/totop.png" alt="back to top" title="Back to top" /></a>
+</div>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{4}"><a href="{0}"><img 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/peoplefind.tpl b/view/theme/smoothly/peoplefind.tpl
index 106abdb1ec..59f803d130 100644
--- a/view/theme/smoothly/peoplefind.tpl
+++ b/view/theme/smoothly/peoplefind.tpl
@@ -1,14 +1,15 @@
 <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-sidebar" name="search" size="24" title="$hint" /><input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
+	<form action="dirfind" method="post" >
+		<input id="side-peoplefind-url" type="text-sidebar" 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>
+	<div class="side-link" id="side-invite-link"><a href="match" >$similar</a></div>
+	<div class="side-link" id="side-invite-link"><a href="suggest" >$suggest</a></div>
+	<div class="side-link" id="side-invite-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>
+	<div class="side-link" id="side-invite-link"><a href="invite" >$inv</a></div>
 	{{ endif }}
 </div>
 
diff --git a/view/theme/smoothly/profile_vcard.tpl b/view/theme/smoothly/profile_vcard.tpl
index f798c58ea9..6d5fb10b74 100644
--- a/view/theme/smoothly/profile_vcard.tpl
+++ b/view/theme/smoothly/profile_vcard.tpl
@@ -3,7 +3,7 @@
 				
 	
 	{{ 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>
+	<div id="profile-photo-wrapper"><img class="photo" width="191" height="191" src="$profile.photo" alt="$profile.name"></div>
 
 
 
diff --git a/view/theme/smoothly/shiny.png b/view/theme/smoothly/shiny.png
new file mode 100644
index 0000000000..3af6030fdf
Binary files /dev/null and b/view/theme/smoothly/shiny.png differ
diff --git a/view/theme/smoothly/star.png b/view/theme/smoothly/star.png
index a327ba14e4..f03948faf2 100644
Binary files a/view/theme/smoothly/star.png and b/view/theme/smoothly/star.png differ
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 541a86a893..90de5a4f28 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -3,11 +3,10 @@
   	Smoothly
    
   	Created by Anne Walk and Devlon Duthie on 2011-09-24
-	Modified by alex@friendica.pixelbits.de on 2012-09-06
+	Modified by alex@friendica.pixelbits.de on 2012-09-17
 
-*/
-/* ========== */
-/* = Colors
+
+** Colors ** 
 Blue links - #1873a2
 Blue link hover - #6da6c4
 Blue Gradients (buttons and other gradients) - #1873a2 and #6da6c4
@@ -16,15 +15,12 @@ Grey Gradients (buttons and other gradients) - #bdbdbd and #a2a2a2
 Dark Grey Gradients - #7c7d7b and #555753
 Orange - #fec01d
 
-You can switch out the colors of the header, buttons and links by using a find and replace in your text editor.
-
- = */
-/* ========== */
+*/
 
 body {
     margin: 0 auto;
     padding-bottom: 3em;
-    position: relative;
+    /*position: relative;*/
     width: 960px;
     font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif;
     font-size: 15px;
@@ -38,10 +34,21 @@ body {
     color: #333333;
 }
 
-img {border: 0 none; max-width: 550px; }
+img {
+	border: 0 none;
+	max-width: 550px;
+}
 
-a { color: #1873a2; text-decoration: none; margin-bottom:1px;}
-a:hover { color: #6da6c4; padding-bottom: 0px;}
+a {
+	color: #1873a2;
+	text-decoration: none;
+	margin-bottom: 1px;
+}
+
+a:hover {
+	color: #6da6c4;
+	padding-bottom: 0px;
+}
 
 h3 > a, h4 > a {
 	font-size: 18px;
@@ -60,7 +67,6 @@ h2 {
 }
 
 p {
-
 	max-width: 600px;
 }
 
@@ -69,23 +75,48 @@ label {
 }
 
 li {
-	list-style: none;
+	list-style: none outside none;
 }
 
-.required { display: inline; color: #1873a2; }
-.fakelink { color: #1873a2; cursor: pointer; }
-.fakelink :hover { color: #6da6c4; }
-.heart { color: #FF0000; font-size: 100%; }
+li.widget-list {
+	list-style: none outside none;
+	background: url("arrow.png") no-repeat scroll left center transparent;
+	display: block;
+   	padding: 3px 24px;
+}
+
+.required {
+	display: inline;
+	color: #1873a2;
+}
+
+.fakelink {
+	color: #1873a2;
+	cursor: pointer;
+	margin-bottom: 10px;
+	margin-left: 10px;
+	/*background: url("down.png") no-repeat scroll left center transparent;*/
+}
+
+.fakelink :hover {
+	color: #6da6c4;
+}
+
+.heart {
+	color: #FF0000;
+	font-size: 100%;
+}
 
 
 input[type=text] {
+	float: left;
 	border: 1px solid #b0b0b0;
 	padding: 2px;
-	width: 466px;
-	margin-left: 0px;
-	-webkit-border-radius: 3px 3px 3px 3px;
-	-moz-border-radius: 3px 3px 3px 3px;
-	border-radius: 3px 3px 3px 3px;	
+	width: 575px;
+	margin-top: 10px;
+	border-radius: 3px 3px 3px 3px;
+		-webkit-border-radius: 3px 3px 3px 3px;
+		-moz-border-radius: 3px 3px 3px 3px;
 }
 
 input[type=text-sidebar] {
@@ -94,51 +125,57 @@ input[type=text-sidebar] {
 	width: 172px;
 	margin-left: 10px;
 	margin-top: 10px;
-	-webkit-border-radius: 3px 3px 3px 3px;
-	-moz-border-radius: 3px 3px 3px 3px;
-	border-radius: 3px 3px 3px 3px;	
+	border-radius: 3px 3px 3px 3px;
+		-webkit-border-radius: 3px 3px 3px 3px;
+		-moz-border-radius: 3px 3px 3px 3px;
 }
 
 input[type=submit] {
 	margin: 10px;
-	border: none;
 	font-size: 0.9em;
 	padding: 5px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	color:#efefef;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	color: #efefef;
 	text-align: center;
+	border: 1px solid #7C7D7B;
+	border-radius: 5px 5px 5px 5px;
 }
 
 input[type=submit]:hover {
-	border: none;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
 	color: #efefef;
+	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+	border-radius: 5px 5px 5px 5px;
 }
 input[type=submit]:active {
-	position:relative;
-	top:1px;
+	position: relative;
+	top: 1px;
 }
 
-.smalltext { font-size: 0.7em }
+.smalltext {
+	font-size: 0.7em
+}
 
-::selection	{ background:#fdf795; color: #000; /* Safari and Opera */ }
-::-moz-selection { background:#fdf795; color: #000; /* Firefox */ }
+::selection	{
+	background: #fec01d;
+	color: #000; /* Safari and Opera */
+}
+
+::-moz-selection {
+	background: #fec01d;
+	color: #000; /* Firefox */
+}
 
 section {
 	float: left;
-	padding-top: 40px; /*60*/
+	margin-top: 45px;
 	width: 730px;
 	font-size: 0.9em;
 	line-height: 1.2em;
@@ -146,20 +183,19 @@ section {
 
 .lframe {
 	border: 1px solid #dddddd;
-	-moz-box-shadow: 3px 3px 6px #959494;
-	-webkit-box-shadow: 3px 3px 6px #959494;
 	box-shadow: 3px 3px 6px #959494;
+		-moz-box-shadow: 3px 3px 6px #959494;
+		-webkit-box-shadow: 3px 3px 6px #959494;
 	background-color: #efefef;
 	padding: 10px;	
 }
 
 .mframe {
 	padding: 2px;
-	background-color: #efefef;
-	border: 1px solid #dddddd;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
-	box-shadow: 3px 3px 4px #959494;
+    background: none repeat scroll 0 0 #FFFFFF;
+    border: 1px solid #C5C5C5;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 0 8px #BDBDBD;
 }
 
 #wall-item-lock {
@@ -167,34 +203,31 @@ section {
 }
 
 .button {
-	border: none;
+	border: 1px solid #7C7D7B;
+	border-radius: 5px 5px 5px 5px;
 	font-size: 1em;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	color:#efefef;
-	text-align: center;	
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	color: #efefef;
+	text-align: center;
 }
 
 .button:hover {
-	border: none;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
-	color: #efefef;	
+	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+	border-radius: 5px 5px 5px 5px;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
+	color: #efefef;
 }
 
 .button:active {
-	position:relative;
-	top:1px;
+	position: relative;
+	top: 1px;
 }
 
 .button a {
@@ -243,19 +276,19 @@ section {
 
 #panel {
 	position: absolute;
-	font-size:0.8em;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
+	font-size: 0.8em;
 	border-radius: 5px;
+		-webkit-border-radius: 5px;
+		-moz-border-radius: 5px;
 	border: 1px solid #494948;
 	background-color: #2e3436;
-	opacity:50%;
+	opacity: 50%;
 	color: #eeeeec;
 	padding:1em;
 	z-index: 200;
-	-moz-box-shadow: 7px 7px 12px #434343;
-	-webkit-box-shadow: 7px75px 12px #434343;
 	box-shadow: 7px 7px 10px #434343;
+		-moz-box-shadow: 7px 7px 12px #434343;
+		-webkit-box-shadow: 7px75px 12px #434343;
 }
 
 /* ========= */
@@ -264,7 +297,7 @@ section {
 
 .pager {
 	padding-top: 30px;
-	display:block;
+	display: block;
 	clear: both;
 	text-align: center;
 }
@@ -273,8 +306,15 @@ section {
 	color: #626262;
 }
 
-.pager span { padding: 4px; margin:4px; }
-.pager_current { background-color: #1873a2; color: #ffffff; }
+.pager span {
+	padding: 4px;
+	margin: 4px;
+}
+
+.pager_current {
+	background-color: #1873a2;
+	color: #ffffff;
+}
 
 /* ======= */
 /* = Nav = */
@@ -291,68 +331,85 @@ nav {
 	height: 40px;
 	position: fixed;
 	color: #efefef;
-	background: url("nav-bg.png") no-repeat scroll 0px 0px transparent;
-	/*background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) );*/
-	/*background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% );*/
-	/*filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753');*/
-	/*background-color:#7c7d7b;*/
 	margin-bottom: 16px;
 	font-size: 15px;
-	/*border-bottom: 1px solid #494948;*/
+	background-color: #BDBDBD;
+	background: -moz-linear-gradient(center top , #BDBDBD 5%, #A2A2A2 100%) repeat scroll 0 0 #BDBDBD;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+	border-radius: 5px 5px 5px 5px;
 }
-nav a { text-decoration: none;	color: #eeeeec; border:0px;}
-nav a:hover { text-decoration: none;	color: #eeeeec; border:0px;}
+
+nav a {
+	text-decoration: none;
+	color: #eeeeec;
+	border: 0px;
+}
+
+nav a:hover {
+	text-decoration: none;
+	color: #eeeeec;
+	border: 0px;
+}
+
 nav #banner {
 	display: block;
 	position: absolute;
-	margin-left: 3px; /*10*/
-	margin-top: 3px; /*5*/
-	padding-bottom:5px;	
+	margin-left: 3px;
+	margin-top: 3px;
+	padding-bottom: 5px;	
 }
+
 nav #banner #logo-text a {
 	display: hidden;
 	font-size: 40px;
 	font-weight: bold;
 	margin-left: 3px;
+	text-shadow: #7C7D7B 3px 3px 5px;
 }
+
 nav #user-menu {
 	display: block;
-	width: 190px; /*240*/
+	width: auto;
+	min-width: 190px;
 	float: right;
-	margin-right: 5px; /*20%*/
-	margin-top: 3px;
+	margin-right: 5px;
+	margin-top: 4px;
 	padding: 5px;
 	position: relative;
 	vertical-align: middle;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) );
-	background:-moz-linear-gradient( center top, #797979 5%, #898988 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988');
-	background-color:#a2a2a2;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	border: 1px solid #9A9A9A;
-	color:#efefef;
-	text-decoration:none;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) );
+	background: -moz-linear-gradient( center top, #797979 5%, #898988 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988');
+	background-color: #a2a2a2;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	border: 1px solid #7C7D8B;
+	color: #efefef;
+	text-decoration: none;
 	text-align: center;   
 }
 nav #user-menu-label::after {
 	content: url("menu-user-pin.png") no-repeat;
 	padding-left: 15px;
 }
+
 nav #user-menu-label {
 	vertical-align: middle;
    	font-size: 12px;
 	padding: 5px;
 	text-align: center;
 }
+
 ul#user-menu-popup {
 	display: none;
 	position: absolute;
-	background:-webk/*	margin-right:10px;*/it-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) );
-	background:-moz-linear-gradient( center top, #a2a2a2 5%, #898988 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988');
-	background-color:#898988;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) );
+	background: -moz-linear-gradient( center top, #a2a2a2 5%, #898988 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988');
+	background-color: #898988;
 	width: 100%;
 	padding: 10px 0px;
 	margin: 0px;
@@ -369,16 +426,28 @@ ul#user-menu-popup {
 	box-shadow: 5px 5px 10px #242424;    
 	z-index: 10000;
 }
-ul#user-menu-popup li { display: block; }
-ul#user-menu-popup li a { display: block; padding: 5px; }
+
+ul#user-menu-popup li {
+	display: block;
+}
+
+ul#user-menu-popup li a {
+	display: block;
+	padding: 5px;
+}
+
 ul#user-menu-popup li a:hover {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) );
-	background:-moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2');
-	background-color:#6da6c4;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) );
+	background: -moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2');
+	background-color: #6da6c4;
+}
+
+ul#user-menu-popup li a.nav-sep {
+	border-top: 1px solid #989898;
+	border-style:inset;
 }
-ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:inset; }
 
 /* ============= */
 /* = Notifiers = */
@@ -387,8 +456,10 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 #notifications {
 	height: 32px;
 	position: absolute;
-	top:3px; left: 35%;
+	top: 3px;
+	left: 35%;
 }
+
 .nav-ajax-update {
 	width: 44px;
 	height: 32px;
@@ -400,11 +471,26 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 	float: left;
 	padding-left: 11px;
 }
-#notify-update { background-position: 0px -168px; }
-#net-update { background-position: 0px -126px; }
-#mail-update { background-position: 0px -40px; }
-#intro-update { background-position: 0px -84px; }
-#home-update { background-position: 0px 0px; }
+
+#notify-update {
+	background-position: 0px -168px;
+}
+
+#net-update {
+	background-position: 0px -126px;
+}
+
+#mail-update {
+	background-position: 0px -40px;
+}
+
+#intro-update {
+	background-position: 0px -84px;
+}
+
+#home-update {
+	background-position: 0px 0px;
+}
 
 #lang-select-icon {
 	bottom: 6px;
@@ -414,10 +500,10 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 	z-index: 10;
 }
 #language-selector {
-	position:fixed;
-	bottom:2px;
-	left:52px;
-	z-index:10;
+	position: fixed;
+	bottom: 2px;
+	left: 52px;
+	z-index: 10;
 }
 
 /* =================== */
@@ -425,26 +511,27 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 /* =================== */
 
 #sysmsg_info, #sysmsg {
-	position:fixed; 
+	position: fixed; 
 	bottom: 0px; right:20%; 
-	-moz-box-shadow: 7px 7px 12px #434343;
-	-webkit-box-shadow: 7px75px 12px #434343;
 	box-shadow: 7px 7px 10px #434343;
+		-moz-box-shadow: 7px 7px 12px #434343;
+		-webkit-box-shadow: 7px75px 12px #434343;
 	padding: 10px; 
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
-	-webkit-border-radius: 5px 5px 0px 0px;
-	-moz-border-radius: 5px 5px 0px 0px;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
 	border-radius: 5px 5px 0px 0px;
+		-webkit-border-radius: 5px 5px 0px 0px;
+		-moz-border-radius: 5px 5px 0px 0px;
 	border: 1px solid #da2c2c;
-	border-bottom:0px;
+	border-bottom: 0px;
 	padding-bottom: 50px;	
 	z-index: 1000;
 	color: #efefef;
 	font-style: bold;
 }
+
 #sysmsg_info br,
 #sysmsg br {
 	display:block;
@@ -458,22 +545,18 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 
 aside {
 	float: right;
-	margin-right: 5px; /*10%*/
-	/*width: 21%;*/
-	width: 200px; /*250*/
-	margin-top: 40px; /*50*/
-	font-size: 1.0em;
+	width: 205px;
+	margin-top: 45px;
+	font-size: 0.9em;
 	font-style: bold;
 }
 
 aside a{
 	padding-bottom: 5px;
-
 }
 
 .vcard {
 	font-size: 1em;
-/*	font-variant:small-caps; */
 }
 
 .vcard dd {
@@ -486,70 +569,74 @@ aside a{
 	font-size: 1.4em;
 	font-weight: bold;
 	border-bottom: none;
-	padding-top: 15px;
 }
 
 .vcard #profile-photo-wrapper {
 	margin: 10px 0px;
-	padding: 12px;
-	width: 175px;
-	background-color: #f3f3f3;
-	border: 1px solid #dddddd;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
-	box-shadow: 3px 3px 4px #959494;	
-border-radius: 5px 5px 5px 5px;
+	padding: 6px;
+	width: auto;
+	background: none repeat scroll 0 0 #FFFFFF;
+	border: 1px solid #C5C5C5;
+	box-shadow: 0 0 8px #BDBDBD;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
+	border-radius: 5px 5px 5px 5px;
 }
 
-aside h4 { font-size: 1.3em; }
+aside h4 {
+	font-size: 1.3em;
+}
 
 .allcontact-link {
 	color: #626262;
 	text-align: center;
 	font-weight: bold;
-/*	font-variant:small-caps; */
-	font-size: 1.1em;
+	font-size: 1em;
 }
 .allcontact-link a {
 	padding-bottom: 10px;
 }
 
-#profile-extra-links ul { margin-left: 0px; padding-left: 0px; list-style: none; }
+#profile-extra-links ul {
+	margin-left: 0px;
+	padding-left: 0px;
+	list-style: none;
+}
 
 #dfrn-request-link {
-	-moz-box-shadow:inset 0px 1px 0px 0px #a65151;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #a65151;
-	box-shadow:inset 0px 1px 0px 0px #a65151;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) );
-	background:-moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2');
-	background-color:#6da6c4;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	border:1px solid #fc5656;
-	display:inline-block;
-	color:#f0e7e7;
-	font-family:Trebuchet MS;
-	font-size:19px;
-	font-weight:bold;
+	box-shadow: inset 0px 1px 0px 0px #a65151;
+		-moz-box-shadow: inset 0px 1px 0px 0px #a65151;
+		-webkit-box-shadow: inset 0px 1px 0px 0px #a65151;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) );
+	background: -moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2');
+	background-color: #6da6c4;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	border: 1px solid #fc5656;
+	display: inline-block;
+	color: #f0e7e7;
+	font-family: Trebuchet MS;
+	font-size: 19px;
+	font-weight: bold;
 	text-align: center;
-	padding:10px;
+	padding: 10px;
 	width: 185px;
-	text-decoration:none;
-	text-shadow:1px 1px 0px #b36f6f;
+	text-decoration: none;
+	text-shadow: 1px 1px 0px #b36f6f;
 }
 
 #dfrn-request-link:hover {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
 }
 
 #dfrn-request-link:active {
-	position:relative;
-	top:1px;
+	position: relative;
+	top: 1px;
 }
 
 #dfrn-request-intro {
@@ -561,11 +648,10 @@ aside h4 { font-size: 1.3em; }
 	padding: 5px 5px 5px 5px;
 }
 #netsearch-box input[type="text"] {
-	width: 97%;
+	width: 90%;
 }
 #netsearch-box input[type="submit"] {
 	width: auto;
-	/*margin-top: 5px;*/
 }
 
 h3#search:before {
@@ -578,9 +664,9 @@ h3#search:before {
 	background-color: #f3f3f3;
 	border: 1px solid #cdcdcd;
 	margin-bottom: 10px;
-	-webkit-border-radius: 5px 5px 5px 5px;
-	-moz-border-radius: 5px 5px 5px 5px;
 	border-radius: 5px 5px 5px 5px;	
+		-webkit-border-radius: 5px 5px 5px 5px;
+		-moz-border-radius: 5px 5px 5px 5px;
 }
 
 #group-sidebar {
@@ -601,72 +687,70 @@ h3#search:before {
 
 .widget {
 	margin-top: 20px;
-	-moz-box-shadow: 1px 2px 6px 0px #959494;
-	-webkit-box-shadow: 1px 2px 6px 0px #959494;
 	box-shadow: 1px 2px 6px 0px #959494;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f8f8f8), color-stop(1, #f6f6f6) );
-	background:-moz-linear-gradient( center top, #f8f8f8 5%, #f6f6f6 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#f6f6f6');
-	background-color:#f8f8f8;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	color:#7c7d7b;
-	/*text-shadow:-1px 0px 0px #bdbdbd;*/
+		-moz-box-shadow: 1px 2px 6px 0px #959494;
+		-webkit-box-shadow: 1px 2px 6px 0px #959494;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f8f8f8), color-stop(1, #f6f6f6) );
+	background: -moz-linear-gradient( center top, #f8f8f8 5%, #f6f6f6 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#f6f6f6');
+	background-color: #f8f8f8;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	color: #7c7d7b;
 	border: 1px solid #cdcdcd;
 }
 
 #sidebar-new-group {
-	padding:7px;
+	padding: 7px;
 	width: 165px;
 	margin: auto;
-	margin-left: 10px; /*40*/
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	display:inline-block;
-	color:#efefef;
-	text-decoration:none;
+	margin-left: 10px;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	display: inline-block;
+	color: #efefef;
+	text-decoration: none;
 	text-align: center;
+	border: 1px solid #7C7D7B;
+	border-radius: 5px 5px 5px 5px;
 }
 
 
 #sidebar-new-group:hover {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
+	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+	border-radius: 5px 5px 5px 5px;
 }
 
 #sidebar-new-group:active {
-	position:relative;
-	top:1px;
+	position: relative;
+	top: 1px;
 }
 
 .group-selected, .nets-selected {
 	padding-bottom: 0px;
 	padding-left: 2px;
 	padding-right: 2px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	display:inline-block;
-	color:#efefef;
-	text-decoration:none;
+	box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	display: inline-block;
+	color: #efefef;
+	text-decoration: none;
 }
 
 #sidebar-new-group a {
@@ -676,19 +760,18 @@ h3#search:before {
 	margin: auto;
 }
 
-ul .sidebar-group-li{
+ul .sidebar-group-li {
 	list-style: none;
 	font-size: 1.0em;
 	padding-bottom: 5px;
 }
 
-ul .sidebar-group-li .icon{
+ul .sidebar-group-li .icon {
 	display: inline-block;
 	height: 12px;
 	width: 12px;
 }
 
-
 .nets-ul {
 	list-style-type: none;
 }
@@ -704,31 +787,30 @@ ul .sidebar-group-li .icon{
 	margin-left: 42px;
 }
 
-
-.widget h3{
-	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;
-	-moz-border-radius:5px 5px 0px 0px;
-	-webkit-border-radius:5px 5px 0px 0px;
-	border-radius:5px 5px 0px 0px;
-	border:1px solid #e2e2e2;
+.widget h3 {
+	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 #e2e2e2;
 	border-bottom: 1px solid #cdcdcd;
-	padding-top:5px;
+	padding-top: 5px;
 	padding-bottom: 5px;
 	vertical-align: baseline;
 	text-align: center;
-	text-shadow:-1px 0px 0px #bdbdbd;	
+	text-shadow: -1px 0px 0px #bdbdbd;	
 }
 
-#group-sidebar h3:before{
+#group-sidebar h3:before {
 	content: url("groups.png");
 	padding-right: 10px;
 	vertical-align: middle;
 }
 
-#saved-search-list{
+#saved-search-list {
 	margin-top: 15px;
 	padding-bottom: 20px;
 }
@@ -761,70 +843,111 @@ ul .sidebar-group-li .icon{
 /* ================== */
 
 .contact-block-img {
-	width: 48px; /*42*/
-	height: 48px;
-	padding-right: 2px;
+	width: 47px;
+	height: 47px;
+	margin-right: 2px;
+	border: 1px solid #C5C5C5;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 0 8px #BDBDBD;
 }
 .contact-block-div {
 	float: left;
 }
 
-.contact-block-textdiv { width: 150px; height: 34px; float: left; }
-#contact-block-end { clear: both; } 
+.contact-block-textdiv {
+	width: 150px;
+	height: 34px;
+	float: left;
+}
+
+#contact-block-end {
+	clear: both;
+} 
 
 /* ======= */
 /* = Jot = */
 /* ======= */
 
-#profile-jot-text_tbl { margin-bottom: 10px; }
-#profile-jot-text_ifr { width: 99.9%!important }
+#profile-jot-text_tbl {
+	margin-bottom: 10px;
+	margin-top: 10px;
+}
+
+#profile-jot-text_ifr {
+	width: 99.9%!important
+}
+
 #profile-jot-submit-wrapper { 
+	margin-top: 30px;
 }
 
 #jot-title {
 	margin: 0px;
 	height: 20px;
-	width: 466px;
+	width: 575px;
 	font-weight: bold;
 	border: 1px solid #cccccc;
 }
 
-#jot-title::-webkit-input-placeholder{font-weight: normal;}
-#jot-title:-moz-placeholder{font-weight: normal;}
-		
+#jot-title::-webkit-input-placeholder {
+	font-weight: normal;
+}
+
+#jot-title:-moz-placeholder {
+	font-weight: normal;
+}
+	
 #jot-title:hover,
 #jot-title:focus {
-	border: 1px solid #cccccc
+	border: 1px solid #cccccc;
 }
 
 .preview {
 	background: #FFFFC8;
 }
 
-#profile-jot-perms, #profile-jot-submit, #jot-preview-link {
+#profile-jot-perms, #profile-jot-submit {
 	width: 60px;
 	font-size: 12px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	display:inline-block;
-	color:#efefef;
-	text-decoration:none;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	display: inline-block;
+	color: #efefef;
+	text-decoration: none;
 	text-align: center;
+	border: 1px solid #7C7D7B;
+	border-radius: 5px 5px 5px 5px;
+}
+
+#jot-preview-link {
+	float: left;
+	width: 60px;
+	/*height: 10px;*/
+	font-size: 12px;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	display: inline-block;
+	color: #efefef;
+	text-decoration: none;
+	text-align: center;
+	padding: 5px 5px;
+	border: 1px solid #7C7D7B;
+	border-radius: 5px 5px 5px 5px;
 }
 
 #profile-jot-perms {
-	width: 30px;
+	width: 27px;
+	height: 27px;
+	float: right;
 	overflow: hidden;
-	border: 0px;
-	margin-left:5px;
+	margin-left: 10px;
+	margin-top: -20px;
+	border: 1px solid #7C7D7B;
+	border-radius: 5px 5px 5px 5px;
 }
 
 #jot-perms-perms .icon {
@@ -832,26 +955,40 @@ ul .sidebar-group-li .icon{
 }
 
 #profile-jot-submit {
-	float: left;
-	margin-right:5px;
-	border: 0px;
-	margin-top: 0px;
-	margin-left: -30px;
+	width: 80px;
+	float: right;
+	margin-right: 145px;
+	margin-top: -20px;
+	margin-left: 10px;
+	padding: 5px 5px;
+	border: 1px solid #7C7D7B;
+	border-radius: 5px 5px 5px 5px;
 }
 
-#profile-jot-perms:hover, #profile-jot-submit:hover, #jot-preview-link:hover {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
+#profile-jot-perms:hover, 
+#profile-jot-submit:hover, 
+#jot-preview-link:hover {
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
+	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+	border-radius: 5px 5px 5px 5px;
 }
-#profile-jot-perms:active, #profile-jot-submit:active, #jot-preview-link:active {
-	position:relative;
-	top:1px;
+
+#profile-jot-perms:active, 
+#profile-jot-submit:active, 
+#jot-preview-link:active {
+	position: relative;
+	top: 1px;
 }
 
 #character-counter {
-	position: absolute: right: 100px; top:100px;
+	position: relative;
+	float: left;
+	right: 0px; 
+	top: 0px;
 }
 #profile-rotator-wrapper {
 	float: right; 
@@ -861,16 +998,28 @@ ul .sidebar-group-li .icon{
 	float: left;
 	margin-right: 5px;
 }
+
 #profile-jot-tools-end,
-#profile-jot-banner-end { clear: both; }
+#profile-jot-banner-end {
+	clear: both;
+}
 
 #profile-jot-email-wrapper {
 	margin: 10px 10% 0px 10%;
 	border: 1px solid #eeeeee;
 	border-bottom: 0px;
 }
-#profile-jot-email-label { background-color: #555753; color: #ccccce; 	padding: 5px;}
-#profile-jot-email { margin: 5px; width: 95%; }
+
+#profile-jot-email-label {
+	background-color: #555753;
+	color: #ccccce;
+	padding: 5px;
+}
+
+#profile-jot-email {
+	margin: 5px;
+	width: 95%;
+}
 	
 #profile-jot-networks {
 	margin: 0px 10%;
@@ -883,24 +1032,50 @@ ul .sidebar-group-li .icon{
 	margin: 0px 10px;
 	border: 1px solid #eeeeee;
 	border-top: 0px;
-        display:block!important;
+    display:block!important;
 }
+
 #group_allow_wrapper,
 #group_deny_wrapper,
-#acl-permit-outer-wrapper { width: 47%; float: left; }
+#acl-permit-outer-wrapper {
+	width: 47%;
+	float: left;
+}
 
 #contact_allow_wrapper,
 #contact_deny_wrapper,
-#acl-deny-outer-wrapper { width: 47%; float: right; }
+#acl-deny-outer-wrapper {
+	width: 47%;
+	float: right;
+}
 
-#acl-permit-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;}
-#jot-public {background-color: #555753; color: #ff0000; padding: 5px; float: left;}
-#acl-deny-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;}
+#acl-permit-text {
+	background-color: #555753;
+	color: #ccccce;
+	padding: 5px; float: left;
+}
+
+#jot-public {
+	background-color: #555753; 
+	color: #ff0000; 
+	padding: 5px; 
+	float: left;
+}
+
+#acl-deny-text {
+	background-color: #555753; 
+	color: #ccccce; 
+	padding: 5px; 
+	float: left;
+}
 
 #acl-permit-text-end,
-#acl-deny-text-end { clear: both; }
+#acl-deny-text-end {
+	clear: both;
+}
+
 #profile-jot-wrapper {
-	margin-top: 0px;
+	margin-top: -15px;
 	padding-top: 0px;
 }
 
@@ -921,10 +1096,12 @@ profile-jot-banner-wrapper {
 	min-width: 400px;
 	list-style: none;
 	padding: 20px 0px 0px;
-	/*border-bottom: 1px solid #efefef;*/
 	font-size: 0.9em;
 }
-.tabs li { display: inline;}
+
+.tabs li {
+	display: inline;
+}
 
 .tab {
 	padding: 5px 10px 5px 10px;
@@ -949,122 +1126,171 @@ profile-jot-banner-wrapper {
 	margin-bottom: 20px;
 	padding-right: 10px;
 	padding-left: 12px;
-	background: -moz-linear-gradient(center top , #F8F8F8 5%, #F6F6F6 100%) repeat scroll 0 0 #F8F8F8;
+	background: none repeat scroll 0 0 #FFFFFF;
 	border: 1px solid #CDCDCD;
 	border-radius: 5px 5px 5px 5px;
-	box-shadow: 3px 3px 4px 0 #959494;
-	/*color: #E6E6E6;*/
-	margin-top: 20px;
-	/*text-shadow: -1px 0 0 #BDBDBD;*/
-	/*	Overflow: hidden; */
+	box-shadow: 0 0 8px #BDBDBD;
+}
+
+.wall-item-outside-wrapper-end {
+	clear: both;
+}
+
+.wall-item-content-wrapper {
+	position: relative;
+	max-width: 100%;
+	padding-top: 10px;
+}
+
+.wall-item-photo-menu {
+	display: none;
 }
 
-.wall-item-outside-wrapper-end { clear: both;}
-.wall-item-content-wrapper { position: relative; max-width: 100%; padding-top: 10px; }
-.wall-item-photo-menu { display: none;}
 .wall-item-photo-menu-button {
-	display:none;
+	display: none;
 	text-indent: -99999px;
 	background: #eeeeee url("menu-user-pin.png") no-repeat 75px center;
 	position: absolute;
 	overflow: hidden;
-	height: 20px; width: 90px; 
-	top: 85px;	left: -1px;
-	-webkit-border-radius: 0px 0px 5px  5px;
-	-moz-border-radius: 0px 0px 5px  5px;
+	height: 20px;
+	width: 90px;
+	top: 85px;
+	left: -1px;
 	border-radius: 0px 0px 5px  5px;	
+		-webkit-border-radius: 0px 0px 5px  5px;
+		-moz-border-radius: 0px 0px 5px  5px;
+}
+
+.wall-item-info {
+	float: left;
+	width: 100px;
 }
 
-.wall-item-info { float: left; width: 100px; } /*140*/
 .wall-item-photo-wrapper { 
-	width: 80px; height: 80px;  
+	width: 80px; 
+	height: 80px;  
 	position: relative;
 }
 
 .wall-item-tools { 
 	filter: alpha(opacity=60);
 	opacity: 0.7;
-	-webkit-transition: all 0.25s ease-in-out;
-	-moz-transition: all 0.25s ease-in-out;
-	-o-transition: all 0.25s ease-in-out;
-	-ms-transition: all 0.25s ease-in-out;
-	transition: all 0.25s ease-in-out;	
-	/*margin-left: 140px;*/
-	margin-top: 10px;
+	transition: all 0.25s ease-in-out;
+		-webkit-transition: all 0.25s ease-in-out;
+		-moz-transition: all 0.25s ease-in-out;
+	margin-top: 20px;
 	padding-bottom: 5px;
 	float: right;
+	width: auto;
 }
 
 .wall-item-tools:hover {
 	filter: alpha(opacity=100);
 	opacity: 1;
-	-webkit-transition: all 0.25s ease-in-out;
-	-moz-transition: all 0.25s ease-in-out;
-	-o-transition: all 0.25s ease-in-out;
-	-ms-transition: all 0.25s ease-in-out;
 	transition: all 0.25s ease-in-out;	
-	margin-left: 140px;
+		-webkit-transition: all 0.25s ease-in-out;
+		-moz-transition: all 0.25s ease-in-out;
+}
+
+.wall-item-social { 
+	filter: alpha(opacity=60);
+	opacity: 0.7;
+	transition: all 0.25s ease-in-out;
+		-webkit-transition: all 0.25s ease-in-out;
+		-moz-transition: all 0.25s ease-in-out;
+	margin-top: 20px;
+	margin-left: 0px;
+	padding-bottom: 5px;
+	float: left;
+	width: auto;
+}
+
+.wall-item-social:hover {
+	filter: alpha(opacity=100);
+	opacity: 1;
+	transition: all 0.25s ease-in-out;	
+		-webkit-transition: all 0.25s ease-in-out;
+		-moz-transition: all 0.25s ease-in-out;
 }
 
 .wall-item-outside-wrapper.comment .wall-item-tools {
-	margin: 5px 5px 0px 70px;
 	float: right;
 }
 
 .wall-item-like-buttons {
 	float: left;
-	padding-left: 10px;
 }
+
 .wall-item-like-buttons a.icon {
 	float: left;
-	margin-right: 5px;
+	margin-right: 10px;
 	display: inline;
 }
+
 .wall-item-links-wrapper {
-	width: 30px; /*20*/
+	width: 30px;
 	float: left;
 }
+
 .wall-item-delete-wrapper {
 	float: left;
-	margin-right: 5px;
+	margin-right: 10px;
 }
+
 .wall-item-links-wrapper a.icon {
 	float: left;
-	margin-right: 5px;
+	margin-right: 10px;
 	display: inline;
 }
+
 .pencil {
 	float: left;
+	margin-right: 20px;
 }
 
 .star-item {
 	float: left;	
 }
+
 .tag-item {
 	float: left;	
 }
-.wall-item-title { font-size: 1.2em; font-weight: bold; padding-top: 5px; margin-left: 100px;}
-.wall-item-body {
-	margin-left: 100px; /*140*/
-	padding-right: 10px;
-	padding-top: 5px;
-	max-width: 100%; /*85*/
+
+.wall-item-title {
+	font-size: 1.2em;
+	font-weight: bold; 
+	padding-top: 5px; 
+	margin-left: 100px;
 }
 
-.wall-item-body img { max-width: 100%; height: auto; }
+.wall-item-body {
+	margin-left: 100px;
+	padding-right: 10px;
+	padding-top: 5px;
+	max-width: 100%;
+}
+
+.wall-item-body img { 
+	max-width: 100%; 
+	height: auto; 
+}
 
 .wall-item-body p {
 	font-size: 0.8em;
 }
-.wall-item-lock-wrapper { float: right; }
+
+.wall-item-lock-wrapper { 
+	float: right; 
+}
+
 .wall-item-dislike,
 .wall-item-like {
 	clear: left;
 	font-size: 0.9em;
-	margin: 0px 0px 10px 450px;
-	padding-left: 0px;
-
+	margin: 0px 0px 10px 0px;
+	padding-left: 10px;
 }
+
 .wall-item-author {
 	font-size: 0.9em;
 	margin: 0px 0px 0px 100px;
@@ -1075,31 +1301,50 @@ profile-jot-banner-wrapper {
 	color: #898989;
 }
 
-.wall-item-ago { display: inline; padding-left: 0px; color: #898989;} /*10*/
-.wall-item-wrapper-end { clear:both; }
+.wall-item-ago { 
+	display: inline; 
+	padding-left: 0px; 
+	color: #898989;
+}
+
+.wall-item-wrapper-end { 
+	clear:both; 
+}
+
 .wall-item-location {
-	margin-top:5px;
+	margin-top: 5px;
 	width: 100px;
 	overflow: hidden;
 	text-overflow: ellipsis;
-	-o-text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+}
+
+.wall-item-location .icon { 
+	float: left; 
 }
 
-.wall-item-location .icon { float: left; }
 .wall-item-location > a {
-	margin-left: 0px; /*25*/
+	margin-left: 0px;
+	margin-right: 3px;
 	font-size: 0.9em;
 	display: block;
-/*	font-variant:small-caps; */
+	font-variant: small-caps;
 	color: #898989;
 }
 
-.wall-item-location .smalltext { margin-left: 25px;  font-size: 0.9em; display: block;}
-.wall-item-location > br { display: none; }
+.wall-item-location .smalltext { 
+	margin-left: 25px;  
+	font-size: 0.9em; 
+	display: block;
+}
+
+.wall-item-location > br { 
+	display: none; 
+}
+
 .wall-item-conv a{
 	font-size: 0.9em;
 	color: #898989;
-/*	font-variant:small-caps; */
 }
 
 .wallwall .wwto {
@@ -1113,8 +1358,15 @@ profile-jot-banner-wrapper {
 	height: 30px;    
 }
 
-.wallwall .wwto img { width: 30px!important; height: 30px!important;}
-.wallwall .wall-item-photo-end { clear: both; }
+.wallwall .wwto img { 
+	width: 30px!important; 
+	height: 30px!important;
+}
+
+.wallwall .wall-item-photo-end { 
+	clear: both; 
+}
+
 .wall-item-arrowphoto-wrapper {
 	position: absolute;
 	left: 20px;
@@ -1131,50 +1383,70 @@ profile-jot-banner-wrapper {
 	border-left: 1px solid #dddddd;
 	border-bottom: 1px solid #dddddd;
 	position: absolute;
-	left: -2px; top: 101px;
+	left: -2px; 
+	top: 101px;
 	display: none;
 	z-index: 10000;
-	-webkit-border-radius: 0px 5px 5px 5px;
-	-moz-border-radius: 0px 5px 5px 5px;
 	border-radius: 0px 5px 5px 5px;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
+		-webkit-border-radius: 0px 5px 5px 5px;
+		-moz-border-radius: 0px 5px 5px 5px;
 	box-shadow: 3px 3px 4px #959494;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
+
 }
 
 .wall-item-photo-menu-button {
 	border-right: 1px solid #dddddd;
 	border-left: 1px solid #dddddd;
 	border-bottom: 1px solid #dddddd;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
 	box-shadow: 3px 3px 4px #959494;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
 }
 
 .fakelink wall-item-photo-menu-button {
 	-webkit-border-radius: 0px 5px 5px 5px;
 	-moz-border-radius: 0px 5px 5px 5px;
 	border-radius: 0px 5px 5px 5px;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
 	box-shadow: 3px 3px 4px #959494;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
+}
+
+.wall-item-photo-menu ul { 
+	margin: 0px; 
+	padding: 0px; 
+	list-style: none;
+}
+
+.wall-item-photo-menu li a { 
+	white-space: nowrap;  
+	display: block; 
+	padding: 5px 2px; 	
+	color: #2e3436;	 
 }
 
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.wall-item-photo-menu li a { white-space: nowrap;  display: block; padding: 5px 2px; 	color: #2e3436;	 }
 .wall-item-photo-menu li a:hover {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2; 
-	order-bottom: none;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2; 
+	/*order-bottom: none;*/
 }
 
 .icon.drop,
-.icon.drophide { float: right;}
-#item-delete-selected {	overflow: auto;	width: 100%;}
+.icon.drophide { 
+	float: right;
+}
 
+#item-delete-selected {	
+	overflow: auto;
+	margin-top: 20px;
+	float: right;
+    	width: 230px;
+}
 
 /* ============ */
 /* = Comments = */
@@ -1184,30 +1456,42 @@ profile-jot-banner-wrapper {
 	font-size: 0.9em;
 	color: #898989;
 	margin-left: 60px;
-	/*font-variant:small-caps;*/
 }
  
-.wall-item-outside-wrapper.comment { margin-left: 70px; }
+.wall-item-outside-wrapper.comment { 
+	margin-left: 70px; 
+}
+
 .wall-item-outside-wrapper.comment .wall-item-photo {
 	width: 40px!important;
 	height: 40px!important;
 }
 
-.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; }
+.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {
+	width: 40px; 
+	height: 40px; 
+}
+
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
 	width: 50px;
 	top: 45px;
 	background-position: 35px center;
 }
-.wall-item-outside-wrapper.comment .wall-item-info { width: 60px; }
+	
+.wall-item-outside-wrapper.comment .wall-item-info { 
+	width: 60px; 
+}
+
 .wall-item-outside-wrapper.comment .wall-item-body {
-	margin-left: 60px;/*70*/
+	margin-left: 60px;
 	max-width: 100%;
 	padding-right: 10px;
 	padding-left: 0px;
 }
 
-.wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px; } /*10*/
+.wall-item-outside-wrapper.comment .wall-item-author { 
+	margin-left: 60px; 
+}
 
 .wall-item-outside-wrapper.comment .wall-item-photo-menu {
 	min-width: 50px;
@@ -1216,46 +1500,66 @@ profile-jot-banner-wrapper {
 .icollapse-wrapper {
 	font-size: 0.9em;
 	color: #898989;
-/*	font-variant:small-caps;	*/
 }
 
 .comment-wwedit-wrapper,
-.comment-edit-wrapper { margin: 30px 0px 0px 80px;}
+.comment-edit-wrapper { 
+	margin: 0px 0px 0px 80px;
+}
+
 .comment-wwedit-wrapper img,
-.comment-edit-wrapper img { width: 20px; height: 20px; }
-.comment-edit-photo-link { float: left; width: 40px;}
+.comment-edit-wrapper img { 
+	width: 20px; 
+	height: 20px;
+	margin-top: 5px;
+}
+
+.comment-edit-photo-link { 
+	float: left; 
+	width: 40px;
+}
+
 .comment-edit-text-empty { 
 	width: 80%;
 	height: 20px;
-	/*border: 0px;*/
 	color: #babdb6;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
 	transition: all 0.5s ease-in-out;	
+		-webkit-transition: all 0.5s ease-in-out;
+		-moz-transition: all 0.5s ease-in-out;
 }
-.comment-edit-text-empty:hover { color: #999999;}
-.comment-edit-text-full { width: 80%; height: 6em;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
+
+.comment-edit-text-empty:hover {
+	color: #999999;
+}
+
+.comment-edit-text-full { 
+	width: 80%; 
+	height: 6em;
 	transition: all 0.5s ease-in-out;	
+		-webkit-transition: all 0.5s ease-in-out;
+		-moz-transition: all 0.5s ease-in-out;
 }
-.comment-edit-submit-wrapper { width: 80%; margin-left: 40px; text-align: right; }
+
+.comment-edit-submit-wrapper { 
+	width: 80%; 
+	margin-left: 40px; 
+	text-align: left; 
+}
+
 .comment-edit-submit {
 	height: 22px;
+	padding: 5px 5px;
 	background-color: #a2a2a2;
 	color: #eeeeec;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0px;
+	border: 1px solid #CDCDCD;
+	border-radius: 5px 5px 5px 5px;
 }
 
 .comment-edit-submit:hover {
 	background-color: #1873a2;
+	border: 1px solid #CDCDCD;
+	border-radius: 5px 5px 5px 5px;
+	box-shadow: 0 0 8px #BDBDBD;
 }
 
 .comment-edit-submit:active {
@@ -1294,21 +1598,28 @@ profile-jot-banner-wrapper {
 	margin-bottom: 0px;
 	padding-bottom: 5px;
 	font-size: 18px;
-	/*font-variant:small-caps;*/
 }
  
-div[id$="wrapper"] { height: 100%;} 
-div[id$="wrapper"] br { clear: left; }
-#advanced-profile-with { margin-left: 20px;}
+div[id$="wrapper"] { 
+	height: 100%;
+}
+ 
+div[id$="wrapper"] br { 
+	clear: left; 
+}
+
+#advanced-profile-with { 
+	margin-left: 20px;
+}
 
 #profile-listing-desc {
 	float: left;
 	display: inline;
 	padding: 5px 10px 5px 10px;
 	width: 150px;
-	margin-bottom:20px;
+	margin-bottom: 20px;
 	margin-top: 20px;
-	display:inline-block;
+	display: inline-block;
 	font-style: bold;
 	text-align: center;
 }
@@ -1317,7 +1628,7 @@ div[id$="wrapper"] br { clear: left; }
 	float: left;
 	display: inline;
 	width: auto;
-	margin-left:5px;
+	margin-left: 5px;
 	margin-top: 20px;
 	padding: 5px 10px 5px 10px;
 	font-style: bold;
@@ -1326,7 +1637,6 @@ div[id$="wrapper"] br { clear: left; }
 
 .profile-listing-name {
 	font-size: 1em;
-/*	font-variant: small-caps;*/
 }
 .profile-listing-name a {
 	color: #898989;
@@ -1335,16 +1645,16 @@ div[id$="wrapper"] br { clear: left; }
 #profile-edit-links li {
 	display: inline;
 	width: 150px;
-	margin-bottom:20px;
+	margin-bottom: 20px;
 	margin-top: 20px;
 	background-color: #a2a2a2;
 	color: #eeeeec;
 	padding: 5px 10px 5px 10px;
 	margin-right: 5px;
 	font-style: bold;
-	-webkit-border-radius: 5px 5px 5px 5px;
-	-moz-border-radius: 5px 5px 5px 5px;
 	border-radius: 5px 5px 5px 5px;	
+		-webkit-border-radius: 5px 5px 5px 5px;
+		-moz-border-radius: 5px 5px 5px 5px;
 }
 
 #profile-edit-links li a {
@@ -1367,12 +1677,16 @@ div[id$="wrapper"] br { clear: left; }
 	position: absolute;
 }
 
-#cropimage-wrapper { float:left; }
-#crop-image-form { clear:both; }
+#cropimage-wrapper { 
+	float:left; 
+}
+
+#crop-image-form { 
+	clear:both; 
+}
 
 .profile-match-name a{
 	color: #999;
-	/*font-variant: small-caps;*/
 	font-size: 1em;
 }
 
@@ -1383,13 +1697,13 @@ div[id$="wrapper"] br { clear: left; }
 .profile-match-wrapper {
 	width: 82%;
 	padding: 5px;
-	margin-bottom:10px;
+	margin-bottom: 10px;
 	margin-left: 20px;
 	background-color: #f6f6f6;
 	border: 1px solid #dddddd;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
 	box-shadow: 3px 3px 4px #959494;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
 	clear: both;	
 }
 
@@ -1427,17 +1741,18 @@ div[id$="wrapper"] br { clear: left; }
 
 #photo-top-links {
 	width: 130px;
-	margin-bottom:20px;
+	margin-bottom: 20px;
 	margin-top: 20px;
 	background-color: #a2a2a2;
 	color: #eeeeec;
 	padding: 5px 10px 5px 10px;
 	margin-right: 5px;
 	font-style: bold;
-	-webkit-border-radius: 5px 5px 5px 5px;
-	-moz-border-radius: 5px 5px 5px 5px;
 	border-radius: 5px 5px 5px 5px;		
+		-webkit-border-radius: 5px 5px 5px 5px;
+		-moz-border-radius: 5px 5px 5px 5px;
 }
+
 #photo-top-links a {
 	color: #efefef;
 }
@@ -1454,7 +1769,7 @@ div[id$="wrapper"] br { clear: left; }
 	float: left;
 	margin: 0px 10px 10px 0px;
 	padding-bottom: 30px;
-	position:relative;	
+	position: relative;	
 }
 
 .photo-top-image-wrapper {
@@ -1463,7 +1778,7 @@ div[id$="wrapper"] br { clear: left; }
 	height: 180px;
 	margin: 0px 10px 10px 0px;
 	padding-bottom: 30px;
-	position:relative;
+	position: relative;
 }
 
 #photo-album-wrapper-inner {
@@ -1474,8 +1789,14 @@ div[id$="wrapper"] br { clear: left; }
 	overflow: hidden;
 }
 
-#photo-photo { max-width: 85%; height: auto; }
-#photo-photo img { max-width: 100% }
+#photo-photo { 
+	max-width: 85%; 
+	height: auto; 
+}
+
+#photo-photo img { 
+	max-width: 100% 
+}
 
 .photo-top-image-wrapper a:hover,
 #photo-photo a:hover,
@@ -1491,11 +1812,10 @@ div[id$="wrapper"] br { clear: left; }
 	bottom: 0px;
 	padding: 0px 5px;
 	font-weight: bold;
-	font-stretch:semi-expanded;
-/*	font-variant:small-caps; */
+	font-stretch: semi-expanded;
 } 
 
-.photo-top-album-name a{
+.photo-top-album-name a {
 	text-align: center;
 	color: #6e6e6e;
 }
@@ -1506,43 +1826,54 @@ div[id$="wrapper"] br { clear: left; }
 	text-align: center;
 	color: #6e6e6e;
 	font-size: 0.9em;
-/*	font-variant: small-caps; */
 }
 
-#photo-photo{
+#photo-photo {
 	position: relative;
-	float:left;	
+	float: left;	
 }
 
 #photo-caption {
 	margin-top: 10px;
 	color: #6E6E6E;
-/*	font-variant:small-caps; */
 	font-size: 1.1em;
 }
 
-#photo-photo-end { clear: both; }
+#photo-photo-end { 
+	clear: both; 
+}
+
 #photo-prev-link,
-#photo-next-link{
+#photo-next-link {
 	position: absolute;
-	width:10%;
+	width: 10%;
 	height: 100%;
 	background-color: rgba(255,255,255,0.2);
 	opacity: 0;
-	-webkit-transition: all 0.2s ease-in-out;
-	-moz-transition: all 0.2s ease-in-out;
-	-o-transition: all 0.2s ease-in-out;
-	-ms-transition: all 0.2s ease-in-out;
 	transition: all 0.2s ease-in-out;
+		-webkit-transition: all 0.2s ease-in-out;
+		-moz-transition: all 0.2s ease-in-out;
 	background-position: center center;
 	background-repeat: no-repeat;	
 }
 
-#photo-prev-link { left:0px; top:0px; background-image: url('prev.png'); }
-#photo-next-link { right:0px; top:0px; background-image: url('next.png');}
+#photo-prev-link { 
+	left: 0px; 
+	top: 0px; 
+	background-image: url('prev.png'); 
+}
+
+#photo-next-link { 
+	right: 0px; 
+	top: 0px; 
+	background-image: url('next.png');
+}
+
 #photo-prev-link a,
-#photo-next-link a{
-	display: block; width: 100%; height: 100%;
+#photo-next-link a {
+	display: block; 
+	width: 100%; 
+	height: 100%;
 	overflow: hidden;
 	text-indent: -900000px;		 
 }
@@ -1550,19 +1881,22 @@ div[id$="wrapper"] br { clear: left; }
 #photo-prev-link:hover,
 #photo-next-link:hover {
 	opacity: 1;
-	-webkit-transition: all 0.2s ease-in-out;
-	-moz-transition: all 0.2s ease-in-out;
-	-o-transition: all 0.2s ease-in-out;
-	-ms-transition: all 0.2s ease-in-out;
 	transition: all 0.2s ease-in-out;		
+		-webkit-transition: all 0.2s ease-in-out;
+		-moz-transition: all 0.2s ease-in-out;
 }
 
 #photo-next-link .icon,
-#photo-prev-link .icon { display: none }
+#photo-prev-link .icon { 
+	display: none;
+}
 
 #photos-upload-spacer,
 #photos-upload-new-wrapper,
-#photos-upload-exist-wrapper { margin-bottom: 1em; }
+#photos-upload-exist-wrapper { 
+	margin-bottom: 1em;
+}
+
 #photos-upload-existing-album-text,
 #photos-upload-newalbum-div { 
 	background-color: #fff;
@@ -1574,7 +1908,9 @@ div[id$="wrapper"] br { clear: left; }
 }
 
 #photos-upload-album-select,
-#photos-upload-newalbum { width: 400px; }
+#photos-upload-newalbum { 
+	width: 400px; 
+}
 
 #photos-upload-perms-menu {
 	width: 180px;
@@ -1589,13 +1925,16 @@ select, input {
 	margin-top: 0px;
 	border: 1px solid #b0b0b0;
 	padding: 2px;
-	-webkit-border-radius: 3px 3px 3px 3px;
-	-moz-border-radius: 3px 3px 3px 3px;
-	border-radius: 3px 3px 3px 3px;	
+	border-radius: 3px 3px 3px 3px;
+		-webkit-border-radius: 3px 3px 3px 3px;
+		-moz-border-radius: 3px 3px 3px 3px;
 }
 
-select[size], select[multiple], select[size][multiple] {
+select[size], 
+select[multiple], 
+select[size][multiple] {
 	-webkit-appearance: listbox;
+	margin: 5px 0px 10px 30px;
 }
 
 select {
@@ -1606,10 +1945,11 @@ select {
 }
 
 keygen, select {
-	-webkit-border-radius: ;
+	/*-webkit-border-radius: ;*/
 }
 
-input, textarea, keygen {
+textarea, keygen {
+	margin-top: 3px;
 	font-size: 0.9em;
 	letter-spacing: normal;
 	word-spacing: normal;
@@ -1621,24 +1961,38 @@ input, textarea, keygen {
 	text-align: -webkit-auto;	
 }
 
+input {
+	margin-top: 3px;
+	margin-right: 10px;
+	/*font-size: 0.9em;
+	letter-spacing: normal;
+	word-spacing: normal;
+	line-height: 1.2em;
+	text-transform: none;
+	text-indent: 0px;
+	text-shadow: none;
+	display: inline-block;
+	text-align: -webkit-auto;*/
+}
+
 .qq-upload-button {
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
 }
 
 #album-edit-link {
 	width: 70px;
-	margin-bottom:20px;
+	margin-bottom: 20px;
 	margin-top: 20px;
 	background-color: #a2a2a2;
 	color: #eeeeec;
 	padding: 5px 10px 5px 10px;
 	margin-right: 5px;
 	font-style: bold;
-	-webkit-border-radius: 5px 5px 5px 5px;
-	-moz-border-radius: 5px 5px 5px 5px;
-	border-radius: 5px 5px 5px 5px;		
+	border-radius: 5px 5px 5px 5px;
+		-webkit-border-radius: 5px 5px 5px 5px;
+		-moz-border-radius: 5px 5px 5px 5px;
 }
 
 #album-edit-link  a {
@@ -1655,7 +2009,7 @@ input, textarea, keygen {
 
 #photo_edit_form {
 	width: 500px;
-	margin-top:20px;
+	margin-top: 20px;
 	text-align: left;
 }
 
@@ -1691,7 +2045,9 @@ input#photo_edit_form {
 /* = Messages = */
 /* ============ */
 
-#prvmail-wrapper, .mail-conv-detail, .mail-list-detail {
+#prvmail-wrapper, 
+.mail-conv-detail, 
+.mail-list-detail {
 	position: relative;
 	width: 500px;
 	padding: 50px;
@@ -1702,7 +2058,12 @@ input#photo_edit_form {
 	box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
 }
 
-#prvmail-wrapper:before, #prvmail-wrapper:after, .mail-conv-detail:before, .mail-conv-detail:after, .mail-list-detail:before, .mail-list-detail:after {
+#prvmail-wrapper:before, 
+#prvmail-wrapper:after, 
+.mail-conv-detail:before, 
+.mail-conv-detail:after, 
+.mail-list-detail:before, 
+.mail-list-detail:after {
 	position: absolute;
 	width: 40%;
 	height: 10px;
@@ -1710,25 +2071,27 @@ input#photo_edit_form {
 	left: 12px;
 	bottom: 12px;
 	background: transparent;
-	-webkit-transform: skew(-5deg) rotate(-5deg);
-	-moz-transform: skew(-5deg) rotate(-5deg);
-	-ms-transform: skew(-5deg) rotate(-5deg);
-	-o-transform: skew(-5deg) rotate(-5deg);
 	transform: skew(-5deg) rotate(-5deg);
-	-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
-	-moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+		-webkit-transform: skew(-5deg) rotate(-5deg);
+		-moz-transform: skew(-5deg) rotate(-5deg);
+		-ms-transform: skew(-5deg) rotate(-5deg);
+		-o-transform: skew(-5deg) rotate(-5deg);
 	box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+		-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+		-moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
 	z-index: -1;
 }
 
-#prvmail-wrapper:after, .mail-conv-detail:after, .mail-list-detail:after {
+#prvmail-wrapper:after, 
+.mail-conv-detail:after, 
+.mail-list-detail:after {
 	left: auto;
 	right: 12px;
-	-webkit-transform: skew(5deg) rotate(5deg);
-	-moz-transform: skew(5deg) rotate(5deg);
-	-ms-transform: skew(5deg) rotate(5deg);
-	-o-transform: skew(5deg) rotate(5deg);
 	transform: skew(5deg) rotate(5deg);
+		-webkit-transform: skew(5deg) rotate(5deg);
+		-moz-transform: skew(5deg) rotate(5deg);
+		-ms-transform: skew(5deg) rotate(5deg);
+		-o-transform: skew(5deg) rotate(5deg);
 }
 
 .prvmail-text {
@@ -1737,28 +2100,33 @@ input#photo_edit_form {
 
 #prvmail-form input
 
-#prvmail-subject { width: 490px;; padding-left: 10px; font-size: 1.1em; font-style: bold;}
-#prvmail-subject .input{
-	border: none !important ;
+#prvmail-subject { 
+	width: 490px; 
+	padding-left: 10px; 
+	font-size: 1.1em; 
+	font-style: bold;
 }
 
-#prvmail-subject-label {
-/*	font-variant:small-caps; */
+#prvmail-subject .input {
+	border: none !important;
 }
 
+#prvmail-subject-label {}
+
 #prvmail-to {
 	padding-left: 10px;
 }
-#prvmail-to-label {
-/*	font-variant:small-caps; */
-}
+
+#prvmail-to-label {}
 
 #prvmail-message-label {
-/*	font-variant:small-caps; */
 	font-size: 1em;	
 }
 
-#prvmail-submit-wrapper { margin-top: 10px; }
+#prvmail-submit-wrapper { 
+	margin-top: 10px; 
+}
+
 #prvmail-submit {
 	float: right;
 	margin-top: 0px;
@@ -1780,12 +2148,13 @@ margin-left: 0px;
 
 .mail-list-sender {
 	float: left;
-	padding: 5px;
+	padding: 2px;
 	background-color: #efefef;
-	border: 1px dotted #eeeeee;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
-	box-shadow: 3px 3px 4px #959494;
+	border: 1px solid #C5C5C5;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 0 8px #BDBDBD;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
 }
 
 .mail-list-detail {
@@ -1793,14 +2162,13 @@ margin-left: 0px;
 	width: 600px;
 	min-height: 70px;
 	padding: 20px;
-	padding-top:10px;
+	padding-top: 10px;
 	border: 1px solid #dddddd;
-	}
+}
 	
 .mail-list-sender-name {
 	font-size: 1.1em;
 	display: inline;
-/*	font-variant:small-caps; */
 }
 
 .mail-list-date {
@@ -1809,8 +2177,7 @@ margin-left: 0px;
 	display: inline;
 	font-size: 0.9em;
 	padding-left: 10px;
-	font-stretch:ultra-condensed;
-/*	font-variant:small-caps; */
+	font-stretch: ultra-condensed;
 }
 
 .mail-list-subject {
@@ -1824,7 +2191,10 @@ margin-left: 0px;
 	color: #626262;
 }
 
-.mail-list-delete-wrapper { float: right;}
+.mail-list-delete-wrapper { 
+	float: right;
+}
+
 .mail-list-outside-wrapper-end {
 	clear: both;
 }
@@ -1834,15 +2204,31 @@ margin-left: 0px;
 	margin-top: 30px;
 }
 
-.mail-conv-sender {float: left; margin: 0px 5px 5px 0px; }
+.mail-conv-sender {
+	float: left;
+	margin: 0px 5px 5px 0px; 
+}
+
 .mail-conv-sender-photo {
 	width: 64px;
 	height: 64px;
 }
 
-.mail-conv-sender-name { float: left; font-style: bold; }
-.mail-conv-date { float: right; }
-.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em }
+.mail-conv-sender-name { 
+	float: left; 
+	font-style: bold; 
+}
+
+.mail-conv-date { 
+	float: right; 
+}
+
+.mail-conv-subject { 
+	clear: right; 
+	font-weight: bold; 
+	font-size: 1.2em;
+}
+
 .mail-conv-body {
 	clear: both;
 }
@@ -1857,8 +2243,16 @@ margin-left: 0px;
 	margin: auto;
 	border: 1px solid #dddddd;
 }
-.mail-conv-break { display: none; border: none;}
-.mail-conv-delete-wrapper { padding-top: 10px; width: 510px; text-align: right; }
+.mail-conv-break { 
+	display: none; 
+	border: none;
+}
+
+.mail-conv-delete-wrapper { 
+	padding-top: 10px; 
+	width: 510px; 
+	text-align: right; 
+}
 
 #prvmail-subject {
 	font-weight: bold;
@@ -1871,16 +2265,16 @@ margin-left: 0px;
 
 #notification-show-hide-wrapper {
 	width: 160px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+	box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
 	padding: 5px 10px 5px 10px;
 	margin-right: 5px;
 	margin-top: 10px;
@@ -1891,16 +2285,16 @@ margin-left: 0px;
 
 #notification-show-hide-wrapper:hover {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
 }
 
 #notification-show-hide-wrapper:active {
 	background-color: #1873a2;
-	position:relative;
-	top:1px;
+	position: relative;
+	top: 1px;
 }
 
 #notification-show-hide-wrapper a {
@@ -1925,19 +2319,30 @@ margin-left: 0px;
 	position: relative;
 }
 
-.contact-entry-direction-wrapper {position: absolute; top: 20px;}
-.contact-entry-edit-links { position: absolute; top: 60px; }
-#contacts-show-hide-link { margin-bottom: 20px; margin-top: 10px; font-weight: bold;}
+.contact-entry-direction-wrapper {
+	position: absolute;
+	top: 20px;
+}
+
+.contact-entry-edit-links { 
+	position: absolute; 
+	top: 60px; 
+}
+
+#contacts-show-hide-link { 
+	margin-bottom: 20px; 
+	margin-top: 10px; 
+	font-weight: bold;
+}
 
 .contact-entry-name {
 	width: 100px;
 	overflow: hidden;
 	font: #999;
 	font-size: 12px;
-	text-align:center;
-/*	font-variant:small-caps; */
+	text-align: center;
 	font-weight: bold;
-	margin-top:5px;
+	margin-top: 5px;
 }
 
 .contact-entry-photo {
@@ -1946,46 +2351,48 @@ margin-left: 0px;
 
 .contact-entry-edit-links .icon {	
 	border: 1px solid #babdb6;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
+		-webkit-border-radius: 3px;
+		-moz-border-radius: 3px;
 	background-color: #ffffff;
 }
 
-#contact-edit-banner-name { font-size: 1.5em; margin-left: 30px; }
-
+#contact-edit-banner-name { 
+	font-size: 1.5em; 
+	margin-left: 30px; 
+}
 
 #contact-edit-update-now {
-	padding:7px;
+	padding: 7px;
 	width: 165px;
 	margin: auto;
 	margin-left: 40px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	display:inline-block;
-	color:#efefef;
-	text-decoration:none;
+	box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	display: inline-block;
+	color: #efefef;
+	text-decoration: none;
 	text-align: center;
 }
 
 #contact-edit-update-now:hover {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
 }
 
 #contact-edit-update-now:active {
-	position:relative;
-	top:1px;
+	position: relative;
+	top: 1px;
 }
 
 #contact-edit-update-now a {
@@ -1995,7 +2402,6 @@ margin-left: 0px;
 	margin: auto;
 }
 
-
 .contact-photo-menu-button {
 	position: absolute;
 	background-image: url("photo-menu.jpg");
@@ -2018,34 +2424,43 @@ margin-left: 0px;
 	left: 0px; top: 90px;
 	display: none;
 	z-index: 10000;
-	-moz-box-shadow: 3px 3px 5px #888;
-	-webkit-box-shadow: 3px 3px 5px #888;
 	box-shadow: 3px 3px 5px #888;
+		-moz-box-shadow: 3px 3px 5px #888;
+		-webkit-box-shadow: 3px 3px 5px #888;
+}
+
+.contact-photo-menu ul { 
+	margin: 0px; 
+	padding: 0px; 
+	list-style: none; 
+}
+
+.contact-photo-menu li a { 
+	display: block; 
+	padding: 3px; 
+	color: #626262; 
+	font-size: 1em; 
 }
 
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.contact-photo-menu li a { display: block; padding: 3px; color: #626262; font-size: 1em; }
 .contact-photo-menu li a:hover {
 	color: #FFFFFF;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
 	text-decoration: none;
 }
 
-.view-contact-name {
-/*	font-variant: small-caps; */
-}
+.view-contact-name {}
 
 #div.side-link {
 	background-color: #efefef;
 	padding: 10px;
-	margin-top:20px;
+	margin-top: 20px;
 }
 
 #follow-sidebar {
-	margin-bottom: 20px;
+	margin-bottom: 80px;
 }
 
 #follow-sidebar h3:before {
@@ -2069,35 +2484,33 @@ margin-left: 0px;
 	width: 158px;
 	padding: 10px;
 	margin: auto 10px 20px;
-	/*margin-bottom: 20px;*/
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
 	padding: 5px 10px 5px 10px;
 	color: #efefef;
 	font-size: 1.1em;
 	text-align: center;
+	border: 1px solid #7C7D7B;
+	border-radius: 5px 5px 5px 5px;
 }
 
 #side-match-link:hover {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
+	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+	border-radius: 5px 5px 5px 5px;
 }
 
 #side-match-link:active {
 	background-color: #1873a2;
-	position:relative;
-	top:1px;
+	position: relative;
+	top: 1px;
 }
 
 #side-match-link a {
@@ -2109,35 +2522,34 @@ margin-left: 0px;
 	padding: 10px;
 	margin: auto;
 	margin-bottom: 20px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
 	padding: 5px 10px 5px 10px;
 	color: #efefef;
 	font-size: 1.1em;
-	text-align: center;	
+	text-align: center;
+	border: 1px solid #7C7D7B;
+	border-radius: 5px 5px 5px 5px;
 }
 
 #side-invite-link:hover {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;	
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;	
+	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+	border-radius: 5px 5px 5px 5px;
 }
 
 
 #side-invite-link:active {
 	background-color: #1873a2;
-	position:relative;
-	top:1px;	
+	position: relative;
+	top: 1px;	
 }
 
 #side-invite-link a {
@@ -2149,56 +2561,56 @@ margin-left: 0px;
 	padding: 10px;
 	margin: auto;
 	margin-bottom: 20px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
 	padding: 5px 10px 5px 10px;
 	color: #efefef;
 	font-size: 1.1em;
-	text-align: center;	
+	text-align: center;
+	border: 1px solid #7C7D7B;
+	border-radius: 5px 5px 5px 5px;
 }
 
 #side-suggest-link:hover {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;	
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;	
+	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+	border-radius: 5px 5px 5px 5px;
 }
 
-
 #side-suggest-link:active {
 	background-color: #1873a2;
-	position:relative;
-	top:1px;	
+	position: relative;
+	top: 1px;	
 }
 
 #side-suggest-link a {
 	color: #efefef;	
 }
 
-#invite-message, #invite-recipients, #invite-recipient-text {
+#invite-message,
+#invite-recipients, 
+#invite-recipient-text {
 	padding: 10px;
 }
 
 #side-follow-wrapper {
 	font-size: 1em;
 	font-weight: bold;
-	font-stretch:semi-expanded;
+	font-stretch: semi-expanded;
 	background-color: #f3f3f3;
 	border: 1px solid #cdcdcd;
 	padding: 10px;
 	margin-top: 20px;
-	-webkit-border-radius: 5px 5px 5px 5px;
-	-moz-border-radius: 5px 5px 5px 5px;
 	border-radius: 5px 5px 5px 5px;
+		-webkit-border-radius: 5px 5px 5px 5px;
+		-moz-border-radius: 5px 5px 5px 5px;
 }
 
 #side-follow-wrapper label{
@@ -2212,16 +2624,16 @@ margin-left: 0px;
 	width: 120px;
 	padding: 10px;
 	margin-bottom: 20px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+	box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
 	padding: 5px 10px 5px 10px;
 	color: #efefef;
 	font-size: 1.2em;
@@ -2230,16 +2642,16 @@ margin-left: 0px;
 
 #contact-suggest:hover {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;	
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;	
 }
 
 #contact-suggest:active {
 	background-color: #1873a2;
-	position:relative;
-	top:1px;	
+	position: relative;
+	top: 1px;	
 }
 
 #contact-suggest a {
@@ -2266,7 +2678,7 @@ margin-left: 0px;
 	background: url(login-bg.gif) no-repeat;
 	background-position: 0 50%;
 	padding-left: 18px;
-	width: 384px!important;
+	width: 220px!important;
 }
 
 #profile-tabs-wrapper {
@@ -2290,53 +2702,52 @@ margin-left: 0px;
 
 #uexport-link {
 	width: 140px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) );
-	background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753');
-	background-color:#7c7d7b;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+	box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) );
+	background: -moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753');
+	background-color: #7c7d7b;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
 	padding: 5px 10px 5px 10px;
 	margin-bottom: 10px;
 }
 
 #uexport-link:hover {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #555753), color-stop(1, #7c7d7b) );
-	background:-moz-linear-gradient( center top, #555753 5%, #7c7d7b 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#555753', endColorstr='#7c7d7b');
-	background-color:#555753;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #555753), color-stop(1, #7c7d7b) );
+	background: -moz-linear-gradient( center top, #555753 5%, #7c7d7b 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555753', endColorstr='#7c7d7b');
+	background-color: #555753;
 }
 
 #uexport-link:active {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
-	position:relative;
-	top:1px;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
+	position: relative;
+	top: 1px;
 }
 
 #settings-default-perms {
 	width: 260px;
 	text-align: center;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) );
-	/*background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% );*/
+	box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) );
 	background: -moz-linear-gradient(center top , #BDBDBD 5%, #A2A2A2 100%) repeat scroll 0 0 #BDBDBD;
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753');
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753');
 	color: #EFEFEF;
-	background-color:#7c7d7b;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+	background-color: #7c7d7b;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
 	padding: 5px 10px 5px 10px;
 	margin-bottom: 10px;
 }
@@ -2347,29 +2758,29 @@ margin-left: 0px;
 
 #settings-default-perms:hover {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #555753), color-stop(1, #7c7d7b) );
-	background:-moz-linear-gradient( center top, #555753 5%, #7c7d7b 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#555753', endColorstr='#7c7d7b');
-	background-color:#555753;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #555753), color-stop(1, #7c7d7b) );
+	background: -moz-linear-gradient( center top, #555753 5%, #7c7d7b 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555753', endColorstr='#7c7d7b');
+	background-color: #555753;
 }
 
 #settings-default-perms:active {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
-	position:relative;
-	top:1px;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
+	position: relative;
+	top: 1px;
 }
  
 #settings-nickname-desc {
 	width: 80%;
 	background-color: #efefef;
 	margin-bottom: 10px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
 	border-radius: 5px;
+		-webkit-border-radius: 5px;
+		-moz-border-radius: 5px;
 	padding: 5px;
 }
 
@@ -2388,25 +2799,39 @@ margin-left: 0px;
 
 #register-form label,
 #profile-edit-form label {
-	width: 300px; float: left;
+	width: 300px; 
+	float: left;
 }
 
 /* #register-form span,
 #profile-edit-form span  { */
 #register-form span {
 	color: #555753;
-	display:block;
+	display: block;
 	margin-bottom: 20px;
 }
 
 .settings-submit-wrapper,
-.profile-edit-submit-wrapper { margin: 30px 0px;}
-.profile-listing { float: left; clear: both; margin: 20px 20px 0px 0px}
+.profile-edit-submit-wrapper { 
+	margin: 30px 0px;
+}
 
-#profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; }
+.profile-listing { 
+	float: left; 
+	clear: both; 
+	margin: 20px 20px 0px 0px;
+}
 
+#profile-edit-links ul { 
+	margin: 20px 0px; 
+	padding: 0px; 
+	list-style: none; 
+}
 
-#register-sitename { display: inline; font-weight: bold;}
+#register-sitename { 
+	display: inline; 
+	font-weight: bold;
+}
  
 /* ===================== */
 /* = Contacts Selector = */
@@ -2432,30 +2857,30 @@ margin-left: 0px;
 	display: inline;
 	padding: 5px;
 	margin-bottom: 10px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;*/
+	box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
 }
 
 .group-delete-wrapper:hover {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;	
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;	
 }
 
 .group-delete-wrapper:active {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;	
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;	
 }
 
 .group-delete-wrapper a {
@@ -2463,8 +2888,14 @@ margin-left: 0px;
 	font-size: 0.9em;
 }
 
-#group-edit-desc { margin: 10px 0xp; }
-#group-new-text {font-size: 1.1em;}
+#group-edit-desc { 
+	margin: 10px 0xp; 
+}
+
+#group-new-text {
+	font-size: 1.1em;
+}
+
 #group-members,
 #prof-members {
 	width: 83%;
@@ -2498,13 +2929,19 @@ margin-left: 0px;
 }
 
 #group-separator,
-#prof-separator { display: none;}
+#prof-separator { 
+	display: none;
+}
 
 /* ========== */
 /* = Events = */
 /* ========== */
  
-.clear { clear: both; }
+.clear { 
+	clear: both;
+	margin-top: 10px;
+}
+
 .eventcal {
 	float: left;
 	font-size: 20px;
@@ -2519,12 +2956,13 @@ margin-left: 0px;
 	margin: 0 0px;
 	margin-bottom: 10px;
 	background-color: #fff;
-	-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
-	-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
 	box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+		-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+		-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
 }
 
-.vevent:before, .vevent:after {
+.vevent:before, 
+.vevent:after {
 	position: absolute;
 	width: 40%;
 	height: 10px;
@@ -2532,84 +2970,83 @@ margin-left: 0px;
 	left: 12px;
 	bottom: 12px;
 	background: transparent;
-	-webkit-transform: skew(-5deg) rotate(-5deg);
-	-moz-transform: skew(-5deg) rotate(-5deg);
-	-ms-transform: skew(-5deg) rotate(-5deg);
-	-o-transform: skew(-5deg) rotate(-5deg);
 	transform: skew(-5deg) rotate(-5deg);
-	-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
-	-moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+		-webkit-transform: skew(-5deg) rotate(-5deg);
+		-moz-transform: skew(-5deg) rotate(-5deg);
+		-ms-transform: skew(-5deg) rotate(-5deg);
+		-o-transform: skew(-5deg) rotate(-5deg);
 	box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+		-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+		-moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
 	z-index: -1;
 }
 
 .vevent:after {
 	left: auto;
 	right: 12px;
-	-webkit-transform: skew(5deg) rotate(5deg);
-	-moz-transform: skew(5deg) rotate(5deg);
-	-ms-transform: skew(5deg) rotate(5deg);
-	-o-transform: skew(5deg) rotate(5deg);
 	transform: skew(5deg) rotate(5deg);
+		-webkit-transform: skew(5deg) rotate(5deg);
+		-moz-transform: skew(5deg) rotate(5deg);
+		-ms-transform: skew(5deg) rotate(5deg);
+		-o-transform: skew(5deg) rotate(5deg);
 }
 
 .vevent .event-description {
 	margin-left: 10px;
 	margin-right: 10px;
-	text-align:center;
+	text-align: center;
 	font-size: 1.2em;
-	font-weight:bolder;
+	font-weight: bolder;
 }
 
- .vevent .event-location{
+ .vevent .event-location {
 	margin-left: 10px;
 	margin-right: 10px;
 	font-size: 1em;
 	font-style: oblique;
 	text-align: center;
-	
 }
 
-.vevent .event-start, .vevent .event-end  {
+.vevent .event-start, 
+.vevent .event-end  {
 	margin-left: 20px;
 	margin-right: 20px;
 	margin-bottom: 2px;
 	margin-top: 2px;
 	font-size: 0.9em;
-/*	font-variant: small-caps; */
 	text-align: left;
 }
 
-#new-event-link{
+#new-event-link {
 	width: 130px;
 	padding: 7px;
 	margin-bottom: 10px;
-	margin-left: 170px; ;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+	margin-left: 170px;
+	box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
 	color: #efefef;
 }
 
 #new-event-link:hover {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
 }
 
 #new-event-link:active {
 	background-color: #1873a2;
-	position:relative;
-	top:1px;
+	position: relative;
+	top: 1px;
 }
 
 #new-event-link a {
@@ -2630,23 +3067,25 @@ margin-left: 0px;
 	vertical-align: middle;
 }
 
-.event-start, .event-end {
+.event-start, 
+.event-end {
 	margin-left: 10px;
 	width: 330px;
 }
 
-.event-start .dtstart, .event-end .dtend {
+.event-start .dtstart, 
+.event-end .dtend {
 	float: right;
 }
 
 .event-list-date {
 	color: #626262;
 	margin-bottom: 10px;
-/*	font-variant:small-caps; */
-	font-stretch:condensed;
+	font-stretch: condensed;
 }
 
-.prevcal, .nextcal {
+.prevcal, 
+.nextcal {
 	float: left;
 	margin-left: 32px;
 	margin-right: 32px;
@@ -2663,25 +3102,24 @@ margin-left: 0px;
 	background-color: #f1f1f1;
 	border: 1px solid #dedede;
 	margin-bottom: 10px;
-	-moz-box-shadow: 5px 5px 8px #959494;
-	-webkit-box-shadow: 5px 5px 8px #959494;
-	box-shadow: 5px 5px 8px #959494;	
+	box-shadow: 5px 5px 8px #959494;
+		-moz-box-shadow: 5px 5px 8px #959494;
+		-webkit-box-shadow: 5px 5px 8px #959494;
 }
 
-.calendar caption{
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) );
-	background:-moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2');
+.calendar caption {
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) );
+	background: -moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2');
 	background-color: #1873a2;
 	padding: 10px 0px 10px 0px;
 	width: 300px;
 	color: #ffffff;
 	font-weight: bold;
-	text-align:center;
-/*	font-variant:small-caps; */
-	-moz-box-shadow: 5px 2px 8px #959494;
-	-webkit-box-shadow: 5px 2px 8px #959494;
+	text-align: center;
 	box-shadow: 5px 2px 8px #959494;
+		-moz-box-shadow: 5px 2px 8px #959494;
+		-webkit-box-shadow: 5px 2px 8px #959494;
 }
 
 tr {
@@ -2697,7 +3135,7 @@ tr {
 .calendar td > a {
 	background-color: #cdcdcd;
 	padding: 2px;
-	color: #000;
+	color: #000000;
 }
 
 .calendar th {
@@ -2708,7 +3146,7 @@ tr {
 	font-weight: bold;
 	text-align: center;
 	background-color: #1873a2;
-	color: #fff;
+	color: #ffffff;
 }
  
 #event-start-text, 
@@ -2756,13 +3194,11 @@ tr {
 
 .directory-details {
 	font-size: 0.9em;
-/*	font-variant: small-caps; */
 	width: 160px;
 }
 
 .directory-name {
 	font-size: 1em;
-/*	font-variant: small-caps; */
 	width: 150px;	
 }
 
@@ -2820,8 +3256,10 @@ tr {
 	clear:left;
 }
 
-#adminpage #pluginslist {
-	margin: 0px; padding: 0px;
+#adminpage 
+#pluginslist {
+	margin: 0px; 
+	padding: 0px;
 }
 
 #adminpage .plugin {
@@ -2834,32 +3272,51 @@ tr {
 }
 
 #adminpage .toggleplugin {
-	float:left;
+	float: left;
 	margin-right: 1em;
 }
 
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #eeeeee; }
-#adminpage .selectall { text-align: right; }
+#adminpage table {
+	width: 100%; 
+	border-bottom: 1p solid #000000; 
+	margin: 5px 0px;
+}
+
+#adminpage table th { 
+	text-align: left;
+}
+
+#adminpage td .icon { 
+	float: left;
+}
+
+#adminpage table#users img { 
+	width: 16px; 
+	height: 16px; 
+}
+
+#adminpage table tr:hover { 
+	background-color: #eeeeee; 
+}
+
+#adminpage .selectall { 
+	text-align: right; 
+}
 
 /* =============== */
 /* = Form Fields = */
 /* =============== */
 
 .field {
-	margin-bottom: 10px;
-	margin-top: 10px;
+	/*margin-bottom: 10px;
+	margin-top: 10px;*/
 	padding-bottom: 0px;
-	/*overflow: auto;*/
 	width: 90%;
 }
 
 .field label {
 	float: left;
-	width: 400px; /*550*/
+	width: 480px;
 }
 
 .field input,
@@ -2867,9 +3324,11 @@ tr {
 	width: 220px;
 	border: 1px solid #CDCDCD;
 	border-radius: 5px 5px 5px 5px;
-	/*box-shadow: 3px 3px 4px 0 #959494;*/
 }
-.field textarea { height: 100px; }
+.field textarea { 
+	height: 100px; 
+}
+
 .field_help {
 	display: block;
 	margin-left: 100px;
@@ -2882,15 +3341,15 @@ tr {
 }
 .field .onoff a {
 	display: block;
-	border:1px solid #c1c1c1;
-	background-image:url("../../../images/onoff.jpg");
+	border: 1px solid #c1c1c1;
+	background-image: url("../../../images/onoff.jpg");
 	background-repeat: no-repeat;
 	padding: 4px 2px 2px 2px;
 	height: 16px;
 	text-decoration: none;
 }
 .field .onoff .off {
-	border-color:#c1c1c1;
+	border-color: #c1c1c1;
 	padding-left: 40px;
 	background-position: left center;
 	background-color: #cccccc;
@@ -2899,7 +3358,7 @@ tr {
 }
 
 .field .onoff .on {
-	border-color:#c1c1c1;
+	border-color: #c1c1c1;
 	padding-right: 40px;
 	background-position: right center;
 	background-color: #1873a2;
@@ -2907,9 +3366,13 @@ tr {
 	text-align: left;
 }
 
-.hidden { display: none!important; }
+.hidden { 
+	display: none!important; 
+}
 
-.field.radio .field_help { margin-left: 0px; }
+.field.radio .field_help { 
+	margin-left: 0px; 
+}
 
 /* ========= */
 /* = Icons = */
@@ -2922,11 +3385,13 @@ tr {
 .icon {
 	margin-left: 5px;
 	margin-right: 5px;
-	display: block; width: 20px; height: 20px;
-	background-image: url('icons.png');
+	display: block; 
+	width: 20px; 
+	height: 20px;
+	background-image: url("icons.png");
 }
 .starred { 
-	background-image: url("star.png"); 
+	background-image: url("star.png");
 	repeat: no-repeat;
 }
 .unstarred { 
@@ -2935,15 +3400,15 @@ tr {
 }
 
 .notify {
-	background-image: url("notifications.png");}
+	background-image: url("notifications.png");
 	repeat: no-repeat;
 }
 
 .border {
 	border: 1px solid #c1c1c1;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
 	border-radius: 3px;	
+		-webkit-border-radius: 3px;
+		-moz-border-radius: 3px;
 }
 
 .article	{ background-position: -50px  0px;}
@@ -2961,10 +3426,10 @@ tr {
 .no 		{ background-position: -90px  -20px;}
 .pause 		{ background-position: -110px -20px;}
 .play 		{ background-position: -130px -20px;}
-.pencil 	{ background-position: -150px -20px;}
+.pencil 	{ background-position: -150px -20px; margin-right: 12px;}
 .small-pencil	{ background-position: -170px -20px;}
 .recycle 	{ background-position: -190px -20px;}
-.remote-link	{ background-position: -210px -20px;}
+.remote-link	{ background-position: -210px -20px; margin-right: 10px;}
 .share 		{ background-position: -230px -20px;}
 .tools 		{ background-position: -50px  -40px;}
 .lock 		{ background-position: -70px  -40px;}
@@ -2976,7 +3441,7 @@ tr {
 }
 
 .sharePerms {
-	background-image: url(icons.png);
+	background-image: url("icons.png");
 	width: 20px;
 	height: 20px;
 	margin: 2px 0px 2px 3px;
@@ -2985,22 +3450,18 @@ tr {
 
 .video 		{ background-position: -110px -40px;}
 .youtube 	{ background-position: -130px -40px;}
-
 .attach 	{ background-position: -190px -40px;}
 .language 	{ background-position: -210px -40px;}
-
-
 .on 		{ background-position: -50px  -60px;}
 .off 		{ background-position: -70px  -60px;}
 .prev 		{ background-position: -90px  -60px;}
 .next 		{ background-position: -110px -60px;}
-.tagged     { background-position: -130px -60px;}
-
-.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
+.tagged     	{ background-position: -130px -60px; margin-right: 10px;}
+.icon.dim 	{ opacity: 0.3;filter:alpha(opacity=30);}
 
 .attachtype {
 	display: block; width: 20px; height: 23px;
-	background-image: url('../../../images/content-types.png');
+	background-image: url("../../../images/content-types.png");
 }
 
 .type-video { background-position: 0px 0px; }
@@ -3012,14 +3473,21 @@ tr {
 /* ========== */
 /* = Footer = */
 /* ========== */
-                                 
-.cc-license { margin-top: 100px; font-size: 0.7em; }                                  
-footer { display: block; margin: 50px 20%; clear: both; }
-                                  
+
+.cc-license { 
+	margin-top: 100px; 
+	font-size: 0.7em; 
+}
+
+footer { 
+	display: block; 
+	margin: 50px 20%; 
+	clear: both; 
+}
+
 #profile-jot-text {
 	height: 20px;
-	color:#cccccc;
-	/*border: 1px solid #cccccc;*/
+	color: #cccccc;
 }
 
 /* ======= */
@@ -3029,7 +3497,7 @@ footer { display: block; margin: 50px 20%; clear: both; }
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper{
-	display:block!important;
+	display: block!important;
 }
 
 #acl-wrapper {
@@ -3039,8 +3507,9 @@ footer { display: block; margin: 50px 20%; clear: both; }
 #acl-search {
 	float:right;
 	background: #ffffff url("../../../images/search_18.png") no-repeat right center;
-	padding-right:20px;
+	padding-right: 20px;
 }
+
 #acl-showall {
 	float: left;
 	display: block;
@@ -3053,18 +3522,19 @@ footer { display: block; margin: 50px 20%; clear: both; }
 	background-position: 7px 7px;
 	background-repeat: no-repeat;
 	padding: 5px;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
 	border-radius: 5px;
+		-webkit-border-radius: 5px ;
+		-moz-border-radius: 5px;
 	color: #999999;
 }
+
 #acl-showall.selected {
-	color: #fff;
+	color: #ffffff;
 	background-color: #1873a2;
 }
 
 #acl-list {
-	height: auto;
+	height: 400px;
 	border: 1px solid #cccccc;
 	background-color: #efefef;
 	clear: both;
@@ -3073,7 +3543,6 @@ footer { display: block; margin: 50px 20%; clear: both; }
 }
 
 #acl-list-content {
-	margin-left: 20px;
 }
 
 .acl-list-item {
@@ -3084,19 +3553,19 @@ footer { display: block; margin: 50px 20%; clear: both; }
 	background-color: #fff;
 	margin: 5px;
 	float: left;
-	-moz-box-shadow: 2px 2px 3px #c1c1c1;
-	-webkit-box-shadow: 2px 2px 3px #c1c1c1;
 	box-shadow: 2px 2px 3px #c1c1c1;
+		-moz-box-shadow: 2px 2px 3px #c1c1c1;
+		-webkit-box-shadow: 2px 2px 3px #c1c1c1;
 }
 .acl-list-item img{
-	width:30px;
+	width: 30px;
 	height: 30px;
 	float: left;
 	margin: 5px;
 }
 
 .acl-list-item p {
-	color: #999;
+	color: #999999;
 	height: 12px;
 	font-size: 0.7em;
 	margin: 0px;
@@ -3113,9 +3582,9 @@ footer { display: block; margin: 50px 20%; clear: both; }
 	background-position: 3px 3px;
 	background-repeat: no-repeat;
 	margin: 10px 0 0 5px;
-	-webkit-border-radius: 2px ;
-	-moz-border-radius: 2px;
 	border-radius: 2px;
+		-webkit-border-radius: 2px ;
+		-moz-border-radius: 2px;
 	padding: 3px;
 }
 
@@ -3146,32 +3615,32 @@ footer { display: block; margin: 50px 20%; clear: both; }
 	padding: 7px;
 	margin-bottom: 10px;
 	margin-left: 0px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+	box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+		-webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color: #bdbdbd;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
 	color: #efefef;
 	text-align: center;
 }
 
 #global-directory-link:hover {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
 }
 
 #global-directory-link:active {
 	background-color: #1873a2;
-	position:relative;
-	top:1px;
+	position: relative;
+	top: 1px;
 }
 
 #global-directory-link a {
@@ -3183,11 +3652,11 @@ footer { display: block; margin: 50px 20%; clear: both; }
 }
 
 a.active {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
-	color:#efefef;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
+	color: #fec01d;
 	padding: 5px 10px 5px 10px;
 	margin-right: 5px;
 }
@@ -3219,35 +3688,48 @@ ul.menu-popup {
 #nav-notifications-menu {
 	width: 320px;
 	max-height: 400px;
-	overflow-y: scroll;overflow-style:scrollbar;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) );
-	background:-moz-linear-gradient( center top, #797979 5%, #898988 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988');
-	background-color:#a2a2a2;
-	-moz-border-radius:0px 0px 5px 5px;
-	-webkit-border-radius:0px 0px 5px 5px;
-	border-radius:0px 0px 5px 5px;
+	overflow-y: scroll;
+	overflow-style: scrollbar;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) );
+	background: -moz-linear-gradient( center top, #797979 5%, #898988 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988');
+	background-color: #a2a2a2;
+	border-radius: 0px 0px 5px 5px;
+		-moz-border-radius: 0px 0px 5px 5px;
+		-webkit-border-radius: 0px 0px 5px 5px;
 	border: 1px solid #9A9A9A;
 	border-top: none;
-	-moz-box-shadow: 5px 5px 10px #242424;
-	-webkit-box-shadow: 5px 5px 10px #242424;
 	box-shadow: 5px 5px 10px #242424;
+		-moz-box-shadow: 5px 5px 10px #242424;
+		-webkit-box-shadow: 5px 5px 10px #242424;
 }
 
-#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
-#nav-notifications-menu img { float: left; margin-right: 5px; }
-#nav-notifications-menu .notif-when { font-size: 0.8em; display: block; }
+#nav-notifications-menu .contactname { 
+	font-weight: bold; 
+	font-size: 0.9em; 
+}
+
+#nav-notifications-menu img { 
+	float: left; 
+	margin-right: 5px; 
+}
+
+#nav-notifications-menu .notif-when { 
+	font-size: 0.8em; 
+	display: block; 
+}
+	
 #nav-notifications-menu li {
 	padding: 7px 0px 7px 10px;
-	word-wrap:normal;
+	word-wrap: normal;
 	border-bottom: 1px solid #626262;
 }
 
 #nav-notifications-menu li:hover {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2;
 }
 
 #nav-notifications-menu a:hover {
@@ -3276,25 +3758,26 @@ ul.menu-popup {
 
 /* autocomplete popup */
 .acpopup {
-	max-height:150px;
-	overflow:auto;
-	z-index:100000;
+	max-height: 150px;
+	overflow: auto;
+	z-index: 100000;
 	color: #2e3436;
 	border-top: 0px;
 	background: #eeeeee;
 	border-right: 1px solid #dddddd;
 	border-left: 1px solid #dddddd;
 	border-bottom: 1px solid #dddddd;
-	-webkit-border-radius: 0px 5px 5px 5px;
-	-moz-border-radius: 0px 5px 5px 5px;
 	border-radius: 0px 5px 5px 5px;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
+		-webkit-border-radius: 0px 5px 5px 5px;
+		-moz-border-radius: 0px 5px 5px 5px;
 	box-shadow: 3px 3px 4px #959494;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
 }
 
 .acpopupitem {
-	color: #2e3436; padding: 4px;
+	color: #2e3436; 
+	padding: 4px;
 	clear:left;
 }
 .acpopupitem img {
@@ -3304,28 +3787,29 @@ ul.menu-popup {
 
 .acpopupitem.selected {
 	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-	background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-	background-color:#1873a2; 
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
+	background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
+	background-color: #1873a2; 
 	order-bottom: none;
 }
 
 .qcomment {
 	opacity: 0;
-	filter:alpha(opacity=0);
+	filter: alpha(opacity=0);
 }
 
 .qcomment:hover {
 	opacity: 1.0;
-	filter:alpha(opacity=100);
+	filter: alpha(opacity=100);
 }
 
 .notify-seen {
-	background: #000;
+	background: #000000;
 }
 
-/* Pages profile widget */
+/* Pages profile widget
+----------------------------------------------------------- */
 #page-profile div#profile-page-list{
 	margin-left: 45px;
 }
@@ -3333,5 +3817,29 @@ ul.menu-popup {
 hr.line-dots {
     background: url("dot.png") repeat-x scroll left center transparent;
     border: medium none;
-    /*padding: 0.5em 0;*/
+}
+
+/* SCROLL TO TOP
+----------------------------------------------------------- */
+#scrollup {
+	position: fixed;
+	right: 1px;
+	bottom: 30px;
+	z-index: 100;
+}
+
+#scrollup a:hover{
+	text-decoration: none;
+	border: 0;
+}
+
+/* New posts and comments => background color
+----------------------------------------------------------- */
+.shiny {
+	background: #fbfde9;
+}
+
+div.wall-item-content-wrapper.shiny {
+	background-image: url("shiny.png");
+	background-repeat: repeat-x;
 }
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index e69b8a3b99..14c40a2ea2 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -2,8 +2,8 @@
 
 /*
  * Name: Smoothly
- * Description: Theme opzimized for Tablets
- * Version: 0.4
+ * Description: Like coffee with milk. Theme works fine with iPad[2].
+ * Version: Version 0.9.19-4
  * Author: Alex <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>
@@ -13,6 +13,7 @@ $a->theme_info = array();
 
 function smoothly_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
+
 <script>
 function insertFormatting(comment,BBcode,id) {
 	
@@ -91,7 +92,27 @@ $('.savedsearchterm').hover(
 
 });
 
-
 </script>
 EOT;
+
+    // custom css
+    if (!is_null($cssFile)) {
+        $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
+    }
+
+_js_in_foot();
+
+}
+
+if(! function_exists('_js_in_foot')) {
+	function _js_in_foot() {
+		/** @purpose insert stuff in bottom of page
+		*/
+		$a = get_app();
+		$baseurl = $a->get_baseurl($ssl_state);
+		$bottom['$baseurl'] = $baseurl;
+		$tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
+
+		return $a->page['bottom'] = replace_macros($tpl, $bottom);
+	}
 }
diff --git a/view/theme/smoothly/totop.png b/view/theme/smoothly/totop.png
new file mode 100644
index 0000000000..d222b39653
Binary files /dev/null and b/view/theme/smoothly/totop.png differ
diff --git a/view/theme/smoothly/wall_item.tpl b/view/theme/smoothly/wall_item.tpl
index 63ed406c86..a8f4bc908c 100644
--- a/view/theme/smoothly/wall_item.tpl
+++ b/view/theme/smoothly/wall_item.tpl
@@ -2,12 +2,12 @@
 	<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 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" 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>
+			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
@@ -15,63 +15,83 @@
 				</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-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 }}
+			{{ 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 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">
+		<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>
 				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ 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 }}
+				{{ 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>
+			<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>
 			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></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 }}
+				{{ 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.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+
+			{{ if $item.drop.dropping }}
+			<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>
+			<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>
-	<div class="wall-item-comment-wrapper" >
-	$item.comment
-	</div>
+	<div class="wall-item-comment-wrapper" >$item.comment</div>
 </div>
 
 <div class="wall-item-outside-wrapper-end $item.indent" ></div>
diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl
index 581cd0d951..60b1d30dcc 100644
--- a/view/theme/smoothly/wall_thread.tpl
+++ b/view/theme/smoothly/wall_thread.tpl
@@ -24,11 +24,21 @@
 				</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-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 }}
+			{{ 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" >
 
@@ -58,34 +68,45 @@
 		<hr class="line-dots">
 		</div>
 -->
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+		<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>
 				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ 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 }}
+				{{ 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>
+				<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 }}
+	 		{{ 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>
 			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></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 }}
+				{{ 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.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+				
+			{{ if $item.drop.dropping }}
+			<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>
diff --git a/view/theme/smoothly/wallwall_item.tpl b/view/theme/smoothly/wallwall_item.tpl
index e4849cf0b1..eb95396811 100644
--- a/view/theme/smoothly/wallwall_item.tpl
+++ b/view/theme/smoothly/wallwall_item.tpl
@@ -12,45 +12,59 @@
 				<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 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-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 }}
+			{{ 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 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">
+
+		<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>
 				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ 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 }}
+				{{ 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>
+			<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 }}
@@ -58,24 +72,36 @@
 			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></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 }}
+				{{ 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.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+
+			{{ if $item.drop.dropping }}
+			<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>
+			<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>
-	<div class="wall-item-comment-wrapper" >
-	$item.comment
-	</div>
+	<div class="wall-item-comment-wrapper" >$item.comment</div>
 </div>
 
 <div class="wall-item-outside-wrapper-end $item.indent" ></div>
-
diff --git a/view/theme/smoothly/wallwall_thread.tpl b/view/theme/smoothly/wallwall_thread.tpl
index a660aacfd0..06822d013c 100644
--- a/view/theme/smoothly/wallwall_thread.tpl
+++ b/view/theme/smoothly/wallwall_thread.tpl
@@ -1,9 +1,11 @@
 {{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>
+		<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 wallwall" id="wall-item-outside-wrapper-$item.id" >
 	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
@@ -30,8 +32,13 @@
 			<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 }}
+			{{ 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">
@@ -54,31 +61,43 @@
 					</div>
 			</div>
 		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+		<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>
 				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ 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 }}
+				{{ 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>
+			<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>
 			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></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 }}
+				{{ 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.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+
+			{{ if $item.drop.dropping }}
+			<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>
 
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
index 45d206d57d..89150534c3 100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -47,7 +47,7 @@
 
 	<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: $visitor;" >
+		<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>
 
diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl
index f64f2e44a0..e3f0436a3b 100644
--- a/view/wall_thread.tpl
+++ b/view/wall_thread.tpl
@@ -6,7 +6,11 @@
 {{endif}}
 <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
 <a name="$item.id" ></a>
+{{ if $item.threaded }}
+<div class="wall-item-outside-wrapper $item.indent$item.previewing threaded" id="wall-item-outside-wrapper-$item.id" >
+{{ else }}
 <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+{{ endif }}
 	<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" 
@@ -93,10 +97,12 @@
 	{{ inc $item.template }}{{ endinc }}
 {{ endfor }}
 
+{{ if $item.comment }}
 {{ if $item.flatten }}
 <div class="wall-item-comment-wrapper" >
 	$item.comment
 </div>
 {{ endif }}
+{{ endif }}
 </div>
 {{if $item.comment_lastcollapsed}}</div>{{endif}}