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, 29 insertions, 31 deletions

diff --git a/view/sv/settings.tpl b/view/sv/settings.tpl
index 2601f4851..a1fff52eb 100644
--- a/view/sv/settings.tpl
+++ b/view/sv/settings.tpl
@@ -1,6 +1,6 @@
-<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
 
@@ -10,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>
@@ -27,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>
@@ -48,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>
 
@@ -105,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>
@@ -163,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>
-
-