[tx-robot] updated from transifex

9 files changed, 663 insertions, 482 deletions

diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index 5dc93a2d23f..dc644554103 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,7 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s shared \"%s\" with you"
-
-#: ajax/share.php:169
+#: ajax/share.php:112
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Couldn't send mail to following users: %s "
@@ -73,135 +68,139 @@ msgstr "No temporary profile picture available, try again"
 msgid "No crop data provided"
 msgstr "No crop data provided"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Sunday"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Monday"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Thursday"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Friday"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Saturday"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "January"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "February"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "March"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "May"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "June"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "July"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "October"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "December"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Settings"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:992
 msgid "seconds ago"
 msgstr "seconds ago"
 
-#: js/js.js:870
+#: js/js.js:993
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minute ago"
 msgstr[1] "%n minutes ago"
 
-#: js/js.js:871
+#: js/js.js:994
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hour ago"
 msgstr[1] "%n hours ago"
 
-#: js/js.js:872
+#: js/js.js:995
 msgid "today"
 msgstr "today"
 
-#: js/js.js:873
+#: js/js.js:996
 msgid "yesterday"
 msgstr "yesterday"
 
-#: js/js.js:874
+#: js/js.js:997
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n day ago"
 msgstr[1] "%n days ago"
 
-#: js/js.js:875
+#: js/js.js:998
 msgid "last month"
 msgstr "last month"
 
-#: js/js.js:876
+#: js/js.js:999
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n month ago"
 msgstr[1] "%n months ago"
 
-#: js/js.js:877
+#: js/js.js:1000
 msgid "months ago"
 msgstr "months ago"
 
-#: js/js.js:878
+#: js/js.js:1001
 msgid "last year"
 msgstr "last year"
 
-#: js/js.js:879
+#: js/js.js:1002
 msgid "years ago"
 msgstr "years ago"
 
@@ -269,6 +268,26 @@ msgstr "({count} selected)"
 msgid "Error loading file exists template"
 msgstr "Error loading file exists template"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Shared"
@@ -277,12 +296,12 @@ msgstr "Shared"
 msgid "Share"
 msgstr "Share"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: js/share.js:723 templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:755
 msgid "Error while sharing"
 msgstr "Error whilst sharing"
 
