12 files changed, 85 insertions, 71 deletions
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 5c36d44feb1..576591b9f80 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-11 01:54-0400\n"
+"POT-Creation-Date: 2014-04-16 01:55-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 ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 97d8aaf0ab0..85b4f6cff1a 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-11 01:54-0400\n"
+"POT-Creation-Date: 2014-04-16 01:55-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 09f5900a03a..4ce00890ea1 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-11 01:54-0400\n"
+"POT-Creation-Date: 2014-04-16 01:55-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 446829a7066..5df6d0e30e7 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-11 01:54-0400\n"
+"POT-Creation-Date: 2014-04-16 01:55-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"
@@ -41,29 +41,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:598
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:608
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:630
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:626
+#: lib/config.php:632
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of "
 "%s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:628
+#: lib/config.php:634
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please "
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 335843470ba..5b5e49eb1bf 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-11 01:54-0400\n"
+"POT-Creation-Date: 2014-04-16 01:55-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 9800a9ad3f7..6f6738bd79a 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-11 01:54-0400\n"
+"POT-Creation-Date: 2014-04-16 01:55-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_versions.pot b/l10n/templates/files_versions.pot
index eca1e25e0df..484ba898c09 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-11 01:54-0400\n"
+"POT-Creation-Date: 2014-04-16 01:55-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 df8dcaa8041..66aa4ece37d 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-11 01:54-0400\n"
+"POT-Creation-Date: 2014-04-16 01:55-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"
@@ -290,68 +290,68 @@ msgstr ""
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:134
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:135
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:135
+#: private/template/functions.php:136
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:137
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:137
+#: private/template/functions.php:138
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:140
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:142
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:143
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:144
+#: private/template/functions.php:145
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:145
+#: private/template/functions.php:146
 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 c7c39e54af5..bd9540914ad 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-11 01:54-0400\n"
+"POT-Creation-Date: 2014-04-16 01:55-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"
@@ -282,68 +282,68 @@ msgstr ""
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: template/functions.php:133
+#: template/functions.php:134
 msgid "seconds ago"
 msgstr ""
 
-#: template/functions.php:134
+#: template/functions.php:135
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:135
+#: template/functions.php:136
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:136
+#: template/functions.php:137
 msgid "today"
 msgstr ""
 
-#: template/functions.php:137
+#: template/functions.php:138
 msgid "yesterday"
 msgstr ""
 
-#: template/functions.php:139
+#: template/functions.php:140
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:141
+#: template/functions.php:142
 msgid "last month"
 msgstr ""
 
-#: template/functions.php:142
+#: template/functions.php:143
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:144
+#: template/functions.php:145
 msgid "last year"
 msgstr ""
 
-#: template/functions.php:145
+#: template/functions.php:146
 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 9095c16f9f7..4ac6477ef5f 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-11 01:54-0400\n"
+"POT-Creation-Date: 2014-04-16 01:55-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"
@@ -84,6 +84,20 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 9418a90de14..f1b4e61a2a7 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-11 01:54-0400\n"
+"POT-Creation-Date: 2014-04-16 01:55-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"
@@ -335,7 +335,7 @@ msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:26
-msgid "Case insensitve LDAP server (Windows)"
+msgid "Case insensitive LDAP server (Windows)"
 msgstr ""
 
 #: templates/settings.php:27
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index e858ef7740c..bf8580b5dc2 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-11 01:54-0400\n"
+"POT-Creation-Date: 2014-04-16 01:55-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"