[tx-robot] updated from transifex

6 files changed, 438 insertions, 282 deletions

diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index fd3396cce3a..462186b5465 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 13:00+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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,10 +28,6 @@ msgstr "%s shared \"%s\" with you"
 msgid "Couldn't send mail to following users: %s "
 msgstr "Couldn't send mail to following users: %s "
 
-#: ajax/share.php:327
-msgid "group"
-msgstr "group"
-
 #: ajax/update.php:11
 msgid "Turned on maintenance mode"
 msgstr "Turned on maintenance mode"
@@ -273,144 +269,148 @@ msgstr "({count} selected)"
 msgid "Error loading file exists template"
 msgstr "Error loading file exists template"
 
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Shared"
 
-#: js/share.js:90
+#: js/share.js:109
 msgid "Share"
 msgstr "Share"
 
-#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
-#: js/share.js:679
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
+#: js/share.js:688
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:132 js/share.js:707
+#: js/share.js:151 js/share.js:716
 msgid "Error while sharing"
 msgstr "Error whilst sharing"
 
-#: js/share.js:143
+#: js/share.js:162
 msgid "Error while unsharing"
 msgstr "Error whilst unsharing"
 
-#: js/share.js:150
+#: js/share.js:169
 msgid "Error while changing permissions"
 msgstr "Error whilst changing permissions"
 
-#: js/share.js:159
+#: js/share.js:178
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Shared with you and the group {group} by {owner}"
 
-#: js/share.js:161
+#: js/share.js:180
 msgid "Shared with you by {owner}"
 msgstr "Shared with you by {owner}"
 
-#: js/share.js:184
-msgid "Share with"
-msgstr "Share with"
+#: js/share.js:203
+msgid "Share with user or group …"
+msgstr ""
 
-#: js/share.js:189
-msgid "Share with link"
-msgstr "Share with link"
+#: js/share.js:209
+msgid "Share link"
+msgstr ""
 
-#: js/share.js:192
+#: js/share.js:212
 msgid "Password protect"
 msgstr "Password protect"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+#: js/share.js:214 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:199
+#: js/share.js:219
 msgid "Allow Public Upload"
 msgstr "Allow Public Upload"
 
-#: js/share.js:203
+#: js/share.js:223
 msgid "Email link to person"
 msgstr "Email link to person"
 
-#: js/share.js:204
+#: js/share.js:224
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:209
+#: js/share.js:229
 msgid "Set expiration date"
 msgstr "Set expiration date"
 
-#: js/share.js:210
+#: js/share.js:230
 msgid "Expiration date"
 msgstr "Expiration date"
 
-#: js/share.js:243
+#: js/share.js:263
 msgid "Share via email:"
 msgstr "Share via email:"
 
-#: js/share.js:246
+#: js/share.js:266
 msgid "No people found"
 msgstr "No people found"
 
-#: js/share.js:284
+#: js/share.js:295 js/share.js:332
+msgid "group"
+msgstr "group"
+
+#: js/share.js:306
 msgid "Resharing is not allowed"
 msgstr "Resharing is not allowed"
 
-#: js/share.js:320
+#: js/share.js:348
 msgid "Shared in {item} with {user}"
 msgstr "Shared in {item} with {user}"
 
-#: js/share.js:341
+#: js/share.js:370
 msgid "Unshare"
 msgstr "Unshare"
 
-#: js/share.js:353
-msgid "notify user by email"
-msgstr "notify user by email"
+#: js/share.js:378
+msgid "notify by email"
+msgstr ""
 
-#: js/share.js:361
+#: js/share.js:381
 msgid "can edit"
 msgstr "can edit"
 
-#: js/share.js:363
+#: js/share.js:383
 msgid "access control"
 msgstr "access control"
 
-#: js/share.js:366
+#: js/share.js:386
 msgid "create"
 msgstr "create"
 
-#: js/share.js:369
+#: js/share.js:389
 msgid "update"
 msgstr "update"
 
-#: js/share.js:372
+#: js/share.js:392
 msgid "delete"
 msgstr "delete"
 
