[tx-robot] updated from transifex

2 files changed, 119 insertions, 119 deletions

diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index a05c8107e39..404c36e6b36 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 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"
@@ -59,79 +59,79 @@ msgstr "No temporary profile picture available, try again"
 msgid "No crop data provided"
 msgstr "No crop data provided"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Sunday"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Monday"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Thursday"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Friday"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Saturday"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "January"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "February"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "March"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "May"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "June"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "July"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "October"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "December"
 
@@ -191,75 +191,75 @@ msgstr "last year"
 msgid "years ago"
 msgstr "years ago"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Choose"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error loading file picker template: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Yes"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Choose"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error loading file picker template: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Error loading message template: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} file conflict"
 msgstr[1] "{count} file conflicts"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "One file conflict"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "New Files"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Already existing files"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Which files do you wish to keep?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "If you select both versions, the copied file will have a number added to its name."
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Cancel"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continue"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(all selected)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} selected)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Error loading file exists template"
 
@@ -291,12 +291,12 @@ msgstr "Shared"
 msgid "Share"
 msgstr "Share"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
 msgid "Error while sharing"
 msgstr "Error whilst sharing"
 
@@ -324,107 +324,116 @@ msgstr "Share with user or group …"
 msgid "Share link"
 msgstr "Share link"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
 msgid "Password protect"
 msgstr "Password protect"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Allow Public Upload"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Email link to person"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Set expiration date"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Expiration date"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Share via email:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "No people found"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "group"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Resharing is not allowed"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Shared in {item} with {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Unshare"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "notify by email"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "can edit"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "access control"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "create"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "update"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "delete"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "share"
 
-#: js/share.js:721
+#: js/share.js:734
 msgid "Password protected"
 msgstr "Password protected"
 
-#: js/share.js:734
+#: js/share.js:747
 msgid "Error unsetting expiration date"
 msgstr "Error unsetting expiration date"
 
-#: js/share.js:752
+#: js/share.js:768
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:777
+#: js/share.js:797
 msgid "Sending ..."
 msgstr "Sending ..."
 
-#: js/share.js:788
+#: js/share.js:808
 msgid "Email sent"
 msgstr "Email sent"
 
-#: js/share.js:812
+#: js/share.js:832
 msgid "Warning"
 msgstr "Warning"
 
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index 3b7c741141a..b46610d0ae9 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 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"
@@ -101,13 +101,13 @@ msgstr "Couldn't decrypt your files, check your password and try again"
 
 #: ajax/deletekeys.php:14
 msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Encryption keys deleted permanently"
 
 #: ajax/deletekeys.php:16
 msgid ""
 "Couldn't permanently delete your encryption keys, please check your "
 "owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator"
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -127,13 +127,13 @@ msgstr "Unable to delete user"
 
 #: ajax/restorekeys.php:14
 msgid "Backups restored successfully"
-msgstr ""
+msgstr "Backups restored successfully"
 
 #: ajax/restorekeys.php:23
 msgid ""
 "Couldn't restore your encryption keys, please check your owncloud.log or ask"
 " your administrator"
-msgstr ""
+msgstr "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -190,7 +190,7 @@ 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/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Sending..."
 
@@ -276,11 +276,11 @@ msgstr "Decrypting files... Please wait, this can take some time."
 
 #: js/personal.js:324
 msgid "Delete encryptin keys permanently."
-msgstr ""
+msgstr "Delete encryption keys permanently."
 
 #: js/personal.js:338
 msgid "Restore encryptin keys."
-msgstr ""
+msgstr "Restore encryption keys."
 
 #: js/users.js:47
 msgid "deleted"
@@ -515,63 +515,54 @@ msgstr "Allow apps to use the Share API"
 msgid "Allow links"
 msgstr "Allow links"
 
-#: templates/admin.php:220
-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:227
+#: templates/admin.php:225
 msgid "Allow public uploads"
 msgstr "Allow public uploads"
 
-#: templates/admin.php:228
-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:229
+msgid "Set default expiration date"
+msgstr "Set default expiry date"
+
+#: templates/admin.php:231
+msgid "Expire after "
+msgstr "Expire after "
+
+#: templates/admin.php:234
+msgid "days"
+msgstr "days"
+
+#: templates/admin.php:237
+msgid "Enforce expiration date"
+msgstr "Enforce expiry date"
+
+#: templates/admin.php:241
+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:235
+#: templates/admin.php:251
 msgid "Allow resharing"
 msgstr "Allow resharing"
 
-#: templates/admin.php:236
+#: templates/admin.php:252
 msgid "Allow users to share items shared with them again"
 msgstr "Allow users to share items shared with them again"
 
-#: templates/admin.php:243
+#: templates/admin.php:259
 msgid "Allow users to share with anyone"
 msgstr "Allow users to share with anyone"
 
-#: templates/admin.php:246
+#: templates/admin.php:262
 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:253
+#: templates/admin.php:269
 msgid "Allow mail notification"
 msgstr "Allow mail notification"
 
-#: templates/admin.php:254
+#: templates/admin.php:270
 msgid "Allow users to send mail notification for shared files"
 msgstr "Allow users to send mail notification for shared files"
 
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Set default expiry date"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Expire after "
-
-#: templates/admin.php:266
-msgid "days"
-msgstr "days"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Enforce expiry date"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Expire shares by default after N days"
-
 #: templates/admin.php:278
 msgid "Security"
 msgstr "Security"
@@ -837,15 +828,15 @@ msgid ""
 "Your encryption keys are moved to a backup location. If something went wrong"
 " you can restore the keys. Only delete them permanently if you are sure that"
 " all files are decrypted correctly."
-msgstr ""
+msgstr "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly."
 
 #: templates/personal.php:184
 msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Restore Encryption Keys"
 
 #: templates/personal.php:188
 msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Delete Encryption Keys"
 
 #: templates/users.php:19
 msgid "Login Name"