Merge remote branch 'mike/master'

2011-03-28 12:11:10 +02:00 · 2011-03-28 12:11:10 +02:00 · da546588db
parent 19d7e7fefe 1f6c6c466a
commit da546588db
64 changed files with 1273 additions and 850 deletions
--- a/18
+++ b/18
@ -1,7 +1,7 @@

-    *********
-    Friendika
-    *********
+    *************
+    * Friendika *
+    *************

    Distributed Social Network

@ -79,11 +79,6 @@ only able to see the side of you that you wish to present. If you send a
 private message to your aunt Mary, we will encrypt it with military grade
 encryption.

-    Other distributed social network projects talk about privacy and offering
-a feature-rich social networking alternative, but all they can deliver is 
-vapour and vague promises. Things like "Private mail will be in the next
-release". 
-
    Friendika delivers. We've got an incredibly rich social communications 
 interface you can make use of *right now*.

@ -94,6 +89,13 @@ But we're creating something completely different.

    Something better.

+    Start with richer communications. Adorn your text, colour it. We've got a 
+text counter in case you're sending across to one of the primitive social 
+networks, but we don't think you should have to squeeze your communications
+into some arbitrary limit. Free yourself from thinking how to squeeze your 
+message into 140 or 420 characters, or sending messages in some strange 
+short-hand code. Even edit your text after you send it. It's OK.
+
    A single instance of Friendika can easily support hundreds of (and up to
 several thousand) people using commodity hosting hardware. You could even run
 Friendika on an old PC in your closet or garage. Each of these people are able
--- a/boot.php
+++ b/boot.php
@ -2,9 +2,9 @@

 set_time_limit(0);

