Merge branch 'master' of http://github.com/erikl/friendika into erikl-master

Conflicts:
	view/sv/contact_edit.tpl
	view/sv/strings.php

44 files changed, 1846 insertions, 1 deletions

diff --git a/view/sv/contact_edit.tpl b/view/sv/contact_edit.tpl
index 1c5a1a3fb..40a751073 100644
--- a/view/sv/contact_edit.tpl
+++ b/view/sv/contact_edit.tpl
@@ -69,7 +69,7 @@ $rating
 </div>
 <div id="contact-edit-rating-explain">
 <p>
-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.
+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.
 </p>
 <textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
 </div>
diff --git a/view/sv/cropbody.tpl b/view/sv/cropbody.tpl
new file mode 100644
index 000000000..39395af8e
--- /dev/null
+++ b/view/sv/cropbody.tpl
@@ -0,0 +1,57 @@
+<h1>Crop Image</h1>
+<p id="cropimage-desc">
+Please adjust the image cropping for optimum viewing.
+</p>
+<div id="cropimage-wrapper">
+<img src="$image_url" id="croppa" class="imgCrop" alt="" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<script type="text/javascript" language="javascript">
+
+	function onEndCrop( coords, dimensions ) {
+		$( 'x1' ).value = coords.x1;
+		$( 'y1' ).value = coords.y1;
+		$( 'x2' ).value = coords.x2;
+		$( 'y2' ).value = coords.y2;
+		$( 'width' ).value = dimensions.width;
+		$( 'height' ).value = dimensions.height;
+	}
+
+	Event.observe( window, 'load', function() {
+		new Cropper.ImgWithPreview(
+		'croppa',
+		{
+			previewWrap: 'previewWrap',
+			minWidth: 175,
+			minHeight: 175,
+			maxWidth: 640,
+			maxHeight: 640,
+			ratioDim: { x: 100, y:100 },
+			displayOnInit: true,
+			onEndCrop: onEndCrop
+		}
+		);
+	}
+	);
+
+</script>
+
+<form action="profile_photo/$resource" id="crop-image-form" method="post" />
+
+<input type="hidden" name="imagename" value="$hash" />
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="Done Editing" />
+</div>
+
+</form>
diff --git a/view/sv/dfrn_req_confirm.tpl b/view/sv/dfrn_req_confirm.tpl
new file mode 100644
index 000000000..f053f22af
--- /dev/null
+++ b/view/sv/dfrn_req_confirm.tpl
@@ -0,0 +1,17 @@
+
+<p id="dfrn-request-homecoming" >
+Welcome home $username. 
+<br />
+Please confirm your introduction to $dfrn_url.
+
+</p>
+<form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> 
+<input type="hidden" name="dfrn_url" value="$dfrn_url" />
+<input type="hidden" name="confirm_key" value="$confirm_key" />
+<input type="hidden" name="localconfirm" value="1" />
+$aes_allow
+
+<div id="dfrn-request-homecoming-submit-wrapper" >
+<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="Confirm" />
+</div>
+</form>
\ No newline at end of file
diff --git a/view/sv/directory_header.tpl b/view/sv/directory_header.tpl
new file mode 100644
index 000000000..03eed62b3
--- /dev/null
+++ b/view/sv/directory_header.tpl
@@ -0,0 +1,14 @@
+<h1>Site Directory</h1>
+
+$globaldir
+
+$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" />
+</form>
+</div>
+<div id="directory-search-end"></div>
+
diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl
new file mode 100644
index 000000000..ae758c9a8
--- /dev/null
+++ b/view/sv/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Dear $myname,
+
+You have a new follower at $sitename -  '$requestor'.
+
+You may visit their profile at $url.
+
+Please login to your site to approve or ignore/cancel the request.
+
+$siteurl
+
+Regards,
+
+	$sitename administrator
\ No newline at end of file
diff --git a/view/sv/friend_complete_eml.tpl b/view/sv/friend_complete_eml.tpl
new file mode 100644
index 000000000..ab12fcb6b
--- /dev/null
+++ b/view/sv/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Dear $username,
+
+	Great news... '$fn' at '$dfrn_url' has accepted 
+your connection request at '$sitename'.
+
+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. 
+
+$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
+
+ 
diff --git a/view/sv/group_edit.tpl b/view/sv/group_edit.tpl
new file mode 100644
index 000000000..e6c7afb49
--- /dev/null
+++ b/view/sv/group_edit.tpl
@@ -0,0 +1,24 @@
+<h2>Group Editor</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>
+<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>
+$selector
+
+</div>
+$drop
+<div id="group_members_select_end"></div>
+<div id="group-edit-submit-wrapper" >
+<input type="submit" name="submit" value="Submit" >
+</div>
+
+<div id="group-edit-select-end" ></div>
+</form>
+</div>
diff --git a/view/sv/group_new.tpl b/view/sv/group_new.tpl
new file mode 100644
index 000000000..a1efa7717
--- /dev/null
+++ b/view/sv/group_new.tpl
@@ -0,0 +1,23 @@
+
+
+
+<div id="group-new-wrapper" >
+<form action="group/new" method="post">
+
+<div id="group-new-text">
+<p>
+Create a group of contacts/friends.
+
+<div id="group-new-input-wrapper">
+<label id="group-new-label" for="group-new-name" >Group Name: </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" />
+</form>
+</div>
+<div id="group-new-end"></div>
+
+ 
\ No newline at end of file
diff --git a/view/sv/head.tpl b/view/sv/head.tpl
new file mode 100644
index 000000000..8f97a11e5
--- /dev/null
+++ b/view/sv/head.tpl
@@ -0,0 +1,32 @@
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<base href="$baseurl" />
+<meta name="generator" content="$generator" />
+<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+
+<!--[if IE]>
+<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
+<script type="text/javascript" src="$baseurl/include/main.js" ></script>
+<script>
+
+	function confirmDelete() { return confirm("Delete this item?"); }
+	function commentOpen(obj,id) {
+		if(obj.value == 'Comment') {
+			obj.value = '';
+			obj.className = "comment-edit-text-full";
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+	function commentClose(obj,id) {
+		if(obj.value == '') {
+			obj.value = 'Comment';
+			obj.className="comment-edit-text-empty";
+			closeMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+
+</script>
+
+
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
new file mode 100644
index 000000000..d3bb6b411
--- /dev/null
+++ b/view/sv/htconfig.tpl
@@ -0,0 +1,74 @@
+<?php
+
+// Set the following for your MySQL installation
+// Copy or rename this file to .htconfig.php
+
+$db_host = '$dbhost';
+$db_user = '$dbuser';
+$db_pass = '$dbpass';
+$db_data = '$dbdata';
+
+// If you are using a subdirectory of your domain you will need to put the
+// relative path (from the root of your domain) here.
+// For instance if your URL is 'http://example.com/directory/subdirectory',
+// set $a->path to 'directory/subdirectory'. 
+
+$a->path = '$urlpath';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '$timezone';
+
+// What is your site name?
+
+$a->config['sitename'] = "My Friend Network";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 10000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '$phpath';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
+// Addons or plugins are configured here.
+// This is a comma seperated list of addons to enable. Example:
+// $a->config['system']['addon'] = 'js_upload,randplace,oembed';
+
+$a->config['system']['addon'] = 'js_upload';
+
diff --git a/view/sv/insecure_net.tpl b/view/sv/insecure_net.tpl
new file mode 100644
index 000000000..5628639cc
--- /dev/null
+++ b/view/sv/insecure_net.tpl
@@ -0,0 +1,6 @@
+<div id="profile-edit-insecure">
+<p>
+The social network that $name belongs to is an open network with limited or non-existent privacy controls. 
+Please use appropriate discretion.
+</p>
+</div>
\ No newline at end of file
diff --git a/view/sv/install_db.tpl b/view/sv/install_db.tpl
new file mode 100644
index 000000000..c413689c2
--- /dev/null
+++ b/view/sv/install_db.tpl
@@ -0,0 +1,40 @@
+
+<h3>Friendika Social Network</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. 
+</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>
+<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>
+<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>
+<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>
+<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
+</div>
+
+$tzselect
+
+<div id="install-tz-end" ></div>
+<input id="install-submit" type="submit" name="submit" value="$submit" /> 
+
+</form>
+<div id="install-end" ></div>
+
diff --git a/view/sv/intro_complete_eml.tpl b/view/sv/intro_complete_eml.tpl
new file mode 100644
index 000000000..a60745ec5
--- /dev/null
+++ b/view/sv/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Dear $username,
+
+	'$fn' at '$dfrn_url' has accepted 
+your connection request at '$sitename'.
+
+	'$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' 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  
+
+$siteurl
+
+Sincerely,
+
+	$sitename Administrator
diff --git a/view/sv/intros-top.tpl b/view/sv/intros-top.tpl
new file mode 100644
index 000000000..d8b7394a4
--- /dev/null
+++ b/view/sv/intros-top.tpl
@@ -0,0 +1,7 @@
+<h1>Pending Friend/Connect Notifications</h1>
+
+<div id="notification-show-hide-wrapper" >
+<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
+</div>
+
+
diff --git a/view/sv/jot-header.tpl b/view/sv/jot-header.tpl
new file mode 100644
index 000000000..fe818410e
--- /dev/null
+++ b/view/sv/jot-header.tpl
@@ -0,0 +1,142 @@
+
+<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+var editor;
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "specific_textareas",
+	editor_selector: /(profile-jot-text|prvmail-text)/,
+	plugins : "bbcode,paste",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_blockformats : "blockquote,code",
+	paste_text_sticky : true,
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	force_p_newlines : false,
+	force_br_newlines : true,
+	forced_root_block : '',
+	convert_urls: false,
+	content_css: "$baseurl/view/custom_tinymce.css",
+	     //Character count
+	theme_advanced_path : false,
+	setup : function(ed) {
+		ed.onKeyUp.add(function(ed, e) {
+			var txt = tinyMCE.activeEditor.getContent();
+			var text = txt.length;
+			if(txt.length <= 140) {
+				$('#character-counter').removeClass('red');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('grey');
+			}
+			if((txt.length > 140) && (txt .length <= 420)) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('red');
+				$('#character-counter').addClass('orange');
+			}
+			if(txt.length > 420) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('red');
+			}
+			$('#character-counter').text(text);
+    	});
+
+		ed.onInit.add(function(ed) {
+			ed.pasteAsPlainText = true;
+		});
+
+	}
+});
+
+</script>
+<script type="text/javascript" src="include/ajaxupload.js" ></script>
+<script>
+	$(document).ready(function() {
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#profile-jot-perms img').attr('src', 'images/lock_icon.gif');
+				$('.profile-jot-net input').attr('disabled', 'disabled');
+			});
+			if(selstr == null) { 
+				$('#profile-jot-perms img').attr('src', 'images/unlock_icon.gif');
+				$('.profile-jot-net input').attr('disabled', false);
+			}
+
+		}).trigger('change');
+
+	});
+
+	function jotGetLink() {
+		reply = prompt("Please enter a link URL:");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotGetVideo() {
+		reply = prompt("Please enter a YouTube link:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
+		}
+	}
+
+	function jotGetLocation() {
+		reply = prompt("Where are you right now?", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+	$geotag
+
+</script>
+
diff --git a/view/sv/lostpass.tpl b/view/sv/lostpass.tpl
new file mode 100644
index 000000000..a7040c149
--- /dev/null
+++ b/view/sv/lostpass.tpl
@@ -0,0 +1,18 @@
+<h3>Forgot your Password?</h3>
+
+<p id="lostpass-desc">
+Enter your email address and submit to have your password reset. Then check your email for further instructions.
+</p>
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper">
+        <label for="login-name" id="label-login-name">Nickname or Email: </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" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+
diff --git a/view/sv/lostpass_eml.tpl b/view/sv/lostpass_eml.tpl
new file mode 100644
index 000000000..c350236a4
--- /dev/null
+++ b/view/sv/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+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. 
+
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email. 
+
+Your password will not be changed unless we can verify that you
+issued this request. 
+
+Follow this link to verify your identity:
+
+$reset_link
+
+You will then receive a follow-up message containing the new password.
+
+You may change that password from your account settings page after logging in.
+
+The login details are as follows:
+
+Site Location:	$siteurl
+Login Name:	$email
+
+
+
+
+Sincerely,
+	$sitename Administrator
+
+ 
diff --git a/view/sv/mail_received_html_body_eml.tpl b/view/sv/mail_received_html_body_eml.tpl
new file mode 100644
index 000000000..6b7eb8873
--- /dev/null
+++ b/view/sv/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>Friendika Message</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendika</span></td></tr>
+
+	<tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $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>
+	</tbody>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/view/sv/mail_received_text_body_eml.tpl b/view/sv/mail_received_text_body_eml.tpl
new file mode 100644
index 000000000..023867304
--- /dev/null
+++ b/view/sv/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+$from sent you a new private message at $siteName.
+	
+$title
+
+$textversion
+				
+Please login at $siteurl to read and reply to your private messages.
+
+Thank you,
+$siteName administrator
diff --git a/view/sv/msg-header.tpl b/view/sv/msg-header.tpl
new file mode 100644
index 000000000..174e6c985
--- /dev/null
+++ b/view/sv/msg-header.tpl
@@ -0,0 +1,104 @@
+
+<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "specific_textareas",
+	editor_selector: /(profile-jot-text|prvmail-text)/,
+	plugins : "bbcode,paste",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_blockformats : "blockquote,code",
+	paste_text_sticky : true,
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	force_p_newlines : false,
+	force_br_newlines : true,
+	forced_root_block : '',
+	convert_urls: false,
+	content_css: "$baseurl/view/custom_tinymce.css",
+	     //Character count
+	theme_advanced_path : false,
+	setup : function(ed) {
+		ed.onKeyUp.add(function(ed, e) {
+			var txt = tinyMCE.activeEditor.getContent();
+			var text = txt.length;
+			if(txt.length <= 140) {
+				$('#character-counter').removeClass('red');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('grey');
+			}
+			if((txt.length > 140) && (txt .length <= 420)) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('red');
+				$('#character-counter').addClass('orange');
+			}
+			if(txt.length > 420) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('red');
+			}
+			$('#character-counter').text(text);
+    	});
+
+		ed.onInit.add(function(ed) {
+			ed.pasteAsPlainText = true;
+		});
+	}
+});
+
+</script>
+<script type="text/javascript" src="include/ajaxupload.js" ></script>
+<script>
+	$(document).ready(function() {
+		var uploader = new window.AjaxUpload(
+			'prvmail-upload',
+			{ action: 'wall_upload/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+	});
+
+	function jotGetLink() {
+		reply = prompt("Please enter a link URL:");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+</script>
+
diff --git a/view/sv/pagetypes.tpl b/view/sv/pagetypes.tpl
new file mode 100644
index 000000000..2036614ab
--- /dev/null
+++ b/view/sv/pagetypes.tpl
@@ -0,0 +1,25 @@
+
+		<div id="settings-normal-wrapper">
+			<label id="settings-normal-label" for="settings-normal">Normal Profile</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>
+		</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>
+		</div>
+		<div id="settings-soapbox-break" ></div>	
+		<div id="settings-community-wrapper">
+			<label id="settings-community-label" for="settings-community">Community/Celebrity Profile</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>
+		</div>
+		<div id="settings-community-break" ></div>	
+		<div id="settings-freelove-wrapper">
+			<label id="settings-freelove-label" for="settings-freelove">Automatic Friend Profile</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>
+		</div>
+			<div id="settings-freelove-break" ></div>	
diff --git a/view/sv/passchanged_eml.tpl b/view/sv/passchanged_eml.tpl
new file mode 100644
index 000000000..9692159e1
--- /dev/null
+++ b/view/sv/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+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).
+
+
+Your login details are as follows:
+
+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
+
+ 
diff --git a/view/sv/profile-hide-friends.tpl b/view/sv/profile-hide-friends.tpl
new file mode 100644
index 000000000..54ade00fe
--- /dev/null
+++ b/view/sv/profile-hide-friends.tpl
@@ -0,0 +1,16 @@
+<p id="hide-friends-text">
+Hide my contact/friend list from viewers of this profile?
+</p>
+
+		<div id="hide-friends-yes-wrapper">
+		<label id="hide-friends-yes-label" for="hide-friends-yes">Yes</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>
+		<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0"  />
+
+		<div id="hide-friends-end"></div>
+		</div>
diff --git a/view/sv/profile-in-directory.tpl b/view/sv/profile-in-directory.tpl
new file mode 100644
index 000000000..98af3e59a
--- /dev/null
+++ b/view/sv/profile-in-directory.tpl
@@ -0,0 +1,16 @@
+<p id="profile-in-directory">
+Publish your default profile in site directory? 
+</p>
+
+		<div id="profile-in-dir-yes-wrapper">
+		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Yes</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>
+		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0"  />
+
+		<div id="profile-in-dir-end"></div>
+		</div>
diff --git a/view/sv/profile-in-netdir.tpl b/view/sv/profile-in-netdir.tpl
new file mode 100644
index 000000000..be111aa67
--- /dev/null
+++ b/view/sv/profile-in-netdir.tpl
@@ -0,0 +1,16 @@
+<p id="profile-in-directory">
+Publish your default profile in global social directory? 
+</p>
+
+		<div id="profile-in-netdir-yes-wrapper">
+		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Yes</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>
+		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0"  />
+
+		<div id="profile-in-netdir-end"></div>
+		</div>
diff --git a/view/sv/profile.php b/view/sv/profile.php
new file mode 100644
index 000000000..fa7372668
--- /dev/null
+++ b/view/sv/profile.php
@@ -0,0 +1,72 @@
+<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>

+<html>

+<head>

+  <title><?php if(x($page,'title')) echo $page['title']; ?></title>

+  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>

+</head>

+<body>

+<header><?php if(x($page,'header')) echo $page['header']; ?></header>

+<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>

+<aside>

+<?php if((is_array($profile)) && count($profile)) { ?>

+<div class="vcard">

+	<?php if(strlen($profile['name'])) { ?>

+		<div class="fn"><?php echo $profile['name']; ?></div>

+	<?php } ?>

+

+	<?php if(strlen($profile['photo'])) { ?>

+		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>

+	<?php } ?>

+

+	<div id="profile-extra-links">

+	<ul>

+	<?php if($profile['uid'] != $_SESSION['uid']) { ?>

+	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li>

+	<?php } ?>

+	</ul>

+

+	</div>

+

+	<?php if ( (strlen($profile['address'])) 

+		|| (strlen($profile['locality']))

+		|| (strlen($profile['region'])) 

+		|| (strlen($profile['postal-code'])) 

+		|| (strlen($profile['country-name']))) { ?>

+		<div class="location">Location:

+			<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>

+				<span class="country-name"><?php echo $profile['country-name']; ?></span>

+			</div>

+		</div>

+

+	<?php } ?>

+

+	<?php if(strlen($profile['gender'])) { ?>

+		<div class="mf">Gender: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>

+

+	<?php } ?>

+

+	<?php if(strlen($profile['pubkey'])) { ?>

+		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>

+	<?php } ?>

+</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>

+<?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>

+<?php } ?>

+<?php if(x($page,'aside')) echo $page['aside'] ?>

+</aside>

+<section>

+<?php if(x($page,'content')) echo $page['content']; ?>

+<div id="page-footer"></div>

+</section>

+<footer>

+<?php if(x($page,'footer')) echo $page['footer']; ?>

+</footer>

+</body>

+</html>

+

diff --git a/view/sv/profile_advanced.php b/view/sv/profile_advanced.php
new file mode 100644
index 000000000..6d2ecba4d
--- /dev/null
+++ b/view/sv/profile_advanced.php
@@ -0,0 +1,225 @@
+<?php
+
+$o .= '';
+
+$o .= <<< EOT
+
+<h2>Profile</h2>
+
+
+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">{$a->profile['name']}</div>
+</div>
+<div id="advanced-profile-name-end"></div>
+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">{$a->profile['gender']}</div>
+</div>
+<div id="advanced-profile-gender-end"></div>
+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>
+EOT;
+
+// If no year, add an arbitrary one so just we can parse the month and day.
+
+$o .= '<div id="advanced-profile-dob">' 
+	. ((intval($a->profile['dob'])) 
+		? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y'))
+		: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F'))) 
+	. "</div>\r\n</div>";
+
+$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">$age</div>
+</div>
+<div id="advanced-profile-age-end"></div>
+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">{$a->profile['marital']}</div>
+EOT;
+
+if($a->profile['with'])
+	$o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
+$o .= <<< EOT
+</div>
+<div id="advanced-profile-marital-end"></div>
+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">{$a->profile['sexual']}</div>
+</div>
+<div id="advanced-profile-sexual-end"></div>
+EOT;
+}
+
+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">$homepage</div>
+</div>
+<div id="advanced-profile-homepage-end"></div>
+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">{$a->profile['politic']}</div>
+</div>
+<div id="advanced-profile-politic-end"></div>
+EOT;
+}
+
+if($a->profile['religion']) {
+$o .= <<< EOT
+<div id="advanced-profile-religion-wrapper" >
+<div id="advanced-profile-religion-text">Religion:</div>
+<div id="advanced-profile-religion">{$a->profile['religion']}</div>
+</div>
+<div id="advanced-profile-religion-end"></div>
+EOT;
+}
+if($txt = prepare_text($a->profile['about'])) {
+$o .= <<< EOT
+<div id="advanced-profile-about-wrapper" >
+<div id="advanced-profile-about-text">About:</div>
+<br />
+<div id="advanced-profile-about">$txt</div>
+</div>
+<div id="advanced-profile-about-end"></div>
+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>
+<br />
+<div id="advanced-profile-interest">$txt</div>
+</div>
+<div id="advanced-profile-interest-end"></div>
+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>
+<br />
+<div id="advanced-profile-contact">$txt</div>
+</div>
+<div id="advanced-profile-contact-end"></div>
+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>
+<br />
+<div id="advanced-profile-music">$txt</div>
+</div>
+<div id="advanced-profile-music-end"></div>
+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>
+<br />
+<div id="advanced-profile-book">$txt</div>
+</div>
+<div id="advanced-profile-book-end"></div>
+EOT;
+}
+
+if($txt = prepare_text($a->profile['tv'])) {
+$o .= <<< EOT
+<div id="advanced-profile-tv-wrapper" >
+<div id="advanced-profile-tv-text">Television:</div>
+<br />
+<div id="advanced-profile-tv">$txt</div>
+</div>
+<div id="advanced-profile-tv-end"></div>
+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>
+<br />
+<div id="advanced-profile-film">$txt</div>
+</div>
+<div id="advanced-profile-film-end"></div>
+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>
+<br />
+<div id="advanced-profile-romance">$txt</div>
+</div>
+<div id="advanced-profile-romance-end"></div>
+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>
+<br />
+<div id="advanced-profile-work">$txt</div>
+</div>
+<div id="advanced-profile-work-end"></div>
+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>
+<br />
+<div id="advanced-profile-education">$txt</div>
+</div>
+<div id="advanced-profile-education-end"></div>
+EOT;
+}
+
+
diff --git a/view/sv/profile_edit.tpl b/view/sv/profile_edit.tpl
new file mode 100644
index 000000000..b0d4850d0
--- /dev/null
+++ b/view/sv/profile_edit.tpl
@@ -0,0 +1,293 @@
+<h1>Edit Profile Details</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></li>
+<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+$default
+
+<div id="profile-edit-wrapper" >
+<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>
+<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>
+<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>
+<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>
+$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>
+<div id="profile-edit-dob" >
+$dob $age
+</div>
+</div>
+<div id="profile-edit-dob-end"></div>
+
+$hide_friends
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >Street Address: </label>
+<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
+</div>
+<div id="profile-edit-address-end"></div>
+
+<div id="profile-edit-locality-wrapper" >
+<label id="profile-edit-locality-label" for="profile-edit-locality" >Locality/City: </label>
+<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postal/Zip Code: </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>
+<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
+<option selected="selected" >$country_name</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >Region/State: </label>
+<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >$region</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span> (Marital) Status: </label>
+$marital
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > Who: (if applicable) </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>
+$sexual
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Homepage 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>
+<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >Religion: </label>
+<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-keywords-wrapper" >
+<label id="profile-edit-keywords-label" for="profile-edit-keywords" >Keywords: </label>
+<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Example: fishing photography software" value="$keywords" />
+</div><div id="profile-edit-keywords-desc">(Used for searching public profiles, never shown to others)</div>
+<div id="profile-edit-keywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" >
+<p id="about-jot-desc" >
+Tell us about yourself... 
+</p>
+
+<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+</div>
+
+
+<div id="interest-jot-wrapper" >
+<p id="interest-jot-desc" >
+Hobbies/Interests 
+</p>
+
+<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+</div>
+
+
+<div id="contact-jot-wrapper" >
+<p id="contact-jot-desc" >
+Contact information and Social Networks 
+</p>
+
+<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+</div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" >
+<p id="music-jot-desc" >
+Musical interests 
+</p>
+
+<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+</div>
+
+<div id="book-jot-wrapper" >
+<p id="book-jot-desc" >
+Books, literature 
+</p>
+
+<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+</div>
+
+
+
+<div id="tv-jot-wrapper" >
+<p id="tv-jot-desc" >
+Television 
+</p>
+
+<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+</div>
+
+
+
+<div id="film-jot-wrapper" >
+<p id="film-jot-desc" >
+Film/dance/culture/entertainment 
+</p>
+
+<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+</div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" >
+<p id="romance-jot-desc" >
+Love/romance 
+</p>
+
+<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+</div>
+
+
+
+<div id="work-jot-wrapper" >
+<p id="work-jot-desc" >
+Work/employment 
+</p>
+
+<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+</div>
+
+
+
+<div id="education-jot-wrapper" >
+<p id="education-jot-desc" >
+School/education 
+</p>
+
+<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+</div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
\ No newline at end of file
diff --git a/view/sv/profile_entry_default.tpl b/view/sv/profile_entry_default.tpl
new file mode 100644
index 000000000..651199918
--- /dev/null
+++ b/view/sv/profile_entry_default.tpl
@@ -0,0 +1,9 @@
+
+<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>
+</div>
+<div class="profile-listing-photo-end" ></div>
+<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
+</div>
+<div class="profile-listing-end"></div>
diff --git a/view/sv/profile_listing_header.tpl b/view/sv/profile_listing_header.tpl
new file mode 100644
index 000000000..d4b139a69
--- /dev/null
+++ b/view/sv/profile_listing_header.tpl
@@ -0,0 +1,8 @@
+<h1>Profiles</h1>
+<p id="profile-listing-desc" >
+<a href="profile_photo" >Change profile photo</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>
+</div>
+
diff --git a/view/sv/profile_photo.tpl b/view/sv/profile_photo.tpl
new file mode 100644
index 000000000..30e51210a
--- /dev/null
+++ b/view/sv/profile_photo.tpl
@@ -0,0 +1,18 @@
+<h1>Upload Profile Photo</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>
+<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">
+</div>
+
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+or <a href='photos/$user'>select a photo from albums</a>
+</div>
\ No newline at end of file
diff --git a/view/sv/profile_tabs.tpl b/view/sv/profile_tabs.tpl
new file mode 100644
index 000000000..9c6c54a1c
--- /dev/null
+++ b/view/sv/profile_tabs.tpl
@@ -0,0 +1,7 @@
+
+<div id="profile-tabs-wrapper" >
+	<a href="$url" id="profile-tab-status-link" class="profile-tabs" >Status</a>
+	<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profile</a>
+	<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Photos</a>
+<div id="profile-tabs-end"></div>
+</div>
\ No newline at end of file
diff --git a/view/sv/pwdreset.tpl b/view/sv/pwdreset.tpl
new file mode 100644
index 000000000..dd609f061
--- /dev/null
+++ b/view/sv/pwdreset.tpl
@@ -0,0 +1,16 @@
+<h3>Password Reset</h3>
+
+<p>
+Your password has been reset as requested.
+</p>
+<p>
+Your new password is
+</p>
+<p>
+$newpass
+</p>
+<p>
+Save or copy your new password - and then <a href="$baseurl" >click here to login</a>.
+</p>
+<p>
+Your password may be changed from the 'Settings' page after successful login.
\ No newline at end of file
diff --git a/view/sv/register_open_eml.tpl b/view/sv/register_open_eml.tpl
new file mode 100644
index 000000000..8a00f21e9
--- /dev/null
+++ b/view/sv/register_open_eml.tpl
@@ -0,0 +1,21 @@
+
+Dear $username,
+	Thank you for registering at $sitename. Your account has been created. 
+The login details are as follows:
+
+
+Site Location:	$siteurl
+Login Name:	$email
+Password:	$password
+
+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
+
+ 
diff --git a/view/sv/register_verify_eml.tpl b/view/sv/register_verify_eml.tpl
new file mode 100644
index 000000000..60c38d800
--- /dev/null
+++ b/view/sv/register_verify_eml.tpl
@@ -0,0 +1,26 @@
+
+A new user registration request was received at $sitename which requires 
+your approval. 
+
+
+The login details are as follows:
+
+Full Name:	$username
+Site Location:	$siteurl
+Login Name:	$email
+
+
+To approve this request please visit the following link:
+
+
+$siteurl/regmod/allow/$hash 
+
+
+To deny the request and remove the account, please visit:
+
+
+$siteurl/regmod/deny/$hash
+
+
+Thank you.
+
diff --git a/view/sv/registrations-top.tpl b/view/sv/registrations-top.tpl
new file mode 100644
index 000000000..d8faf3439
--- /dev/null
+++ b/view/sv/registrations-top.tpl
@@ -0,0 +1,3 @@
+<h1>User registrations waiting for confirm</h1>
+
+
diff --git a/view/sv/registrations.tpl b/view/sv/registrations.tpl
new file mode 100644
index 000000000..c8646043e
--- /dev/null
+++ b/view/sv/registrations.tpl
@@ -0,0 +1 @@
+<li>$fullname ($email) : <a href="$approvelink">Approve</a> - <a href="$denylink">Deny</a></li>
diff --git a/view/sv/request_notify_eml.tpl b/view/sv/request_notify_eml.tpl
new file mode 100644
index 000000000..9eef7a61e
--- /dev/null
+++ b/view/sv/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Dear $myname,
+
+You have just received a connection request at $sitename 
+
+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.
+
+$siteurl
+
+Regards,
+
+	$sitename administrator
\ No newline at end of file
diff --git a/view/sv/settings.tpl b/view/sv/settings.tpl
new file mode 100644
index 000000000..97d67cbf6
--- /dev/null
+++ b/view/sv/settings.tpl
@@ -0,0 +1,163 @@
+<h1>Account Settings</h1>
+
+<div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>
+
+$nickname_block
+
+
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
+
+
+<h3 class="settings-heading">Basic Settings</h3>
+
+<div id="settings-username-wrapper" >
+<label id="settings-username-label" for="settings-username" >Full Name: </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>
+<input type="text" name="email" id="settings-email" value="$email" />
+</div>
+<div id="settings-email-end" ></div>
+
+
+
+<div id="settings-timezone-wrapper" >
+<label id="settings-timezone-label" for="timezone_select" >Your Timezone: </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>
+<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>
+<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
+</div>
+<div id="settings-allowloc-end" ></div>
+
+
+
+
+<div id="settings-theme-select">
+<label id="settings-theme-label" for="theme-select" >Display Theme: </label>
+$theme
+</div>
+<div id="settings-theme-end"></div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="Submit" />
+</div>
+
+
+<h3 class="settings-heading">Security and Privacy Settings</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>
+<input id="settings-maxreq" name="maxreq" value="$maxreq" />
+<div id="settings-maxreq-desc">(to prevent spam abuse)</div>
+</div>
+<div id="settings-maxreq-end"></div>
+
+
+
+
+$profile_in_dir
+
+$profile_in_net_dir
+
+
+
+<div id="settings-default-perms" class="settings-default-perms" >
+	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
+	<div id="settings-default-perms-menu-end"></div>
+
+	<div id="settings-default-perms-select" style="display: none;" >
+	
+		$aclselect
+
+	</div>
+</div>
+<div id="settings-default-perms-end"></div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="Submit" />
+</div>
+
+
+
+<h3 class="settings-heading">Notification Settings</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>
+<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>
+<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>
+<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>
+<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>
+<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" />
+</div>
+
+
+<h3 class="settings-heading">Password Settings</h3>
+
+
+<div id="settings-password-wrapper" >
+<p id="settings-password-desc" >
+Leave password fields blank unless changing
+</p>
+<label id="settings-password-label" for="settings-password" >New Password: </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>
+<input type="password" id="settings-confirm" name="confirm" />
+</div>
+<div id="settings-confirm-end" ></div>
+
+<div id="settings-openid-wrapper" >
+	$oidhtml
+</div>
+<div id="settings-openid-end" ></div>
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="Submit" />
+</div>
+
+
+<h3 class="settings-heading">Advanced Page Settings</h3>
+
+$pagetype
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="Submit" />
+</div>
+
+
diff --git a/view/sv/settings_nick_set.tpl b/view/sv/settings_nick_set.tpl
new file mode 100644
index 000000000..a36b3b9a2
--- /dev/null
+++ b/view/sv/settings_nick_set.tpl
@@ -0,0 +1,9 @@
+
+<div id="settings-nick-wrapper" >
+<p id="settings-nickname-desc">
+<span class="error-message">Your profile address is <strong>'$nickname@$basepath'</strong></span>
+</p>
+$subdir
+
+</div>
+<div id="settings-nick-end" ></div>
diff --git a/view/sv/settings_nick_subdir.tpl b/view/sv/settings_nick_subdir.tpl
new file mode 100644
index 000000000..303c24df7
--- /dev/null
+++ b/view/sv/settings_nick_subdir.tpl
@@ -0,0 +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 />
+</p>
+<p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'.
+</p>
\ No newline at end of file
diff --git a/view/sv/settings_nick_unset.tpl b/view/sv/settings_nick_unset.tpl
new file mode 100644
index 000000000..903768b59
--- /dev/null
+++ b/view/sv/settings_nick_unset.tpl
@@ -0,0 +1,14 @@
+
+<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
+<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.
+</p>
+<label id="settings-nick-label" for="settings-nick" >URL Nickname: </label>
+<input type="text" name="nick" id="settings-nick" value="$nickname" />
+</div>
+<div id="settings-nick-end" ></div>
+
diff --git a/view/sv/strings.php b/view/sv/strings.php
index 2fe95bc96..d30a14b1f 100644
--- a/view/sv/strings.php
+++ b/view/sv/strings.php
@@ -60,7 +60,11 @@ $a->strings['December'] = 'december';
 $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]';
+<<<<<<< HEAD
 $a->strings['link to source'] = 'länk till källa';
+=======
+$a->strings['link to source'] = 'link to source';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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,12 +98,20 @@ $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.';
+<<<<<<< HEAD
 $a->strings['Contact has been '] = 'Kontakten ';
+=======
+$a->strings['Contact has been '] = 'Kontakt ';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $a->strings['blocked'] = 'spärrad';
 $a->strings['unblocked'] = 'inte längre spärrad';
 $a->strings['ignored'] = 'ignoreras';
 $a->strings['unignored'] = 'ignoreras inte längre';
+<<<<<<< HEAD
 $a->strings['stopped following'] = 'följer inte längre';
+=======
+$a->strings['stopped following'] = 'stopped following';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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';
@@ -142,20 +154,32 @@ $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.';
+<<<<<<< HEAD
 $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['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.';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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['Administrator'] = 'Administratör';
 $a->strings['noreply'] = 'noreply';
+<<<<<<< HEAD
 $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."] = "Den här förfrågan har redan accepterats.";
+=======
+$a->strings[' commented on an item at '] = ' skrev en kommentar på ';
+$a->strings[" commented on an item at "] = " skrev en kommentar på ";
+$a->strings[' welcomes '] = ' välkomnar ';
+$a->strings["This introduction has already been accepted."] = "This introduction has already been accepted.";
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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[' required parameter'] = ' obligatoriskt fält';
+<<<<<<< HEAD
 $a->strings[" was "] = " var ";
 $a->strings["s were "] = " var ";
 $a->strings["not found at the given location."] = "finns inte på platsen som angavs.";
@@ -164,18 +188,37 @@ $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.'] = ' 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[" was "] = " was ";
+$a->strings["s were "] = "s were ";
+$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['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.';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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.';
+<<<<<<< HEAD
 $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."] = "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'] = 'Vän- eller kontaktförfrågan';
+=======
+$a->strings['Disallowed profile URL.'] = 'Disallowed profile 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["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';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $a->strings['Please answer the following:'] = 'Besvara följande, tack:';
 $a->strings['Does $name know you?'] = 'Känner $name dig?';
 $a->strings['Yes'] = 'Ja';
@@ -272,16 +315,26 @@ $a->strings['Remote privacy information not available.'] = 'Remote privacy infor
 $a->strings['Visible to:'] = 'Synlig för:';
 $a->strings['Password reset requested at '] = 'Lösenordsåterställning begärd kl ';
 $a->strings["Welcome back "] = "Välkommen tillbaka ";
+<<<<<<< HEAD
 $a->strings['Manage Identities and/or Pages'] = 'Ändra identitet 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: '] = 'Välj vilken identitet du vill ändra: ';
+=======
+$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: ';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $a->strings['Normal View'] = 'Normal vy';
 $a->strings['New Item View'] = 'New Item View';
 $a->strings['Share'] = 'Dela';
 $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';
+<<<<<<< HEAD
 $a->strings['Permission settings'] = 'Åtkomstinställningar';
+=======
+$a->strings['Permission settings'] = 'Permission settings';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $a->strings['No such group'] = 'Gruppen finns inte';
 $a->strings['Group is empty'] = 'Gruppen är tom';
 $a->strings['Group: '] = 'Grupp: ';
@@ -291,10 +344,17 @@ $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';
+<<<<<<< HEAD
 $a->strings['Claims to be known to you: '] = 'Hävdar att du vet vem han/hon är: ';
 $a->strings['yes'] = 'ja';
 $a->strings['no'] = 'nej';
 $a->strings['Approve as: '] = 'Godkänn som: ';
+=======
+$a->strings['Claims to be known to you: '] = 'Claims to be known to you: ';
+$a->strings['yes'] = 'ja';
+$a->strings['no'] = 'nej';
+$a->strings['Approve as: '] = 'Approve as: ';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $a->strings['Friend'] = 'Vän';
 $a->strings['Fan/Admirer'] = 'Fan/Beundrare';
 $a->strings['Notification type: '] = 'Notification type: ';
@@ -311,7 +371,11 @@ $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';
+<<<<<<< HEAD
 $a->strings['was tagged in a'] = 'har taggats i';
+=======
+$a->strings['was tagged in a'] = 'was tagged in a';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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,7 +384,11 @@ $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: ';
+<<<<<<< HEAD
 $a->strings['Permissions'] = 'Åtkomst';
+=======
+$a->strings['Permissions'] = 'Permissions';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $a->strings['Edit Album'] = 'Redigera album';
 $a->strings['View Photo'] = 'Visa foto';
 $a->strings['Photo not available'] = 'Fotot är inte tillgängligt';
@@ -328,10 +396,17 @@ $a->strings['Edit photo'] = 'Redigera foto';
 $a->strings['View Full Size'] = 'Visa fullstor';
 $a->strings['Tags: '] = 'Taggar: ';
 $a->strings['[Remove any tag]'] = '[Remove any tag]';
+<<<<<<< HEAD
 $a->strings['New album name'] = 'Nytt album med namn';
 $a->strings['Caption'] = 'Caption';
 $a->strings['Add a Tag'] = 'Lägg till tagg';
 $a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Exempel: @adam, @Anna_Andersson, @johan@exempel.com, #Stockholm, #camping';
+=======
+$a->strings['New album name'] = 'New album name';
+$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';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $a->strings['Recent Photos'] = 'Nyligen tillagda foton';
 $a->strings['Upload New Photos'] = 'Ladda upp foton';
 $a->strings['View Album'] = 'Titta i album';
@@ -342,7 +417,11 @@ $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].';
+<<<<<<< HEAD
 $a->strings['Profile Name is required.'] = 'Profilen måste ha ett namn.';
+=======
+$a->strings['Profile Name is required.'] = 'Profile Name is required.';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $a->strings['Profile updated.'] = 'Profilen har uppdaterats.';
 $a->strings['Profile deleted.'] = 'Profilen har tagits bort.';
 $a->strings['Profile-'] = 'Profil-';
@@ -351,7 +430,11 @@ $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';
+<<<<<<< HEAD
 $a->strings['Invalid OpenID url'] = 'Ogiltig OpenID-URL';
+=======
+$a->strings['Invalid OpenID url'] = 'Ogiltig OpenID-url';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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.';
@@ -381,7 +464,11 @@ $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 ';
+<<<<<<< HEAD
 $a->strings['Account approved.'] = 'Kontot har godkänts.';
+=======
+$a->strings['Account approved.'] = 'Account approved.';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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:';
@@ -398,12 +485,21 @@ $a->strings['Plugin Settings'] = 'Plugin Settings';
 $a->strings['Account Settings'] = 'Kontoinställningar';
 $a->strings['No Plugin settings configured'] = 'No Plugin settings configured';
 $a->strings['OpenID: '] = 'OpenID: ';
+<<<<<<< HEAD
 $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'] = 'Ta bort tagg';
 $a->strings['Select a tag to remove: '] = 'Välj vilken tagg som ska tas bort: ';
+=======
+$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['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: ';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $a->strings['Remove'] = 'Ta bort';
 $a->strings['No contacts.'] = 'Inga kontakter.';
 $a->strings['Visible To:'] = 'Synlig för:';
@@ -502,7 +598,11 @@ $a->strings['Divorced'] = 'Skiljd';
 $a->strings['Widowed'] = 'Widowed';
 $a->strings['Uncertain'] = 'Uncertain';
 $a->strings['Complicated'] = 'Komplicerat';
+<<<<<<< HEAD
 $a->strings['Don\'t care'] = 'Bryr mig inte';
+=======
+$a->strings['Don\'t care'] = 'Don\'t care';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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.';
@@ -511,10 +611,17 @@ $a->strings['Install Facebook post connector'] = 'Install Facebook post connecto
 $a->strings['Remove Facebook post connector'] = 'Remove Facebook post connector';
 $a->strings['Facebook'] = 'Facebook';
 $a->strings['Facebook Connector Settings'] = 'Facebook Connector Settings';
+<<<<<<< HEAD
 $a->strings['Post to Facebook'] = 'Lägg in på Facebook';
 $a->strings['Image: '] = 'Bild: ';
 $a->strings['Select files to upload: '] = 'Välj filer att ladda upp: ';
 $a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Använd följande bara om javauppladdaren ovanför inte startar.';
+=======
+$a->strings['Post to Facebook'] = 'Post to 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.';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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,21 +632,32 @@ $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';
+<<<<<<< HEAD
 $a->strings['Post to StatusNet'] = 'Lägg in på StatusNet';
+=======
+$a->strings['Post to StatusNet'] = 'Post to StatusNet';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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.';
+<<<<<<< HEAD
 $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: '] = 'Ansluten till: ';
+=======
+$a->strings['Log in with StatusNet'] = 'Log in with 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: ';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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';
+<<<<<<< HEAD
 $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. ';
@@ -555,6 +673,23 @@ $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'] = 'Ange PIN-koden från Twitter här';
+=======
+$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['"Cat" game!'] = '"Cat" game!';
+$a->strings['I won!'] = 'I won!';
+$a->strings['Post to Twitter'] = 'Post to 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';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $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 +1180,11 @@ $a->strings['Israel'] = 'Israel';
 $a->strings['Jamaica'] = 'Jamaica';
 $a->strings['Japan'] = 'Japan';
 $a->strings['Kwajalein'] = 'Kwajalein';
+<<<<<<< HEAD
 $a->strings['Libya'] = 'Libyen';
+=======
+$a->strings['Libya'] = 'Libya';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $a->strings['MET'] = 'MET';
 $a->strings['Mexico/BajaNorte'] = 'Mexico/BajaNorte';
 $a->strings['Mexico/BajaSur'] = 'Mexico/BajaSur';
@@ -1095,7 +1234,11 @@ $a->strings['Pacific/Truk'] = 'Pacific/Truk';
 $a->strings['Pacific/Wake'] = 'Pacific/Wake';
 $a->strings['Pacific/Wallis'] = 'Pacific/Wallis';
 $a->strings['Pacific/Yap'] = 'Pacific/Yap';
+<<<<<<< HEAD
 $a->strings['Poland'] = 'Polen';
+=======
+$a->strings['Poland'] = 'Poland';
+>>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6
 $a->strings['Portugal'] = 'Portugal';
 $a->strings['PRC'] = 'PRC';
 $a->strings['PST8PDT'] = 'PST8PDT';
diff --git a/view/sv/wall_received_eml.tpl b/view/sv/wall_received_eml.tpl
new file mode 100644
index 000000000..c296de785
--- /dev/null
+++ b/view/sv/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Dear $username,
+
+	'$from' posted something to your profile wall.
+
+-----
+$body
+-----
+
+Please login at $siteurl to view or delete the item:
+
+$display
+
+Thank you,
+	$sitename administrator
+
+ 
+