Merge branch 'master' into hook-improvements

Conflicts:
	lib/files/view.php

11 files changed, 496 insertions, 391 deletions

diff --git a/l10n/da/core.po b/l10n/da/core.po
index daab9063b3d..e5a78600fcd 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,24 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Bawl <transifex@bawl.dk>, 2013.
-#   <cronner@gmail.com>, 2012.
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
-#   <mikkelbjerglarsen@gmail.com>, 2011, 2012.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2013.
-# Ole Holm Frandsen <froksen@gmail.com>, 2012.
-# Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
-# Rasmus Paasch <rasmuspaasch@gmail.com>, 2013.
-#   <simon@rosmi.dk>, 2012.
-# Thomas Tanghus <>, 2012.
-# Thomas Tanghus <thomas@tanghus.net>, 2012.
+# Peter Jespersen <flywheeldk@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: Bawl <transifex@bawl.dk>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 06:10+0000\n"
+"Last-Translator: Peter Jespersen <flywheeldk@gmail.com>\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"
@@ -171,75 +161,79 @@ msgstr "December"
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minut siden"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dage siden"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "sidste måned"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} måneder siden"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "sidste år"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "år siden"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Vælg"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
-msgstr "Fortryd"
+msgstr "Annuller"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nej"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nej"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -304,7 +298,7 @@ msgstr "Del med link"
 msgid "Password protect"
 msgstr "Beskyt med adgangskode"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Kodeord"
 
@@ -407,24 +401,27 @@ msgstr "Nulstil ownCloud kodeord"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Anvend følgende link til at nulstille din adgangskode: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Du vil modtage et link til at nulstille dit kodeord via email."
+#: lostpassword/templates/lostpassword.php:4
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr "Linket til at nulstille dit kodeord er blevet sendt til din e-post. <br> Hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam / junk mapper.<br> Hvis det ikke er der, så spørg din lokale administrator."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Reset-mail afsendt."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Anmodning mislykkedes!<br>Er du sikker på at din e-post / brugernavn var korrekt?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Anmodningen mislykkedes!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du vil modtage et link til at nulstille dit kodeord via email."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Brugernavn"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Anmod om nulstilling"
 
@@ -446,7 +443,7 @@ msgstr "Nulstil kodeord"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Personlig"
+msgstr "Personligt"
 
 #: strings.php:6
 msgid "Users"
@@ -530,37 +527,37 @@ msgstr "Avanceret"
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: templates/installation.php:79 templates/installation.php:91
+#: templates/installation.php:102 templates/installation.php:113
+#: templates/installation.php:125
 msgid "will be used"
 msgstr "vil blive brugt"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Databasebruger"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Databasekodeord"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Navn på database"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Database tabelplads"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Databasehost"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
@@ -568,37 +565,42 @@ msgstr "Afslut opsætning"
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr "%s er tilgængelig. Få mere information om, hvordan du opdaterer."
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Log ud"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk login afvist!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Skift adgangskode for at sikre din konto igen."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Mistet dit kodeord?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Log ind"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Alternative logins"
 
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 4e78dc104bc..80a65611032 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,22 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cronner@gmail.com>, 2012.
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2013.
-# Ole Holm Frandsen <froksen@gmail.com>, 2012.
-#   <osos@openeyes.dk>, 2012.
-# Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
-#   <simon@rosmi.dk>, 2012.
-# Thomas <cronner@gmail.com>, 2013.
-# Thomas Tanghus <>, 2012.
-# Thomas Tanghus <thomas@tanghus.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -37,17 +27,13 @@ msgstr "Kunne ikke flytte %s - der findes allerede en fil med dette navn"
 msgid "Could not move %s"
 msgstr "Kunne ikke flytte %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Kunne ikke omdøbe fil"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil blev uploadet. Ukendt fejl."
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Der er ingen fejl, filen blev uploadet med success"
+msgstr "Der skete ingen fejl, filen blev succesfuldt uploadet"
 
 #: ajax/upload.php:27
 msgid ""
