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, 4 insertions, 5 deletions

diff --git a/view/sv/lostpass.tpl b/view/sv/lostpass.tpl
index a7040c149..9294fb261 100644
--- 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>
-