Merge branch 'master' into routing

Conflicts:
	apps/contacts/js/contacts.js
	apps/contacts/lib/search.php
	apps/files_archive/js/archive.js
	apps/gallery/lib/tiles.php
	apps/gallery/templates/index.php
	lib/ocs.php

1 files changed, 33 insertions, 29 deletions

diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 92631fa7607..325f61911a1 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 08:33+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,55 +39,55 @@ msgstr "Denna kategori finns redan:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Augusti"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "December"
 
@@ -135,7 +135,7 @@ msgstr "Begärd"
 msgid "Login failed!"
 msgstr "Misslyckad inloggning!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Användarnamn"
@@ -196,48 +196,52 @@ msgstr "Redigera kategorier"
 msgid "Add"
 msgstr "Lägg till"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skapa ett <strong>administratörskonto</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datamapp"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurera databasen"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "kommer att användas"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Databasanvändare"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Lösenord till databasen"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Databasnamn"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Databasserver"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Avsluta installation"