@@ -58,19 +44,19 @@ msgstr "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini"
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen"
+msgstr "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Den uploadede file blev kun delvist uploadet"
+msgstr "Filen blev kun delvist uploadet."
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Ingen fil blev uploadet"
+msgstr "Ingen fil uploadet"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Mangler en midlertidig mappe"
+msgstr "Manglende midlertidig mappe."
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -88,57 +74,61 @@ msgstr "Ugyldig mappe."
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Del"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Slet"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Omdøb"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "erstat"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "fortryd"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstattede {new_name} med {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "udfør slet operation"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 fil uploades"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "uploader filer"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -162,69 +152,77 @@ msgstr "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkron
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kunne ikke uploade din fil, da det enten er en mappe eller er tom"
+msgstr "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
-msgstr ""
+msgstr "ikke nok tilgængelig ledig plads "
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URLen kan ikke være tom."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Fejl"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} filer"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Kunne ikke omdøbe fil"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Upload"
@@ -285,37 +283,37 @@ msgstr "Slettede filer"
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Du har ikke skriverettigheder her."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Upload for stor"
+msgstr "Upload er for stor"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlæst, vent venligst."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Indlæser"
 
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 416d8486d5c..49b772ef5d4 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013.
-#   <osos@openeyes.dk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:46+0000\n"
-"Last-Translator: Frederik Lassen <frederiklassen@gmail.com>\n"
+"POT-Creation-Date: 2013-05-30 02:27+0200\n"
+"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -20,22 +17,87 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Gemmer..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Fil kryptering aktiveret."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
 
 #: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "De følgende filtyper vil ikke blive krypteret:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ekskluder de følgende fil typer fra kryptering:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ingen"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index cc8e5b10257..4ca39b66c4f 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Bawl <transifex@bawl.dk>, 2013.
-#   <cronner@gmail.com>, 2012.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
-# Ole Holm Frandsen <froksen@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-31 00:01+0100\n"
-"PO-Revision-Date: 2013-03-30 18:00+0000\n"
-"Last-Translator: Bawl <transifex@bawl.dk>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,19 +37,26 @@ msgstr "Angiv venligst en valid Dropbox app nøgle og hemmelighed"
 msgid "Error configuring Google Drive storage"
 msgstr "Fejl ved konfiguration af Google Drive plads"
 
-#: lib/config.php:423
+#: lib/config.php:431
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b> Advarsel: </ b> \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. Spørg din systemadministrator om at installere det."
 
-#: lib/config.php:426
+#: lib/config.php:434
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b> Advarsel: </ b> FTP-understøttelse i PHP ikke er aktiveret eller installeret. Montering af FTP delinger er ikke muligt. Spørg din systemadministrator om at installere det."
 
+#: lib/config.php:437
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr "<b>Advarsel:</b> Understøttelsen for Curl i PHP er enten ikke aktiveret eller ikke installeret. Det er ikke muligt, at montere ownCloud / WebDAV eller GoogleDrive. Spørg din system administrator om at installere det. "
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Ekstern opbevaring"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 99b2cdf8e9c..124f03c1e50 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
-#   <osos@openeyes.dk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 08:48+0000\n"
-"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -27,24 +25,24 @@ msgstr "Kodeord"
 msgid "Submit"
 msgstr "Send"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delte mappen %s med dig"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delte filen %s med dig"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Forhåndsvisning ikke tilgængelig for"
 
-#: templates/public.php:37
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 5c96449c4be..2fbadf71c60 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Bawl <transifex@bawl.dk>, 2013.
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +27,11 @@ msgstr "Kunne ikke slette %s permanent"
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gendanne %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "udfør gendannelsesoperation"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Fejl"
 
@@ -41,31 +39,31 @@ msgstr "Fejl"
 msgid "delete file permanently"
 msgstr "slet fil permanent"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Navn"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Slettet"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} filer"
 
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 6b6ab2ac91f..23356455f8a 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
-#   <osos@openeyes.dk>, 2012.
-# Thomas <cronner@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-04 18:20+0000\n"
-"Last-Translator: cronner <cronner@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index ef2223373c7..c21fdcab004 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cronner@gmail.com>, 2012.
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012-2013.
-#   <osos@openeyes.dk>, 2012.
-# Thomas <cronner@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: cronner <cronner@gmail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:33+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -22,47 +17,47 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Hjælp"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
-msgstr "Personlig"
+msgstr "Personligt"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Brugere"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP-download er slået fra."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Filer skal downloades en for en."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Tilbage til Filer"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "De markerede filer er for store til at generere en ZIP-fil."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "kunne ikke fastslås"
 
@@ -98,10 +93,6 @@ msgstr "Angiv et admin brugernavn."
 msgid "Set an admin password."
 msgstr "Angiv et admin kodeord."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Specificer en data mappe."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -122,72 +113,76 @@ msgstr "%s du må ikke bruge punktummer i databasenavnet."
 msgid "%s set the database host."
 msgstr "%s sæt database værten."
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator."
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Databasefejl: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fejlende kommando var: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL brugeren '%s'@'localhost' eksisterer allerede."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Slet denne bruger fra MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL brugeren '%s'@'%%' eksisterer allerede."
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Slet denne bruger fra MySQL"
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s"
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt."
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
@@ -216,11 +211,11 @@ msgstr "%d timer siden"
 
 #: template.php:118
 msgid "today"