-#: js/share.js:375
+#: js/share.js:395
 msgid "share"
 msgstr "share"
 
-#: js/share.js:409 js/share.js:654
+#: js/share.js:437 js/share.js:663
 msgid "Password protected"
 msgstr "Password protected"
 
-#: js/share.js:667
+#: js/share.js:676
 msgid "Error unsetting expiration date"
 msgstr "Error unsetting expiration date"
 
-#: js/share.js:679
+#: js/share.js:688
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:694
+#: js/share.js:703
 msgid "Sending ..."
 msgstr "Sending ..."
 
-#: js/share.js:705
+#: js/share.js:714
 msgid "Email sent"
 msgstr "Email sent"
 
-#: js/share.js:729
+#: js/share.js:738
 msgid "Warning"
 msgstr "Warning"
 
@@ -522,7 +522,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Users"
 
-#: strings.php:7 templates/layout.user.php:109
+#: strings.php:7 templates/layout.user.php:110
 msgid "Apps"
 msgstr "Apps"
 
@@ -680,12 +680,12 @@ msgstr "Finish setup"
 msgid "Finishing …"
 msgstr "Finishing …"
 
-#: templates/layout.user.php:42
+#: templates/layout.user.php:43
 #, php-format
 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:70
+#: templates/layout.user.php:71
 msgid "Log out"
 msgstr "Log out"
 
@@ -739,7 +739,26 @@ msgstr "Hey there,<br><br>just letting you know that %s shared »%s« with you.<
 msgid "The share will expire on %s.<br><br>"
 msgstr "The share will expire on %s.<br><br>"
 
-#: templates/update.php:3
+#: templates/update.admin.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "Updating ownCloud to version %s, this may take a while."
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+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_GB/files.po b/l10n/en_GB/files.po
index 1913edbad9c..671693997c2 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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,62 +28,102 @@ msgstr "Could not move %s - File with this name already exists"
 msgid "Could not move %s"
 msgstr "Could not move %s"
 
-#: ajax/upload.php:16 ajax/upload.php:45
+#: ajax/newfile.php:56
+msgid "File name cannot not be empty."
+msgstr ""
+
+#: ajax/newfile.php:62
+msgid "File name must not contain \"/\". Please choose a different name."
+msgstr ""
+
+#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:81
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:94
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:127
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:21
+msgid "Folder name cannot not be empty."
+msgstr ""
+
+#: ajax/newfolder.php:27
+msgid "Folder name must not contain \"/\". Please choose a different name."
+msgstr ""
+
+#: ajax/newfolder.php:56
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:18 ajax/upload.php:50
 msgid "Unable to set upload directory."
 msgstr "Unable to set upload directory."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:27
 msgid "Invalid Token"
 msgstr "Invalid Token"
 
-#: ajax/upload.php:59
+#: ajax/upload.php:64
 msgid "No file was uploaded. Unknown error"
 msgstr "No file was uploaded. Unknown error"
 
-#: ajax/upload.php:66
+#: ajax/upload.php:71
 msgid "There is no error, the file uploaded with success"
 msgstr "There is no error, the file uploaded successfully"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:72
 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:69
+#: ajax/upload.php:74
 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:70
+#: ajax/upload.php:75
 msgid "The uploaded file was only partially uploaded"
 msgstr "The uploaded file was only partially uploaded"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:76
 msgid "No file was uploaded"
 msgstr "No file was uploaded"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:77
 msgid "Missing a temporary folder"
 msgstr "Missing a temporary folder"
 
-#: ajax/upload.php:73
+#: ajax/upload.php:78
 msgid "Failed to write to disk"
 msgstr "Failed to write to disk"
 
-#: ajax/upload.php:91
+#: ajax/upload.php:96
 msgid "Not enough storage available"
 msgstr "Not enough storage available"
 
-#: ajax/upload.php:122 ajax/upload.php:148
+#: ajax/upload.php:127 ajax/upload.php:153
 msgid "Upload failed. Could not get file info."
 msgstr "Upload failed. Could not get file info."
 
