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, 7 insertions, 9 deletions

diff --git a/view/sv/install_db.tpl b/view/sv/install_db.tpl
index c413689c2..fb66ef29b 100644
--- a/view/sv/install_db.tpl
+++ b/view/sv/install_db.tpl
@@ -1,33 +1,32 @@
-
-<h3>Friendika Social Network</h3>
+<h3>Det sociala n&auml;tverket Friendika</h3>
 <h3>Installation</h3>
 
 <p>
-In order to install Friendika we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing. 
+F&ouml;r att kunna installera Friendika m&aring;ste du ange hur man ansluter till din databas. Kontakta ditt webbhotell eller webbplatsadministrat&ouml;r om du har fr&aring;gor om dessa inst&auml;llningar. Databasen du specar nedan m&aring;ste finnas. Skapa databasen innan du forts&auml;tter, om det inte redan &auml;r gjort. 
 </p>
 
 <form id="install-form" action="$baseurl/install" method="post">
 
 <input type="hidden" name="phpath" value="$phpath" />
 
-<label for="install-dbhost" id="install-dbhost-label">Database Server Name</label>
+<label for="install-dbhost" id="install-dbhost-label">Servernamn d&auml;r databasen finns</label>
 <input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
 <div id="install-dbhost-end"></div>
 
-<label for="install-dbuser" id="install-dbuser-label">Database Login Name</label>
+<label for="install-dbuser" id="install-dbuser-label">Inloggningsnamn f&ouml;r databasen</label>
 <input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
 <div id="install-dbuser-end"></div>
 
-<label for="install-dbpass" id="install-dbpass-label">Database Login Password</label>
+<label for="install-dbpass" id="install-dbpass-label">L&ouml;senord f&ouml;r databasen</label>
 <input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
 <div id="install-dbpass-end"></div>
 
-<label for="install-dbdata" id="install-dbdata-label">Database Name</label>
+<label for="install-dbdata" id="install-dbdata-label">Databasens namn</label>
 <input type="text" name="dbdata" id="install-dbdata"  value="$dbdata" />
 <div id="install-dbdata-end"></div>
 
 <div id="install-tz-desc">
-Please select a default timezone for your website
+Ange vilken tidszon som ska vara f&ouml;rvald p&aring; din webbplats
 </div>
 
 $tzselect
@@ -37,4 +36,3 @@ $tzselect
 
 </form>
 <div id="install-end" ></div>
-