Merge remote-tracking branch 'friendika-master/master'

53 files changed, 5525 insertions, 1640 deletions

diff --git a/.gitignore b/.gitignore
index 837b2e876..9b3b23a00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ include/jquery-1.4.2.min.js
 *.out
 *.version*
 push*
+langup
 home.html
diff --git a/boot.php b/boot.php
index 39ace01fa..7a8f00fbe 100644
--- a/boot.php
+++ b/boot.php
@@ -2,9 +2,9 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.948' );
+define ( 'FRIENDIKA_VERSION',      '2.1.952' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1051      );
+define ( 'DB_UPDATE_VERSION',      1053      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -290,7 +290,7 @@ class App {
 
 		if($this->cmd === '.well-known/host-meta') {
 			require_once('include/hostxrd.php');
-			hostxrd($this->hostname);
+			hostxrd($this->get_baseurl());
 			// NOTREACHED
 		}
 
diff --git a/database.sql b/database.sql
index b88e5e5ff..84bb42ff3 100644
--- a/database.sql
+++ b/database.sql
@@ -64,6 +64,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `issued-id` char(255) NOT NULL,
   `dfrn-id` char(255) NOT NULL,
   `url` char(255) NOT NULL,
+  `addr` char(255) NOT NULL,
   `alias` char(255) NOT NULL,
   `pubkey` text NOT NULL,
   `prvkey` text NOT NULL,
@@ -194,6 +195,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   `deny_cid` mediumtext NOT NULL,
   `deny_gid` mediumtext NOT NULL,
   `private` tinyint(1) NOT NULL DEFAULT '0',
+  `pubmail` tinyint(1) NOT NULL DEFAULT '0',
   `visible` tinyint(1) NOT NULL DEFAULT '0',
   `unseen` tinyint(1) NOT NULL DEFAULT '1',
   `deleted` tinyint(1) NOT NULL DEFAULT '0',
@@ -508,9 +510,13 @@ CREATE TABLE IF NOT EXISTS `mailacct` (
 `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
 `uid` INT NOT NULL,
 `server` CHAR( 255 ) NOT NULL ,
+`port` INT NOT NULL,
+`ssltype` CHAR( 16 ) NOT NULL,
+`mailbox` CHAR( 255 ) NOT NULL,
 `user` CHAR( 255 ) NOT NULL ,
-`pass` CHAR( 255 ) NOT NULL ,
+`pass` TEXT NOT NULL ,
 `reply_to` CHAR( 255 ) NOT NULL ,
+`pubmail` TINYINT(1) NOT NULL DEFAULT '0',
 `last_check` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'
 ) ENGINE = MYISAM DEFAULT CHARSET=utf8;
 
diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md
index 135f1394a..4bb05872e 100644
--- a/doc/Making-Friends.md
+++ b/doc/Making-Friends.md
@@ -9,7 +9,7 @@ The first thing you can do is look at the Directory for somebody you would like
 
 Click that. It will take you to a "Connect" form.
 
-This is going to ask you for your profile locator. This is necessary so that this person's website can find yours. 
+This is going to ask you for your Identity Address. This is necessary so that this person's website can find yours. 
 
 What do you put in the box?
 
@@ -17,25 +17,27 @@ If your Friendika site is called "demo.friendika.com" and your username/nickname
 
 Notice this looks just like an email address. It was meant to be that way. It's easy for people to remember.
 
-You *could* also put in the URL of your profile page, such as "http://demo.friendika.com/profile/bob". 
-
-The email-style locator is certainly easier.
+You *could* also put in the URL of your "home" page, such as "http://demo.friendika.com/profile/bob", but the email-style address is certainly easier.
 
 When you've submitted the connection page, it will take you back to your own site where you must then login (if necessary) and verify the connection request on *your* site. Once you've done this, the two websites can communicate with each other to complete the process (after your new friend has approved the request). 
 
-If you already know somebody's profile location, you can enter it in the "connect" box on your "Contacts" page. This will take you through a similar process.
+If you already know somebody's Identity Address, you can enter it in the "connect" box on your "Contacts" page. This will take you through a similar process.
+
+**Alternate Networks**
+
+You can also use your Identity Address or other people's Identity Addresses to become friends across networks. The list of possible networks is growing all the time. If you know (for instance) "bob" on identi.ca (a Status.Net site) you could put bob@identi.ca into your Contact page and become friends across networks.  (Or you can put in the URL to Bob's identi.ca page if you wish).  You can also be "partial" friends with somebody on Google Buzz by putting in their gmail address. Google Buzz does not yet support all the protocols we need for direct messaging, but you should be able to follow status updates from within Friendika. You can do the same for Twitter accounts and Diaspora accounts. In fact you can "follow" most anybody or any website that produces a syndication feed (RSS/Atom,etc.). If we can find an information stream and a name to attach to the contact, we'll try to connect with them. 
 
-You can also use your profile locator or other people's profile locators to become friends across networks. The list of possible networks is growing all the time. If you know (for instance) "bob" on identi.ca (a Status.Net site) you could put bob@identi.ca into your Contact page and become friends across networks.  (Or you can put in Bob's profile URL if you wish).  You can also be "partial" friends with somebody on Google Buzz by putting in their gmail address. Google Buzz does not yet support all the protocols we need for direct messaging, but you should be able to follow status updates from within Friendika. 
+If you have supplied your mailbox connection information on your Settings page, you can enter the email address of anybody that has sent you a message recently and have their email messages show up in your social stream. You can also reply to them from within Friendika.  
 
-This works from other networks as well. If a friend of yours has an identi.ca account, they can become friends with you by putting your Friendika profile locator into their identi.ca subscription dialog box. 
+People can also become friends with you from other networks. If a friend of yours has an identi.ca account, they can become friends with you by putting your Friendika Identity Address into their identi.ca subscription dialog box. 
 
 If this happens you will receive a notification. You will need to approve this before the friendship is complete.
 
-Some networks allow people to send you messages without being friends and without your approval. Friendika does not allow this by default. It would open a gateway for spam. So when you've approved a friend request from one of these networks, look at your contact page for that person (this will be displayed as soon as you approve the relationship). They might be marked as an "Ignored" contact. 
+Some networks allow people to send you messages without being friends and without your approval. Friendika does not allow this by default, as it would open a gateway for spam. So when you've approved a friend request from one of these networks, look at your contact page for that person (this will be displayed as soon as you approve the relationship). They might be marked as an "Ignored" contact. 
 
 This means they can see some of your posts (your public posts), but they aren't permitted to send you anything. You can "Un-ignore" them if you desire to allow them to contact you directly and to have their status updates appear in your Network feed. 
 
-When you receive a friendship notification from another Friendika member, you will have the option of allowing them as a "fan" or as a "friend". If they are a fan, they can see what you have to say, including private communications that you send to them, but not vice versa. As a friend, you can both communicate with each other. 
+When you receive a friendship notification from another Friendika member, you will have the option of allowing them as a "fan" or as a "friend". If they are a fan, they can see what you have to say, including private communications that you send to them, but not vice versa. As a friend, you can both communicate with each other.
 
 Once you have become friends, if you find the person constantly sends you spam or worthless information, you can "Ignore" them - without breaking off the friendship or even alerting them to the fact that you aren't interested in anything they are saying. In many ways they are like a "fan" - but they don't know this. They think they are a friend. 
 
diff --git a/doc/Tags-and-Mentions.md b/doc/Tags-and-Mentions.md
index d5880254b..404da7465 100644
--- a/doc/Tags-and-Mentions.md
+++ b/doc/Tags-and-Mentions.md
@@ -15,7 +15,7 @@ The following are various ways of indicating a person:
 
 * @mike - indicates a known contact in your social circle whose nickname is "mike"
 * @mike_macgirvin - indicates a known contact in your social circle whose  full name is "Mike Macgirvin". Note that spaces cannot be used inside tags.
-* @mike@macgirvin.com - indicates the profile locator of a person on a different network, or one that is *not* in your social circle. This can only be an email-style locator, not a web URL. 
+* @mike@macgirvin.com - indicates the Identity Address of a person on a different network, or one that is *not* in your social circle. This can only be an email-style locator, not a web URL. 
 
 Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts. Please note that Friendika often blocks incoming "mentions" from other networks and especially from people with no relationship to you. This is a spam prevention measure. 
 
diff --git a/include/Scrape.php b/include/Scrape.php
index 002fdfb35..a6bb5f728 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -260,4 +260,232 @@ function scrape_feed($url) {
 	}
 
 	return $ret;
-}}
\ No newline at end of file
+}}
+
+
+function probe_url($url) {
+	require_once('include/email.php');
+
+	$result = array();
+
+	if(! $url)
+		return $result;
+
+	$diaspora = false;	
+	$email_conversant = false;
+
+	if($url) {
+		$links = lrdd($url);
+
+		if(count($links)) {
+			foreach($links as $link) {
+				if($link['@attributes']['rel'] === NAMESPACE_DFRN)
+					$dfrn = unamp($link['@attributes']['href']);
+				if($link['@attributes']['rel'] === 'salmon')
+					$notify = unamp($link['@attributes']['href']);
+				if($link['@attributes']['rel'] === NAMESPACE_FEED)
+					$poll = unamp($link['@attributes']['href']);
+				if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
+					$hcard = unamp($link['@attributes']['href']);
+				if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
+					$profile = unamp($link['@attributes']['href']);
+				if($link['@attributes']['rel'] === 'http://joindiaspora.com/seed_location')
+					$diaspora = true;
+			}
+
+			// Status.Net can have more than one profile URL. We need to match the profile URL
+			// to a contact on incoming messages to prevent spam, and we won't know which one
+			// to match. So in case of two, one of them is stored as an alias. Only store URL's
+			// and not webfinger user@host aliases. If they've got more than two non-email style
+			// aliases, let's hope we're lucky and get one that matches the feed author-uri because 
+			// otherwise we're screwed.
+
+			foreach($links as $link) {
+				if($link['@attributes']['rel'] === 'alias') {
+					if(strpos($link['@attributes']['href'],'@') === false) {
+						if(isset($profile)) {
+							if($link['@attributes']['href'] !== $profile)
+								$alias = unamp($link['@attributes']['href']);
+						}
+						else
+							$profile = unamp($link['@attributes']['href']);
+					}
+				}
+			}
+		}
+		else {
+
+			// Check email
+
+			$orig_url = $url;
+			if((strpos($orig_url,'@')) && validate_email($orig_url)) {
+				$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
+					intval(local_user())
+				);
+				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
+					intval(local_user())
+				);
+				if(count($x) && count($r)) {
+				    $mailbox = construct_mailbox_name($r[0]);
+					$password = '';
+					openssl_private_decrypt(hex2bin($r[0]['pass']),$password,$x[0]['prvkey']);
+					$mbox = email_connect($mailbox,$r[0]['user'],$password);
+					unset($password);
+				}
+				if($mbox) {
+					$msgs = email_poll($mbox,$orig_url);
+					if(count($msgs)) {
+						$addr = $orig_url;
+						$network = NETWORK_MAIL;
+						$name = substr($url,0,strpos($url,'@'));
+						$profile = 'http://' . substr($url,strpos($url,'@')+1);
+						// fix nick character range
+						$vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url));
+						$notify = 'smtp ' . random_string();
+						$poll = 'email ' . random_string();
+						$priority = 0;
+						$x = email_msg_meta($mbox,$msgs[0]);
+						$adr = imap_rfc822_parse_adrlist($x->from,'');
+						if(strlen($adr[0]->personal))
+							$vcard['fn'] = notags($adr[0]->personal);
+					}
+					imap_close($mbox);
+				}
+			}
+		}
+	}	
+
+	if(strlen($dfrn)) {
+		$ret = scrape_dfrn($dfrn);
+		if(is_array($ret) && x($ret,'dfrn-request')) {
+			$network = NETWORK_DFRN;
+			$request = $ret['dfrn-request'];
+			$confirm = $ret['dfrn-confirm'];
+			$notify  = $ret['dfrn-notify'];
+			$poll    = $ret['dfrn-poll'];
+		}
+	}
+
+	if($network !== NETWORK_DFRN && $network !== NETWORK_MAIL) {
+		$network  = NETWORK_OSTATUS;
+		$priority = 0;
+
+		if($hcard) {
+			$vcard = scrape_vcard($hcard);
+
+			// Google doesn't use absolute url in profile photos
+	
+			if((x($vcard,'photo')) && substr($vcard['photo'],0,1) == '/') {
+				$h = @parse_url($hcard);
+				if($h)
+					$vcard['photo'] = $h['scheme'] . '://' . $h['host'] . $vcard['photo'];
+			}
+		
+			logger('probe_url: scrape_vcard: ' . print_r($vcard,true), LOGGER_DATA);
+		}
+
+		if(! $profile) {
+			if($diaspora)
+				$profile = $hcard;
+			else
+				$profile = $url;
+		}
+
+		if(! x($vcard,'fn'))
+			if(x($vcard,'nick'))
+				$vcard['fn'] = $vcard['nick'];
+
+		if((! isset($vcard)) && (! $poll)) {
+
+			$ret = scrape_feed($url);
+			logger('probe_url: scrape_feed returns: ' . print_r($ret,true), LOGGER_DATA);
+			if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) {
+				$poll = ((x($ret,'feed_atom')) ? unamp($ret['feed_atom']) : unamp($ret['feed_rss']));
+				$vcard = array();
+					if(x($ret,'photo'))
+						$vcard['photo'] = $ret['photo'];
+				require_once('simplepie/simplepie.inc');
+			    $feed = new SimplePie();
+				$xml = fetch_url($poll);
+
+    			$feed->set_raw_data($xml);
+
+			    $feed->init();
+
+				if(! x($vcard,'photo'))
+					$vcard['photo'] = $feed->get_image_url();
+				$author = $feed->get_author();
+				if($author) {			
+					$vcard['fn'] = unxmlify(trim($author->get_name()));
+					if(! $vcard['fn'])
+						$vcard['fn'] = trim(unxmlify($author->get_email()));
+					if(strpos($vcard['fn'],'@') !== false)
+						$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
+					$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn'])));
+					if(strpos($vcard['nick'],' '))
+						$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
+					$email = unxmlify($author->get_email());
+				}
+				else {
+					$item = $feed->get_item(0);
+					if($item) {
+						$author = $item->get_author();
+						if($author) {			
+							$vcard['fn'] = trim(unxmlify($author->get_name()));
+							if(! $vcard['fn'])
+								$vcard['fn'] = trim(unxmlify($author->get_email()));
+							if(strpos($vcard['fn'],'@') !== false)
+								$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
+							$vcard['nick'] = strtolower(unxmlify($vcard['fn']));
+							if(strpos($vcard['nick'],' '))
+								$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
+							$email = unxmlify($author->get_email());
+						}
+						if(! $vcard['photo']) {
+							$rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail');
+							if($rawmedia && $rawmedia[0]['attribs']['']['url'])
+								$vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']);
+						}
+					}
+				}
+				if((! $vcard['photo']) && strlen($email))
+					$vcard['photo'] = gravatar_img($email);
+				if($poll === $profile)
+					$lnk = $feed->get_permalink();
+				if(isset($lnk) && strlen($lnk))
+					$profile = $lnk;	
+				if(! (x($vcard,'fn')))
+					$vcard['fn'] = notags($feed->get_title());
+				if(! (x($vcard,'fn')))
+					$vcard['fn'] = notags($feed->get_description());
+				$network = 'feed';
+				$priority = 2;
+			}
+		}
+	}
+
+	if(! x($vcard,'photo')) {
+		$a = get_app();
+		$vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ; 
+	}
+	$vcard['fn'] = notags($vcard['fn']);
+	$vcard['nick'] = notags($vcard['nick']);
+
+
+	$result['name'] = $vcard['fn'];
+	$result['nick'] = $vcard['nick'];
+	$result['url'] = $profile;
+	$result['addr'] = $addr;
+	$result['notify'] = $notify;
+	$result['poll'] = $poll;
+	$result['request'] = $request;
+	$result['confirm'] = $confirm;
+	$result['photo'] = $vcard['photo'];
+	$result['priority'] = $priority;
+	$result['network'] = $network;
+	$result['alias'] = $alias;
+
+	logger('probe_url: ' . print_r($result,true), LOGGER_DEBUG);
+
+	return $result;
+}
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index fa700818f..d1303d933 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -57,9 +57,12 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 		$sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
 	}
 
-	if($privmail || $privatenet) {
+	if($privmail) {
 		$sql_extra .= " AND `network` IN ( 'dfrn' ) ";
-	}	
+	}
+	elseif($privatenet) {	
+		$sql_extra .= " AND `network` IN ( 'dfrn', 'mail' ) ";
+	}
 
 	if($privmail)
 		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";
diff --git a/include/conversation.php b/include/conversation.php
index 5c8327e56..4c858d818 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -85,6 +85,8 @@ function conversation(&$a, $items, $mode, $update) {
 				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
 				$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
 				$profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
+				if($profile_link === 'mailbox')
+					$profile_link = '';
 
 				$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
@@ -360,6 +362,9 @@ function conversation(&$a, $items, $mode, $update) {
 			else 
 				$profile_link = $item['url'];
 
+			if($profile_link === 'mailbox')
+				$profile_link = '';
+
 			$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
 			$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
 
@@ -483,6 +488,9 @@ function item_photo_menu($item){
 	$profile_link   = ((strlen($item['author-link']))   ? $item['author-link'] : $item['url']);
 	$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
+	if($profile_link === 'mailbox')
+		$profile_link = '';
+
 	// $item['contact-uid'] is only set on profile page and indicates the uid of the user who owns the profile.
 
 	$profile_owner = ((x($item,'contact-uid')) && intval($item['contact-uid']) ? intval($item['contact-uid']) : 0);	
@@ -495,21 +503,26 @@ function item_photo_menu($item){
 	if((local_user() && ($profile_owner == 0)) 
 		|| ($profile_owner && $profile_owner == local_user())) {
 
-		if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url']))
+		if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url'])) {
 			$redir = $redirect_url;
+			$cid = $item['cid'];
+		}
 		elseif(isset($a->authors[$item['author-link']])) {
 			$redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
 			$cid = $a->authors[$item['author-link']]['id'];
 		}
-
-		if($item['network'] === 'dfrn' && (! $item['self'])) {
-			$status_link = $redir . "?url=status";
-			$profile_link = $redir . "?url=profile";
-			$photos_link = $redir . "?url=photos";
-			$pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+		if($item['author-link'] === 'mailbox')
+			$cid = $item['cid'];
+
+		if((isset($cid)) && (! $item['self'])) {
+			$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
+			if($item['network'] === 'dfrn') {
+				$status_link = $redir . "?url=status";
+				$profile_link = $redir . "?url=profile";
+				$photos_link = $redir . "?url=photos";
+				$pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+			}
 		}
-
-		$contact_url = $item['self']?"":$a->get_baseurl() . '/contacts/' . (($item['cid']) ? $item['cid'] : $cid);
 	}
 
 
diff --git a/include/email.php b/include/email.php
new file mode 100644
index 000000000..91aafd45e
--- /dev/null
+++ b/include/email.php
@@ -0,0 +1,191 @@
+<?php
+
+function email_connect($mailbox,$username,$password) {
+	if(! function_exists('imap_open'))
+		return false;
+
+	$mbox = imap_open($mailbox,$username,$password);
+
+	return $mbox;
+}
+
+function email_poll($mbox,$email_addr) {
+
+	if(! ($mbox && $email_addr))
+		return array();;
+
+	$search = imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID);
+	return (($search) ? $search : array());
+}
+
+
+function construct_mailbox_name($mailacct) {
+	$ret = '{' . $mailacct['server'] . (($mailacct['port']) ? ':' . $mailacct['port'] : '');
+	$ret .= (($mailacct['ssltype']) ?  '/' . $mailacct['ssltype'] . '/novalidate-cert' : '');
+	$ret .= '}' . $mailacct['mailbox'];
+	return $ret;
+}
+
+
+function email_msg_meta($mbox,$uid) {
+	$ret = (($mbox && $uid) ? imap_fetch_overview($mbox,$uid,FT_UID) : array(array()));
+	return ((count($ret)) ? $ret[0] : array());
+}
+
+function email_msg_headers($mbox,$uid) {
+	$raw_header = (($mbox && $uid) ? imap_fetchheader($mbox,$uid,FT_UID) : '');
+	$raw_header = str_replace("\r",'',$raw_header);
+	$ret = array();
+	$h = split("\n",$raw_header);
+	if(count($h))
+	foreach($h as $line ) {
+	    if (preg_match("/^[a-zA-Z]/", $line)) {
+			$key = substr($line,0,strpos($line,':'));
+			$value = substr($line,strpos($line,':')+1);
+
+			$last_entry = strtolower($key);
+			$ret[$last_entry] = trim($value);
+		}
+		else {
+			$ret[$last_entry] .= ' ' . trim($line);
+    	}
+	}
+	return $ret;
+}
+
+
+function email_get_msg($mbox,$uid) {
+	$ret = array();
+
+	$struc = (($mbox && $uid) ? imap_fetchstructure($mbox,$uid,FT_UID) : null);
+
+	if(! $struc)
+		return $ret;
+
+	if(! $struc->parts) {
+		$ret['body'] = email_get_part($mbox,$uid,$struc,0);
+	}
+	else {
+		foreach($struc->parts as $ptop => $p) {
+			$x = email_get_part($mbox,$uid,$p,$ptop + 1);
+			if($x)
+				$ret['body'] = $x;
+		}
+	}
+	return $ret;
+}
+
+// At the moment - only return plain/text.
+// Later we'll repackage inline images as data url's and make the HTML safe
+
+function email_get_part($mbox,$uid,$p,$partno) {
+    // $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
+    global $htmlmsg,$plainmsg,$charset,$attachments;
+
+	echo $partno;
+
+    // DECODE DATA
+    $data = ($partno)
+		? imap_fetchbody($mbox,$uid,$partno, FT_UID|FT_PEEK)
+        : imap_body($mbox,$uid,FT_UID|FT_PEEK);
+
+    // Any part may be encoded, even plain text messages, so check everything.
+    if ($p->encoding==4)
+        $data = quoted_printable_decode($data);
+    elseif ($p->encoding==3)
+        $data = base64_decode($data);
+
+    // PARAMETERS
+    // get all parameters, like charset, filenames of attachments, etc.
+    $params = array();
+    if ($p->parameters)
+        foreach ($p->parameters as $x)
+            $params[strtolower($x->attribute)] = $x->value;
+    if ($p->dparameters)
+        foreach ($p->dparameters as $x)
+            $params[strtolower($x->attribute)] = $x->value;
+
+    // ATTACHMENT
+    // Any part with a filename is an attachment,
+    // so an attached text file (type 0) is not mistaken as the message.
+
+    if ($params['filename'] || $params['name']) {
+        // filename may be given as 'Filename' or 'Name' or both
+        $filename = ($params['filename'])? $params['filename'] : $params['name'];
+        // filename may be encoded, so see imap_mime_header_decode()
+        $attachments[$filename] = $data;  // this is a problem if two files have same name
+    }
+
+    // TEXT
+    if ($p->type == 0 && $data) {
+        // Messages may be split in different parts because of inline attachments,
+        // so append parts together with blank row.
+        if (strtolower($p->subtype)=='plain')
+            return (trim($data) ."\n\n");
+        else
+			$data = '';
+
+ //           $htmlmsg .= $data ."<br><br>";
+        $charset = $params['charset'];  // assume all parts are same charset
+    }
+
+    // EMBEDDED MESSAGE
+    // Many bounce notifications embed the original message as type 2,
+    // but AOL uses type 1 (multipart), which is not handled here.
+    // There are no PHP functions to parse embedded messages,
+    // so this just appends the raw source to the main message.
+//    elseif ($p->type==2 && $data) {
+//        $plainmsg .= $data."\n\n";
+//    }
+
+    // SUBPART RECURSION
+    if ($p->parts) {
+        foreach ($p->parts as $partno0=>$p2) {
+            $x =  email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1));  // 1.2, 1.2.1, etc.
+			if($x)
+				return $x;
+		}
+    }
+}
+
+
+
+function email_header_encode($in_str, $charset) {
+    $out_str = $in_str;
+    if ($out_str && $charset) {
+
+        // define start delimimter, end delimiter and spacer
+        $end = "?=";
+        $start = "=?" . $charset . "?B?";
+        $spacer = $end . "\r\n " . $start;
+
+        // determine length of encoded text within chunks
+        // and ensure length is even
+        $length = 75 - strlen($start) - strlen($end);
+
+        /*
+            [EDIT BY danbrown AT php DOT net: The following
+            is a bugfix provided by (gardan AT gmx DOT de)
+            on 31-MAR-2005 with the following note:
+            "This means: $length should not be even,
+            but divisible by 4. The reason is that in
+            base64-encoding 3 8-bit-chars are represented
+            by 4 6-bit-chars. These 4 chars must not be
+            split between two encoded words, according
+            to RFC-2047.
+        */
+        $length = $length - ($length % 4);
+
+        // encode the string and split it into chunks
+        // with spacers after each chunk
+        $out_str = base64_encode($out_str);
+        $out_str = chunk_split($out_str, $length, $spacer);
+
+        // remove trailing spacer and
+        // add start and end delimiters
+        $spacer = preg_quote($spacer);
+        $out_str = preg_replace("/" . $spacer . "$/", "", $out_str);
+        $out_str = $start . $out_str . $end;
+    }
+    return $out_str;
+} 
\ No newline at end of file
diff --git a/include/group.php b/include/group.php
index 065c2241f..5dca08c76 100644
--- a/include/group.php
+++ b/include/group.php
@@ -123,7 +123,8 @@ function group_public_members($gid) {
 	if(intval($gid)) {
 		$r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` 
 			LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
-			WHERE `gid` = %d AND `group_member`.`uid` = %d AND `contact`.`network` != 'dfrn' ",
+			WHERE `gid` = %d AND `group_member`.`uid` = %d 
+			AND `contact`.`network` != 'dfrn' AND `contact`.`network` != 'mail' ",
 			intval($gid),
 			intval(local_user())
 		);		
diff --git a/include/hostxrd.php b/include/hostxrd.php
index 9161b265c..987175c33 100644
--- a/include/hostxrd.php
+++ b/include/hostxrd.php
@@ -1,10 +1,10 @@
 <?php
 
-function hostxrd($hostname) {
+function hostxrd($baseurl) {
 
 	header("Content-type: text/xml");
 	$tpl = file_get_contents('view/xrd_host.tpl');
-	echo str_replace('$domain',$hostname,$tpl);
+	echo str_replace('$domain',$baseurl,$tpl);
 	session_write_close();
 	exit();
 
diff --git a/include/items.php b/include/items.php
index 82752e168..733cd8048 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1415,7 +1415,9 @@ function new_follower($importer,$contact,$datarray,$item) {
 				$res = mail($r[0]['email'], 
 					t("You have a new follower at ") . $a->config['sitename'],
 					$email,
-					'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
+					'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+					. 'Content-type: text/plain; charset=UTF-8' . "\n"
+					. 'Content-transfer-encoding: 8bit' );
 			
 			}
 		}
diff --git a/include/notifier.php b/include/notifier.php
index 9d74f8b9b..80f0e67c7 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -72,7 +72,7 @@ function notifier_run($argv, $argc){
 	else {
 
 		// find ancestors
-		$r = q("SELECT `parent`, `uid`, `edited` FROM `item` WHERE `id` = %d LIMIT 1",
+		$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
 			intval($item_id)
 		);
 
@@ -80,6 +80,7 @@ function notifier_run($argv, $argc){
 			return;
 		}
 
+		$parent_item = $r[0];
 		$parent_id = intval($r[0]['parent']);
 		$uid = $r[0]['uid'];
 		$updated = $r[0]['edited'];
@@ -267,12 +268,25 @@ function notifier_run($argv, $argc){
 
 	logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
 
+	// If this is a public message and pubmail is set on the parent, include all your email contacts
+
+	if((! strlen($parent_item['allow_cid'])) && (! strlen($parent_item['allow_gid'])) && (! strlen($parent_item['deny_cid'])) && (! strlen($parent_item['deny_gid'])) 
+		&& (intval($parent_item['pubmail']))) {
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
+			intval($uid),
+			dbesc(NETWORK_MAIL)
+		);
+		if(count($r)) {
+			foreach($r as $rr)
+				$recipients[] = $rr['id'];
+		}
+	}
+
 	if($followup)
 		$recip_str = $parent['contact-id'];
 	else
 		$recip_str = implode(', ', $recipients);
 
-
 	$r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 AND `pending` = 0 ",
 		dbesc($recip_str)
 	);
@@ -352,6 +366,79 @@ function notifier_run($argv, $argc){
 					}
 					break;
 				case 'mail':
+
+					// WARNING: does not currently convert to RFC2047 header encodings, etc.
+
+					$addr = $contact['addr'];
+					if(! strlen($addr))
+						break;
+
+					if($cmd === 'wall-new' || $cmd === 'comment-new') {
+
+						$it = null;
+						if($cmd === 'wall-new') 
+							$it = $items[0];
+						else {
+							$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", 
+								intval($argv[2]),
+								intval($uid)
+							);
+							if(count($r))
+								$it = $r[0];
+						}
+						if(! $it)
+							break;
+						
+
+
+						$local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+							intval($uid)
+						);
+						if(! count($local_user))
+							break;
+						
+						$reply_to = '';
+						$r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+							intval($uid)
+						);
+						if($r1 && $r1[0]['reply_to'])
+							$reply_to = $r1[0]['reply_to'];
+	
+						$subject  = (($it['title']) ? $it['title'] : t("\x28no subject\x29")) ;
+						$headers  = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+
+						if($reply_to)
+							$headers .= 'Reply-to: ' . $reply_to . "\n";
+
+						$headers .= 'Message-id: <' . $it['uri'] . '>' . "\n";
+
+						if($it['uri'] !== $it['parent-uri']) {
+							$header .= 'References: <' . $it['parent-uri'] . '>' . "\n";
+							if(! strlen($it['title'])) {
+								$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
+									dbesc($it['parent-uri'])
+								);
+								if(count($r)) {
+									$subtitle = $r[0]['title'];
+									if($subtitle) {
+										if(strncasecmp($subtitle,'RE:',3))
+											$subject = $subtitle;
+										else
+											$subject = 'Re: ' . $subtitle;
+									}
+								}
+							}
+						}
+
+						$headers .= 'MIME-Version: 1.0' . "\n";
+						$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
+						$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
+						$html    = prepare_body($it);
+						$message = '<html><body>' . $html . '</body></html>';
+						logger('notifier: email delivery to ' . $addr);
+						mail($addr, $subject, $message, $headers);
+					}
+					break;
 				case 'dspr':
 				case 'feed':
 				case 'face':
diff --git a/include/poller.php b/include/poller.php
index b878ef295..82ac89cf5 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,4 +1,5 @@
 <?php
+
 require_once("boot.php");
 
 function poller_run($argv, $argc){
@@ -15,11 +16,14 @@ function poller_run($argv, $argc){
     	unset($db_host, $db_user, $db_pass, $db_data);
   	};
 
+	$mbox = null;
+
 	require_once('session.php');
 	require_once('datetime.php');
 	require_once('simplepie/simplepie.inc');
 	require_once('include/items.php');
 	require_once('include/Contact.php');
+	require_once('include/email.php');
 
 	$a->set_baseurl(get_config('system','url'));
 
@@ -85,6 +89,9 @@ function poller_run($argv, $argc){
 			continue;
 
 		foreach($res as $contact) {
+
+			$xml = false;
+
 			if($manual_id)
 				$contact['last-update'] = '0000-00-00 00:00:00';
 
@@ -158,7 +165,7 @@ function poller_run($argv, $argc){
 				: datetime_convert('UTC','UTC',$contact['last-update'], ATOM_TIME)
 			);
 
-			if($contact['network'] === 'dfrn') {
+			if($contact['network'] === NETWORK_DFRN) {
 
 				$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 
@@ -175,12 +182,12 @@ function poller_run($argv, $argc){
 					. '&type=data&last_update=' . $last_update 
 					. '&perm=' . $perm ;
 	
-				$xml = fetch_url($url);
+				$handshake_xml = fetch_url($url);
 
-				logger('poller: handshake with url ' . $url . ' returns xml: ' . $xml, LOGGER_DATA);
+				logger('poller: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
 
 
-				if(! $xml) {
+				if(! $handshake_xml) {
 					logger("poller: $url appears to be dead - marking for death ");
 					// dead connection - might be a transient event, or this might
 					// mean the software was uninstalled or the domain expired. 
@@ -197,7 +204,7 @@ function poller_run($argv, $argc){
 					continue;
 				}
 
-				if(! strstr($xml,'<?xml')) {
+				if(! strstr($handshake_xml,'<?xml')) {
 					logger('poller: response from ' . $url . ' did not contain XML.');
 					$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
 						dbesc(datetime_convert()),
@@ -207,7 +214,7 @@ function poller_run($argv, $argc){
 				}
 
 
-				$res = parse_xml_string($xml);
+				$res = parse_xml_string($handshake_xml);
 	
 				if(intval($res->status) == 1) {
 					logger("poller: $url replied status 1 - marking for death ");
@@ -265,52 +272,157 @@ function poller_run($argv, $argc){
 
 				$xml = post_url($contact['poll'],$postvars);
 			}
-			else {
+			elseif(($contact['network'] === NETWORK_OSTATUS) 
+				|| ($contact['network'] === NETWORK_DIASPORA)
+				|| ($contact['network'] === NETWORK_FEED) ) {
 
-				// $contact['network'] !== 'dfrn'
+				// Upgrading DB fields from an older Friendika version
+				// Will only do this once per notify-enabled OStatus contact
 
 				if(($contact['notify']) && (! $contact['writable'])) {
 					q("UPDATE `contact` SET `writable` = 1 WHERE `id` = %d LIMIT 1",
 						intval($contact['id'])
 					);
 				}
+
 				$xml = fetch_url($contact['poll']);
 			}
-
-			logger('poller: received xml : ' . $xml, LOGGER_DATA);
-
-			if(! strstr($xml,'<?xml')) {
-				logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
-				$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
-					dbesc(datetime_convert()),
-					intval($contact['id'])
-				);
-				continue;
+			elseif($contact['network'] === NETWORK_MAIL) {
+				if(! $mbox) {
+					$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
+						intval($importer_uid)
+					);
+					$mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1",
+						intval($importer_uid)
+					);
+					if(count($x) && count($mailconf)) {
+					    $mailbox = construct_mailbox_name($mailconf[0]);
+						$password = '';
+						openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
+						$mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
+						unset($password);
+						if($mbox) {
+							q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+								dbesc(datetime_convert()),
+								intval($mailconf[0]['id']),
+								intval($importer_uid)
+							);
+						}
+					}
+				}
+				if($mbox) {
+
+					$msgs = email_poll($mbox,$contact['addr']);
+
+					if(count($msgs)) {
+						foreach($msgs as $msg_uid) {
+							$datarray = array();
+							$meta = email_msg_meta($mbox,$msg_uid);
+							$headers = email_msg_headers($mbox,$msg_uid);
+
+							// look for a 'references' header and try and match with a parent item we have locally.
+
+							$raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
+							$datarray['uri'] = trim($meta->message_id,'<>');
+
+							if($raw_refs) {
+								$refs_arr = explode(' ', $raw_refs);
+								if(count($refs_arr)) {
+									for($x = 0; $x < count($refs_arr); $x ++)
+										$refs_arr[$x] = "'" . str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x])) . "'";
+								}
+								$qstr = implode(',',$refs_arr);
+								$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1",
+									intval($importer_uid)
+								);
+								if(count($r))
+									$datarray['parent-uri'] = $r[0]['uri'];
+							}
+
+
+							if(! x($datarray,'parent-uri'))
+								$datarray['parent-uri'] = $datarray['uri'];
+
+							// Have we seen it before?
+							$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
+								intval($importer_uid),
+								dbesc($datarray['uri'])
+							);
+
+							if(count($r)) {
+								if($meta->deleted && ! $r[0]['deleted']) {
+									q("UPDATE `item` SET `deleted` = `, `changed` = '%s' WHERE `id` = %d LIMIT 1",
+										dbesc(datetime_convert()),
+										intval($r[0]['id'])
+									);
+								}		
+								continue;
+							}
+							$datarray['title'] = notags(trim($meta->subject));
+							$datarray['created'] = datetime_convert('UTC','UTC',$meta->date);
+	
+							$r = email_get_msg($mbox,$msg_uid);
+							if(! $r)
+								continue;
+							$datarray['body'] = escape_tags($r['body']);
+							$datarray['uid'] = $importer_uid;
+							$datarray['contact-id'] = $contact['id'];
+							if($datarray['parent-uri'] === $datarray['uri'])
+								$datarray['private'] = 1;
+							$datarray['author-name'] = $contact['name'];
+							$datarray['author-link'] = 'mailbox';
+							$datarray['author-avatar'] = $contact['photo'];
+						
+							$stored_item = item_store($datarray);
+							q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d",
+								dbesc($datarray['parent-uri']),
+								intval($importer_uid)
+							);
+							q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
+								intval($stored_item)
+							);
+						}
+					}
+				}
+			}
+			elseif($contact['network'] === NETWORK_FACEBOOK) {
+				// TODO: work in progress			
 			}
 
+			if($xml) {
+				logger('poller: received xml : ' . $xml, LOGGER_DATA);
 
-			consume_feed($xml,$importer,$contact,$hub,1, true);
-
-			// do it twice. Ensures that children of parents which may be later in the stream aren't tossed
+				if(! strstr($xml,'<?xml')) {
+					logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
+					$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+						dbesc(datetime_convert()),
+						intval($contact['id'])
+					);
+					continue;
+				}
 
-			consume_feed($xml,$importer,$contact,$hub,1);
 
+				consume_feed($xml,$importer,$contact,$hub,1, true);
 
-			if((strlen($hub)) && ($hub_update) 
-				&& (($contact['rel'] == REL_BUD) || (($contact['network'] === 'stat') && (! $contact['readonly'])))) {
-				logger('poller: subscribing to hub(s) : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
-				$hubs = explode(',', $hub);
-				if(count($hubs)) {
-					foreach($hubs as $h) {
-						$h = trim($h);
-						if(! strlen($h))
-							continue;
-						subscribe_to_hub($h,$importer,$contact);
+				// do it twice. Ensures that children of parents which may be later in the stream aren't tossed
+	
+				consume_feed($xml,$importer,$contact,$hub,1);
+
+
+				if((strlen($hub)) && ($hub_update) && (($contact['rel'] == REL_BUD) || (($contact['network'] === NETWORK_OSTATUS) && (! $contact['readonly'])))) {
+					logger('poller: subscribing to hub(s) : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
+					$hubs = explode(',', $hub);
+					if(count($hubs)) {
+						foreach($hubs as $h) {
+							$h = trim($h);
+							if(! strlen($h))
+								continue;
+							subscribe_to_hub($h,$importer,$contact);
+						}
 					}
 				}
 			}
 
-
 			$updated = datetime_convert();
 
 			$r = q("UPDATE `contact` SET `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d LIMIT 1",
@@ -322,6 +434,9 @@ function poller_run($argv, $argc){
 			// loop - next contact
 		}
 	}
+
+	if($mbox && function_exists('imap_close'))
+		imap_close($mbox);
 		
 	return;
 }
diff --git a/mod/contacts.php b/mod/contacts.php
index ee7177d48..18eedbe9b 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -284,7 +284,7 @@ function contacts_content(&$a) {
 			'$contact_id' => $r[0]['id'],
 			'$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
 			'$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ),
-			'$insecure' => (($r[0]['network'] !== 'dfrn') ? $insecure : ''),
+			'$insecure' => (($r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_MAIL) ? $insecure : ''),
 			'$info' => $r[0]['info'],
 			'$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''),
 			'$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''),
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 02437ec36..58473146d 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -651,7 +651,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			);
 	
 			$res = mail($r[0]['email'], sprintf( t("Connection accepted at %s") , $a->config['sitename']),
-				$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
+				$email_tpl,
+				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				. 'Content-type: text/plain; charset=UTF-8' . "\n"
+				. 'Content-transfer-encoding: 8bit' );
+
 			if(!$res) {
 				// pointless throwing an error here and confusing the person at the other end of the wire.
 			}
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index f6f68d348..eb9d71fe3 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -401,7 +401,11 @@ function dfrn_notify_post(&$a) {
 							));
 	
 							$res = mail($importer['email'], sprintf(t('%s commented on an item at %s'), $from , $a->config['sitename']),
-								$email_tpl, "From: " . t('Administrator') . '@' . $a->get_hostname() );
+								$email_tpl, 
+								'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+								. 'Content-type: text/plain; charset=UTF-8' . "\n"
+								. 'Content-transfer-encoding: 8bit' );
+
 						}
 					}
 					xml_status(0);
@@ -487,7 +491,11 @@ function dfrn_notify_post(&$a) {
 							));
 
 							$res = mail($importer['email'], sprintf( t("%s commented on an item at %s") , $from ,$a->config['sitename']),
-								$email_tpl, "From: ".t("Administrator") . "@". $a->get_hostname() );
+								$email_tpl, 
+								'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+								. 'Content-type: text/plain; charset=UTF-8' . "\n"
+								. 'Content-transfer-encoding: 8bit' );
+
 							break;
 						}
 					}
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 11b7438a7..4463c713f 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -544,7 +544,10 @@ function dfrn_request_content(&$a) {
 					$res = mail($r[0]['email'], 
 					    t("Introduction received at ") . $a->config['sitename'],
 						$email,
-						'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
+						'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+						. 'Content-type: text/plain; charset=UTF-8' . "\n"
+						. 'Content-transfer-encoding: 8bit' );
+
 					// This is a redundant notification - no point throwing errors if it fails.
 				}
 				if($auto_confirm) {
@@ -615,17 +618,18 @@ function dfrn_request_content(&$a) {
 
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Friend/Connection Request'),
+			'$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'),
 			'$pls_answer' => t('Please answer the following:'),
 			'$does_know' => t('Does $name know you?'),
 			'$yes' => t('Yes'),
 			'$no' => t('No'),
 			'$add_note' => t('Add a personal note:'),
-			'$page_desc' => t('Please enter your profile address from one of the following supported social networks:'),
+			'$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"),
 			'$friendika' => t('Friendika'),
 			'$statusnet' => t('StatusNet/Federated Social Web'),
 			'$private_net' => t("Private \x28secure\x29 network"),
 			'$public_net' => t("Public \x28insecure\x29 network"),
-			'$your_address' => t('Your profile address:'),
+			'$your_address' => t('Your Identity Address:'),
 			'$submit' => t('Submit Request'),
 			'$cancel' => t('Cancel'),
 			'$nickname' => $a->argv[1],
diff --git a/mod/editpost.php b/mod/editpost.php
index 862ba937f..7a102119b 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -51,6 +51,28 @@ function editpost_content(&$a) {
 
 	$jotplugins = '';
 	$jotnets = '';
+
+	$mail_enabled = false;
+	$pubmail_enabled = false;
+
+
+	$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
+		intval(local_user())
+	);
+	if(count($r)) {
+		$mail_enabled = true;
+		if(intval($r[0]['pubmail']))
+			$pubmail_enabled = true;
+	}
+
+	if($mail_enabled) {
+       $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
+		$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . 'value="1" /> '
+          	. t("Post to Email") . '</div>';
+	}
+					
+
+
 	call_hooks('jot_tool', $jotplugins);
 	call_hooks('jot_networks', $jotnets);
 
diff --git a/mod/follow.php b/mod/follow.php
index 04858ce52..23fad81a8 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -11,200 +11,45 @@ function follow_post(&$a) {
 	}
 
 	$url = $orig_url = notags(trim($_POST['url']));
-	$diaspora = false;	
-	$email_conversant = false;
 
-	if($url) {
-		$links = lrdd($url);
+	$ret = probe_url($url);
 
-		if(count($links)) {
-			foreach($links as $link) {
-				if($link['@attributes']['rel'] === NAMESPACE_DFRN)
-					$dfrn = unamp($link['@attributes']['href']);
-				if($link['@attributes']['rel'] === 'salmon')
-					$notify = unamp($link['@attributes']['href']);
-				if($link['@attributes']['rel'] === NAMESPACE_FEED)
-					$poll = unamp($link['@attributes']['href']);
-				if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
-					$hcard = unamp($link['@attributes']['href']);
-				if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
-					$profile = unamp($link['@attributes']['href']);
-				if($link['@attributes']['rel'] === 'http://joindiaspora.com/seed_location')
-					$diaspora = true;
 
-
-			}
-
-			// Status.Net can have more than one profile URL. We need to match the profile URL
-			// to a contact on incoming messages to prevent spam, and we won't know which one
-			// to match. So in case of two, one of them is stored as an alias. Only store URL's
-			// and not webfinger user@host aliases. If they've got more than two non-email style
-			// aliases, let's hope we're lucky and get one that matches the feed author-uri because 
-			// otherwise we're screwed.
-
-			foreach($links as $link) {
-				if($link['@attributes']['rel'] === 'alias') {
-					if(strpos($link['@attributes']['href'],'@') === false) {
-						if(isset($profile)) {
-							if($link['@attributes']['href'] !== $profile)
-								$alias = unamp($link['@attributes']['href']);
-						}
-						else
-							$profile = unamp($link['@attributes']['href']);
-					}
-				}
-			}
-		}
-		else {
-			if((strpos($orig_url,'@')) && validate_email($orig_url)) {
-				$email_conversant = true;
-			}
-		}
-	}	
-
-	// If we find a DFRN site, send our subscriber to the other person's
-	// dfrn_request page and all the other details will get sorted.
-
-	if(strlen($dfrn)) {
-		$ret = scrape_dfrn($dfrn);
-		if(is_array($ret) && x($ret,'dfrn-request')) {
-			if(strlen($a->path))
-				$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
-			else
-				$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
+	if($ret['network'] === NETWORK_DFRN) {
+		if(strlen($a->path))
+			$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
+		else
+			$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
  
-			goaway($ret['dfrn-request'] . "&addr=$myaddr");
-		
-			// NOTREACHED
-		}
-	}
-
-	$network  = 'stat';
-	$priority = 0;
-
-	if($hcard) {
-		$vcard = scrape_vcard($hcard);
-
-		// Google doesn't use absolute url in profile photos
-
-		if((x($vcard,'photo')) && substr($vcard['photo'],0,1) == '/') {
-			$h = @parse_url($hcard);
-			if($h)
-				$vcard['photo'] = $h['scheme'] . '://' . $h['host'] . $vcard['photo'];
-		}
+		goaway($ret['request'] . "&addr=$myaddr");
 		
-		logger('mod_follow: scrape_vcard: ' . print_r($vcard,true), LOGGER_DATA);
-	}
-
-	if(! $profile) {
-		if($diaspora)
-			$profile = $hcard;
-		else
-			$profile = $url;
-	}
-
-	if(! x($vcard,'fn'))
-		if(x($vcard,'nick'))
-			$vcard['fn'] = $vcard['nick'];
-
-	if((! isset($vcard)) && (! $poll)) {
-
-		$ret = scrape_feed($url);
-		logger('mod_follow: scrape_feed returns: ' . print_r($ret,true), LOGGER_DATA);
-		if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) {
-			$poll = ((x($ret,'feed_atom')) ? unamp($ret['feed_atom']) : unamp($ret['feed_rss']));
-			$vcard = array();
-				if(x($ret,'photo'))
-					$vcard['photo'] = $ret['photo'];
-			require_once('simplepie/simplepie.inc');
-		    $feed = new SimplePie();
-			$xml = fetch_url($poll);
-
-    		$feed->set_raw_data($xml);
-
-		    $feed->init();
-
-			if(! x($vcard,'photo'))
-				$vcard['photo'] = $feed->get_image_url();
-			$author = $feed->get_author();
-			if($author) {			
-				$vcard['fn'] = unxmlify(trim($author->get_name()));
-				if(! $vcard['fn'])
-					$vcard['fn'] = trim(unxmlify($author->get_email()));
-				if(strpos($vcard['fn'],'@') !== false)
-					$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
-				$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn'])));
-				if(strpos($vcard['nick'],' '))
-					$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
-				$email = unxmlify($author->get_email());
-			}
-			else {
-				$item = $feed->get_item(0);
-				if($item) {
-					$author = $item->get_author();
-					if($author) {			
-						$vcard['fn'] = trim(unxmlify($author->get_name()));
-						if(! $vcard['fn'])
-							$vcard['fn'] = trim(unxmlify($author->get_email()));
-						if(strpos($vcard['fn'],'@') !== false)
-							$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
-						$vcard['nick'] = strtolower(unxmlify($vcard['fn']));
-						if(strpos($vcard['nick'],' '))
-							$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
-						$email = unxmlify($author->get_email());
-					}
-					if(! $vcard['photo']) {
-						$rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail');
-						if($rawmedia && $rawmedia[0]['attribs']['']['url'])
-							$vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']);
-					}
-				}
-			}
-			if((! $vcard['photo']) && strlen($email))
-				$vcard['photo'] = gravatar_img($email);
-			if($poll === $profile)
-				$lnk = $feed->get_permalink();
-			if(isset($lnk) && strlen($lnk))
-				$profile = $lnk;	
-			if(! (x($vcard,'fn')))
-				$vcard['fn'] = notags($feed->get_title());
-			if(! (x($vcard,'fn')))
-				$vcard['fn'] = notags($feed->get_description());
-			$network = 'feed';
-			$priority = 2;
-		}
+		// NOTREACHED
 	}
 
-	logger('follow: poll=' . $poll . ' notify=' . $notify . ' profile=' . $profile . ' vcard=' . print_r($vcard,true));
-
-	$vcard['fn'] = notags($vcard['fn']);
-	$vcard['nick'] = notags($vcard['nick']);
-
 	// do we have enough information?
 	
-	if(! ((x($vcard['fn'])) && ($poll) && ($profile))) {
+	if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
 		notice( t('The profile address specified does not provide adequate information.') . EOL);
 		goaway($_SESSION['return_url']);
 	}
 
 
-	if(! $notify) {
+	if(! $ret['notify']) {
 		notice( t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL);
 	}
 
-	if(! x($vcard,'photo'))
-		$vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ; 
-
-
-	$writeable = ((($network === 'stat') && ($notify)) ? 1 : 0);
-
+	$writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
+	if($ret['network'] === NETWORK_MAIL) {
+		$writeable = 1;
+		
+	}
 	// check if we already have a contact
 	// the poll url is more reliable than the profile url, as we may have
 	// indirect links or webfinger links
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1",
 		intval(local_user()),
-		dbesc($poll)
+		dbesc($ret['poll'])
 	);			
 
 	if(count($r)) {
@@ -219,27 +64,28 @@ function follow_post(&$a) {
 	}
 	else {
 		// create contact record 
-		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`,
+		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`,
 			`writable`, `blocked`, `readonly`, `pending` )
-			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
 			intval(local_user()),
 			dbesc(datetime_convert()),
-			dbesc($profile),
-			dbesc($alias),
-			dbesc($notify),
-			dbesc($poll),
-			dbesc($vcard['fn']),
-			dbesc($vcard['nick']),
-			dbesc($vcard['photo']),
-			dbesc($network),
-			intval(REL_FAN),
-			intval($priority),
-			intval($writable)
+			dbesc($ret['url']),
+			dbesc($ret['addr']),
+			dbesc($ret['alias']),
+			dbesc($ret['notify']),
+			dbesc($ret['poll']),
+			dbesc($ret['name']),
+			dbesc($ret['nick']),
+			dbesc($ret['photo']),
+			dbesc($ret['network']),
+			intval(($ret['network'] === NETWORK_MAIL) ? REL_BUD : REL_FAN),
+			intval($ret['priority']),
+			intval($writeable)
 		);
 	}
 
 	$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
-		dbesc($profile),
+		dbesc($ret['url']),
 		intval(local_user())
 	);
 
@@ -254,7 +100,7 @@ function follow_post(&$a) {
 
 	require_once("Photo.php");
 
-	$photos = import_profile_photo($vcard['photo'],local_user(),$contact_id);
+	$photos = import_profile_photo($ret['photo'],local_user(),$contact_id);
 
 	$r = q("UPDATE `contact` SET `photo` = '%s', 
 			`thumb` = '%s',
diff --git a/mod/help.php b/mod/help.php
index e07e4c5d9..561f5381f 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -22,12 +22,16 @@ function help_content(&$a) {
 
 	$text = '';
 
-	if($a->argc > 1) 
+	if($a->argc > 1) {
 		$text = load_doc_file('doc/' . $a->argv[1] . '.md');
-
+		$a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags($a->argv[1]));
+	}
 	if(! $text) {
 		$text = load_doc_file('doc/Home.md');
+		$a->page['title'] = t('Help');
 	}
+	
+
 	return Markdown($text);
 
 }
\ No newline at end of file
diff --git a/mod/invite.php b/mod/invite.php
index 84fa978ad..1c5119595 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -30,7 +30,11 @@ function invite_post(&$a) {
 		}
 
 		$res = mail($recip, sprintf(t('Please join my network on %s'), $a->config['sitename']), 
-			$message, "From: " . $a->user['email']);
+			$message, 
+			"From: " . $a->user['email'] . "\n"
+			. 'Content-type: text/plain; charset=UTF-8' . "\n"
+			. 'Content-transfer-encoding: 8bit' );
+
 		if($res) {
 			$total ++;
 		}
diff --git a/mod/item.php b/mod/item.php
index 5cefb3be3..e53cfb033 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -96,6 +96,7 @@ function item_post(&$a) {
 
 		$body              = escape_tags(trim($_POST['body']));
 		$private           = $orig_post['private'];
+		$pubmail_enable    = $orig_post['pubmail'];
 	}
 	else {
 		$str_group_allow   = perms2str($_POST['group_allow']);
@@ -121,6 +122,7 @@ function item_post(&$a) {
 			$private = 1;
 		}
 	
+		$pubmail_enable    = ((x($_POST,'pubmail_enable') && intval($_POST['pubmail_enable']) && (! $private)) ? 1 : 0);
 
 		if(! strlen($body)) {
 			notice( t('Empty post discarded.') . EOL );
@@ -362,6 +364,7 @@ function item_post(&$a) {
 	$datarray['deny_cid']      = $str_contact_deny;
 	$datarray['deny_gid']      = $str_group_deny;
 	$datarray['private']       = $private;
+	$datarray['pubmail']       = $pubmail_enable;
 
 	/**
 	 * These fields are for the convenience of plugins...
@@ -399,8 +402,8 @@ function item_post(&$a) {
 
 	$r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
 		`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, 
-		`tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private` )
-		VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )",
+		`tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail` )
+		VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
 		intval($datarray['uid']),
 		dbesc($datarray['type']),
 		intval($datarray['wall']),
@@ -427,7 +430,8 @@ function item_post(&$a) {
 		dbesc($datarray['allow_gid']),
 		dbesc($datarray['deny_cid']),
 		dbesc($datarray['deny_gid']),
-		intval($datarray['private'])
+		intval($datarray['private']),
+		intval($datarray['pubmail'])
 	);
 
 	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
@@ -472,7 +476,10 @@ function item_post(&$a) {
 				));
 
 				$res = mail($user['email'], sprintf( t("%s commented on your item at %s") ,$from,$a->config['sitename']),
-					$email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() );
+					$email_tpl,
+					'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+					. 'Content-type: text/plain; charset=UTF-8' . "\n"
+					. 'Content-transfer-encoding: 8bit' );
 			}
 		}
 		else {
@@ -495,7 +502,11 @@ function item_post(&$a) {
 				));
 
 				$res = mail($user['email'], sprintf( t("%s posted on your profile wall at %s") ,$from, $a->config['sitename']),
-					$email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() );
+					$email_tpl,
+					'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+					. 'Content-type: text/plain; charset=UTF-8' . "\n"
+					. 'Content-transfer-encoding: 8bit' );
+
 			}
 		}
 
@@ -538,11 +549,10 @@ function item_post(&$a) {
 				$addr = trim($recip);
 				if(! strlen($addr))
 					continue;
-				$disclaimer = '<hr />' . sprintf(t('This message was sent to you by %s, a member of the Friendika social network.'),$a->user['username']) 
+				$disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendika social network.'),$a->user['username']) 
 					. '<br />';
-				$disclaimer .= t('You may visit them online at') . ' ' 
-					. $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '<br />';
-				$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . '<br />'; 
+				$disclaimer .= sprintf( t('You may visit them online at %s'), $a->get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
+				$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; 
 
 				$subject  = '[Friendika]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']);
 				$headers  = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n";
diff --git a/mod/lostpass.php b/mod/lostpass.php
index c46a57e6a..8d1cf7629 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -36,7 +36,11 @@ function lostpass_post(&$a) {
 	));
 
 	$res = mail($email, sprintf( t('Password reset requested at %s'),$a->config['sitename']),
-			$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME]);
+			$email_tpl,
+			'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+			. 'Content-type: text/plain; charset=UTF-8' . "\n"
+			. 'Content-transfer-encoding: 8bit' );
+
 
 	goaway($a->get_baseurl());
 }
@@ -94,7 +98,10 @@ function lostpass_content(&$a) {
 			'$new_password' => $new_password,
 			'$uid' => $newuid ));
 
-			$res = mail($email,"Your password has changed at {$a->config['sitename']}",$email_tpl,"From: Administrator@{$_SERVER[SERVER_NAME]}");
+			$res = mail($email,"Your password has changed at {$a->config['sitename']}",$email_tpl,
+				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				. 'Content-type: text/plain; charset=UTF-8' . "\n"
+				. 'Content-transfer-encoding: 8bit' );
 
 			return $o;
 		}
diff --git a/mod/network.php b/mod/network.php
index f0a071cbf..746206031 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -94,6 +94,28 @@ function network_content(&$a, $update = 0) {
 
 		$jotplugins = '';
 		$jotnets = '';
+
+
+		$mail_enabled = false;
+		$pubmail_enabled = false;
+
+
+		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
+			intval(local_user())
+		);
+		if(count($r)) {
+			$mail_enabled = true;
+			if(intval($r[0]['pubmail']))
+				$pubmail_enabled = true;
+		}
+
+		if($mail_enabled) {
+	       $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
+			$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . 'value="1" /> '
+           	. t("Post to Email") . '</div>';
+		}
+
+
 		call_hooks('jot_tool', $jotplugins);
 		call_hooks('jot_networks', $jotnets);
 
diff --git a/mod/profile.php b/mod/profile.php
index 923f4fb90..fa2c261df 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -147,6 +147,26 @@ function profile_content(&$a, $update = 0) {
        
 			$jotplugins = '';
 			$jotnets = '';
+
+			$mail_enabled = false;
+			$pubmail_enabled = false;
+
+			if($is_owner) {
+				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
+					intval(local_user())
+				);
+				if(count($r)) {
+					$mail_enabled = true;
+					if(intval($r[0]['pubmail']))
+						$pubmail_enabled = true;
+				}
+			}
+			if($mail_enabled) {
+		       $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
+				$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . 'value="1" /> '
+            	. t("Post to Email") . '</div>';
+			}
+					
 			call_hooks('jot_tool', $jotplugins); 
 
 			call_hooks('jot_networks', $jotnets);
diff --git a/mod/register.php b/mod/register.php
index 5fe7c0c6d..83e9e2891 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -329,7 +329,10 @@ function register_post(&$a) {
 				'$uid' => $newuid ));
 
 		$res = mail($email, sprintf(t('Registration details for %s'), $a->config['sitename']),
-			$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
+			$email_tpl, 
+				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				. 'Content-type: text/plain; charset=UTF-8' . "\n"
+				. 'Content-transfer-encoding: 8bit' );
 
 
 		if($res) {
@@ -366,8 +369,10 @@ function register_post(&$a) {
 		 ));
 
 		$res = mail($a->config['admin_email'], sprintf(t('Registration request at %s'), $a->config['sitename']),
-			$email_tpl,'From: ' .  t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
-
+			$email_tpl,
+				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				. 'Content-type: text/plain; charset=UTF-8' . "\n"
+				. 'Content-transfer-encoding: 8bit' );
 		if($res) {
 			notice( t('Your registration is pending approval by the site owner.') . EOL ) ;
 			goaway($a->get_baseurl());
diff --git a/mod/regmod.php b/mod/regmod.php
index 2cbe810bc..b985ee364 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -90,7 +90,10 @@ function regmod_content(&$a) {
 		));
 
 		$res = mail($user[0]['email'], sprintf(t('Registration details for %s'), $a->config['sitename']),
-			$email_tpl,'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
+			$email_tpl,
+				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				. 'Content-type: text/plain; charset=UTF-8' . "\n"
+				. 'Content-transfer-encoding: 8bit' );
 
 		if($res) {
 			notice( t('Account approved.') . EOL );
diff --git a/mod/settings.php b/mod/settings.php
index 42529ae23..8b7e3c5d6 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -73,6 +73,41 @@ function settings_post(&$a) {
 	$page_flags       = (((x($_POST,'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
 	$blockwall        = (((x($_POST,'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
 
+	$mail_server      = ((x($_POST,'mail_server')) ? $_POST['mail_server'] : '');
+	$mail_port        = ((x($_POST,'mail_port')) ? $_POST['mail_port'] : '');
+	$mail_ssl         = ((x($_POST,'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
+	$mail_user        = ((x($_POST,'mail_user')) ? $_POST['mail_user'] : '');
+	$mail_pass        = ((x($_POST,'mail_pass')) ? trim($_POST['mail_pass']) : '');
+	$mail_replyto     = ((x($_POST,'mail_replyto')) ? $_POST['mail_replyto'] : '');
+	$mail_pubmail     = ((x($_POST,'mail_pubmail')) ? $_POST['mail_pubmail'] : '');
+
+	$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+		intval(local_user())
+	);
+	if(! count($r)) {
+		q("INSERT INTO `mailacct` (`uid`) VALUES (%d)",
+			intval(local_user())
+		);
+	}
+	if(strlen($mail_pass)) {
+		$pass = '';
+		openssl(private_encrypt($mail_pass,$pass,$a->user['pubkey']));
+		q("UPDATE `mailacct` SET `pass` = '%s' WHERE `uid` = %d LIMIT 1",
+				dbesc(hex2bin($pass)),
+				intval(local_user())
+		);
+	}
+	$r = q("UPDATE `mailacct` SET `server` = '%s', `port` = %d, `ssltype` = '%s', `user` = '%s',
+		`mailbox` = 'INBOX', `reply_to` = '%s', `pubmail` = %d WHERE `uid` = %d LIMIT 1",
+		dbesc($mail_server),
+		intval($mail_port),
+		dbesc($mail_ssl),
+		dbesc($mail_user),
+		dbesc($mail_replyto),
+		intval($mail_pubmail),
+		intval(local_user())
+	);
+
 	$notify = 0;
 
 	if(x($_POST,'notify1'))
@@ -249,6 +284,19 @@ function settings_content(&$a) {
 	if(! strlen($a->user['timezone']))
 		$timezone = date_default_timezone_get();
 
+
+	$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+		local_user()
+	);
+
+	$mail_server = ((count($r)) ? $r[0]['server'] : '');
+	$mail_port = ((count($r)) ? $r[0]['port'] : '');
+	$mail_ssl = ((count($r)) ? $r[0]['ssltype'] : '');
+	$mail_user = ((count($r)) ? $r[0]['user'] : '');
+	$mail_replyto = ((count($r)) ? $r[0]['reply_to'] : '');
+	$mail_pubmail = ((count($r)) ? $r[0]['pubmail'] : 0);
+
+
 	$pageset_tpl = load_view_file('view/pagetypes.tpl');
 	$pagetype = replace_macros($pageset_tpl,array(
 		'$normal'         => (($a->user['page-flags'] == PAGE_NORMAL)      ? " checked=\"checked\" " : ""),
@@ -331,6 +379,7 @@ function settings_content(&$a) {
 			$theme_selector .= '<option val="' . basename($file) . '"' . $selected . '>' . basename($file) . '</option>';
 		}
 	}
+
 	$theme_selector .= '</select>';
 
 	$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : '');
@@ -338,7 +387,7 @@ function settings_content(&$a) {
 	$tpl_addr = load_view_file("view/settings_nick_set.tpl");
 
 	$prof_addr = replace_macros($tpl_addr,array(
-		'$desc' => t('Your profile address is'),
+		'$desc' => t('Your Identity Address is'),
 		'$nickname' => $nickname,
 		'$subdir' => $subdir,
 		'$basepath' => $a->get_hostname()
@@ -407,7 +456,23 @@ function settings_content(&$a) {
 		'$expire' => $expire,
 		'$blockw_checked' => (($blockwall) ? '' : ' checked="checked" ' ),
 		'$theme' => $theme_selector,
-		'$pagetype' => $pagetype
+		'$pagetype' => $pagetype,
+		'$lbl_imap0' => t('Email/Mailbox Setup'),
+		'$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
+		'$lbl_imap1' => t('IMAP server name:'),
+		'$imap_server' => $mail_server,
+		'$lbl_imap2' => t('IMAP port:'),
+		'$imap_port' => $mail_port,
+		'$lbl_imap3' => t("Security \x28TLS or SSL\x29:"),
+		'$imap_ssl' => $mail_ssl,
+		'$lbl_imap4' => t('Email login name:'),
+		'$imap_user' => $mail_user,
+		'$lbl_imap5' => t('Email password:'),
+		'$lbl_imap6' => t("Reply-to address \x28Optional\x29:"),
+		'$imap_replyto' => $mail_replyto,
+		'$lbl_imap7' => t('Send public posts to all email contacts:'),
+		'$pubmail_checked' => (($mail_pubmail) ? ' checked="checked" ' : ''),
+
 	));
 
 	call_hooks('settings_form',$o);
diff --git a/update.php b/update.php
index 763b8f267..a8140fe91 100644
--- a/update.php
+++ b/update.php
@@ -460,3 +460,19 @@ function update_1050() {
 	) ENGINE = MYISAM ");
 
 }
+
+function update_1051() {
+	q("ALTER TABLE `mailacct` ADD `port` INT NOT NULL AFTER `server` ,
+		ADD `ssltype` CHAR( 16 ) NOT NULL AFTER `port` ,
+		ADD `mailbox` CHAR( 255 ) NOT NULL AFTER `ssltype` ");
+
+	q("ALTER TABLE `contact` ADD `addr` CHAR( 255 ) NOT NULL AFTER `url` ");
+}
+
+function update_1052() {
+	q("ALTER TABLE `mailacct` CHANGE `pass` `pass` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL");
+	q("ALTER TABLE `mailacct` ADD `pubmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `reply_to` ");
+	q("ALTER TABLE `item` ADD `pubmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `private` ");
+}
+
+
diff --git a/util/messages.po b/util/messages.po
index 6433cf864..91c479386 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.948\n"
+"Project-Id-Version: 2.1.949\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-13 20:16-0700\n"
+"POT-Creation-Date: 2011-04-15 01:04-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"
@@ -36,16 +36,16 @@ msgstr ""
 #: ../../mod/settings.php:211 ../../mod/manage.php:75 ../../mod/network.php:6
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:13
 #: ../../mod/register.php:25 ../../mod/regmod.php:16 ../../mod/item.php:57
-#: ../../mod/item.php:668 ../../mod/profile_photo.php:19
+#: ../../mod/item.php:675 ../../mod/profile_photo.php:19
 #: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:139
 #: ../../mod/profile_photo.php:150 ../../mod/message.php:8
 #: ../../mod/message.php:116 ../../mod/wall_upload.php:42
 #: ../../mod/follow.php:8 ../../mod/display.php:133 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:227 ../../mod/invite.php:13 ../../mod/invite.php:50
+#: ../../mod/profiles.php:227 ../../mod/invite.php:13 ../../mod/invite.php:54
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:110
-#: ../../wip/photos.php:77 ../../wip/photos.php:723 ../../wip/group.php:19
-#: ../../wip/photos-chris.php:97 ../../wip/photos-chris.php:770
-#: ../../index.php:265
+#: ../../wip/photos.php:77 ../../wip/photos.php:723 ../../wip/follow2.php:8
+#: ../../wip/group.php:19 ../../wip/photos-chris.php:97
+#: ../../wip/photos-chris.php:770 ../../index.php:265
 msgid "Permission denied."
 msgstr ""
 
@@ -101,8 +101,8 @@ msgstr ""
 #: ../../mod/crepair.php:100 ../../mod/photos.php:805 ../../mod/photos.php:862
 #: ../../mod/photos.php:1069 ../../mod/photos.php:1112
 #: ../../mod/install.php:133 ../../mod/contacts.php:264
-#: ../../mod/settings.php:364 ../../mod/manage.php:106 ../../mod/group.php:76
-#: ../../mod/group.php:159 ../../mod/profiles.php:370 ../../mod/invite.php:64
+#: ../../mod/settings.php:365 ../../mod/manage.php:106 ../../mod/group.php:76
+#: ../../mod/group.php:159 ../../mod/profiles.php:370 ../../mod/invite.php:68
 #: ../../addon/facebook/facebook.php:151
 #: ../../addon/randplace/randplace.php:179
 #: ../../addon/statusnet/statusnet.php:163
@@ -116,8 +116,16 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
+#: ../../mod/help.php:27
+msgid "Help:"
+msgstr ""
+
+#: ../../mod/help.php:31 ../../include/nav.php:64
+msgid "Help"
+msgstr ""
+
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:630 ../../addon/js_upload/js_upload.php:41
+#: ../../mod/dfrn_request.php:634 ../../addon/js_upload/js_upload.php:41
 msgid "Cancel"
 msgstr ""
 
@@ -558,70 +566,76 @@ msgstr ""
 msgid "Introduction received at "
 msgstr ""
 
-#: ../../mod/dfrn_request.php:547 ../../mod/lostpass.php:39
-#: ../../mod/register.php:332 ../../mod/register.php:369
-#: ../../mod/regmod.php:93 ../../mod/item.php:475 ../../mod/item.php:498
-#: ../../mod/dfrn_notify.php:189 ../../mod/dfrn_notify.php:404
-#: ../../mod/dfrn_notify.php:490 ../../mod/dfrn_confirm.php:654
-#: ../../include/items.php:1418
+#: ../../mod/dfrn_request.php:547 ../../mod/lostpass.php:40
+#: ../../mod/lostpass.php:102 ../../mod/register.php:333
+#: ../../mod/register.php:373 ../../mod/regmod.php:94 ../../mod/item.php:476
+#: ../../mod/item.php:502 ../../mod/dfrn_notify.php:189
+#: ../../mod/dfrn_notify.php:405 ../../mod/dfrn_notify.php:495
+#: ../../mod/dfrn_confirm.php:655 ../../include/items.php:1418
 msgid "Administrator"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:617
+#: ../../mod/dfrn_request.php:620
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:618
+#: ../../mod/dfrn_request.php:621
+msgid ""
+"Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, "
+"testuser@identi.ca"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:622
 msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:619
+#: ../../mod/dfrn_request.php:623
 msgid "Does $name know you?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:620 ../../mod/settings.php:289
-#: ../../mod/settings.php:301 ../../mod/register.php:439
+#: ../../mod/dfrn_request.php:624 ../../mod/settings.php:289
+#: ../../mod/settings.php:301 ../../mod/register.php:444
 #: ../../mod/profiles.php:355
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:621 ../../mod/settings.php:290
-#: ../../mod/settings.php:302 ../../mod/register.php:440
+#: ../../mod/dfrn_request.php:625 ../../mod/settings.php:290
+#: ../../mod/settings.php:302 ../../mod/register.php:445
 #: ../../mod/profiles.php:356
 msgid "No"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:622
+#: ../../mod/dfrn_request.php:626
 msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:623
+#: ../../mod/dfrn_request.php:627
 msgid ""
-"Please enter your profile address from one of the following supported social "
-"networks:"
+"Please enter your 'Identity Address' from one of the following supported "
+"social networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:624
+#: ../../mod/dfrn_request.php:628
 msgid "Friendika"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:625
+#: ../../mod/dfrn_request.php:629
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:626
+#: ../../mod/dfrn_request.php:630
 msgid "Private (secure) network"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:627
+#: ../../mod/dfrn_request.php:631
 msgid "Public (insecure) network"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:628
-msgid "Your profile address:"
+#: ../../mod/dfrn_request.php:632
+msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:629
+#: ../../mod/dfrn_request.php:633
 msgid "Submit Request"
 msgstr ""
 
@@ -1092,7 +1106,7 @@ msgstr ""
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:321 ../../include/nav.php:117
+#: ../../mod/contacts.php:321 ../../include/nav.php:110
 #: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
 msgid "Contacts"
 msgstr ""
@@ -1117,7 +1131,7 @@ msgstr ""
 msgid "Visit $username's profile"
 msgstr ""
 
-#: ../../mod/contacts.php:387 ../../include/conversation.php:520
+#: ../../mod/contacts.php:387 ../../include/conversation.php:523
 msgid "Edit contact"
 msgstr ""
 
@@ -1130,53 +1144,53 @@ msgstr ""
 msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../mod/lostpass.php:56
+#: ../../mod/lostpass.php:60
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:74 ../../boot.php:844
+#: ../../mod/lostpass.php:78 ../../boot.php:839
 msgid "Password Reset"
 msgstr ""
 
-#: ../../mod/lostpass.php:75
+#: ../../mod/lostpass.php:79
 msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../mod/lostpass.php:76
+#: ../../mod/lostpass.php:80
 msgid "Your new password is"
 msgstr ""
 
-#: ../../mod/lostpass.php:77
+#: ../../mod/lostpass.php:81
 msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../mod/lostpass.php:78
+#: ../../mod/lostpass.php:82
 msgid "click here to login"
 msgstr ""
 
-#: ../../mod/lostpass.php:79
+#: ../../mod/lostpass.php:83
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr ""
 
-#: ../../mod/lostpass.php:107
+#: ../../mod/lostpass.php:114
 msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../mod/lostpass.php:108
+#: ../../mod/lostpass.php:115
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr ""
 
-#: ../../mod/lostpass.php:109
+#: ../../mod/lostpass.php:116
 msgid "Nickname or Email: "
 msgstr ""
 
-#: ../../mod/lostpass.php:110
+#: ../../mod/lostpass.php:117
 msgid "Reset"
 msgstr ""
 
@@ -1216,11 +1230,11 @@ msgstr ""
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:216 ../../mod/settings.php:356
+#: ../../mod/settings.php:216 ../../mod/settings.php:357
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:217 ../../mod/settings.php:355
+#: ../../mod/settings.php:217 ../../mod/settings.php:356
 msgid "Account Settings"
 msgstr ""
 
@@ -1280,123 +1294,123 @@ msgstr ""
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:336 ../../mod/profile_photo.php:191
+#: ../../mod/settings.php:337 ../../mod/profile_photo.php:191
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:341
-msgid "Your profile address is"
+#: ../../mod/settings.php:342
+msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:351
+#: ../../mod/settings.php:352
 msgid "Export Personal Data"
 msgstr ""
 
-#: ../../mod/settings.php:357
+#: ../../mod/settings.php:358
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:358 ../../include/profile_advanced.php:10
+#: ../../mod/settings.php:359 ../../include/profile_advanced.php:10
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:359
+#: ../../mod/settings.php:360
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:360
+#: ../../mod/settings.php:361
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:361
+#: ../../mod/settings.php:362
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:362
+#: ../../mod/settings.php:363
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:363
+#: ../../mod/settings.php:364
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:365
+#: ../../mod/settings.php:366
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:366
+#: ../../mod/settings.php:367
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:367
+#: ../../mod/settings.php:368
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:368
+#: ../../mod/settings.php:369
 msgid "Allow friends to post to your profile page:"
 msgstr ""
 
-#: ../../mod/settings.php:369
+#: ../../mod/settings.php:370
 msgid "Automatically expire (delete) posts older than"
 msgstr ""
 
-#: ../../mod/settings.php:370 ../../include/datetime.php:154
+#: ../../mod/settings.php:371 ../../include/datetime.php:154
 msgid "days"
 msgstr ""
 
-#: ../../mod/settings.php:371
+#: ../../mod/settings.php:372
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:372
+#: ../../mod/settings.php:373
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:373
+#: ../../mod/settings.php:374
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:374
+#: ../../mod/settings.php:375
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:375
+#: ../../mod/settings.php:376
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:376
+#: ../../mod/settings.php:377
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:377
+#: ../../mod/settings.php:378
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:378
+#: ../../mod/settings.php:379
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:379
+#: ../../mod/settings.php:380
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:380
+#: ../../mod/settings.php:381
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:381
+#: ../../mod/settings.php:382
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:382
+#: ../../mod/settings.php:383
 msgid "Advanced Page Settings"
 msgstr ""
 
-#: ../../mod/settings.php:397
+#: ../../mod/settings.php:398
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:398
+#: ../../mod/settings.php:399
 msgid "(click to open/close)"
 msgstr ""
 
@@ -1484,7 +1498,7 @@ msgstr ""
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:277 ../../mod/register.php:445
+#: ../../mod/network.php:277 ../../mod/register.php:450
 #: ../../mod/profile.php:300 ../../mod/display.php:142
 msgid ""
 "Shared content is covered by the <a href=\"http://creativecommons.org/"
@@ -1567,7 +1581,7 @@ msgstr ""
 msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:17 ../../boot.php:1996
+#: ../../mod/viewcontacts.php:17 ../../boot.php:1997
 msgid "View Contacts"
 msgstr ""
 
@@ -1634,72 +1648,72 @@ msgstr ""
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/register.php:336
+#: ../../mod/register.php:339
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:340
+#: ../../mod/register.php:343
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:345
+#: ../../mod/register.php:348
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:368
+#: ../../mod/register.php:371
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:372
+#: ../../mod/register.php:377
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:420
+#: ../../mod/register.php:425
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:421
+#: ../../mod/register.php:426
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 
-#: ../../mod/register.php:422
+#: ../../mod/register.php:427
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:436
+#: ../../mod/register.php:441
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:452
+#: ../../mod/register.php:457
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:460
+#: ../../mod/register.php:465
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:461
+#: ../../mod/register.php:466
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:462
+#: ../../mod/register.php:467
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
-#: ../../mod/register.php:463
+#: ../../mod/register.php:468
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:466 ../../include/nav.php:62 ../../boot.php:827
+#: ../../mod/register.php:471 ../../include/nav.php:59 ../../boot.php:822
 msgid "Register"
 msgstr ""
 
@@ -1765,7 +1779,7 @@ msgstr ""
 msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/regmod.php:96
+#: ../../mod/regmod.php:99
 msgid "Account approved."
 msgstr ""
 
@@ -1788,37 +1802,37 @@ msgstr ""
 msgid "%s commented on your item at %s"
 msgstr ""
 
-#: ../../mod/item.php:497
+#: ../../mod/item.php:500
 #, php-format
 msgid "%s posted on your profile wall at %s"
 msgstr ""
 
-#: ../../mod/item.php:523
+#: ../../mod/item.php:530
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:541
+#: ../../mod/item.php:548
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendika social network."
 msgstr ""
 
-#: ../../mod/item.php:543
+#: ../../mod/item.php:550
 msgid "You may visit them online at"
 msgstr ""
 
-#: ../../mod/item.php:545
+#: ../../mod/item.php:552
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:547
+#: ../../mod/item.php:554
 #, php-format
 msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/item.php:598 ../../mod/display.php:20 ../../mod/display.php:137
+#: ../../mod/item.php:605 ../../mod/display.php:20 ../../mod/display.php:137
 msgid "Item not found."
 msgstr ""
 
@@ -1907,7 +1921,7 @@ msgstr ""
 msgid "Message could not be sent."
 msgstr ""
 
-#: ../../mod/message.php:125 ../../include/nav.php:106
+#: ../../mod/message.php:125 ../../include/nav.php:102
 msgid "Messages"
 msgstr ""
 
@@ -1943,7 +1957,7 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
-#: ../../mod/message.php:185 ../../mod/message.php:319 ../../mod/invite.php:59
+#: ../../mod/message.php:185 ../../mod/message.php:319 ../../mod/invite.php:63
 msgid "Your message:"
 msgstr ""
 
@@ -1971,7 +1985,7 @@ msgstr ""
 msgid "Send Reply"
 msgstr ""
 
-#: ../../mod/profile.php:8 ../../boot.php:2197
+#: ../../mod/profile.php:8 ../../boot.php:2198
 msgid "No profile"
 msgstr ""
 
@@ -1992,21 +2006,21 @@ msgstr ""
 msgid "Welcome back "
 msgstr ""
 
-#: ../../mod/follow.php:186
+#: ../../mod/follow.php:32 ../../wip/follow2.php:186
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../mod/follow.php:192
+#: ../../mod/follow.php:38 ../../wip/follow2.php:192
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 
-#: ../../mod/follow.php:247
+#: ../../mod/follow.php:89 ../../wip/follow2.php:247
 msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../mod/follow.php:293
+#: ../../mod/follow.php:135 ../../wip/follow2.php:293
 msgid "following"
 msgstr ""
 
@@ -2022,7 +2036,7 @@ msgstr ""
 msgid "New mail received at "
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:403 ../../mod/dfrn_notify.php:489
+#: ../../mod/dfrn_notify.php:403 ../../mod/dfrn_notify.php:493
 #, php-format
 msgid "%s commented on an item at %s"
 msgstr ""
@@ -2031,7 +2045,7 @@ msgstr ""
 msgid "Applications"
 msgstr ""
 
-#: ../../mod/search.php:21 ../../include/nav.php:73 ../../boot.php:2042
+#: ../../mod/search.php:21 ../../include/nav.php:71 ../../boot.php:2043
 msgid "Search"
 msgstr ""
 
@@ -2230,7 +2244,7 @@ msgstr ""
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:456 ../../include/nav.php:115
+#: ../../mod/profiles.php:456 ../../include/nav.php:109
 msgid "Profiles"
 msgstr ""
 
@@ -2280,36 +2294,36 @@ msgstr ""
 msgid "Please join my network on %s"
 msgstr ""
 
-#: ../../mod/invite.php:38
+#: ../../mod/invite.php:42
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../mod/invite.php:42
+#: ../../mod/invite.php:46
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/invite.php:57
+#: ../../mod/invite.php:61
 msgid "Send invitations"
 msgstr ""
 
-#: ../../mod/invite.php:58
+#: ../../mod/invite.php:62
 msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/invite.php:60
+#: ../../mod/invite.php:64
 #, php-format
 msgid "Please join my social network on %s"
 msgstr ""
 
-#: ../../mod/invite.php:61
+#: ../../mod/invite.php:65
 msgid "To accept this invitation, please visit:"
 msgstr ""
 
-#: ../../mod/invite.php:62
+#: ../../mod/invite.php:66
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr ""
@@ -2634,7 +2648,7 @@ msgstr ""
 msgid "Send public postings to Twitter"
 msgstr ""
 
-#: ../../include/profile_advanced.php:23 ../../boot.php:2276
+#: ../../include/profile_advanced.php:23 ../../boot.php:2277
 msgid "Gender:"
 msgstr ""
 
@@ -2658,7 +2672,7 @@ msgstr ""
 msgid "<span class=\"heart\">&hearts;</span> Status:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:103 ../../boot.php:2282
+#: ../../include/profile_advanced.php:103 ../../boot.php:2283
 msgid "Homepage:"
 msgstr ""
 
@@ -2978,43 +2992,39 @@ msgstr ""
 msgid "Everybody"
 msgstr ""
 
-#: ../../include/nav.php:39 ../../boot.php:855
+#: ../../include/nav.php:41 ../../boot.php:850
 msgid "Logout"
 msgstr ""
 
-#: ../../include/nav.php:45 ../../boot.php:835 ../../boot.php:841
+#: ../../include/nav.php:44 ../../boot.php:830 ../../boot.php:836
 msgid "Login"
 msgstr ""
 
-#: ../../include/nav.php:57 ../../include/nav.php:97
+#: ../../include/nav.php:55 ../../include/nav.php:93
 msgid "Home"
 msgstr ""
 
-#: ../../include/nav.php:67
-msgid "Help"
-msgstr ""
-
-#: ../../include/nav.php:70
+#: ../../include/nav.php:68
 msgid "Apps"
 msgstr ""
 
-#: ../../include/nav.php:83
+#: ../../include/nav.php:81
 msgid "Directory"
 msgstr ""
 
-#: ../../include/nav.php:93
+#: ../../include/nav.php:91
 msgid "Network"
 msgstr ""
 
-#: ../../include/nav.php:102
+#: ../../include/nav.php:99
 msgid "Notifications"
 msgstr ""
 
-#: ../../include/nav.php:110
+#: ../../include/nav.php:105
 msgid "Manage"
 msgstr ""
 
-#: ../../include/nav.php:113
+#: ../../include/nav.php:108
 msgid "Settings"
 msgstr ""
 
@@ -3138,57 +3148,57 @@ msgstr ""
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/conversation.php:517
+#: ../../include/conversation.php:520
 msgid "View status"
 msgstr ""
 
-#: ../../include/conversation.php:518
+#: ../../include/conversation.php:521
 msgid "View profile"
 msgstr ""
 
-#: ../../include/conversation.php:519
+#: ../../include/conversation.php:522
 msgid "View photos"
 msgstr ""
 
-#: ../../include/conversation.php:521
+#: ../../include/conversation.php:524
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/conversation.php:571
+#: ../../include/conversation.php:574
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:571
+#: ../../include/conversation.php:574
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:575
+#: ../../include/conversation.php:578
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:577
+#: ../../include/conversation.php:580
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:583
+#: ../../include/conversation.php:586
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:586
+#: ../../include/conversation.php:589
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:587
+#: ../../include/conversation.php:590
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:587
+#: ../../include/conversation.php:590
 #, php-format
 msgid "%s don't like this."
 msgstr ""
@@ -3197,170 +3207,170 @@ msgstr ""
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:826
+#: ../../boot.php:821
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:833
+#: ../../boot.php:828
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:834
+#: ../../boot.php:829
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:839
+#: ../../boot.php:834
 msgid "Nickname/Email/OpenID: "
 msgstr ""
 
-#: ../../boot.php:840
+#: ../../boot.php:835
 msgid "Password (if not OpenID): "
 msgstr ""
 
-#: ../../boot.php:843
+#: ../../boot.php:838
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1096
+#: ../../boot.php:1091
 msgid "prev"
 msgstr ""
 
-#: ../../boot.php:1098
+#: ../../boot.php:1093
 msgid "first"
 msgstr ""
 
-#: ../../boot.php:1127
+#: ../../boot.php:1122
 msgid "last"
 msgstr ""
 
-#: ../../boot.php:1130
+#: ../../boot.php:1125
 msgid "next"
 msgstr ""
 
-#: ../../boot.php:1983
+#: ../../boot.php:1984
 msgid "No contacts"
 msgstr ""
 
-#: ../../boot.php:1991
+#: ../../boot.php:1992
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../boot.php:2254
+#: ../../boot.php:2255
 msgid "Connect"
 msgstr ""
 
-#: ../../boot.php:2264
+#: ../../boot.php:2265
 msgid "Location:"
 msgstr ""
 
-#: ../../boot.php:2268
+#: ../../boot.php:2269
 msgid ", "
 msgstr ""
 
-#: ../../boot.php:2280
+#: ../../boot.php:2281
 msgid "Status:"
 msgstr ""
 
-#: ../../boot.php:2373
+#: ../../boot.php:2374
 msgid "Monday"
 msgstr ""
 
-#: ../../boot.php:2373
+#: ../../boot.php:2374
 msgid "Tuesday"
 msgstr ""
 
-#: ../../boot.php:2373
+#: ../../boot.php:2374
 msgid "Wednesday"
 msgstr ""
 
-#: ../../boot.php:2373
+#: ../../boot.php:2374
 msgid "Thursday"
 msgstr ""
 
-#: ../../boot.php:2373
+#: ../../boot.php:2374
 msgid "Friday"
 msgstr ""
 
-#: ../../boot.php:2373
+#: ../../boot.php:2374
 msgid "Saturday"
 msgstr ""
 
-#: ../../boot.php:2373
+#: ../../boot.php:2374
 msgid "Sunday"
 msgstr ""
 
-#: ../../boot.php:2377
+#: ../../boot.php:2378
 msgid "January"
 msgstr ""
 
-#: ../../boot.php:2377
+#: ../../boot.php:2378
 msgid "February"
 msgstr ""
 
-#: ../../boot.php:2377
+#: ../../boot.php:2378
 msgid "March"
 msgstr ""
 
-#: ../../boot.php:2377
+#: ../../boot.php:2378
 msgid "April"
 msgstr ""
 
-#: ../../boot.php:2377
+#: ../../boot.php:2378
 msgid "May"
 msgstr ""
 
-#: ../../boot.php:2377
+#: ../../boot.php:2378
 msgid "June"
 msgstr ""
 
-#: ../../boot.php:2377
+#: ../../boot.php:2378
 msgid "July"
 msgstr ""
 
-#: ../../boot.php:2377
+#: ../../boot.php:2378
 msgid "August"
 msgstr ""
 
-#: ../../boot.php:2377
+#: ../../boot.php:2378
 msgid "September"
 msgstr ""
 
-#: ../../boot.php:2377
+#: ../../boot.php:2378
 msgid "October"
 msgstr ""
 
-#: ../../boot.php:2377
+#: ../../boot.php:2378
 msgid "November"
 msgstr ""
 
-#: ../../boot.php:2377
+#: ../../boot.php:2378
 msgid "December"
 msgstr ""
 
-#: ../../boot.php:2392
+#: ../../boot.php:2393
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:2409
+#: ../../boot.php:2410
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:2410
+#: ../../boot.php:2411
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:2411
+#: ../../boot.php:2412
 msgid "(Adjusted for local time)"
 msgstr ""
 
-#: ../../boot.php:2422
+#: ../../boot.php:2423
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:2619
+#: ../../boot.php:2624
 msgid "link to source"
 msgstr ""
 
diff --git a/util/strings.php b/util/strings.php
index 42615fb5d..5a8c0f649 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -209,17 +209,18 @@ $a->strings['Confirm'] = 'Confirm';
 $a->strings['[Name Withheld]'] = '[Name Withheld]';
 $a->strings["Introduction received at "] = "Introduction received at ";
 $a->strings['Friend/Connection Request'] = 'Friend/Connection Request';
+$a->strings['Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'] = 'Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca';
 $a->strings['Please answer the following:'] = 'Please answer the following:';
 $a->strings['Does $name know you?'] = 'Does $name know you?';
 $a->strings['Yes'] = 'Yes';
 $a->strings['No'] = 'No';
 $a->strings['Add a personal note:'] = 'Add a personal note:';
-$a->strings['Please enter your profile address from one of the following supported social networks:'] = 'Please enter your profile address from one of the following supported social networks:';
+$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Please enter your 'Identity Address' from one of the following supported social networks:";
 $a->strings['Friendika'] = 'Friendika';
 $a->strings['StatusNet/Federated Social Web'] = 'StatusNet/Federated Social Web';
 $a->strings["Private \x28secure\x29 network"] = "Private \x28secure\x29 network";
 $a->strings["Public \x28insecure\x29 network"] = "Public \x28insecure\x29 network";
-$a->strings['Your profile address:'] = 'Your profile address:';
+$a->strings['Your Identity Address:'] = 'Your Identity Address:';
 $a->strings['Submit Request'] = 'Submit Request';
 $a->strings['Cancel'] = 'Cancel';
 $a->strings["%d required parameter was not found at the given location"] = array(
@@ -261,6 +262,8 @@ $a->strings['Click on a contact to add or remove.'] = 'Click on a contact to add
 $a->strings['Group Editor'] = 'Group Editor';
 $a->strings['Members'] = 'Members';
 $a->strings['All Contacts'] = 'All Contacts';
+$a->strings['Help:'] = 'Help:';
+$a->strings['Help'] = 'Help';
 $a->strings["Welcome to %s"] = "Welcome to %s";
 $a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.';
 $a->strings['Connected to database.'] = 'Connected to database.';
@@ -314,7 +317,6 @@ $a->strings['Unable to locate original post.'] = 'Unable to locate original post
 $a->strings['Empty post discarded.'] = 'Empty post discarded.';
 $a->strings['Wall Photos'] = 'Wall Photos';
 $a->strings["%s commented on your item at %s"] = "%s commented on your item at %s";
-$a->strings["Administrator"] = "Administrator";
 $a->strings["%s posted on your profile wall at %s"] = "%s posted on your profile wall at %s";
 $a->strings['System error. Post not saved.'] = 'System error. Post not saved.';
 $a->strings['You may visit them online at'] = 'You may visit them online at';
@@ -551,7 +553,7 @@ $a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."
 $a->strings['Publish your default profile in site directory?'] = 'Publish your default profile in site directory?';
 $a->strings['Publish your default profile in global social directory?'] = 'Publish your default profile in global social directory?';
 $a->strings['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.';
-$a->strings['Your profile address is'] = 'Your profile address is';
+$a->strings['Your Identity Address is'] = 'Your Identity Address is';
 $a->strings['Export Personal Data'] = 'Export Personal Data';
 $a->strings['Basic Settings'] = 'Basic Settings';
 $a->strings['Full Name:'] = 'Full Name:';
@@ -637,11 +639,9 @@ $a->strings['Create a new group'] = 'Create a new group';
 $a->strings['Everybody'] = 'Everybody';
 $a->strings['Birthday:'] = 'Birthday:';
 $a->strings['Home'] = 'Home';
-$a->strings['Help'] = 'Help';
 $a->strings['Apps'] = 'Apps';
 $a->strings['Directory'] = 'Directory';
 $a->strings['Network'] = 'Network';
-$a->strings['Notifications'] = 'Notifications';
 $a->strings['Manage'] = 'Manage';
 $a->strings['Settings'] = 'Settings';
 $a->strings['Embedding disabled'] = 'Embedding disabled';
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index 9cb1e8749..034da332d 100644
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -7,6 +7,7 @@ $page_desc<br />
 <li><a href="http://friendika.com" title="$private_net">$friendika</a> <img src="images/lock_icon.gif" alt="$private_net" title="$private_net" /></li>
 <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a> <img src="images/unlock_icon.gif" alt="$public_net" title="$public_net"/></li>
 </ul>
+$desc
 </p>
 
 <form action="dfrn_request/$nickname" method="post" />
diff --git a/view/es/cmnt_received_eml.tpl b/view/es/cmnt_received_eml.tpl
new file mode 100644
index 000000000..abf2d95df
--- /dev/null
+++ b/view/es/cmnt_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Estimado/a $username,
+
+	'$from' ha comentado un elemento/conversación que estás siguiendo.
+
+-----
+$body
+-----
+
+Accede a $siteurl para ver la conversación completa:
+
+$display
+
+
+	$sitename
+
+ 
+
diff --git a/view/es/follow_notify_eml.tpl b/view/es/follow_notify_eml.tpl
new file mode 100644
index 000000000..17bd2c01c
--- /dev/null
+++ b/view/es/follow_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Estimado/a $myname,
+
+Tienes un nuevo seguidor en $sitename -  '$requestor'.
+
+Puedes visitar su perfil en $url.
+
+Inicie sesión en su sitio para aprobar o rechazar/cancelar la solicitud.
+
+$siteurl
+
+
+	$sitename 
diff --git a/view/es/friend_complete_eml.tpl b/view/es/friend_complete_eml.tpl
new file mode 100644
index 000000000..0dc867efd
--- /dev/null
+++ b/view/es/friend_complete_eml.tpl
@@ -0,0 +1,19 @@
+
+Estimado/a $username,
+
+	Grandes noticias... '$fn' a '$dfrn_url' ha aceptado tu solicitud de conexión en '$sitename'.
+
+Ahora sois amigos mutuos y podreis intercambiar actualizaciones de estado, fotos, y correo electrónico
+sin restricción alguna.
+
+Visita tu página de 'Contactos' en $sitename si desear realizar cualquier cambio en esta relación.
+
+$siteurl
+
+[Por ejemplo, puedes crear un perfil independiente con información que no está disponible al público en general 
+- y asignar derechos de visualización a '$fn'].
+
+
+	$sitename
+
+ 
diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl
new file mode 100644
index 000000000..180f7885c
--- /dev/null
+++ b/view/es/htconfig.tpl
@@ -0,0 +1,73 @@
+<?php
+
+// Set the following for your MySQL installation
+// Copy or rename this file to .htconfig.php
+
+$db_host = '$dbhost';
+$db_user = '$dbuser';
+$db_pass = '$dbpass';
+$db_data = '$dbdata';
+
+// If you are using a subdirectory of your domain you will need to put the
+// relative path (from the root of your domain) here.
+// For instance if your URL is 'http://example.com/directory/subdirectory',
+// set $a->path to 'directory/subdirectory'. 
+
+$a->path = '$urlpath';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '$timezone';
+
+// What is your site name?
+
+$a->config['sitename'] = "La Mia Rete di Amici";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 10000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '$phpath';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
+// Addons or plugins are configured here.
+// This is a comma seperated list of addons to enable. Example:
+// $a->config['system']['addon'] = 'js_upload,randplace,oembed';
+
+$a->config['system']['addon'] = 'js_upload';
diff --git a/view/es/intro_complete_eml.tpl b/view/es/intro_complete_eml.tpl
new file mode 100644
index 000000000..a2964808c
--- /dev/null
+++ b/view/es/intro_complete_eml.tpl
@@ -0,0 +1,21 @@
+
+Estimado/a $username,
+
+	'$fn' en '$dfrn_url' ha aceptado tu petición
+conexión a '$sitename'.
+
+	'$fn' ha optado por aceptarte come "fan", que restringe ciertas 
+formas de comunicación, como mensajes privados y algunas interacciones 
+con el perfil. Si eres una "celebridad" o una página de comunidad, 
+estos ajustes se aplican automáticamente 
+
+	'$fn' puede optar por extender esto en una relación más permisiva
+en el futuro.
+
+	Empezarás a recibir las actualizaciones públicas de estado de '$fn', 
+que aparecerán en tu página "Red" en
+
+$siteurl
+
+
+	$sitename
diff --git a/view/es/lostpass_eml.tpl b/view/es/lostpass_eml.tpl
new file mode 100644
index 000000000..607744bfe
--- /dev/null
+++ b/view/es/lostpass_eml.tpl
@@ -0,0 +1,34 @@
+
+Estimado/a $username,
+	
+	Se ha recibido una solicitud en $sitename recientemente para restablecer
+tu contraseña. Para confirmar esta solicitud, por favor seleccione el enlace de
+verificación debajo o cópialo y pégalo en la barra de direcciones de tu navegador.
+
+Se NO has solicitado este cambio, por favor NO sigas el enlace indicado e ignora
+y/o elimina este mensaje.
+
+Tu contraseña no se cambiará a menos que podamos verificar que eres tu quien
+emitió esta solicitud.
+
+Sigue este enlace para verificar tu identidad:
+
+$reset_link
+
+A continuación recibirás un mensaje con la nueva contraseña.
+
+Despues de accceder, podrás cambiar la contraseña de tu cuenta en la página de 
+configuración.
+
+Los datos de acceso son los siguientes:
+
+Sitio:	$siteurl
+Nombre:	$email
+
+
+
+
+Saludos,
+	La administración de $sitename
+
+ 
diff --git a/view/es/mail_received_html_body_eml.tpl b/view/es/mail_received_html_body_eml.tpl
new file mode 100644
index 000000000..5086ec246
--- /dev/null
+++ b/view/es/mail_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>Mensaje de Friendika</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendika</span></td></tr>
+
+	<tr><td style="padding-top:22px;" colspan="2">Has recibido un nuevo mensaje privado de '$from' en $siteName.</td></tr>
+
+
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
+	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Accede a <a href="$siteurl">$siteurl</a> para leer y responder a tus mensajes privados.</td></tr>
+	<tr><td></td><td>$siteName</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
diff --git a/view/es/mail_received_text_body_eml.tpl b/view/es/mail_received_text_body_eml.tpl
new file mode 100644
index 000000000..8400b9d01
--- /dev/null
+++ b/view/es/mail_received_text_body_eml.tpl
@@ -0,0 +1,9 @@
+Has recibido un nuevo mensaje privado de '$from' en $siteName.
+	
+$title
+
+$textversion
+				
+Accede a $siteurl para leer y responder a tus mensajes privados.
+
+	$siteName
diff --git a/view/es/messages.po b/view/es/messages.po
new file mode 100644
index 000000000..e978ddf93
--- /dev/null
+++ b/view/es/messages.po
@@ -0,0 +1,2636 @@
+# FRIENDIKA Distribuited Social Network
+# Copyright (C) 2010, 2011 Mike Macgirvin
+# This file is distributed under the same license as the Friendika package.
+# Mike Macgirvin, 2010
+# David Martín Miranda, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 2.1.921\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-23 13:48+0100\n"
+"PO-Revision-Date: 2011-04-14 11:18+0200\n"
+"Last-Translator: David Martín Miranda\n"
+"Language-Team: Español\n"
+"Language: Es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Language: es_ES\n"
+"X-Source-Language: C\n"
+
+#: ../../index.php:187 ../../index.php:194
+msgid "Not Found"
+msgstr "No se ha encontrado"
+
+#: ../../index.php:188 ../../index.php:195
+msgid "Page not found."
+msgstr "Página no encontrada."
+
+#: ../../index.php:243 ../../mod/group.php:88 ../../index.php:250
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: ../../index.php:244 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
+#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:139
+#: ../../mod/profile_photo.php:150 ../../mod/regmod.php:16
+#: ../../mod/profiles.php:7 ../../mod/profiles.php:224
+#: ../../mod/settings.php:14 ../../mod/settings.php:19
+#: ../../mod/settings.php:206 ../../mod/photos.php:85 ../../mod/photos.php:772
+#: ../../mod/display.php:303 ../../mod/invite.php:13 ../../mod/invite.php:50
+#: ../../mod/contacts.php:101 ../../mod/register.php:25
+#: ../../mod/network.php:6 ../../mod/notifications.php:56
+#: ../../mod/item.php:57 ../../mod/item.php:616 ../../mod/message.php:8
+#: ../../mod/message.php:116 ../../mod/dfrn_confirm.php:53
+#: ../../mod/viewcontacts.php:13 ../../mod/group.php:19
+#: ../../addon/facebook/facebook.php:110 ../../index.php:251
+#: ../../mod/profiles.php:227 ../../mod/settings.php:208
+#: ../../mod/photos.php:773 ../../mod/display.php:308
+#: ../../mod/editpost.php:10 ../../mod/item.php:668
+msgid "Permission denied."
+msgstr "Permiso denegado."
+
+#: ../../boot.php:808
+msgid "Create a New Account"
+msgstr "Crear una nueva cuenta"
+
+#: ../../boot.php:809 ../../mod/register.php:443 ../../include/nav.php:61
+#: ../../mod/register.php:445
+msgid "Register"
+msgstr "Registrarse"
+
+#: ../../boot.php:815
+msgid "Nickname or Email address: "
+msgstr "Apodo o dirección de email: "
+
+#: ../../boot.php:816
+msgid "Password: "
+msgstr "Contraseña: "
+
+#: ../../boot.php:817 ../../boot.php:823 ../../include/nav.php:44
+msgid "Login"
+msgstr "Acceder"
+
+#: ../../boot.php:821
+msgid "Nickname/Email/OpenID: "
+msgstr "Apodo/Email/OpenID: "
+
+#: ../../boot.php:822
+msgid "Password (if not OpenID): "
+msgstr "Contraseña (si no OpenID): "
+
+#: ../../boot.php:825
+msgid "Forgot your password?"
+msgstr "¿Olvidó la contraseña?"
+
+#: ../../boot.php:826
+msgid "Password Reset"
+msgstr "Resetear la contraseña"
+
+#: ../../boot.php:837 ../../include/nav.php:38
+msgid "Logout"
+msgstr "Salir"
+
+#: ../../boot.php:1077
+msgid "prev"
+msgstr "ant"
+
+#: ../../boot.php:1079
+msgid "first"
+msgstr "primera"
+
+#: ../../boot.php:1108
+msgid "last"
+msgstr "última"
+
+#: ../../boot.php:1111
+msgid "next"
+msgstr "sig"
+
+#: ../../boot.php:1831
+#, php-format
+msgid "%s likes this."
+msgstr "A %s le gusta esto."
+
+#: ../../boot.php:1831
+#, php-format
+msgid "%s doesn't like this."
+msgstr "A %s no le gusta esto."
+
+#: ../../boot.php:1835 ../../test.php:8
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgstr "Le gusta a <span %1$s>%2$d personas</span>."
+
+#: ../../boot.php:1837
+#, 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>."
+
+#: ../../boot.php:1843
+msgid "and"
+msgstr "y"
+
+#: ../../boot.php:1846
+#, php-format
+msgid ", and %d other people"
+msgstr ", y otras %d personas"
+
+#: ../../boot.php:1847
+#, php-format
+msgid "%s like this."
+msgstr "Le gusta a %s."
+
+#: ../../boot.php:1847
+#, php-format
+msgid "%s don't like this."
+msgstr "No le gusta a %s."
+
+#: ../../boot.php:2008
+msgid "No contacts"
+msgstr "Nigún contacto"
+
+#: ../../boot.php:2016 ../../mod/contacts.php:303
+#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
+#: ../../include/nav.php:111
+msgid "Contacts"
+msgstr "Contactos"
+
+#: ../../boot.php:2032 ../../mod/viewcontacts.php:17
+msgid "View Contacts"
+msgstr "Ver contactos"
+
+#: ../../boot.php:2049 ../../mod/search.php:17 ../../include/nav.php:67
+msgid "Search"
+msgstr "Busca"
+
+#: ../../boot.php:2204 ../../mod/profile.php:8
+msgid "No profile"
+msgstr "Nigún perfil"
+
+#: ../../boot.php:2261
+msgid "Connect"
+msgstr "Conecta"
+
+#: ../../boot.php:2271
+msgid "Location:"
+msgstr "Ubicación:"
+
+#: ../../boot.php:2275
+msgid ", "
+msgstr ", "
+
+#: ../../boot.php:2283
+msgid "Gender:"
+msgstr "Género:"
+
+#: ../../boot.php:2287
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../../boot.php:2289
+msgid "Homepage:"
+msgstr "Página web:"
+
+#: ../../boot.php:2380
+msgid "Monday"
+msgstr "Lunes"
+
+#: ../../boot.php:2380
+msgid "Tuesday"
+msgstr "Martes"
+
+#: ../../boot.php:2380
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#: ../../boot.php:2380
+msgid "Thursday"
+msgstr "Jueves"
+
+#: ../../boot.php:2380
+msgid "Friday"
+msgstr "Viernes"
+
+#: ../../boot.php:2380
+msgid "Saturday"
+msgstr "Sábado"
+
+#: ../../boot.php:2380
+msgid "Sunday"
+msgstr "Domingo"
+
+#: ../../boot.php:2384
+msgid "January"
+msgstr "Enero"
+
+#: ../../boot.php:2384
+msgid "February"
+msgstr "Febrero"
+
+#: ../../boot.php:2384
+msgid "March"
+msgstr "Marzo"
+
+#: ../../boot.php:2384
+msgid "April"
+msgstr "Abril"
+
+#: ../../boot.php:2384
+msgid "May"
+msgstr "Mayo"
+
+#: ../../boot.php:2384
+msgid "June"
+msgstr "Junio"
+
+#: ../../boot.php:2384
+msgid "July"
+msgstr "Julio"
+
+#: ../../boot.php:2384
+msgid "August"
+msgstr "Agosto"
+
+#: ../../boot.php:2384
+msgid "September"
+msgstr "Septiembre"
+
+#: ../../boot.php:2384
+msgid "October"
+msgstr "Octubre"
+
+#: ../../boot.php:2384
+msgid "November"
+msgstr "Noviembre"
+
+#: ../../boot.php:2384
+msgid "December"
+msgstr "Diciembre"
+
+#: ../../boot.php:2413 ../../boot.php:2419
+msgid "Birthdays this week:"
+msgstr "Cumpleaños esta semana:"
+
+#: ../../boot.php:2414 ../../boot.php:2420
+msgid "(Adjusted for local time)"
+msgstr "(Convertido a la hora local)"
+
+#: ../../boot.php:2423 ../../boot.php:2431
+msgid "[today]"
+msgstr "[hoy]"
+
+#: ../../boot.php:2620 ../../boot.php:2628
+msgid "link to source"
+msgstr "Enlace al original"
+
+#: ../../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 "Seleccione una identidad a gestionar:"
+
+#: ../../mod/manage.php:106 ../../mod/photos.php:800 ../../mod/photos.php:857
+#: ../../mod/photos.php:1032 ../../mod/invite.php:64 ../../mod/install.php:109
+#: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175
+#: ../../addon/statusnet/statusnet.php:163
+#: ../../addon/statusnet/statusnet.php:189
+#: ../../addon/statusnet/statusnet.php:207
+#: ../../addon/facebook/facebook.php:151
+#: ../../addon/randplace/randplace.php:179 ../../mod/photos.php:801
+#: ../../mod/photos.php:858 ../../mod/photos.php:1066
+msgid "Submit"
+msgstr "Envia"
+
+#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:109
+#, 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:118
+#: ../../mod/photos.php:570 ../../mod/photos.php:571
+msgid "Unable to process image."
+msgstr "Imposible procesar la imagen."
+
+#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
+#: ../../mod/wall_upload.php:95 ../../mod/item.php:184
+#: ../../mod/message.php:93 ../../mod/item.php:212
+msgid "Wall Photos"
+msgstr "Foto del Muro"
+
+#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:230
+#: ../../mod/photos.php:588 ../../mod/photos.php:589
+msgid "Image upload failed."
+msgstr "Subida de imagen fallida."
+
+#: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:389
+#: ../../mod/regmod.php:93 ../../mod/register.php:311
+#: ../../mod/register.php:348 ../../mod/dfrn_request.php:545
+#: ../../mod/lostpass.php:39 ../../mod/item.php:423
+#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1350
+#: ../../mod/dfrn_notify.php:475 ../../mod/item.php:475 ../../mod/item.php:498
+#: ../../include/items.php:1373
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../../mod/dfrn_notify.php:179
+msgid "noreply"
+msgstr "no-responder"
+
+#: ../../mod/dfrn_notify.php:237
+msgid "New mail received at "
+msgstr "Nuevo correo recibido en "
+
+#: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474
+#, php-format
+msgid "%s commented on an item at %s"
+msgstr "%s ha commentato un elemento en %s"
+
+#: ../../mod/profile.php:151 ../../mod/network.php:91
+#: ../../mod/profile.php:156 ../../mod/profile.php:317
+#: ../../mod/photos.php:1086 ../../mod/display.php:158
+#: ../../mod/network.php:370
+msgid "Share"
+msgstr "Compartir"
+
+#: ../../mod/profile.php:152 ../../mod/network.php:92
+#: ../../mod/message.php:185 ../../mod/message.php:319
+#: ../../mod/profile.php:157 ../../mod/editpost.php:63
+msgid "Upload photo"
+msgstr "Subir foto"
+
+#: ../../mod/profile.php:153 ../../mod/network.php:93
+#: ../../mod/message.php:186 ../../mod/message.php:320
+#: ../../mod/profile.php:158 ../../mod/editpost.php:64
+msgid "Insert web link"
+msgstr "Insertar enlace web"
+
+#: ../../mod/profile.php:154 ../../mod/network.php:94
+#: ../../mod/profile.php:159 ../../mod/editpost.php:65
+msgid "Insert YouTube video"
+msgstr "Insertar video de YouTube"
+
+#: ../../mod/profile.php:155 ../../mod/network.php:95
+#: ../../mod/profile.php:162 ../../mod/editpost.php:68
+#: ../../mod/network.php:97
+msgid "Set your location"
+msgstr "Configura la tu ubicación"
+
+#: ../../mod/profile.php:156 ../../mod/network.php:96
+#: ../../mod/profile.php:163 ../../mod/editpost.php:69
+#: ../../mod/network.php:98
+msgid "Clear browser location"
+msgstr "Borrar la ubicación del navegador"
+
+#: ../../mod/profile.php:157 ../../mod/profile.php:309
+#: ../../mod/photos.php:1052 ../../mod/display.php:158
+#: ../../mod/network.php:97 ../../mod/network.php:367
+#: ../../mod/message.php:187 ../../mod/message.php:321
+#: ../../mod/profile.php:164 ../../mod/profile.php:318
+#: ../../mod/photos.php:1087 ../../mod/display.php:159
+#: ../../mod/editpost.php:70 ../../mod/network.php:99
+#: ../../mod/network.php:371
+msgid "Please wait"
+msgstr "Por favor, espere"
+
+#: ../../mod/profile.php:158 ../../mod/network.php:98
+#: ../../mod/profile.php:165 ../../mod/editpost.php:71
+#: ../../mod/network.php:100
+msgid "Permission settings"
+msgstr "Configuración de permisos"
+
+#: ../../mod/profile.php:165 ../../mod/network.php:104
+#: ../../mod/profile.php:172 ../../mod/editpost.php:77
+#: ../../mod/network.php:106
+msgid "CC: email addresses"
+msgstr "CC: dirección email"
+
+#: ../../mod/profile.php:167 ../../mod/network.php:106
+#: ../../mod/profile.php:174 ../../mod/editpost.php:79
+#: ../../mod/network.php:108
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com"
+
+#: ../../mod/profile.php:300 ../../mod/photos.php:935
+#: ../../mod/display.php:149 ../../mod/network.php:321
+#: ../../mod/profile.php:308 ../../mod/photos.php:962
+#: ../../mod/network.php:324
+msgid "Private Message"
+msgstr "Mensaje privado"
+
+#: ../../mod/profile.php:307 ../../mod/photos.php:1050
+#: ../../mod/display.php:156 ../../mod/network.php:365
+#: ../../mod/profile.php:315 ../../mod/photos.php:1084
+#: ../../mod/network.php:368
+msgid "I like this (toggle)"
+msgstr "Me gusta esto (cambiar)"
+
+#: ../../mod/profile.php:308 ../../mod/photos.php:1051
+#: ../../mod/display.php:157 ../../mod/network.php:366
+#: ../../mod/profile.php:316 ../../mod/photos.php:1085
+#: ../../mod/network.php:369
+msgid "I don't like this (toggle)"
+msgstr "No me gusta questo (cambiar)"
+
+#: ../../mod/profile.php:321 ../../mod/photos.php:1071
+#: ../../mod/photos.php:1111 ../../mod/photos.php:1140
+#: ../../mod/display.php:170 ../../mod/network.php:380
+#: ../../mod/profile.php:330 ../../mod/photos.php:1106
+#: ../../mod/photos.php:1146 ../../mod/photos.php:1175
+#: ../../mod/display.php:171 ../../mod/network.php:384
+msgid "This is you"
+msgstr "Éste/a eres tú"
+
+#: ../../mod/profile.php:361 ../../mod/photos.php:1168
+#: ../../mod/display.php:234 ../../mod/network.php:386 ../../mod/group.php:137
+#: ../../mod/profile.php:376 ../../mod/photos.php:1203
+#: ../../mod/display.php:238 ../../mod/network.php:393
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../../mod/profile.php:382 ../../mod/search.php:116
+#: ../../mod/display.php:258 ../../mod/network.php:272
+#: ../../mod/network.php:434 ../../mod/profile.php:397
+#: ../../mod/display.php:262 ../../mod/network.php:275
+#: ../../mod/network.php:441
+msgid "View $name's profile"
+msgstr "Ver el perfil de $name"
+
+#: ../../mod/profile.php:414 ../../mod/display.php:312
+#: ../../mod/register.php:422 ../../mod/network.php:471
+#: ../../mod/profile.php:430 ../../mod/display.php:317
+#: ../../mod/register.php:424 ../../mod/network.php:479
+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>."
+
+#: ../../mod/follow.php:167
+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:173
+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 usted."
+
+#: ../../mod/follow.php:224
+msgid "Unable to retrieve contact information."
+msgstr "No ha sido posible recibir la información del contacto."
+
+#: ../../mod/follow.php:270
+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:155
+#: ../../mod/profile_photo.php:225 ../../mod/profile_photo.php:234
+#: ../../mod/photos.php:106 ../../mod/photos.php:530 ../../mod/photos.php:849
+#: ../../mod/photos.php:864 ../../mod/register.php:267
+#: ../../mod/register.php:274 ../../mod/register.php:281
+#: ../../mod/photos.php:531 ../../mod/photos.php:850 ../../mod/photos.php:865
+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:237
+#, 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:95
+msgid "Unable to process image"
+msgstr "Imposible procesar la imagen"
+
+#: ../../mod/profile_photo.php:228
+msgid "Image uploaded successfully."
+msgstr "Imagen subida con éxito."
+
+#: ../../mod/home.php:23
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bienvenido a %s"
+
+#: ../../mod/regmod.php:10
+msgid "Please login."
+msgstr "Accede."
+
+#: ../../mod/regmod.php:54
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registro anulado para %s"
+
+#: ../../mod/regmod.php:92 ../../mod/register.php:310
+#, php-format
+msgid "Registration details for %s"
+msgstr "Detalles de registro para %s"
+
+#: ../../mod/regmod.php:96
+msgid "Account approved."
+msgstr "Cuenta aprobada."
+
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:234
+#: ../../mod/profiles.php:339 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:237 ../../mod/profiles.php:342
+msgid "Profile not found."
+msgstr "Perfil no encontrado."
+
+#: ../../mod/profiles.php:28
+msgid "Profile Name is required."
+msgstr "El nombre de perfil es requerido."
+
+#: ../../mod/profiles.php:196 ../../mod/profiles.php:199
+msgid "Profile updated."
+msgstr "Perfil actualizado."
+
+#: ../../mod/profiles.php:251 ../../mod/profiles.php:254
+msgid "Profile deleted."
+msgstr "Perfil eliminado."
+
+#: ../../mod/profiles.php:267 ../../mod/profiles.php:298
+#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
+msgid "Profile-"
+msgstr "Perfil-"
+
+#: ../../mod/profiles.php:286 ../../mod/profiles.php:325
+#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
+msgid "New profile created."
+msgstr "Nuevo perfil creado."
+
+#: ../../mod/profiles.php:304 ../../mod/profiles.php:307
+msgid "Profile unavailable to clone."
+msgstr "Imposible duplicar el perfil."
+
+#: ../../mod/profiles.php:367 ../../mod/profiles.php:370
+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:377 ../../mod/profiles.php:380
+msgid "Age: "
+msgstr "Edad : "
+
+#: ../../mod/profiles.php:418 ../../mod/profiles.php:422
+msgid "Profile Image"
+msgstr "Imagen del Perfil"
+
+#: ../../mod/settings.php:37
+msgid "Passwords do not match. Password unchanged."
+msgstr "Las contraseñas no coinciden. La contraseña no ha sido modificada."
+
+#: ../../mod/settings.php:42
+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:53
+msgid "Password changed."
+msgstr "Contraseña modificada."
+
+#: ../../mod/settings.php:55
+msgid "Password update failed. Please try again."
+msgstr ""
+"La actualización de la contraseña ha fallado. Por favor, pruebe otra vez."
+
+#: ../../mod/settings.php:95 ../../mod/settings.php:96
+msgid " Please use a shorter name."
+msgstr " Usa un nombre más corto."
+
+#: ../../mod/settings.php:97 ../../mod/settings.php:98
+msgid " Name too short."
+msgstr " Nombre demasiado corto."
+
+#: ../../mod/settings.php:103 ../../mod/settings.php:104
+msgid " Not valid email."
+msgstr " Email no válido."
+
+#: ../../mod/settings.php:105 ../../mod/settings.php:106
+msgid " Cannot change to that email."
+msgstr " No se puede usar ese email."
+
+#: ../../mod/settings.php:161 ../../mod/settings.php:163
+msgid "Settings updated."
+msgstr "Configuración actualizada."
+
+#: ../../mod/settings.php:211 ../../mod/settings.php:213
+msgid "Plugin Settings"
+msgstr "Configuración de los Plugin"
+
+#: ../../mod/settings.php:212 ../../mod/settings.php:214
+msgid "Account Settings"
+msgstr "Configuración de la cuenta"
+
+#: ../../mod/settings.php:218 ../../mod/settings.php:220
+msgid "No Plugin settings configured"
+msgstr "Ningún Plugin ha sido configurado"
+
+#: ../../mod/settings.php:263 ../../mod/settings.php:266
+msgid "OpenID: "
+msgstr "OpenID: "
+
+#: ../../mod/settings.php:263 ../../mod/settings.php:266
+msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
+msgstr "&nbsp;(Opcional) Permitir a este OpenID acceder a esta cuenta."
+
+#: ../../mod/settings.php:295 ../../mod/settings.php:298
+msgid "Profile is <strong>not published</strong>."
+msgstr "El perfil <strong>no está publicado</strong>."
+
+#: ../../mod/settings.php:352 ../../mod/settings.php:355
+msgid "Default Post Permissions"
+msgstr "Permisos por defecto para los mensajes"
+
+#: ../../mod/search.php:131 ../../mod/network.php:287
+#: ../../mod/network.php:290
+msgid "View in context"
+msgstr "Ver en el contexto"
+
+#: ../../mod/photos.php:30
+msgid "Photo Albums"
+msgstr "Álbum de Fotos"
+
+#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:780
+#: ../../mod/photos.php:849 ../../mod/photos.php:864 ../../mod/photos.php:1198
+#: ../../mod/photos.php:1209 ../../include/Photo.php:225
+#: ../../include/Photo.php:232 ../../include/Photo.php:239
+#: ../../include/items.php:959 ../../include/items.php:962
+#: ../../include/items.php:965 ../../mod/photos.php:781
+#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1244 ../../include/items.php:982
+#: ../../include/items.php:985 ../../include/items.php:988
+msgid "Contact Photos"
+msgstr "Foto del contacto"
+
+#: ../../mod/photos.php:95
+msgid "Contact information unavailable"
+msgstr "Información del contacto no disponible"
+
+#: ../../mod/photos.php:116
+msgid "Album not found."
+msgstr "Album no encontrado."
+
+#: ../../mod/photos.php:134 ../../mod/photos.php:858 ../../mod/photos.php:859
+msgid "Delete Album"
+msgstr "Eliminar album"
+
+#: ../../mod/photos.php:197 ../../mod/photos.php:1033
+#: ../../mod/photos.php:1067
+msgid "Delete Photo"
+msgstr "Eliminar foto"
+
+#: ../../mod/photos.php:468 ../../mod/photos.php:469
+msgid "was tagged in a"
+msgstr "ha sido etiquetado en"
+
+#: ../../mod/photos.php:468 ../../mod/like.php:110 ../../mod/photos.php:469
+msgid "photo"
+msgstr "foto"
+
+#: ../../mod/photos.php:468 ../../mod/photos.php:469
+msgid "by"
+msgstr "por"
+
+#: ../../mod/photos.php:558 ../../addon/js_upload/js_upload.php:306
+#: ../../mod/photos.php:559
+msgid "Image exceeds size limit of "
+msgstr "La imagen supera el limite de tamaño de "
+
+#: ../../mod/photos.php:660 ../../mod/photos.php:661
+msgid "No photos selected"
+msgstr "Ninguna foto seleccionada"
+
+#: ../../mod/photos.php:807 ../../mod/photos.php:808
+msgid "Upload Photos"
+msgstr "Subir fotos"
+
+#: ../../mod/photos.php:810 ../../mod/photos.php:853 ../../mod/photos.php:811
+#: ../../mod/photos.php:854
+msgid "New album name: "
+msgstr "Nombre del nuevo álbum: "
+
+#: ../../mod/photos.php:811 ../../mod/photos.php:812
+msgid "or existing album name: "
+msgstr "o nombre de un álbum existente: "
+
+#: ../../mod/photos.php:813 ../../mod/photos.php:1028 ../../mod/photos.php:814
+#: ../../mod/photos.php:1062
+msgid "Permissions"
+msgstr "Permisos"
+
+#: ../../mod/photos.php:868 ../../mod/photos.php:869
+msgid "Edit Album"
+msgstr "Modifica álbum"
+
+#: ../../mod/photos.php:878 ../../mod/photos.php:1228 ../../mod/photos.php:879
+#: ../../mod/photos.php:1263
+msgid "View Photo"
+msgstr "Ver foto"
+
+#: ../../mod/photos.php:908 ../../mod/photos.php:909
+msgid "Photo not available"
+msgstr "Foto no disponible"
+
+#: ../../mod/photos.php:929 ../../mod/photos.php:956
+msgid "Edit photo"
+msgstr "Modificar foto"
+
+#: ../../mod/photos.php:931 ../../mod/photos.php:958
+msgid "Use as profile photo"
+msgstr "Usar como foto del perfil"
+
+#: ../../mod/photos.php:944 ../../mod/photos.php:973
+msgid "View Full Size"
+msgstr "Ver a tamaño completo"
+
+#: ../../mod/photos.php:1002 ../../mod/photos.php:1036
+msgid "Tags: "
+msgstr "Etiquetas: "
+
+#: ../../mod/photos.php:1012 ../../mod/photos.php:1046
+msgid "[Remove any tag]"
+msgstr "[Borrar todas las etiquetas]"
+
+#: ../../mod/photos.php:1021 ../../mod/photos.php:1055
+msgid "New album name"
+msgstr "Nuevo nombre de álbum"
+
+#: ../../mod/photos.php:1024 ../../mod/photos.php:1058
+msgid "Caption"
+msgstr "Título"
+
+#: ../../mod/photos.php:1026 ../../mod/photos.php:1060
+msgid "Add a Tag"
+msgstr "Añadir una etiqueta"
+
+#: ../../mod/photos.php:1030 ../../mod/photos.php:1064
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr ""
+"Ejemplo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+
+#: ../../mod/photos.php:1214 ../../mod/photos.php:1249
+msgid "Recent Photos"
+msgstr "Fotos recientes"
+
+#: ../../mod/photos.php:1218 ../../mod/photos.php:1253
+msgid "Upload New Photos"
+msgstr "Subir nuevas fotos"
+
+#: ../../mod/photos.php:1234 ../../mod/photos.php:1269
+msgid "View Album"
+msgstr "Ver álbum"
+
+#: ../../mod/display.php:15 ../../mod/display.php:307 ../../mod/item.php:546
+#: ../../mod/display.php:312 ../../mod/item.php:598
+msgid "Item not found."
+msgstr "Elemento no encontrado."
+
+#: ../../mod/display.php:259 ../../mod/network.php:435
+#: ../../mod/display.php:263 ../../mod/network.php:442
+msgid "View $owner_name's profile"
+msgstr "Ver el perfil de $owner_name"
+
+#: ../../mod/display.php:260 ../../mod/network.php:436
+#: ../../mod/display.php:264 ../../mod/network.php:443
+msgid "to"
+msgstr "a"
+
+#: ../../mod/display.php:261 ../../mod/network.php:437
+#: ../../mod/display.php:265 ../../mod/network.php:444
+msgid "Wall-to-Wall"
+msgstr "Muro-A-Muro"
+
+#: ../../mod/display.php:262 ../../mod/network.php:438
+#: ../../mod/display.php:266 ../../mod/network.php:445
+msgid "via Wall-To-Wall:"
+msgstr "via Muro-A-Muro:"
+
+#: ../../mod/display.php:300 ../../mod/display.php:305
+msgid "Item has been removed."
+msgstr "El elemento ha sido eliminado."
+
+#: ../../mod/invite.php:28
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s: No es una dirección válida de email."
+
+#: ../../mod/invite.php:32
+#, php-format
+msgid "Please join my network on %s"
+msgstr "Por favor únete a mi red social en %s"
+
+#: ../../mod/invite.php:38
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s: Ha fallado la entrega del mensaje."
+
+#: ../../mod/invite.php:42
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d mensaje enviado."
+msgstr[1] "%d mensajes enviados."
+
+#: ../../mod/invite.php:57
+msgid "Send invitations"
+msgstr "Enviar invitaciones"
+
+#: ../../mod/invite.php:58
+msgid "Enter email addresses, one per line:"
+msgstr "Introduce las direcciones de email, una por línea:"
+
+#: ../../mod/invite.php:59 ../../mod/message.php:182 ../../mod/message.php:316
+msgid "Your message:"
+msgstr "Tu mensaje:"
+
+#: ../../mod/invite.php:60
+#, php-format
+msgid "Please join my social network on %s"
+msgstr "Únete a mi red social en % s"
+
+#: ../../mod/invite.php:61
+msgid "To accept this invitation, please visit:"
+msgstr "Para aceptar esta invitación, por favor visita:"
+
+#: ../../mod/invite.php:62
+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:"
+
+#: ../../mod/contacts.php:12
+msgid "Invite Friends"
+msgstr "Invitar amigos"
+
+#: ../../mod/contacts.php:16
+msgid "Connect/Follow"
+msgstr "Conectar/Seguir"
+
+#: ../../mod/contacts.php:17
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Ejemplo: bob@ejemplo.com, http://ejemplo.com/barbara"
+
+#: ../../mod/contacts.php:18
+msgid "Follow"
+msgstr "Seguir"
+
+#: ../../mod/contacts.php:38 ../../mod/contacts.php:119
+msgid "Could not access contact record."
+msgstr "No se pudo acceder a los datos del contacto."
+
+#: ../../mod/contacts.php:52
+msgid "Could not locate selected profile."
+msgstr "No se pudo encontrar el perfil seleccionado."
+
+#: ../../mod/contacts.php:83
+msgid "Contact updated."
+msgstr "Contacto actualizado."
+
+#: ../../mod/contacts.php:85 ../../mod/dfrn_request.php:402
+msgid "Failed to update contact record."
+msgstr "Error al actualizar el contacto."
+
+#: ../../mod/contacts.php:141
+msgid "Contact has been blocked"
+msgstr "El contacto ha sido bloqueado"
+
+#: ../../mod/contacts.php:141
+msgid "Contact has been unblocked"
+msgstr "El contacto ha sido desbloqueado"
+
+#: ../../mod/contacts.php:155
+msgid "Contact has been ignored"
+msgstr "El contacto ha sido ignorado"
+
+#: ../../mod/contacts.php:155
+msgid "Contact has been unignored"
+msgstr "El contacto es no ignorado"
+
+#: ../../mod/contacts.php:176
+msgid "stopped following"
+msgstr "dejó de seguir"
+
+#: ../../mod/contacts.php:195
+msgid "Contact has been removed."
+msgstr "El contacto ha sido eliminado"
+
+#: ../../mod/contacts.php:209 ../../mod/dfrn_confirm.php:114
+msgid "Contact not found."
+msgstr "Contacto no encontrado."
+
+#: ../../mod/contacts.php:223 ../../mod/contacts.php:344
+msgid "Mutual Friendship"
+msgstr "Amistad recíproca"
+
+#: ../../mod/contacts.php:227 ../../mod/contacts.php:348
+msgid "is a fan of yours"
+msgstr "es tu fan"
+
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:352
+msgid "you are a fan of"
+msgstr "eres fan de"
+
+#: ../../mod/contacts.php:248
+msgid "Never"
+msgstr "Nunca"
+
+#: ../../mod/contacts.php:252
+msgid "(Update was successful)"
+msgstr "(La actualización se ha completado)"
+
+#: ../../mod/contacts.php:252
+msgid "(Update was not successful)"
+msgstr "(La actualización no se ha completado)"
+
+#: ../../mod/contacts.php:255
+msgid "Contact Editor"
+msgstr "Editor de contactos"
+
+#: ../../mod/contacts.php:256
+msgid "Visit $name's profile"
+msgstr "Visita el perfil de $name"
+
+#: ../../mod/contacts.php:257
+msgid "Block/Unblock contact"
+msgstr "Boquear/Desbloquear contacto"
+
+#: ../../mod/contacts.php:258
+msgid "Ignore contact"
+msgstr "Ignorar contacto"
+
+#: ../../mod/contacts.php:259
+msgid "Delete contact"
+msgstr "Eliminar contacto"
+
+#: ../../mod/contacts.php:261
+msgid "Last updated: "
+msgstr "Última actualización:"
+
+#: ../../mod/contacts.php:262
+msgid "Update public posts: "
+msgstr "Actualizar mensajes públicos: "
+
+#: ../../mod/contacts.php:264
+msgid "Update now"
+msgstr "Actualizar ahora"
+
+#: ../../mod/contacts.php:267
+msgid "Unblock this contact"
+msgstr "Desbloquear a este contacto"
+
+#: ../../mod/contacts.php:267
+msgid "Block this contact"
+msgstr "Bloquear a este contacto"
+
+#: ../../mod/contacts.php:268
+msgid "Unignore this contact"
+msgstr "Eliminar de contactos ignorados"
+
+#: ../../mod/contacts.php:268
+msgid "Ignore this contact"
+msgstr "Agregar a contactos ignorados"
+
+#: ../../mod/contacts.php:271
+msgid "Currently blocked"
+msgstr "Bloqueados"
+
+#: ../../mod/contacts.php:272
+msgid "Currently ignored"
+msgstr "Ignorados"
+
+#: ../../mod/contacts.php:305
+msgid "Show Blocked Connections"
+msgstr "Mostrar conexiones bloqueadas"
+
+#: ../../mod/contacts.php:305
+msgid "Hide Blocked Connections"
+msgstr "Esconder conexiones bloqueadas"
+
+#: ../../mod/contacts.php:307 ../../mod/directory.php:38
+msgid "Finding: "
+msgstr "Busco: "
+
+#: ../../mod/contacts.php:308
+msgid "Find"
+msgstr "Encontrar"
+
+#: ../../mod/contacts.php:368 ../../mod/viewcontacts.php:44
+msgid "Visit $username's profile"
+msgstr "Visita el perfil de $username"
+
+#: ../../mod/contacts.php:369
+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 a:"
+
+#: ../../mod/register.php:47
+msgid "Invalid OpenID url"
+msgstr "Url OpenID no valido"
+
+#: ../../mod/register.php:62
+msgid "Please enter the required information."
+msgstr "Por favor, introduzca la información necesaria."
+
+#: ../../mod/register.php:74
+msgid "Please use a shorter name."
+msgstr "Por favor, use un nombre más corto."
+
+#: ../../mod/register.php:76
+msgid "Name too short."
+msgstr "El nombre es demasiado corto."
+
+#: ../../mod/register.php:89
+msgid "That doesn\\'t appear to be your full (First Last) name."
+msgstr "Ese no parece ser su nombre completo (Nombre Apellido)."
+
+#: ../../mod/register.php:92
+msgid "Your email domain is not among those allowed on this site."
+msgstr ""
+"Su dominio de correo electrónico no se encuentra entre los permitidos en "
+"este sitio."
+
+#: ../../mod/register.php:95
+msgid "Not a valid email address."
+msgstr "No es una dirección de correo electrónico válida."
+
+#: ../../mod/register.php:101
+msgid "Cannot use that email."
+msgstr "No se puede utilizar estecorreo electrónico."
+
+#: ../../mod/register.php:106
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
+msgstr ""
+"Su \"apodo\"sólo puede contener \"az\", \"0-9\", \"-\", y \"_\", y también "
+"debe empezar por una letra."
+
+#: ../../mod/register.php:112
+msgid "Nickname is already registered. Please choose another."
+msgstr "Apodo ya registrado. Por favor, elija otro."
+
+#: ../../mod/register.php:131
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "ERROR GRAVE: La generación de claves de seguridad ha fallado."
+
+#: ../../mod/register.php:198
+msgid "An error occurred during registration. Please try again."
+msgstr ""
+"Se produjo un error durante el registro. Por favor, inténtelo de nuevo."
+
+#: ../../mod/register.php:216
+msgid "An error occurred creating your default profile. Please try again."
+msgstr ""
+"Error al crear su perfil predeterminado. Por favor, inténtelo de nuevo."
+
+#: ../../mod/register.php:315
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr ""
+"Se ha registrado con éxito. Por favor, consulte su correo electrónico para "
+"obtener instrucciones adicionales."
+
+#: ../../mod/register.php:319
+msgid "Failed to send email message. Here is the message that failed."
+msgstr ""
+"Error al enviar mensaje de correo electrónico. Aquí está el mensaje no "
+"enviado."
+
+#: ../../mod/register.php:324
+msgid "Your registration can not be processed."
+msgstr "Su registro no se puede procesar."
+
+#: ../../mod/register.php:347
+#, php-format
+msgid "Registration request at %s"
+msgstr "Solicitud de registro en% s"
+
+#: ../../mod/register.php:351
+msgid "Your registration is pending approval by the site owner."
+msgstr "Su registro está pendiente de aprobación por el propietario del sitio."
+
+#: ../../mod/register.php:399
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr ""
+"Usted puede (opcionalmente) rellenar este formulario a través de OpenID "
+"mediante el suministro de su OpenID y haciendo clic en 'Registrar '."
+
+#: ../../mod/register.php:400
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
+msgstr ""
+"Si usted no está familiarizado con OpenID, por favor deje ese campo en "
+"blanco y rellene el resto de los elementos."
+
+#: ../../mod/register.php:401
+msgid "Your OpenID (optional): "
+msgstr "Tu OpenID (opcional):"
+
+#: ../../mod/register.php:404
+msgid ""
+"Members of this network prefer to communicate with real people who use their "
+"real names."
+msgstr ""
+"Los miembros de esta red prefieren comunicarse con personas reales que usan "
+"sus nombres reales."
+
+#: ../../mod/register.php:413 ../../mod/register.php:415
+msgid "Include your profile in member directory?"
+msgstr "¿Incluir su perfil en el directorio de miembros?"
+
+#: ../../mod/register.php:416 ../../mod/dfrn_request.php:618
+#: ../../mod/register.php:418
+msgid "Yes"
+msgstr "Sí"
+
+#: ../../mod/register.php:417 ../../mod/dfrn_request.php:619
+#: ../../mod/register.php:419
+msgid "No"
+msgstr "No"
+
+#: ../../mod/register.php:429 ../../mod/register.php:431
+msgid "Registration"
+msgstr "Registro"
+
+#: ../../mod/register.php:437 ../../mod/register.php:439
+msgid "Your Full Name (e.g. Joe Smith): "
+msgstr "Su nombre completo (por ejemplo, Joe Smith):"
+
+#: ../../mod/register.php:438 ../../mod/register.php:440
+msgid "Your Email Address: "
+msgstr "Su dirección de correo electrónico:"
+
+#: ../../mod/register.php:439 ../../mod/register.php:441
+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 ""
+"Elija un apodo perfil. Debe comenzar con un carácter de texto. Su dirección "
+"de perfil en este sitio va a ser '<strong>nickname@$sitename</strong>'."
+
+#: ../../mod/register.php:440 ../../mod/register.php:442
+msgid "Choose a nickname: "
+msgstr "Escoge un apodo: "
+
+#: ../../mod/install.php:30
+msgid "Could not create/connect to database."
+msgstr "No se pudo crear o conectarse a la base de datos."
+
+#: ../../mod/install.php:35
+msgid "Connected to database."
+msgstr "Conectado a la base de datos."
+
+#: ../../mod/install.php:66
+msgid "Database import succeeded."
+msgstr "Importación de la base de datos completada."
+
+#: ../../mod/install.php:67
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+msgstr ""
+"IMPORTANTE: Usted tendrá que [manualmente] configurar una tarea programada "
+"para el encuestador"
+
+#: ../../mod/install.php:68 ../../mod/install.php:75 ../../mod/install.php:175
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Por favor, consulte el archivo \"INSTALL.txt\"."
+
+#: ../../mod/install.php:73
+msgid "Database import failed."
+msgstr "La importación de la base de datos ha fallado."
+
+#: ../../mod/install.php:74
+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:84
+msgid "Welcome to Friendika."
+msgstr "Bienvenido a Friendika."
+
+#: ../../mod/install.php:124
+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:125
+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:132
+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 su sistema no tiene "
+"\"register_argc_argv\" habilitado."
+
+#: ../../mod/install.php:133
+msgid "This is required for message delivery to work."
+msgstr "Esto es necesario para el funcionamiento de la entrega de mensajes."
+
+#: ../../mod/install.php:155
+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:156
+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:165
+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:167
+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:169
+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:171
+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:173
+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:184
+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 su servidor web y es "
+"incapaz de hacerlo."
+
+#: ../../mod/install.php:185
+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 usted "
+"puede."
+
+#: ../../mod/install.php:186
+msgid ""
+"Please check with your site documentation or support people to see if this "
+"situation can be corrected."
+msgstr ""
+"Por favor, consulte el sitio de documentación o gente de ayuda para ver si "
+"esta situación se puede corregir."
+
+#: ../../mod/install.php:187
+msgid ""
+"If not, you may be required to perform a manual installation. Please see the "
+"file \"INSTALL.txt\" for instructions."
+msgstr ""
+"Si no, deberá proceder con la instalación manual. Por favor, consulte el "
+"archivo \"INSTALL.txt\"para obtener instrucciones."
+
+#: ../../mod/install.php:196
+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, utilice el texto adjunto para crear un archivo de "
+"configuración en la raíz de su servidor web."
+
+#: ../../mod/install.php:211
+msgid "Errors encountered creating database tables."
+msgstr "Errores encontrados creando las tablas de bases de datos."
+
+#: ../../mod/network.php:18
+msgid "Normal View"
+msgstr "Vista normal"
+
+#: ../../mod/network.php:20
+msgid "New Item View"
+msgstr "Vista de nuevos elementos"
+
+#: ../../mod/network.php:149 ../../mod/network.php:151
+msgid "No such group"
+msgstr "Ningún grupo"
+
+#: ../../mod/network.php:160 ../../mod/network.php:162
+msgid "Group is empty"
+msgstr "El grupo está vacío"
+
+#: ../../mod/network.php:164 ../../mod/network.php:166
+msgid "Group: "
+msgstr "Grupo: "
+
+#: ../../mod/notifications.php:28
+msgid "Invalid request identifier."
+msgstr "Solicitud de identificación no válida."
+
+#: ../../mod/notifications.php:31 ../../mod/notifications.php:134
+msgid "Discard"
+msgstr "Descartar"
+
+#: ../../mod/notifications.php:41 ../../mod/notifications.php:133
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../../mod/notifications.php:72
+msgid "Show Ignored Requests"
+msgstr "Mostrar peticiones ignoradas"
+
+#: ../../mod/notifications.php:72
+msgid "Hide Ignored Requests"
+msgstr "Esconder peticiones ignoradas"
+
+#: ../../mod/notifications.php:105
+msgid "Claims to be known to you: "
+msgstr "Dice conocerte:"
+
+#: ../../mod/notifications.php:105
+msgid "yes"
+msgstr "sí"
+
+#: ../../mod/notifications.php:105
+msgid "no"
+msgstr "no"
+
+#: ../../mod/notifications.php:111
+msgid "Approve as: "
+msgstr "Aprobar como:"
+
+#: ../../mod/notifications.php:112
+msgid "Friend"
+msgstr "Amig@"
+
+#: ../../mod/notifications.php:113
+msgid "Fan/Admirer"
+msgstr "Fan/Admirador"
+
+#: ../../mod/notifications.php:120
+msgid "Notification type: "
+msgstr "Tipo di notificación: "
+
+#: ../../mod/notifications.php:121
+msgid "Friend/Connect Request"
+msgstr "Solicitud de Amistad/Conexión"
+
+#: ../../mod/notifications.php:121
+msgid "New Follower"
+msgstr "Nuevo seguidor"
+
+#: ../../mod/notifications.php:131
+msgid "Approve"
+msgstr "Aprobar"
+
+#: ../../mod/notifications.php:140
+msgid "No notifications."
+msgstr "Ninguna notificación."
+
+#: ../../mod/notifications.php:164
+msgid "No registrations."
+msgstr "Ningún registro."
+
+#: ../../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:347
+msgid "Profile location is not valid or does not contain profile information."
+msgstr ""
+"Ubicación del perfil no es válido o no contiene la información de perfil."
+
+#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:352
+msgid "Warning: profile location has no identifiable owner name."
+msgstr ""
+"Aviso: Ubicación del perfil no tiene nombre del propietario identificable."
+
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:354
+msgid "Warning: profile location has no profile photo."
+msgstr "Advertencia: ubicación del perfil no tiene foto de perfil."
+
+#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:357
+#, 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:164
+msgid "Introduction complete."
+msgstr "Presentación completa."
+
+#: ../../mod/dfrn_request.php:188
+msgid "Unrecoverable protocol error."
+msgstr "Error de protocolo irrecuperable."
+
+#: ../../mod/dfrn_request.php:216
+msgid "Profile unavailable."
+msgstr "Perfil no disponible."
+
+#: ../../mod/dfrn_request.php:241
+#, 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:242
+msgid "Spam protection measures have been invoked."
+msgstr "Han sido activadas las medidas de protección contra spam."
+
+#: ../../mod/dfrn_request.php:243
+msgid "Friends are advised to please try again in 24 hours."
+msgstr "Se aconseja a los amigos intentarlo de nuevo en 24 horas."
+
+#: ../../mod/dfrn_request.php:273
+msgid "Invalid locator"
+msgstr "Localizador no válido"
+
+#: ../../mod/dfrn_request.php:292
+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:305
+msgid "You have already introduced yourself here."
+msgstr "Ya te has presentado aquí."
+
+#: ../../mod/dfrn_request.php:309
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr "Al parecer, ya eres amigo de % s."
+
+#: ../../mod/dfrn_request.php:330
+msgid "Invalid profile URL."
+msgstr "Dirección de perfil no válida."
+
+#: ../../mod/dfrn_request.php:336
+msgid "Disallowed profile URL."
+msgstr "Dirección de perfil no permitida."
+
+#: ../../mod/dfrn_request.php:423
+msgid "Your introduction has been sent."
+msgstr "Su presentación ha sido enviada."
+
+#: ../../mod/dfrn_request.php:477
+msgid "Please login to confirm introduction."
+msgstr "Inicia sesión para confirmar la presentación."
+
+#: ../../mod/dfrn_request.php:491
+msgid ""
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
+msgstr ""
+"Inicio de sesión con la identificación incorrecta. Entra en <strong>este</ "
+"strong> perfil."
+
+#: ../../mod/dfrn_request.php:536 ../../include/items.php:1341
+#: ../../include/items.php:1364
+msgid "[Name Withheld]"
+msgstr "[Nombre oculto]"
+
+#: ../../mod/dfrn_request.php:543
+msgid "Introduction received at "
+msgstr "Presentación recibida en"
+
+#: ../../mod/dfrn_request.php:615
+msgid "Friend/Connection Request"
+msgstr "Solicitud de Amistad/Conexión"
+
+#: ../../mod/dfrn_request.php:616
+msgid "Please answer the following:"
+msgstr "Por favor responda lo siguiente:"
+
+#: ../../mod/dfrn_request.php:617
+msgid "Does $name know you?"
+msgstr "$name te conoce?"
+
+#: ../../mod/dfrn_request.php:620
+msgid "Add a personal note:"
+msgstr "Agregar una nota personal:"
+
+#: ../../mod/dfrn_request.php:621
+msgid ""
+"Please enter your profile address from one of the following supported social "
+"networks:"
+msgstr ""
+"Por favor, introduzca su dirección de perfil de uno de las siguientes redes "
+"sociales soportadas:"
+
+#: ../../mod/dfrn_request.php:622
+msgid "Friendika"
+msgstr "Friendika"
+
+#: ../../mod/dfrn_request.php:623
+msgid "StatusNet/Federated Social Web"
+msgstr "StatusNet/Federated Social Web"
+
+#: ../../mod/dfrn_request.php:624
+msgid "Private (secure) network"
+msgstr "Red privada (segura) "
+
+#: ../../mod/dfrn_request.php:625
+msgid "Public (insecure) network"
+msgstr "Red pública (insegura)"
+
+#: ../../mod/dfrn_request.php:626
+msgid "Your profile address:"
+msgstr "Su dirección de perfil:"
+
+#: ../../mod/dfrn_request.php:627
+msgid "Submit Request"
+msgstr "Enviar solicitud"
+
+#: ../../mod/dfrn_request.php:628 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:41
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../../mod/like.php:110
+msgid "status"
+msgstr "estado"
+
+#: ../../mod/like.php:127
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "A %1$s gusta %3$s de %2$s"
+
+#: ../../mod/like.php:129
+#, 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:38
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Restablecer la contraseña solicitada en %s"
+
+#: ../../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 su cuenta. Una vez hecho esto no es recuperable."
+
+#: ../../mod/removeme.php:44
+msgid "Please enter your password for verification:"
+msgstr "Por favor, introduzca su contraseña para la verificación:"
+
+#: ../../mod/apps.php:6
+msgid "Applications"
+msgstr "Aplicaciones"
+
+#: ../../mod/directory.php:32
+msgid "Global Directory"
+msgstr "Directorio global"
+
+#: ../../mod/item.php:37
+msgid "Unable to locate original post."
+msgstr "No se puede encontrar post original."
+
+#: ../../mod/item.php:98 ../../mod/item.php:126
+msgid "Empty post discarded."
+msgstr "Mensaje vacío descartado."
+
+#: ../../mod/item.php:422 ../../mod/item.php:474
+#, php-format
+msgid "%s commented on your item at %s"
+msgstr "%s ha comentado en tu post en %s"
+
+#: ../../mod/item.php:445 ../../mod/item.php:497
+#, php-format
+msgid "%s posted on your profile wall at %s"
+msgstr "%s ha publicado en tu muro en %s"
+
+#: ../../mod/item.php:471 ../../mod/item.php:523
+msgid "System error. Post not saved."
+msgstr "Error del sistema. Mensaje no guardado."
+
+#: ../../mod/item.php:489 ../../mod/item.php:541
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendika social network."
+msgstr ""
+"Este mensaje le ha sido enviado por %s, un miembro de la red social "
+"Friendika."
+
+#: ../../mod/item.php:491 ../../mod/item.php:543
+msgid "You may visit them online at"
+msgstr "Puede visitarle online en"
+
+#: ../../mod/item.php:493 ../../mod/item.php:545
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr ""
+"Por favor contacte al remitente respondiendo a este mensaje si no desea "
+"recibir estos mensajes."
+
+#: ../../mod/item.php:495 ../../mod/item.php:547
+#, 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:18
+msgid "No recipient selected."
+msgstr "Ningún destinatario seleccionado"
+
+#: ../../mod/message.php:23
+msgid "[no subject]"
+msgstr "[sin asunto]"
+
+#: ../../mod/message.php:34
+msgid "Unable to locate contact information."
+msgstr "No se puede encontrar información del contacto."
+
+#: ../../mod/message.php:102
+msgid "Message sent."
+msgstr "Mensaje enviado."
+
+#: ../../mod/message.php:105
+msgid "Message could not be sent."
+msgstr "El mensaje no ha podido ser enviado."
+
+#: ../../mod/message.php:125 ../../include/nav.php:100
+msgid "Messages"
+msgstr "Mensajes"
+
+#: ../../mod/message.php:126
+msgid "Inbox"
+msgstr "Entrada"
+
+#: ../../mod/message.php:127
+msgid "Outbox"
+msgstr "Enviados"
+
+#: ../../mod/message.php:128
+msgid "New Message"
+msgstr "Nuevo mensaje"
+
+#: ../../mod/message.php:142
+msgid "Message deleted."
+msgstr "Mensaje eliminado."
+
+#: ../../mod/message.php:158
+msgid "Conversation removed."
+msgstr "Conversación eliminada."
+
+#: ../../mod/message.php:177
+msgid "Send Private Message"
+msgstr "Enviar mensaje privado"
+
+#: ../../mod/message.php:178 ../../mod/message.php:312
+msgid "To:"
+msgstr "A:"
+
+#: ../../mod/message.php:179 ../../mod/message.php:313
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: ../../mod/message.php:221
+msgid "No messages."
+msgstr "No hay mensajes."
+
+#: ../../mod/message.php:234
+msgid "Delete conversation"
+msgstr "Eliminar conversación"
+
+#: ../../mod/message.php:264
+msgid "Message not available."
+msgstr "Mensaje no disponibile."
+
+#: ../../mod/message.php:301
+msgid "Delete message"
+msgstr "Borrar mensaje"
+
+#: ../../mod/message.php:311
+msgid "Send Reply"
+msgstr "Enviar respuesta"
+
+#: ../../mod/dfrn_confirm.php:231
+msgid "Response from remote site was not understood."
+msgstr "La respuesta desde el sitio remoto no ha sido entendida."
+
+#: ../../mod/dfrn_confirm.php:240
+msgid "Unexpected response from remote site: "
+msgstr "Respuesta inesperada desde el sitio remoto:"
+
+#: ../../mod/dfrn_confirm.php:248
+msgid "Confirmation completed successfully."
+msgstr "Confirmación completada con éxito."
+
+#: ../../mod/dfrn_confirm.php:250 ../../mod/dfrn_confirm.php:264
+#: ../../mod/dfrn_confirm.php:271
+msgid "Remote site reported: "
+msgstr "El sito remoto informó:"
+
+#: ../../mod/dfrn_confirm.php:262
+msgid "Temporary failure. Please wait and try again."
+msgstr "Error temporal. Por favor, espere y vuelva a intentarlo."
+
+#: ../../mod/dfrn_confirm.php:269
+msgid "Introduction failed or was revoked."
+msgstr "La presentación ha fallado o ha sido anulada."
+
+#: ../../mod/dfrn_confirm.php:387
+msgid "Unable to set contact photo."
+msgstr "Imposible establecer la foto del contacto."
+
+#: ../../mod/dfrn_confirm.php:426
+msgid "is now friends with"
+msgstr "ahora es amigo de"
+
+#: ../../mod/dfrn_confirm.php:494
+#, php-format
+msgid "No user record found for '%s' "
+msgstr "Ningún usuario encontrado para '%s'"
+
+#: ../../mod/dfrn_confirm.php:504
+msgid "Our site encryption key is apparently messed up."
+msgstr "Nuestra clave de cifrado del site es aparentemente un lío."
+
+#: ../../mod/dfrn_confirm.php:515
+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."
+
+#: ../../mod/dfrn_confirm.php:527
+msgid "Contact record was not found for you on our site."
+msgstr "El contacto no se ha encontrado en nuestro sitio."
+
+#: ../../mod/dfrn_confirm.php:555
+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 intenta de nuevo."
+
+#: ../../mod/dfrn_confirm.php:566
+msgid "Unable to set your contact credentials on our system."
+msgstr ""
+"No se puede establecer sus credenciales de contacto en nuestro sistema."
+
+#: ../../mod/dfrn_confirm.php:619
+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"
+
+#: ../../mod/dfrn_confirm.php:648
+#, php-format
+msgid "Connection accepted at %s"
+msgstr "Conexión aceptada en % s"
+
+#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
+#: ../../include/auth.php:130 ../../include/auth.php:183
+msgid "Login failed."
+msgstr "Accesso fallido."
+
+#: ../../mod/openid.php:73 ../../include/auth.php:194
+msgid "Welcome back "
+msgstr "Bienvenido de nuevo"
+
+#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392
+#, php-format
+msgid "%s welcomes %s"
+msgstr "%s te da la bienvenida a %s"
+
+#: ../../mod/viewcontacts.php:32
+msgid "No contacts."
+msgstr "Ningún contacto."
+
+#: ../../mod/group.php:27
+msgid "Group created."
+msgstr "Grupo creado."
+
+#: ../../mod/group.php:33
+msgid "Could not create group."
+msgstr "Imposible crear el grupo."
+
+#: ../../mod/group.php:43 ../../mod/group.php:123
+msgid "Group not found."
+msgstr "Grupo no encontrado."
+
+#: ../../mod/group.php:56
+msgid "Group name changed."
+msgstr "El nombre del grupo ha cambiado."
+
+#: ../../mod/group.php:79
+msgid "Membership list updated."
+msgstr "Lista de miembros actualizada."
+
+#: ../../mod/group.php:107
+msgid "Group removed."
+msgstr "Grupo eliminado."
+
+#: ../../mod/group.php:109
+msgid "Unable to remove group."
+msgstr "No se puede eliminar el grupo."
+
+#: ../../addon/twitter/twitter.php:64
+msgid "Post to Twitter"
+msgstr "Publicar en Twitter"
+
+#: ../../addon/twitter/twitter.php:122
+msgid "Twitter Posting Settings"
+msgstr "Configuración de publicación en Twitter"
+
+#: ../../addon/twitter/twitter.php:129
+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:148
+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 ha vinculado su cuenta a su cuenta de Twitter.Para ello haga clic en el "
+"botón 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."
+
+#: ../../addon/twitter/twitter.php:149
+msgid "Log in with Twitter"
+msgstr "Acceder con Twitter"
+
+#: ../../addon/twitter/twitter.php:151
+msgid "Copy the PIN from Twitter here"
+msgstr "Copia el PIN de Twitter aquí"
+
+#: ../../addon/twitter/twitter.php:165 ../../addon/statusnet/statusnet.php:197
+msgid "Currently connected to: "
+msgstr "Actualmente conectado a:"
+
+#: ../../addon/twitter/twitter.php:166
+msgid ""
+"If enabled all your <strong>public</strong> postings will be posted to the "
+"associated Twitter account as well."
+msgstr ""
+"Si se habilita, todos sus posts <strong>públicos</ strong> se publicarán "
+"también en la cuenta de Twitter asociada."
+
+#: ../../addon/twitter/twitter.php:168
+msgid "Send public postings to Twitter"
+msgstr "Enviar posts públicos a Twitter"
+
+#: ../../addon/twitter/twitter.php:172 ../../addon/statusnet/statusnet.php:204
+msgid "Clear OAuth configuration"
+msgstr "Borrar la configuración de OAuth"
+
+#: ../../addon/statusnet/statusnet.php:78
+msgid "Post to StatusNet"
+msgstr "Publicar en StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:146
+msgid "StatusNet Posting Settings"
+msgstr "Configuración de envío a StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:152
+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. Registre su cuenta "
+"de Friendika como cliente de escritorio en su cuenta de StatusNet, copie la "
+"clave consumer aquí y escriba la dirección de la base API.<br />Antes de "
+"registrar su propio par de claves OAuth, pregunte al administrador si ya hay "
+"un par de claves para este instalación de Friendika en su instalación "
+"StatusNet favorita."
+
+#: ../../addon/statusnet/statusnet.php:154
+msgid "OAuth Consumer Key"
+msgstr "OAuth Consumer Key"
+
+#: ../../addon/statusnet/statusnet.php:157
+msgid "OAuth Consumer Secret"
+msgstr "OAuth Consumer Secret"
+
+#: ../../addon/statusnet/statusnet.php:160
+msgid "Base API Path (remember the trailing /)"
+msgstr "Dirección de base para la API (recordar el / al final)"
+
+#: ../../addon/statusnet/statusnet.php:181
+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 su 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."
+
+#: ../../addon/statusnet/statusnet.php:182
+msgid "Log in with StatusNet"
+msgstr "Inicia sesión con StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:184
+msgid "Copy the security code from StatusNet here"
+msgstr "Copia el código de seguridad de StatusNet aquí"
+
+#: ../../addon/statusnet/statusnet.php:198
+msgid ""
+"If enabled all your <strong>public</strong> postings will be posted to the "
+"associated StatusNet account as well."
+msgstr ""
+"Si se habilita, todos sus posts <strong>públicos</ strong> se publicarán "
+"también en la cuenta de StatusNet asociada."
+
+#: ../../addon/statusnet/statusnet.php:200
+msgid "Send public postings to StatusNet"
+msgstr "Enviar posts públicos a StatusNet"
+
+#: ../../addon/tictac/tictac.php:14
+msgid "Three Dimensional Tic-Tac-Toe"
+msgstr "Tic-Tac-Toe tridimensionale"
+
+#: ../../addon/tictac/tictac.php:47
+msgid "3D Tic-Tac-Toe"
+msgstr "3D Tic-Tac-Toe"
+
+#: ../../addon/tictac/tictac.php:52
+msgid "New game"
+msgstr "Nueva partida"
+
+#: ../../addon/tictac/tictac.php:53
+msgid "New game with handicap"
+msgstr "Nuevo juego con handicap"
+
+#: ../../addon/tictac/tictac.php:54
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
+msgstr ""
+"Tic-tac-toe tridimensional es como el juego tradicional, excepto que se "
+"juega en varios niveles simultáneamente."
+
+#: ../../addon/tictac/tictac.php:55
+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."
+
+#: ../../addon/tictac/tictac.php:57
+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."
+
+#: ../../addon/tictac/tictac.php:176
+msgid "You go first..."
+msgstr "Comienza tú..."
+
+#: ../../addon/tictac/tictac.php:181
+msgid "I'm going first this time..."
+msgstr "Yo voy primero esta vez..."
+
+#: ../../addon/tictac/tictac.php:187
+msgid "You won!"
+msgstr "¡Has ganado!"
+
+#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218
+msgid "\"Cat\" game!"
+msgstr "¡Empate!"
+
+#: ../../addon/tictac/tictac.php:216
+msgid "I won!"
+msgstr "¡He ganado!"
+
+#: ../../addon/java_upload/java_upload.php:33
+msgid "Select files to upload: "
+msgstr "Seleccione los archivos a subir: "
+
+#: ../../addon/java_upload/java_upload.php:35
+msgid ""
+"Use the following controls only if the Java uploader [above] fails to launch."
+msgstr ""
+"Usa el seguente controllo solo se el el caricatore Java (qui sopra) no parte."
+
+#: ../../addon/facebook/facebook.php:116
+msgid "Facebook disabled"
+msgstr "Facebook no habilitado"
+
+#: ../../addon/facebook/facebook.php:124
+msgid "Facebook API key is missing."
+msgstr "Falta la Clave API de Facebook."
+
+#: ../../addon/facebook/facebook.php:131
+msgid "Facebook Connect"
+msgstr "Facebook Connect"
+
+#: ../../addon/facebook/facebook.php:137
+msgid "Install Facebook post connector"
+msgstr "Instalar el conector con Facebook"
+
+#: ../../addon/facebook/facebook.php:144
+msgid "Remove Facebook post connector"
+msgstr "DesInstalar el conector con Facebook"
+
+#: ../../addon/facebook/facebook.php:150
+msgid "Post to Facebook by default"
+msgstr "Publicar en Facebook de forma predeterminada"
+
+#: ../../addon/facebook/facebook.php:174
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../addon/facebook/facebook.php:175
+msgid "Facebook Connector Settings"
+msgstr "Configuración de conexión a Facebook"
+
+#: ../../addon/facebook/facebook.php:189
+msgid "Post to Facebook"
+msgstr "Publicar en Facebook"
+
+#: ../../addon/facebook/facebook.php:230
+msgid "Image: "
+msgstr "Imagen: "
+
+#: ../../addon/randplace/randplace.php:171
+msgid "Randplace Settings"
+msgstr "Configuración de Randplace"
+
+#: ../../addon/randplace/randplace.php:173
+msgid "Enable Randplace Plugin"
+msgstr "Activar el plugin Randplace"
+
+#: ../../addon/js_upload/js_upload.php:39
+msgid "Upload a file"
+msgstr "Subir un archivo"
+
+#: ../../addon/js_upload/js_upload.php:40
+msgid "Drop files here to upload"
+msgstr "Soltar los archivos aquí para subir"
+
+#: ../../addon/js_upload/js_upload.php:42
+msgid "Failed"
+msgstr "Falló"
+
+#: ../../addon/js_upload/js_upload.php:288
+msgid "No files were uploaded."
+msgstr "No hay archivos subidos."
+
+#: ../../addon/js_upload/js_upload.php:294
+msgid "Uploaded file is empty"
+msgstr "El archivo subido está vacío"
+
+#: ../../addon/js_upload/js_upload.php:299
+msgid "Uploaded file is too large"
+msgstr "El archivo subido es demasiado grande"
+
+#: ../../addon/js_upload/js_upload.php:317
+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:328
+msgid "Upload was cancelled, or server error encountered"
+msgstr "La subida ha sido cancelada, o se encontró un error del servidor"
+
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
+msgstr "Desconocido | No clasificado"
+
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
+msgstr "Bloquear inmediatamente"
+
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
+msgstr "Sospechoso, spammer, auto-publicidad"
+
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
+msgstr "Le conozco, sin opinión"
+
+#: ../../include/contact_selectors.php:36
+msgid "OK, probably harmless"
+msgstr "OK, probablemente inofensivo"
+
+#: ../../include/contact_selectors.php:37
+msgid "Reputable, has my trust"
+msgstr "Buena reputación, tiene mi confianza"
+
+#: ../../include/contact_selectors.php:55
+msgid "Frequently"
+msgstr "Frequentemente"
+
+#: ../../include/contact_selectors.php:56
+msgid "Hourly"
+msgstr "Cada hora"
+
+#: ../../include/contact_selectors.php:57
+msgid "Twice daily"
+msgstr "Dos veces al día"
+
+#: ../../include/contact_selectors.php:58
+msgid "Daily"
+msgstr "Diariamente"
+
+#: ../../include/contact_selectors.php:59
+msgid "Weekly"
+msgstr "Semanalmente"
+
+#: ../../include/contact_selectors.php:60
+msgid "Monthly"
+msgstr "Mensualmente"
+
+#: ../../include/profile_selectors.php:6
+msgid "Male"
+msgstr "Male"
+
+#: ../../include/profile_selectors.php:6
+msgid "Female"
+msgstr "Mujer"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Actualmente Hombre"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Actualmente Mujer"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Mayormente Hombre"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Mayormente Mujer"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transgénero"
+
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Bisexual"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transexual"
+
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Hermafrodita"
+
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Neutro"
+
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "No-específico"
+
+#: ../../include/profile_selectors.php:6
+msgid "Other"
+msgstr "Otro"
+
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Indeciso"
+
+#: ../../include/profile_selectors.php:19
+msgid "Males"
+msgstr "Hombres"
+
+#: ../../include/profile_selectors.php:19
+msgid "Females"
+msgstr "Mujeres"
+
+#: ../../include/profile_selectors.php:19
+msgid "Gay"
+msgstr "Gay"
+
+#: ../../include/profile_selectors.php:19
+msgid "Lesbian"
+msgstr "Lesbiana"
+
+#: ../../include/profile_selectors.php:19
+msgid "No Preference"
+msgstr "Sin preferencias"
+
+#: ../../include/profile_selectors.php:19
+msgid "Bisexual"
+msgstr "Bisexual"
+
+#: ../../include/profile_selectors.php:19
+msgid "Autosexual"
+msgstr "Autosexual"
+
+#: ../../include/profile_selectors.php:19
+msgid "Abstinent"
+msgstr "Abstinente"
+
+#: ../../include/profile_selectors.php:19
+msgid "Virgin"
+msgstr "Virgen"
+
+#: ../../include/profile_selectors.php:19
+msgid "Deviant"
+msgstr "Desviado"
+
+#: ../../include/profile_selectors.php:19
+msgid "Fetish"
+msgstr "Fetish"
+
+#: ../../include/profile_selectors.php:19
+msgid "Oodles"
+msgstr "Montones"
+
+#: ../../include/profile_selectors.php:19
+msgid "Nonsexual"
+msgstr "No sexual"
+
+#: ../../include/profile_selectors.php:33
+msgid "Single"
+msgstr "Soltero"
+
+#: ../../include/profile_selectors.php:33
+msgid "Lonely"
+msgstr "Solitario"
+
+#: ../../include/profile_selectors.php:33
+msgid "Available"
+msgstr "Disponible"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unavailable"
+msgstr "No disponible"
+
+#: ../../include/profile_selectors.php:33
+msgid "Dating"
+msgstr "de citas"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unfaithful"
+msgstr "Infiel"
+
+#: ../../include/profile_selectors.php:33
+msgid "Sex Addict"
+msgstr "Adicto al sexo"
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends"
+msgstr "Amigos"
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends/Benefits"
+msgstr "Amigos con beneficios"
+
+#: ../../include/profile_selectors.php:33
+msgid "Casual"
+msgstr "Casual"
+
+#: ../../include/profile_selectors.php:33
+msgid "Engaged"
+msgstr "Comprometido/a"
+
+#: ../../include/profile_selectors.php:33
+msgid "Married"
+msgstr "Casado/a"
+
+#: ../../include/profile_selectors.php:33
+msgid "Partners"
+msgstr "Socios"
+
+#: ../../include/profile_selectors.php:33
+msgid "Cohabiting"
+msgstr "Cohabitando"
+
+#: ../../include/profile_selectors.php:33
+msgid "Happy"
+msgstr "Feliz"
+
+#: ../../include/profile_selectors.php:33
+msgid "Not Looking"
+msgstr "No estoy buscando"
+
+#: ../../include/profile_selectors.php:33
+msgid "Swinger"
+msgstr "Scambista"
+
+#: ../../include/profile_selectors.php:33
+msgid "Betrayed"
+msgstr "Traicionado/a"
+
+#: ../../include/profile_selectors.php:33
+msgid "Separated"
+msgstr "Separado/a"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unstable"
+msgstr "Inestable"
+
+#: ../../include/profile_selectors.php:33
+msgid "Divorced"
+msgstr "Divorciado/a"
+
+#: ../../include/profile_selectors.php:33
+msgid "Widowed"
+msgstr "Viudo/a"
+
+#: ../../include/profile_selectors.php:33
+msgid "Uncertain"
+msgstr "Incierto"
+
+#: ../../include/profile_selectors.php:33
+msgid "Complicated"
+msgstr "Complicado"
+
+#: ../../include/profile_selectors.php:33
+msgid "Don't care"
+msgstr "No importa"
+
+#: ../../include/profile_selectors.php:33
+msgid "Ask me"
+msgstr "Pregúntame"
+
+#: ../../include/acl_selectors.php:132
+msgid "Visible To:"
+msgstr "Visible a:"
+
+#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
+msgid "Groups"
+msgstr "Grupos"
+
+#: ../../include/acl_selectors.php:147
+msgid "Except For:"
+msgstr "A excepción de:"
+
+#: ../../include/auth.php:27
+msgid "Logged out."
+msgstr "Sesión terminada"
+
+#: ../../include/datetime.php:44 ../../include/datetime.php:46
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#: ../../include/datetime.php:148
+msgid "less than a second ago"
+msgstr "hace menos de un segundo"
+
+#: ../../include/datetime.php:151
+msgid "year"
+msgstr "año"
+
+#: ../../include/datetime.php:151
+msgid "years"
+msgstr "años"
+
+#: ../../include/datetime.php:152
+msgid "month"
+msgstr "mes"
+
+#: ../../include/datetime.php:152
+msgid "months"
+msgstr "meses"
+
+#: ../../include/datetime.php:153
+msgid "week"
+msgstr "semana"
+
+#: ../../include/datetime.php:153
+msgid "weeks"
+msgstr "semanas"
+
+#: ../../include/datetime.php:154
+msgid "day"
+msgstr "día"
+
+#: ../../include/datetime.php:154
+msgid "days"
+msgstr "días"
+
+#: ../../include/datetime.php:155
+msgid "hour"
+msgstr "hora"
+
+#: ../../include/datetime.php:155
+msgid "hours"
+msgstr "horas"
+
+#: ../../include/datetime.php:156
+msgid "minute"
+msgstr "minuto"
+
+#: ../../include/datetime.php:156
+msgid "minutes"
+msgstr "minutos"
+
+#: ../../include/datetime.php:157
+msgid "second"
+msgstr "segundo"
+
+#: ../../include/datetime.php:157
+msgid "seconds"
+msgstr "segundos"
+
+#: ../../include/datetime.php:164
+msgid " ago"
+msgstr " hace"
+
+#: ../../include/nav.php:56 ../../include/nav.php:91
+msgid "Home"
+msgstr "Home"
+
+#: ../../include/nav.php:64
+msgid "Apps"
+msgstr "Aplicaciones"
+
+#: ../../include/nav.php:77
+msgid "Directory"
+msgstr "Directorio"
+
+#: ../../include/nav.php:87
+msgid "Network"
+msgstr "Red"
+
+#: ../../include/nav.php:96
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: ../../include/nav.php:104
+msgid "Manage"
+msgstr "Administrar"
+
+#: ../../include/nav.php:107
+msgid "Settings"
+msgstr "Configuración"
+
+#: ../../include/nav.php:109
+msgid "Profiles"
+msgstr "Perfiles"
+
+#: ../../include/items.php:1004 ../../include/items.php:1027
+msgid "Birthday:"
+msgstr "Fecha de nacimiento:"
+
+#: ../../include/items.php:1348 ../../include/items.php:1371
+msgid "You have a new follower at "
+msgstr "Tienes un nuevo seguidor en "
+
+#: ../../include/group.php:130
+msgid "Create a new group"
+msgstr "Crear un nuevo grupo"
+
+#: ../../include/group.php:131
+msgid "Everybody"
+msgstr "Todo el mundo"
+
+#: ../../include/oembed.php:57
+msgid "Embedding disabled"
+msgstr "Embedding desabilitado"
+
+#: ../../boot.php:2418
+msgid "Birthday Reminders"
+msgstr "Recordatorios de cumpleaños"
+
+#: ../../mod/profile.php:160 ../../mod/editpost.php:66
+#: ../../mod/network.php:95
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Insertar video Vorbis [.ogg]"
+
+#: ../../mod/profile.php:161 ../../mod/editpost.php:67
+#: ../../mod/network.php:96
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Insertar audio Vorbis [.ogg]"
+
+#: ../../mod/profile.php:354 ../../mod/display.php:222
+#: ../../mod/editpost.php:62 ../../mod/network.php:392
+msgid "Edit"
+msgstr "Editar"
+
+#: ../../mod/search.php:54
+msgid "No results."
+msgstr "No hay resultados."
+
+#: ../../mod/photos.php:969
+msgid "<< Prev"
+msgstr "<< Ant"
+
+#: ../../mod/photos.php:977
+msgid "Next >>"
+msgstr "Sig >>"
+
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
+msgstr "Elemento no encontrado"
+
+#: ../../mod/editpost.php:32
+msgid "Edit post"
+msgstr "Editar mensaje"
+
+#: ../../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'"
+
+#: ../../boot.php:2016
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d Contacto"
+msgstr[1] "%d Contactos"
diff --git a/view/es/passchanged_eml.tpl b/view/es/passchanged_eml.tpl
new file mode 100644
index 000000000..7959846b7
--- /dev/null
+++ b/view/es/passchanged_eml.tpl
@@ -0,0 +1,19 @@
+
+Estimado/a $username,
+
+    Tu contraseña ha sido modificada como has solicitado. Anota esta información
+(o cambia inmediatamente la contraseña con algo que recuerdes).
+
+
+Tus datos de acceso son los siguientes:
+
+Sitio:	$siteurl
+Nombre:	$email
+Contraseña:	$new_password
+
+Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil.
+
+
+	$sitename
+
+ 
diff --git a/view/es/register_open_eml.tpl b/view/es/register_open_eml.tpl
new file mode 100644
index 000000000..7c7a90b40
--- /dev/null
+++ b/view/es/register_open_eml.tpl
@@ -0,0 +1,21 @@
+
+Estimado/a $username,
+
+    Gracias por registrarte en $sitename. Tu cuenta ha sido creada.
+
+
+Los datos de acceso son los siguientes:
+
+Sitio:	$siteurl
+Nombre:	$email
+Contraseña:	$password
+
+
+Después de acceder puedes cambiar tu contraseña en la página de "Configuración".
+
+Toma un momento para revisar las otras configuraciones de la cuenta en esa página.
+
+
+Gracias y bienvenido/a $sitename.
+
+ 
diff --git a/view/es/register_verify_eml.tpl b/view/es/register_verify_eml.tpl
new file mode 100644
index 000000000..9f2cc4d9b
--- /dev/null
+++ b/view/es/register_verify_eml.tpl
@@ -0,0 +1,22 @@
+
+Se ha recibido la solicitud de registro de un nuevo usuario en
+$sitename que requiere tu aprobación.
+
+Los datos de acceso son los siguientes:
+
+Nombre Completo:	$username
+Sitio:	$siteurl
+Nombre:	$email
+
+
+Para aprobar esta solicitud, visita el siguiente enlace:
+
+$siteurl/regmod/allow/$hash 
+
+Para denegar la solicitud y eliminar la cuenta, por favor visita:
+
+$siteurl/regmod/deny/$hash
+
+
+Gracias.
+
diff --git a/view/es/request_notify_eml.tpl b/view/es/request_notify_eml.tpl
new file mode 100644
index 000000000..6161c45c1
--- /dev/null
+++ b/view/es/request_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Estimado/a $myname,
+
+Acabas de recibir una solicitud de conexión de '$requestor' en $sitename.
+
+Puedes visitar su perfil en $url.
+
+Accede a tu sitio para ver la presentación completa y aceptar o ignorar/cancelar la solicitud.
+
+$siteurl
+
+
+	$sitename
diff --git a/view/es/strings.php b/view/es/strings.php
new file mode 100644
index 000000000..c7bbb02d8
--- /dev/null
+++ b/view/es/strings.php
@@ -0,0 +1,579 @@
+<?php
+
+function string_plural_select($n){
+	return ($n != 1);
+}
+;
+$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["Create a New Account"] = "Crea una nueva cuenta";
+$a->strings["Register"] = "Registrarse";
+$a->strings["Nickname or Email address: "] = "Apodo o dirección de email: ";
+$a->strings["Password: "] = "Contraseña: ";
+$a->strings["Login"] = "Acceder";
+$a->strings["Nickname/Email/OpenID: "] = "Apodo/Email/OpenID: ";
+$a->strings["Password (if not OpenID): "] = "Contraseña (si no OpenID): ";
+$a->strings["Forgot your password?"] = "¿Olvidó la contraseña?";
+$a->strings["Password Reset"] = "Resetear la contraseña";
+$a->strings["Logout"] = "Salir";
+$a->strings["prev"] = "ant";
+$a->strings["first"] = "primera";
+$a->strings["last"] = "última";
+$a->strings["next"] = "sig";
+$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["%s like this."] = "Le gusta a %s.";
+$a->strings["%s don't like this."] = "No le gusta a %s.";
+$a->strings["No contacts"] = "Nigún contacto";
+$a->strings["Contacts"] = "Contactos";
+$a->strings["View Contacts"] = "Ver contactos";
+$a->strings["Search"] = "Busca";
+$a->strings["No profile"] = "Nigún perfil";
+$a->strings["Connect"] = "Conecta";
+$a->strings["Location:"] = "Ubicación:";
+$a->strings[", "] = ", ";
+$a->strings["Gender:"] = "Género:";
+$a->strings["Status:"] = "Estado:";
+$a->strings["Homepage:"] = "Página web:";
+$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["January"] = "Enero";
+$a->strings["February"] = "Febrero";
+$a->strings["March"] = "Marzo";
+$a->strings["April"] = "Abril";
+$a->strings["May"] = "Mayo";
+$a->strings["June"] = "Junio";
+$a->strings["July"] = "Julio";
+$a->strings["August"] = "Agosto";
+$a->strings["September"] = "Septiembre";
+$a->strings["October"] = "Octubre";
+$a->strings["November"] = "Noviembre";
+$a->strings["December"] = "Diciembre";
+$a->strings["Birthdays this week:"] = "Cumpleaños esta semana:";
+$a->strings["(Adjusted for local time)"] = "(Convertido a la hora local)";
+$a->strings["[today]"] = "[hoy]";
+$a->strings["link to source"] = "Enlace al original";
+$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: "] = "Seleccione una identidad a gestionar:";
+$a->strings["Submit"] = "Envia";
+$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."] = "Subida de imagen fallida.";
+$a->strings["Administrator"] = "Administrador";
+$a->strings["noreply"] = "no-responder";
+$a->strings["New mail received at "] = "Nuevo correo recibido en ";
+$a->strings["%s commented on an item at %s"] = "%s ha commentato un elemento en %s";
+$a->strings["Share"] = "Compartir";
+$a->strings["Upload photo"] = "Subir foto";
+$a->strings["Insert web link"] = "Insertar enlace web";
+$a->strings["Insert YouTube video"] = "Insertar video de YouTube";
+$a->strings["Set your location"] = "Configura la tu ubicación";
+$a->strings["Clear browser location"] = "Borrar la ubicación del navegador";
+$a->strings["Please wait"] = "Por favor, espere";
+$a->strings["Permission settings"] = "Configuración de permisos";
+$a->strings["CC: email addresses"] = "CC: dirección email";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com";
+$a->strings["Private Message"] = "Mensaje privado";
+$a->strings["I like this (toggle)"] = "Me gusta esto (cambiar)";
+$a->strings["I don't like this (toggle)"] = "No me gusta questo (cambiar)";
+$a->strings["This is you"] = "Éste/a eres tú";
+$a->strings["Delete"] = "Eliminar";
+$a->strings["View \$name's profile"] = "Ver el perfil de \$name";
+$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["The profile address specified does not provide adequate information."] = "La dirección del perfil especificado no proporciona información adecuada.";
+$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 usted.";
+$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["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["Unable to process image"] = "Imposible procesar la imagen";
+$a->strings["Image uploaded successfully."] = "Imagen subida con éxito.";
+$a->strings["Welcome to %s"] = "Bienvenido a %s";
+$a->strings["Please login."] = "Accede.";
+$a->strings["Registration revoked for %s"] = "Registro anulado para %s";
+$a->strings["Registration details for %s"] = "Detalles de registro para %s";
+$a->strings["Account approved."] = "Cuenta aprobada.";
+$a->strings["Profile not found."] = "Perfil no encontrado.";
+$a->strings["Profile Name is required."] = "El nombre de perfil es requerido.";
+$a->strings["Profile updated."] = "Perfil actualizado.";
+$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["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["Age: "] = "Edad : ";
+$a->strings["Profile Image"] = "Imagen del Perfil";
+$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, pruebe 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."] = " Email no válido.";
+$a->strings[" Cannot change to that email."] = " No se puede usar ese email.";
+$a->strings["Settings updated."] = "Configuración actualizada.";
+$a->strings["Plugin Settings"] = "Configuración de los Plugin";
+$a->strings["Account Settings"] = "Configuración de la cuenta";
+$a->strings["No Plugin settings configured"] = "Ningún Plugin ha sido configurado";
+$a->strings["OpenID: "] = "OpenID: ";
+$a->strings["&nbsp;(Optional) Allow this OpenID to login to this account."] = "&nbsp;(Opcional) Permitir a este OpenID acceder a esta cuenta.";
+$a->strings["Profile is <strong>not published</strong>."] = "El perfil <strong>no está publicado</strong>.";
+$a->strings["Default Post Permissions"] = "Permisos por defecto para los mensajes";
+$a->strings["View in context"] = "Ver en el contexto";
+$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."] = "Album no encontrado.";
+$a->strings["Delete Album"] = "Eliminar album";
+$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["No photos selected"] = "Ninguna foto seleccionada";
+$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["Permissions"] = "Permisos";
+$a->strings["Edit Album"] = "Modifica álbum";
+$a->strings["View Photo"] = "Ver foto";
+$a->strings["Photo not available"] = "Foto no disponible";
+$a->strings["Edit photo"] = "Modificar foto";
+$a->strings["Use as profile photo"] = "Usar como foto del perfil";
+$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 de á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["Recent Photos"] = "Fotos recientes";
+$a->strings["Upload New Photos"] = "Subir nuevas fotos";
+$a->strings["View Album"] = "Ver álbum";
+$a->strings["Item not found."] = "Elemento no encontrado.";
+$a->strings["View \$owner_name's profile"] = "Ver el perfil de \$owner_name";
+$a->strings["to"] = "a";
+$a->strings["Wall-to-Wall"] = "Muro-A-Muro";
+$a->strings["via Wall-To-Wall:"] = "via Muro-A-Muro:";
+$a->strings["Item has been removed."] = "El elemento ha sido eliminado.";
+$a->strings["%s : Not a valid email address."] = "%s: No es una dirección válida de email.";
+$a->strings["Please join my network on %s"] = "Por favor únete a mi red social en %s";
+$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["Send invitations"] = "Enviar invitaciones";
+$a->strings["Enter email addresses, one per line:"] = "Introduce las direcciones de email, 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["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["Invite Friends"] = "Invitar amigos";
+$a->strings["Connect/Follow"] = "Conectar/Seguir";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Ejemplo: bob@ejemplo.com, http://ejemplo.com/barbara";
+$a->strings["Follow"] = "Seguir";
+$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 es no ignorado";
+$a->strings["stopped following"] = "dejó de seguir";
+$a->strings["Contact has been removed."] = "El contacto ha sido eliminado";
+$a->strings["Contact not found."] = "Contacto no encontrado.";
+$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["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["Contact Editor"] = "Editor de contactos";
+$a->strings["Visit \$name's profile"] = "Visita el perfil de \$name";
+$a->strings["Block/Unblock contact"] = "Boquear/Desbloquear contacto";
+$a->strings["Ignore contact"] = "Ignorar contacto";
+$a->strings["Delete contact"] = "Eliminar contacto";
+$a->strings["Last updated: "] = "Última actualización:";
+$a->strings["Update public posts: "] = "Actualizar mensajes públicos: ";
+$a->strings["Update now"] = "Actualizar ahora";
+$a->strings["Unblock this contact"] = "Desbloquear a este contacto";
+$a->strings["Block this contact"] = "Bloquear a este contacto";
+$a->strings["Unignore this contact"] = "Eliminar de contactos ignorados";
+$a->strings["Ignore this contact"] = "Agregar a contactos ignorados";
+$a->strings["Currently blocked"] = "Bloqueados";
+$a->strings["Currently ignored"] = "Ignorados";
+$a->strings["Show Blocked Connections"] = "Mostrar conexiones bloqueadas";
+$a->strings["Hide Blocked Connections"] = "Esconder conexiones bloqueadas";
+$a->strings["Finding: "] = "Busco: ";
+$a->strings["Find"] = "Encontrar";
+$a->strings["Visit \$username's profile"] = "Visita el perfil de \$username";
+$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 a:";
+$a->strings["Invalid OpenID url"] = "Url OpenID no valido";
+$a->strings["Please enter the required information."] = "Por favor, introduzca la información necesaria.";
+$a->strings["Please use a shorter name."] = "Por favor, use 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."] = "Ese no parece ser su nombre completo (Nombre Apellido).";
+$a->strings["Your email domain is not among those allowed on this site."] = "Su 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 estecorreo electrónico.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Su \"apodo\"sólo puede contener \"az\", \"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, elija 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éntelo de nuevo.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Error al crear su perfil predeterminado. Por favor, inténtelo de nuevo.";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Se ha registrado con éxito. Por favor, consulte su correo electrónico para obtener instrucciones adicionales.";
+$a->strings["Failed to send email message. Here is the message that failed."] = "Error al enviar mensaje de correo electrónico. Aquí está el mensaje no enviado.";
+$a->strings["Your registration can not be processed."] = "Su 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."] = "Su 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'."] = "Usted puede (opcionalmente) rellenar este formulario a través de OpenID mediante el suministro de su OpenID y haciendo clic 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 usted no está familiarizado con OpenID, por favor deje ese campo en blanco y rellene el resto de los elementos.";
+$a->strings["Your OpenID (optional): "] = "Tu OpenID (opcional):";
+$a->strings["Members of this network prefer to communicate with real people who use their real names."] = "Los miembros de esta red prefieren comunicarse con personas reales que usan sus nombres reales.";
+$a->strings["Include your profile in member directory?"] = "¿Incluir su perfil en el directorio de miembros?";
+$a->strings["Yes"] = "Sí";
+$a->strings["No"] = "No";
+$a->strings["Registration"] = "Registro";
+$a->strings["Your Full Name (e.g. Joe Smith): "] = "Su nombre completo (por ejemplo, Joe Smith):";
+$a->strings["Your Email Address: "] = "Su 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>'."] = "Elija un apodo perfil. Debe comenzar con un carácter de texto. Su dirección de perfil en este sitio va a ser '<strong>nickname@\$sitename</strong>'.";
+$a->strings["Choose a nickname: "] = "Escoge un apodo: ";
+$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["Database import succeeded."] = "Importación de la base de datos completada.";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Usted tendrá que [manualmente] configurar una tarea programada para el encuestador";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Por favor, consulte el archivo \"INSTALL.txt\".";
+$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["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 su 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["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 su 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 usted puede.";
+$a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Por favor, consulte el sitio de documentación o gente de ayuda 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á proceder con la instalación manual. Por favor, consulte 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, utilice el texto adjunto para crear un archivo de configuración en la raíz de su servidor web.";
+$a->strings["Errors encountered creating database tables."] = "Errores encontrados creando las tablas de bases de datos.";
+$a->strings["Normal View"] = "Vista normal";
+$a->strings["New Item View"] = "Vista de nuevos elementos";
+$a->strings["No such group"] = "Ningún grupo";
+$a->strings["Group is empty"] = "El grupo está vacío";
+$a->strings["Group: "] = "Grupo: ";
+$a->strings["Invalid request identifier."] = "Solicitud de identificación no válida.";
+$a->strings["Discard"] = "Descartar";
+$a->strings["Ignore"] = "Ignorar";
+$a->strings["Show Ignored Requests"] = "Mostrar peticiones ignoradas";
+$a->strings["Hide Ignored Requests"] = "Esconder peticiones ignoradas";
+$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"] = "Amig@";
+$a->strings["Fan/Admirer"] = "Fan/Admirador";
+$a->strings["Notification type: "] = "Tipo di notificación: ";
+$a->strings["Friend/Connect Request"] = "Solicitud de Amistad/Conexión";
+$a->strings["New Follower"] = "Nuevo seguidor";
+$a->strings["Approve"] = "Aprobar";
+$a->strings["No notifications."] = "Ninguna notificación.";
+$a->strings["No registrations."] = "Ningún registro.";
+$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."] = "Ubicación del perfil no es válido o no contiene la información de perfil.";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Aviso: Ubicación del perfil no tiene nombre del propietario identificable.";
+$a->strings["Warning: profile location has no profile photo."] = "Advertencia: 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."] = "Se aconseja a los amigos intentarlo de nuevo en 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["Disallowed profile URL."] = "Dirección de perfil no permitida.";
+$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."] = "Inicio de sesión con la identificación incorrecta. Entra en <strong>este</ strong> perfil.";
+$a->strings["[Name Withheld]"] = "[Nombre oculto]";
+$a->strings["Introduction received at "] = "Presentación recibida en";
+$a->strings["Friend/Connection Request"] = "Solicitud de Amistad/Conexión";
+$a->strings["Please answer the following:"] = "Por favor responda lo siguiente:";
+$a->strings["Does \$name know you?"] = "$name te conoce?";
+$a->strings["Add a personal note:"] = "Agregar una nota personal:";
+$a->strings["Please enter your profile address from one of the following supported social networks:"] = "Por favor, introduzca su dirección de perfil de uno de las siguientes redes sociales soportadas:";
+$a->strings["Friendika"] = "Friendika";
+$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
+$a->strings["Private (secure) network"] = "Red privada (segura) ";
+$a->strings["Public (insecure) network"] = "Red pública (insegura)";
+$a->strings["Your profile address:"] = "Su dirección de perfil:";
+$a->strings["Submit Request"] = "Enviar solicitud";
+$a->strings["Cancel"] = "Cancelar";
+$a->strings["status"] = "estado";
+$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["Password reset requested at %s"] = "Restablecer la contraseña solicitada en %s";
+$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 su cuenta. Una vez hecho esto no es recuperable.";
+$a->strings["Please enter your password for verification:"] = "Por favor, introduzca su contraseña para la verificación:";
+$a->strings["Applications"] = "Aplicaciones";
+$a->strings["Global Directory"] = "Directorio global";
+$a->strings["Unable to locate original post."] = "No se puede encontrar post original.";
+$a->strings["Empty post discarded."] = "Mensaje vacío descartado.";
+$a->strings["%s commented on your item at %s"] = "%s ha comentado en tu post en %s";
+$a->strings["%s posted on your profile wall at %s"] = "%s ha publicado en tu muro en %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 le ha sido enviado por %s, un miembro de la red social Friendika.";
+$a->strings["You may visit them online at"] = "Puede visitarle online en";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Por favor contacte al remitente respondiendo a este mensaje si no desea 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["[no subject]"] = "[sin asunto]";
+$a->strings["Unable to locate contact information."] = "No se puede encontrar información del contacto.";
+$a->strings["Message sent."] = "Mensaje enviado.";
+$a->strings["Message could not be sent."] = "El mensaje no ha podido ser enviado.";
+$a->strings["Messages"] = "Mensajes";
+$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["Send Private Message"] = "Enviar mensaje privado";
+$a->strings["To:"] = "A:";
+$a->strings["Subject:"] = "Asunto:";
+$a->strings["No messages."] = "No hay mensajes.";
+$a->strings["Delete conversation"] = "Eliminar conversación";
+$a->strings["Message not available."] = "Mensaje no disponibile.";
+$a->strings["Delete message"] = "Borrar mensaje";
+$a->strings["Send Reply"] = "Enviar respuesta";
+$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["Confirmation completed successfully."] = "Confirmación completada con éxito.";
+$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["is now friends with"] = "ahora es amigo de";
+$a->strings["No user record found for '%s' "] = "Ningún usuario encontrado para '%s'";
+$a->strings["Our site encryption key is apparently messed up."] = "Nuestra clave de cifrado del site 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 nuestro sitio.";
+$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 intenta de nuevo.";
+$a->strings["Unable to set your contact credentials on our system."] = "No se puede establecer sus credenciales de 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 back "] = "Bienvenido de nuevo";
+$a->strings["%s welcomes %s"] = "%s te da la bienvenida a %s";
+$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["Membership list updated."] = "Lista de miembros actualizada.";
+$a->strings["Group removed."] = "Grupo eliminado.";
+$a->strings["Unable to remove group."] = "No se puede eliminar el grupo.";
+$a->strings["Post to Twitter"] = "Publicar en Twitter";
+$a->strings["Twitter Posting Settings"] = "Configuración de publicación 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 ha vinculado su cuenta a su cuenta de Twitter.Para ello haga clic en el botón 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 will be posted to the associated Twitter account as well."] = "Si se habilita, todos sus posts <strong>públicos</ strong> se publicarán también en la cuenta de Twitter asociada.";
+$a->strings["Send public postings to Twitter"] = "Enviar posts públicos a Twitter";
+$a->strings["Clear OAuth configuration"] = "Borrar la configuración de OAuth";
+$a->strings["Post to StatusNet"] = "Publicar en StatusNet";
+$a->strings["StatusNet Posting Settings"] = "Configuración de envío a StatusNet";
+$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. Registre su cuenta de Friendika como cliente de escritorio en su cuenta de StatusNet, copie la clave consumer aquí y escriba la dirección de la base API.<br />Antes de registrar su propio par de claves OAuth, pregunte al administrador si ya hay un par de claves para este instalación de Friendika en su 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 su 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["If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well."] = "Si se habilita, todos sus posts <strong>públicos</ strong> se publicarán también en la cuenta de StatusNet asociada.";
+$a->strings["Send public postings to StatusNet"] = "Enviar posts públicos a StatusNet";
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe tridimensionale";
+$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
+$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. "] = "Tic-tac-toe 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..."] = "Comienza 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["Select files to upload: "] = "Seleccione los archivos a subir: ";
+$a->strings["Use the following controls only if the Java uploader [above] fails to launch."] = "Usa el seguente controllo solo se el el caricatore Java (qui sopra) no parte.";
+$a->strings["Facebook disabled"] = "Facebook no habilitado";
+$a->strings["Facebook API key is missing."] = "Falta la Clave API de Facebook.";
+$a->strings["Facebook Connect"] = "Facebook Connect";
+$a->strings["Install Facebook post connector"] = "Instalar el conector con Facebook";
+$a->strings["Remove Facebook post connector"] = "DesInstalar el conector con Facebook";
+$a->strings["Post to Facebook by default"] = "Publicar en Facebook de forma predeterminada";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Facebook Connector Settings"] = "Configuración de conexión a Facebook";
+$a->strings["Post to Facebook"] = "Publicar en Facebook";
+$a->strings["Image: "] = "Imagen: ";
+$a->strings["Randplace Settings"] = "Configuración de Randplace";
+$a->strings["Enable Randplace Plugin"] = "Activar el plugin Randplace";
+$a->strings["Upload a file"] = "Subir un archivo";
+$a->strings["Drop files here to upload"] = "Soltar los archivos aquí para subir";
+$a->strings["Failed"] = "Falló";
+$a->strings["No files were uploaded."] = "No hay archivos subidos.";
+$a->strings["Uploaded file is empty"] = "El archivo subido está vacío";
+$a->strings["Uploaded file is too large"] = "El archivo subido es demasiado grande";
+$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["Unknown | Not categorised"] = "Desconocido | No clasificado";
+$a->strings["Block immediately"] = "Bloquear inmediatamente";
+$a->strings["Shady, spammer, self-marketer"] = "Sospechoso, spammer, auto-publicidad";
+$a->strings["Known to me, but no opinion"] = "Le conozco, sin opinión";
+$a->strings["OK, probably harmless"] = "OK, probablemente inofensivo";
+$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["Male"] = "Male";
+$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["Intersex"] = "Bisexual";
+$a->strings["Transsexual"] = "Transexual";
+$a->strings["Hermaphrodite"] = "Hermafrodita";
+$a->strings["Neuter"] = "Neutro";
+$a->strings["Non-specific"] = "No-específico";
+$a->strings["Other"] = "Otro";
+$a->strings["Undecided"] = "Indeciso";
+$a->strings["Males"] = "Hombres";
+$a->strings["Females"] = "Mujeres";
+$a->strings["Gay"] = "Gay";
+$a->strings["Lesbian"] = "Lesbiana";
+$a->strings["No Preference"] = "Sin preferencias";
+$a->strings["Bisexual"] = "Bisexual";
+$a->strings["Autosexual"] = "Autosexual";
+$a->strings["Abstinent"] = "Abstinente";
+$a->strings["Virgin"] = "Virgen";
+$a->strings["Deviant"] = "Desviado";
+$a->strings["Fetish"] = "Fetish";
+$a->strings["Oodles"] = "Montones";
+$a->strings["Nonsexual"] = "No sexual";
+$a->strings["Single"] = "Soltero";
+$a->strings["Lonely"] = "Solitario";
+$a->strings["Available"] = "Disponible";
+$a->strings["Unavailable"] = "No disponible";
+$a->strings["Dating"] = "de citas";
+$a->strings["Unfaithful"] = "Infiel";
+$a->strings["Sex Addict"] = "Adicto al sexo";
+$a->strings["Friends"] = "Amigos";
+$a->strings["Friends/Benefits"] = "Amigos con beneficios";
+$a->strings["Casual"] = "Casual";
+$a->strings["Engaged"] = "Comprometido/a";
+$a->strings["Married"] = "Casado/a";
+$a->strings["Partners"] = "Socios";
+$a->strings["Cohabiting"] = "Cohabitando";
+$a->strings["Happy"] = "Feliz";
+$a->strings["Not Looking"] = "No estoy buscando";
+$a->strings["Swinger"] = "Scambista";
+$a->strings["Betrayed"] = "Traicionado/a";
+$a->strings["Separated"] = "Separado/a";
+$a->strings["Unstable"] = "Inestable";
+$a->strings["Divorced"] = "Divorciado/a";
+$a->strings["Widowed"] = "Viudo/a";
+$a->strings["Uncertain"] = "Incierto";
+$a->strings["Complicated"] = "Complicado";
+$a->strings["Don't care"] = "No importa";
+$a->strings["Ask me"] = "Pregúntame";
+$a->strings["Visible To:"] = "Visible a:";
+$a->strings["Groups"] = "Grupos";
+$a->strings["Except For:"] = "A excepción de:";
+$a->strings["Logged out."] = "Sesión terminada";
+$a->strings["Miscellaneous"] = "Varios";
+$a->strings["less than a second ago"] = "hace menos de un segundo";
+$a->strings["year"] = "año";
+$a->strings["years"] = "años";
+$a->strings["month"] = "mes";
+$a->strings["months"] = "meses";
+$a->strings["week"] = "semana";
+$a->strings["weeks"] = "semanas";
+$a->strings["day"] = "día";
+$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["Home"] = "Home";
+$a->strings["Apps"] = "Aplicaciones";
+$a->strings["Directory"] = "Directorio";
+$a->strings["Network"] = "Red";
+$a->strings["Notifications"] = "Notificaciones";
+$a->strings["Manage"] = "Administrar";
+$a->strings["Settings"] = "Configuración";
+$a->strings["Profiles"] = "Perfiles";
+$a->strings["Birthday:"] = "Fecha de nacimiento:";
+$a->strings["You have a new follower at "] = "Tienes un nuevo seguidor en ";
+$a->strings["Create a new group"] = "Crear un nuevo grupo";
+$a->strings["Everybody"] = "Todo el mundo";
+$a->strings["Embedding disabled"] = "Embedding desabilitado";
+$a->strings["Birthday Reminders"] = "Recordatorios de cumpleaños";
+$a->strings["Insert Vorbis [.ogg] video"] = "Insertar video Vorbis [.ogg]";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Insertar audio Vorbis [.ogg]";
+$a->strings["Edit"] = "Editar";
+$a->strings["No results."] = "No hay resultados.";
+$a->strings["<< Prev"] = "<< Ant";
+$a->strings["Next >>"] = "Sig >>";
+$a->strings["Item not found"] = "Elemento no encontrado";
+$a->strings["Edit post"] = "Editar mensaje";
+$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["%d Contact"] = array(
+	0 => "%d Contacto",
+	1 => "%d Contactos",
+);
diff --git a/view/es/wall_received_eml.tpl b/view/es/wall_received_eml.tpl
new file mode 100644
index 000000000..4cd253c72
--- /dev/null
+++ b/view/es/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Estimado/a $username,
+
+	'$from' ha escrito algo en el muro de tu perfil.
+
+-----
+$body
+-----
+
+Accede a  $siteurl para ver o borrar el elemento:
+
+$display
+
+
+	$sitename
+
+ 
+
diff --git a/view/settings.tpl b/view/settings.tpl
index e87853d45..5876cdeeb 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -164,7 +164,35 @@ $profile_in_net_dir
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
+<h3 class="settings-imap">$lbl_imap0</h3>
+<p>
+$imap_desc
+</p>
+<label for="imap-server" id="settings-label-imap1">$lbl_imap1</label>
+<input type="text" id="imap-server" name="mail_server" value="$imap_server" />
+<div id="imap-server-end"></div>
+<label for="imap-port" id="settings-label-imap2">$lbl_imap2</label>
+<input type="text" id="imap-port" name="mail_port" value="$imap_port" />
+<div id="imap-port-end"></div>
+<label for="imap-ssl" id="settings-label-imap3">$lbl_imap3</label>
+<input type="text" id="imap-ssl" name="mail_ssl" value="$imap_ssl" />
+<div id="imap-ssl-end"></div>
+<label for="imap-user" id="settings-label-imap4">$lbl_imap4</label>
+<input type="text" id="imap-user" name="mail_user" value="$imap_user" />
+<div id="imap-user-end"></div>
+<label for="imap-pass" id="settings-label-imap5">$lbl_imap5</label>
+<input type="password" id="imap-pass" name="mail_pass" value="" />
+<div id="imap-pass-end"></div>
+<label for="imap-replyto" id="settings-label-imap6">$lbl_imap6</label>
+<input type="text" id="imap-replyto" name="mail_replyto" value="$imap_replyto" />
+<div id="imap-replyto-end"></div>
+<label for="imap-pubmail" id="settings-label-imap7">$lbl_imap7</label>
+<input type="checkbox" name="mail_pubmail" id="imap-pubmail" $pubmail_checked value="1" />
+<div id="imap-pubmail-end"></div>
 
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
 
 
 <h3 class="settings-heading">$lbl_advn</h3>
diff --git a/view/sv/strings.php b/view/sv/strings.php
index c20bc3293..1162bb61a 100644
--- a/view/sv/strings.php
+++ b/view/sv/strings.php
@@ -1,1164 +1,760 @@
 <?php
 
 function string_plural_select($n){
-	return ($n != 1);
+	return ;
 }
-
-$a->strings['Not Found'] = 'Hittar inte';
-$a->strings['Page not found.' ] = 'Sidan hittades inte.' ;
-$a->strings['Permission denied'] = 'Åtkomst nekad';
-$a->strings['Permission denied.'] = 'Åtkomst nekad.';
-$a->strings['Delete this item?'] = 'Ta bort?';
-$a->strings['Comment'] = 'Kommentera';
-$a->strings['Create a New Account'] = 'Skapa nytt konto';
-$a->strings['Register'] = 'Registrera';
-$a->strings['Nickname or Email address: '] = 'Användarnamn eller e-postadress: ';
-$a->strings['Password: '] = 'Lösenord: ';
-$a->strings['Login'] = 'Logga in';
-$a->strings['Nickname/Email/OpenID: '] = 'Användarnamn/e-post/OpenID: ';
-$a->strings["Password \x28if not OpenID\x29: "] = "Lösenord (om inget OpenID): ";
-$a->strings['Forgot your password?'] = 'Har du glömt lösenordet?';
-$a->strings['Password Reset'] = 'Glömt lösenordet?';
-$a->strings['Logout'] = 'Logga ut';
-$a->strings['prev'] = 'föreg';
-$a->strings['first'] = 'första';
-$a->strings['last'] = 'sista';
-$a->strings['next'] = 'nästa';
-$a->strings['%s likes this.'] = '%s gillar det här.';
-$a->strings['%s doesn\'t like this.'] = '%s ogillar det här.';
-$a->strings['<span  %1$s>%2$d people</span> like this.'] = '<span  %1$s>%2$d personer</span> gillar det här.';
-$a->strings['<span  %1$s>%2$d people</span> don\'t like this.'] = '<span  %1$s>%2$d personer</span> ogillar det här.';
-$a->strings['and'] = 'och';
-$a->strings[', and %d other people'] = ', och ytterligare %d personer';
-$a->strings['%s like this.'] = '%s gillar det här.';
-$a->strings['%s don\'t like this.'] = '%s ogillar det här.';
-$a->strings['No contacts'] = 'Inga kontakter';
-$a->strings['View Contacts'] = 'Visa kontakter';
-$a->strings['Search'] = 'Sök';
-$a->strings['No profile'] = 'Ingen profil';
-$a->strings['Connect'] = 'Skicka kontaktförfrågan';
-$a->strings['Location:'] = 'Plats:';
-$a->strings[', '] = ', ';
-$a->strings['Gender:'] = 'Kön:';
-$a->strings['Status:'] = 'Status:';
-$a->strings['Homepage:'] = 'Hemsida:';
-$a->strings['Monday'] = 'måndag';
-$a->strings['Tuesday'] = 'tisdag';
-$a->strings['Wednesday'] = 'onsdag';
-$a->strings['Thursday'] = 'torsdag';
-$a->strings['Friday'] = 'fredag';
-$a->strings['Saturday'] = 'lördag';
-$a->strings['Sunday'] = 'söndag';
-$a->strings['January'] = 'januari';
-$a->strings['February'] = 'februari';
-$a->strings['March'] = 'mars';
-$a->strings['April'] = 'april';
-$a->strings['May'] = 'maj';
-$a->strings['June'] = 'juni';
-$a->strings['July'] = 'juli';
-$a->strings['August'] = 'augusti';
-$a->strings['September'] = 'september';
-$a->strings['October'] = 'oktober';
-$a->strings['November'] = 'november';
-$a->strings['December'] = 'december';
-$a->strings['Birthday Reminders'] = 'Födelsedagspåminnelser';
-$a->strings['Birthdays this week:'] = 'Födelsedagar denna vecka:';
-$a->strings["\x28Adjusted for local time\x29"] = "(Justerat till lokal tid)";
-$a->strings['[today]'] = '[idag]';
-$a->strings['link to source'] = 'länk till källa';
-$a->strings['Applications'] = 'Applikationer';
-$a->strings["Invite Friends"] = "Bjud in folk du känner";
-$a->strings['Find People With Shared Interests'] = 'Sök personer som har samma intressen som du';
-$a->strings['Connect/Follow'] = 'Gör till kontakt/Följ';
-$a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Exempel: adam@exempel.com, http://exempel.com/bertil';
-$a->strings['Follow'] = 'Följ';
-$a->strings['Could not access contact record.'] = 'Hittar inte information om kontakten.';
-$a->strings['Could not locate selected profile.'] = 'Hittar inte vald profil.';
-$a->strings['Contact updated.'] = 'Kontakten har uppdaterats.';
-$a->strings['Failed to update contact record.'] = 'Det blev fel när kontakten skulle uppdateras.';
-$a->strings['Contact has been '] = 'Kontakten ';
-$a->strings['blocked'] = 'spärrad';
-$a->strings['unblocked'] = 'inte längre spärrad';
-$a->strings['Contact has been blocked'] = 'Kontakten har spärrats';
-$a->strings['Contact has been unblocked'] = 'Kontakten är inte längre spärrad';
-$a->strings['Contact has been ignored'] = 'Kontakten ignoreras';
-$a->strings['Contact has been unignored'] = 'Kontakten ignoreras inte längre';
-$a->strings['stopped following'] = 'följer inte längre';
-$a->strings['Contact has been removed.'] = 'Kontakten har tagits bort.';
-$a->strings['Contact not found.'] = 'Kontakten hittades inte.';
-$a->strings['Mutual Friendship'] = 'Ömsesidig vänskap';
-$a->strings['is a fan of yours'] = 'är ett fan till dig';
-$a->strings['you are a fan of'] = 'du är fan till';
-$a->strings['Privacy Unavailable'] = 'Inte tillgängligt';
-$a->strings['Private communications are not available for this contact.'] = 'Det går inte att utbyta personliga meddelanden med den här kontakten.';
-$a->strings['Never'] = 'Aldrig';
-$a->strings["\x28Update was successful\x29"] = "(Uppdateringen lyckades)";
-$a->strings["\x28Update was not successful\x29"] = "(Uppdateringen lyckades inte)";
-$a->strings['Contact Editor'] = 'Ändra kontakter';
-$a->strings['Visit $name\'s profile'] = 'Besök $name ';
-$a->strings['Block/Unblock contact'] = 'Spärra kontakt eller häv spärr';
-$a->strings['Ignore contact'] = 'Ignorera kontakt';
-$a->strings['Delete contact'] = 'Ta bort kontakt';
-$a->strings['Last updated: '] = 'Uppdaterad senast: ';
-$a->strings['Update public posts: '] = 'Uppdatera offentliga inlägg: ';
-$a->strings['Update now'] = 'Updatera nu';
-$a->strings['Unblock this contact'] = 'Häv spärr för kontakt';
-$a->strings['Block this contact'] = 'Spärra kontakt';
-$a->strings['Unignore this contact'] = 'Ignorera inte längre kontakt';
-$a->strings['Ignore this contact'] = 'Ignorera kontakt';
-$a->strings['Currently blocked'] = 'Spärrad';
-$a->strings['Currently ignored'] = 'Ignoreras';
-$a->strings['Contacts'] = 'Kontakter';
-$a->strings['Show Blocked Connections'] = 'Visa spärrade kontakter';
-$a->strings['Hide Blocked Connections'] = 'Dölj spärrade kontakter';
-$a->strings['Finding: '] = 'Hittar: ';
-$a->strings['Find'] = 'Sök';
-$a->strings['Visit $username\'s profile'] = 'Gå till profilen som tillhör $username';
-$a->strings['Edit contact'] = 'Ändra kontakt';
-$a->strings['Profile not found.'] = 'Profilen hittades inte.';
-$a->strings['Response from remote site was not understood.'] = 'Kunde inte tolka svaret från fjärrsajten.';
-$a->strings['Unexpected response from remote site: '] = 'Oväntat svar från fjärrsajten: ';
-$a->strings["Confirmation completed successfully."] = "Bekräftat.";
-$a->strings['Remote site reported: '] = 'Meddelande från fjärrsajten: ';
-$a->strings["Temporary failure. Please wait and try again."] = "Tillfälligt fel. Försök igen lite senare.";
-$a->strings["Introduction failed or was revoked."] = "Kontaktförfrågan gick inte fram eller har återkallats.";
-$a->strings['Unable to set contact photo.'] = 'Det gick inte att byta profilbild.';
-$a->strings['is now friends with'] = 'är nu vän med';
-$a->strings['Our site encryption key is apparently messed up.'] = 'Det är något fel på webbplatsens krypteringsnyckel.';
-$a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Empty site URL was provided or URL could not be decrypted by us.';
-$a->strings['Contact record was not found for you on our site.'] = 'Det gick inte att hitta efterfrågad information på vår webbplats.';
-$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'Det ID som angavs av ditt system är samma som på vårt system. Det borde fungera om du provar igen.';
-$a->strings['Unable to set your contact credentials on our system.'] = 'Unable to set your contact credentials on our system.';
-$a->strings['Unable to update your contact profile details on our system'] = 'Unable to update your contact profile details on our system';
-$a->strings["Connection accepted at %s"] = "Kontaktförfrågan beviljad - %s";
-$a->strings['Administrator'] = 'Admin';
-$a->strings['noreply'] = 'noreply';
-$a->strings["%s commented on an item at %s"] = "%s har kommenterat ett inlägg på %s";
-$a->strings["This introduction has already been accepted."] = "Den här förfrågan har redan beviljats.";
-$a->strings['Profile location is not valid or does not contain profile information.'] = 'Profiladressen är ogiltig eller innehåller ingen profilinformation.';
-$a->strings['Warning: profile location has no identifiable owner name.'] = 'Varning: Hittar inget namn som identifierar profilen.';
-$a->strings['Warning: profile location has no profile photo.'] = 'Varning: Profilen innehåller inte någon profilbild.';
-$a->strings["Introduction complete."] = "Kontaktförfrågan/Presentationen är klar.";
-$a->strings['Unrecoverable protocol error.'] = 'Protokollfel.';
-$a->strings['Profile unavailable.'] = 'Profilen är inte tillgänglig.';
-$a->strings['%s has received too many connection requests today.'] = '%s har fått för många kontaktförfrågningar idag.';
-$a->strings['Spam protection measures have been invoked.'] = 'Åtgärder för spamskydd har vidtagits.';
-$a->strings['Friends are advised to please try again in 24 hours.'] = 'Dina vänner kan prova igen om ett dygn.';
-$a->strings["Invalid locator"] = "Invalid locator";
-$a->strings["Unable to resolve your name at the provided location."] = "Unable to resolve your name at the provided location.";
-$a->strings['You have already introduced yourself here.'] = 'Du har redan presenterat dig här.';
-$a->strings['Apparently you are already friends with .'] = 'Du är redan vän med .';
-$a->strings['Invalid profile URL.'] = 'Ogiltig profil-URL.';
-$a->strings['Disallowed profile URL.'] = 'Otillåten profil-URL.';
-$a->strings['Your introduction has been sent.'] = 'Kontaktförfrågan/Presentationen har skickats.';
-$a->strings["Please login to confirm introduction."] = "Logga in för att acceptera förfrågan.";
-$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Inloggad med fel identitet. Logga in med <strong>den här</strong> profilen.";
-$a->strings['[Name Withheld]'] = '[Namnet visas inte]';
-$a->strings["Introduction received at "] = "Inkommen kontaktförfrågan/presentation - ";
-$a->strings['Friend/Connection Request'] = 'Vän- eller kontaktförfrågan';
-$a->strings['Please answer the following:'] = 'Var vänlig besvara följande:';
-$a->strings['Does $name know you?'] = 'Känner $name dig?';
-$a->strings['Yes'] = 'Ja';
-$a->strings['No'] = 'Nej';
-$a->strings['Add a personal note:'] = 'Lägg till ett personligt meddelande:';
-$a->strings['Please enter your profile address from one of the following supported social networks:'] = 'Ange din profiladress på ett av följande sociala nätverk:';
-$a->strings['Friendika'] = 'Friendika';
-$a->strings['StatusNet/Federated Social Web'] = 'StatusNet/Federated Social Web';
-$a->strings["Private \x28secure\x29 network"] = "Privat (säkert) nätverk";
-$a->strings["Public \x28insecure\x29 network"] = "Offentligt (osäkert) nätverk";
-$a->strings['Your profile address:'] = 'Din profiladress:';
-$a->strings['Submit Request'] = 'Skicka förfrågan';
-$a->strings['Cancel'] = 'Avbryt';
+;
+$a->strings["Not Found"] = "Hittar inte";
+$a->strings["Page not found."] = "Sidan hittades inte.";
+$a->strings["Permission denied"] = "&Aring;tkomst nekad";
+$a->strings["Permission denied."] = "&Aring;tkomst nekad.";
+$a->strings["Delete this item?"] = "Ta bort?";
+$a->strings["Comment"] = "Kommentera";
+$a->strings["Create a New Account"] = "Skapa nytt konto";
+$a->strings["Register"] = "Registrera";
+$a->strings["Nickname or Email address: "] = "Anv&auml;ndarnamn eller e-postadress: ";
+$a->strings["Password: "] = "L&ouml;senord: ";
+$a->strings["Login"] = "Logga in";
+$a->strings["Nickname/Email/OpenID: "] = "Anv&auml;ndarnamn/e-post/OpenID: ";
+$a->strings["Password (if not OpenID): "] = "L&ouml;senord (om inget OpenID): ";
+$a->strings["Forgot your password?"] = "Har du gl&ouml;mt l&ouml;senordet?";
+$a->strings["Password Reset"] = "Gl&ouml;mt l&ouml;senordet?";
+$a->strings["Logout"] = "Logga ut";
+$a->strings["prev"] = "f&ouml;reg";
+$a->strings["first"] = "f&ouml;rsta";
+$a->strings["last"] = "sista";
+$a->strings["next"] = "n&auml;sta";
+$a->strings["%s likes this."] = "%s gillar det h&auml;r.";
+$a->strings["%s doesn't like this."] = "%s ogillar det h&auml;r.";
+$a->strings["<span  %1\$s>%2\$d people</span> like this."] = "<span  %1\$s>%2\$d personer</span> gillar det h&auml;r.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "<span  %1\$s>%2\$d personer</span> ogillar det h&auml;r.";
+$a->strings["and"] = "och";
+$a->strings[", and %d other people"] = ", och ytterligare %d personer";
+$a->strings["%s like this."] = "%s gillar det h&auml;r.";
+$a->strings["%s don't like this."] = "%s ogillar det h&auml;r.";
+$a->strings["No contacts"] = "Inga kontakter";
+$a->strings["%d Contact"] = array(
+	0 => "%d kontakt",
+	1 => "%d kontakter",
+);
+$a->strings["View Contacts"] = "Visa kontakter";
+$a->strings["Search"] = "S&ouml;k";
+$a->strings["No profile"] = "Ingen profil";
+$a->strings["Connect"] = "Skicka kontaktf&ouml;rfr&aring;gan";
+$a->strings["Location:"] = "Plats:";
+$a->strings[", "] = ", ";
+$a->strings["Gender:"] = "K&ouml;n:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Hemsida:";
+$a->strings["Monday"] = "m&aring;ndag";
+$a->strings["Tuesday"] = "tisdag";
+$a->strings["Wednesday"] = "onsdag";
+$a->strings["Thursday"] = "torsdag";
+$a->strings["Friday"] = "fredag";
+$a->strings["Saturday"] = "l&ouml;rdag";
+$a->strings["Sunday"] = "s&ouml;ndag";
+$a->strings["January"] = "januari";
+$a->strings["February"] = "februari";
+$a->strings["March"] = "mars";
+$a->strings["April"] = "april";
+$a->strings["May"] = "maj";
+$a->strings["June"] = "juni";
+$a->strings["July"] = "juli";
+$a->strings["August"] = "augusti";
+$a->strings["September"] = "september";
+$a->strings["October"] = "oktober";
+$a->strings["November"] = "november";
+$a->strings["December"] = "december";
+$a->strings["g A l F d"] = "g A l F d";
+$a->strings["Birthday Reminders"] = "F&ouml;delsedagsp&aring;minnelser";
+$a->strings["Birthdays this week:"] = "F&ouml;delsedagar denna vecka:";
+$a->strings["(Adjusted for local time)"] = "(Justerat till lokal tid)";
+$a->strings["[today]"] = "[idag]";
+$a->strings["link to source"] = "l&auml;nk till k&auml;lla";
+$a->strings["View status"] = "Visa status";
+$a->strings["View profile"] = "Visa profil";
+$a->strings["View photos"] = "Visa bilder";
+$a->strings["Edit contact"] = "&Auml;ndra kontakt";
+$a->strings["Send PM"] = "Skicka personligt meddelande";
+$a->strings["Welcome back %s"] = "V&auml;lkommen tillbaka %s";
+$a->strings["Manage Identities and/or Pages"] = "Hantera identiteter eller sidor";
+$a->strings["(Toggle between different identities or community/group pages which share your account details.)"] = "(V&auml;xla mellan olika identiteter eller gemenskaper/gruppsidor som &auml;r kopplade till ditt konto.)";
+$a->strings["Select an identity to manage: "] = "V&auml;lj vilken identitet du vill hantera: ";
+$a->strings["Submit"] = "Spara";
+$a->strings["Image exceeds size limit of %d"] = "Bilden &ouml;verskrider maxgr&auml;nsen %d";
+$a->strings["Unable to process image."] = "Det gick inte att behandla bilden.";
+$a->strings["Wall Photos"] = "Loggbilder";
+$a->strings["Image upload failed."] = "Fel vid bilduppladdning.";
+$a->strings["Administrator"] = "Admin";
+$a->strings["noreply"] = "noreply";
+$a->strings["New mail received at "] = "Nytt meddelande mottaget p&aring; ";
+$a->strings["%s commented on an item at %s"] = "%s har kommenterat ett inl&auml;gg p&aring; %s";
+$a->strings["Status"] = "Status";
+$a->strings["Profile"] = "Profil";
+$a->strings["Photos"] = "Bilder";
+$a->strings["Please enter a link URL:"] = "Ange en l&auml;nk (URL):";
+$a->strings["Please enter a YouTube link:"] = "Ange en YouTube-l&auml;nk:";
+$a->strings["Please enter a video(.ogg) link/URL:"] = "Ange l&auml;nk/URL till video (.ogg):";
+$a->strings["Please enter an audio(.ogg) link/URL:"] = "Ange l&auml;nk/URL till ljud (.ogg):";
+$a->strings["Where are you right now?"] = "Var &auml;r du just nu?";
+$a->strings["Enter a title for this item"] = "Ange en rubrik p&aring; inl&auml;gget";
+$a->strings["Share"] = "Publicera";
+$a->strings["Upload photo"] = "Ladda upp bild";
+$a->strings["Insert web link"] = "Infoga l&auml;nk";
+$a->strings["Insert YouTube video"] = "Infoga video fr&aring;n YouTube";
+$a->strings["Insert Vorbis [.ogg] video"] = "L&auml;gg in video i format Vorbis [.ogg]";
+$a->strings["Insert Vorbis [.ogg] audio"] = "L&auml;gg in ljud i format Vorbis [.ogg]";
+$a->strings["Set your location"] = "Ange plats";
+$a->strings["Clear browser location"] = "Clear browser location";
+$a->strings["Set title"] = "Ange rubrik";
+$a->strings["Please wait"] = "V&auml;nta";
+$a->strings["Permission settings"] = "&Aring;tkomstinst&auml;llningar";
+$a->strings["CC: email addresses"] = "Kopia: e-postadresser";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Exempel: adam@exempel.com, bertil@exempel.com";
+$a->strings["See all %d comments"] = "Visa alla %d kommentarer";
+$a->strings["Private Message"] = "Personligt meddelande";
+$a->strings["I like this (toggle)"] = "Jag gillar det h&auml;r (v&auml;xla)";
+$a->strings["I don't like this (toggle)"] = "Jag ogillar det h&auml;r (v&auml;xla)";
+$a->strings["This is you"] = "Det h&auml;r &auml;r du";
+$a->strings["Edit"] = "&Auml;ndra";
+$a->strings["Delete"] = "Ta bort";
+$a->strings["View \$name's profile"] = "G&aring; till profilen som tillh&ouml;r \$name";
+$a->strings["Shared content is covered by the <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."] = "Inneh&aring;llet omfattas av licensen <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0</a>.";
+$a->strings["The profile address specified does not provide adequate information."] = "Angiven profiladress ger inte tillr&auml;cklig information.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Begr&auml;nsad profil. Den h&auml;r personen kommer inte att kunna ta emot personliga meddelanden fr&aring;n dig.";
+$a->strings["Unable to retrieve contact information."] = "Det gick inte att komma &aring;t kontaktinformationen.";
+$a->strings["following"] = "f&ouml;ljer";
+$a->strings["Image uploaded but image cropping failed."] = "Bilden laddades upp men det blev fel n&auml;r den skulle besk&auml;ras.";
+$a->strings["Profile Photos"] = "Profilbilder";
+$a->strings["Image size reduction [%s] failed."] = "Det gick inte att minska bildstorleken [%s].";
+$a->strings["Unable to process image"] = "Det gick inte att behandla bilden";
+$a->strings["Upload File:"] = "Ladda upp fil:";
+$a->strings["Upload Profile Photo"] = "Ladda upp profilbild";
+$a->strings["Upload"] = "Ladda upp";
+$a->strings["or"] = "eller";
+$a->strings["select a photo from your photo albums"] = "v&auml;lj en bild fr&aring;n ett album";
+$a->strings["Crop Image"] = "Besk&auml;r bild";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "V&auml;lj hur bilden ska besk&auml;ras f&ouml;r att bli s&aring; bra som m&ouml;jligt.";
+$a->strings["Done Editing"] = "Spara";
+$a->strings["Image uploaded successfully."] = "Bilden har laddats upp.";
+$a->strings["Welcome to %s"] = "V&auml;lkommen till %s";
+$a->strings["Please login."] = "Logga in.";
+$a->strings["Registration revoked for %s"] = "Registreringen har avslagits - %s";
+$a->strings["Registration details for %s"] = "Registrering, detaljer - %s";
+$a->strings["Account approved."] = "Kontot har godk&auml;nts.";
+$a->strings["Profile not found."] = "Profilen hittades inte.";
+$a->strings["Profile Name is required."] = "Profilen m&aring;ste ha ett namn.";
+$a->strings["Profile updated."] = "Profilen har uppdaterats.";
+$a->strings["Profile deleted."] = "Profilen har tagits bort.";
+$a->strings["Profile-"] = "Profil-";
+$a->strings["New profile created."] = "En ny profil har skapats.";
+$a->strings["Profile unavailable to clone."] = "Det gick inte att klona profilen.";
+$a->strings["Hide my contact/friend list from viewers of this profile?"] = "D&ouml;lj min kontaktlista f&ouml;r personer som ser den h&auml;r profilen?";
+$a->strings["Yes"] = "Ja";
+$a->strings["No"] = "Nej";
+$a->strings["Edit Profile Details"] = "&Auml;ndra profilen";
+$a->strings["View this profile"] = "Titta p&aring; profilen";
+$a->strings["Create a new profile using these settings"] = "Skapa en ny profil med dessa inst&auml;llningar";
+$a->strings["Clone this profile"] = "Kopiera profil";
+$a->strings["Delete this profile"] = "Ta bort profil";
+$a->strings["Profile Name:"] = "Profilens namn:";
+$a->strings["Your Full Name:"] = "Fullst&auml;ndigt namn:";
+$a->strings["Title/Description:"] = "Titel/Beskrivning:";
+$a->strings["Your Gender:"] = "K&ouml;n:";
+$a->strings["Birthday (y/m/d):"] = "F&ouml;delsedag: (y/m/d)";
+$a->strings["Street Address:"] = "Gatuadress:";
+$a->strings["Locality/City:"] = "Plats/Stad:";
+$a->strings["Postal/Zip Code:"] = "Postnummer:";
+$a->strings["Country:"] = "Land:";
+$a->strings["Region/State:"] = "Region:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Civilst&aring;nd:";
+$a->strings["Who: (if applicable)"] = "Vem: ";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Exempel: kalle123, Johanna Johansson, pelle@exempel.com";
+$a->strings["Sexual Preference:"] = "Sexualitet";
+$a->strings["Homepage URL:"] = "Hemsida: (URL)";
+$a->strings["Political Views:"] = "Politisk &aring;sk&aring;dning:";
+$a->strings["Religious Views:"] = "Religion:";
+$a->strings["Public Keywords:"] = "Offentliga nyckelord:";
+$a->strings["Private Keywords:"] = "Privata nyckelord:";
+$a->strings["Example: fishing photography software"] = "Exempel: fiske fotografering programmering";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Obs, synliga f&ouml;r andra. Anv&auml;nds f&ouml;r att f&ouml;resl&aring; potentiella v&auml;nner.)";
+$a->strings["(Used for searching profiles, never shown to others)"] = "(Obs, kan ge s&ouml;ktr&auml;ffar vid s&ouml;kning av profiler. Visas annars inte f&ouml;r andra.)";
+$a->strings["Tell us about yourself..."] = "Beskriv dig sj&auml;lv...";
+$a->strings["Hobbies/Interests"] = "Hobbys/Intressen";
+$a->strings["Contact information and Social Networks"] = "Kontaktuppgifter och sociala n&auml;tverk";
+$a->strings["Musical interests"] = "Musik";
+$a->strings["Books, literature"] = "B&ouml;cker, litteratur";
+$a->strings["Television"] = "TV";
+$a->strings["Film/dance/culture/entertainment"] = "Film/Dans/Kultur/N&ouml;je";
+$a->strings["Love/romance"] = "K&auml;rlek/Romantik";
+$a->strings["Work/employment"] = "Arbete";
+$a->strings["School/education"] = "Skola/Utbildning";
+$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Det h&auml;r &auml;r din <strong>offentliga</strong> profil.<br />Den <strong>kan vara synlig f&ouml;r vem som helst</strong> p&aring; internet.";
+$a->strings["Age: "] = "&Aring;lder: ";
+$a->strings["Profiles"] = "Profiler";
+$a->strings["Change profile photo"] = "Byt profilbild";
+$a->strings["Create New Profile"] = "Skapa ny profil";
+$a->strings["Profile Image"] = "Profilbild";
+$a->strings["Passwords do not match. Password unchanged."] = "L&ouml;senorden skiljer sig &aring;t. L&ouml;senordet &auml;ndras inte.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "L&ouml;senordet f&aring;r inte vara blankt. L&ouml;senordet &auml;ndras inte.";
+$a->strings["Password changed."] = "L&ouml;senordet har &auml;ndrats.";
+$a->strings["Password update failed. Please try again."] = "Det blev fel n&auml;r l&ouml;senordet skulle &auml;ndras. F&ouml;rs&ouml;k igen.";
+$a->strings[" Please use a shorter name."] = " Anv&auml;nd ett kortare namn.";
+$a->strings[" Name too short."] = " Namnet &auml;r f&ouml;r kort.";
+$a->strings[" Not valid email."] = " Ogiltig e-postadress.";
+$a->strings[" Cannot change to that email."] = " &Auml;ndring till den e-postadressen g&ouml;rs inte.";
+$a->strings["Settings updated."] = "Inst&auml;llningarna har uppdaterats.";
+$a->strings["Plugin Settings"] = "Inst&auml;llningar f&ouml;r insticksprogram";
+$a->strings["Account Settings"] = "Kontoinst&auml;llningar";
+$a->strings["No Plugin settings configured"] = "Det finns inga inst&auml;llningar f&ouml;r insticksprogram";
+$a->strings["Normal Account"] = "Vanligt konto";
+$a->strings["This account is a normal personal profile"] = "Kontot &auml;r ett vanligt personligt konto";
+$a->strings["Soapbox Account"] = "Konto med env&auml;gskommunikation";
+$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Kontaktf&ouml;rfr&aring;gningar godk&auml;nns automatiskt som fans. De kan se vad du skriver men har inte samma r&auml;ttigheter som v&auml;nner.";
+$a->strings["Community/Celebrity Account"] = "Gemenskap eller k&auml;ndiskonto.";
+$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Kontaktf&ouml;rfr&aring;gningar godk&auml;nns automatiskt som fans med fullst&auml;ndig tv&aring;v&auml;gskommunikation.";
+$a->strings["Automatic Friend Account"] = "Konto med automatiskt godk&auml;nnande av v&auml;nner.";
+$a->strings["Automatically approve all connection/friend requests as friends"] = "Kontaktf&ouml;rfr&aring;gningar godk&auml;nns automatiskt som v&auml;nner.";
+$a->strings["OpenID: "] = "OpenID: ";
+$a->strings["&nbsp;(Optional) Allow this OpenID to login to this account."] = "&nbsp;(Valfritt) Till&aring;t inloggning med detta OpenID p&aring; det h&auml;r kontot.";
+$a->strings["Publish your default profile in site directory?"] = "Vill du att din standardprofil ska synas i den h&auml;r sajtens medlemskatalog?";
+$a->strings["Publish your default profile in global social directory?"] = "Vill du att din standardprofil ska synas i den globala medlemskatalogen?";
+$a->strings["Profile is <strong>not published</strong>."] = "Profilen &auml;r <strong>inte publicerad</strong>.";
+$a->strings["Your profile address is"] = "Din profiladress &auml;r";
+$a->strings["Export Personal Data"] = "Exportera personlig information";
+$a->strings["Basic Settings"] = "Grundl&auml;ggande inst&auml;llningar";
+$a->strings["Full Name:"] = "Fullst&auml;ndigt namn:";
+$a->strings["Email Address:"] = "E-postadress:";
+$a->strings["Your Timezone:"] = "Tidszon:";
+$a->strings["Default Post Location:"] = "Default Post Location:";
+$a->strings["Use Browser Location:"] = "Anv&auml;nd webbl&auml;sarens positionering:";
+$a->strings["Display Theme:"] = "Tema/utseende:";
+$a->strings["Security and Privacy Settings"] = "Inst&auml;llningar f&ouml;r s&auml;kerhet och sekretess";
+$a->strings["Maximum Friend Requests/Day:"] = "Maximalt antal kontaktf&ouml;rfr&aring;gningar per dygn:";
+$a->strings["(to prevent spam abuse)"] = "(f&ouml;r att motverka spam)";
+$a->strings["Allow friends to post to your profile page:"] = "L&aring;t kontakter g&ouml;ra inl&auml;gg p&aring; din profilsida:";
+$a->strings["Automatically expire (delete) posts older than"] = "Ta automatiskt bort inl&auml;gg som &auml;r &auml;ldre &auml;n";
+$a->strings["days"] = "dagar";
+$a->strings["Notification Settings"] = "Aviseringsinst&auml;llningar";
+$a->strings["Send a notification email when:"] = "Skicka ett aviseringsmail n&auml;r:";
+$a->strings["You receive an introduction"] = "En kontaktf&ouml;rfr&aring;gan anl&auml;nder";
+$a->strings["Your introductions are confirmed"] = "Dina f&ouml;rfr&aring;gningar godk&auml;nns";
+$a->strings["Someone writes on your profile wall"] = "N&aring;gon g&ouml;r inl&auml;gg p&aring; din profilsida";
+$a->strings["Someone writes a followup comment"] = "N&aring;gon g&ouml;r ett inl&auml;gg i samma tr&aring;d som du";
+$a->strings["You receive a private message"] = "Du f&aring;r personliga meddelanden";
+$a->strings["Password Settings"] = "L&ouml;senordsinst&auml;llningar";
+$a->strings["Leave password fields blank unless changing"] = "L&auml;mna f&auml;ltet tomt om du inte vill byta l&ouml;senord";
+$a->strings["New Password:"] = "Nytt l&ouml;senord";
+$a->strings["Confirm:"] = "Bekr&auml;fta (repetera):";
+$a->strings["Advanced Page Settings"] = "Avancerat";
+$a->strings["Default Post Permissions"] = "Standard&aring;tkomst f&ouml;r inl&auml;gg";
+$a->strings["No results."] = "Inga resultat.";
+$a->strings["View in context"] = "Visa i sitt sammanhang";
+$a->strings["Photo Albums"] = "Fotoalbum";
+$a->strings["Contact Photos"] = "Dina kontakters bilder";
+$a->strings["Contact information unavailable"] = "Kommer inte &aring;t kontaktuppgifter.";
+$a->strings["Album not found."] = "Albumet finns inte.";
+$a->strings["Delete Album"] = "Ta bort album";
+$a->strings["Delete Photo"] = "Ta bort bild";
+$a->strings["was tagged in a"] = "har taggats i";
+$a->strings["photo"] = "bild";
+$a->strings["by"] = "av";
+$a->strings["Image exceeds size limit of "] = "Bilden &ouml;verskrider den till&aring;tna storleken ";
+$a->strings["No photos selected"] = "Inga bilder har valts";
+$a->strings["Upload Photos"] = "Ladda upp bilder";
+$a->strings["New album name: "] = "Nytt album med namn: ";
+$a->strings["or existing album name: "] = "eller befintligt album med namn: ";
+$a->strings["Permissions"] = "&Aring;tkomst";
+$a->strings["Edit Album"] = "Redigera album";
+$a->strings["View Photo"] = "Visa bild";
+$a->strings["Photo not available"] = "Bilden &auml;r inte tillg&auml;nglig";
+$a->strings["Edit photo"] = "Hantera bild";
+$a->strings["Use as profile photo"] = "Anv&auml;nd som profilbild";
+$a->strings["<< Prev"] = "<< F&ouml;reg";
+$a->strings["View Full Size"] = "Visa fullstor";
+$a->strings["Next >>"] = "N&auml;sta >>";
+$a->strings["Tags: "] = "Taggar: ";
+$a->strings["[Remove any tag]"] = "[Remove any tag]";
+$a->strings["New album name"] = "Nytt album med namn";
+$a->strings["Caption"] = "Caption";
+$a->strings["Add a Tag"] = "L&auml;gg till tagg";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Exempel: @adam, @Anna_Andersson, @johan@exempel.com, #Stockholm, #camping";
+$a->strings["Recent Photos"] = "Nyligen tillagda bilder";
+$a->strings["Upload New Photos"] = "Ladda upp bilder";
+$a->strings["View Album"] = "Titta i album";
+$a->strings["Item not found."] = "Hittar inte.";
+$a->strings["View \$owner_name's profile"] = "G&aring; till profilen som tillh&ouml;r \$owner_name";
+$a->strings["to"] = "till";
+$a->strings["Wall-to-Wall"] = "Profil-till-profil";
+$a->strings["via Wall-To-Wall:"] = "via profil-till-profil:";
+$a->strings["Item has been removed."] = "Har tagits bort.";
+$a->strings["Item not found"] = "Hittades inte";
+$a->strings["Edit post"] = "&Auml;ndra inl&auml;gg";
+$a->strings["%s : Not a valid email address."] = "%s : Ogiltig e-postadress.";
+$a->strings["Please join my network on %s"] = "G&aring; g&auml;rna med i mitt n&auml;tverk p&aring; %s";
+$a->strings["%s : Message delivery failed."] = "%s : Meddelandet kom inte fram.";
+$a->strings["%d message sent."] = array(
+	0 => "%d skickat meddelande.",
+	1 => "%d skickade meddelanden.",
+);
+$a->strings["Send invitations"] = "Skicka inbjudningar";
+$a->strings["Enter email addresses, one per line:"] = "Ange e-postadresser, en per rad:";
+$a->strings["Your message:"] = "Meddelande:";
+$a->strings["Please join my social network on %s"] = "G&aring; g&auml;rna med i mitt sociala n&auml;tverk p&aring; %s";
+$a->strings["To accept this invitation, please visit:"] = "G&aring; hit f&ouml;r att tacka ja till inbjudan:";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Vi kan bli kontakter via min profil. Bes&ouml;k min profil h&auml;r n&auml;r du har registrerat dig:";
+$a->strings["Invite Friends"] = "Bjud in folk du k&auml;nner";
+$a->strings["Find People With Shared Interests"] = "S&ouml;k personer som har samma intressen som du";
+$a->strings["Connect/Follow"] = "G&ouml;r till kontakt/F&ouml;lj";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Exempel: adam@exempel.com, http://exempel.com/bertil";
+$a->strings["Follow"] = "F&ouml;lj";
+$a->strings["Could not access contact record."] = "Hittar inte information om kontakten.";
+$a->strings["Could not locate selected profile."] = "Hittar inte vald profil.";
+$a->strings["Contact updated."] = "Kontakten har uppdaterats.";
+$a->strings["Failed to update contact record."] = "Det blev fel n&auml;r kontakten skulle uppdateras.";
+$a->strings["Contact has been blocked"] = "Kontakten har sp&auml;rrats";
+$a->strings["Contact has been unblocked"] = "Kontakten &auml;r inte l&auml;ngre sp&auml;rrad";
+$a->strings["Contact has been ignored"] = "Kontakten ignoreras";
+$a->strings["Contact has been unignored"] = "Kontakten ignoreras inte l&auml;ngre";
+$a->strings["stopped following"] = "f&ouml;ljer inte l&auml;ngre";
+$a->strings["Contact has been removed."] = "Kontakten har tagits bort.";
+$a->strings["Contact not found."] = "Kontakten hittades inte.";
+$a->strings["Mutual Friendship"] = "&Ouml;msesidig v&auml;nskap";
+$a->strings["is a fan of yours"] = "&auml;r ett fan till dig";
+$a->strings["you are a fan of"] = "du &auml;r fan till";
+$a->strings["Privacy Unavailable"] = "Inte tillg&auml;ngligt";
+$a->strings["Private communications are not available for this contact."] = "Det g&aring;r inte att utbyta personliga meddelanden med den h&auml;r kontakten.";
+$a->strings["Never"] = "Aldrig";
+$a->strings["(Update was successful)"] = "(Uppdateringen lyckades)";
+$a->strings["(Update was not successful)"] = "(Uppdateringen lyckades inte)";
+$a->strings["Contact Editor"] = "&Auml;ndra kontakter";
+$a->strings["Profile Visibility"] = "Visning av profil";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "V&auml;lj vilken profil som ska visas f&ouml;r %s n&auml;r han/hon bes&ouml;ker din sida.";
+$a->strings["Contact Information / Notes"] = "Kontaktuppgifter/Anteckningar";
+$a->strings["Online Reputation"] = "Rykte online";
+$a->strings["Occasionally your friends may wish to inquire about this person's online legitimacy."] = "Dina kontakter kanske vill veta n&aring;got om den h&auml;r personens rykte online innan de tar kontakt.";
+$a->strings["You may help them choose whether or not to interact with this person by providing a <em>reputation</em> to guide them."] = "Du kan vara till hj&auml;lp genom att ange personens rykte online.";
+$a->strings["Please take a moment to elaborate on this selection if you feel it could be helpful to others."] = "&Auml;gna g&auml;rna en stund &aring;t att ange detta f&ouml;r att hj&auml;lpa andra.";
+$a->strings["Visit \$name's profile"] = "Bes&ouml;k \$name ";
+$a->strings["Block/Unblock contact"] = "Sp&auml;rra kontakt eller h&auml;v sp&auml;rr";
+$a->strings["Ignore contact"] = "Ignorera kontakt";
+$a->strings["Delete contact"] = "Ta bort kontakt";
+$a->strings["Last updated: "] = "Uppdaterad senast: ";
+$a->strings["Update public posts: "] = "Uppdatera offentliga inl&auml;gg: ";
+$a->strings["Update now"] = "Updatera nu";
+$a->strings["Unblock this contact"] = "H&auml;v sp&auml;rr f&ouml;r kontakt";
+$a->strings["Block this contact"] = "Sp&auml;rra kontakt";
+$a->strings["Unignore this contact"] = "Ignorera inte l&auml;ngre kontakt";
+$a->strings["Ignore this contact"] = "Ignorera kontakt";
+$a->strings["Currently blocked"] = "Sp&auml;rrad";
+$a->strings["Currently ignored"] = "Ignoreras";
+$a->strings["Contacts"] = "Kontakter";
+$a->strings["Show Blocked Connections"] = "Visa sp&auml;rrade kontakter";
+$a->strings["Hide Blocked Connections"] = "D&ouml;lj sp&auml;rrade kontakter";
+$a->strings["Finding: "] = "Hittar: ";
+$a->strings["Find"] = "S&ouml;k";
+$a->strings["Visit \$username's profile"] = "G&aring; till profilen som tillh&ouml;r \$username";
+$a->strings["Remote privacy information not available."] = "Remote privacy information not available.";
+$a->strings["Visible to:"] = "Synlig f&ouml;r:";
+$a->strings["Invalid OpenID url"] = "Ogiltig OpenID-URL";
+$a->strings["Please enter the required information."] = "Fyll i alla obligatoriska f&auml;lt.";
+$a->strings["Please use a shorter name."] = "V&auml;lj ett kortare namn.";
+$a->strings["Name too short."] = "Namnet &auml;r f&ouml;r kort.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Du verkar inte ha angett ditt fullst&auml;ndiga namn.";
+$a->strings["Your email domain is not among those allowed on this site."] = "Din e-postdom&auml;n &auml;r inte till&aring;ten p&aring; den h&auml;r webbplatsen.";
+$a->strings["Not a valid email address."] = "Ogiltig e-postadress.";
+$a->strings["Cannot use that email."] = "Otill&aring;ten e-postadress.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Ditt anv&auml;ndarnamn f&aring;r bara inneh&aring;lla \"a-z\", \"0-9\", \"-\" och \"_\", och m&aring;ste dessutom b&ouml;rja med en bokstav.";
+$a->strings["Nickname is already registered. Please choose another."] = "Anv&auml;ndarnamnet &auml;r upptaget. V&auml;lj ett annat.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "SERIOUS ERROR: Generation of security keys failed.";
+$a->strings["An error occurred during registration. Please try again."] = "N&aring;got gick fel vid registreringen. F&ouml;rs&ouml;k igen.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Det blev fel n&auml;r din standardprofil skulle skapas. Prova igen.";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Registrering klar. Kolla din e-post f&ouml;r vidare information.";
+$a->strings["Failed to send email message. Here is the message that failed."] = "Det gick inte att skicka e-brevet. H&auml;r &auml;r meddelandet som inte kunde skickas.";
+$a->strings["Your registration can not be processed."] = "Det g&aring;r inte att behandla registreringen.";
+$a->strings["Registration request at %s"] = "Beg&auml;ran om registrering p&aring; %s";
+$a->strings["Your registration is pending approval by the site owner."] = "Din registrering inv&auml;ntar godk&auml;nnande av webbplatsens &auml;gare.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Om du vill kan du fylla i detta formul&auml;r via OpenID genom att ange ditt OpenID och klicka p&aring; 'Registrera'.";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Om du inte vet vad OpenID &auml;r, eller inte vill anv&auml;nda det, kan du l&auml;mna det f&auml;ltet tomt och fylla i resten.";
+$a->strings["Your OpenID (optional): "] = "OpenID (om du vill): ";
+$a->strings["Include your profile in member directory?"] = "Ta med profilen i medlemskatalogen?";
+$a->strings["Registration"] = "Registrering";
+$a->strings["Your Full Name (e.g. Joe Smith): "] = "Fullst&auml;ndigt namn (t. ex. Karl Karlsson): ";
+$a->strings["Your Email Address: "] = "E-postadress: ";
+$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>'."] = "V&auml;lj ett anv&auml;ndarnamn. Det m&aring;ste inledas med en bokstav. Din profiladress p&aring; den h&auml;r webbplatsen blir '<strong>anv&auml;ndarnamn@\$sitename</strong>'.";
+$a->strings["Choose a nickname: "] = "V&auml;lj ett anv&auml;ndarnamn: ";
+$a->strings["Post successful."] = "Inlagt.";
+$a->strings["Could not create/connect to database."] = "Det gick inte att skapa eller ansluta till databasen.";
+$a->strings["Connected to database."] = "Ansluten till databasen.";
+$a->strings["Proceed with Installation"] = "Forts&auml;tt med installationen";
+$a->strings["Your Friendika site database has been installed."] = "Databasen f&ouml;r din friendikasajt har installerats.";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: You will need to [manually] setup a scheduled task for the poller.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Se filen \"INSTALL.txt\".";
+$a->strings["Proceed to registration"] = "G&aring; vidare till registreringen";
+$a->strings["Database import failed."] = "Det gick inte att importera databasen.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Du kanske m&aring;ste importera filen \"database.sql\" manuellt med phpmyadmin eller mysql.";
+$a->strings["Welcome to Friendika."] = "V&auml;lkommen till Friendika.";
+$a->strings["Friendika Social Network"] = "Det sociala n&auml;tverket Friendika";
+$a->strings["Installation"] = "Installation";
+$a->strings["In order to install Friendika we need to know how to contact your database."] = "In order to install Friendika we need to know how to contact your database.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Please contact your hosting provider or site administrator if you have questions about these settings.";
+$a->strings["The database you specify below must already exist. If it does not, please create it before continuing."] = "The database you specify below must already exist. If it does not, please create it before continuing.";
+$a->strings["Database Server Name"] = "Database Server Name";
+$a->strings["Database Login Name"] = "Database Login Name";
+$a->strings["Database Login Password"] = "Database Login Password";
+$a->strings["Database Name"] = "Database Name";
+$a->strings["Please select a default timezone for your website"] = "Please select a default timezone for your website";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Could not find a command line version of PHP in the web server PATH.";
+$a->strings["This is required. Please adjust the configuration file .htconfig.php accordingly."] = "This is required. Please adjust the configuration file .htconfig.php accordingly.";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "The command line version of PHP on your system does not have \"register_argc_argv\" enabled.";
+$a->strings["This is required for message delivery to work."] = "Det kr&auml;vs f&ouml;r att meddelanden ska kunna levereras.";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fel: funktionen \"openssl_pkey_new\" kan inte skapa krypteringsnycklar";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "L&auml;s mer p&aring; \"http://www.php.net/manual/en/openssl.installation.php\" om du k&ouml;r Windows.";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: Apache webserver mod-rewrite module is required but not installed.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Error: libCURL PHP module required but not installed.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: GD graphics PHP module with JPEG support required but not installed.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Error: openssl PHP module required but not installed.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Error: mysqli PHP module required but not installed.";
+$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."] = "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.";
+$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."] = "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.";
+$a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Please check with your site documentation or support people to see if this situation can be corrected.";
+$a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions.";
+$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."] = "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root.";
+$a->strings["Errors encountered creating database tables."] = "Fel vid skapandet av databastabeller.";
+$a->strings["Normal View"] = "Byt till normalvy";
+$a->strings["New Item View"] = "Visa nya inl&auml;gg &ouml;verst";
+$a->strings["%d member"] = array(
+	0 => "%d medlem",
+	1 => "%d medlemmar",
+);
+$a->strings["Warning: This group contains %s from an insecure network."] = "Varning! Gruppen inneh&aring;ller %s p&aring; os&auml;kra n&auml;tverk.";
+$a->strings["Private messages to this group are at risk of public disclosure."] = "Meddelanden kan komma att bli synliga f&ouml;r vem som helst p&aring; internet.";
+$a->strings["No such group"] = "Gruppen finns inte";
+$a->strings["Group is empty"] = "Gruppen &auml;r tom";
+$a->strings["Group: "] = "Grupp: ";
+$a->strings["See more posts like this"] = "Leta inl&auml;gg som liknar det h&auml;r";
+$a->strings["Invalid request identifier."] = "Invalid request identifier.";
+$a->strings["Discard"] = "Ta bort";
+$a->strings["Ignore"] = "Ignorera";
+$a->strings["Pending Friend/Connect Notifications"] = "V&auml;ntande kontaktf&ouml;rfr&aring;gningar";
+$a->strings["Show Ignored Requests"] = "Visa f&ouml;rfr&aring;gningar du ignorerat";
+$a->strings["Hide Ignored Requests"] = "D&ouml;lj f&ouml;rfr&aring;gningar du ignorerat";
+$a->strings["Claims to be known to you: "] = "H&auml;vdar att du vet vem han/hon &auml;r: ";
+$a->strings["yes"] = "ja";
+$a->strings["no"] = "nej";
+$a->strings["Approve as: "] = "Godk&auml;nn och l&auml;gg till som: ";
+$a->strings["Friend"] = "V&auml;n";
+$a->strings["Fan/Admirer"] = "Fan/Beundrare";
+$a->strings["Notification type: "] = "Typ av avisering: ";
+$a->strings["Friend/Connect Request"] = "V&auml;n- eller kontaktf&ouml;rfr&aring;gan";
+$a->strings["New Follower"] = "En som vill f&ouml;lja dig";
+$a->strings["Approve"] = "Godk&auml;nn";
+$a->strings["No notifications."] = "Inga aviseringar.";
+$a->strings["User registrations waiting for confirm"] = "Anv&auml;ndare som registrerat sig och inv&auml;ntar godk&auml;nnande";
+$a->strings["Deny"] = "Avsl&aring;";
+$a->strings["No registrations."] = "Inga registreringar.";
+$a->strings["This introduction has already been accepted."] = "Den h&auml;r f&ouml;rfr&aring;gan har redan beviljats.";
+$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladressen &auml;r ogiltig eller inneh&aring;ller ingen profilinformation.";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Varning! Hittar inget namn som identifierar profilen.";
+$a->strings["Warning: profile location has no profile photo."] = "Varning! Profilen inneh&aring;ller inte n&aring;gon profilbild.";
 $a->strings["%d required parameter was not found at the given location"] = array(
 	0 => "%d required parameter was not found at the given location",
 	1 => "%d required parameters were not found at the given location",
 );
-$a->strings['Global Directory'] = 'Medlemskatalog för flera sajter';
-$a->strings['Age: '] = 'Ålder: ';
-$a->strings['Gender: '] = 'Kön: ';
-$a->strings["No entries \x28some entries may be hidden\x29."] = "Inget att visa. (Man kan välja att inte synas här)";
-$a->strings['Item not found.'] = 'Hittar inte.';
-$a->strings['Private Message'] = 'Personligt meddelande';
-$a->strings["I like this \x28toggle\x29"] = "Jag gillar det här (växla)";
-$a->strings["I don't like this \x28toggle\x29"] = "Jag ogillar det här (växla)";
-$a->strings['Share'] = 'Publicera';
-$a->strings['Please wait'] = 'Vänta';
-$a->strings['This is you'] = 'Det här är du';
-$a->strings['Edit'] = 'Ändra';
-$a->strings['Delete'] = 'Ta bort';
-$a->strings['View $name\'s profile'] = 'Gå till profilen som tillhör $name';
-$a->strings['View $owner_name\'s profile'] = 'Gå till profilen som tillhör $owner_name';
-$a->strings['to'] = 'till';
-$a->strings['Wall-to-Wall'] = 'Logg-till-logg';
-$a->strings['via Wall-To-Wall:'] = 'via Logg-till-logg:';
-$a->strings['Item has been removed.'] = 'Har tagits bort.';
-$a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Innehållet omfattas av licensen <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a>.';
-$a->strings['Item not found'] = 'Hittades inte';
-$a->strings['Edit post'] = 'Ändra inlägg';
-$a->strings['Upload photo'] = 'Ladda upp bild';
-$a->strings['Insert web link'] = 'Infoga länk';
-$a->strings['Insert YouTube video'] = 'Infoga video från YouTube';
-$a->strings['Insert Vorbis [.ogg] video'] = 'Lägg in video i format Vorbis [.ogg]';
-$a->strings['Insert Vorbis [.ogg] audio'] = 'Lägg in ljud i format Vorbis [.ogg]';
-$a->strings['Set your location'] = 'Ange plats';
-$a->strings['Clear browser location'] = 'Clear browser location';
-$a->strings['Permission settings'] = 'Åtkomstinställningar';
-$a->strings['CC: email addresses'] = 'Kopia: e-postadresser';
-$a->strings['Example: bob@example.com, mary@example.com'] = 'Exempel: adam@exempel.com, bertil@exempel.com';
-$a->strings['The profile address specified does not provide adequate information.'] = 'Angiven profiladress ger inte tillräcklig information.';
-$a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Begränsad profil. Den här personen kommer inte att kunna ta emot personliga meddelanden från dig.';
-$a->strings['Unable to retrieve contact information.'] = 'Det gick inte att komma åt kontaktinformationen.';
-$a->strings['following'] = 'följer';
-$a->strings['This is Friendika version'] = 'Det här är Friendika version';
-$a->strings['running at web location'] = 'som körs på';
-$a->strings['Shared content within the Friendika network is provided under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>'] = 'Innehåll som publiceras inom Friendikanätverket omfattas av licensen <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>';
-$a->strings['Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendika project.'] = 'Gå till <a href="http://project.friendika.com">Project.Friendika.com</a> om du vill läsa mer om friendikaprojektet.';
-$a->strings['Bug reports and issues: please visit'] = 'Anmäl buggar eller andra problem, gå till';
-$a->strings['Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com'] = 'Förslag, beröm, donationer, etc. - skicka e-post till "info at friendika punkt com" ';
-$a->strings['Installed plugins/addons/apps'] = 'Installerade insticksprogram/applikationer';
-$a->strings['No installed plugins/addons/apps'] = 'Inga installerade insticksprogram/applikationer';
-$a->strings['Group created.'] = 'Gruppen har skapats.';
-$a->strings['Could not create group.'] = 'Det gick inte att skapa gruppen.';
-$a->strings['Group not found.'] = 'Gruppen hittades inte.';
-$a->strings['Group name changed.'] = 'Gruppens namn har ändrats.';
-$a->strings['Membership list updated.'] = 'Medlemslistan har uppdaterats.';
-$a->strings['Group removed.'] = 'Gruppen har tagits bort.';
-$a->strings['Unable to remove group.'] = 'Det gick inte att ta bort gruppen.';
-$a->strings["Welcome to %s"] = "Välkommen till %s";
-$a->strings['Could not create/connect to database.'] = 'Det gick inte att skapa eller ansluta till databasen.';
-$a->strings['Connected to database.'] = 'Ansluten till databasen.';
-$a->strings['Proceed with Installation'] = 'Fortsätt med installationen';
-$a->strings['Your Friendika site database has been installed.'] = 'Databasen för din friendikasajt har installerats.';
-$a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANT: You will need to [manually] setup a scheduled task for the poller.';
-$a->strings['Please see the file "INSTALL.txt".'] = 'Se filen "INSTALL.txt".';
-$a->strings['Proceed to registration'] = 'Gå vidare till registreringen';
-$a->strings['Database import failed.'] = 'Det gick inte att importera databasen.';
-$a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'Du kanske måste importera filen "database.sql" manuellt med phpmyadmin eller mysql.';
-$a->strings['Welcome to Friendika.'] = 'Välkommen till Friendika.';
-$a->strings['Submit'] = 'Spara';
-$a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Could not find a command line version of PHP in the web server PATH.';
-$a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'This is required. Please adjust the configuration file .htconfig.php accordingly.';
-$a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'The command line version of PHP on your system does not have "register_argc_argv" enabled.';
-$a->strings['This is required for message delivery to work.'] = 'Det krävs för att meddelanden ska kunna levereras.';
-$a->strings['Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'] = 'Fel: funktionen "openssl_pkey_new" kan inte skapa krypteringsnycklar';
-$a->strings['If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'] = 'Läs mer på "http://www.php.net/manual/en/openssl.installation.php" om du kör Windows.';
-$a->strings['Error: Apache webserver mod-rewrite module is required but not installed.'] = 'Error: Apache webserver mod-rewrite module is required but not installed.';
-$a->strings['Error: libCURL PHP module required but not installed.'] = 'Error: libCURL PHP module required but not installed.';
-$a->strings['Error: GD graphics PHP module with JPEG support required but not installed.'] = 'Error: GD graphics PHP module with JPEG support required but not installed.';
-$a->strings['Error: openssl PHP module required but not installed.'] = 'Error: openssl PHP module required but not installed.';
-$a->strings['Error: mysqli PHP module required but not installed.'] = 'Error: mysqli PHP module required but not installed.';
-$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.'] = '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.';
-$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.'] = 'This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.';
-$a->strings['Please check with your site documentation or support people to see if this situation can be corrected.'] = 'Please check with your site documentation or support people to see if this situation can be corrected.';
-$a->strings['If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'] = 'If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.';
-$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.'] = 'The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.';
-$a->strings['Errors encountered creating database tables.'] = 'Fel vid skapandet av databastabeller.';
-$a->strings['%s : Not a valid email address.'] = '%s : Ogiltig e-postadress.';
-$a->strings['%s : Message delivery failed.'] = '%s : Meddelandet kom inte fram.';
-$a->strings['Send invitations'] = 'Skicka inbjudningar';
-$a->strings['Enter email addresses, one per line:'] = 'Ange e-postadresser, en per rad:';
-$a->strings['Your message:'] = 'Meddelande:';
-$a->strings['To accept this invitation, please visit:'] = 'Gå hit för att tacka ja till inbjudan:';
-$a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Vi kan bli kontakter via min profil. Besök min profil här när du har registrerat dig:';
-$a->strings["%d message sent."] = array(
-	0 => "%d meddelande har skickats.",
-	1 => "%d meddelanden har skickats.",
-);
-$a->strings['Unable to locate original post.'] = 'Hittar inte det ursprungliga inlägget.';
-$a->strings['Empty post discarded.'] = 'Tomt inlägg. Inte sparat.';
-$a->strings['Wall Photos'] = 'Loggbilder';
-$a->strings["%s commented on your item at %s"] = "%s har kommenterat ditt inlägg på %s";
-$a->strings["Administrator"] = "Admin";
-$a->strings["%s posted on your profile wall at %s"] = "%s har gjort ett inlägg på din logg på %s";
-$a->strings['System error. Post not saved.'] = 'Något gick fel. Inlägget sparades inte.';
-$a->strings['You may visit them online at'] = 'Besök online på';
-$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Kontakta avsändaren genom att svara på det här meddelandet om du inte vill ha sådana här meddelanden.';
-$a->strings['%s posted an update.'] = '%s har gjort ett inlägg.';
-$a->strings['photo'] = 'bild';
-$a->strings['status'] = 'status';
-$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s gillar %2$s\'s %3$s';
-$a->strings['%1$s doesn\'t like %2$s\'s %3$s'] = '%1$s ogillar %2$s\'s %3$s';
-$a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.';
-$a->strings['Visible to:'] = 'Synlig för:';
-$a->strings["Welcome back %s"] = "Välkommen tillbaka %s";
-$a->strings['Manage Identities and/or Pages'] = 'Hantera identiteter eller sidor';
-$a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "(Växla mellan olika identiteter eller gemenskaper/gruppsidor som är kopplade till ditt konto.)";
-$a->strings['Select an identity to manage: '] = 'Välj vilken identitet du vill hantera: ';
-$a->strings['Profile Match'] = 'Matcha profiler';
-$a->strings['No matches'] = 'Ingen träff';
-$a->strings['No recipient selected.'] = 'Ingen mottagare har valts.';
-$a->strings['[no subject]'] = '[ingen rubrik]';
-$a->strings['Unable to locate contact information.'] = 'Det gick inte att hitta kontaktuppgifterna.';
-$a->strings['Message sent.'] = 'Meddelandet har skickats.';
-$a->strings['Message could not be sent.'] = 'Det gick inte att skicka meddelandet.';
-$a->strings['Messages'] = 'Meddelanden';
-$a->strings['Inbox'] = 'Inkorg';
-$a->strings['Outbox'] = 'Utkorg';
-$a->strings['New Message'] = 'Nytt meddelande';
-$a->strings['Message deleted.'] = 'Meddelandet togs bort.';
-$a->strings['Conversation removed.'] = 'Konversationen togs bort.';
-$a->strings['Please enter a link URL:'] = 'Ange en länk (URL):';
-$a->strings['Send Private Message'] = 'Skicka personligt meddelande';
-$a->strings['To:'] = 'Till:';
-$a->strings['Subject:'] = 'Rubrik:';
-$a->strings['No messages.'] = 'Inga meddelanden.';
-$a->strings['Delete conversation'] = 'Ta bort konversation';
-$a->strings['Message not available.'] = 'Meddelandet är inte tillgängligt.';
-$a->strings['Delete message'] = 'Ta bort meddelande';
-$a->strings['Send Reply'] = 'Skicka svar';
-$a->strings['Normal View'] = 'Normalvy';
-$a->strings['New Item View'] = 'Nya inlägg först';
-$a->strings['Please enter a YouTube link:'] = 'Ange en YouTube-länk:';
-$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Ange länk/URL till video (.ogg):";
-$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Ange länk/URL till ljud (.ogg):";
-$a->strings['Where are you right now?'] = 'Var är du just nu?';
-$a->strings['No such group'] = 'Gruppen finns inte';
-$a->strings['Group is empty'] = 'Gruppen är tom';
-$a->strings['Group: '] = 'Grupp: ';
-$a->strings['View in context'] = 'Visa i sitt sammanhang';
-$a->strings['See more posts like this'] = 'Leta inlägg som liknar det här';
-$a->strings['See all %d comments'] = 'Visa alla %d kommentarer';
-$a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
-$a->strings['Discard'] = 'Ta bort';
-$a->strings['Ignore'] = 'Ignorera';
-$a->strings['Pending Friend/Connect Notifications'] = 'Väntande kontaktförfrågningar';
-$a->strings['Show Ignored Requests'] = 'Visa förfrågningar du ignorerat';
-$a->strings['Hide Ignored Requests'] = 'Dölj förfrågningar du ignorerat';
-$a->strings['Claims to be known to you: '] = 'Hävdar att du vet vem han/hon är: ';
-$a->strings['yes'] = 'ja';
-$a->strings['no'] = 'nej';
-$a->strings['Approve as: '] = 'Godkänn och lägg till som: ';
-$a->strings['Friend'] = 'Vän';
-$a->strings['Fan/Admirer'] = 'Fan/Beundrare';
-$a->strings['Notification type: '] = 'Typ av avisering: ';
-$a->strings['Friend/Connect Request'] = 'Vän- eller kontaktförfrågan';
-$a->strings['New Follower'] = 'En som vill följa dig';
-$a->strings['Approve'] = 'Godkänn';
-$a->strings['No notifications.'] = 'Inga aviseringar.';
-$a->strings['User registrations waiting for confirm'] = 'Användare som registrerat sig och inväntar godkännande';
-$a->strings['No registrations.'] = 'Inga registreringar.';
-$a->strings['Login failed.'] = 'Inloggningen misslyckades.';
-$a->strings["Welcome back "] = "Välkommen tillbaka ";
-$a->strings['Photo Albums'] = 'Fotoalbum';
-$a->strings['Contact Photos'] = 'Dina kontakters bilder';
-$a->strings['Contact information unavailable'] = 'Kommer inte åt kontaktuppgifter.';
-$a->strings['Profile Photos'] = 'Profilbilder';
-$a->strings['Album not found.'] = 'Albumet finns inte.';
-$a->strings['Delete Album'] = 'Ta bort album';
-$a->strings['Delete Photo'] = 'Ta bort bild';
-$a->strings['was tagged in a'] = 'har taggats i';
-$a->strings['by'] = 'av';
-$a->strings['Image exceeds size limit of '] = 'Bilden överskrider den tillåtna storleken ';
-$a->strings['Unable to process image.'] = 'Det gick inte att behandla bilden.';
-$a->strings['Image upload failed.'] = 'Fel vid bilduppladdning.';
-$a->strings['No photos selected'] = 'Inga bilder har valts';
-$a->strings['Upload Photos'] = 'Ladda upp bilder';
-$a->strings['New album name: '] = 'Nytt album med namn: ';
-$a->strings['or existing album name: '] = 'eller befintligt album med namn: ';
-$a->strings['Permissions'] = 'Åtkomst';
-$a->strings['Edit Album'] = 'Redigera album';
-$a->strings['View Photo'] = 'Visa bild';
-$a->strings['Photo not available'] = 'Bilden är inte tillgänglig';
-$a->strings['Edit photo'] = 'Hantera bild';
-$a->strings['<< Prev'] = '<< Föreg';
-$a->strings['View Full Size'] = 'Visa fullstor';
-$a->strings['Next >>'] = 'Nästa >>';
-$a->strings['Tags: '] = 'Taggar: ';
-$a->strings['[Remove any tag]'] = '[Remove any tag]';
-$a->strings['New album name'] = 'Nytt album med namn';
-$a->strings['Caption'] = 'Caption';
-$a->strings['Add a Tag'] = 'Lägg till tagg';
-$a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Exempel: @adam, @Anna_Andersson, @johan@exempel.com, #Stockholm, #camping';
-$a->strings['Recent Photos'] = 'Nyligen tillagda bilder';
-$a->strings['Upload New Photos'] = 'Ladda upp bilder';
-$a->strings['View Album'] = 'Titta i album';
-$a->strings['Status'] = 'Status';
-$a->strings['Profile'] = 'Profil';
-$a->strings['Photos'] = 'Bilder';
-$a->strings['Image uploaded but image cropping failed.'] = 'Bilden laddades upp men det blev fel när den skulle beskäras.';
-$a->strings['Unable to process image'] = 'Det gick inte att behandla bilden';
-$a->strings['Crop Image'] = 'Beskär bild';
-$a->strings['Please adjust the image cropping for optimum viewing.'] = 'Välj hur bilden ska beskäras för att bli så bra som möjligt.';
-$a->strings['Done Editing'] = 'Spara';
-$a->strings['Image uploaded successfully.'] = 'Bilden har laddats upp.';
-$a->strings['Profile Name is required.'] = 'Profilen måste ha ett namn.';
-$a->strings['Profile updated.'] = 'Profilen har uppdaterats.';
-$a->strings['Profile deleted.'] = 'Profilen har tagits bort.';
-$a->strings['Profile-'] = 'Profil-';
-$a->strings['New profile created.'] = 'En ny profil har skapats.';
-$a->strings['Profile unavailable to clone.'] = 'Det gick inte att klona profilen.';
-$a->strings['This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.'] = 'Det här är din <strong>offentliga</strong> profil.<br />Den <strong>kan vara synlig för vem som helst</strong> på internet.';
-$a->strings['Profile Image'] = 'Profilbild';
-$a->strings['Invalid OpenID url'] = 'Ogiltig OpenID-URL';
-$a->strings['Please enter the required information.'] = 'Fyll i alla obligatoriska fält.';
-$a->strings['Please use a shorter name.'] = 'Välj ett kortare namn.';
-$a->strings['Name too short.'] = 'Namnet är för kort.';
-$a->strings["That doesn't appear to be your full \x28First Last\x29 name."] = "Du verkar inte ha angett ditt fullständiga namn.";
-$a->strings['Your email domain is not among those allowed on this site.'] = 'Din e-postdomän är inte tillåten på den här webbplatsen.';
-$a->strings['Not a valid email address.'] = 'Ogiltig e-postadress.';
-$a->strings['Cannot use that email.'] = 'Otillåten e-postadress.';
-$a->strings['Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.'] = 'Ditt användarnamn får bara innehålla "a-z", "0-9", "-" och "_", och måste dessutom börja med en bokstav.';
-$a->strings['Nickname is already registered. Please choose another.'] = 'Användarnamnet är upptaget. Välj ett annat.';
-$a->strings['SERIOUS ERROR: Generation of security keys failed.'] = 'SERIOUS ERROR: Generation of security keys failed.';
-$a->strings['An error occurred during registration. Please try again.'] = 'Något gick fel vid registreringen. Försök igen.';
-$a->strings['An error occurred creating your default profile. Please try again.'] = 'Det blev fel när din standardprofil skulle skapas. Prova igen.';
-$a->strings['Registration successful. Please check your email for further instructions.'] = 'Registrering klar. Kolla din e-post för vidare information.';
-$a->strings['Failed to send email message. Here is the message that failed.'] = 'Det gick inte att skicka e-brevet. Här är meddelandet som inte kunde skickas.';
-$a->strings['Your registration can not be processed.'] = 'Det går inte att behandla registreringen.';
-$a->strings['Your registration is pending approval by the site owner.'] = 'Din registrering inväntar godkännande av webbplatsens ägare.';
-$a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Om du vill kan du fylla i detta formulär via OpenID genom att ange ditt OpenID och klicka på 'Registrera'.";
-$a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'Om du inte vet vad OpenID är, eller inte vill använda det, kan du lämna det fältet tomt och fylla i resten.';
-$a->strings["Your OpenID \x28optional\x29: "] = "OpenID (om du vill): ";
-$a->strings['Members of this network prefer to communicate with real people who use their real names.'] = 'Medlemmarna i det här nätverket föredrar att kommunicera med riktiga människor som använder sina riktiga namn.';
-$a->strings['Include your profile in member directory?'] = 'Ta med profilen i medlemskatalogen?';
-$a->strings['Registration'] = 'Registrering';
-$a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Fullständigt namn ' . "\x28" . 't. ex. Karl Karlsson' . "\x29" . ': ';
-$a->strings['Your Email Address: '] = 'E-postadress: ';
-$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>\'.'] = 'Välj ett användarnamn. Det måste inledas med en bokstav. Din profiladress på den här webbplatsen blir \'<strong>användarnamn@$sitename</strong>\'.';
-$a->strings['Choose a nickname: '] = 'Välj ett användarnamn: ';
-$a->strings['Please login.'] = 'Logga in.';
-$a->strings['Account approved.'] = 'Kontot har godkänts.';
-$a->strings['Remove My Account'] = 'Ta bort mitt konto';
-$a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'Detta kommer att ta bort kontot helt och hållet. Efter att det är gjort går det inte att återställa.';
-$a->strings['Please enter your password for verification:'] = 'Ange lösenordet igen för säkerhets skull:';
-$a->strings['No results.'] = 'Inga resultat.';
-$a->strings['Passwords do not match. Password unchanged.'] = 'Lösenorden skiljer sig åt. Lösenordet ändras inte.';
-$a->strings['Empty passwords are not allowed. Password unchanged.'] = 'Lösenordet får inte vara blankt. Lösenordet ändras inte.';
-$a->strings['Password changed.'] = 'Lösenordet har ändrats.';
-$a->strings['Password update failed. Please try again.'] = 'Det blev fel när lösenordet skulle ändras. Försök igen.';
-$a->strings[' Please use a shorter name.'] = ' Använd ett kortare namn.';
-$a->strings[' Name too short.'] = ' Namnet är för kort.';
-$a->strings[' Not valid email.'] = ' Ogiltig e-postadress.';
-$a->strings[' Cannot change to that email.'] = ' Ändring till den e-postadressen görs inte.';
-$a->strings['Settings updated.'] = 'Inställningarna har uppdaterats.';
-$a->strings['Plugin Settings'] = 'Inställningar för insticksprogram';
-$a->strings['Account Settings'] = 'Kontoinställningar';
-$a->strings['No Plugin settings configured'] = 'Det finns inga inställningar för insticksprogram';
-$a->strings['OpenID: '] = 'OpenID: ';
-$a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Valfritt\x29 Tillåt inloggning med detta OpenID på det här kontot.";
-$a->strings['Profile is <strong>not published</strong>.'] = 'Profilen är <strong>inte publicerad</strong>.';
-$a->strings['Export Personal Data'] = 'Exportera personlig information';
-$a->strings['Default Post Permissions'] = 'Standardåtkomst för inlägg';
-$a->strings['Tag removed'] = 'Taggen har tagits bort';
-$a->strings['Remove Item Tag'] = 'Ta bort tagg';
-$a->strings['Select a tag to remove: '] = 'Välj vilken tagg som ska tas bort: ';
-$a->strings['Remove'] = 'Ta bort';
-$a->strings['No contacts.'] = 'Inga kontakter.';
-$a->strings['Visible To:'] = 'Synlig för:';
-$a->strings['Groups'] = 'Grupper';
-$a->strings['Except For:'] = 'Utom för:';
-$a->strings['Logged out.'] = 'Utloggad.';
-$a->strings['Unknown | Not categorised'] = 'Okänd | Inte kategoriserad';
-$a->strings['Block immediately'] = 'Spärra omedelbart';
-$a->strings['Shady, spammer, self-marketer'] = 'Skum, spammare, reklamspridare';
-$a->strings['Known to me, but no opinion'] = 'Jag vet vem det är, men har ingen åsikt';
-$a->strings['OK, probably harmless'] = 'OK, antagligen harmlös';
-$a->strings['Reputable, has my trust'] = 'Pålitlig, jag litar på personen';
-$a->strings['Frequently'] = 'Ofta';
-$a->strings['Hourly'] = 'En gång i timmen';
-$a->strings['Twice daily'] = 'Två gånger om dagen';
-$a->strings['Daily'] = 'Dagligen';
-$a->strings['Weekly'] = 'Veckovis';
-$a->strings['Monthly'] = 'Månadsvis';
-$a->strings['Miscellaneous'] = 'Blandat';
-$a->strings['less than a second ago'] = 'för mindre än en sekund sedan';
-$a->strings['year'] = 'år';
-$a->strings['years'] = 'år';
-$a->strings['month'] = 'månad';
-$a->strings['months'] = 'månader';
-$a->strings['week'] = 'vecka';
-$a->strings['weeks'] = 'veckor';
-$a->strings['day'] = 'dag';
-$a->strings['days'] = 'dagar';
-$a->strings['hour'] = 'timme';
-$a->strings['hours'] = 'timmar';
-$a->strings['minute'] = 'minut';
-$a->strings['minutes'] = 'minuter';
-$a->strings['second'] = 'sekund';
-$a->strings['seconds'] = 'sekunder';
-$a->strings[' ago'] = ' sedan';
-$a->strings['Cannot locate DNS info for database server \'%s\''] = 'Cannot locate DNS info for database server \'%s\'';
-$a->strings['Create a new group'] = 'Skapa ny grupp';
-$a->strings['Everybody'] = 'Alla';
-$a->strings['Birthday:'] = 'Födelsedatum:';
-$a->strings['Home'] = 'Hem';
-$a->strings['Apps'] = 'Apps';
-$a->strings['Directory'] = 'Medlemskatalog';
-$a->strings['Network'] = 'Nätverk';
-$a->strings['Notifications'] = 'Aviseringar';
-$a->strings['Manage'] = 'Hantera';
-$a->strings['Settings'] = 'Inställningar';
-$a->strings['Profiles'] = 'Profiler';
-$a->strings['Embedding disabled'] = 'Funktionen bädda in är avstängd';
-$a->strings['Male'] = 'Man';
-$a->strings['Female'] = 'Kvinna';
-$a->strings['Currently Male'] = 'För närvarande man';
-$a->strings['Currently Female'] = 'För närvarande kvinna';
-$a->strings['Mostly Male'] = 'Mestadels man';
-$a->strings['Mostly Female'] = 'Mestadels kvinna';
-$a->strings['Transgender'] = 'Transgender';
-$a->strings['Intersex'] = 'Intersex';
-$a->strings['Transsexual'] = 'Transsexuell';
-$a->strings['Hermaphrodite'] = 'Hermafrodit';
-$a->strings['Neuter'] = 'Könslös';
-$a->strings['Non-specific'] = 'Oklart';
-$a->strings['Other'] = 'Annat';
-$a->strings['Undecided'] = 'Obestämt';
-$a->strings['Males'] = 'Män';
-$a->strings['Females'] = 'Kvinnor';
-$a->strings['Gay'] = 'Bög';
-$a->strings['Lesbian'] = 'Lesbisk';
-$a->strings['No Preference'] = 'No Preference';
-$a->strings['Bisexual'] = 'Bisexuell';
-$a->strings['Autosexual'] = 'Autosexual';
-$a->strings['Abstinent'] = 'Abstinent';
-$a->strings['Virgin'] = 'Oskuld';
-$a->strings['Deviant'] = 'Avvikande';
-$a->strings['Fetish'] = 'Fetisch';
-$a->strings['Oodles'] = 'Massor';
-$a->strings['Nonsexual'] = 'Asexuell';
-$a->strings['Single'] = 'Singel';
-$a->strings['Lonely'] = 'Ensam';
-$a->strings['Available'] = 'Tillgänglig';
-$a->strings['Unavailable'] = 'Upptagen';
-$a->strings['Dating'] = 'Dejtar';
-$a->strings['Unfaithful'] = 'Otrogen';
-$a->strings['Sex Addict'] = 'Sexmissbrukare';
-$a->strings['Friends'] = 'Vänner';
-$a->strings['Friends/Benefits'] = 'Friends/Benefits';
-$a->strings['Casual'] = 'Casual';
-$a->strings['Engaged'] = 'Förlovad';
-$a->strings['Married'] = 'Gift';
-$a->strings['Partners'] = 'I partnerskap';
-$a->strings['Cohabiting'] = 'Cohabiting';
-$a->strings['Happy'] = 'Nöjd';
-$a->strings['Not Looking'] = 'Letar inte';
-$a->strings['Swinger'] = 'Swinger';
-$a->strings['Betrayed'] = 'Bedragen';
-$a->strings['Separated'] = 'Separerat';
-$a->strings['Unstable'] = 'Instabilt';
-$a->strings['Divorced'] = 'Skiljd';
-$a->strings['Widowed'] = 'Änka/änkling';
-$a->strings['Uncertain'] = 'Oklart';
-$a->strings['Complicated'] = 'Komplicerat';
-$a->strings['Don\'t care'] = 'Bryr mig inte';
-$a->strings['Ask me'] = 'Fråga mig';
-$a->strings['Facebook disabled'] = 'Facebook inaktiverat';
-$a->strings['Facebook API key is missing.'] = 'Facebook API key is missing.';
-$a->strings['Facebook Connect'] = 'Facebook Connect';
-$a->strings['Install Facebook post connector'] = 'Install Facebook post connector';
-$a->strings['Remove Facebook post connector'] = 'Remove Facebook post connector';
-$a->strings['Post to Facebook by default'] = 'Lägg alltid in inläggen på Facebook';
-$a->strings['Facebook'] = 'Facebook';
-$a->strings['Facebook Connector Settings'] = 'Facebook Connector Settings';
-$a->strings['Post to Facebook'] = 'Lägg in på Facebook';
-$a->strings['Image: '] = 'Bild: ';
-$a->strings['Select files to upload: '] = 'Välj filer att ladda upp: ';
-$a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Använd följande bara om javauppladdaren ovanför inte startar.';
-$a->strings['Upload a file'] = 'Ladda upp en fil';
-$a->strings['Drop files here to upload'] = 'Dra filer som ska laddas upp hit';
-$a->strings['Failed'] = 'Misslyckades';
-$a->strings['No files were uploaded.'] = 'Inga filer laddades upp.';
-$a->strings['Uploaded file is empty'] = 'Den uppladdade filen är tom';
-$a->strings['Uploaded file is too large'] = 'Den uppladdade filen är för stor';
-$a->strings['File has an invalid extension, it should be one of '] = 'Otillåten filnamnsändelse, det ska vara ';
-$a->strings['Upload was cancelled, or server error encountered'] = 'Serverfel eller avbruten uppladdning';
-$a->strings['Randplace Settings'] = 'Randplace Settings';
-$a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin';
-$a->strings['Post to StatusNet'] = 'Lägg in på StatusNet';
-$a->strings['StatusNet Posting Settings'] = 'Inställningar för inlägg på StatusNet';
-$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 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.';
-$a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key';
-$a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret';
-$a->strings["Base API Path \x28remember the trailing /\x29"] = "Base API Path \x28remember the trailing /\x29";
-$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.'] = '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.';
-$a->strings['Log in with StatusNet'] = 'Logga in med StatusNet';
-$a->strings['Copy the security code from StatusNet here'] = 'Ange säkerhetskoden från StatusNet här';
-$a->strings['Currently connected to: '] = 'Ansluten till: ';
-$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.';
-$a->strings['Send public postings to StatusNet'] = 'Send public postings to StatusNet';
-$a->strings['Clear OAuth configuration'] = 'Clear OAuth configuration';
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Tredimensionellt luffarschack';
-$a->strings['3D Tic-Tac-Toe'] = '3D-luffarschack';
-$a->strings['New game'] = 'Ny spelomgång';
-$a->strings['New game with handicap'] = 'Ny spelomgång med handikapp';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Det tredimensionella luffarschacket är precis som vanligt luffarschack förutom att det spelas i flera nivåer samtidigt. ';
-$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.'] = 'Här är det tre nivåer. Man vinner om man får tre i rad på vilken nivå som helst, eller uppåt, nedåt eller diagonalt på flera nivåer.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'Om man spelar med handikapp så stängs mittenpositionen på mittennivån av eftersom spelare som väljer den positionen ofta får övertaget.';
-$a->strings['You go first...'] = 'Du börjar...';
-$a->strings['I\'m going first this time...'] = 'Jag börjar den här gången...';
-$a->strings['You won!'] = 'Du vann!';
-$a->strings['"Cat" game!'] = '"Cat" game!';
-$a->strings['I won!'] = 'Jag vann!';
-$a->strings['Post to Twitter'] = 'Lägg in på Twitter';
-$a->strings['Twitter Posting Settings'] = 'Inställningar för inlägg på Twitter';
-$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.';
-$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.'] = '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.';
-$a->strings['Copy the PIN from Twitter here'] = 'Ange PIN-koden från Twitter här';
-$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.';
-$a->strings['Send public postings to Twitter'] = 'Send public postings to Twitter';
-$a->strings['Africa/Abidjan'] = 'Afrika/Abidjan';
-$a->strings['Africa/Accra'] = 'Afrika/Accra';
-$a->strings['Africa/Addis_Ababa'] = 'Afrika/Addis_Ababa';
-$a->strings['Africa/Algiers'] = 'Afrika/Algiers';
-$a->strings['Africa/Asmara'] = 'Afrika/Asmara';
-$a->strings['Africa/Asmera'] = 'Afrika/Asmera';
-$a->strings['Africa/Bamako'] = 'Afrika/Bamako';
-$a->strings['Africa/Bangui'] = 'Afrika/Bangui';
-$a->strings['Africa/Banjul'] = 'Afrika/Banjul';
-$a->strings['Africa/Bissau'] = 'Afrika/Bissau';
-$a->strings['Africa/Blantyre'] = 'Afrika/Blantyre';
-$a->strings['Africa/Brazzaville'] = 'Afrika/Brazzaville';
-$a->strings['Africa/Bujumbura'] = 'Afrika/Bujumbura';
-$a->strings['Africa/Cairo'] = 'Afrika/Cairo';
-$a->strings['Africa/Casablanca'] = 'Afrika/Casablanca';
-$a->strings['Africa/Ceuta'] = 'Afrika/Ceuta';
-$a->strings['Africa/Conakry'] = 'Afrika/Conakry';
-$a->strings['Africa/Dakar'] = 'Afrika/Dakar';
-$a->strings['Africa/Dar_es_Salaam'] = 'Afrika/Dar_es_Salaam';
-$a->strings['Africa/Djibouti'] = 'Afrika/Djibouti';
-$a->strings['Africa/Douala'] = 'Afrika/Douala';
-$a->strings['Africa/El_Aaiun'] = 'Afrika/El_Aaiun';
-$a->strings['Africa/Freetown'] = 'Afrika/Freetown';
-$a->strings['Africa/Gaborone'] = 'Afrika/Gaborone';
-$a->strings['Africa/Harare'] = 'Afrika/Harare';
-$a->strings['Africa/Johannesburg'] = 'Afrika/Johannesburg';
-$a->strings['Africa/Kampala'] = 'Afrika/Kampala';
-$a->strings['Africa/Khartoum'] = 'Afrika/Khartoum';
-$a->strings['Africa/Kigali'] = 'Afrika/Kigali';
-$a->strings['Africa/Kinshasa'] = 'Afrika/Kinshasa';
-$a->strings['Africa/Lagos'] = 'Afrika/Lagos';
-$a->strings['Africa/Libreville'] = 'Afrika/Libreville';
-$a->strings['Africa/Lome'] = 'Afrika/Lome';
-$a->strings['Africa/Luanda'] = 'Afrika/Luanda';
-$a->strings['Africa/Lubumbashi'] = 'Afrika/Lubumbashi';
-$a->strings['Africa/Lusaka'] = 'Afrika/Lusaka';
-$a->strings['Africa/Malabo'] = 'Afrika/Malabo';
-$a->strings['Africa/Maputo'] = 'Afrika/Maputo';
-$a->strings['Africa/Maseru'] = 'Afrika/Maseru';
-$a->strings['Africa/Mbabane'] = 'Afrika/Mbabane';
-$a->strings['Africa/Mogadishu'] = 'Afrika/Mogadishu';
-$a->strings['Africa/Monrovia'] = 'Afrika/Monrovia';
-$a->strings['Africa/Nairobi'] = 'Afrika/Nairobi';
-$a->strings['Africa/Ndjamena'] = 'Afrika/Ndjamena';
-$a->strings['Africa/Niamey'] = 'Afrika/Niamey';
-$a->strings['Africa/Nouakchott'] = 'Afrika/Nouakchott';
-$a->strings['Africa/Ouagadougou'] = 'Afrika/Ouagadougou';
-$a->strings['Africa/Porto-Novo'] = 'Afrika/Porto-Novo';
-$a->strings['Africa/Sao_Tome'] = 'Afrika/Sao_Tome';
-$a->strings['Africa/Timbuktu'] = 'Afrika/Timbuktu';
-$a->strings['Africa/Tripoli'] = 'Afrika/Tripoli';
-$a->strings['Africa/Tunis'] = 'Afrika/Tunis';
-$a->strings['Africa/Windhoek'] = 'Afrika/Windhoek';
-$a->strings['America/Adak'] = 'Amerika/Adak';
-$a->strings['America/Anchorage'] = 'Amerika/Anchorage';
-$a->strings['America/Anguilla'] = 'Amerika/Anguilla';
-$a->strings['America/Antigua'] = 'Amerika/Antigua';
-$a->strings['America/Araguaina'] = 'Amerika/Araguaina';
-$a->strings['America/Argentina/Buenos_Aires'] = 'Amerika/Argentina/Buenos_Aires';
-$a->strings['America/Argentina/Catamarca'] = 'Amerika/Argentina/Catamarca';
-$a->strings['America/Argentina/ComodRivadavia'] = 'Amerika/Argentina/ComodRivadavia';
-$a->strings['America/Argentina/Cordoba'] = 'Amerika/Argentina/Cordoba';
-$a->strings['America/Argentina/Jujuy'] = 'Amerika/Argentina/Jujuy';
-$a->strings['America/Argentina/La_Rioja'] = 'Amerika/Argentina/La_Rioja';
-$a->strings['America/Argentina/Mendoza'] = 'Amerika/Argentina/Mendoza';
-$a->strings['America/Argentina/Rio_Gallegos'] = 'Amerika/Argentina/Rio_Gallegos';
-$a->strings['America/Argentina/Salta'] = 'Amerika/Argentina/Salta';
-$a->strings['America/Argentina/San_Juan'] = 'Amerika/Argentina/San_Juan';
-$a->strings['America/Argentina/San_Luis'] = 'Amerika/Argentina/San_Luis';
-$a->strings['America/Argentina/Tucuman'] = 'Amerika/Argentina/Tucuman';
-$a->strings['America/Argentina/Ushuaia'] = 'Amerika/Argentina/Ushuaia';
-$a->strings['America/Aruba'] = 'Amerika/Aruba';
-$a->strings['America/Asuncion'] = 'Amerika/Asuncion';
-$a->strings['America/Atikokan'] = 'Amerika/Atikokan';
-$a->strings['America/Atka'] = 'Amerika/Atka';
-$a->strings['America/Bahia'] = 'Amerika/Bahia';
-$a->strings['America/Barbados'] = 'Amerika/Barbados';
-$a->strings['America/Belem'] = 'Amerika/Belem';
-$a->strings['America/Belize'] = 'Amerika/Belize';
-$a->strings['America/Blanc-Sablon'] = 'Amerika/Blanc-Sablon';
-$a->strings['America/Boa_Vista'] = 'Amerika/Boa_Vista';
-$a->strings['America/Bogota'] = 'Amerika/Bogota';
-$a->strings['America/Boise'] = 'Amerika/Boise';
-$a->strings['America/Buenos_Aires'] = 'Amerika/Buenos_Aires';
-$a->strings['America/Cambridge_Bay'] = 'Amerika/Cambridge_Bay';
-$a->strings['America/Campo_Grande'] = 'Amerika/Campo_Grande';
-$a->strings['America/Cancun'] = 'Amerika/Cancun';
-$a->strings['America/Caracas'] = 'Amerika/Caracas';
-$a->strings['America/Catamarca'] = 'Amerika/Catamarca';
-$a->strings['America/Cayenne'] = 'Amerika/Cayenne';
-$a->strings['America/Cayman'] = 'Amerika/Cayman';
-$a->strings['America/Chicago'] = 'Amerika/Chicago';
-$a->strings['America/Chihuahua'] = 'Amerika/Chihuahua';
-$a->strings['America/Coral_Harbour'] = 'Amerika/Coral_Harbour';
-$a->strings['America/Cordoba'] = 'Amerika/Cordoba';
-$a->strings['America/Costa_Rica'] = 'Amerika/Costa_Rica';
-$a->strings['America/Cuiaba'] = 'Amerika/Cuiaba';
-$a->strings['America/Curacao'] = 'Amerika/Curacao';
-$a->strings['America/Danmarkshavn'] = 'Amerika/Danmarkshavn';
-$a->strings['America/Dawson'] = 'Amerika/Dawson';
-$a->strings['America/Dawson_Creek'] = 'Amerika/Dawson_Creek';
-$a->strings['America/Denver'] = 'Amerika/Denver';
-$a->strings['America/Detroit'] = 'Amerika/Detroit';
-$a->strings['America/Dominica'] = 'Amerika/Dominica';
-$a->strings['America/Edmonton'] = 'Amerika/Edmonton';
-$a->strings['America/Eirunepe'] = 'Amerika/Eirunepe';
-$a->strings['America/El_Salvador'] = 'Amerika/El_Salvador';
-$a->strings['America/Ensenada'] = 'Amerika/Ensenada';
-$a->strings['America/Fort_Wayne'] = 'Amerika/Fort_Wayne';
-$a->strings['America/Fortaleza'] = 'Amerika/Fortaleza';
-$a->strings['America/Glace_Bay'] = 'Amerika/Glace_Bay';
-$a->strings['America/Godthab'] = 'Amerika/Godthab';
-$a->strings['America/Goose_Bay'] = 'Amerika/Goose_Bay';
-$a->strings['America/Grand_Turk'] = 'Amerika/Grand_Turk';
-$a->strings['America/Grenada'] = 'Amerika/Grenada';
-$a->strings['America/Guadeloupe'] = 'Amerika/Guadeloupe';
-$a->strings['America/Guatemala'] = 'Amerika/Guatemala';
-$a->strings['America/Guayaquil'] = 'Amerika/Guayaquil';
-$a->strings['America/Guyana'] = 'Amerika/Guyana';
-$a->strings['America/Halifax'] = 'Amerika/Halifax';
-$a->strings['America/Havana'] = 'Amerika/Havana';
-$a->strings['America/Hermosillo'] = 'Amerika/Hermosillo';
-$a->strings['America/Indiana/Indianapolis'] = 'Amerika/Indiana/Indianapolis';
-$a->strings['America/Indiana/Knox'] = 'Amerika/Indiana/Knox';
-$a->strings['America/Indiana/Marengo'] = 'Amerika/Indiana/Marengo';
-$a->strings['America/Indiana/Petersburg'] = 'Amerika/Indiana/Petersburg';
-$a->strings['America/Indiana/Tell_City'] = 'Amerika/Indiana/Tell_City';
-$a->strings['America/Indiana/Vevay'] = 'Amerika/Indiana/Vevay';
-$a->strings['America/Indiana/Vincennes'] = 'Amerika/Indiana/Vincennes';
-$a->strings['America/Indiana/Winamac'] = 'Amerika/Indiana/Winamac';
-$a->strings['America/Indianapolis'] = 'Amerika/Indianapolis';
-$a->strings['America/Inuvik'] = 'Amerika/Inuvik';
-$a->strings['America/Iqaluit'] = 'Amerika/Iqaluit';
-$a->strings['America/Jamaica'] = 'Amerika/Jamaica';
-$a->strings['America/Jujuy'] = 'Amerika/Jujuy';
-$a->strings['America/Juneau'] = 'Amerika/Juneau';
-$a->strings['America/Kentucky/Louisville'] = 'Amerika/Kentucky/Louisville';
-$a->strings['America/Kentucky/Monticello'] = 'Amerika/Kentucky/Monticello';
-$a->strings['America/Knox_IN'] = 'Amerika/Knox_IN';
-$a->strings['America/La_Paz'] = 'Amerika/La_Paz';
-$a->strings['America/Lima'] = 'Amerika/Lima';
-$a->strings['America/Los_Angeles'] = 'Amerika/Los_Angeles';
-$a->strings['America/Louisville'] = 'Amerika/Louisville';
-$a->strings['America/Maceio'] = 'Amerika/Maceio';
-$a->strings['America/Managua'] = 'Amerika/Managua';
-$a->strings['America/Manaus'] = 'Amerika/Manaus';
-$a->strings['America/Marigot'] = 'Amerika/Marigot';
-$a->strings['America/Martinique'] = 'Amerika/Martinique';
-$a->strings['America/Matamoros'] = 'Amerika/Matamoros';
-$a->strings['America/Mazatlan'] = 'Amerika/Mazatlan';
-$a->strings['America/Mendoza'] = 'Amerika/Mendoza';
-$a->strings['America/Menominee'] = 'Amerika/Menominee';
-$a->strings['America/Merida'] = 'Amerika/Merida';
-$a->strings['America/Mexico_City'] = 'Amerika/Mexico_City';
-$a->strings['America/Miquelon'] = 'Amerika/Miquelon';
-$a->strings['America/Moncton'] = 'Amerika/Moncton';
-$a->strings['America/Monterrey'] = 'Amerika/Monterrey';
-$a->strings['America/Montevideo'] = 'Amerika/Montevideo';
-$a->strings['America/Montreal'] = 'Amerika/Montreal';
-$a->strings['America/Montserrat'] = 'Amerika/Montserrat';
-$a->strings['America/Nassau'] = 'Amerika/Nassau';
-$a->strings['America/New_York'] = 'Amerika/New_York';
-$a->strings['America/Nipigon'] = 'Amerika/Nipigon';
-$a->strings['America/Nome'] = 'Amerika/Nome';
-$a->strings['America/Noronha'] = 'Amerika/Noronha';
-$a->strings['America/North_Dakota/Center'] = 'Amerika/North_Dakota/Center';
-$a->strings['America/North_Dakota/New_Salem'] = 'Amerika/North_Dakota/New_Salem';
-$a->strings['America/Ojinaga'] = 'Amerika/Ojinaga';
-$a->strings['America/Panama'] = 'Amerika/Panama';
-$a->strings['America/Pangnirtung'] = 'Amerika/Pangnirtung';
-$a->strings['America/Paramaribo'] = 'Amerika/Paramaribo';
-$a->strings['America/Phoenix'] = 'Amerika/Phoenix';
-$a->strings['America/Port-au-Prince'] = 'Amerika/Port-au-Prince';
-$a->strings['America/Port_of_Spain'] = 'Amerika/Port_of_Spain';
-$a->strings['America/Porto_Acre'] = 'Amerika/Porto_Acre';
-$a->strings['America/Porto_Velho'] = 'Amerika/Porto_Velho';
-$a->strings['America/Puerto_Rico'] = 'Amerika/Puerto_Rico';
-$a->strings['America/Rainy_River'] = 'Amerika/Rainy_River';
-$a->strings['America/Rankin_Inlet'] = 'Amerika/Rankin_Inlet';
-$a->strings['America/Recife'] = 'Amerika/Recife';
-$a->strings['America/Regina'] = 'Amerika/Regina';
-$a->strings['America/Resolute'] = 'Amerika/Resolute';
-$a->strings['America/Rio_Branco'] = 'Amerika/Rio_Branco';
-$a->strings['America/Rosario'] = 'Amerika/Rosario';
-$a->strings['America/Santa_Isabel'] = 'Amerika/Santa_Isabel';
-$a->strings['America/Santarem'] = 'Amerika/Santarem';
-$a->strings['America/Santiago'] = 'Amerika/Santiago';
-$a->strings['America/Santo_Domingo'] = 'Amerika/Santo_Domingo';
-$a->strings['America/Sao_Paulo'] = 'Amerika/Sao_Paulo';
-$a->strings['America/Scoresbysund'] = 'Amerika/Scoresbysund';
-$a->strings['America/Shiprock'] = 'Amerika/Shiprock';
-$a->strings['America/St_Barthelemy'] = 'Amerika/St_Barthelemy';
-$a->strings['America/St_Johns'] = 'Amerika/St_Johns';
-$a->strings['America/St_Kitts'] = 'Amerika/St_Kitts';
-$a->strings['America/St_Lucia'] = 'Amerika/St_Lucia';
-$a->strings['America/St_Thomas'] = 'Amerika/St_Thomas';
-$a->strings['America/St_Vincent'] = 'Amerika/St_Vincent';
-$a->strings['America/Swift_Current'] = 'Amerika/Swift_Current';
-$a->strings['America/Tegucigalpa'] = 'Amerika/Tegucigalpa';
-$a->strings['America/Thule'] = 'Amerika/Thule';
-$a->strings['America/Thunder_Bay'] = 'Amerika/Thunder_Bay';
-$a->strings['America/Tijuana'] = 'Amerika/Tijuana';
-$a->strings['America/Toronto'] = 'Amerika/Toronto';
-$a->strings['America/Tortola'] = 'Amerika/Tortola';
-$a->strings['America/Vancouver'] = 'Amerika/Vancouver';
-$a->strings['America/Virgin'] = 'Amerika/Virgin';
-$a->strings['America/Whitehorse'] = 'Amerika/Whitehorse';
-$a->strings['America/Winnipeg'] = 'Amerika/Winnipeg';
-$a->strings['America/Yakutat'] = 'Amerika/Yakutat';
-$a->strings['America/Yellowknife'] = 'Amerika/Yellowknife';
-$a->strings['Antarctica/Casey'] = 'Antarctica/Casey';
-$a->strings['Antarctica/Davis'] = 'Antarctica/Davis';
-$a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville';
-$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie';
-$a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson';
-$a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo';
-$a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer';
-$a->strings['Antarctica/Rothera'] = 'Antarctica/Rothera';
-$a->strings['Antarctica/South_Pole'] = 'Antarctica/South_Pole';
-$a->strings['Antarctica/Syowa'] = 'Antarctica/Syowa';
-$a->strings['Antarctica/Vostok'] = 'Antarctica/Vostok';
-$a->strings['Arctic/Longyearbyen'] = 'Arctic/Longyearbyen';
-$a->strings['Asia/Aden'] = 'Asien/Aden';
-$a->strings['Asia/Almaty'] = 'Asien/Almaty';
-$a->strings['Asia/Amman'] = 'Asien/Amman';
-$a->strings['Asia/Anadyr'] = 'Asien/Anadyr';
-$a->strings['Asia/Aqtau'] = 'Asien/Aqtau';
-$a->strings['Asia/Aqtobe'] = 'Asien/Aqtobe';
-$a->strings['Asia/Ashgabat'] = 'Asien/Ashgabat';
-$a->strings['Asia/Ashkhabad'] = 'Asien/Ashkhabad';
-$a->strings['Asia/Baghdad'] = 'Asien/Baghdad';
-$a->strings['Asia/Bahrain'] = 'Asien/Bahrain';
-$a->strings['Asia/Baku'] = 'Asien/Baku';
-$a->strings['Asia/Bangkok'] = 'Asien/Bangkok';
-$a->strings['Asia/Beirut'] = 'Asien/Beirut';
-$a->strings['Asia/Bishkek'] = 'Asien/Bishkek';
-$a->strings['Asia/Brunei'] = 'Asien/Brunei';
-$a->strings['Asia/Calcutta'] = 'Asien/Calcutta';
-$a->strings['Asia/Choibalsan'] = 'Asien/Choibalsan';
-$a->strings['Asia/Chongqing'] = 'Asien/Chongqing';
-$a->strings['Asia/Chungking'] = 'Asien/Chungking';
-$a->strings['Asia/Colombo'] = 'Asien/Colombo';
-$a->strings['Asia/Dacca'] = 'Asien/Dacca';
-$a->strings['Asia/Damascus'] = 'Asien/Damascus';
-$a->strings['Asia/Dhaka'] = 'Asien/Dhaka';
-$a->strings['Asia/Dili'] = 'Asien/Dili';
-$a->strings['Asia/Dubai'] = 'Asien/Dubai';
-$a->strings['Asia/Dushanbe'] = 'Asien/Dushanbe';
-$a->strings['Asia/Gaza'] = 'Asien/Gaza';
-$a->strings['Asia/Harbin'] = 'Asien/Harbin';
-$a->strings['Asia/Ho_Chi_Minh'] = 'Asien/Ho_Chi_Minh';
-$a->strings['Asia/Hong_Kong'] = 'Asien/Hong_Kong';
-$a->strings['Asia/Hovd'] = 'Asien/Hovd';
-$a->strings['Asia/Irkutsk'] = 'Asien/Irkutsk';
-$a->strings['Asia/Istanbul'] = 'Asien/Istanbul';
-$a->strings['Asia/Jakarta'] = 'Asien/Jakarta';
-$a->strings['Asia/Jayapura'] = 'Asien/Jayapura';
-$a->strings['Asia/Jerusalem'] = 'Asien/Jerusalem';
-$a->strings['Asia/Kabul'] = 'Asien/Kabul';
-$a->strings['Asia/Kamchatka'] = 'Asien/Kamchatka';
-$a->strings['Asia/Karachi'] = 'Asien/Karachi';
-$a->strings['Asia/Kashgar'] = 'Asien/Kashgar';
-$a->strings['Asia/Kathmandu'] = 'Asien/Kathmandu';
-$a->strings['Asia/Katmandu'] = 'Asien/Katmandu';
-$a->strings['Asia/Kolkata'] = 'Asien/Kolkata';
-$a->strings['Asia/Krasnoyarsk'] = 'Asien/Krasnoyarsk';
-$a->strings['Asia/Kuala_Lumpur'] = 'Asien/Kuala_Lumpur';
-$a->strings['Asia/Kuching'] = 'Asien/Kuching';
-$a->strings['Asia/Kuwait'] = 'Asien/Kuwait';
-$a->strings['Asia/Macao'] = 'Asien/Macao';
-$a->strings['Asia/Macau'] = 'Asien/Macau';
-$a->strings['Asia/Magadan'] = 'Asien/Magadan';
-$a->strings['Asia/Makassar'] = 'Asien/Makassar';
-$a->strings['Asia/Manila'] = 'Asien/Manila';
-$a->strings['Asia/Muscat'] = 'Asien/Muscat';
-$a->strings['Asia/Nicosia'] = 'Asien/Nicosia';
-$a->strings['Asia/Novokuznetsk'] = 'Asien/Novokuznetsk';
-$a->strings['Asia/Novosibirsk'] = 'Asien/Novosibirsk';
-$a->strings['Asia/Omsk'] = 'Asien/Omsk';
-$a->strings['Asia/Oral'] = 'Asien/Oral';
-$a->strings['Asia/Phnom_Penh'] = 'Asien/Phnom_Penh';
-$a->strings['Asia/Pontianak'] = 'Asien/Pontianak';
-$a->strings['Asia/Pyongyang'] = 'Asien/Pyongyang';
-$a->strings['Asia/Qatar'] = 'Asien/Qatar';
-$a->strings['Asia/Qyzylorda'] = 'Asien/Qyzylorda';
-$a->strings['Asia/Rangoon'] = 'Asien/Rangoon';
-$a->strings['Asia/Riyadh'] = 'Asien/Riyadh';
-$a->strings['Asia/Saigon'] = 'Asien/Saigon';
-$a->strings['Asia/Sakhalin'] = 'Asien/Sakhalin';
-$a->strings['Asia/Samarkand'] = 'Asien/Samarkand';
-$a->strings['Asia/Seoul'] = 'Asien/Seoul';
-$a->strings['Asia/Shanghai'] = 'Asien/Shanghai';
-$a->strings['Asia/Singapore'] = 'Asien/Singapore';
-$a->strings['Asia/Taipei'] = 'Asien/Taipei';
-$a->strings['Asia/Tashkent'] = 'Asien/Tashkent';
-$a->strings['Asia/Tbilisi'] = 'Asien/Tbilisi';
-$a->strings['Asia/Tehran'] = 'Asien/Tehran';
-$a->strings['Asia/Tel_Aviv'] = 'Asien/Tel_Aviv';
-$a->strings['Asia/Thimbu'] = 'Asien/Thimbu';
-$a->strings['Asia/Thimphu'] = 'Asien/Thimphu';
-$a->strings['Asia/Tokyo'] = 'Asien/Tokyo';
-$a->strings['Asia/Ujung_Pandang'] = 'Asien/Ujung_Pandang';
-$a->strings['Asia/Ulaanbaatar'] = 'Asien/Ulaanbaatar';
-$a->strings['Asia/Ulan_Bator'] = 'Asien/Ulan_Bator';
-$a->strings['Asia/Urumqi'] = 'Asien/Urumqi';
-$a->strings['Asia/Vientiane'] = 'Asien/Vientiane';
-$a->strings['Asia/Vladivostok'] = 'Asien/Vladivostok';
-$a->strings['Asia/Yakutsk'] = 'Asien/Yakutsk';
-$a->strings['Asia/Yekaterinburg'] = 'Asien/Yekaterinburg';
-$a->strings['Asia/Yerevan'] = 'Asien/Yerevan';
-$a->strings['Atlantic/Azores'] = 'Atlantic/Azores';
-$a->strings['Atlantic/Bermuda'] = 'Atlantic/Bermuda';
-$a->strings['Atlantic/Canary'] = 'Atlantic/Canary';
-$a->strings['Atlantic/Cape_Verde'] = 'Atlantic/Cape_Verde';
-$a->strings['Atlantic/Faeroe'] = 'Atlantic/Faeroe';
-$a->strings['Atlantic/Faroe'] = 'Atlantic/Faroe';
-$a->strings['Atlantic/Jan_Mayen'] = 'Atlantic/Jan_Mayen';
-$a->strings['Atlantic/Madeira'] = 'Atlantic/Madeira';
-$a->strings['Atlantic/Reykjavik'] = 'Atlantic/Reykjavik';
-$a->strings['Atlantic/South_Georgia'] = 'Atlantic/South_Georgia';
-$a->strings['Atlantic/St_Helena'] = 'Atlantic/St_Helena';
-$a->strings['Atlantic/Stanley'] = 'Atlantic/Stanley';
-$a->strings['Australia/ACT'] = 'Australien/ACT';
-$a->strings['Australia/Adelaide'] = 'Australien/Adelaide';
-$a->strings['Australia/Brisbane'] = 'Australien/Brisbane';
-$a->strings['Australia/Broken_Hill'] = 'Australien/Broken_Hill';
-$a->strings['Australia/Canberra'] = 'Australien/Canberra';
-$a->strings['Australia/Currie'] = 'Australien/Currie';
-$a->strings['Australia/Darwin'] = 'Australien/Darwin';
-$a->strings['Australia/Eucla'] = 'Australien/Eucla';
-$a->strings['Australia/Hobart'] = 'Australien/Hobart';
-$a->strings['Australia/LHI'] = 'Australien/LHI';
-$a->strings['Australia/Lindeman'] = 'Australien/Lindeman';
-$a->strings['Australia/Lord_Howe'] = 'Australien/Lord_Howe';
-$a->strings['Australia/Melbourne'] = 'Australien/Melbourne';
-$a->strings['Australia/North'] = 'Australien/North';
-$a->strings['Australia/NSW'] = 'Australien/NSW';
-$a->strings['Australia/Perth'] = 'Australien/Perth';
-$a->strings['Australia/Queensland'] = 'Australien/Queensland';
-$a->strings['Australia/South'] = 'Australien/South';
-$a->strings['Australia/Sydney'] = 'Australien/Sydney';
-$a->strings['Australia/Tasmania'] = 'Australien/Tasmania';
-$a->strings['Australia/Victoria'] = 'Australien/Victoria';
-$a->strings['Australia/West'] = 'Australien/West';
-$a->strings['Australia/Yancowinna'] = 'Australien/Yancowinna';
-$a->strings['Brazil/Acre'] = 'Brasilien/Acre';
-$a->strings['Brazil/DeNoronha'] = 'Brasilien/DeNoronha';
-$a->strings['Brazil/East'] = 'Brasilien/East';
-$a->strings['Brazil/West'] = 'Brasilien/West';
-$a->strings['Canada/Atlantic'] = 'Kanada/Atlantic';
-$a->strings['Canada/Central'] = 'Kanada/Central';
-$a->strings['Canada/East-Saskatchewan'] = 'Kanada/East-Saskatchewan';
-$a->strings['Canada/Eastern'] = 'Kanada/Eastern';
-$a->strings['Canada/Mountain'] = 'Kanada/Mountain';
-$a->strings['Canada/Newfoundland'] = 'Kanada/Newfoundland';
-$a->strings['Canada/Pacific'] = 'Kanada/Pacific';
-$a->strings['Canada/Saskatchewan'] = 'Kanada/Saskatchewan';
-$a->strings['Canada/Yukon'] = 'Kanada/Yukon';
-$a->strings['CET'] = 'CET';
-$a->strings['Chile/Continental'] = 'Chile/Continental';
-$a->strings['Chile/EasterIsland'] = 'Chile/EasterIsland';
-$a->strings['CST6CDT'] = 'CST6CDT';
-$a->strings['Cuba'] = 'Cuba';
-$a->strings['EET'] = 'EET';
-$a->strings['Egypt'] = 'Egypten';
-$a->strings['Eire'] = 'Eire';
-$a->strings['EST'] = 'EST';
-$a->strings['EST5EDT'] = 'EST5EDT';
-$a->strings['Etc/GMT'] = 'Etc/GMT';
-$a->strings['Etc/GMT+0'] = 'Etc/GMT+0';
-$a->strings['Etc/GMT+1'] = 'Etc/GMT+1';
-$a->strings['Etc/GMT+10'] = 'Etc/GMT+10';
-$a->strings['Etc/GMT+11'] = 'Etc/GMT+11';
-$a->strings['Etc/GMT+12'] = 'Etc/GMT+12';
-$a->strings['Etc/GMT+2'] = 'Etc/GMT+2';
-$a->strings['Etc/GMT+3'] = 'Etc/GMT+3';
-$a->strings['Etc/GMT+4'] = 'Etc/GMT+4';
-$a->strings['Etc/GMT+5'] = 'Etc/GMT+5';
-$a->strings['Etc/GMT+6'] = 'Etc/GMT+6';
-$a->strings['Etc/GMT+7'] = 'Etc/GMT+7';
-$a->strings['Etc/GMT+8'] = 'Etc/GMT+8';
-$a->strings['Etc/GMT+9'] = 'Etc/GMT+9';
-$a->strings['Etc/GMT-0'] = 'Etc/GMT-0';
-$a->strings['Etc/GMT-1'] = 'Etc/GMT-1';
-$a->strings['Etc/GMT-10'] = 'Etc/GMT-10';
-$a->strings['Etc/GMT-11'] = 'Etc/GMT-11';
-$a->strings['Etc/GMT-12'] = 'Etc/GMT-12';
-$a->strings['Etc/GMT-13'] = 'Etc/GMT-13';
-$a->strings['Etc/GMT-14'] = 'Etc/GMT-14';
-$a->strings['Etc/GMT-2'] = 'Etc/GMT-2';
-$a->strings['Etc/GMT-3'] = 'Etc/GMT-3';
-$a->strings['Etc/GMT-4'] = 'Etc/GMT-4';
-$a->strings['Etc/GMT-5'] = 'Etc/GMT-5';
-$a->strings['Etc/GMT-6'] = 'Etc/GMT-6';
-$a->strings['Etc/GMT-7'] = 'Etc/GMT-7';
-$a->strings['Etc/GMT-8'] = 'Etc/GMT-8';
-$a->strings['Etc/GMT-9'] = 'Etc/GMT-9';
-$a->strings['Etc/GMT0'] = 'Etc/GMT0';
-$a->strings['Etc/Greenwich'] = 'Etc/Greenwich';
-$a->strings['Etc/UCT'] = 'Etc/UCT';
-$a->strings['Etc/Universal'] = 'Etc/Universal';
-$a->strings['Etc/UTC'] = 'Etc/UTC';
-$a->strings['Etc/Zulu'] = 'Etc/Zulu';
-$a->strings['Europe/Amsterdam'] = 'Europa/Amsterdam';
-$a->strings['Europe/Andorra'] = 'Europa/Andorra';
-$a->strings['Europe/Athens'] = 'Europa/Aten';
-$a->strings['Europe/Belfast'] = 'Europa/Belfast';
-$a->strings['Europe/Belgrade'] = 'Europa/Belgrad';
-$a->strings['Europe/Berlin'] = 'Europa/Berlin';
-$a->strings['Europe/Bratislava'] = 'Europa/Bratislava';
-$a->strings['Europe/Brussels'] = 'Europa/Bryssel';
-$a->strings['Europe/Bucharest'] = 'Europa/Bucharest';
-$a->strings['Europe/Budapest'] = 'Europa/Budapest';
-$a->strings['Europe/Chisinau'] = 'Europa/Chisinau';
-$a->strings['Europe/Copenhagen'] = 'Europa/Köpenhamn';
-$a->strings['Europe/Dublin'] = 'Europa/Dublin';
-$a->strings['Europe/Gibraltar'] = 'Europa/Gibraltar';
-$a->strings['Europe/Guernsey'] = 'Europa/Guernsey';
-$a->strings['Europe/Helsinki'] = 'Europa/Helsingfors';
-$a->strings['Europe/Isle_of_Man'] = 'Europa/Isle_of_Man';
-$a->strings['Europe/Istanbul'] = 'Europa/Istanbul';
-$a->strings['Europe/Jersey'] = 'Europa/Jersey';
-$a->strings['Europe/Kaliningrad'] = 'Europa/Kaliningrad';
-$a->strings['Europe/Kiev'] = 'Europa/Kiev';
-$a->strings['Europe/Lisbon'] = 'Europa/Lisabon';
-$a->strings['Europe/Ljubljana'] = 'Europa/Ljubljana';
-$a->strings['Europe/London'] = 'Europa/London';
-$a->strings['Europe/Luxembourg'] = 'Europa/Luxemburg';
-$a->strings['Europe/Madrid'] = 'Europa/Madrid';
-$a->strings['Europe/Malta'] = 'Europa/Malta';
-$a->strings['Europe/Mariehamn'] = 'Europa/Mariehamn';
-$a->strings['Europe/Minsk'] = 'Europa/Minsk';
-$a->strings['Europe/Monaco'] = 'Europa/Monaco';
-$a->strings['Europe/Moscow'] = 'Europa/Moskva';
-$a->strings['Europe/Nicosia'] = 'Europa/Nicosia';
-$a->strings['Europe/Oslo'] = 'Europa/Oslo';
-$a->strings['Europe/Paris'] = 'Europa/Paris';
-$a->strings['Europe/Podgorica'] = 'Europa/Podgorica';
-$a->strings['Europe/Prague'] = 'Europa/Prag';
-$a->strings['Europe/Riga'] = 'Europa/Riga';
-$a->strings['Europe/Rome'] = 'Europa/Rom';
-$a->strings['Europe/Samara'] = 'Europa/Samara';
-$a->strings['Europe/San_Marino'] = 'Europa/San_Marino';
-$a->strings['Europe/Sarajevo'] = 'Europa/Sarajevo';
-$a->strings['Europe/Simferopol'] = 'Europa/Simferopol';
-$a->strings['Europe/Skopje'] = 'Europa/Skopje';
-$a->strings['Europe/Sofia'] = 'Europa/Sofia';
-$a->strings['Europe/Stockholm'] = 'Europa/Stockholm';
-$a->strings['Europe/Tallinn'] = 'Europa/Tallinn';
-$a->strings['Europe/Tirane'] = 'Europa/Tirane';
-$a->strings['Europe/Tiraspol'] = 'Europa/Tiraspol';
-$a->strings['Europe/Uzhgorod'] = 'Europa/Uzhgorod';
-$a->strings['Europe/Vaduz'] = 'Europa/Vaduz';
-$a->strings['Europe/Vatican'] = 'Europa/Vatikanen';
-$a->strings['Europe/Vienna'] = 'Europa/Wien';
-$a->strings['Europe/Vilnius'] = 'Europa/Vilnius';
-$a->strings['Europe/Volgograd'] = 'Europa/Volgograd';
-$a->strings['Europe/Warsaw'] = 'Europa/Warsawa';
-$a->strings['Europe/Zagreb'] = 'Europa/Zagreb';
-$a->strings['Europe/Zaporozhye'] = 'Europa/Zaporozhye';
-$a->strings['Europe/Zurich'] = 'Europa/Zürich';
-$a->strings['Factory'] = 'Factory';
-$a->strings['GB'] = 'GB';
-$a->strings['GB-Eire'] = 'GB-Eire';
-$a->strings['GMT'] = 'GMT';
-$a->strings['GMT+0'] = 'GMT+0';
-$a->strings['GMT-0'] = 'GMT-0';
-$a->strings['GMT0'] = 'GMT0';
-$a->strings['Greenwich'] = 'Greenwich';
-$a->strings['Hongkong'] = 'Hongkong';
-$a->strings['HST'] = 'HST';
-$a->strings['Iceland'] = 'Iceland';
-$a->strings['Indian/Antananarivo'] = 'Indian/Antananarivo';
-$a->strings['Indian/Chagos'] = 'Indian/Chagos';
-$a->strings['Indian/Christmas'] = 'Indian/Christmas';
-$a->strings['Indian/Cocos'] = 'Indian/Cocos';
-$a->strings['Indian/Comoro'] = 'Indian/Comoro';
-$a->strings['Indian/Kerguelen'] = 'Indian/Kerguelen';
-$a->strings['Indian/Mahe'] = 'Indian/Mahe';
-$a->strings['Indian/Maldives'] = 'Indian/Maldives';
-$a->strings['Indian/Mauritius'] = 'Indian/Mauritius';
-$a->strings['Indian/Mayotte'] = 'Indian/Mayotte';
-$a->strings['Indian/Reunion'] = 'Indian/Reunion';
-$a->strings['Iran'] = 'Iran';
-$a->strings['Israel'] = 'Israel';
-$a->strings['Jamaica'] = 'Jamaica';
-$a->strings['Japan'] = 'Japan';
-$a->strings['Kwajalein'] = 'Kwajalein';
-$a->strings['Libya'] = 'Libyen';
-$a->strings['MET'] = 'MET';
-$a->strings['Mexico/BajaNorte'] = 'Mexico/BajaNorte';
-$a->strings['Mexico/BajaSur'] = 'Mexico/BajaSur';
-$a->strings['Mexico/General'] = 'Mexico/General';
-$a->strings['MST'] = 'MST';
-$a->strings['MST7MDT'] = 'MST7MDT';
-$a->strings['Navajo'] = 'Navajo';
-$a->strings['NZ'] = 'NZ';
-$a->strings['NZ-CHAT'] = 'NZ-CHAT';
-$a->strings['Pacific/Apia'] = 'Pacific/Apia';
-$a->strings['Pacific/Auckland'] = 'Pacific/Auckland';
-$a->strings['Pacific/Chatham'] = 'Pacific/Chatham';
-$a->strings['Pacific/Easter'] = 'Pacific/Easter';
-$a->strings['Pacific/Efate'] = 'Pacific/Efate';
-$a->strings['Pacific/Enderbury'] = 'Pacific/Enderbury';
-$a->strings['Pacific/Fakaofo'] = 'Pacific/Fakaofo';
-$a->strings['Pacific/Fiji'] = 'Pacific/Fiji';
-$a->strings['Pacific/Funafuti'] = 'Pacific/Funafuti';
-$a->strings['Pacific/Galapagos'] = 'Pacific/Galapagos';
-$a->strings['Pacific/Gambier'] = 'Pacific/Gambier';
-$a->strings['Pacific/Guadalcanal'] = 'Pacific/Guadalcanal';
-$a->strings['Pacific/Guam'] = 'Pacific/Guam';
-$a->strings['Pacific/Honolulu'] = 'Pacific/Honolulu';
-$a->strings['Pacific/Johnston'] = 'Pacific/Johnston';
-$a->strings['Pacific/Kiritimati'] = 'Pacific/Kiritimati';
-$a->strings['Pacific/Kosrae'] = 'Pacific/Kosrae';
-$a->strings['Pacific/Kwajalein'] = 'Pacific/Kwajalein';
-$a->strings['Pacific/Majuro'] = 'Pacific/Majuro';
-$a->strings['Pacific/Marquesas'] = 'Pacific/Marquesas';
-$a->strings['Pacific/Midway'] = 'Pacific/Midway';
-$a->strings['Pacific/Nauru'] = 'Pacific/Nauru';
-$a->strings['Pacific/Niue'] = 'Pacific/Niue';
-$a->strings['Pacific/Norfolk'] = 'Pacific/Norfolk';
-$a->strings['Pacific/Noumea'] = 'Pacific/Noumea';
-$a->strings['Pacific/Pago_Pago'] = 'Pacific/Pago_Pago';
-$a->strings['Pacific/Palau'] = 'Pacific/Palau';
-$a->strings['Pacific/Pitcairn'] = 'Pacific/Pitcairn';
-$a->strings['Pacific/Ponape'] = 'Pacific/Ponape';
-$a->strings['Pacific/Port_Moresby'] = 'Pacific/Port_Moresby';
-$a->strings['Pacific/Rarotonga'] = 'Pacific/Rarotonga';
-$a->strings['Pacific/Saipan'] = 'Pacific/Saipan';
-$a->strings['Pacific/Samoa'] = 'Pacific/Samoa';
-$a->strings['Pacific/Tahiti'] = 'Pacific/Tahiti';
-$a->strings['Pacific/Tarawa'] = 'Pacific/Tarawa';
-$a->strings['Pacific/Tongatapu'] = 'Pacific/Tongatapu';
-$a->strings['Pacific/Truk'] = 'Pacific/Truk';
-$a->strings['Pacific/Wake'] = 'Pacific/Wake';
-$a->strings['Pacific/Wallis'] = 'Pacific/Wallis';
-$a->strings['Pacific/Yap'] = 'Pacific/Yap';
-$a->strings['Poland'] = 'Polen';
-$a->strings['Portugal'] = 'Portugal';
-$a->strings['PRC'] = 'PRC';
-$a->strings['PST8PDT'] = 'PST8PDT';
-$a->strings['ROC'] = 'ROC';
-$a->strings['ROK'] = 'ROK';
-$a->strings['Singapore'] = 'Singapore';
-$a->strings['Turkey'] = 'Turkiet';
-$a->strings['UCT'] = 'UCT';
-$a->strings['Universal'] = 'Universal';
-$a->strings['US/Alaska'] = 'USA/Alaska';
-$a->strings['US/Aleutian'] = 'USA/Aleutian';
-$a->strings['US/Arizona'] = 'USA/Arizona';
-$a->strings['US/Central'] = 'USA/Central';
-$a->strings['US/East-Indiana'] = 'USA/East-Indiana';
-$a->strings['US/Eastern'] = 'USA/Eastern';
-$a->strings['US/Hawaii'] = 'USA/Hawaii';
-$a->strings['US/Indiana-Starke'] = 'USA/Indiana-Starke';
-$a->strings['US/Michigan'] = 'USA/Michigan';
-$a->strings['US/Mountain'] = 'USA/Mountain';
-$a->strings['US/Pacific'] = 'USA/Pacific';
-$a->strings['US/Pacific-New'] = 'USA/Pacific-New';
-$a->strings['US/Samoa'] = 'USA/Samoa';
-$a->strings['UTC'] = 'UTC';
-$a->strings['W-SU'] = 'W-SU';
-$a->strings['WET'] = 'WET';
-$a->strings['Zulu'] = 'Zulu';
+$a->strings["Introduction complete."] = "Kontaktf&ouml;rfr&aring;gan/Presentationen &auml;r klar.";
+$a->strings["Unrecoverable protocol error."] = "Protokollfel.";
+$a->strings["Profile unavailable."] = "Profilen &auml;r inte tillg&auml;nglig.";
+$a->strings["%s has received too many connection requests today."] = "%s har f&aring;tt f&ouml;r m&aring;nga kontaktf&ouml;rfr&aring;gningar idag.";
+$a->strings["Spam protection measures have been invoked."] = "&Aring;tg&auml;rder f&ouml;r spamskydd har vidtagits.";
+$a->strings["Friends are advised to please try again in 24 hours."] = "Dina v&auml;nner kan prova igen om ett dygn.";
+$a->strings["Invalid locator"] = "Invalid locator";
+$a->strings["Unable to resolve your name at the provided location."] = "Unable to resolve your name at the provided location.";
+$a->strings["You have already introduced yourself here."] = "Du har redan presenterat dig h&auml;r.";
+$a->strings["Apparently you are already friends with %s."] = "Du och %s &auml;r redan kontakter.";
+$a->strings["Invalid profile URL."] = "Ogiltig profil-URL.";
+$a->strings["Disallowed profile URL."] = "Otill&aring;ten profil-URL.";
+$a->strings["Your introduction has been sent."] = "Kontaktf&ouml;rfr&aring;gan/Presentationen har skickats.";
+$a->strings["Please login to confirm introduction."] = "Logga in f&ouml;r att acceptera f&ouml;rfr&aring;gan.";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Inloggad med fel identitet. Logga in med <strong>den h&auml;r</strong> profilen.";
+$a->strings["Welcome home %s."] = "V&auml;lkommen hem %s.";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Bekr&auml;fta att du vill skicka kontaktf&ouml;rfr&aring;gan till %s.";
+$a->strings["Confirm"] = "Bekr&auml;fta";
+$a->strings["[Name Withheld]"] = "[Namnet visas inte]";
+$a->strings["Introduction received at "] = "Inkommen kontaktf&ouml;rfr&aring;gan/presentation - ";
+$a->strings["Friend/Connection Request"] = "V&auml;n- eller kontaktf&ouml;rfr&aring;gan";
+$a->strings["Please answer the following:"] = "Var v&auml;nlig besvara f&ouml;ljande:";
+$a->strings["Does \$name know you?"] = "K&auml;nner \$name dig?";
+$a->strings["Add a personal note:"] = "L&auml;gg till ett personligt meddelande:";
+$a->strings["Please enter your profile address from one of the following supported social networks:"] = "Ange din profiladress p&aring; ett av f&ouml;ljande sociala n&auml;tverk:";
+$a->strings["Friendika"] = "Friendika";
+$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
+$a->strings["Private (secure) network"] = "Privat (s&auml;kert) n&auml;tverk";
+$a->strings["Public (insecure) network"] = "Offentligt (os&auml;kert) n&auml;tverk";
+$a->strings["Your profile address:"] = "Din profiladress:";
+$a->strings["Submit Request"] = "Skicka f&ouml;rfr&aring;gan";
+$a->strings["Cancel"] = "Avbryt";
+$a->strings["status"] = "status";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s gillar %2\$s's %3\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s ogillar %2\$s's %3\$s";
+$a->strings["Password reset request issued. Check your email."] = "Nytt l&ouml;senord har beg&auml;rts. Kolla din mail.";
+$a->strings["Password reset requested at %s"] = "Nytt l&ouml;senord p&aring; %s har beg&auml;rts";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Request could not be verified. (You may have previously submitted it.) Password reset failed.";
+$a->strings["Your password has been reset as requested."] = "Nu har du f&aring;tt ett nytt l&ouml;senord.";
+$a->strings["Your new password is"] = "Det nya l&ouml;senordet &auml;r";
+$a->strings["Save or copy your new password - and then"] = "Spara eller kopiera l&ouml;senordet och";
+$a->strings["click here to login"] = "klicka h&auml;r f&ouml;r att logga in";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "N&auml;r du loggat in kan du byta l&ouml;senord p&aring; sidan <em>Inst&auml;llningar</em>.";
+$a->strings["Forgot your Password?"] = "Gl&ouml;mt l&ouml;senordet?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Ange din e-postadress f&ouml;r att f&aring; ett nytt l&ouml;senord. Du kommer att f&aring; ett meddelande med vidare instruktioner via e-post.";
+$a->strings["Nickname or Email: "] = "Anv&auml;ndarnamn eller e-post:";
+$a->strings["Reset"] = "Skicka";
+$a->strings["Remove My Account"] = "Ta bort mitt konto";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Detta kommer att ta bort kontot helt och h&aring;llet. Efter att det &auml;r gjort g&aring;r det inte att &aring;terst&auml;lla.";
+$a->strings["Please enter your password for verification:"] = "Ange l&ouml;senordet igen f&ouml;r s&auml;kerhets skull:";
+$a->strings["Applications"] = "Applikationer";
+$a->strings["Global Directory"] = "Medlemskatalog f&ouml;r flera sajter (global)";
+$a->strings["Site Directory"] = "Medlemskatalog";
+$a->strings["Gender: "] = "K&ouml;n: ";
+$a->strings["No entries (some entries may be hidden)."] = "Inget att visa. (Man kan v&auml;lja att inte synas h&auml;r)";
+$a->strings["This is Friendika version"] = "Det h&auml;r &auml;r Friendika version";
+$a->strings["running at web location"] = "som k&ouml;rs p&aring;";
+$a->strings["Shared content within the Friendika network is provided under the <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0 license</a>"] = "Inneh&aring;ll som publiceras inom Friendikan&auml;tverket omfattas av licensen <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0 license</a>";
+$a->strings["Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</a> to learn more about the Friendika project."] = "G&aring; till <a href=\"http://project.friendika.com\">Project.Friendika.com</a> om du vill l&auml;sa mer om friendikaprojektet.";
+$a->strings["Bug reports and issues: please visit"] = "Anm&auml;l buggar eller andra problem, g&aring; till";
+$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - dot com"] = "F&ouml;rslag, ber&ouml;m, donationer, etc. - skicka e-post till \"info at friendika punkt com\" ";
+$a->strings["Installed plugins/addons/apps"] = "Installerade insticksprogram/applikationer";
+$a->strings["No installed plugins/addons/apps"] = "Inga installerade insticksprogram/applikationer";
+$a->strings["Unable to locate original post."] = "Hittar inte det ursprungliga inl&auml;gget.";
+$a->strings["Empty post discarded."] = "Tomt inl&auml;gg. Inte sparat.";
+$a->strings["%s commented on your item at %s"] = "%s har kommenterat ditt inl&auml;gg p&aring; %s";
+$a->strings["%s posted on your profile wall at %s"] = "%s har gjort ett inl&auml;gg p&aring; din logg p&aring; %s";
+$a->strings["System error. Post not saved."] = "N&aring;got gick fel. Inl&auml;gget sparades inte.";
+$a->strings["This message was sent to you by %s, a member of the Friendika social network."] = "Meddelandet skickades av %s, medlem i det sociala n&auml;tverket Friendika.";
+$a->strings["You may visit them online at"] = "Bes&ouml;k online p&aring;";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Kontakta avs&auml;ndaren genom att svara p&aring; det h&auml;r meddelandet om du inte vill ha s&aring;dana h&auml;r meddelanden.";
+$a->strings["%s posted an update."] = "%s har gjort ett inl&auml;gg.";
+$a->strings["Tag removed"] = "Taggen har tagits bort";
+$a->strings["Remove Item Tag"] = "Ta bort tagg";
+$a->strings["Select a tag to remove: "] = "V&auml;lj vilken tagg som ska tas bort: ";
+$a->strings["Remove"] = "Ta bort";
+$a->strings["No recipient selected."] = "Ingen mottagare har valts.";
+$a->strings["[no subject]"] = "[ingen rubrik]";
+$a->strings["Unable to locate contact information."] = "Det gick inte att hitta kontaktuppgifterna.";
+$a->strings["Message sent."] = "Meddelandet har skickats.";
+$a->strings["Message could not be sent."] = "Det gick inte att skicka meddelandet.";
+$a->strings["Messages"] = "Meddelanden";
+$a->strings["Inbox"] = "Inkorg";
+$a->strings["Outbox"] = "Utkorg";
+$a->strings["New Message"] = "Nytt meddelande";
+$a->strings["Message deleted."] = "Meddelandet togs bort.";
+$a->strings["Conversation removed."] = "Konversationen togs bort.";
+$a->strings["Send Private Message"] = "Skicka personligt meddelande";
+$a->strings["To:"] = "Till:";
+$a->strings["Subject:"] = "Rubrik:";
+$a->strings["No messages."] = "Inga meddelanden.";
+$a->strings["Delete conversation"] = "Ta bort konversation";
+$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
+$a->strings["Message not available."] = "Meddelandet &auml;r inte tillg&auml;ngligt.";
+$a->strings["Delete message"] = "Ta bort meddelande";
+$a->strings["Send Reply"] = "Skicka svar";
+$a->strings["Response from remote site was not understood."] = "Kunde inte tolka svaret fr&aring;n fj&auml;rrsajten.";
+$a->strings["Unexpected response from remote site: "] = "Ov&auml;ntat svar fr&aring;n fj&auml;rrsajten: ";
+$a->strings["Confirmation completed successfully."] = "Bekr&auml;ftat.";
+$a->strings["Remote site reported: "] = "Meddelande fr&aring;n fj&auml;rrsajten: ";
+$a->strings["Temporary failure. Please wait and try again."] = "Tillf&auml;lligt fel. F&ouml;rs&ouml;k igen lite senare.";
+$a->strings["Introduction failed or was revoked."] = "Kontaktf&ouml;rfr&aring;gan gick inte fram eller har &aring;terkallats.";
+$a->strings["Unable to set contact photo."] = "Det gick inte att byta profilbild.";
+$a->strings["is now friends with"] = "&auml;r nu v&auml;n med";
+$a->strings["No user record found for '%s' "] = "No user record found for '%s' ";
+$a->strings["Our site encryption key is apparently messed up."] = "Det &auml;r n&aring;got fel p&aring; webbplatsens krypteringsnyckel.";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Empty site URL was provided or URL could not be decrypted by us.";
+$a->strings["Contact record was not found for you on our site."] = "Det gick inte att hitta efterfr&aring;gad information p&aring; v&aring;r webbplats.";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Det ID som angavs av ditt system &auml;r samma som p&aring; v&aring;rt system. Det borde fungera om du provar igen.";
+$a->strings["Unable to set your contact credentials on our system."] = "Unable to set your contact credentials on our system.";
+$a->strings["Unable to update your contact profile details on our system"] = "Unable to update your contact profile details on our system";
+$a->strings["Connection accepted at %s"] = "Kontaktf&ouml;rfr&aring;gan beviljad - %s";
+$a->strings["Login failed."] = "Inloggningen misslyckades.";
+$a->strings["Welcome back "] = "V&auml;lkommen tillbaka ";
+$a->strings["%s welcomes %s"] = "%s v&auml;lkomnar %s";
+$a->strings["No contacts."] = "Inga kontakter.";
+$a->strings["Group created."] = "Gruppen har skapats.";
+$a->strings["Could not create group."] = "Det gick inte att skapa gruppen.";
+$a->strings["Group not found."] = "Gruppen hittades inte.";
+$a->strings["Group name changed."] = "Gruppens namn har &auml;ndrats.";
+$a->strings["Membership list updated."] = "Medlemslistan har uppdaterats.";
+$a->strings["Create a group of contacts/friends."] = "Skapa en grupp med kontakter/v&auml;nner.";
+$a->strings["Group Name: "] = "Gruppens namn: ";
+$a->strings["Group removed."] = "Gruppen har tagits bort.";
+$a->strings["Unable to remove group."] = "Det gick inte att ta bort gruppen.";
+$a->strings["Group Editor"] = "&Auml;ndra i grupper";
+$a->strings["Members:"] = "Medlemmar:";
+$a->strings["Profile Match"] = "Matcha profiler";
+$a->strings["No matches"] = "Ingen tr&auml;ff";
+$a->strings["Post to Twitter"] = "L&auml;gg in p&aring; Twitter";
+$a->strings["Twitter Posting Settings"] = "Inst&auml;llningar f&ouml;r inl&auml;gg p&aring; Twitter";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No consumer key pair for Twitter found. Please contact your site administrator.";
+$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."] = "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.";
+$a->strings["Log in with Twitter"] = "Logga in med Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Ange PIN-koden fr&aring;n Twitter h&auml;r";
+$a->strings["Currently connected to: "] = "Ansluten till: ";
+$a->strings["If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well."] = "If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.";
+$a->strings["Send public postings to Twitter"] = "Send public postings to Twitter";
+$a->strings["Clear OAuth configuration"] = "Clear OAuth configuration";
+$a->strings["Post to StatusNet"] = "L&auml;gg in p&aring; StatusNet";
+$a->strings["StatusNet Posting Settings"] = "Inst&auml;llningar f&ouml;r inl&auml;gg p&aring; StatusNet";
+$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 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.";
+$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
+$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret";
+$a->strings["Base API Path (remember the trailing /)"] = "Base API Path (remember the trailing /)";
+$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."] = "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.";
+$a->strings["Log in with StatusNet"] = "Logga in med StatusNet";
+$a->strings["Copy the security code from StatusNet here"] = "Ange s&auml;kerhetskoden fr&aring;n StatusNet h&auml;r";
+$a->strings["If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well."] = "If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.";
+$a->strings["Send public postings to StatusNet"] = "Send public postings to StatusNet";
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tredimensionellt luffarschack";
+$a->strings["3D Tic-Tac-Toe"] = "3D-luffarschack";
+$a->strings["New game"] = "Ny spelomg&aring;ng";
+$a->strings["New game with handicap"] = "Ny spelomg&aring;ng med handikapp";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Det tredimensionella luffarschacket &auml;r precis som vanligt luffarschack f&ouml;rutom att det spelas i flera niv&aring;er samtidigt. ";
+$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."] = "H&auml;r &auml;r det tre niv&aring;er. Man vinner om man f&aring;r tre i rad p&aring; vilken niv&aring; som helst, eller upp&aring;t, ned&aring;t eller diagonalt p&aring; flera niv&aring;er.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Om man spelar med handikapp s&aring; st&auml;ngs mittenpositionen p&aring; mittenniv&aring;n av eftersom spelare som v&auml;ljer den positionen ofta f&aring;r &ouml;vertaget.";
+$a->strings["You go first..."] = "Du b&ouml;rjar...";
+$a->strings["I'm going first this time..."] = "Jag b&ouml;rjar den h&auml;r g&aring;ngen...";
+$a->strings["You won!"] = "Du vann!";
+$a->strings["\"Cat\" game!"] = "\"Cat\" game!";
+$a->strings["I won!"] = "Jag vann!";
+$a->strings["Select files to upload: "] = "V&auml;lj filer att ladda upp: ";
+$a->strings["Use the following controls only if the Java uploader [above] fails to launch."] = "Anv&auml;nd f&ouml;ljande bara om javauppladdaren ovanf&ouml;r inte startar.";
+$a->strings["Facebook disabled"] = "Facebook inaktiverat";
+$a->strings["Facebook API key is missing."] = "Facebook API key is missing.";
+$a->strings["Facebook Connect"] = "Facebook Connect";
+$a->strings["Install Facebook post connector"] = "Install Facebook post connector";
+$a->strings["Remove Facebook post connector"] = "Remove Facebook post connector";
+$a->strings["Post to Facebook by default"] = "L&auml;gg alltid in inl&auml;ggen p&aring; Facebook";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Facebook Connector Settings"] = "Facebook Connector Settings";
+$a->strings["Post to Facebook"] = "L&auml;gg in p&aring; Facebook";
+$a->strings["Image: "] = "Bild: ";
+$a->strings["Randplace Settings"] = "Randplace Settings";
+$a->strings["Enable Randplace Plugin"] = "Enable Randplace Plugin";
+$a->strings["Upload a file"] = "Ladda upp en fil";
+$a->strings["Drop files here to upload"] = "Dra filer som ska laddas upp hit";
+$a->strings["Failed"] = "Misslyckades";
+$a->strings["No files were uploaded."] = "Inga filer laddades upp.";
+$a->strings["Uploaded file is empty"] = "Den uppladdade filen &auml;r tom";
+$a->strings["Uploaded file is too large"] = "Den uppladdade filen &auml;r f&ouml;r stor";
+$a->strings["File has an invalid extension, it should be one of "] = "Otill&aring;ten filnamns&auml;ndelse, det ska vara ";
+$a->strings["Upload was cancelled, or server error encountered"] = "Serverfel eller avbruten uppladdning";
+$a->strings["Unknown | Not categorised"] = "Ok&auml;nd | Inte kategoriserad";
+$a->strings["Block immediately"] = "Sp&auml;rra omedelbart";
+$a->strings["Shady, spammer, self-marketer"] = "Skum, spammare, reklamspridare";
+$a->strings["Known to me, but no opinion"] = "Jag vet vem det &auml;r, men har ingen &aring;sikt";
+$a->strings["OK, probably harmless"] = "OK, antagligen harml&ouml;s";
+$a->strings["Reputable, has my trust"] = "P&aring;litlig, jag litar p&aring; personen";
+$a->strings["Frequently"] = "Ofta";
+$a->strings["Hourly"] = "En g&aring;ng i timmen";
+$a->strings["Twice daily"] = "Tv&aring; g&aring;nger om dagen";
+$a->strings["Daily"] = "Dagligen";
+$a->strings["Weekly"] = "Veckovis";
+$a->strings["Monthly"] = "M&aring;nadsvis";
+$a->strings["Male"] = "Man";
+$a->strings["Female"] = "Kvinna";
+$a->strings["Currently Male"] = "F&ouml;r n&auml;rvarande man";
+$a->strings["Currently Female"] = "F&ouml;r n&auml;rvarande kvinna";
+$a->strings["Mostly Male"] = "Mestadels man";
+$a->strings["Mostly Female"] = "Mestadels kvinna";
+$a->strings["Transgender"] = "Transgender";
+$a->strings["Intersex"] = "Intersex";
+$a->strings["Transsexual"] = "Transsexuell";
+$a->strings["Hermaphrodite"] = "Hermafrodit";
+$a->strings["Neuter"] = "K&ouml;nsl&ouml;s";
+$a->strings["Non-specific"] = "Oklart";
+$a->strings["Other"] = "Annat";
+$a->strings["Undecided"] = "Obest&auml;mt";
+$a->strings["Males"] = "M&auml;n";
+$a->strings["Females"] = "Kvinnor";
+$a->strings["Gay"] = "B&ouml;g";
+$a->strings["Lesbian"] = "Lesbisk";
+$a->strings["No Preference"] = "No Preference";
+$a->strings["Bisexual"] = "Bisexuell";
+$a->strings["Autosexual"] = "Autosexual";
+$a->strings["Abstinent"] = "Abstinent";
+$a->strings["Virgin"] = "Oskuld";
+$a->strings["Deviant"] = "Avvikande";
+$a->strings["Fetish"] = "Fetisch";
+$a->strings["Oodles"] = "Massor";
+$a->strings["Nonsexual"] = "Asexuell";
+$a->strings["Single"] = "Singel";
+$a->strings["Lonely"] = "Ensam";
+$a->strings["Available"] = "Tillg&auml;nglig";
+$a->strings["Unavailable"] = "Upptagen";
+$a->strings["Dating"] = "Dejtar";
+$a->strings["Unfaithful"] = "Otrogen";
+$a->strings["Sex Addict"] = "Sexmissbrukare";
+$a->strings["Friends"] = "V&auml;nner";
+$a->strings["Friends/Benefits"] = "Friends/Benefits";
+$a->strings["Casual"] = "Casual";
+$a->strings["Engaged"] = "F&ouml;rlovad";
+$a->strings["Married"] = "Gift";
+$a->strings["Partners"] = "I partnerskap";
+$a->strings["Cohabiting"] = "Cohabiting";
+$a->strings["Happy"] = "N&ouml;jd";
+$a->strings["Not Looking"] = "Letar inte";
+$a->strings["Swinger"] = "Swinger";
+$a->strings["Betrayed"] = "Bedragen";
+$a->strings["Separated"] = "Separerat";
+$a->strings["Unstable"] = "Instabilt";
+$a->strings["Divorced"] = "Skiljd";
+$a->strings["Widowed"] = "&Auml;nka/&auml;nkling";
+$a->strings["Uncertain"] = "Oklart";
+$a->strings["Complicated"] = "Komplicerat";
+$a->strings["Don't care"] = "Bryr mig inte";
+$a->strings["Ask me"] = "Fr&aring;ga mig";
+$a->strings["Visible To:"] = "Synlig f&ouml;r:";
+$a->strings["Groups"] = "Grupper";
+$a->strings["Except For:"] = "Utom f&ouml;r:";
+$a->strings["Logged out."] = "Utloggad.";
+$a->strings["Miscellaneous"] = "Blandat";
+$a->strings["less than a second ago"] = "f&ouml;r mindre &auml;n en sekund sedan";
+$a->strings["year"] = "&aring;r";
+$a->strings["years"] = "&aring;r";
+$a->strings["month"] = "m&aring;nad";
+$a->strings["months"] = "m&aring;nader";
+$a->strings["week"] = "vecka";
+$a->strings["weeks"] = "veckor";
+$a->strings["day"] = "dag";
+$a->strings["hour"] = "timme";
+$a->strings["hours"] = "timmar";
+$a->strings["minute"] = "minut";
+$a->strings["minutes"] = "minuter";
+$a->strings["second"] = "sekund";
+$a->strings["seconds"] = "sekunder";
+$a->strings[" ago"] = " sedan";
+$a->strings["Birthday:"] = "F&ouml;delsedatum:";
+$a->strings["j F, Y"] = "j F, Y";
+$a->strings["j F"] = "j F";
+$a->strings["Age:"] = "&Aring;lder:";
+$a->strings["<span class=\"heart\">&hearts;</span> Status:"] = "<span class=\"heart\">&hearts;</span> Civilst&aring;nd:";
+$a->strings["Religion:"] = "Religion:";
+$a->strings["About:"] = "Om:";
+$a->strings["Hobbies/Interests:"] = "Hobbys/Intressen:";
+$a->strings["Contact information and Social Networks:"] = "Kontaktuppgifter och sociala n&auml;tverk:";
+$a->strings["Musical interests:"] = "Musik:";
+$a->strings["Books, literature:"] = "B&ouml;cker/Litteratur:";
+$a->strings["Television:"] = "TV:";
+$a->strings["Film/dance/culture/entertainment:"] = "Film/Dans/Kultur/Underh&aring;llning:";
+$a->strings["Love/Romance:"] = "K&auml;rlek/Romantik:";
+$a->strings["Work/employment:"] = "Arbete:";
+$a->strings["School/education:"] = "Skola/Utbildning:";
+$a->strings["Home"] = "Hem";
+$a->strings["Apps"] = "Apps";
+$a->strings["Directory"] = "Medlemskatalog";
+$a->strings["Network"] = "N&auml;tverk";
+$a->strings["Notifications"] = "Aviseringar";
+$a->strings["Manage"] = "Hantera";
+$a->strings["Settings"] = "Inst&auml;llningar";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "Cannot locate DNS info for database server '%s'";
+$a->strings["You have a new follower at "] = "En ny person har valt att f&ouml;lja dig p&aring; ";
+$a->strings["Create a new group"] = "Skapa ny grupp";
+$a->strings["Everybody"] = "Alla";
+$a->strings["Embedding disabled"] = "Funktionen b&auml;dda in &auml;r avst&auml;ngd";
\ No newline at end of file
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 6658cd94a..0e361ad46 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -402,7 +402,14 @@ input#dfrn-url {
 #notify2-end,
 #notify3-end,
 #notify4-end,
-#notify5-end {
+#notify5-end,
+#imap-server-end,
+#imap-port-end,
+#imap-ssl-end,
+#imap-user-end,
+#imap-pass-end,
+#imap-replyto-end,
+#imap-pubmail-end {
 	margin-bottom: 5px;
 	clear: both;
 }
@@ -423,7 +430,14 @@ input#dfrn-url {
 #settings-label-notify2,
 #settings-label-notify3,
 #settings-label-notify4,
-#settings-label-notify5 {
+#settings-label-notify5,
+#settings-label-imap1,
+#settings-label-imap2,
+#settings-label-imap3,
+#settings-label-imap4,
+#settings-label-imap5,
+#settings-label-imap6,
+#settings-label-imap7 {
 	float: left;
 	width: 200px;
 }
@@ -443,7 +457,14 @@ input#dfrn-url {
 #notify2,
 #notify3,
 #notify4,
-#notify5 {
+#notify5,
+#imap-server,
+#imap-port,
+#imap-ssl,
+#imap-user,
+#imap-pass,
+#imap-replyto,
+#imap-pubmail {
 	float: left;
 	margin-bottom: 20px;
 }
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index fd909666f..f4d31e93f 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -529,7 +529,14 @@ input#dfrn-url {
 #notify2-end,
 #notify3-end,
 #notify4-end,
-#notify5-end {
+#notify5-end,
+#imap-server-end,
+#imap-port-end,
+#imap-ssl-end,
+#imap-user-end,
+#imap-pass-end,
+#imap-replyto-end,
+#imap-pubmail-end {
 	margin-bottom: 5px;
 	clear: both;
 }
@@ -550,7 +557,14 @@ input#dfrn-url {
 #settings-label-notify2,
 #settings-label-notify3,
 #settings-label-notify4,
-#settings-label-notify5 {
+#settings-label-notify5,
+#settings-label-imap1,
+#settings-label-imap2,
+#settings-label-imap3,
+#settings-label-imap4,
+#settings-label-imap5,
+#settings-label-imap6,
+#settings-label-imap7 {
 	float: left;
 	width: 200px;
 }
@@ -570,7 +584,14 @@ input#dfrn-url {
 #notify2,
 #notify3,
 #notify4,
-#notify5 {
+#notify5,
+#imap-server,
+#imap-port,
+#imap-ssl,
+#imap-user,
+#imap-pass,
+#imap-replyto,
+#imap-pubmail {
 	float: left;
 	margin-bottom: 20px;
 }
diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl
index f843df31e..c6184e306 100644
--- a/view/xrd_host.tpl
+++ b/view/xrd_host.tpl
@@ -4,9 +4,9 @@
  
     <hm:Host>$domain</hm:Host>
  
-    <Link rel='lrdd' template='http://$domain/xrd/?uri={uri}' />
-    <Link rel='acct-mgmt' href='http://$domain/amcd' />
-    <Link rel='http://services.mozilla.com/amcd/0.1' href='http://$domain/amcd' />
+    <Link rel='lrdd' template='$domain/xrd/?uri={uri}' />
+    <Link rel='acct-mgmt' href='$domain/amcd' />
+    <Link rel='http://services.mozilla.com/amcd/0.1' href='$domain/amcd' />
 	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
-		href="http://$domain/oexchange/xrd" />
+		href="$domain/oexchange/xrd" />
 </XRD>