Merge branch 'master' into encryption_enable_public_upload

Conflicts:
	apps/files_encryption/lib/helper.php
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/keymanager.php

4 files changed, 171 insertions, 153 deletions

diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 09b9dbbeab2..e5df4a38829 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
+"POT-Creation-Date: 2013-11-26 10:45-0500\n"
+"PO-Revision-Date: 2013-11-26 15:45+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -277,12 +277,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:692
-#: js/share.js:704
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
+#: js/share.js:719
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:732
+#: js/share.js:160 js/share.js:747
 msgid "Error while sharing"
 msgstr ""
 
@@ -302,115 +302,115 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:213
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:218
+#: js/share.js:219
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:221
+#: js/share.js:222
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:223 templates/installation.php:57 templates/login.php:32
+#: js/share.js:224 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Passcode"
 
-#: js/share.js:228
+#: js/share.js:229
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:233
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Send"
 msgstr ""
 
-#: js/share.js:238
+#: js/share.js:239
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:274
+#: js/share.js:275
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:278
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:307 js/share.js:344
+#: js/share.js:322 js/share.js:359
 msgid "group"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:333
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:360
+#: js/share.js:375
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:382
+#: js/share.js:397
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:390
+#: js/share.js:405
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:393
+#: js/share.js:408
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:395
+#: js/share.js:410
 msgid "access control"
 msgstr ""
 
-#: js/share.js:398
+#: js/share.js:413
 msgid "create"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:416
 msgid "update"
 msgstr ""
 
-#: js/share.js:404
+#: js/share.js:419
 msgid "delete"
 msgstr ""
 
-#: js/share.js:407
+#: js/share.js:422
 msgid "share"
 msgstr ""
 
-#: js/share.js:449 js/share.js:679
+#: js/share.js:464 js/share.js:694
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:707
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:704
+#: js/share.js:719
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:734
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:730
+#: js/share.js:745
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:754
+#: js/share.js:769
 msgid "Warning"
 msgstr ""
 
@@ -442,6 +442,10 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
+#: js/update.js:8
+msgid "Please reload the page."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -580,14 +584,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:4 templates/mail.php:17
 #, php-format
-msgid ""
-"The share will expire on %s.\n"
-"\n"
+msgid "The share will expire on %s."
 msgstr ""
 
-#: templates/altmail.php:6 templates/mail.php:19
+#: templates/altmail.php:7 templates/mail.php:20
 msgid "Cheers!"
 msgstr ""
 
@@ -685,7 +687,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:71
+#: templates/layout.user.php:71 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -734,9 +736,22 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
-#: templates/mail.php:17
-#, php-format
-msgid "The share will expire on %s.<br><br>"
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
 msgstr ""
 
 #: templates/update.admin.php:3
@@ -752,13 +767,3 @@ msgstr ""
 #: templates/update.user.php:4
 msgid "Please reload this page after a short time to continue using ownCloud."
 msgstr ""
-
-#: templates/update.user.php:5
-msgid ""
-"Contact your system administrator if this message persists or appeared "
-"unexpectedly."
-msgstr ""
-
-#: templates/update.user.php:6
-msgid "Thank you for your patience."
-msgstr ""
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index 7dfbcbfeda0..94beead0358 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-03 12:38-0500\n"
-"PO-Revision-Date: 2013-11-03 17:38+0000\n"
+"POT-Creation-Date: 2013-11-21 10:01-0500\n"
+"PO-Revision-Date: 2013-11-21 15:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:27
+#: ajax/newfile.php:56 js/files.js:74
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:127
+#: ajax/newfile.php:128
 msgid "Error when creating the file"
 msgstr ""
 
@@ -114,15 +114,15 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:153
+#: ajax/upload.php:127 ajax/upload.php:154
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:143
+#: ajax/upload.php:144
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:170
+#: ajax/upload.php:172
 msgid "Invalid directory."
 msgstr ""
 
@@ -142,24 +142,24 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:345
+#: js/file-upload.js:344
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:437
+#: js/file-upload.js:436
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:520
+#: js/file-upload.js:519
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:524 js/filelist.js:364
+#: js/file-upload.js:523 js/filelist.js:377
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:526 js/filelist.js:366
+#: js/file-upload.js:525 js/filelist.js:379
 msgid "{new_name} already exists"
 msgstr ""
 
