[tx-robot] updated from transifex

3 files changed, 132 insertions, 107 deletions

diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index 862e41169c8..77776b1b6a0 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: 2014-04-24 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 11:31+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-04-25 01:54-0400\n"
+"PO-Revision-Date: 2014-04-25 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,7 +28,7 @@ msgstr "Could not move %s - File with this name already exists"
 msgid "Could not move %s"
 msgstr "Could not move %s"
 
-#: ajax/newfile.php:58 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:96
 msgid "File name cannot be empty."
 msgstr "File name cannot be empty."
 
@@ -37,18 +37,18 @@ msgstr "File name cannot be empty."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" is an invalid file name."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:65
+#: lib/app.php:60
 msgid "The target folder has been moved or deleted."
 msgstr "The target folder has been moved or deleted."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -174,134 +174,126 @@ msgstr "File upload is in progress. Leaving the page now will cancel the upload.
 msgid "URL cannot be empty"
 msgstr "URL cannot be empty"
 
-#: js/file-upload.js:559
-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:561 js/filelist.js:586
+#: js/file-upload.js:559 js/filelist.js:597
 msgid "{new_name} already exists"
 msgstr "{new_name} already exists"
 
-#: js/file-upload.js:613
+#: js/file-upload.js:611
 msgid "Could not create file"
 msgstr "Could not create file"
 
-#: js/file-upload.js:626
+#: js/file-upload.js:624
 msgid "Could not create folder"
 msgstr "Could not create folder"
 
-#: js/file-upload.js:666
+#: js/file-upload.js:664
 msgid "Error fetching URL"
 msgstr "Error fetching URL"
 
-#: js/fileactions.js:164
+#: js/fileactions.js:160
 msgid "Share"
 msgstr "Share"
 
-#: js/fileactions.js:177
+#: js/fileactions.js:173
 msgid "Delete permanently"
 msgstr "Delete permanently"
 
-#: js/fileactions.js:238
+#: js/fileactions.js:234
 msgid "Rename"
 msgstr "Rename"
 
-#: js/filelist.js:102 js/files.js:552
+#: js/filelist.js:102 js/files.js:550
 msgid "Error moving file"
 msgstr "Error moving file"
 
-#: js/filelist.js:102 js/files.js:552
+#: js/filelist.js:102 js/files.js:550
 msgid "Error"
 msgstr "Error"
 
-#: js/filelist.js:251 js/filelist.js:1130
+#: js/filelist.js:258 js/filelist.js:1141
 msgid "Pending"
 msgstr "Pending"
 
-#: js/filelist.js:613
+#: js/filelist.js:624
 msgid "Could not rename file"
 msgstr "Could not rename file"
 
-#: js/filelist.js:776
+#: js/filelist.js:787
 msgid "Error deleting file."
 msgstr "Error deleting file."
 
-#: js/filelist.js:801 js/filelist.js:877 js/files.js:589
+#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 msgstr[1] "%n folders"
 
-#: js/filelist.js:802 js/filelist.js:878 js/files.js:595
+#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
 msgstr[1] "%n files"
 
-#: js/filelist.js:809
+#: js/filelist.js:820
 msgid "{dirs} and {files}"
 msgstr "{dirs} and {files}"
 
-#: js/filelist.js:1038 js/filelist.js:1077
+#: js/filelist.js:1049 js/filelist.js:1088
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploading %n file"
 msgstr[1] "Uploading %n files"
 
-#: js/files.js:96
+#: js/files.js:94
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" is an invalid file name."
 
-#: js/files.js:117
+#: js/files.js:115
 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:121
+#: js/files.js:119
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Your storage is almost full ({usedSpacePercent}%)"
 
-#: js/files.js:134
+#: js/files.js:132
 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:138
+#: js/files.js:136
 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:142
+#: js/files.js:140
 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:331
+#: js/files.js:329
 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:570 templates/index.php:67
+#: js/files.js:568 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:571 templates/index.php:79
+#: js/files.js:569 templates/index.php:79
 msgid "Size"
 msgstr "Size"
 
-#: js/files.js:572 templates/index.php:81
+#: js/files.js:570 templates/index.php:81
 msgid "Modified"
 msgstr "Modified"
 
-#: lib/app.php:60
-msgid "Invalid folder name. Usage of 'Shared' is reserved."
-msgstr "Invalid folder name. Usage of 'Shared' is reserved."
-
-#: lib/app.php:93
+#: lib/app.php:86
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s could not be renamed"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index 0d6696a6176..11fdcf4ddc0 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-24 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 05:54+0000\n"
+"POT-Creation-Date: 2014-04-25 01:54-0400\n"
+"PO-Revision-Date: 2014-04-25 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"
@@ -18,6 +18,14 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: base.php:723
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:724
+msgid "Please contact your administrator"
+msgstr ""
+
 #: private/app.php:236
 #, php-format
 msgid ""
@@ -285,103 +293,108 @@ msgstr "Please double check the <a href='%s'>installation guides</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s shared \"%s\" with you"
 
-#: private/share/share.php:490
+#: private/share/share.php:498
 #, php-format
-msgid "Sharing %s failed, because the user %s is the item owner"
+msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:496
+#: private/share/share.php:523
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr "Sharing %s failed, because the user %s is the item owner"
+
+#: private/share/share.php:529
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "Sharing %s failed, because the user %s does not exist"
 
-#: private/share/share.php:505
+#: private/share/share.php:538
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
-msgstr ""
+msgstr "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of"
 
-#: private/share/share.php:518 private/share/share.php:546
+#: private/share/share.php:551 private/share/share.php:579
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
+msgstr "Sharing %s failed, because this item is already shared with %s"
 