-#: ajax/upload.php:138
+#: ajax/upload.php:143
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload failed. Could not find uploaded file"
 
-#: ajax/upload.php:165
+#: ajax/upload.php:170
 msgid "Invalid directory."
 msgstr "Invalid directory."
 
@@ -91,96 +131,92 @@ msgstr "Invalid directory."
 msgid "Files"
 msgstr "Files"
 
-#: js/file-upload.js:224
+#: js/file-upload.js:228
 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:235
+#: js/file-upload.js:239
 msgid "Not enough space available"
 msgstr "Not enough space available"
 
-#: js/file-upload.js:302
+#: js/file-upload.js:306
 msgid "Upload cancelled."
 msgstr "Upload cancelled."
 
-#: js/file-upload.js:336
+#: js/file-upload.js:340
 msgid "Could not get result from server."
 msgstr "Could not get result from server."
 
-#: js/file-upload.js:426
+#: js/file-upload.js:432
 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:500
-msgid "URL cannot be empty."
-msgstr "URL cannot be empty."
+#: js/file-upload.js:511
+msgid "URL cannot be empty"
+msgstr ""
 
-#: js/file-upload.js:505 lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+#: js/file-upload.js:515 js/filelist.js:361
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
 
-#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
-msgid "Error"
-msgstr "Error"
+#: js/file-upload.js:517 js/filelist.js:363
+msgid "{new_name} already exists"
+msgstr "{new_name} already exists"
+
+#: js/file-upload.js:576
+msgid "Could not create file"
+msgstr ""
 
-#: js/fileactions.js:119
+#: js/file-upload.js:592
+msgid "Could not create folder"
+msgstr ""
+
+#: js/fileactions.js:125
 msgid "Share"
 msgstr "Share"
 
-#: js/fileactions.js:131
+#: js/fileactions.js:137
 msgid "Delete permanently"
 msgstr "Delete permanently"
 
-#: js/fileactions.js:184
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Rename"
 
-#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:789
+#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:850
 msgid "Pending"
 msgstr "Pending"
 
-#: js/filelist.js:416 js/filelist.js:418
-msgid "{new_name} already exists"
-msgstr "{new_name} already exists"
-
-#: js/filelist.js:416 js/filelist.js:418
-msgid "replace"
-msgstr "replace"
-
-#: js/filelist.js:416
-msgid "suggest name"
-msgstr "suggest name"
-
-#: js/filelist.js:416 js/filelist.js:418
-msgid "cancel"
-msgstr "cancel"
+#: js/filelist.js:389
+msgid "Could not rename file"
+msgstr ""
 
-#: js/filelist.js:463
+#: js/filelist.js:508
 msgid "replaced {new_name} with {old_name}"
 msgstr "replaced {new_name} with {old_name}"
 
-#: js/filelist.js:463
+#: js/filelist.js:508
 msgid "undo"
 msgstr "undo"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
+#: js/filelist.js:579 js/filelist.js:645 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 msgstr[1] "%n folders"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
+#: js/filelist.js:580 js/filelist.js:646 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
 msgstr[1] "%n files"
 
-#: js/filelist.js:541
+#: js/filelist.js:587
 msgid "{dirs} and {files}"
 msgstr "{dirs} and {files}"
 
-#: js/filelist.js:732 js/filelist.js:770
+#: js/filelist.js:789 js/filelist.js:827
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploading %n file"
@@ -190,53 +226,57 @@ msgstr[1] "Uploading %n files"
 msgid "'.' is an invalid file name."
 msgstr "'.' is an invalid file name."
 
-#: js/files.js:29
+#: js/files.js:27
 msgid "File name cannot be empty."
 msgstr "File name cannot be empty."
 
-#: js/files.js:37
+#: js/files.js:34
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
 
-#: js/files.js:51
+#: js/files.js:46
 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:55
+#: js/files.js:50
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Your storage is almost full ({usedSpacePercent}%)"
 
-#: js/files.js:68
+#: js/files.js:63
 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:72