@@ -183,104 +183,108 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:854
+#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:873
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:392
+#: js/filelist.js:405
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:511
+#: js/filelist.js:524
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:511
+#: js/filelist.js:524
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:582 js/filelist.js:649 js/files.js:587
+#: js/filelist.js:576
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:594 js/filelist.js:668 js/files.js:631
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:583 js/filelist.js:650 js/files.js:593
+#: js/filelist.js:595 js/filelist.js:669 js/files.js:637
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:590
+#: js/filelist.js:602
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:793 js/filelist.js:831
+#: js/filelist.js:812 js/filelist.js:850
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:25
+#: js/files.js:72
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:34
+#: js/files.js:81
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:46
+#: js/files.js:93
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:50
+#: js/files.js:97
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:63
+#: js/files.js:110
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:67
+#: js/files.js:114
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:71
+#: js/files.js:118
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:302
+#: js/files.js:349
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:514 js/files.js:552
+#: js/files.js:558 js/files.js:596
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:514 js/files.js:552
+#: js/files.js:558 js/files.js:596
 msgid "Error"
 msgstr ""
 
-#: js/files.js:569 templates/index.php:56
+#: js/files.js:613 templates/index.php:56
 msgid "Name"
 msgstr ""
 
-#: js/files.js:570 templates/index.php:68
+#: js/files.js:614 templates/index.php:68
 msgid "Size"
 msgstr ""
 
-#: js/files.js:571 templates/index.php:70
+#: js/files.js:615 templates/index.php:70
 msgid "Modified"
 msgstr ""
 
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index e6812184889..d5acd01a2e2 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/lib.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-17 13:47-0400\n"
-"PO-Revision-Date: 2013-10-17 17:47+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2013-11-21 10:01-0500\n"
+"PO-Revision-Date: 2013-11-21 15:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -24,31 +24,31 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:254
+#: private/app.php:255
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:359
+#: private/app.php:360
 msgid "Help"
 msgstr ""
 
-#: private/app.php:372
+#: private/app.php:373
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:383
+#: private/app.php:384
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:395
+#: private/app.php:396
 msgid "Users"
 msgstr ""
 
-#: private/app.php:408
+#: private/app.php:409
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:872
+#: private/app.php:873
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -70,25 +70,25 @@ msgstr "web services under your control"
 msgid "cannot open \"%s\""
 msgstr ""
 
-#: private/files.php:226
+#: private/files.php:228
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:227
+#: private/files.php:229
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:228 private/files.php:256
+#: private/files.php:230 private/files.php:258
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:253
+#: private/files.php:255
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:254
+#: private/files.php:256
 msgid ""
-"Download the files in smaller chunks, seperately or kindly ask your "
+"Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
 msgstr ""
 
@@ -133,17 +133,17 @@ msgid ""
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:152
+#: private/installer.php:159
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:162
+#: private/installer.php:169
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:175
+#: private/installer.php:182
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
@@ -268,13 +268,13 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:184
+#: private/setup.php:195
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:185
+#: private/setup.php:196
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -284,54 +284,54 @@ msgstr ""
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:122
+#: private/template/functions.php:130
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:123
+#: private/template/functions.php:131
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:124
+#: private/template/functions.php:132
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:125
+#: private/template/functions.php:133
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:126
+#: private/template/functions.php:134
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:128
+#: private/template/functions.php:136
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:138
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:139
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:141
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:142
 msgid "years ago"
 msgstr ""
 
-#: private/template.php:297
+#: private/template.php:297 public/util.php:108
 msgid "Caused by:"
 msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index 9303a81886b..ae8b99a27fa 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
+"POT-Creation-Date: 2013-11-26 04:02-0500\n"
+"PO-Revision-Date: 2013-11-26 09:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:265
+#: js/personal.js:266
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -281,18 +281,27 @@ msgid "Locale not working"
 msgstr ""
 
 #: templates/admin.php:70
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:74
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:78
 #, php-format
 msgid ""
-"System locale can't be set to %s. This means that there might be problems "
-"with certain characters in file names. We strongly suggest to install the "
-"required packages on your system to support %s."
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:82
+#: templates/admin.php:90
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:85
+#: templates/admin.php:93
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -301,118 +310,118 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:99
+#: templates/admin.php:107
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:106
+#: templates/admin.php:114
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:122
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:122
+#: templates/admin.php:130
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:135
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:133
+#: templates/admin.php:141
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:142
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:141
+#: templates/admin.php:149
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:150
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:158
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:159
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:159
+#: templates/admin.php:167
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:167
+#: templates/admin.php:175
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:185
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:186
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:193
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:206
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:200
+#: templates/admin.php:208
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:214
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:218
+#: templates/admin.php:226
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:219
+#: templates/admin.php:227
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:251
+#: templates/admin.php:259
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:260
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:258 templates/personal.php:169
+#: templates/admin.php:266 templates/personal.php:169
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:262 templates/personal.php:172
+#: templates/admin.php:270 templates/personal.php:172
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -571,7 +580,7 @@ msgid "Encryption"
 msgstr ""
 
 #: templates/personal.php:148
-msgid "The encryption app is no longer enabled, decrypt all your file"
+msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
 #: templates/personal.php:154