-#: private/share/share.php:526
+#: private/share/share.php:559
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
+msgstr "Sharing %s failed, because the group %s does not exist"
 
-#: private/share/share.php:533
+#: private/share/share.php:566
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
-msgstr ""
+msgstr "Sharing %s failed, because %s is not a member of the group %s"
 
-#: private/share/share.php:596
+#: private/share/share.php:629
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
+msgstr "Sharing %s failed, because sharing with links is not allowed"
 
-#: private/share/share.php:603
+#: private/share/share.php:636
 #, php-format
 msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "Share type %s is not valid for %s"
 
-#: private/share/share.php:740
+#: private/share/share.php:773
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
-msgstr ""
+msgstr "Setting permissions for %s failed, because the permissions exceed permissions granted to %s"
 
-#: private/share/share.php:801
+#: private/share/share.php:834
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
+msgstr "Setting permissions for %s failed, because the item was not found"
 
-#: private/share/share.php:895
+#: private/share/share.php:940
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
+msgstr "Sharing backend %s must implement the interface OCP\\Share_Backend"
 
-#: private/share/share.php:902
+#: private/share/share.php:947
 #, php-format
 msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "Sharing backend %s not found"
 
-#: private/share/share.php:908
+#: private/share/share.php:953
 #, php-format
 msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "Sharing backend for %s not found"
 
-#: private/share/share.php:1325
+#: private/share/share.php:1367
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr ""
+msgstr "Sharing %s failed, because the user %s is the original sharer"
 
-#: private/share/share.php:1334
+#: private/share/share.php:1376
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
-msgstr ""
+msgstr "Sharing %s failed, because the permissions exceed permissions granted to %s"
 
-#: private/share/share.php:1349
+#: private/share/share.php:1391
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
-msgstr ""
+msgstr "Sharing %s failed, because resharing is not allowed"
 
-#: private/share/share.php:1361
+#: private/share/share.php:1403
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
-msgstr ""
+msgstr "Sharing %s failed, because the sharing backend for %s could not find its source"
 
-#: private/share/share.php:1375
+#: private/share/share.php:1417
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
-msgstr ""
+msgstr "Sharing %s failed, because the file could not be found in the file cache"
 
 #: private/tags.php:193
 #, php-format
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index 6b178f05eba..07dbb86c488 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: 2014-04-24 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 11:31+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-04-25 01:54-0400\n"
+"PO-Revision-Date: 2014-04-25 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"
@@ -48,15 +48,15 @@ msgstr "Email sent"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "You need to set your user email before being able to send test emails."
 
-#: admin/controller.php:116 templates/admin.php:299
+#: admin/controller.php:116 templates/admin.php:316
 msgid "Send mode"
 msgstr "Send mode"
 
-#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
 msgid "Encryption"
 msgstr "Encryption"
 
-#: admin/controller.php:120 templates/admin.php:336
+#: admin/controller.php:120 templates/admin.php:353
 msgid "Authentication method"
 msgstr "Authentication method"
 
@@ -524,91 +524,111 @@ msgstr "Allow mail notification"
 msgid "Allow users to send mail notification for shared files"
 msgstr "Allow users to send mail notification for shared files"
 
-#: templates/admin.php:261
+#: templates/admin.php:262
+msgid "Set default expire date"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:266
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Enforce expire date"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Expire shares by default after N days"
+msgstr ""
+
+#: templates/admin.php:278
 msgid "Security"
 msgstr "Security"
 
-#: templates/admin.php:274
+#: templates/admin.php:291
 msgid "Enforce HTTPS"
 msgstr "Enforce HTTPS"
 
-#: templates/admin.php:276
+#: templates/admin.php:293
 #, 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:282
+#: templates/admin.php:299
 #, 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:294
+#: templates/admin.php:311
 msgid "Email Server"
 msgstr "Email Server"
 
-#: templates/admin.php:296
+#: templates/admin.php:313
 msgid "This is used for sending out notifications."
 msgstr "This is used for sending out notifications."
 
-#: templates/admin.php:327
+#: templates/admin.php:344
 msgid "From address"
 msgstr "From address"
 
-#: templates/admin.php:349
+#: templates/admin.php:366
 msgid "Authentication required"
 msgstr "Authentication required"
 
-#: templates/admin.php:353
+#: templates/admin.php:370
 msgid "Server address"
 msgstr "Server address"
 
-#: templates/admin.php:357
+#: templates/admin.php:374
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:362
+#: templates/admin.php:379
 msgid "Credentials"
 msgstr "Credentials"
 
-#: templates/admin.php:363
+#: templates/admin.php:380
 msgid "SMTP Username"
 msgstr "SMTP Username"
 
-#: templates/admin.php:366
+#: templates/admin.php:383
 msgid "SMTP Password"
 msgstr "SMTP Password"
 
-#: templates/admin.php:370
+#: templates/admin.php:387
 msgid "Test email settings"
 msgstr "Test email settings"
 
-#: templates/admin.php:371
+#: templates/admin.php:388
 msgid "Send email"
 msgstr "Send email"
 
-#: templates/admin.php:376
+#: templates/admin.php:393
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:377
+#: templates/admin.php:394
 msgid "Log level"
 msgstr "Log level"
 
-#: templates/admin.php:409
+#: templates/admin.php:426
 msgid "More"
 msgstr "More"
 
-#: templates/admin.php:410
+#: templates/admin.php:427
 msgid "Less"
 msgstr "Less"
 
-#: templates/admin.php:416 templates/personal.php:171
+#: templates/admin.php:433 templates/personal.php:171
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:420 templates/personal.php:174
+#: templates/admin.php:437 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "