Merge branch 'erikl-master'

Conflicts:
	view/sv/settings.tpl

diff --cc view/sv/profile_edit.tpl
Simple merge

diff --cc view/sv/settings.tpl
index 5c776c3a352803765192e373d098f30d10f78d73,bfcad64c850da176ae2b564d98b5fd4aa2c925ee..2ab07af0c5a5ce3a0a1b8f626a25bf3f99319a23
--- 1/view/sv/settings.tpl
--- 2/view/sv/settings.tpl
+++ b/view/sv/settings.tpl
@@@ -98,8 -98,8 +98,7 @@@ $profile_in_net_di
  <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>
  
  

diff --cc view/sv/strings.php
Simple merge