+#: js/files.js:67
 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:76
+#: js/files.js:71
 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:307
+#: js/files.js:302
 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:518 js/files.js:556
+#: js/files.js:514 js/files.js:552
 msgid "Error moving file"
 msgstr "Error moving file"
 
+#: js/files.js:514 js/files.js:552
+msgid "Error"
+msgstr "Error"
+
 #: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Name"
@@ -249,7 +289,11 @@ msgstr "Size"
 msgid "Modified"
 msgstr "Modified"
 
-#: lib/app.php:73
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+
+#: lib/app.php:88
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s could not be renamed"
@@ -315,8 +359,8 @@ msgid "Cancel upload"
 msgstr "Cancel upload"
 
 #: templates/index.php:40
-msgid "You don’t have write permissions here."
-msgstr "You don’t have write permission here."
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
 
 #: templates/index.php:45
 msgid "Nothing in here. Upload something!"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index 4247e556cf2..2947c707c40 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-23 12:20+0000\n"
+"Last-Translator: mnestis <transifex@mnestis.net>\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"
@@ -82,4 +82,4 @@ msgstr "No preview available for"
 
 #: templates/public.php:98
 msgid "Direct link"
-msgstr ""
+msgstr "Direct link"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index 02ac1254c69..687e9e733a7 100644
--- a/l10n/en_GB/lib.po
+++ b/l10n/en_GB/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-17 13:47-0400\n"
-"PO-Revision-Date: 2013-10-17 17:47+0000\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-23 10:41+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -25,31 +25,31 @@ msgid ""
 " of ownCloud."
 msgstr "App \"%s\" can't be installed because it is not compatible with this version of ownCloud."
 
-#: private/app.php:254
+#: private/app.php:255
 msgid "No app name specified"
 msgstr "No app name specified"
 
-#: private/app.php:359
+#: private/app.php:360
 msgid "Help"
 msgstr "Help"
 
-#: private/app.php:372
+#: private/app.php:373
 msgid "Personal"
 msgstr "Personal"
 
-#: private/app.php:383
+#: private/app.php:384
 msgid "Settings"
 msgstr "Settings"
 
-#: private/app.php:395
+#: private/app.php:396
 msgid "Users"
 msgstr "Users"
 
-#: private/app.php:408
+#: private/app.php:409
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:872
+#: private/app.php:873
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Failed to upgrade \"%s\"."
@@ -285,54 +285,54 @@ msgstr "Please double check the <a href='%s'>installation guides</a>."
 msgid "Could not find category \"%s\""
 msgstr "Could not find category \"%s\""
 
-#: private/template/functions.php:122
+#: private/template/functions.php:130
 msgid "seconds ago"
 msgstr "seconds ago"
 
-#: private/template/functions.php:123
+#: private/template/functions.php:131
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minute ago"
 msgstr[1] "%n minutes ago"
 
-#: private/template/functions.php:124
+#: private/template/functions.php:132
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hour ago"
 msgstr[1] "%n hours ago"
 
-#: private/template/functions.php:125
+#: private/template/functions.php:133
 msgid "today"
 msgstr "today"
 
-#: private/template/functions.php:126
+#: private/template/functions.php:134
 msgid "yesterday"
 msgstr "yesterday"
 
-#: private/template/functions.php:128
+#: private/template/functions.php:136
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n day go"
 msgstr[1] "%n days ago"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:138
 msgid "last month"
 msgstr "last month"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:139
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n month ago"
 msgstr[1] "%n months ago"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:141
 msgid "last year"
 msgstr "last year"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:142
 msgid "years ago"
 msgstr "years ago"
 
-#: private/template.php:297
+#: private/template.php:297 public/util.php:103
 msgid "Caused by:"
 msgstr "Caused by:"
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index 1046e2596ea..c85cf57f557 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:01+0000\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-27 06:28+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -211,6 +211,10 @@ msgstr "Error creating user"
 msgid "A valid password must be provided"
 msgstr "A valid password must be provided"
 
