Merge branch 'erikl-master'

Conflicts:
	view/sv/insecure_net.tpl
	view/sv/jot-header.tpl
	view/sv/msg-header.tpl
	view/sv/profile_edit.tpl
	view/sv/profile_tabs.tpl
	view/sv/strings.php

1 files changed, 5 insertions, 5 deletions

diff --git a/view/sv/pwdreset.tpl b/view/sv/pwdreset.tpl
index dd609f061..2c2d9e7e6 100644
--- 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.
\ No newline at end of file
+L&ouml;senordet kan &auml;ndras p&aring; sidan Inst&auml;llningar efter att du loggat in.
\ No newline at end of file