Merge branch 'master' into share_expiration

Conflicts:
	core/js/share.js
	lib/util.php

1 files changed, 53 insertions, 32 deletions

diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index cf36b73d5b6..0b6110c70d7 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/files.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu_ES\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -51,83 +51,100 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:237
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:195 js/filelist.js:246
-msgid "undo"
+#: js/filelist.js:268
+msgid "unshared"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:423
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:731
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
@@ -159,6 +176,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
@@ -183,36 +204,36 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""