+#: js/users.js:472
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
 #: personal.php:45 personal.php:46
 msgid "__language_name__"
 msgstr "__language_name__"
@@ -290,11 +294,11 @@ msgstr "Execute one task with each page loaded"
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
-msgstr ""
+msgstr "cron.php is registered at a webcron service to call cron.php every 15 minutes over http."
 
 #: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
-msgstr ""
+msgstr "Use system's cron service to call the cron.php file every 15 minutes."
 
 #: templates/admin.php:120
 msgid "Sharing"
@@ -539,9 +543,9 @@ msgstr "WebDAV"
 #: templates/personal.php:135
 #, php-format
 msgid ""
-"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
-"target=\"_blank\">access your Files via WebDAV</a>"
-msgstr "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>"
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
 
 #: templates/personal.php:146
 msgid "Encryption"
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
index 269467d7aea..1085f578e9a 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-15 16:20+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-27 06:30+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -42,298 +42,395 @@ msgid ""
 "details."
 msgstr "The configuration is invalid. Please look in the ownCloud log for further details."
 
-#: js/settings.js:66
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:78
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:86
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
 msgid "Deletion failed"
 msgstr "Deletion failed"
 
-#: js/settings.js:82
+#: js/settings.js:83
 msgid "Take over settings from recent server configuration?"
 msgstr "Take over settings from recent server configuration?"
 
-#: js/settings.js:83
+#: js/settings.js:84
 msgid "Keep settings?"
 msgstr "Keep settings?"
 
-#: js/settings.js:97
+#: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Cannot add server configuration"
 
-#: js/settings.js:111
+#: js/settings.js:113
 msgid "mappings cleared"
 msgstr "mappings cleared"
 
-#: js/settings.js:112
+#: js/settings.js:114
 msgid "Success"
 msgstr "Success"
 
-#: js/settings.js:117
+#: js/settings.js:119
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:141
+#: js/settings.js:660 js/settings.js:669
+msgid "Select groups"
+msgstr "Select groups"
+
+#: js/settings.js:663 js/settings.js:672
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:666
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:694
 msgid "Connection test succeeded"
 msgstr "Connection test succeeded"
 
-#: js/settings.js:146
+#: js/settings.js:699
 msgid "Connection test failed"
 msgstr "Connection test failed"
 
-#: js/settings.js:156
+#: js/settings.js:709
 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:157
+#: js/settings.js:710
 msgid "Confirm Deletion"
 msgstr "Confirm Deletion"
 
-#: templates/settings.php:9
-msgid ""
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behavior. Please ask your system administrator to "
-"disable one of them."
-msgstr "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them."
+#: lib/wizard.php:78 lib/wizard.php:92
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:123
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:752 lib/wizard.php:764
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:910
+msgid "Could not find the desired feature"
+msgstr ""
 
-#: templates/settings.php:12
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr "Test Configuration"
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:13
+msgid "Help"
+msgstr "Help"
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Limit the access to %s to groups meeting this criteria:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
 msgid ""
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
-"work. Please ask your system administrator to install it."
-msgstr "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it."
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
 
-#: templates/settings.php:16
-msgid "Server configuration"
-msgstr "Server configuration"
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
 
-#: templates/settings.php:32
+#: templates/part.wizard-loginfilter.php:4
+msgid "What attribute shall be used as login name:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Add Server Configuration"
 
-#: templates/settings.php:37
+#: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:39
+#: templates/part.wizard-server.php:31
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "You can omit the protocol, except you require SSL. Then start with ldaps://"
 
-#: templates/settings.php:40
-msgid "Base DN"
-msgstr "Base DN"
-
-#: templates/settings.php:41
-msgid "One Base DN per line"
-msgstr "One Base DN per line"
-
-#: templates/settings.php:42
-msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "You can specify Base DN for users and groups in the Advanced tab"
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr "Port"
 
-#: templates/settings.php:44
+#: templates/part.wizard-server.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:46
+#: templates/part.wizard-server.php:45
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
 msgstr "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty."
 
