merge master into webdav-injection

12 files changed, 75 insertions, 75 deletions

diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 6209b8c0b7c..0b2245ab078 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-15 01:54-0400\n"
+"POT-Creation-Date: 2014-04-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -259,11 +259,11 @@ msgstr ""
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:457
+#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:465
+#: js/oc-dialogs.js:466
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -295,12 +295,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:787
+#: js/share.js:160 js/share.js:790
 msgid "Error while sharing"
 msgstr ""
 
@@ -364,71 +364,71 @@ msgstr ""
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:383
+#: js/share.js:324 js/share.js:385
 msgid "group"
 msgstr ""
 
-#: js/share.js:355
+#: js/share.js:357
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:399
+#: js/share.js:401
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:421
+#: js/share.js:423
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:429
+#: js/share.js:431
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:432
+#: js/share.js:434
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:436
 msgid "access control"
 msgstr ""
 
-#: js/share.js:437
+#: js/share.js:439
 msgid "create"
 msgstr ""
 
-#: js/share.js:440
+#: js/share.js:442
 msgid "update"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:445
 msgid "delete"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:448
 msgid "share"
 msgstr ""
 
-#: js/share.js:718
+#: js/share.js:721
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:731
+#: js/share.js:734
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:749
+#: js/share.js:752
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:774
+#: js/share.js:777
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:785
+#: js/share.js:788
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:809
+#: js/share.js:812
 msgid "Warning"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index b2d90dbfed8..5d016437f58 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-15 01:54-0400\n"
+"POT-Creation-Date: 2014-04-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,7 +43,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -127,15 +127,15 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:159
+#: ajax/upload.php:169
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:179
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:184
+#: ajax/upload.php:194
 msgid "Invalid directory."
 msgstr ""
 
@@ -143,53 +143,53 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:247
+#: js/file-upload.js:254
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:258
+#: js/file-upload.js:266
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:268
+#: js/file-upload.js:276
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:340
+#: js/file-upload.js:353
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:385
+#: js/file-upload.js:398
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:477
+#: js/file-upload.js:490
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:542
+#: js/file-upload.js:555
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:546
+#: js/file-upload.js:559
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:548 js/filelist.js:587
+#: js/file-upload.js:561 js/filelist.js:585
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:600
+#: js/file-upload.js:613
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:613
+#: js/file-upload.js:626
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:653
+#: js/file-upload.js:666
 msgid "Error fetching URL"
 msgstr ""
 
@@ -213,35 +213,35 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:251 js/filelist.js:1101
+#: js/filelist.js:251 js/filelist.js:1129
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:614
+#: js/filelist.js:612
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:777
+#: js/filelist.js:775
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:802 js/filelist.js:879 js/files.js:589
+#: js/filelist.js:800 js/filelist.js:876 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:803 js/filelist.js:880 js/files.js:595
+#: js/filelist.js:801 js/filelist.js:877 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:810
+#: js/filelist.js:808
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:1040 js/filelist.js:1078
+#: js/filelist.js:1037 js/filelist.js:1076
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 4d30ec7fba4..3ebc52afb2c 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-15 01:54-0400\n"
+"POT-Creation-Date: 2014-04-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index cf6575886b9..c05cc89332a 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-15 01:54-0400\n"
+"POT-Creation-Date: 2014-04-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 3ae790dd7bd..14a3151d37b 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-15 01:54-0400\n"
+"POT-Creation-Date: 2014-04-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 562a8d0895a..c4de45e2172 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-15 01:54-0400\n"
+"POT-Creation-Date: 2014-04-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgstr ""
 msgid "Deleted Files"
 msgstr ""
 
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index c3c17e6bd2e..9f25be229f3 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-15 01:54-0400\n"
+"POT-Creation-Date: 2014-04-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index c2d76743891..805e0b895cc 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-15 01:54-0400\n"
+"POT-Creation-Date: 2014-04-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,7 +49,7 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:875
+#: private/app.php:880
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -74,7 +74,7 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:262
+#: private/files.php:234 private/files.php:261
 msgid "Back to Files"
 msgstr ""
 
@@ -148,15 +148,15 @@ msgstr ""
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:40 private/json.php:63 private/json.php:88
+#: private/json.php:40 private/json.php:62 private/json.php:87
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:52
+#: private/json.php:51
 msgid "Token expired. Please reload page."
 msgstr ""
 
-#: private/json.php:75
+#: private/json.php:74
 msgid "Unknown user"
 msgstr ""
 
@@ -338,20 +338,20 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: private/user/manager.php:246
+#: private/user/manager.php:232
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
 msgstr ""
 
-#: private/user/manager.php:251
+#: private/user/manager.php:237
 msgid "A valid username must be provided"
 msgstr ""
 
-#: private/user/manager.php:255
+#: private/user/manager.php:241
 msgid "A valid password must be provided"
 msgstr ""
 
-#: private/user/manager.php:260
+#: private/user/manager.php:246
 msgid "The username is already being used"
 msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 3de22c3c51e..2cac8f8b917 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-15 01:54-0400\n"
+"POT-Creation-Date: 2014-04-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,7 +49,7 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: app.php:875
+#: app.php:880
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -74,7 +74,7 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:234 files.php:262
+#: files.php:234 files.php:261
 msgid "Back to Files"
 msgstr ""
 
@@ -148,15 +148,15 @@ msgstr ""
 msgid "Application is not enabled"
 msgstr ""
 
-#: json.php:40 json.php:63 json.php:88
+#: json.php:40 json.php:62 json.php:87
 msgid "Authentication error"
 msgstr ""
 
-#: json.php:52
+#: json.php:51
 msgid "Token expired. Please reload page."
 msgstr ""
 
-#: json.php:75
+#: json.php:74
 msgid "Unknown user"
 msgstr ""
 
@@ -330,20 +330,20 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: user/manager.php:246
+#: user/manager.php:232
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
 msgstr ""
 
-#: user/manager.php:251
+#: user/manager.php:237
 msgid "A valid username must be provided"
 msgstr ""
 
-#: user/manager.php:255
+#: user/manager.php:241
 msgid "A valid password must be provided"
 msgstr ""
 
-#: user/manager.php:260
+#: user/manager.php:246
 msgid "The username is already being used"
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 97d2877c648..56bf1970deb 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-15 01:54-0400\n"
+"POT-Creation-Date: 2014-04-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index c5e81809f4b..9bb697c59ce 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-15 01:54-0400\n"
+"POT-Creation-Date: 2014-04-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 584fd84a76a..ad4ebbcb2d8 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-15 01:54-0400\n"
+"POT-Creation-Date: 2014-04-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"