@@ -294,123 +313,123 @@ msgstr "Error whilst unsharing"
 msgid "Error while changing permissions"
 msgstr "Error whilst changing permissions"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Shared with you and the group {group} by {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Shared with you by {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Share with user or group …"
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Share link"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Password protect"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Allow Public Upload"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Email link to person"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Set expiration date"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Expiration date"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Share via email:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "No people found"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "group"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Resharing is not allowed"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Shared in {item} with {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Unshare"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "notify by email"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "can edit"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "access control"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "create"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "update"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "delete"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "share"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Password protected"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Error unsetting expiration date"
 
-#: js/share.js:719
+#: js/share.js:723
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:734
+#: js/share.js:742
 msgid "Sending ..."
 msgstr "Sending ..."
 
-#: js/share.js:745
+#: js/share.js:753
 msgid "Email sent"
 msgstr "Email sent"
 
-#: js/share.js:769
+#: js/share.js:777
 msgid "Warning"
 msgstr "Warning"
 
@@ -457,11 +476,17 @@ msgstr "The update was unsuccessful. Please report this issue to the <a href=\"h
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "The update was successful. Redirecting you to ownCloud now."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s password reset"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Use the following link to reset your password: {link}"
@@ -481,8 +506,8 @@ msgstr "Request failed!<br>Did you make sure your email/username was correct?"
 msgid "You will receive a link to reset your password via Email."
 msgstr "You will receive a link to reset your password via email."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Username"
 
@@ -526,7 +551,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Users"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Apps"
 
@@ -636,49 +661,47 @@ msgstr "For information how to properly configure your server, please see the <a
 msgid "Create an <strong>admin account</strong>"
 msgstr "Create an <strong>admin account</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Data folder"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configure the database"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "will be used"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Database user"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Database password"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Database name"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Finish setup"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Finishing …"
 
@@ -694,7 +717,7 @@ msgstr "This application requires JavaScript to be enabled for correct operation
 msgid "%s is available. Get more information on how to update."
 msgstr "%s is available. Get more information on how to update."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Log out"
 
@@ -720,28 +743,28 @@ msgstr "Server side authentication failed!"
 msgid "Please contact your administrator."
 msgstr "Please contact your administrator."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Lost your password?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "remember"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Log in"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index 259e932c171..d6f784ee3e1 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-22 01:55-0500\n"
-"PO-Revision-Date: 2013-12-21 14:50+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,36 +28,48 @@ msgstr "Could not move %s - File with this name already exists"
 msgid "Could not move %s"
 msgstr "Could not move %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "File name cannot be empty."
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "The name %s is already used in the folder %s. Please choose a different name."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr "Not a valid source"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Server is not allowed to open URLs, please check the server configuration"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Error whilst downloading %s to %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr "Error when creating the file"
 
@@ -65,236 +77,231 @@ msgstr "Error when creating the file"
 msgid "Folder name cannot be empty."
 msgstr "Folder name cannot be empty."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Folder name must not contain \"/\". Please choose a different name."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr "Error when creating the folder"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Unable to set upload directory."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Invalid Token"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr "No file was uploaded. Unknown error"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr "There is no error, the file uploaded successfully"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "The uploaded file was only partially uploaded"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr "No file was uploaded"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr "Missing a temporary folder"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr "Failed to write to disk"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr "Not enough storage available"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Upload failed. Could not get file info."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload failed. Could not find uploaded file"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr "Upload failed. Could not get file info."
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr "Invalid directory."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Files"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Unable to upload {filename} as it is a directory or has 0 bytes"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr "Upload cancelled."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr "Could not get result from server."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "File upload is in progress. Leaving the page now will cancel the upload."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr "URL cannot be empty"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "In the home folder 'Shared' is a reserved file name"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} already exists"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr "Could not create file"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr "Could not create folder"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr "Error fetching URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Share"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Delete permanently"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Rename"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Pending"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Could not rename file"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "replaced {new_name} with {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "undo"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Error deleting file."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 msgstr[1] "%n folders"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
 msgstr[1] "%n files"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} and {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploading %n file"
 msgstr[1] "Uploading %n files"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' is an invalid file name."
-
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Your storage is full, files can not be updated or synced anymore!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Your storage is almost full ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Encryption App is enabled but your keys are not initialised, please log-out and log-in again"
 
-#: js/files.js:114
+#: js/files.js:138
 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 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Error moving file"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Size"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modified"
 
@@ -302,12 +309,12 @@ msgstr "Modified"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Invalid folder name. Usage of 'Shared' is reserved."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s could not be renamed"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Upload"
 
@@ -343,69 +350,69 @@ msgstr "Maximum input size for ZIP files"
 msgid "Save"
 msgstr "Save"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "New"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "New text file"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Text file"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "New folder"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "From link"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Deleted files"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancel upload"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "You don’t have permission to upload or create files here"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Nothing in here. Upload something!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Delete"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Upload too large"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "The files you are trying to upload exceed the maximum size for file uploads on this server."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Files are being scanned, please wait."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Current scanning"
 
diff --git a/l10n/en_GB/files_encryption.po b/l10n/en_GB/files_encryption.po
index a9281d92156..ad5a0a24dd4 100644
--- a/l10n/en_GB/files_encryption.po
+++ b/l10n/en_GB/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-11-29 19:30+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,18 +81,18 @@ msgid ""
 "administrator"
 msgstr "Unknown error. Please check your system settings or contact your administrator"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Missing requirements."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "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 "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."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Following users are not set up for encryption:"
 
@@ -100,9 +100,9 @@ msgstr "Following users are not set up for encryption:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Initial encryption started... This can take some time. Please wait."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/en_GB/files_external.po b/l10n/en_GB/files_external.po
index bbfe3b3d262..07fe6e5fbc1 100644
--- a/l10n/en_GB/files_external.po
+++ b/l10n/en_GB/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Access granted"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Error configuring Dropbox storage"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Grant access"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Please provide a valid Dropbox app key and secret."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Error configuring Google Drive storage"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 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>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it."
 
-#: lib/config.php:465
+#: lib/config.php:516
 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>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."
 
-#: lib/config.php:468
+#: lib/config.php:519
 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 "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Users"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Delete"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Enable User External Storage"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL root certificates"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Import Root Certificate"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index ba0d1d9fcc1..bdd010dd53a 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -8,9 +8,9 @@ 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:00+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "This share is password-protected"
@@ -54,32 +58,16 @@ msgstr "sharing is disabled"
 msgid "For more info, please ask the person who sent this link."
 msgstr "For more info, please ask the person who sent this link."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s shared the folder %s with you"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s shared the file %s with you"
-
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Download"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Upload"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Cancel upload"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "No preview available for"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Direct link"
diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po
index 6da8b00bfe9..89bfe4f41dd 100644
--- a/l10n/en_GB/files_trashbin.po
+++ b/l10n/en_GB/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Couldn't delete %s permanently"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Couldn't restore %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Error"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr "restored"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nothing in here. Your recycle bin is empty!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Name"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Restore"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Deleted"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Delete"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Deleted Files"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index 94418cfa7d9..66ade3fc99b 100644
--- a/l10n/en_GB/lib.po
+++ b/l10n/en_GB/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "App \"%s\" can't be installed because it is not compatible with this version of ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "No app name specified"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Help"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personal"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Settings"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Users"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Failed to upgrade \"%s\"."
@@ -62,15 +62,10 @@ msgstr "Unknown filetype"
 msgid "Invalid image"
 msgstr "Invalid image"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "cannot open \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP download is turned off."
@@ -93,74 +88,78 @@ msgid ""
 "administrator."
 msgstr "Please download the files separately in smaller chunks or kindly ask your administrator."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "No source specified when installing app"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "No href specified when installing app from http"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "No path specified when installing app from local file"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Archives of type %s are not supported"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Failed to open archive when installing app"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "App does not provide an info.xml file"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "App can't be installed because of unallowed code in the App"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "App can't be installed because it is not compatible with this version of ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps"
 
-#: private/installer.php:159
+#: private/installer.php:160
 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 "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "App directory already exists"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Can't create app folder. Please fix permissions. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Application is not enabled"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Authentication error"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token expired. Please reload page."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Files"
@@ -200,8 +199,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "You need to enter either an existing account or the administrator."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -228,21 +227,21 @@ msgstr "Offending command was: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -269,66 +268,72 @@ msgstr "Set an admin username."
 msgid "Set an admin password."
 msgstr "Set an admin password."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Please double check the <a href='%s'>installation guides</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Could not find category \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "seconds ago"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minute ago"
 msgstr[1] "%n minutes ago"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hour ago"
 msgstr[1] "%n hours ago"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "today"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "yesterday"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n day go"
 msgstr[1] "%n days ago"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "last month"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n month ago"
 msgstr[1] "%n months ago"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "last year"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "years ago"
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index d3903fba58b..47b887b598d 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-05 22:23-0500\n"
-"PO-Revision-Date: 2013-12-05 14:30+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:280
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+msgid "Encryption"
+msgstr "Encryption"
+
+#: admin/controller.php:120 templates/admin.php:317
+msgid "Authentification method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Unable to load list from App Store"
@@ -114,62 +156,90 @@ msgstr "Back-end doesn't support password change, but the user's encryption key
 msgid "Unable to change password"
 msgstr "Unable to change password"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "User Documentation"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Update to {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Disable"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Enable"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Please wait...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Error whilst disabling app"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Error whilst enabling app"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Updating...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Error whilst updating app"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Update"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Updated"
 
-#: js/personal.js:220
+#: js/personal.js:244
 msgid "Select a profile picture"
 msgstr "Select a profile picture"
 
-#: js/personal.js:266
+#: js/personal.js:274
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:275
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:276
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:277
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:301
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Decrypting files... Please wait, this can take some time."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Saving..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "deleted"
@@ -182,40 +252,40 @@ msgstr "undo"
 msgid "Unable to remove user"
 msgstr "Unable to remove user"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Groups"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Group Admin"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Delete"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "add group"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "A valid username must be provided"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Error creating user"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "A valid password must be provided"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Warning: Home directory for user \"{user}\" already exists"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -239,18 +309,42 @@ msgstr "Errors and fatal issues"
 msgid "Fatal issues only"
 msgstr "Fatal issues only"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:43 templates/admin.php:57
 msgid "Security Warning"
 msgstr "Security Warning"
 
-#: templates/admin.php:25
+#: templates/admin.php:46
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead."
 
-#: templates/admin.php:39
+#: templates/admin.php:60
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root."
 
-#: templates/admin.php:50
+#: templates/admin.php:71
 msgid "Setup Warning"
 msgstr "Setup Warning"
 
-#: templates/admin.php:53
+#: templates/admin.php:74
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken."
 
-#: templates/admin.php:54
+#: templates/admin.php:75
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Please double check the <a href=\"%s\">installation guides</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:86
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' missing"
 
-#: templates/admin.php:68
+#: templates/admin.php:89
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection."
 
-#: templates/admin.php:79
+#: templates/admin.php:100
 msgid "Your PHP version is outdated"
 msgstr "Your PHP version is outdated"
 
-#: templates/admin.php:82
+#: templates/admin.php:103
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly."
 
-#: templates/admin.php:93
+#: templates/admin.php:114
 msgid "Locale not working"
 msgstr "Locale not working"
 
-#: templates/admin.php:98
+#: templates/admin.php:119
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "System locale can not be set to a one which supports UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:123
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "This means that there might be problems with certain characters in file names."
 
-#: templates/admin.php:106
+#: templates/admin.php:127
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr "We strongly suggest installing the required packages on your system to support one of the following locales: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:139
 msgid "Internet connection not working"
 msgstr "Internet connection not working"
 
-#: templates/admin.php:121
+#: templates/admin.php:142
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -329,118 +423,162 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don't work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features."
 
-#: templates/admin.php:135
+#: templates/admin.php:156
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:163
 msgid "Execute one task with each page loaded"
 msgstr "Execute one task with each page loaded"
 
-#: templates/admin.php:150
+#: templates/admin.php:171
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php is registered at a webcron service to call cron.php every 15 minutes over http."
 
-#: templates/admin.php:158
+#: templates/admin.php:179
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Use system's cron service to call the cron.php file every 15 minutes."
 
-#: templates/admin.php:163
+#: templates/admin.php:184
 msgid "Sharing"
 msgstr "Sharing"
 
-#: templates/admin.php:169
+#: templates/admin.php:190
 msgid "Enable Share API"
 msgstr "Enable Share API"
 
-#: templates/admin.php:170
+#: templates/admin.php:191
 msgid "Allow apps to use the Share API"
 msgstr "Allow apps to use the Share API"
 
-#: templates/admin.php:177
+#: templates/admin.php:198
 msgid "Allow links"
 msgstr "Allow links"
 
-#: templates/admin.php:178
+#: templates/admin.php:199
 msgid "Allow users to share items to the public with links"
 msgstr "Allow users to share items to the public with links"
 
-#: templates/admin.php:186
+#: templates/admin.php:207
 msgid "Allow public uploads"
 msgstr "Allow public uploads"
 
-#: templates/admin.php:187
+#: templates/admin.php:208
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Allow users to enable others to upload into their publicly shared folders"
 
-#: templates/admin.php:195
+#: templates/admin.php:216
 msgid "Allow resharing"
 msgstr "Allow resharing"
 
-#: templates/admin.php:196
+#: templates/admin.php:217
 msgid "Allow users to share items shared with them again"
 msgstr "Allow users to share items shared with them again"
 
-#: templates/admin.php:203
+#: templates/admin.php:224
 msgid "Allow users to share with anyone"
 msgstr "Allow users to share with anyone"
 
-#: templates/admin.php:206
+#: templates/admin.php:227
 msgid "Allow users to only share with users in their groups"
 msgstr "Allow users to only share with users in their groups"
 
-#: templates/admin.php:213
+#: templates/admin.php:234
 msgid "Allow mail notification"
 msgstr "Allow mail notification"
 
-#: templates/admin.php:214
+#: templates/admin.php:235
 msgid "Allow user to send mail notification for shared files"
 msgstr "Allow user to send mail notification for shared files"
 
-#: templates/admin.php:221
+#: templates/admin.php:242
 msgid "Security"
 msgstr "Security"
 
-#: templates/admin.php:234
+#: templates/admin.php:255
 msgid "Enforce HTTPS"
 msgstr "Enforce HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:257
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forces the clients to connect to %s via an encrypted connection."
 
-#: templates/admin.php:242
+#: templates/admin.php:263
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
 
-#: templates/admin.php:254
+#: templates/admin.php:275
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:277
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:308
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:330
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:334
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:338
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:343
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:344
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:347
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:351
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:352
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:357
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:358
 msgid "Log level"
 msgstr "Log level"
 
-#: templates/admin.php:287
+#: templates/admin.php:390
 msgid "More"
 msgstr "More"
 
-#: templates/admin.php:288
+#: templates/admin.php:391
 msgid "Less"
 msgstr "Less"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:397 templates/personal.php:181
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:401 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,30 +588,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public Licence\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Add your App"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "More Apps"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Select an App"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "See application page at apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "User Documentation"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administrator Documentation"
@@ -507,7 +649,7 @@ msgstr "Show First Run Wizard again"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Password"
 
@@ -519,151 +661,149 @@ msgstr "Your password was changed"
 msgid "Unable to change your password"
 msgstr "Unable to change your password"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Current password"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "New password"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Change password"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Full Name"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Your email address"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Fill in an email address to enable password recovery"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profile picture"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Upload new"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Select new from Files"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Remove image"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Either png or jpg. Ideally square but you will be able to crop it."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Your avatar is provided by your original account."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Choose as profile image"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Language"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Help translate"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Encryption"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "The encryption app is no longer enabled, please decrypt all your files"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Log-in password"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Decrypt all Files"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Login Name"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Create"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Admin Recovery Password"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Enter the recovery password in order to recover the user's files during password change"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Default Storage"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Unlimited"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Other"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Username"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Storage"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "change full name"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "set new password"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Default"
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
index b41d0ae0216..ddb78a33b55 100644
--- a/l10n/en_GB/user_ldap.po
+++ b/l10n/en_GB/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,43 +87,43 @@ msgstr "Success"
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Configuration OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Configuration incorrect"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Configuration incomplete"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Select groups"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Select object classes"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Select attributes"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Connection test succeeded"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Connection test failed"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Do you really want to delete the current Server Configuration?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Confirm Deletion"
 
@@ -141,11 +141,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s user found"
 msgstr[1] "%s users found"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Invalid Host"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Could not find the desired feature"
 
@@ -163,8 +163,8 @@ msgstr "Help"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -199,8 +199,8 @@ msgid "groups found"
 msgstr "groups found"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "What attribute should be used as login name:"
+msgid "Users login with this attribute:"
+msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -267,8 +267,8 @@ msgstr "You can specify Base DN for users and groups in the Advanced tab"
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -410,41 +410,51 @@ msgstr "Group Search Attributes"
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Special Attributes"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Quota Field"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Quota Default"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "in bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Email Field"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "User Home Folder Naming Rule"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Internal Username"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 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 "
@@ -460,15 +470,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "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. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. 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."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Internal Username Attribute:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Override UUID detection"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -479,19 +489,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "By default, the UUID attribute is automatically detected. The UUID attribute is used to unambiguously 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."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "UUID Attribute for Users:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "UUID Attribute for Groups:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Username-LDAP User Mapping"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -505,10 +515,10 @@ msgid ""
 "experimental stage."
 msgstr "Usernames are used to store and assign (meta) data. In order to precisely identify and recognise users, each LDAP user will have a internal username. This requires a mapping from 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. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Clear Username-LDAP User Mapping"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Clear Groupname-LDAP Group Mapping"