-#: templates/settings.php:47
+#: templates/part.wizard-server.php:52
 msgid "Password"
 msgstr "Password"
 
-#: templates/settings.php:50
+#: templates/part.wizard-server.php:53
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "For anonymous access, leave DN and Password empty."
 
-#: templates/settings.php:51
-msgid "User Login Filter"
-msgstr "User Login Filter"
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr "One Base DN per line"
 
-#: templates/settings.php:54
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+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 ""
+
+#: templates/part.wizard-userfilter.php:31
 #, php-format
 msgid ""
-"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action. Example: \"uid=%%uid\""
-msgstr "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
 
-#: templates/settings.php:55
-msgid "User List Filter"
-msgstr "User List Filter"
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
 
-#: templates/settings.php:58
-msgid ""
-"Defines the filter to apply, when retrieving users (no placeholders). "
-"Example: \"objectClass=person\""
-msgstr "Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\""
+#: templates/part.wizardcontrols.php:4
+msgid "Back"
+msgstr ""
 
-#: templates/settings.php:59
-msgid "Group Filter"
-msgstr "Group Filter"
+#: templates/part.wizardcontrols.php:7
+msgid "Continue"
+msgstr "Continue"
 
-#: templates/settings.php:62
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them."
+
+#: templates/settings.php:14
 msgid ""
-"Defines the filter to apply, when retrieving groups (no placeholders). "
-"Example: \"objectClass=posixGroup\""
-msgstr "Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it."
 
-#: templates/settings.php:66
+#: templates/settings.php:20
 msgid "Connection Settings"
 msgstr "Connection Settings"
 
-#: templates/settings.php:68
+#: templates/settings.php:22
 msgid "Configuration Active"
 msgstr "Configuration Active"
 
-#: templates/settings.php:68
+#: templates/settings.php:22
 msgid "When unchecked, this configuration will be skipped."
 msgstr "When unchecked, this configuration will be skipped."
 
-#: templates/settings.php:69
-msgid "Port"
-msgstr "Port"
+#: templates/settings.php:23
+msgid "User Login Filter"
+msgstr "User Login Filter"
+
+#: templates/settings.php:26
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\""
 
-#: templates/settings.php:70
+#: templates/settings.php:27
 msgid "Backup (Replica) Host"
 msgstr "Backup (Replica) Host"
 
-#: templates/settings.php:70
+#: templates/settings.php:27
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Give an optional backup host. It must be a replica of the main LDAP/AD server."
 
-#: templates/settings.php:71
+#: templates/settings.php:28
 msgid "Backup (Replica) Port"
 msgstr "Backup (Replica) Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:29
 msgid "Disable Main Server"
 msgstr "Disable Main Server"
 
-#: templates/settings.php:72
+#: templates/settings.php:29
 msgid "Only connect to the replica server."
 msgstr "Only connect to the replica server."
 
-#: templates/settings.php:73
-msgid "Use TLS"
-msgstr "Use TLS"
-
-#: templates/settings.php:73
-msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr "Do not use it additionally for LDAPS connections, it will fail."
-
-#: templates/settings.php:74
+#: templates/settings.php:30
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Case insensitve LDAP server (Windows)"
 
-#: templates/settings.php:75
+#: templates/settings.php:31
 msgid "Turn off SSL certificate validation."
 msgstr "Turn off SSL certificate validation."
 
-#: templates/settings.php:75
+#: templates/settings.php:31
 #, php-format
 msgid ""
 "Not recommended, use it for testing only! If connection only works with this"
 " option, import the LDAP server's SSL certificate in your %s server."
 msgstr "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server."
 
-#: templates/settings.php:76
+#: templates/settings.php:32
 msgid "Cache Time-To-Live"
 msgstr "Cache Time-To-Live"
 
-#: templates/settings.php:76
+#: templates/settings.php:32
 msgid "in seconds. A change empties the cache."
 msgstr "in seconds. A change empties the cache."
 
-#: templates/settings.php:78
+#: templates/settings.php:34
 msgid "Directory Settings"
 msgstr "Directory Settings"
 
