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

8 files changed, 219 insertions, 51 deletions

diff --git a/l10n/da/core.po b/l10n/da/core.po
index c2a6184506b..782c53cf39f 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\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: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,55 +38,55 @@ msgstr "Denne kategori eksisterer allerede: "
 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:185 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 "Indstillinger"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Marts"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "August"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "December"
 
@@ -134,7 +134,7 @@ msgstr "Forespugt"
 msgid "Login failed!"
 msgstr "Login fejlede!"
 
-#: 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 "Brugernavn"
@@ -195,48 +195,52 @@ msgstr "Rediger kategorier"
 msgid "Add"
 msgstr "Tilføj"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Opret en <strong>administratorkonto</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurer 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 "vil blive brugt"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Databasebruger"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Databasekodeord"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Navn på database"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Databasehost"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
diff --git a/l10n/da/files_odfviewer.po b/l10n/da/files_odfviewer.po
new file mode 100644
index 00000000000..755f4010e9d
--- /dev/null
+++ b/l10n/da/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/da/files_pdfviewer.po b/l10n/da/files_pdfviewer.po
new file mode 100644
index 00000000000..781bfdac2e4
--- /dev/null
+++ b/l10n/da/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 7ed986fd029..7af7f3cce6a 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/da/files_texteditor.po b/l10n/da/files_texteditor.po
new file mode 100644
index 00000000000..cb994d6b922
--- /dev/null
+++ b/l10n/da/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/da/impress.po b/l10n/da/impress.po
new file mode 100644
index 00000000000..80c9eb2ed80
--- /dev/null
+++ b/l10n/da/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 52548033030..132eb0965d9 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 14:35+0000\n"
-"Last-Translator: ressel <sr@ybnet.dk>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mere"
 
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 5103ecf98cc..1d87e554059 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 14:58+0000\n"
-"Last-Translator: ressel <sr@ybnet.dk>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Hjælp"