Merge branch 'master' into encryption_work_with_public_gallery

1 files changed, 36 insertions, 43 deletions

diff --git a/l10n/uz/core.po b/l10n/uz/core.po
index 551a6f43ce1..43f4bf98d50 100644
--- a/l10n/uz/core.po
+++ b/l10n/uz/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-09 01:44-0500\n"
-"PO-Revision-Date: 2013-11-07 08:41+0000\n"
+"POT-Creation-Date: 2013-11-21 10:01-0500\n"
+"PO-Revision-Date: 2013-11-21 15:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -271,12 +271,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:692
-#: js/share.js:704
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
+#: js/share.js:719
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:732
+#: js/share.js:160 js/share.js:747
 msgid "Error while sharing"
 msgstr ""
 
@@ -296,115 +296,115 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:213
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:218
+#: js/share.js:219
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:221
+#: js/share.js:222
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:223 templates/installation.php:57 templates/login.php:32
+#: js/share.js:224 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:229
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:233
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Send"
 msgstr ""
 
-#: js/share.js:238
+#: js/share.js:239
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:274
+#: js/share.js:275
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:278
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:307 js/share.js:344
+#: js/share.js:322 js/share.js:359
 msgid "group"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:333
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:360
+#: js/share.js:375
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:382
+#: js/share.js:397
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:390
+#: js/share.js:405
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:393
+#: js/share.js:408
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:395
+#: js/share.js:410
 msgid "access control"
 msgstr ""
 
-#: js/share.js:398
+#: js/share.js:413
 msgid "create"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:416
 msgid "update"
 msgstr ""
 
-#: js/share.js:404
+#: js/share.js:419
 msgid "delete"
 msgstr ""
 
-#: js/share.js:407
+#: js/share.js:422
 msgid "share"
 msgstr ""
 
-#: js/share.js:449 js/share.js:679
+#: js/share.js:464 js/share.js:694
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:692
+#: js/share.js:707
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:704
+#: js/share.js:719
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:734
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:730
+#: js/share.js:745
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:754
+#: js/share.js:769
 msgid "Warning"
 msgstr ""
 
@@ -574,14 +574,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:4 templates/mail.php:17
 #, php-format
-msgid ""
-"The share will expire on %s.\n"
-"\n"
+msgid "The share will expire on %s."
 msgstr ""
 
-#: templates/altmail.php:6 templates/mail.php:19
+#: templates/altmail.php:7 templates/mail.php:20
 msgid "Cheers!"
 msgstr ""
 
@@ -728,11 +726,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
-#: templates/mail.php:17
-#, php-format
-msgid "The share will expire on %s.<br><br>"
-msgstr ""
-
 #: templates/update.admin.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."