-#: templates/settings.php:80
+#: templates/settings.php:36
 msgid "User Display Name Field"
 msgstr "User Display Name Field"
 
-#: templates/settings.php:80
+#: templates/settings.php:36
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "The LDAP attribute to use to generate the user's display name."
 
-#: templates/settings.php:81
+#: templates/settings.php:37
 msgid "Base User Tree"
 msgstr "Base User Tree"
 
-#: templates/settings.php:81
+#: templates/settings.php:37
 msgid "One User Base DN per line"
 msgstr "One User Base DN per line"
 
-#: templates/settings.php:82
+#: templates/settings.php:38
 msgid "User Search Attributes"
 msgstr "User Search Attributes"
 
-#: templates/settings.php:82 templates/settings.php:85
+#: templates/settings.php:38 templates/settings.php:41
 msgid "Optional; one attribute per line"
 msgstr "Optional; one attribute per line"
 
-#: templates/settings.php:83
+#: templates/settings.php:39
 msgid "Group Display Name Field"
 msgstr "Group Display Name Field"
 
-#: templates/settings.php:83
+#: templates/settings.php:39
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "The LDAP attribute to use to generate the group's display name."
 
-#: templates/settings.php:84
+#: templates/settings.php:40
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:84
+#: templates/settings.php:40
 msgid "One Group Base DN per line"
 msgstr "One Group Base DN per line"
 
-#: templates/settings.php:85
+#: templates/settings.php:41
 msgid "Group Search Attributes"
 msgstr "Group Search Attributes"
 
-#: templates/settings.php:86
+#: templates/settings.php:42
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:88
+#: templates/settings.php:44
 msgid "Special Attributes"
 msgstr "Special Attributes"
 
-#: templates/settings.php:90
+#: templates/settings.php:46
 msgid "Quota Field"
 msgstr "Quota Field"
 
-#: templates/settings.php:91
+#: templates/settings.php:47
 msgid "Quota Default"
 msgstr "Quota Default"
 
-#: templates/settings.php:91
+#: templates/settings.php:47
 msgid "in bytes"
 msgstr "in bytes"
 
-#: templates/settings.php:92
+#: templates/settings.php:48
 msgid "Email Field"
 msgstr "Email Field"
 
-#: templates/settings.php:93
+#: templates/settings.php:49
 msgid "User Home Folder Naming Rule"
 msgstr "User Home Folder Naming Rule"
 
-#: templates/settings.php:93
+#: templates/settings.php:49
 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:98
+#: templates/settings.php:55
 msgid "Internal Username"
 msgstr "Internal Username"
 
-#: templates/settings.php:99
+#: templates/settings.php:56
 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 "
@@ -349,15 +446,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:100
+#: templates/settings.php:57
 msgid "Internal Username Attribute:"
 msgstr "Internal Username Attribute:"
 
-#: templates/settings.php:101
+#: templates/settings.php:58
 msgid "Override UUID detection"
 msgstr "Override UUID detection"
 
-#: templates/settings.php:102
+#: templates/settings.php:59
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -368,19 +465,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:103
+#: templates/settings.php:60
 msgid "UUID Attribute for Users:"
 msgstr "UUID Attribute for Users:"
 
-#: templates/settings.php:104
+#: templates/settings.php:61
 msgid "UUID Attribute for Groups:"
 msgstr "UUID Attribute for Groups:"
 
-#: templates/settings.php:105
+#: templates/settings.php:62
 msgid "Username-LDAP User Mapping"
 msgstr "Username-LDAP User Mapping"
 
-#: templates/settings.php:106
+#: templates/settings.php:63
 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. "
@@ -394,18 +491,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:107
+#: templates/settings.php:64
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Clear Username-LDAP User Mapping"
 
-#: templates/settings.php:107
+#: templates/settings.php:64
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Clear Groupname-LDAP Group Mapping"
-
-#: templates/settings.php:109
-msgid "Test Configuration"
-msgstr "Test Configuration"
-
-#: templates/settings.php:109
-msgid "Help"
-msgstr "Help"