-define ( 'FRIENDIKA_VERSION',      '2.1.925' );
+define ( 'FRIENDIKA_VERSION',      '2.1.931' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
-define ( 'DB_UPDATE_VERSION',      1044   );
+define ( 'DB_UPDATE_VERSION',      1045   );

 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@ -1068,6 +1068,7 @@ function paginate(&$a) {
 	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
 	$stripped = str_replace('q=','',$stripped);
 	$stripped = trim($stripped,'/');
+	$pagenum = $a->pager['page'];
 	$url = $a->get_baseurl() . '/' . $stripped;


@ -2019,7 +2020,7 @@ function contact_block() {
 			intval($shown)
 	);
 	if(count($r)) {
-		$o .= '<h4 class="contact-h4">' . $total . ' ' . t('Contacts') . '</h4><div id="contact-block">';
+		$o .= '<h4 class="contact-h4">' .  sprintf(tt('%d Contact','%d Contacts', $total),$total) . '</h4><div id="contact-block">';
 		foreach($r as $rr) {
 			$redirect_url = $a->get_baseurl() . '/redir/' . $rr['id'];
 			if(local_user() && ($rr['uid'] == local_user())
--- a/database.sql
+++ b/database.sql
@ -315,7 +315,9 @@ CREATE TABLE IF NOT EXISTS `profile` (
  `thumb` char(255) NOT NULL,
  `publish` tinyint(1) NOT NULL DEFAULT '0',
  `net-publish` tinyint(1) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `pub_keywords` (`pub_keywords`),
+  FULLTEXT KEY `prv_keywords` (`prv_keywords`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;

 -- --------------------------------------------------------
--- a/include/nav.php
+++ b/include/nav.php
@ -124,7 +124,7 @@ function nav(&$a) {
 	$banner = get_config('system','banner');

 	if($banner === false) 
-		$banner .= '<a href="http://friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendika.com">Friendika</a></span>';
+		$banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>';


 	$a->page['nav'] .= '<span id="banner">' . $banner . '</span>';
--- a/mod/directory.php
+++ b/mod/directory.php
@ -86,10 +86,10 @@ function directory_content(&$a) {
 			}
 			if(strlen($rr['dob'])) {
 				if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
-					$details .= "<br />Age: $years" ; 
+					$details .= '<br />' . t('Age: ') . $years ; 
 			}
 			if(strlen($rr['gender']))
-				$details .= '<br />Gender: ' . $rr['gender'];
+				$details .= '<br />' . t('Gender: ') . $rr['gender'];

 			$entry = replace_macros($tpl,array(
 				'$id' => $rr['id'],
@ -115,7 +115,7 @@ function directory_content(&$a) {

 	}
 	else
-		notice("No entries (some entries may be hidden).");
+		notice( t("No entries \x28some entries may be hidden\x29.") . EOL);

 	return $o;
 }
--- a/mod/friendika.php
+++ b/mod/friendika.php
@ -0,0 +1,47 @@
+<?php
+
+function friendika_content(&$a) {
+
+	$o = '';
+	$o .= '<h3>Friendika</h3>';
+
+
+	$o .= '<p></p><p>';
+
+	$o .= 'View <a href="LICENSE">License</a>' . '<br /><br />';
+	$o .= t('This is Friendika version') . ' ' . FRIENDIKA_VERSION . ' ';
+	$o .= t('running at web location') . ' ' . $a->get_baseurl() . '</p><p>';
+
+	$o .= t('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>') . '</p><p>';
+
+	$o .= t('Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendika project.') . '</p><p>';	
+
+	$o .= t('Bug reports and issues: please visit') . ' ' . '<a href="http://bugs.friendika.com">Bugs.Friendika.com</a></p><p>';
+	$o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com') . '</p>';
+
+	$o .= '<p></p>';
+
+	if(count($a->plugins)) {
+		$o .= '<p>' . t('Installed plugins/addons/apps') . '</p>';
+		$o .= '<ul>';
+		foreach($a->plugins as $p)
+			if(strlen($p))
+				$o .= '<li>' . $p . '</li>';
+		$o .= '</ul>';
+	}
+	else
+		$o .= '<p>' . t('No installed plugins/addons/apps');
+ 	
+	return $o;
+
+
+
+
+
+
+
+
+
+
+
+}
--- a/mod/network.php
+++ b/mod/network.php
@ -183,8 +183,11 @@ function network_content(&$a, $update = 0) {
 		intval($_SESSION['uid'])
 	);

-	if(count($r))
+	if(count($r)) {
 		$a->set_pager_total($r[0]['total']);
+		$a->set_pager_itemspage(40);
+	}
+

 	if($nouveau) {
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
@ -203,6 +206,26 @@ function network_content(&$a, $update = 0) {
 		);
 	}
 	else {
+		$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid`
+			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			AND `item`.`parent` = `item`.`id`
+			$sql_extra
+			ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+			intval(local_user()),
+			intval($a->pager['start']),
+			intval($a->pager['itemspage'])
+		);
+
+		$parents_arr = array();
+		$parents_str = '';
+
+		if(count($r)) {
+			foreach($r as $rr)
+				$parents_arr[] = $rr['item_id'];
+			$parents_str = implode(', ', $parents_arr);
+
 			$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
 				`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
@ -211,14 +234,14 @@ function network_content(&$a, $update = 0) {
 				WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 				AND `contact`.`id` = `item`.`contact-id`
 				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			AND `item`.`parent` = `parentitem`.`id`
+				AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s )
 				$sql_extra
-			ORDER BY `parentitem`.`created`  DESC, `item`.`gravity` ASC, `item`.`created` ASC LIMIT %d ,%d ",
+				ORDER BY `parentitem`.`created`  DESC, `item`.`gravity` ASC, `item`.`created` ASC ",
 				intval(local_user()),
-			intval($a->pager['start']),
-			intval($a->pager['itemspage'])
+				dbesc($parents_str)
 			);
 		}
+	}

 	$author_contacts = extract_item_authors($r,local_user());

@ -303,12 +326,25 @@ function network_content(&$a, $update = 0) {
 		}


+		$comments = array();
+		foreach($r as $rr) {
+			if(intval($rr['gravity']) == 6) {
+				if(! x($comments,$rr['parent']))
+					$comments[$rr['parent']] = 1;
+				else
+					$comments[$rr['parent']] += 1;
+			}
+		}

 		foreach($r as $item) {
 			like_puller($a,$item,$alike,'like');
 			like_puller($a,$item,$dlike,'dislike');
 		}

+		$comments_collapsed = false;
+		$blowhard = 0;
+		$blowhard_count = 0;
+
 		foreach($r as $item) {

 			$comment = '';
@ -320,10 +356,40 @@ function network_content(&$a, $update = 0) {
 			if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
 				continue;

+			if($item['id'] == $item['parent']) {
+				if($blowhard == $item['cid'] && (! $item['self'])) {
+					$blowhard_count ++;
+					if($blowhard_count == 3) {
+						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >' . t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' . $item['parent'] . '" style="display: none;" >';
+					}
+				}
+				else {
+					$blowhard = $item['cid'];					
+					if($blowhard_count > 3)
+						$o .= '</div>';
+					$blowhard_count = 0;
+				}
+
+				$comments_seen = 0;
+				$comments_collapsed = false;
+			}
+			else
+				$comments_seen ++;
+
+
+			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
+				if(! $comments_collapsed) {
+					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>';
+					$o .= '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
+					$comments_collapsed = true;
+				}
+			}
+			if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
+				$o .= '</div>';
+			}
+
 			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;

-
-
 			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
 				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
 				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
@ -480,6 +546,10 @@ function network_content(&$a, $update = 0) {
 	}

 	if(! $update) {
+		if($blowhard_count > 3)
+			$o .= '</div>';
+
+
 		$o .= paginate($a);
 		$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
 	}
--- a/mod/profile.php
+++ b/mod/profile.php
@ -243,14 +243,37 @@ function profile_content(&$a, $update = 0) {
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
-		AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `wall` = 1 )
+		AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
 		$sql_extra ",
 		intval($a->profile['profile_uid'])

 	);

-	if(count($r))
+	if(count($r)) {
 		$a->set_pager_total($r[0]['total']);
+		$a->set_pager_itemspage(40);
+	}
+
+	$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
+		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+		AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
+		$sql_extra
+		ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+		intval($a->profile['profile_uid']),
+		intval($a->pager['start']),
+		intval($a->pager['itemspage'])
+
+	);
+
+	$parents_arr = array();
+	$parents_str = '';
+
+	if(count($r)) {
+		foreach($r as $rr)
+			$parents_arr[] = $rr['item_id'];
+		$parents_str = implode(', ', $parents_arr);
 
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, 
@ -259,15 +282,13 @@ function profile_content(&$a, $update = 0) {
 			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-		AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `wall` = 1 )
+			AND `item`.`parent` IN ( %s )
 			$sql_extra
-		ORDER BY `parent` DESC, `gravity` ASC, `id` ASC LIMIT %d ,%d ",
+			ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
 			intval($a->profile['profile_uid']),
-		intval($a->pager['start']),
-		intval($a->pager['itemspage'])
-
+			dbesc($parents_str)
 		);
-
+	}

 	if($is_owner && ! $update)
 		$o .= get_birthdays();
@ -292,11 +313,23 @@ function profile_content(&$a, $update = 0) {

 	if($r !== false && count($r)) {

+		$comments = array();
+		foreach($r as $rr) {
+			if(intval($rr['gravity']) == 6) {
+				if(! x($comments,$rr['parent']))
+					$comments[$rr['parent']] = 1;
+				else
+					$comments[$rr['parent']] += 1;
+			}
+		}
+
 		foreach($r as $item) {
 			like_puller($a,$item,$alike,'like');
 			like_puller($a,$item,$dlike,'dislike');
 		}

+		$comments_collapsed = false;
+
 		foreach($r as $item) {

 			$sparkle = '';		
@ -311,6 +344,25 @@ function profile_content(&$a, $update = 0) {
 				&& ($item['id'] != $item['parent']))
 				continue;

+			if($item['id'] == $item['parent']) {
+				$comments_seen = 0;
+				$comments_collapsed = false;
+			}
+			else
+				$comments_seen ++;
+
+
+			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
+				if(! $comments_collapsed) {
+					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>';
+					$o .= '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
+					$comments_collapsed = true;
+				}
+			}
+			if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
+				$o .= '</div></div>';
+			}
+
 			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
 				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
 				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
@ -437,6 +489,5 @@ function profile_content(&$a, $update = 0) {
 	$o .= paginate($a);
 	$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';

-
 	return $o;
 }
--- a/mod/register.php
+++ b/mod/register.php
@ -199,6 +199,24 @@ function register_post(&$a) {
 		return;
 	} 		

+	/**
+	 * if somebody clicked submit twice very quickly, they could end up with two accounts 
+	 * due to race condition. Remove this one.
+	 */
+
+	$r = q("SELECT `uid` FROM `user`
+               	WHERE `nickname` = '%s' ",
+               	dbesc($nickname)
+	);
+	if((count($r) > 1) && $newuid) {
+		$err .= t('Nickname is already registered. Please choose another.') . EOL;
+		q("DELETE FROM `user` WHERE `uid` = %d LIMIT 1",
+			intval($newuid)
+		);
+		notice ($err);
+		return;
+	}
+
 	if(x($newuid) !== false) {
 		$r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` )
 			VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ",
--- a/mod/settings.php
+++ b/mod/settings.php
@ -5,6 +5,7 @@ function settings_init(&$a) {
 	if(local_user()) {
 		profile_load($a,$a->user['nickname']);
 	}
+
 }


@ -341,9 +342,13 @@ function settings_content(&$a) {

 	$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);

+	$uexport = '<div id="uexport-link"><a href="uexport" >' . t('Export Personal Data') . '</a></div>';
+
+
 	$o .= replace_macros($stpl,array(
 		'$baseurl' => $a->get_baseurl(),
 		'$oidhtml' => $oidhtml,
+		'$uexport' => $uexport,
 		'$uid' => local_user(),
 		'$username' => $username,
 		'$openid' => $openid,
--- a/mod/uexport.php
+++ b/mod/uexport.php
@ -0,0 +1,72 @@
+<?php
+
+function uexport_init(&$a) {
+
+	if(! local_user())
+		killme();
+
+	$user = array();
+	$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+		local_user()
+	);
+	if(count($r)) {
+		foreach($r as $rr)
+			foreach($rr as $k => $v)
+				$user[$k] = $v;
+
+	}
+	$contact = array();
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d ",
+		intval(local_user())
+	);
+	if(count($r)) {
+		foreach($r as $rr)
+			foreach($rr as $k => $v)
+				$contact[][$k] = $v;
+
+	}
+
+	$profile = array();
+	$r = q("SELECT * FROM `profile` WHERE `uid` = %d ",
+		intval(local_user())
+	);
+	if(count($r)) {
+		foreach($r as $rr)
+			foreach($rr as $k => $v)
+				$profile[][$k] = $v;
+	}
+
+	$output = array('user' => $user, 'contact' => $contact, 'profile' => $profile );
+
+	header("Content-type: application/json");
+	echo str_replace('\\/','/',json_encode($output));
+
+	$r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ",
+		intval(local_user())
+	);
+	if(count($r))
+		$total = $r[0]['total'];
+
+	// chunk the output to avoid exhausting memory
+
+	for($x = 0; $x < $total; $x += 500) {
+		$item = array();
+		$r = q("SELECT * FROM `item` WHERE `uid` = %d LIMIT %d, %d",
+			intval(local_user()),
+			intval($x),
+			intval(500)
+		);
+		if(count($r)) {
+			foreach($r as $rr)
+				foreach($rr as $k => $v)
+					$item[][$k] = $v;
+		}
+
+		$output = array('item' => $item);
+		echo str_replace('\\/','/',json_encode($output));
+	}
+
+
+	killme();
+
+}
--- a/update.php
+++ b/update.php
@ -410,3 +410,11 @@ function update_1042() {
 function update_1043() {
 	q("ALTER TABLE `user` ADD `blockwall` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocked` ");
 }
+
+function update_1044() {
+	q("ALTER TABLE `profile` ADD FULLTEXT ( `pub_keywords` ) ");
+	q("ALTER TABLE `profile` ADD FULLTEXT ( `prv_keywords` ) ");
+}
+
+
+	
--- a/util/messages.po
+++ b/util/messages.po
--- a/util/strings.php
+++ b/util/strings.php
@ -31,7 +31,6 @@ $a->strings[', and %d other people'] = ', and %d other people';
 $a->strings['%s like this.'] = '%s like this.';
 $a->strings['%s don\'t like this.'] = '%s don\'t like this.';
 $a->strings['No contacts'] = 'No contacts';
-$a->strings['Contacts'] = 'Contacts';
 $a->strings['View Contacts'] = 'View Contacts';
 $a->strings['Search'] = 'Search';
 $a->strings['No profile'] = 'No profile';
@ -67,6 +66,7 @@ $a->strings['[today]'] = '[today]';
 $a->strings['link to source'] = 'link to source';
 $a->strings['Applications'] = 'Applications';
 $a->strings["Invite Friends"] = "Invite Friends";
+$a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests';
 $a->strings['Connect/Follow'] = 'Connect/Follow';
 $a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Example: bob@example.com, http://example.com/barbara';
 $a->strings['Follow'] = 'Follow';
@ -106,6 +106,7 @@ $a->strings['Unignore this contact'] = 'Unignore this contact';
 $a->strings['Ignore this contact'] = 'Ignore this contact';
 $a->strings['Currently blocked'] = 'Currently blocked';
 $a->strings['Currently ignored'] = 'Currently ignored';
+$a->strings['Contacts'] = 'Contacts';
 $a->strings['Show Blocked Connections'] = 'Show Blocked Connections';
 $a->strings['Hide Blocked Connections'] = 'Hide Blocked Connections';
 $a->strings['Finding: '] = 'Finding: ';
@ -213,9 +214,11 @@ $a->strings['Unable to remove group.'] = 'Unable to remove group.';
 $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.';
-$a->strings['Database import succeeded.'] = 'Database import succeeded.';
+$a->strings['Proceed with Installation'] = 'Proceed with Installation';
+$a->strings['Your Friendika site database has been installed.'] = 'Your Friendika site database has been installed.';
 $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".'] = 'Please see the file "INSTALL.txt".';
+$a->strings['Proceed to registration'] = 'Proceed to registration';
 $a->strings['Database import failed.'] = 'Database import failed.';
 $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.';
 $a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.';
@ -268,6 +271,8 @@ $a->strings["Welcome back %s"] = "Welcome back %s";
 $a->strings['Manage Identities and/or Pages'] = 'Manage Identities and/or Pages';
 $a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "\x28Toggle between different identities or community/group pages which share your account details.\x29";
 $a->strings['Select an identity to manage: '] = 'Select an identity to manage: ';
+$a->strings['Profile Match'] = 'Profile Match';
+$a->strings['No matches'] = 'No matches';
 $a->strings['No recipient selected.'] = 'No recipient selected.';
 $a->strings['[no subject]'] = '[no subject]';
 $a->strings['Unable to locate contact information.'] = 'Unable to locate contact information.';
@ -720,7 +725,6 @@ $a->strings['America/Managua'] = 'America/Managua';
 $a->strings['America/Manaus'] = 'America/Manaus';
 $a->strings['America/Marigot'] = 'America/Marigot';
 $a->strings['America/Martinique'] = 'America/Martinique';
-$a->strings['America/Matamoros'] = 'America/Matamoros';
 $a->strings['America/Mazatlan'] = 'America/Mazatlan';
 $a->strings['America/Mendoza'] = 'America/Mendoza';
 $a->strings['America/Menominee'] = 'America/Menominee';
@ -739,7 +743,6 @@ $a->strings['America/Nome'] = 'America/Nome';
 $a->strings['America/Noronha'] = 'America/Noronha';
 $a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center';
 $a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem';
-$a->strings['America/Ojinaga'] = 'America/Ojinaga';
 $a->strings['America/Panama'] = 'America/Panama';
 $a->strings['America/Pangnirtung'] = 'America/Pangnirtung';
 $a->strings['America/Paramaribo'] = 'America/Paramaribo';
@ -756,7 +759,6 @@ $a->strings['America/Regina'] = 'America/Regina';
 $a->strings['America/Resolute'] = 'America/Resolute';
 $a->strings['America/Rio_Branco'] = 'America/Rio_Branco';
 $a->strings['America/Rosario'] = 'America/Rosario';
-$a->strings['America/Santa_Isabel'] = 'America/Santa_Isabel';
 $a->strings['America/Santarem'] = 'America/Santarem';
 $a->strings['America/Santiago'] = 'America/Santiago';
 $a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo';
@ -785,7 +787,6 @@ $a->strings['America/Yellowknife'] = 'America/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';
@ -848,7 +849,6 @@ $a->strings['Asia/Makassar'] = 'Asia/Makassar';
 $a->strings['Asia/Manila'] = 'Asia/Manila';
 $a->strings['Asia/Muscat'] = 'Asia/Muscat';
 $a->strings['Asia/Nicosia'] = 'Asia/Nicosia';
-$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk';
 $a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk';
 $a->strings['Asia/Omsk'] = 'Asia/Omsk';
 $a->strings['Asia/Oral'] = 'Asia/Oral';
--- a/view/de/settings.tpl
+++ b/view/de/settings.tpl
@ -2,6 +2,8 @@

 <div id="plugin-settings-link"><a href="settings/addon">Plugin Einstellungen</a></div>

+$uexport
+
 $nickname_block


--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@ -2,6 +2,8 @@

 <div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>

+$uexport
+
 $nickname_block


--- a/view/fr/settings.tpl
+++ b/view/fr/settings.tpl
@ -2,6 +2,8 @@

 <div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>

+$uexport
+
 $nickname_block


--- a/view/it/messages.po
+++ b/view/it/messages.po
@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.913\n"
+"Project-Id-Version: 2.1.921\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-18 10:32+0100\n"
+"POT-Creation-Date: 2011-03-23 13:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Fabio Comuni <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian <fabrix.xm@gmail.com>\n"
-"Language: it-IT\n"
+"Language: It\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -118,7 +118,7 @@ msgstr "Piace a %s."
 msgid "%s doesn't like this."
 msgstr "Non piace a %s."

-#: ../../boot.php:1835
+#: ../../boot.php:1835 ../../test.php:8
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "Piace a <span %1$s>%2$d persone</span>."
@ -2598,3 +2598,10 @@ msgstr "Modifica messaggio"
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Non trovo le informazioni DNS per il database server '%s'"
+
+#: ../../boot.php:2016
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d Contatto"
+msgstr[1] "%d Contatti"
--- a/view/it/settings.tpl
+++ b/view/it/settings.tpl
@ -2,6 +2,7 @@

 <div id="plugin-settings-link"><a href="settings/addon">Impostazioni Plugin</a></div>

+$uexport

 $nickname_block

--- a/view/it/strings.php
+++ b/view/it/strings.php
@ -581,3 +581,7 @@ $a->strings["Next >>"] = "Succ >>";
 $a->strings["Item not found"] = "Elemento non trovato";
 $a->strings["Edit post"] = "Modifica messaggio";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'";
+$a->strings["%d Contact"] = array(
+	0 => "%d Contatto",
+	1 => "%d Contatti",
+);
--- a/view/sv/cmnt_received_eml.tpl
+++ b/view/sv/cmnt_received_eml.tpl
@ -1,7 +1,7 @@

 $username,

-	'$from' har kommenterat något som du följer.
+'$from' har kommenterat något som du följer.

 -----
 $body
@ -11,8 +11,7 @@ Logga in på $siteurl för att se hela konversationen:

 $display

-Tack,
-	$sitename admin
-
+Hälsningar,
+$sitename admin

 
--- a/view/sv/contact_edit.tpl
+++ b/view/sv/contact_edit.tpl
@ -1,4 +1,3 @@
-
 <h2>$header</h2>

 <div id="contact-edit-banner-name">$name</div>
@ -28,7 +27,7 @@


 		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
+			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div>
 			<div id="contact-edit-poll-text">$updpub</div>
 			$poll_interval
 			<div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div>
@ -46,7 +45,7 @@ $ignored
 </div>
 <div id="contact-edit-info-end"></div>

-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
+<input class="contact-edit-submit" type="submit" name="submit" value="Spara" />

 <div id="contact-edit-profile-select-text">
 <h4>Profilvisning</h4>
@ -56,7 +55,7 @@ $ignored
 $profile_select
 <div id="contact-edit-profile-select-end"></div>

-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
+<input class="contact-edit-submit" type="submit" name="submit" value="Spara" />


 <div id="contact-edit-rating-wrapper">
@ -69,13 +68,13 @@ $rating
 </div>
 <div id="contact-edit-rating-explain">
 <p>
-Var v&auml;nlig spendera tid p&aring; att fylla i n&aring;got h&auml;r om du k&auml;nner att det kan vara till n&aring;gon hj&auml;lp f&ouml;r andra.
+Var v&auml;nlig &auml;gna en liten stund &aring;t att fylla i n&aring;got som du k&auml;nner kan vara till hj&auml;lp f&ouml;r andra.
 </p>
 <textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
 </div>
 </div>
 $groups

-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
+<input class="contact-edit-submit" type="submit" name="submit" value="Skicka" />
 </form>
 </div>
--- a/view/sv/cropbody.tpl
+++ b/view/sv/cropbody.tpl
@ -1,6 +1,6 @@
-<h1>Crop Image</h1>
+<h1>Besk&auml;r bilden</h1>
 <p id="cropimage-desc">
-Please adjust the image cropping for optimum viewing.
+V&auml;lj hur du vill att bilden ska besk&auml;ras.
 </p>
 <div id="cropimage-wrapper">
 <img src="$image_url" id="croppa" class="imgCrop" alt="" />
@ -51,7 +51,7 @@ Please adjust the image cropping for optimum viewing.
 <input type="hidden" name="width"  id="width" />

 <div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Done Editing" />
+<input type="submit" name="submit" value="Spara" />
 </div>

 </form>
--- a/view/sv/dfrn_req_confirm.tpl
+++ b/view/sv/dfrn_req_confirm.tpl
@ -1,8 +1,7 @@
-
 <p id="dfrn-request-homecoming" >
-Welcome home $username. 
+V&auml;lkommen hem, $username. 
 <br />
-Please confirm your introduction to $dfrn_url.
+H&auml;r kan du bekr&auml;fta kontaktf&ouml;rfr&aring;gan till $dfrn_url.

 </p>
 <form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> 
@ -12,6 +11,6 @@ Please confirm your introduction to $dfrn_url.
 $aes_allow

 <div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="Confirm" />
+<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="Bekr&auml;fta" />
 </div>
 </form>
--- a/view/sv/directory_header.tpl
+++ b/view/sv/directory_header.tpl
@ -1,4 +1,4 @@
-<h1>Site Directory</h1>
+<h1>Medlemskatalog f&ouml;r denna webbplats (ej global)</h1>

 $globaldir

@ -7,8 +7,7 @@ $finding
 <div id="directory-search-wrapper">
 <form id="directory-search-form" action="directory" method="get" >
 <input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="directory-search-submit" value="Find" />
+<input type="submit" name="submit" id="directory-search-submit" value="S&ouml;k" />
 </form>
 </div>
 <div id="directory-search-end"></div>
-
--- a/view/sv/follow_notify_eml.tpl
+++ b/view/sv/follow_notify_eml.tpl
@ -1,14 +1,12 @@
+$myname,

-Dear $myname,
+'$requestor' på $sitename vill följa dina uppdateringar här på Friendika.

-You have a new follower at $sitename -  '$requestor'.
+Besök dennes profil på $url.

-You may visit their profile at $url.
-
-Please login to your site to approve or ignore/cancel the request.
+Logga in för att godkänna eller avslå förfrågan.

 $siteurl

-Regards,
-
-	$sitename administrator
+Hälsningar,
+$sitename admin
--- a/view/sv/friend_complete_eml.tpl
+++ b/view/sv/friend_complete_eml.tpl
@ -1,22 +1,17 @@
+$username,

-Dear $username,
+Goda nyheter... '$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'.

-	Great news... '$fn' at '$dfrn_url' has accepted 
-your connection request at '$sitename'.
+Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden
+utan begränsningar.

-You are now mutual friends and may exchange status updates, photos, and email
-without restriction.
-
-Please visit your 'Contacts' page at $sitename if you wish to make 
-any changes to this relationship. 
+Gå in på din sida 'Kontakter' på $sitename om du vill göra några 
+ändringar när det gäller denna kontakt. 

 $siteurl

-[For instance, you may create a separate profile with information that is not
-available to the general public - and assign viewing rights to '$fn'].
-
-Sincerely,
-
-	$sitename Administrator
-
+[Du kan exempelvis skapa en separat profil med information som inte
+är tillgänglig för vem som helst, och ge visningsrättigheter till '$fn'].

+Hälsningar,
+$sitename admin
--- a/view/sv/group_edit.tpl
+++ b/view/sv/group_edit.tpl
@ -1,22 +1,22 @@
-<h2>Group Editor</h2>
+<h2>Gruppredigering</h2>


 <div id="group-edit-wrapper" >
 <form action="group/$gid" id="group-edit-form" method="post" >
 <div id="group-edit-name-wrapper" >
-<label id="group-edit-name-label" for="group-edit-name" >Group Name: </label>
+<label id="group-edit-name-label" for="group-edit-name" >Gruppnamn: </label>
 <input type="text" id="group-edit-name" name="groupname" value="$name" />
 </div>
 <div id="group-edit-name-end"></div>
 <div id="group-edit-select-wrapper" >
-<label id="group_members_select_label"  for="group_members_select" >Members:</label>
+<label id="group_members_select_label"  for="group_members_select" >Medlemmar:</label>
 $selector

 </div>
 $drop
 <div id="group_members_select_end"></div>
 <div id="group-edit-submit-wrapper" >
-<input type="submit" name="submit" value="Submit" >
+<input type="submit" name="submit" value="Spara" >
 </div>

 <div id="group-edit-select-end" ></div>
--- a/view/sv/group_new.tpl
+++ b/view/sv/group_new.tpl
@ -1,23 +1,20 @@


-
 <div id="group-new-wrapper" >
 <form action="group/new" method="post">

 <div id="group-new-text">
 <p>
-Create a group of contacts/friends.
+Skapa en grupp med kontakter/v&auml;nner.

 <div id="group-new-input-wrapper">
-<label id="group-new-label" for="group-new-name" >Group Name: </label>
+<label id="group-new-label" for="group-new-name" >Gruppnamn: </label>
 <input name="groupname" id="group-new-name" />
 </div>
 <div id="group-new-input-end" ></div>

 <div id="group-new-submit-wrapper" >
-<input type="submit" name="submit" value="Submit" />
+<input type="submit" name="submit" value="Spara" />
 </form>
 </div>
 <div id="group-new-end"></div>
-
- 
--- a/view/sv/head.tpl
+++ b/view/sv/head.tpl
@ -11,7 +11,7 @@
 <script type="text/javascript" src="$baseurl/include/main.js" ></script>
 <script>

-	function confirmDelete() { return confirm("Delete this item?"); }
+	function confirmDelete() { return confirm("Ta bort?"); }
 	function commentOpen(obj,id) {
 		if(obj.value == 'Comment') {
 			obj.value = '';
@ -28,5 +28,3 @@
 	}

 </script>
-
-
--- a/view/sv/install_db.tpl
+++ b/view/sv/install_db.tpl
@ -1,33 +1,32 @@
-
-<h3>Friendika Social Network</h3>
+<h3>Det sociala n&auml;tverket Friendika</h3>
 <h3>Installation</h3>

 <p>
-In order to install Friendika we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing. 
+F&ouml;r att kunna installera Friendika m&aring;ste du ange hur man ansluter till din databas. Kontakta ditt webbhotell eller webbplatsadministrat&ouml;r om du har fr&aring;gor om dessa inst&auml;llningar. Databasen du specar nedan m&aring;ste finnas. Skapa databasen innan du forts&auml;tter, om det inte redan &auml;r gjort. 
 </p>

 <form id="install-form" action="$baseurl/install" method="post">

 <input type="hidden" name="phpath" value="$phpath" />

-<label for="install-dbhost" id="install-dbhost-label">Database Server Name</label>
+<label for="install-dbhost" id="install-dbhost-label">Servernamn d&auml;r databasen finns</label>
 <input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
 <div id="install-dbhost-end"></div>

-<label for="install-dbuser" id="install-dbuser-label">Database Login Name</label>
+<label for="install-dbuser" id="install-dbuser-label">Inloggningsnamn f&ouml;r databasen</label>
 <input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
 <div id="install-dbuser-end"></div>

-<label for="install-dbpass" id="install-dbpass-label">Database Login Password</label>
+<label for="install-dbpass" id="install-dbpass-label">L&ouml;senord f&ouml;r databasen</label>
 <input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
 <div id="install-dbpass-end"></div>

-<label for="install-dbdata" id="install-dbdata-label">Database Name</label>
+<label for="install-dbdata" id="install-dbdata-label">Databasens namn</label>
 <input type="text" name="dbdata" id="install-dbdata"  value="$dbdata" />
 <div id="install-dbdata-end"></div>

 <div id="install-tz-desc">
-Please select a default timezone for your website
+Ange vilken tidszon som ska vara f&ouml;rvald p&aring; din webbplats
 </div>

 $tzselect
@ -37,4 +36,3 @@ $tzselect

 </form>
 <div id="install-end" ></div>
-
--- a/view/sv/intro_complete_eml.tpl
+++ b/view/sv/intro_complete_eml.tpl
@ -1,22 +1,19 @@
+$username,

-Dear $username,
+'$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'.

-	'$fn' at '$dfrn_url' has accepted 
-your connection request at '$sitename'.
+'$fn' har valt att acceptera dig som ett "fan" vilket innebär vissa begränsningar 
+i kommunikationen mellan er - som till exempel personliga meddelanden och viss interaktion
+mellan profiler. Om detta är en kändis eller en gemenskap så har dessa inställningar gjorts
+per automatik.

-	'$fn' has chosen to accept you a "fan", which restricts 
-some forms of communication - such as private messaging and some profile
-interactions. If this is a celebrity or community page, these settings were
-applied automatically.
+'$fn' kan välja att utöka detta till vanlig tvåvägskommunikation eller någon annan mer 
+tillåtande kommunikationsform i framtiden. 

-	'$fn' may choose to extend this into a two-way or more permissive 
-relationship in the future. 
-
-	You will start receiving public status updates from '$fn', 
-which will appear on your 'Network' page at  
+Du kommer hädanefter att få statusuppdateringar från '$fn', 
+vilka kommer att synas på din Nätverk-sida på 

 $siteurl

-Sincerely,
-
-	$sitename Administrator
+Hälsningar,
+$sitename admin
--- a/view/sv/intros-top.tpl
+++ b/view/sv/intros-top.tpl
@ -1,7 +1,6 @@
-<h1>Pending Friend/Connect Notifications</h1>
+<h1>V&auml;ntande f&ouml;rfr&aring;gningar om v&auml;nskap/kontakt</h1>

 <div id="notification-show-hide-wrapper" >
 <a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
 </div>

-
--- a/view/sv/lostpass.tpl
+++ b/view/sv/lostpass.tpl
@ -1,18 +1,17 @@
-<h3>Forgot your Password?</h3>
+<h3>Har du gl&ouml;mt l&ouml;senordet?</h3>

 <p id="lostpass-desc">
-Enter your email address and submit to have your password reset. Then check your email for further instructions.
+Skriv in och skicka din e-postadress f&ouml;r att &aring;terst&auml;lla l&ouml;senordet. Kolla sedan din e-post f&ouml;r vidare instruktioner.
 </p>

 <form action="lostpass" method="post" >
 <div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">Nickname or Email: </label>
+        <label for="login-name" id="label-login-name">Anv&auml;ndarnamn eller e-postadress: </label>
        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
 </div>
 <div id="login-extra-end"></div>
 <div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="Reset" />
+        <input type="submit" name="submit" id="lostpass-submit-button" value="Skicka" />
 </div>
 <div id="login-submit-end"></div>
 </form>
-
--- a/view/sv/lostpass_eml.tpl
+++ b/view/sv/lostpass_eml.tpl
@ -1,32 +1,29 @@
+$username,

-Dear $username,
-	A request was recently received at $sitename to reset your account 
-password. In order to confirm this request, please select the verification link
-below or paste it into your web browser address bar. 
+En begäran om återställning av lösenord på $sitename har mottagits. 
+Gå till adressen nedan för att bekräfta denna begäran. Du kan också 
+klistra in länken i adressfältet i din webbläsare. 

-If you did NOT request this change, please DO NOT follow the link
-provided and ignore and/or delete this email. 
+Gå INTE till länken nedan om du INTE har begärt lösenordsåterställning. 
+Då kan du ignorera det här meddelandet. 

-Your password will not be changed unless we can verify that you
-issued this request. 
+Ditt lösenord kommer inte att återställas om vi inte kan säkerställa att du 
+initierat detta.

-Follow this link to verify your identity:
+Med den här länken kan du bekräfta din identitet:

 $reset_link

-You will then receive a follow-up message containing the new password.
+Sedan kommer du att få ett meddelande med ett nytt lösenord.

-You may change that password from your account settings page after logging in.
+Lösenordet kan sedan ändras i dina inställningar efter att du loggat in.

-The login details are as follows:
+Detaljerna ser ut så här:

-Site Location:	$siteurl
-Login Name:	$email
-
-
-
-
-Sincerely,
-	$sitename Administrator
+Webbplats:		$siteurl
+Inloggningsnamn:	$email
+
+Hälsningar,
+$sitename admin

 
--- a/view/sv/mail_received_html_body_eml.tpl
+++ b/view/sv/mail_received_html_body_eml.tpl
@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
-	<title>Friendika Message</title>
+	<title>Meddelande p&aring; Friendika</title>
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 </head>
 <body>
@ -9,16 +9,16 @@
 	<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">$from sent you a new private message at $siteName.</td></tr>
+	<tr><td style="padding-top:22px;" colspan="2">$from har skickat ett personligt meddelande till dig p&aring; $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">Please login at <a href="$siteurl">$siteurl</a> to read and reply to your private messages.</td></tr>
-	<tr><td></td><td>Thank You,</td></tr>
-	<tr><td></td><td>$siteName Administrator</td></tr>
+	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Logga in p&aring; <a href="$siteurl">$siteurl</a> f&ouml;r att l&auml;sa och svara p&aring; personliga meddelanden.</td></tr>
+	<tr><td></td><td>H&auml;lsningar,</td></tr>
+	<tr><td></td><td>$siteName admin</td></tr>
 	</tbody>
 </table>
 </body>
--- a/view/sv/mail_received_text_body_eml.tpl
+++ b/view/sv/mail_received_text_body_eml.tpl
@ -1,10 +1,10 @@
-$from sent you a new private message at $siteName.
+$from har skickat ett personligt meddelande till dig på $siteName.
 	
 $title

 $textversion
 				
-Please login at $siteurl to read and reply to your private messages.
+Logga in på $siteurl för att läsa och svara på personliga meddelanden.

-Thank you,
-$siteName administrator
+Hälsningar,
+$siteName admin
--- a/view/sv/pagetypes.tpl
+++ b/view/sv/pagetypes.tpl
@ -1,25 +1,25 @@

 		<div id="settings-normal-wrapper">
-			<label id="settings-normal-label" for="settings-normal">Normal Profile</label>
+			<label id="settings-normal-label" for="settings-normal">Normal profil</label>
 			<input type="radio" name="page-flags" id="settings-normal" $normal_selected value="$page_normal" />
-			<span id="settings-normal-desc">This account is a normal personal profile</span>
+			<span id="settings-normal-desc">Detta konto &auml;r en normal personlig profil</span>
 		</div>
 		<div id="settings-normal-break" ></div>	
 		<div id="settings-soapbox-wrapper">
 			<label id="settings-soapbox-label" for="settings-soapbox">Soapbox Profile</label>
 			<input type="radio" name="page-flags" id="settings-soapbox" $soapbox_selected value="$page_soapbox" />
-			<span id="settings-soapbox-desc">Automatically approve all connection/friend requests as read-only fans</span>
+			<span id="settings-soapbox-desc">Godk&auml;nn automatiskt alla kontaktf&ouml;rfr&aring;gningar som fans med l&auml;sr&auml;ttigheter</span>
 		</div>
 		<div id="settings-soapbox-break" ></div>	
 		<div id="settings-community-wrapper">
-			<label id="settings-community-label" for="settings-community">Community/Celebrity Profile</label>
+			<label id="settings-community-label" for="settings-community">Gemenskap/K&auml;ndisprofil</label>
 			<input type="radio" name="page-flags" id="settings-community" $community_selected value="$page_community" />
-			<span id="settings-community-desc">Automatically approve all connection/friend requests as read-write fans</span>
+			<span id="settings-community-desc">Godk&auml;nn automatiskt alla kontaktf&ouml;rfr&aring;gningar som fans med l&auml;s- och skrivr&auml;ttigheter</span>
 		</div>
 		<div id="settings-community-break" ></div>	
 		<div id="settings-freelove-wrapper">
-			<label id="settings-freelove-label" for="settings-freelove">Automatic Friend Profile</label>
+			<label id="settings-freelove-label" for="settings-freelove">Automatisk v&auml;nnerprofil</label>
 			<input type="radio" name="page-flags" id="settings-freelove" $freelove_selected value="$page_freelove" />
-			<span id="settings-freelove-desc">Automatically approve all connection/friend requests as friends</span>
+			<span id="settings-freelove-desc">Godk&auml;nn automatiskt alla kontaktf&ouml;rfr&aring;gningar som v&auml;nner</span>
 		</div>
 			<div id="settings-freelove-break" ></div>	
--- a/view/sv/passchanged_eml.tpl
+++ b/view/sv/passchanged_eml.tpl
@ -1,20 +1,18 @@

-Dear $username,
-	Your password has been changed as requested. Please retain this 
-information for your records (or change your password immediately to 
-something that you will remember).
+$username,
+
+Lösenordet har ändrats enligt din begäran. Behåll den här 
+informationen om den skulle behövas i framtiden. (eller ändra lösenord 
+på en gång till något som du kommer ihåg).


-Your login details are as follows:
+Här är dina inloggningsuppgifter:

-Site Location:	$siteurl
-Login Name:	$email
-Password:	$new_password
-
-You may change that password from your account settings page after logging in.
-
-
-Sincerely,
-	$sitename Administrator
+Webbplats:	$siteurl
+Användarnamn:	$email
+Lösenord:	$new_password

+När du loggat in kan du byta lösenord bland inställningarna.

+Hälsningar,
+$sitename admin
--- a/view/sv/profile-hide-friends.tpl
+++ b/view/sv/profile-hide-friends.tpl
@ -1,15 +1,15 @@
 <p id="hide-friends-text">
-Hide my contact/friend list from viewers of this profile?
+D&ouml;lj kontaktlista/v&auml;nlista f&ouml;r de som ser denna profil?
 </p>

 		<div id="hide-friends-yes-wrapper">
-		<label id="hide-friends-yes-label" for="hide-friends-yes">Yes</label>
+		<label id="hide-friends-yes-label" for="hide-friends-yes">Ja</label>
 		<input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" />

 		<div id="hide-friends-break" ></div>	
 		</div>
 		<div id="hide-friends-no-wrapper">
-		<label id="hide-friends-no-label" for="hide-friends-no">No</label>
+		<label id="hide-friends-no-label" for="hide-friends-no">Nej</label>
 		<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0"  />

 		<div id="hide-friends-end"></div>
--- a/view/sv/profile-in-directory.tpl
+++ b/view/sv/profile-in-directory.tpl
@ -1,15 +1,15 @@
 <p id="profile-in-directory">
-Publish your default profile in site directory? 
+Publicera din huvudsakliga profil (default) i webbplatsens medlemskatalog? 
 </p>

 		<div id="profile-in-dir-yes-wrapper">
-		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Yes</label>
+		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Ja</label>
 		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" />

 		<div id="profile-in-dir-break" ></div>	
 		</div>
 		<div id="profile-in-dir-no-wrapper">
-		<label id="profile-in-dir-no-label" for="profile-in-dir-no">No</label>
+		<label id="profile-in-dir-no-label" for="profile-in-dir-no">Nej</label>
 		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0"  />

 		<div id="profile-in-dir-end"></div>
--- a/view/sv/profile-in-netdir.tpl
+++ b/view/sv/profile-in-netdir.tpl
@ -1,15 +1,15 @@
 <p id="profile-in-directory">
-Publish your default profile in global social directory? 
+Publicera din huvudsakliga profil (default) i den globala medlemskatalogen? 
 </p>

 		<div id="profile-in-netdir-yes-wrapper">
-		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Yes</label>
+		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Ja</label>
 		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />

 		<div id="profile-in-netdir-break" ></div>	
 		</div>
 		<div id="profile-in-netdir-no-wrapper">
-		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">No</label>
+		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">Nej</label>
 		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0"  />

 		<div id="profile-in-netdir-end"></div>
--- a/view/sv/profile.php
+++ b/view/sv/profile.php
@ -32,7 +32,7 @@
 		|| (strlen($profile['region'])) 
 		|| (strlen($profile['postal-code'])) 
 		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Location:
+		<div class="location">Plats:
 			<div class="adr">
 				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
 				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
@ -43,7 +43,7 @@
 	<?php } ?>

 	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">Gender: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
+		<div class="mf">K&ouml;n: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>

 	<?php } ?>

@ -53,10 +53,10 @@
 </div>
 <?php } ?>
 <?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
+<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Civilstatus: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
 <?php } ?>
 <?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
+<div class="homepage"><span class="homepage-label">Webbplats: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
 <?php } ?>
 <?php if(x($page,'aside')) echo $page['aside'] ?>
 </aside>
@ -69,4 +69,3 @@
 </footer>
 </body>
 </html>
-
--- a/view/sv/profile_advanced.php
+++ b/view/sv/profile_advanced.php
@ -12,7 +12,7 @@ EOT;
 if($a->profile['name']) {
 $o .= <<< EOT
 <div id="advanced-profile-name-wrapper" >
-<div id="advanced-profile-name-text">Full Name:</div>
+<div id="advanced-profile-name-text">Fullst&auml;ndigt namn:</div>
 <div id="advanced-profile-name">{$a->profile['name']}</div>
 </div>
 <div id="advanced-profile-name-end"></div>
@ -22,7 +22,7 @@ EOT;
 if($a->profile['gender']) {
 $o .= <<< EOT
 <div id="advanced-profile-gender-wrapper" >
-<div id="advanced-profile-gender-text">Gender:</div>
+<div id="advanced-profile-gender-text">K&ouml;n:</div>
 <div id="advanced-profile-gender">{$a->profile['gender']}</div>
 </div>
 <div id="advanced-profile-gender-end"></div>
@ -32,7 +32,7 @@ EOT;
 if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
 $o .= <<< EOT
 <div id="advanced-profile-dob-wrapper" >
-<div id="advanced-profile-dob-text">Birthday:</div>
+<div id="advanced-profile-dob-text">F&ouml;delsedag:</div>
 EOT;

 // If no year, add an arbitrary one so just we can parse the month and day.
@ -50,7 +50,7 @@ $o .= '<div id="advanced-profile-dob-end"></div>';
 if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
 $o .= <<< EOT
 <div id="advanced-profile-age-wrapper" >
-<div id="advanced-profile-age-text">Age:</div>
+<div id="advanced-profile-age-text">&Aring;lder:</div>
 <div id="advanced-profile-age">$age</div>
 </div>
 <div id="advanced-profile-age-end"></div>
@ -60,7 +60,7 @@ EOT;
 if($a->profile['marital']) {
 $o .= <<< EOT
 <div id="advanced-profile-marital-wrapper" >
-<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Status:</div>
+<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Civilstatus:</div>
 <div id="advanced-profile-marital">{$a->profile['marital']}</div>
 EOT;

@ -75,7 +75,7 @@ EOT;
 if($a->profile['sexual']) {
 $o .= <<< EOT
 <div id="advanced-profile-sexual-wrapper" >
-<div id="advanced-profile-sexual-text">Sexual Preference:</div>
+<div id="advanced-profile-sexual-text">Sexuell l&auml;ggning:</div>
 <div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
 </div>
 <div id="advanced-profile-sexual-end"></div>
@ -86,7 +86,7 @@ if($a->profile['homepage']) {
 	$homepage = linkify($a->profile['homepage']);
 $o .= <<< EOT
 <div id="advanced-profile-homepage-wrapper" >
-<div id="advanced-profile-homepage-text">Homepage:</div>
+<div id="advanced-profile-homepage-text">Hemsida URL:</div>
 <div id="advanced-profile-homepage">$homepage</div>
 </div>
 <div id="advanced-profile-homepage-end"></div>
@ -96,7 +96,7 @@ EOT;
 if($a->profile['politic']) {
 $o .= <<< EOT
 <div id="advanced-profile-politic-wrapper" >
-<div id="advanced-profile-politic-text">Political Views:</div>
+<div id="advanced-profile-politic-text">Politisk &aring;sk&aring;dning:</div>
 <div id="advanced-profile-politic">{$a->profile['politic']}</div>
 </div>
 <div id="advanced-profile-politic-end"></div>
@ -115,7 +115,7 @@ EOT;
 if($txt = prepare_text($a->profile['about'])) {
 $o .= <<< EOT
 <div id="advanced-profile-about-wrapper" >
-<div id="advanced-profile-about-text">About:</div>
+<div id="advanced-profile-about-text">Om:</div>
 <br />
 <div id="advanced-profile-about">$txt</div>
 </div>
@ -126,7 +126,7 @@ EOT;
 if($txt = prepare_text($a->profile['interest'])) {
 $o .= <<< EOT
 <div id="advanced-profile-interest-wrapper" >
-<div id="advanced-profile-interest-text">Hobbies/Interests:</div>
+<div id="advanced-profile-interest-text">Hobbys/Intressen:</div>
 <br />
 <div id="advanced-profile-interest">$txt</div>
 </div>
@ -137,7 +137,7 @@ EOT;
 if($txt = prepare_text($a->profile['contact'])) {
 $o .= <<< EOT
 <div id="advanced-profile-contact-wrapper" >
-<div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
+<div id="advanced-profile-contact-text">Kontaktuppgifter och sociala n&auml;tverk:</div>
 <br />
 <div id="advanced-profile-contact">$txt</div>
 </div>
@ -148,7 +148,7 @@ EOT;
 if($txt = prepare_text($a->profile['music'])) {
 $o .= <<< EOT
 <div id="advanced-profile-music-wrapper" >
-<div id="advanced-profile-music-text">Musical interests:</div>
+<div id="advanced-profile-music-text">Musik:</div>
 <br />
 <div id="advanced-profile-music">$txt</div>
 </div>
@ -159,7 +159,7 @@ EOT;
 if($txt = prepare_text($a->profile['book'])) {
 $o .= <<< EOT
 <div id="advanced-profile-book-wrapper" >
-<div id="advanced-profile-book-text">Books, literature:</div>
+<div id="advanced-profile-book-text">B&ouml;cker, litteratur:</div>
 <br />
 <div id="advanced-profile-book">$txt</div>
 </div>
@ -170,7 +170,7 @@ EOT;
 if($txt = prepare_text($a->profile['tv'])) {
 $o .= <<< EOT
 <div id="advanced-profile-tv-wrapper" >
-<div id="advanced-profile-tv-text">Television:</div>
+<div id="advanced-profile-tv-text">TV:</div>
 <br />
 <div id="advanced-profile-tv">$txt</div>
 </div>
@ -181,7 +181,7 @@ EOT;
 if($txt = prepare_text($a->profile['film'])) {
 $o .= <<< EOT
 <div id="advanced-profile-film-wrapper" >
-<div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
+<div id="advanced-profile-film-text">Film/dans/kultur/underh&aring;llning:</div>
 <br />
 <div id="advanced-profile-film">$txt</div>
 </div>
@ -192,7 +192,7 @@ EOT;
 if($txt = prepare_text($a->profile['romance'])) {
 $o .= <<< EOT
 <div id="advanced-profile-romance-wrapper" >
-<div id="advanced-profile-romance-text">Love/romance:</div>
+<div id="advanced-profile-romance-text">K&auml;rlek/romantik:</div>
 <br />
 <div id="advanced-profile-romance">$txt</div>
 </div>
@ -203,7 +203,7 @@ EOT;
 if($txt = prepare_text($a->profile['work'])) {
 $o .= <<< EOT
 <div id="advanced-profile-work-wrapper" >
-<div id="advanced-profile-work-text">Work/employment:</div>
+<div id="advanced-profile-work-text">Arbete:</div>
 <br />
 <div id="advanced-profile-work">$txt</div>
 </div>
@ -214,12 +214,10 @@ EOT;
 if($txt = prepare_text($a->profile['education'])) {
 $o .= <<< EOT
 <div id="advanced-profile-education-wrapper" >
-<div id="advanced-profile-education-text">School/education:</div>
+<div id="advanced-profile-education-text">Skola/utbildning:</div>
 <br />
 <div id="advanced-profile-education">$txt</div>
 </div>
 <div id="advanced-profile-education-end"></div>
 EOT;
 }
-
-
--- a/view/sv/profile_edit.tpl
+++ b/view/sv/profile_edit.tpl
@ -1,11 +1,11 @@
-<h1>Edit Profile Details</h1>
+<h1>&Auml;ndra i profil</h1>

 <div id="profile-edit-links">
 <ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></li>
+<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">Visa denna profil</a></li>
+<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Klona denna profil</a></li>
 <li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li>
+<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Ta bort denna profil</a></li>

 </ul>
 </div>
@ -18,32 +18,32 @@ $default
 <form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >

 <div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profile Name: </label>
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profilnamn: </label>
 <input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
 </div>
 <div id="profile-edit-profile-name-end"></div>

 <div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >Your Full Name: </label>
+<label id="profile-edit-name-label" for="profile-edit-name" >Fullst&auml;ndigt namn: </label>
 <input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
 </div>
 <div id="profile-edit-name-end"></div>

 <div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Title/Description: </label>
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Titel/Beskrivning: </label>
 <input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
 </div>
 <div id="profile-edit-pdesc-end"></div>


 <div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >Your Gender: </label>
+<label id="profile-edit-gender-label" for="gender-select" >K&ouml;n: </label>
 $gender
 </div>
 <div id="profile-edit-gender-end"></div>

 <div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >Birthday (y/m/d): </label>
+<label id="profile-edit-dob-label" for="dob-select" >F&ouml;delsedag (&aring;/m/d): </label>
 <div id="profile-edit-dob" >
 $dob $age
 </div>
@ -53,32 +53,32 @@ $dob $age
 $hide_friends

 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
 </div>
 <div class="profile-edit-submit-end"></div>


 <div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >Street Address: </label>
+<label id="profile-edit-address-label" for="profile-edit-address" >Gatuadress: </label>
 <input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
 </div>
 <div id="profile-edit-address-end"></div>

 <div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >Locality/City: </label>
+<label id="profile-edit-locality-label" for="profile-edit-locality" >Plats/Stad: </label>
 <input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
 </div>
 <div id="profile-edit-locality-end"></div>


 <div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postal/Zip Code: </label>
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postnummer: </label>
 <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
 </div>
 <div id="profile-edit-postal-code-end"></div>

 <div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Country: </label>
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Land: </label>
 <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
 <option selected="selected" >$country_name</option>
 <option>temp</option>
@ -87,7 +87,7 @@ $hide_friends
 <div id="profile-edit-country-name-end"></div>

 <div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >Region/State: </label>
+<label id="profile-edit-region-label" for="profile-edit-region" >Region: </label>
 <select name="region" id="profile-edit-region" onChange="Update_Globals();" >
 <option selected="selected" >$region</option>
 <option>temp</option>
@ -96,20 +96,20 @@ $hide_friends
 <div id="profile-edit-region-end"></div>

 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
 </div>
 <div class="profile-edit-submit-end"></div>

 <div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span> (Marital) Status: </label>
+<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span> Civilstatus: </label>
 $marital
 </div>
-<label id="profile-edit-with-label" for="profile-edit-with" > Who: (if applicable) </label>
+<label id="profile-edit-with-label" for="profile-edit-with" > Vem: (om aktuellt) </label>
 <input type="text" size="32" name="with" id="profile-edit-with" title="Examples: cathy123, Cathy Williams, cathy@example.com" value="$with" />
 <div id="profile-edit-marital-end"></div>

 <div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >Sexual Preference: </label>
+<label id="profile-edit-sexual-label" for="sexual-select" >Sexuell l&auml;ggning: </label>
 $sexual
 </div>
 <div id="profile-edit-sexual-end"></div>
@ -117,13 +117,13 @@ $sexual


 <div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Homepage URL: </label>
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Hemsida URL: </label>
 <input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
 </div>
 <div id="profile-edit-homepage-end"></div>

 <div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >Political Views: </label>
+<label id="profile-edit-politic-label" for="profile-edit-politic" >Politisk &aring;sk&aring;dning: </label>
 <input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
 </div>
 <div id="profile-edit-politic-end"></div>
@ -135,26 +135,25 @@ $sexual
 <div id="profile-edit-religion-end"></div>

 <div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Nyckelord: </label>
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Exempel: fiske fotografering delifner" value="$pub_keywords" />
 </div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
 <div id="profile-edit-pubkeywords-end"></div>

 <div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Nyckelord: </label>
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Exempel: fiske fotografering delfiner" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">(Anv&auml;nds vid profils&ouml;kning, visas inte f&ouml;r andra)</div>
 <div id="profile-edit-prvkeywords-end"></div>

-
 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
 </div>
 <div class="profile-edit-submit-end"></div>

 <div id="about-jot-wrapper" >
 <p id="about-jot-desc" >
-Tell us about yourself... 
+Beskriv dig sj&auml;lv... 
 </p>

 <textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
@ -166,7 +165,7 @@ Tell us about yourself...

 <div id="interest-jot-wrapper" >
 <p id="interest-jot-desc" >
-Hobbies/Interests 
+Hobbys/Intressen 
 </p>

 <textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
@ -178,7 +177,7 @@ Hobbies/Interests

 <div id="contact-jot-wrapper" >
 <p id="contact-jot-desc" >
-Contact information and Social Networks 
+Kontaktuppgifter och sociala n&auml;tverk 
 </p>

 <textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
@ -189,14 +188,14 @@ Contact information and Social Networks


 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
 </div>
 <div class="profile-edit-submit-end"></div>


 <div id="music-jot-wrapper" >
 <p id="music-jot-desc" >
-Musical interests 
+Musik 
 </p>

 <textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
@ -207,7 +206,7 @@ Musical interests

 <div id="book-jot-wrapper" >
 <p id="book-jot-desc" >
-Books, literature 
+B&ouml;cker, litteratur 
 </p>

 <textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
@ -220,7 +219,7 @@ Books, literature

 <div id="tv-jot-wrapper" >
 <p id="tv-jot-desc" >
-Television 
+TV 
 </p>

 <textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
@ -233,7 +232,7 @@ Television

 <div id="film-jot-wrapper" >
 <p id="film-jot-desc" >
-Film/dance/culture/entertainment 
+Film/dans/kultur/underh&aring;llning 
 </p>

 <textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
@ -244,14 +243,14 @@ Film/dance/culture/entertainment


 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
 </div>
 <div class="profile-edit-submit-end"></div>


 <div id="romance-jot-wrapper" >
 <p id="romance-jot-desc" >
-Love/romance 
+K&auml;rlek/romantik 
 </p>

 <textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
@ -264,7 +263,7 @@ Love/romance

 <div id="work-jot-wrapper" >
 <p id="work-jot-desc" >
-Work/employment 
+Arbete 
 </p>

 <textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
@ -277,7 +276,7 @@ Work/employment

 <div id="education-jot-wrapper" >
 <p id="education-jot-desc" >
-School/education 
+Skola/utbildning 
 </p>

 <textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
@ -289,7 +288,7 @@ School/education


 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
 </div>
 <div class="profile-edit-submit-end"></div>

--- a/view/sv/profile_entry_default.tpl
+++ b/view/sv/profile_entry_default.tpl
@ -1,7 +1,7 @@

 <div class="profile-listing" >
 <div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profile Image" /></a>
+<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profilbild" /></a>
 </div>
 <div class="profile-listing-photo-end" ></div>
 <div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
--- a/view/sv/profile_listing_header.tpl
+++ b/view/sv/profile_listing_header.tpl
@ -1,8 +1,7 @@
-<h1>Profiles</h1>
+<h1>Profiler</h1>
 <p id="profile-listing-desc" >
-<a href="profile_photo" >Change profile photo</a>
+<a href="profile_photo" >Byt profilbild</a>
 </p>
 <div id="profile-listing-new-link-wrapper" >
-<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Create New Profile</a>
+<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Skapa ny profil</a>
 </div>
-
--- a/view/sv/profile_photo.tpl
+++ b/view/sv/profile_photo.tpl
@ -1,18 +1,18 @@
-<h1>Upload Profile Photo</h1>
+<h1>Ladda upp profilbild</h1>

 <form enctype="multipart/form-data" action="profile_photo" method="post">

 <div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">Upload File: </label>
+<label id="profile-photo-upload-label" for="profile-photo-upload">Ladda upp fil: </label>
 <input name="userfile" type="file" id="profile-photo-upload" size="48" />
 </div>

 <div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="Upload">
+<input type="submit" name="submit" id="profile-photo-submit" value="Ladda upp">
 </div>

 </form>

 <div id="profile-photo-link-select-wrapper">
-or <a href='photos/$user'>select a photo from albums</a>
+eller <a href='photos/$user'>v&auml;lj bild i ett album</a>
 </div>
--- a/view/sv/pwdreset.tpl
+++ b/view/sv/pwdreset.tpl
@ -1,16 +1,16 @@
-<h3>Password Reset</h3>
+<h3>&Aring;terst&auml;llning av l&ouml;senord</h3>

 <p>
-Your password has been reset as requested.
+Ditt l&ouml;senord har &aring;terst&auml;llts enligt &ouml;nskem&aring;l.
 </p>
 <p>
-Your new password is
+Ditt nya l&ouml;senord &auml;r 
 </p>
 <p>
 $newpass
 </p>
 <p>
-Save or copy your new password - and then <a href="$baseurl" >click here to login</a>.
+H&aring;ll koll p&aring; det nya l&ouml;senordet och <a href="$baseurl" >klicka sedan h&auml;r f&ouml;r att logga in</a>.
 </p>
 <p>
-Your password may be changed from the 'Settings' page after successful login.
+L&ouml;senordet kan &auml;ndras p&aring; sidan Inst&auml;llningar efter att du loggat in.
--- a/view/sv/register_open_eml.tpl
+++ b/view/sv/register_open_eml.tpl
@ -1,21 +1,17 @@
+$username,
+Tack för att du registrerat dig på $sitename. Kontot har skapats. 
+Här är dina inloggningsuppgifter:

-Dear $username,
-	Thank you for registering at $sitename. Your account has been created. 
-The login details are as follows:
+Webbplats:	$siteurl
+Användarnamn:	$email
+Lösenord:	$password

+Lösenordet kan ändras på sidan Inställningar efter att du loggat in.

-Site Location:	$siteurl
-Login Name:	$email
-Password:	$password
+Ägna en liten stund åt att gå igenom alla kontoinställningar där. 

-You may change your password from your account "Settings" page after logging 
-in.
-
-Please take a few moments to review the other account settings on that page. 
-
-Thank you and welcome to $sitename.
-
-Sincerely,
-	$sitename Administrator
+Tack, och välkommen till $sitename.

+Hälsningar,
+$sitename admin

--- a/view/sv/register_verify_eml.tpl
+++ b/view/sv/register_verify_eml.tpl
@ -1,26 +1,18 @@

-A new user registration request was received at $sitename which requires 
-your approval. 
+En registreringsförfrågan som kräver svar har mottagits 
+på $sitename 


-The login details are as follows:
+Här är inloggningsuppgifterna:

-Full Name:	$username
-Site Location:	$siteurl
-Login Name:	$email
-
-
-To approve this request please visit the following link:
+Fullständigt namn:	$username
+Webbplats:		$siteurl
+Användarnamn:		$email


+Gå till denna adress om du vill godkänna:
 $siteurl/regmod/allow/$hash 

-
-To deny the request and remove the account, please visit:
-
-
+Gå till denna adress om du vill avslå förfrågan och ta bort kontot:
 $siteurl/regmod/deny/$hash

-
-Thank you.
-
--- a/view/sv/registrations-top.tpl
+++ b/view/sv/registrations-top.tpl
@ -1,3 +1 @@
-<h1>User registrations waiting for confirm</h1>
-
-
+<h1>Registreringar från användare som inv&auml;ntar godk&auml;nnande</h1>
--- a/view/sv/registrations.tpl
+++ b/view/sv/registrations.tpl
@ -1 +1 @@
-<li>$fullname ($email) : <a href="$approvelink">Approve</a> - <a href="$denylink">Deny</a></li>
+<li>$fullname ($email) : <a href="$approvelink">Godk&auml;nn</a> - <a href="$denylink">Avsl&aring;</a></li>
--- a/view/sv/request_notify_eml.tpl
+++ b/view/sv/request_notify_eml.tpl
@ -1,17 +1,13 @@
+$myname,

-Dear $myname,
+Du har just fått en kontaktförfrågan på $sitename från '$requestor'

-You have just received a connection request at $sitename 
+Profilen finns på $url.

-from '$requestor'.
-
-You may visit their profile at $url.
-
-Please login to your site to view the complete introduction 
-and approve or ignore/cancel the request.
+Logga in för att se hela förfrågan och godkänna eller 
+avslå den.

 $siteurl

-Regards,
-
-	$sitename administrator
+Hälsningar,
+$sitename admin
--- a/view/sv/settings.tpl
+++ b/view/sv/settings.tpl
@ -1,6 +1,8 @@
-<h1>Account Settings</h1>
+<h1>Kontoinst&auml;llningar</h1>

-<div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>
+<div id="plugin-settings-link"><a href="settings/addon">Inst&auml;llningar f&ouml;r insticksprogram</a></div>
+
+$uexport

 $nickname_block

@ -8,16 +10,16 @@ $nickname_block
 <form action="settings" id="settings-form" method="post" autocomplete="off" >


-<h3 class="settings-heading">Basic Settings</h3>
+<h3 class="settings-heading">Grundl&auml;ggande inst&auml;llningar</h3>

 <div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Full Name: </label>
+<label id="settings-username-label" for="settings-username" >Fullst&auml;ndigt namn: </label>
 <input type="text" name="username" id="settings-username" value="$username" />
 </div>
 <div id="settings-username-end" ></div>

 <div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >Email Address: </label>
+<label id="settings-email-label" for="settings-email" >E-postadress: </label>
 <input type="text" name="email" id="settings-email" value="$email" />
 </div>
 <div id="settings-email-end" ></div>
@ -25,19 +27,19 @@ $nickname_block


 <div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Your Timezone: </label>
+<label id="settings-timezone-label" for="timezone_select" >Tidszon: </label>
 $zoneselect
 </div>
 <div id="settings-timezone-end" ></div>

 <div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Default Post Location: </label>
+<label id="settings-defloc-label" for="settings-defloc" >F&ouml;rvald plats: </label>
 <input type="text" name="defloc" id="settings-defloc" value="$defloc" />
 </div>
 <div id="settings-defloc-end" ></div>

 <div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Use Browser Location: </label>
+<label id="settings-allowloc-label" for="settings-allowloc" >Anv&auml;nd webbl&auml;sarens positioneringsfunktion: </label>
 <input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
 </div>
 <div id="settings-allowloc-end" ></div>
@ -46,25 +48,25 @@ $zoneselect


 <div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Display Theme: </label>
+<label id="settings-theme-label" for="theme-select" >Tema f&ouml;r layout: </label>
 $theme
 </div>
 <div id="settings-theme-end"></div>

 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="Spara" />
 </div>


-<h3 class="settings-heading">Security and Privacy Settings</h3>
+<h3 class="settings-heading">S&auml;kerhets- och sekretessinst&auml;llningar</h3>


 <input type="hidden" name="visibility" value="$visibility" />

 <div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Maximum Friend Requests/Day</label>
+<label id="settings-maxreq-label" for="settings-maxreq" >Max antal v&auml;nf&ouml;rfr&aring;gningar/dag</label>
 <input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(to prevent spam abuse)</div>
+<div id="settings-maxreq-desc">(spamskydd)</div>
 </div>
 <div id="settings-maxreq-end"></div>

@ -103,53 +105,53 @@ $profile_in_net_dir


 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="Spara" />
 </div>



-<h3 class="settings-heading">Notification Settings</h3>
+<h3 class="settings-heading">Inst&auml;llningar f&ouml;r aviseringar</h3>


 <div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Send a notification email when: </div>
-<label for="notify1" id="settings-label-notify1">You receive an introduction</label>
+<div id="settings-notify-desc">Skicka avisering via e-post n&auml;r: </div>
+<label for="notify1" id="settings-label-notify1">Ny kontaktf&ouml;rfr&aring;gan kommer</label>
 <input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
 <div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Your introductions are confirmed</label>
+<label for="notify2" id="settings-label-notify2">Egen f&ouml;rfr&aring;gan har godk&auml;nts</label>
 <input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
 <div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">Someone writes on your profile wall</label>
+<label for="notify3" id="settings-label-notify3">N&aring;gon skriver p&aring; din profilsida</label>
 <input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
 <div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">Someone writes a followup comment</label>
+<label for="notify4" id="settings-label-notify4">N&aring;gon skriver en kommentar direkt efter din</label>
 <input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
 <div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">You receive a private message</label>
+<label for="notify5" id="settings-label-notify5">Du f&aring;r ett personligt meddelande</label>
 <input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
 <div id="notify5-end"></div>
 </div>
 <div id="settings=notify-end"></div>

 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="Spara" />
 </div>


-<h3 class="settings-heading">Password Settings</h3>
+<h3 class="settings-heading">L&ouml;senordsinst&auml;llningar</h3>


 <div id="settings-password-wrapper" >
 <p id="settings-password-desc" >
-Leave password fields blank unless changing
+L&auml;mna f&auml;ltet tomt om du inte vill byta l&ouml;senord
 </p>
-<label id="settings-password-label" for="settings-password" >New Password: </label>
+<label id="settings-password-label" for="settings-password" >Nytt l&ouml;senord: </label>
 <input type="password" id="settings-password" name="npassword" />
 </div>
 <div id="settings-password-end" ></div>

 <div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Confirm: </label>
+<label id="settings-confirm-label" for="settings-confirm" >Bekr&auml;fta (upprepa): </label>
 <input type="password" id="settings-confirm" name="confirm" />
 </div>
 <div id="settings-confirm-end" ></div>
@ -161,16 +163,14 @@ Leave password fields blank unless changing


 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="Spara" />
 </div>


-<h3 class="settings-heading">Advanced Page Settings</h3>
+<h3 class="settings-heading">Avancerade inst&auml;llningar</h3>

 $pagetype

 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="Spara" />
 </div>
-
-
--- a/view/sv/settings_nick_set.tpl
+++ b/view/sv/settings_nick_set.tpl
@ -1,7 +1,6 @@
-
 <div id="settings-nick-wrapper" >
 <p id="settings-nickname-desc">
-<span class="error-message">Your profile address is <strong>'$nickname@$basepath'</strong></span>
+<span class="error-message">Din profiladress &auml;r <strong>'$nickname@$basepath'</strong></span>
 </p>
 $subdir

--- a/view/sv/settings_nick_subdir.tpl
+++ b/view/sv/settings_nick_subdir.tpl
@ -1,6 +1,6 @@
 <p>
-It appears that your website is located in a subdirectory of the<br />
-$hostname website, so this setting may not work reliably.<br />
+Det verkar som att din webbsida finns i en undermapp p&aring; webbplatsen<br />
+$hostname, s&aring; eventuellt kommer inte denna inst&auml;llning att fungera tillf&ouml;rlitligt.<br />
 </p>
-<p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'.
+<p>Om problem uppst&aring;r &auml;r det m&ouml;jligt att problemen kan l&ouml;sas genom att anv&auml;nda<br /> profiladressen '<strong>$baseurl/profile/$nickname</strong>' ist&auml;llet.
 </p>
--- a/view/sv/settings_nick_unset.tpl
+++ b/view/sv/settings_nick_unset.tpl
@ -1,14 +1,12 @@
-
 <div id="settings-nick-wrapper" >
 <p id="settings-nickname-desc">
-Your profile URL is currently <strong>'$baseurl/profile/$uid'</strong>.
-Setting a nickname will allow a friendly profile URL such as
+Din profiladress &auml;r f&ouml;r n&auml;rvarande<strong>'$baseurl/profile/$uid'</strong>.
+Genom att ange ett smeknamn/nick kan din adress bli enklare, s&aring; h&auml;r:
 <strong>'nickname@$basepath'</strong>.
 <br />
-Once set, it can never be changed. The nickname <strong>must</strong> start with a letter; and only letters, numbers, dashes, and underscores are allowed.
+N&auml;r smeknamn/nick har angetts kan det <strong>inte</strong> &auml;ndras. Det <strong>m&aring;ste</strong> inledas med en bokstav, och bara bokst&auml;ver, siffror, bindestreck och understrykningstecken f&aring;r anv&auml;ndas.
 </p>
-<label id="settings-nick-label" for="settings-nick" >URL Nickname: </label>
+<label id="settings-nick-label" for="settings-nick" >URL Smeknamn/nick: </label>
 <input type="text" name="nick" id="settings-nick" value="$nickname" />
 </div>
 <div id="settings-nick-end" ></div>
-
--- a/view/sv/strings.php
+++ b/view/sv/strings.php
@ -1,32 +1,35 @@
 <?php
-$a->strings['Not Found'] = 'Hittades inte';
+
+function string_plural_select($n){
+	return ($n != 1);
+}
+
+$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['Create a New Account'] = 'Skapa nytt konto';
+$a->strings['Create a New Account'] = 'Skapa ett 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['Nickname/Email/OpenID: '] = 'Användarnamn/e-post/OpenID: ';
 $a->strings["Password \x28if not OpenID\x29: "] = "Lösenord \x28om inget OpenID\x29: ";
-$a->strings['Forgot your password?'] = 'Glömt lösenordet?';
-$a->strings['Password Reset'] = 'Återställ lösenord';
+$a->strings['Forgot your password?'] = 'Har du glömt lösenordet?';
+$a->strings['Password Reset'] = 'Återställ 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[' likes this.'] = ' gillar detta.';
-$a->strings[' doesn\'t like this.'] = ' ogillar detta.';
-$a->strings['people'] = 'personer';
-$a->strings['like this.'] = 'gilla detta.';
-$a->strings['don\'t like this.'] = 'ogilla detta.';
+$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 '] = ', och ';
-$a->strings[' other people'] = ' personer till';
-$a->strings[' like this.'] = ' gillar detta.';
-$a->strings[' don\'t like this.'] = ' ogillar detta.';
+$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['Contacts'] = 'Kontakter';
 $a->strings['View Contacts'] = 'Visa kontakter';
@ -57,10 +60,11 @@ $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"] = "\x28Justerad till lokal tid\x29";
 $a->strings['[today]'] = '[today]';
-$a->strings['link to source'] = 'link to source';
+$a->strings['link to source'] = 'länk till källa';
 $a->strings['No recipient selected.'] = 'Ingen mottagare vald.';
 $a->strings['[no subject]'] = '[no subject]';
 $a->strings['Unable to locate contact information.'] = 'Hittar inga kontaktuppgifter.';
@ -94,17 +98,21 @@ $a->strings['Could not access contact record.'] = 'Could not access contact reco
 $a->strings['Could not locate selected profile.'] = 'Hittade inte vald profil.';
 $a->strings['Contact updated.'] = 'Kontakten har uppdaterats.';
 $a->strings['Failed to update contact record.'] = 'Failed to update contact record.';
-$a->strings['Contact has been '] = 'Kontakt ';
+$a->strings['Contact has been '] = 'Kontakten ';
 $a->strings['blocked'] = 'spärrad';
 $a->strings['unblocked'] = 'inte längre spärrad';
-$a->strings['ignored'] = 'ignoreras';
-$a->strings['unignored'] = 'ignoreras inte längre';
-$a->strings['stopped following'] = 'stopped following';
+$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'] = 'Privacy Unavailable';
+$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"] = "\x28Uppdateringen lyckades\x29";
 $a->strings["\x28Update was not successful\x29"] = "\x28Uppdateringen lyckades inte\x29";
@ -124,8 +132,8 @@ $a->strings['Currently blocked'] = 'Spärrad';
 $a->strings['Currently ignored'] = 'Ignoreras';
 $a->strings['Show Blocked Connections'] = 'Visa spärrade kontakter';
 $a->strings['Hide Blocked Connections'] = 'Dölj spärrade kontakter';
-$a->strings['Finding: '] = 'Finding: ';
-$a->strings['Find'] = 'Find';
+$a->strings['Finding: '] = 'Hittar: ';
+$a->strings['Find'] = 'Sök';
 $a->strings['Visit '] = 'Besök ';
 $a->strings['\'s profile'] = 's profil';
 $a->strings['Edit contact'] = 'Ändra kontakt';
@ -142,40 +150,45 @@ $a->strings['No user record found for '] = 'No user record found for ';
 $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.'] = 'Contact record was not found for you on our site.';
-$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'The ID provided by your system is a duplicate on our system. It should work if you try again.';
+$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = '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 "] = "Connection accepted at ";
+$a->strings["Connection accepted at %s"] = "Anslutningen accepterades %s";
+$a->strings["Connection accepted at "] = "Anslutningen accepterades ";
 $a->strings['Administrator'] = 'Administratör';
 $a->strings['noreply'] = 'noreply';
-$a->strings[' commented on an item at '] = ' skrev en kommentar på ';
-$a->strings[" commented on an item at "] = " skrev en kommentar på ";
+$a->strings["%s commented on an item at %s"] = "%s har kommenterat något %s";
+$a->strings[' commented on an item at '] = ' har kommenterat ';
+$a->strings[" commented on an item at "] = " har kommenterat ";
 $a->strings[' welcomes '] = ' välkomnar ';
-$a->strings["This introduction has already been accepted."] = "This introduction has already been accepted.";
+$a->strings["This introduction has already been accepted."] = "Den här förfrågan har redan accepterats.";
 $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.'] = 'Warning: profile location has no identifiable owner name.';
-$a->strings['Warning: profile location has no profile photo.'] = 'Warning: profile location has no profile photo.';
+$a->strings['Warning: profile location has no profile photo.'] = 'Varning: I den profilen finns ingen profilbild.';
+$a->strings["Introduction complete."] = "Presentationen är klar.";
 $a->strings[' required parameter'] = ' obligatoriskt fält';
-$a->strings[" was "] = " was ";
-$a->strings["s were "] = "s were ";
+$a->strings[" was "] = " var ";
+$a->strings["s were "] = " var ";
 $a->strings["not found at the given location."] = "finns inte på platsen som angavs.";
 $a->strings["Introduction complete."] = "Presentationen klar.";
-$a->strings['Unrecoverable protocol error.'] = 'Unrecoverable protocol error.';
+$a->strings['Unrecoverable protocol error.'] = 'Irreparabelt protokollfel.';
 $a->strings['Profile unavailable.'] = 'Profilen är inte tillgänglig.';
-$a->strings[' has received too many connection requests today.'] = ' has received too many connection requests today.';
-$a->strings['Spam protection measures have been invoked.'] = 'Spam protection measures have been invoked.';
+$a->strings['%s has received too many connection requests today.'] = '%s har tagit emot för många förfrågningar idag.';
+$a->strings[' has received too many connection requests today.'] = ' har tagit emot för många förfrågningar idag.';
+$a->strings['Spam protection measures have been invoked.'] = 'Åtgärder för skydd mot spam har aktiverats.';
 $a->strings['Friends are advised to please try again in 24 hours.'] = 'Friends are advised to please try again in 24 hours.';
 $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 tydligen redan vän med .';
 $a->strings['Invalid profile URL.'] = 'Ogiltig profil-URL.';
-$a->strings['Disallowed profile URL.'] = 'Disallowed profile URL.';
+$a->strings['Disallowed profile URL.'] = 'Otillåten profil-URL.';
 $a->strings['Your introduction has been sent.'] = 'Presentationen har skickats.';
-$a->strings["Please login to confirm introduction."] = "Please login to confirm introduction.";
+$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."] = "Incorrect identity currently logged in. Please login to <strong>this</strong> profile.";
 $a->strings['[Name Withheld]'] = '[Name Withheld]';
-$a->strings['Friend/Connection Request'] = 'Friend/Connection Request';
+$a->strings["Introduction received at "] = "Presentationen ankom ";
+$a->strings['Friend/Connection Request'] = 'Vän- eller kontaktförfrågan';
 $a->strings['Please answer the following:'] = 'Besvara följande, tack:';
 $a->strings['Does $name know you?'] = 'Känner $name dig?';
 $a->strings['Yes'] = 'Ja';
@ -189,12 +202,19 @@ $a->strings["Public \x28insecure\x29 network"] = "Offentligt \x28osäkert\x29 n
 $a->strings['Your profile address:'] = 'Din profiladress:';
 $a->strings['Submit Request'] = 'Skicka begäran';
 $a->strings['Cancel'] = 'Avbryt';
-$a->strings['Global Directory'] = 'Global katalog';
+$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'] = 'Global medlemskatalog';
 $a->strings['Item not found.'] = 'Hittades inte.';
 $a->strings['Private Message'] = 'Personligt meddelande';
 $a->strings["I like this \x28toggle\x29"] = "Jag gillar detta \x28toggle\x29";
 $a->strings["I don't like this \x28toggle\x29"] = "Jag ogillar detta \x28toggle\x29";
+$a->strings['Share'] = 'Dela med dig';
+$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'] = 'Visa $name s profil';
 $a->strings['View $owner_name\'s profile'] = 'Visa $owner_name s profil';
@ -203,6 +223,16 @@ $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 foto';
+$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'] = 'Inställning av rättigheter';
 $a->strings['CC: email addresses'] = 'CC: 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.';
@ -216,6 +246,7 @@ $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.'] = 'Gruppen kunde inte tas bort.';
+$a->strings["Welcome to %s"] = "Välkommen till %s";
 $a->strings["Welcome to "] = "Välkommen till ";
 $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.';
@ -225,7 +256,7 @@ $a->strings['Please see the file "INSTALL.txt".'] = 'Se filen "INSTALL.txt".';
 $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'] = 'Skicka';
+$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.';
@ -243,7 +274,8 @@ $a->strings['Please check with your site documentation or support people to see
 $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[' : '] = ' : ';
+$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['Not a valid email address.'] = 'Ogiltig e-postadress.';
 $a->strings['Please join my network on '] = 'Gå med i mitt nätverk på ';
 $a->strings['Message delivery failed.'] = 'Meddelandet kom inte fram.';
@ -251,50 +283,76 @@ $a->strings[' messages sent.'] = ' meddelanden har skickats.';
 $a->strings['Send invitations'] = 'Send invitations';
 $a->strings['Enter email addresses, one per line:'] = 'Ange e-postadresser, en per rad:';
 $a->strings['Please join my social network on '] = 'Gå med i mitt sociala nätverk på ';
+$a->strings['Your message:'] = 'Ditt 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:'] = 'Once you have registered, please connect with me via my profile page at:';
+$a->strings["%d message sent."] = array(
+	0 => "%d meddelande skickat.",
+	1 => "%d meddelanden skickade.",
+);
 $a->strings['Unable to locate original post.'] = 'Unable to locate original post.';
-$a->strings['Empty post discarded.'] = 'Empty post discarded.';
-$a->strings[" commented on your item at "] = " commented on your item at ";
-$a->strings[" posted on your profile wall at "] = " posted on your profile wall at ";
-$a->strings['System error. Post not saved.'] = 'Systemfel. Inlägget sparades inte.';
-$a->strings['This message was sent to you by '] = 'Du har fått det här meddelandet av ';
-$a->strings[', a member of the Friendika social network.'] = ', medlem i det sociala nätverket Friendika.';
+$a->strings['Empty post discarded.'] = 'Tomt inlägg. Inte sparat.';
+$a->strings['Wall Photos'] = 'Loggfoton';
+$a->strings["%s commented on your item at %s"] = "%s har kommenterat något %s";
+$a->strings["Administrator"] = "Administratör";
+$a->strings["%s posted on your profile wall at %s"] = "%s har gjort ett inlägg på din logg %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['posted an update.'] = 'gjorde en uppdatering.';
+$a->strings['%s posted an update.'] = '%s har uppdaterat något.';
 $a->strings['photo'] = 'foto';
 $a->strings['status'] = 'status';
-$a->strings['likes'] = 'gillar';
-$a->strings['doesn\'t like'] = 'ogillar';
-$a->strings['\'s'] = 's';
+$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['Password reset requested at '] = 'Lösenordsåterställning begärd kl ';
+$a->strings["Welcome back %s"] = "Välkommen tillbaka, %s";
+$a->strings['Password reset requested at '] = 'Lösenordsåterställning begärd ';
 $a->strings["Welcome back "] = "Välkommen tillbaka ";
-$a->strings['Manage Identities and/or Pages'] = 'Manage Identities and/or Pages';
+$a->strings['Manage Identities and/or Pages'] = 'Ändra identiteter eller sidor';
 $a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "\x28Toggle between different identities or community/group pages which share your account details.\x29";
-$a->strings['Select an identity to manage: '] = 'Select an identity to manage: ';
+$a->strings['Select an identity to manage: '] = 'Välj vilken identitet du vill ändra: ';
+$a->strings['No recipient selected.'] = 'Ingen mottagare har valts.';
+$a->strings['[no subject]'] = '[no subject]';
+$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 ett personligt meddelande';
+$a->strings['To:'] = 'Till:';
+$a->strings['Subject:'] = 'Ämne:';
+$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'] = 'Normal vy';
 $a->strings['New Item View'] = 'New Item View';
-$a->strings['Share'] = 'Dela';
+$a->strings['Share'] = 'Dela med dig';
 $a->strings['Insert YouTube video'] = 'Infoga klipp från YouTube';
-$a->strings['Set your location'] = 'Ange plats';
-$a->strings['Clear browser location'] = 'Clear browser location';
-$a->strings['Permission settings'] = 'Permission settings';
+$a->strings['Please enter a YouTube link:'] = 'Ange en YouTube-länk:';
+$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
+$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
+$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'] = 'Se i sitt sammanhang';
+$a->strings['View in context'] = 'Visa i sitt sammanhang';
 $a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
 $a->strings['Discard'] = 'Kasta bort';
 $a->strings['Ignore'] = 'Ignorera';
-$a->strings['Show Ignored Requests'] = 'Show Ignored Requests';
-$a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests';
-$a->strings['Claims to be known to you: '] = 'Claims to be known to you: ';
+$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: '] = 'Approve as: ';
+$a->strings['Approve as: '] = 'Godkänn som: ';
 $a->strings['Friend'] = 'Vän';
 $a->strings['Fan/Admirer'] = 'Fan/Beundrare';
 $a->strings['Notification type: '] = 'Notification type: ';
@ -304,6 +362,7 @@ $a->strings['Approve'] = 'Godkänn';
 $a->strings['No notifications.'] = 'Inga aviseringar.';
 $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'] = 'Contact Photos';
 $a->strings['Contact information unavailable'] = 'Kontaktinformationen är inte tillgänglig';
@ -311,7 +370,7 @@ $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 foto';
-$a->strings['was tagged in a'] = 'was tagged in a';
+$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.'] = 'Bilden kunde inte bahandlas.';
@ -320,18 +379,20 @@ $a->strings['No photos selected'] = 'Inga foton har valts';
 $a->strings['Upload Photos'] = 'Ladda upp foton';
 $a->strings['New album name: '] = 'Nytt album med namn: ';
 $a->strings['or existing album name: '] = 'eller befintligt album med namn: ';
-$a->strings['Permissions'] = 'Permissions';
+$a->strings['Permissions'] = 'Åtkomst';
 $a->strings['Edit Album'] = 'Redigera album';
 $a->strings['View Photo'] = 'Visa foto';
 $a->strings['Photo not available'] = 'Fotot är inte tillgängligt';
-$a->strings['Edit photo'] = 'Redigera foto';
+$a->strings['Edit photo'] = 'Ändra foto';
+$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'] = 'New album name';
+$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'] = 'Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping';
+$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 foton';
 $a->strings['Upload New Photos'] = 'Ladda upp foton';
 $a->strings['View Album'] = 'Titta i album';
@ -342,7 +403,7 @@ $a->strings['Image size reduction [48] failed.'] = 'Fel när bildstorlek skulle
 $a->strings['Unable to process image'] = 'Det gick inte att behandla bilden';
 $a->strings['Image uploaded successfully.'] = 'Bilden har laddats upp.';
 $a->strings['Image size reduction [640] failed.'] = 'Fel när bildstorlek skulle minskas [640].';
-$a->strings['Profile Name is required.'] = 'Profile Name is required.';
+$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-';
@ -351,7 +412,7 @@ $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</strong> vara synlig för vem som helst på internet.';
 $a->strings['Age: '] = 'Ålder: ';
 $a->strings['Profile Image'] = 'Profilbild';
-$a->strings['Invalid OpenID url'] = 'Ogiltig OpenID-url';
+$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.';
@ -362,15 +423,15 @@ $a->strings['Your "nickname" can only contain "a-z", "0-9", "-", and "_", and mu
 $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.'] = 'An error occurred creating your default profile. Please try again.';
-$a->strings['Registration details for '] = 'Registration details for ';
+$a->strings['An error occurred creating your default profile. Please try again.'] = 'Det blev fel när din huvudsakliga profil (default) skulle skapas. Prova igen.';
+$a->strings['Registration details for '] = 'Detaljer i registreringen av ';
 $a->strings['Registration successful. Please check your email for further instructions.'] = 'Registrering klar. Kolla din e-post för vidare instruktioner.';
 $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['Registration request at '] = 'Registration request at ';
 $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'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.";
-$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 känner till OpenID kan du lämna det fältet tomt och fylla i resten.';
+$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 kan du lämna det fältet tomt och fylla i resten.';
 $a->strings["Your OpenID \x28optional\x29: "] = "Ditt OpenID \x28krävs ej\x29: ";
 $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?'] = 'Inkludera din profil i medlemskatalogen?';
@ -381,7 +442,7 @@ $a->strings['Choose a profile nickname. This must begin with a text character. Y
 $a->strings['Choose a nickname: '] = 'Välj ett användarnamn: ';
 $a->strings['Please login.'] = 'Logga in.';
 $a->strings['Registration revoked for '] = 'Registration revoked for ';
-$a->strings['Account approved.'] = 'Account approved.';
+$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 jämförelse:';
@ -394,16 +455,16 @@ $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'] = 'Plugin Settings';
+$a->strings['Plugin Settings'] = 'Inställningar för insticksprogram \x28plugins\x29';
 $a->strings['Account Settings'] = 'Kontoinställningar';
 $a->strings['No Plugin settings configured'] = 'No Plugin settings configured';
 $a->strings['OpenID: '] = 'OpenID: ';
-$a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Optional\x29 Allow this OpenID to login to this account.";
+$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['Default Post Permissions'] = 'Default Post Permissions';
 $a->strings['Tag removed'] = 'Taggen har tagits bort';
-$a->strings['Remove Item Tag'] = 'Remove Item Tag';
-$a->strings['Select a tag to remove: '] = 'Välj tagg som ska tas 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:';
@ -439,12 +500,13 @@ $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'] = 'Katalog';
+$a->strings['Directory'] = 'Medlemskatalog';
 $a->strings['Network'] = 'Nätverk';
 $a->strings['Notifications'] = 'Aviseringar';
 $a->strings['Manage'] = 'Hantera';
@ -464,9 +526,9 @@ $a->strings['Hermaphrodite'] = 'Hermafrodit';
 $a->strings['Neuter'] = 'Neuter';
 $a->strings['Non-specific'] = 'Non-specific';
 $a->strings['Other'] = 'Annat';
-$a->strings['Undecided'] = 'Undecided';
-$a->strings['Males'] = 'Males';
-$a->strings['Females'] = 'Females';
+$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';
@ -477,7 +539,7 @@ $a->strings['Virgin'] = 'Oskuld';
 $a->strings['Deviant'] = 'Avvikande';
 $a->strings['Fetish'] = 'Fetish';
 $a->strings['Oodles'] = 'Oodles';
-$a->strings['Nonsexual'] = 'Nonsexual';
+$a->strings['Nonsexual'] = 'Asexuell';
 $a->strings['Single'] = 'Singel';
 $a->strings['Lonely'] = 'Ensam';
 $a->strings['Available'] = 'Tillgänglig';
@ -492,29 +554,30 @@ $a->strings['Engaged'] = 'Förlovad';
 $a->strings['Married'] = 'Gift';
 $a->strings['Partners'] = 'I partnerskap';
 $a->strings['Cohabiting'] = 'Cohabiting';
-$a->strings['Happy'] = 'Glad';
+$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'] = 'Unstable';
+$a->strings['Unstable'] = 'Instabilt';
 $a->strings['Divorced'] = 'Skiljd';
-$a->strings['Widowed'] = 'Widowed';
-$a->strings['Uncertain'] = 'Uncertain';
+$a->strings['Widowed'] = 'Änka/änkling';
+$a->strings['Uncertain'] = 'Oklart';
 $a->strings['Complicated'] = 'Komplicerat';
-$a->strings['Don\'t care'] = 'Don\'t care';
+$a->strings['Don\'t care'] = 'Bryr mig inte';
 $a->strings['Ask me'] = 'Fråga mig';
 $a->strings['Facebook disabled'] = 'Facebook disabled';
 $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 på Facebook';
 $a->strings['Facebook'] = 'Facebook';
 $a->strings['Facebook Connector Settings'] = 'Facebook Connector Settings';
-$a->strings['Post to Facebook'] = 'Post to Facebook';
+$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.'] = 'Use the following controls only if the Java uploader [above] fails to launch.';
+$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 fil';
 $a->strings['Drop files here to upload'] = 'Dra filer som ska laddas upp hit';
 $a->strings['Failed'] = 'Misslyckades';
@ -525,36 +588,36 @@ $a->strings['File has an invalid extension, it should be one of '] = 'Otillåten
 $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'] = 'Post to StatusNet';
+$a->strings['Post to StatusNet'] = 'Lägg in på StatusNet';
 $a->strings['StatusNet Posting Settings'] = 'StatusNet Posting Settings';
 $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'] = 'Log in with StatusNet';
+$a->strings['Log in with StatusNet'] = 'Logga in med StatusNet';
 $a->strings['Copy the security code from StatusNet here'] = 'Copy the security code from StatusNet here';
-$a->strings['Currently connected to: '] = 'Currently connected to: ';
+$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'] = 'New game';
-$a->strings['New game with handicap'] = 'New game with handicap';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. ';
-$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.';
-$a->strings['You go first...'] = 'You go first...';
-$a->strings['I\'m going first this time...'] = 'I\'m going first this time...';
-$a->strings['You won!'] = 'You won!';
+$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!'] = 'I won!';
-$a->strings['Post to Twitter'] = 'Post to Twitter';
+$a->strings['I won!'] = 'Jag vann!';
+$a->strings['Post to Twitter'] = 'Lägg in på Twitter';
 $a->strings['Twitter Posting Settings'] = 'Twitter Posting Settings';
 $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'] = 'Copy the PIN from Twitter here';
+$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';
@ -1045,7 +1108,7 @@ $a->strings['Israel'] = 'Israel';
 $a->strings['Jamaica'] = 'Jamaica';
 $a->strings['Japan'] = 'Japan';
 $a->strings['Kwajalein'] = 'Kwajalein';
-$a->strings['Libya'] = 'Libya';
+$a->strings['Libya'] = 'Libyen';
 $a->strings['MET'] = 'MET';
 $a->strings['Mexico/BajaNorte'] = 'Mexico/BajaNorte';
 $a->strings['Mexico/BajaSur'] = 'Mexico/BajaSur';
@ -1095,7 +1158,7 @@ $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'] = 'Poland';
+$a->strings['Poland'] = 'Polen';
 $a->strings['Portugal'] = 'Portugal';
 $a->strings['PRC'] = 'PRC';
 $a->strings['PST8PDT'] = 'PST8PDT';
--- a/view/sv/wall_received_eml.tpl
+++ b/view/sv/wall_received_eml.tpl
@ -1,18 +1,16 @@
+$username,

-Dear $username,
-
-	'$from' posted something to your profile wall.
+'$from' har skrivit på din profilsida.

 -----
 $body
 -----

-Please login at $siteurl to view or delete the item:
+Logga in på $siteurl för att kolla eller ta bort:

 $display

-Thank you,
-	$sitename administrator
-
+Hälsningar,
+$sitename admin

 
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@ -16,7 +16,7 @@ body {
 }


-a, a:visited { color: #3465a4; text-decoration: none; }
+a, a:visited, a:link { color: #3465a4; text-decoration: none; }
 a:hover {text-decoration: underline; }

 input {
@ -51,6 +51,11 @@ blockquote:before {
 	content: '>> ';
 }

+.icollapse-wrapper, .ccollapse-wrapper {
+	border: 1px solid #CCC;
+	padding: 5px;
+}
+
 #panel {
 	background-color: ivory;
 	position: absolute;
@ -218,7 +223,7 @@ div.wall-item-content-wrapper.shiny {
 	cursor: pointer;
 }

-.fakelink, .fakelink:visited {
+.fakelink, .fakelink:visited, .fakelink:link {
 	color: #3465a4;
 	text-decoration: none;
 	cursor: pointer;
@ -372,6 +377,7 @@ input#dfrn-url {
 }

 #settings-nick-wrapper {
+	margin-top: 20px;
 	margin-bottom: 30px;
 }

@ -1843,7 +1849,7 @@ a.mail-list-link {
 	margin-bottom: 15px;
 }

-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
+#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
 	color: #8888FF;
 	text-decoration: none;
 	cursor: pointer;
@ -2044,8 +2050,8 @@ a.mail-list-link {
 }


-#plugin-settings-link, #account-settings-link {
-	margin-bottom: 25px;
+#plugin-settings-link, #account-settings-link, #uexport-link {
+	margin-bottom: 10px;
 }

 /* end from defautlt */
--- a/view/theme/greenzero/style.css
+++ b/view/theme/greenzero/style.css
@ -2,7 +2,7 @@

 /* green variation by Tobias Diekershoff <tobias.diekershoff@gmx.net> */

-a, a:visited { color: #549f4f; text-decoration: none; }
+a:link, a:visited { color: #549f4f; text-decoration: none; }
 a:hover {text-decoration: underline; }


--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@ -505,7 +505,7 @@ input#dfrn-url {
 }

 #settings-nick-wrapper {
-	margin-bottom: 30px;
+	margin-bottom: 15px;
 }

 #settings-expire-end {
@ -608,7 +608,7 @@ input#dfrn-url {
 }

 #settings-nick {
-	margin-bottom: 50px;
+	margin-bottom: 30px;
 }

 #cropimage-wrapper, #cropimage-preview-wrapper {
@ -2079,8 +2079,8 @@ a.mail-list-link {
 }


-#plugin-settings-link, #account-settings-link {
-	margin-bottom: 25px;
+#plugin-settings-link, #account-settings-link, #uexport-link {
+	margin-bottom: 10px;
 }