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

diff --cc view/sv/profile_edit.tpl
index 6c7d74dafc4344bb18b72fda9109de5d4bc88186,818e0e2df1d9422de44bd314c824bb518396ff95..9b66f109e6ad1f699c15381b462abf7edeeea417
--- 1/view/sv/profile_edit.tpl
--- 2/view/sv/profile_edit.tpl
+++ b/view/sv/profile_edit.tpl
@@@ -134,21 -134,15 +134,20 @@@ $sexua
  </div>
  <div id="profile-edit-religion-end"></div>
  
 -<div id="profile-edit-keywords-wrapper" >
 -<label id="profile-edit-keywords-label" for="profile-edit-keywords" >Nyckelord: </label>
 -<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Exempel: fiske fotografering delfiner" value="$keywords" />
 -</div><div id="profile-edit-keywords-desc">(Anv&auml;nds vid profils&ouml;kning, visas inte f&ouml;r andra)</div>
 -<div id="profile-edit-keywords-end"></div>
 -
 +<div id="profile-edit-pubkeywords-wrapper" >
- <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
- <input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
++<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Nyckelord: </label>
++<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Exempel: fiske fotografering delifner" value="$pub_keywords" />
 +</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
 +<div id="profile-edit-pubkeywords-end"></div>
 +
 +<div id="profile-edit-prvkeywords-wrapper" >
- <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
- <input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
- </div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
++<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Nyckelord: </label>
++<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Exempel: fiske fotografering delfiner" value="$prv_keywords" />
++</div><div id="profile-edit-prvkeywords-desc">(Anv&auml;nds vid profils&ouml;kning, visas inte f&ouml;r andra)</div>
 +<div id="profile-edit-prvkeywords-end"></div>
  
- 
  <div class="profile-edit-submit-wrapper" >
- <input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+ <input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
  </div>
  <div class="profile-edit-submit-end"></div>
  

diff --cc view/sv/settings.tpl
index 2601f485136b04a6b429d8f27533f8832e8e17a8,9ffe14b910e8f51a2cb2a612e6af567eef32c904..a1fff52eb40107849263a2a078a69e6b3ae2cc26
--- 1/view/sv/settings.tpl
--- 2/view/sv/settings.tpl
+++ b/view/sv/settings.tpl
@@@ -1,9 -1,7 +1,9 @@@
- <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
 +
  $nickname_block
  
  
@@@ -91,21 -89,8 +91,21 @@@ $profile_in_net_di
  </div>
  <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: </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-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>
  
  

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