Merge branch 'master' into master-sqlserver

Conflicts:
	lib/db.php
	lib/files/cache/cache.php
	lib/files/cache/legacy.php
	lib/setup.php

1 files changed, 13 insertions, 6 deletions

diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 2136e779015..0e1723a9373 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -24,7 +24,19 @@
 "Error" => "Fel",
 "Updated" => "Uppdaterad",
 "Saving..." => "Sparar...",
+"deleted" => "raderad",
+"undo" => "ångra",
+"Groups" => "Grupper",
+"Group Admin" => "Gruppadministratör",
+"Delete" => "Radera",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Säkerhetsvarning",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din datakatalog och dina filer är förmodligen tillgängliga från Internet. Den .htaccess-fil som ownCloud tillhandahåller fungerar inte. Vi rekommenderar starkt att du konfigurerar webbservern så att datakatalogen inte längre är tillgänglig eller att du flyttar datakatalogen utanför webbserverns dokument-root.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
+"Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
+"More" => "Mer",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Lägg till din applikation",
 "More Apps" => "Fler Appar",
 "Select an App" => "Välj en App",
@@ -56,18 +68,13 @@
 "Help translate" => "Hjälp att översätta",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Använd denna adress för att ansluta till ownCloud i din filhanterare",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Inloggningsnamn",
-"Groups" => "Grupper",
 "Create" => "Skapa",
 "Default Storage" => "Förvald lagring",
 "Unlimited" => "Obegränsad",
 "Other" => "Annat",
-"Group Admin" => "Gruppadministratör",
 "Storage" => "Lagring",
 "change display name" => "ändra visat namn",
 "set new password" => "ange nytt lösenord",
-"Default" => "Förvald",
-"Delete" => "Radera"
+"Default" => "Förvald"
 );