merge master into navigation

1 files changed, 95 insertions, 57 deletions

diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index d55899f3b3e..1d4d69bb59e 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 16:18+0000\n"
-"Last-Translator: martin <zatroch.martin@gmail.com>\n"
+"POT-Creation-Date: 2013-01-10 00:04+0100\n"
+"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,46 +21,72 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/upload.php:20
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:24
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:19
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:14
+msgid "No file was uploaded. Unknown error"
+msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
+
+#: ajax/upload.php:21
 msgid "There is no error, the file uploaded with success"
 msgstr "Nenastala žiadna chyba, súbor bol úspešne nahraný"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Nahraný súbor predčil  konfiguračnú direktívu upload_max_filesize v súbore php.ini:"
 
-#: ajax/upload.php:23
+#: ajax/upload.php:24
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Nahrávaný súbor presiahol MAX_FILE_SIZE direktívu, ktorá bola špecifikovaná v HTML formulári"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:26
 msgid "The uploaded file was only partially uploaded"
 msgstr "Nahrávaný súbor bol iba čiastočne nahraný"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:27
 msgid "No file was uploaded"
 msgstr "Žiaden súbor nebol nahraný"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:28
 msgid "Missing a temporary folder"
 msgstr "Chýbajúci dočasný priečinok"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:29
 msgid "Failed to write to disk"
 msgstr "Zápis na disk sa nepodaril"
 
+#: ajax/upload.php:45
+msgid "Not enough space available"
+msgstr ""
+
+#: ajax/upload.php:69
+msgid "Invalid directory."
+msgstr ""
+
 #: appinfo/app.php:10
 msgid "Files"
 msgstr "Súbory"
 
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
 msgid "Unshare"
 msgstr "Nezdielať"
 
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
 msgid "Delete"
 msgstr "Odstrániť"
 
@@ -68,122 +94,134 @@ msgstr "Odstrániť"
 msgid "Rename"
 msgstr "Premenovať"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:205 js/filelist.js:207
 msgid "{new_name} already exists"
 msgstr "{new_name} už existuje"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:205 js/filelist.js:207
 msgid "replace"
 msgstr "nahradiť"
 
-#: js/filelist.js:201
+#: js/filelist.js:205
 msgid "suggest name"
 msgstr "pomôcť s menom"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:205 js/filelist.js:207
 msgid "cancel"
 msgstr "zrušiť"
 
-#: js/filelist.js:250
+#: js/filelist.js:254
 msgid "replaced {new_name}"
 msgstr "prepísaný {new_name}"
 
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
+#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
 msgid "undo"
 msgstr "vrátiť"
 
-#: js/filelist.js:252
+#: js/filelist.js:256
 msgid "replaced {new_name} with {old_name}"
 msgstr "prepísaný {new_name} súborom {old_name}"
 
-#: js/filelist.js:284
+#: js/filelist.js:288
 msgid "unshared {files}"
 msgstr "zdieľanie zrušené pre {files}"
 
-#: js/filelist.js:286
+#: js/filelist.js:290
 msgid "deleted {files}"
 msgstr "zmazané {files}"
 
-#: js/files.js:33
+#: js/files.js:31
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:36
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:45
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty."
 
-#: js/files.js:183
+#: js/files.js:186
 msgid "generating ZIP-file, it may take some time."
 msgstr "generujem ZIP-súbor, môže to chvíľu trvať."
 
-#: js/files.js:218
+#: js/files.js:224
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov."
 
-#: js/files.js:218
+#: js/files.js:224
 msgid "Upload Error"
 msgstr "Chyba odosielania"
 
-#: js/files.js:235
+#: js/files.js:241
 msgid "Close"
 msgstr "Zavrieť"
 
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:260 js/files.js:376 js/files.js:409
 msgid "Pending"
 msgstr "Čaká sa"
 
-#: js/files.js:274
+#: js/files.js:280
 msgid "1 file uploading"
 msgstr "1 súbor sa posiela "
 
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:283 js/files.js:338 js/files.js:353
 msgid "{count} files uploading"
 msgstr "{count} súborov odosielaných"
 
-#: js/files.js:349 js/files.js:382
+#: js/files.js:357 js/files.js:393
 msgid "Upload cancelled."
 msgstr "Odosielanie zrušené"
 
-#: js/files.js:451
+#: js/files.js:464
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
 
-#: js/files.js:523
-msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr "Nesprávne meno adresára. Použitie slova \"Shared\" (Zdieľané) je vyhradené službou ownCloud."
+#: js/files.js:537
+msgid "URL cannot be empty."
+msgstr "URL nemôže byť prázdne"
+
+#: js/files.js:543
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr ""
 
-#: js/files.js:704
+#: js/files.js:727
 msgid "{count} files scanned"
 msgstr "{count} súborov prehľadaných"
 
-#: js/files.js:712
+#: js/files.js:735
 msgid "error while scanning"
 msgstr "chyba počas kontroly"
 
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:808 templates/index.php:64
 msgid "Name"
 msgstr "Meno"
 
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:809 templates/index.php:75
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:810 templates/index.php:77
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:814
+#: js/files.js:829
 msgid "1 folder"
 msgstr "1 priečinok"
 
-#: js/files.js:816
+#: js/files.js:831
 msgid "{count} folders"
 msgstr "{count} priečinkov"
 
-#: js/files.js:824
+#: js/files.js:839
 msgid "1 file"
 msgstr "1 súbor"
 
-#: js/files.js:826
+#: js/files.js:841
 msgid "{count} files"
 msgstr "{count} súborov"
 
@@ -195,27 +233,27 @@ msgstr "Nastavenie správanie k súborom"
 msgid "Maximum upload size"
 msgstr "Maximálna veľkosť odosielaného súboru"
 
-#: templates/admin.php:9
+#: templates/admin.php:10
 msgid "max. possible: "
 msgstr "najväčšie možné:"
 
-#: templates/admin.php:12
+#: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
 msgstr "Vyžadované pre sťahovanie viacerých súborov a adresárov."
 
-#: templates/admin.php:14
+#: templates/admin.php:17
 msgid "Enable ZIP-download"
 msgstr "Povoliť sťahovanie ZIP súborov"
 
-#: templates/admin.php:17
+#: templates/admin.php:20
 msgid "0 is unlimited"
 msgstr "0 znamená neobmedzené"
 
-#: templates/admin.php:19
+#: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
 msgstr "Najväčšia veľkosť ZIP súborov"
 
-#: templates/admin.php:23
+#: templates/admin.php:26
 msgid "Save"
 msgstr "Uložiť"
 
@@ -235,36 +273,36 @@ msgstr "Priečinok"
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:35
+#: templates/index.php:18
 msgid "Upload"
 msgstr "Odoslať"
 
-#: templates/index.php:43
+#: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Zrušiť odosielanie"
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Žiadny súbor. Nahrajte niečo!"
 
-#: templates/index.php:71
+#: templates/index.php:70
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/index.php:103
+#: templates/index.php:102
 msgid "Upload too large"
 msgstr "Odosielaný súbor je príliš veľký"
 
-#: templates/index.php:105
+#: templates/index.php:104
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server."
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid "Files are being scanned, please wait."
 msgstr "Čakajte, súbory sú prehľadávané."
 
-#: templates/index.php:113
+#: templates/index.php:112
 msgid "Current scanning"
 msgstr "Práve prehliadané"