-msgstr "I dag"
+msgstr "i dag"
 
 #: template.php:119
 msgid "yesterday"
-msgstr "I går"
+msgstr "i går"
 
 #: template.php:120
 #, php-format
@@ -229,7 +224,7 @@ msgstr "%d dage siden"
 
 #: template.php:121
 msgid "last month"
-msgstr "Sidste måned"
+msgstr "sidste måned"
 
 #: template.php:122
 #, php-format
@@ -238,25 +233,12 @@ msgstr "%d måneder siden"
 
 #: template.php:123
 msgid "last year"
-msgstr "Sidste år"
+msgstr "sidste år"
 
 #: template.php:124
 msgid "years ago"
 msgstr "år siden"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s er tilgængelig. Få <a href=\"%s\">mere information</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "opdateret"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "Check for opdateringer er deaktiveret"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 282d822bded..7dcf4dca63e 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -3,24 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cronner@gmail.com>, 2012.
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
-#   <icewind1991@gmail.com>, 2012.
-#   <mikkelbjerglarsen@gmail.com>, 2011.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2013.
-# Ole Holm Frandsen <froksen@gmail.com>, 2012.
-# Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
-#   <simon@rosmi.dk>, 2012.
-#   <sr@ybnet.dk>, 2012-2013.
-# Thomas <cronner@gmail.com>, 2013.
-# Thomas Tanghus <>, 2012.
-# Thomas Tanghus <thomas@tanghus.net>, 2012.
+# Ole Holm Frandsen <froksen@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -33,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Kunne ikke indlæse listen fra App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Adgangsfejl"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Dit skærmnavn blev ændret."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Kunne ikke skifte skærmnavn"
 
@@ -128,52 +121,52 @@ msgstr "Der opstod en fejl under app opgraderingen"
 msgid "Updated"
 msgstr "Opdateret"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Gemmer..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "Slettet"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "fortryd"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Kan ikke fjerne bruger"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Gruppe Administrator"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Slet"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "Tilføj gruppe"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Et gyldigt brugernavn skal angives"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Fejl ved oprettelse af bruger"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "En gyldig adgangskode skal angives"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Dansk"
 
@@ -324,19 +317,19 @@ msgstr "Log"
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Mere"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -405,9 +398,9 @@ msgstr "Hent applikationerne for at synkronisere dine filer"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr "Vis Første Kørsel Guiden igen"
+msgstr "Vis Første Kørsels Guiden igen."
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Kodeord"
 
@@ -425,88 +418,80 @@ msgstr "Nuværende adgangskode"
 
 #: templates/personal.php:42
 msgid "New password"
-msgstr "Ny adgangskode"
+msgstr "Nyt kodeord"
 
 #: templates/personal.php:44
 msgid "Change password"
 msgstr "Skift kodeord"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Skærmnavn"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Dit skærmnavn blev ændret"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Kunne ikke skifte dit skærmnavn"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Skift skærmnavn"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Din emailadresse"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Sprog"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Hjælp med oversættelsen"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Loginnavn"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Ny"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Standard opbevaring"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Ubegrænset"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Andet"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Opbevaring"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "skift skærmnavn"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "skift kodeord"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 6ac95f9ce5c..f2c20cdc87e 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -3,17 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <blah@blacksunset.dk>, 2012.
-#   <cronner@gmail.com>, 2012.
-# Frederik Lassen <frederiklassen@gmail.com>, 2012.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
-#   <sr@ybnet.dk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +17,10 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -58,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succes"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fejl"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
 " experience unexpected behaviour. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "You can specify Base DN for users and groups in the Advanced tab"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Bruger DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "For anonym adgang, skal du lade DN og Adgangskode tomme."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Bruger Login Filter"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Brugerliste Filter"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definere filteret der bruges ved indlæsning af brugere."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppe Filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definere filteret der bruges når der indlæses grupper."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Brug TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Deaktiver SSL certifikat validering"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Anbefales ikke, brug kun for at teste."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "User Display Name Field"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Base Bruger Træ"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hjælp"
diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po
index 32a2a3729ab..9c0bc594ab8 100644
--- a/l10n/da/user_webdavauth.po
+++ b/l10n/da/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cronner@gmail.com>, 2012.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013.
+# cronner <cronner@gmail.com>, 2012
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-30 00:23+0100\n"
-"PO-Revision-Date: 2013-01-29 12:07+0000\n"
-"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -27,7 +27,7 @@ msgstr "WebDAV-godkendelse"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: templates/settings.php:7
 msgid ""
 "ownCloud will send the user credentials to this URL. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "