Merge branch 'master' into mimetype-defaults

Conflicts:
	apps/files/ajax/newfile.php

8 files changed, 120 insertions, 127 deletions

diff --git a/l10n/da/core.po b/l10n/da/core.po
index d69592d284c..2966aa98494 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Sappe, 2013
+# claus_chr <claus_chr@webspeed.dk>, 2013
 # Ole Holm Frandsen <froksen@gmail.com>, 2013
 # 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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -140,59 +141,59 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:293
+#: js/js.js:355
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:753
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minut siden"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutter siden"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 time siden"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} timer siden"
-
-#: js/js.js:758
+#: js/js.js:818
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:759
+#: js/js.js:819
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} dage siden"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:761
+#: js/js.js:821
 msgid "last month"
 msgstr "sidste måned"
 
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} måneder siden"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:763
+#: js/js.js:823
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:764
+#: js/js.js:824
 msgid "last year"
 msgstr "sidste år"
 
-#: js/js.js:765
+#: js/js.js:825
 msgid "years ago"
 msgstr "år siden"
 
@@ -380,9 +381,10 @@ msgstr "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Nulstil ownCloud kodeord"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -414,7 +416,7 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
@@ -477,7 +479,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
+msgstr "Hallo\n\ndette blot for at lade dig vide, at %s har delt %s med dig.\nSe det: %s\n\nHej"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -524,7 +526,7 @@ msgstr "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>."
 
 #: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
@@ -581,6 +583,10 @@ msgstr "%s er tilgængelig. Få mere information om, hvordan du opdaterer."
 msgid "Log out"
 msgstr "Log ud"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Flere programmer"
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk login afvist!"
@@ -616,7 +622,7 @@ msgstr "Alternative logins"
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Hallo,<br><br>dette blot for at lade dig vide, at %s har delt \"%s\" med dig.<br><a href=\"%s\">Se det!</a><br><br>Hej"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 2c33ac99d71..8a78acb722a 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:40+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -130,7 +130,7 @@ msgstr "Slet"
 msgid "Rename"
 msgstr "Omdøb"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Afventer"
 
@@ -162,11 +162,13 @@ msgstr "fortryd"
 msgid "perform delete operation"
 msgstr "udfør slet operation"
 
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 fil uploades"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "uploader filer"
 
@@ -214,21 +216,17 @@ msgstr "Størrelse"
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 mappe"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} mapper"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index f9c1880e0e0..105ba059f9e 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Sappe, 2013
+# claus_chr <claus_chr@webspeed.dk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-14 19:40+0000\n"
+"Last-Translator: claus_chr <claus_chr@webspeed.dk>\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"
@@ -68,14 +69,14 @@ msgstr "Manglende betingelser."
 
 #: hooks/hooks.php:45
 msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Sikker dig venligst at PHP 5.3.3 eller nyere er installeret og at OpenSSL PHP udvidelsen er aktiveret og konfigureret korrekt. Indtil videre er krypterings app'en deaktiveret. "
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret."
 
 #: hooks/hooks.php:263
 msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Følgende brugere er ikke sat op til kryptering:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 6e390fdcb36..6ce42eb608a 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 1306af5b495..a629083f8ba 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-01 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 10:51+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -52,21 +52,17 @@ msgstr "Navn"
 msgid "Deleted"
 msgstr "Slettet"
 
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 mappe"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} mapper"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 2f0661d9448..1d132880f9d 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -36,14 +36,10 @@ msgid "Users"
 msgstr "Brugere"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: app.php:844
+#: app.php:836
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Upgradering af \"%s\" fejlede"
@@ -212,50 +208,46 @@ msgid "seconds ago"
 msgstr "sekunder siden"
 
 #: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minut siden"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minutter siden"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 time siden"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d timer siden"
-
-#: template/functions.php:85
 msgid "today"
 msgstr "i dag"
 
-#: template/functions.php:86
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "i går"
 
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d dage siden"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template/functions.php:88
+#: template/functions.php:86
 msgid "last month"
 msgstr "sidste måned"
 
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d måneder siden"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template/functions.php:90
+#: template/functions.php:88
 msgid "last year"
 msgstr "sidste år"
 
-#: template/functions.php:91
+#: template/functions.php:89
 msgid "years ago"
 msgstr "år siden"
 
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index c56fa461d3b..9bff35b5b3d 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index e9b0f6b6c09..480233b211a 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"