Merge branch 'erikl-master'

Conflicts:
	view/sv/settings.tpl

1 files changed, 4 insertions, 5 deletions

diff --git a/view/sv/settings.tpl b/view/sv/settings.tpl
index 5c776c3a3..2ab07af0c 100644
--- a/view/sv/settings.tpl
+++ b/view/sv/settings.tpl
@@ -33,7 +33,7 @@ $zoneselect
 <div id="settings-timezone-end" ></div>
 
 <div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >F&ouml;rvald plats: </label>
+<label id="settings-defloc-label" for="settings-defloc" >Standardplats: </label>
 <input type="text" name="defloc" id="settings-defloc" value="$defloc" />
 </div>
 <div id="settings-defloc-end" ></div>
@@ -48,7 +48,7 @@ $zoneselect
 
 
 <div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Tema f&ouml;r layout: </label>
+<label id="settings-theme-label" for="theme-select" >Utseende (tema): </label>
 $theme
 </div>
 <div id="settings-theme-end"></div>
@@ -92,14 +92,13 @@ $profile_in_net_dir
 <div id="settings-default-perms-end"></div>
 
 <div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
+<label id="settings-blockw-label" for="settings-blockw" >L&aring;t kontakter g&ouml;ra inl&auml;gg p&aring; din profilsida: </label>
 <input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
 </div>
 <div id="settings-blockw-end" ></div>
 
 
-
-<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
+<div id="settings-expire-desc">Ta automatiskt bort inl&auml;gg som &auml;r &auml;ldre &auml;n <input type="text" size="3" name="expire" value="$expire" /> dagar</div>
 <div id="settings-expire-end"></div>