From: Friendika <info@friendika.com>
Date: Mon, 4 Apr 2011 22:46:33 +0000 (-0700)
Subject: Merge branch 'erikl-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea;p=friendica.git

Merge branch 'erikl-master'

Conflicts:
	view/sv/settings.tpl
---

1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea
diff --cc view/sv/settings.tpl
index 5c776c3a35,bfcad64c85..2ab07af0c5
--- a/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>