aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/appinfo/remote.php10
-rw-r--r--apps/files/css/files.css2
-rw-r--r--apps/files/index.php14
-rw-r--r--apps/files/js/filelist.js1
-rw-r--r--apps/files/js/files.js10
-rw-r--r--apps/files/l10n/ca.php1
-rw-r--r--apps/files/l10n/cs_CZ.php27
-rw-r--r--apps/files/l10n/da.php5
-rw-r--r--apps/files/l10n/de.php1
-rw-r--r--apps/files/l10n/de_DE.php1
-rw-r--r--apps/files/l10n/es.php1
-rw-r--r--apps/files/l10n/es_AR.php1
-rw-r--r--apps/files/l10n/et_EE.php1
-rw-r--r--apps/files/l10n/eu.php1
-rw-r--r--apps/files/l10n/fa.php1
-rw-r--r--apps/files/l10n/fi_FI.php1
-rw-r--r--apps/files/l10n/fr.php1
-rw-r--r--apps/files/l10n/gl.php1
-rw-r--r--apps/files/l10n/hu_HU.php1
-rw-r--r--apps/files/l10n/it.php1
-rw-r--r--apps/files/l10n/ja_JP.php1
-rw-r--r--apps/files/l10n/nb_NO.php1
-rw-r--r--apps/files/l10n/nl.php3
-rw-r--r--apps/files/l10n/pt_BR.php1
-rw-r--r--apps/files/l10n/pt_PT.php1
-rw-r--r--apps/files/l10n/ru.php1
-rw-r--r--apps/files/l10n/sv.php1
-rw-r--r--apps/files/l10n/tr.php1
-rw-r--r--apps/files/l10n/zh_CN.GB2312.php1
-rw-r--r--apps/files/l10n/zh_TW.php1
-rw-r--r--apps/files/templates/index.php6
31 files changed, 55 insertions, 45 deletions
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 6c92cc80b69..9b114ca2e37 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -23,7 +23,7 @@
*
*/
// load needed apps
-$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging');
+$RUNTIME_APPTYPES = array('filesystem', 'authentication', 'logging');
OC_App::loadApps($RUNTIME_APPTYPES);
@@ -35,15 +35,17 @@ $lockBackend = new OC_Connector_Sabre_Locks();
$requestBackend = new OC_Connector_Sabre_Request();
// Create ownCloud Dir
-$publicDir = new OC_Connector_Sabre_Directory('');
+$rootDir = new OC_Connector_Sabre_Directory('');
+$objectTree = new \OC\Connector\Sabre\ObjectTree($rootDir);
// Fire up server
-$server = new Sabre_DAV_Server($publicDir);
+$server = new Sabre_DAV_Server($objectTree);
$server->httpRequest = $requestBackend;
$server->setBaseUri($baseuri);
// Load plugins
-$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
+$defaults = new OC_Defaults();
+$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName()));
$server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f2ca1065eca..117aac4c93e 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -24,7 +24,7 @@
#new>ul>li>p { cursor:pointer; }
#new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
-#trash { height:17px; margin: 0 1em; z-index:1010; float: right; }
+#trash { margin: 0 1em; z-index:1010; float: right; }
#upload {
height:27px; padding:0; margin-left:0.2em; overflow:hidden;
diff --git a/apps/files/index.php b/apps/files/index.php
index 2338cf439e4..4f9e881eb2d 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -121,7 +121,17 @@ if ($needUpgrade) {
// information about storage capacities
$storageInfo=OC_Helper::getStorageInfo();
$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
+ $publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes');
+ if (OC_App::isEnabled('files_encryption')) {
+ $publicUploadEnabled = 'no';
+ }
+ $trashEnabled = \OCP\App::isEnabled('files_trashbin');
+ $trashEmpty = true;
+ if ($trashEnabled) {
+ $trashEmpty = \OCA\Files_Trashbin\Trashbin::isEmpty($user);
+ }
+
OCP\Util::addscript('files', 'fileactions');
OCP\Util::addscript('files', 'files');
OCP\Util::addscript('files', 'keyboardshortcuts');
@@ -132,11 +142,13 @@ if ($needUpgrade) {
$tmpl->assign('isCreatable', \OC\Files\Filesystem::isCreatable($dir . '/'));
$tmpl->assign('permissions', $permissions);
$tmpl->assign('files', $files);
- $tmpl->assign('trash', \OCP\App::isEnabled('files_trashbin'));
+ $tmpl->assign('trash', $trashEnabled);
+ $tmpl->assign('trashEmpty', $trashEmpty);
$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
$tmpl->assign('isPublic', false);
+ $tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
$tmpl->printPage();
}
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 04a9fb91649..b858e2580ee 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -392,6 +392,7 @@ var FileList={
files.removeClass('selected');
});
procesSelection();
+ checkTrashStatus();
} else {
$.each(files,function(index,file) {
var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 98fc53b71a9..3fad3fae7d3 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -121,7 +121,7 @@ $(document).ready(function() {
});
// Show trash bin
- $('#trash a').live('click', function() {
+ $('#trash').on('click', function() {
window.location=OC.filePath('files_trashbin', '', 'index.php');
});
@@ -845,3 +845,11 @@ function getUniqueName(name){
}
return name;
}
+
+function checkTrashStatus() {
+ $.post(OC.filePath('files_trashbin', 'ajax', 'isEmpty.php'), function(result){
+ if (result.data.isEmpty === false) {
+ $("input[type=button][id=trash]").removeAttr("disabled");
+ }
+ });
+} \ No newline at end of file
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 51d450b4f68..8d5f69f3318 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "No teniu permisos d'escriptura aquí.",
"Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
"Download" => "Baixa",
-"Size (MB)" => "Mida (MB)",
"Unshare" => "Deixa de compartir",
"Upload too large" => "La pujada és massa gran",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index c16d32e9c28..e87872a4a09 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -1,12 +1,12 @@
<?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Nelze přesunout %s - existuje soubor se stejným názvem",
+"Could not move %s - File with this name already exists" => "Nelze přesunout %s - již existuje soubor se stejným názvem",
"Could not move %s" => "Nelze přesunout %s",
"Unable to set upload directory." => "Nelze nastavit adresář pro nahrané soubory.",
"Invalid Token" => "Neplatný token",
-"No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba",
+"No file was uploaded. Unknown error" => "Žádný soubor nebyl odeslán. Neznámá chyba",
"There is no error, the file uploaded with success" => "Soubor byl odeslán úspěšně",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný v formuláři HTML",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný ve formuláři HTML",
"The uploaded file was only partially uploaded" => "Soubor byl odeslán pouze částečně",
"No file was uploaded" => "Žádný soubor nebyl odeslán",
"Missing a temporary folder" => "Chybí adresář pro dočasné soubory",
@@ -14,11 +14,11 @@
"Not enough storage available" => "Nedostatek dostupného úložného prostoru",
"Invalid directory." => "Neplatný adresář",
"Files" => "Soubory",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů",
-"Not enough space available" => "Nedostatek dostupného místa",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo jeho velikost je 0 bajtů",
+"Not enough space available" => "Nedostatek volného místa",
"Upload cancelled." => "Odesílání zrušeno.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání.",
-"URL cannot be empty." => "URL nemůže být prázdná",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
+"URL cannot be empty." => "URL nemůže být prázdná.",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno",
"Error" => "Chyba",
"Share" => "Sdílet",
@@ -31,7 +31,7 @@
"suggest name" => "navrhnout název",
"cancel" => "zrušit",
"replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
-"undo" => "zpět",
+"undo" => "vrátit zpět",
"perform delete operation" => "provést smazání",
"1 file uploading" => "odesílá se 1 soubor",
"files uploading" => "soubory se odesílají",
@@ -40,15 +40,16 @@
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Použití 'Shared' je rezervováno pro vnitřní potřeby Owncloud",
+"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Pojmenování 'Shared' je rezervováno pro vnitřní potřeby ownCloud",
"Name" => "Název",
"Size" => "Velikost",
"Modified" => "Upraveno",
"1 folder" => "1 složka",
-"{count} folders" => "{count} složky",
+"{count} folders" => "{count} složek",
"1 file" => "1 soubor",
-"{count} files" => "{count} soubory",
+"{count} files" => "{count} souborů",
+"%s could not be renamed" => "%s nemůže být přejmenován",
"Upload" => "Odeslat",
"File handling" => "Zacházení se soubory",
"Maximum upload size" => "Maximální velikost pro odesílání",
@@ -72,6 +73,8 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
"Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
"Current scanning" => "Aktuální prohledávání",
+"directory" => "adresář",
+"directories" => "adresáře",
"file" => "soubor",
"files" => "soubory",
"Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..."
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index c2f200e476f..3dd82fadba5 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -1,6 +1,8 @@
<?php $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Kunne ikke flytte %s - der findes allerede en fil med dette navn",
"Could not move %s" => "Kunne ikke flytte %s",
+"Unable to set upload directory." => "Ude af stand til at vælge upload mappe.",
+"Invalid Token" => "Ugyldig Token ",
"No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
"There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
@@ -47,6 +49,7 @@
"{count} folders" => "{count} mapper",
"1 file" => "1 fil",
"{count} files" => "{count} filer",
+"%s could not be renamed" => "%s kunne ikke omdøbes",
"Upload" => "Upload",
"File handling" => "Filhåndtering",
"Maximum upload size" => "Maksimal upload-størrelse",
@@ -70,6 +73,8 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
"Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
"Current scanning" => "Indlæser",
+"directory" => "mappe",
+"directories" => "Mapper",
"file" => "fil",
"files" => "filer",
"Upgrading filesystem cache..." => "Opgraderer filsystems cachen..."
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 435c821400d..33430795ddd 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "Du hast hier keine Schreib-Berechtigung.",
"Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
"Download" => "Herunterladen",
-"Size (MB)" => "Größe (MB)",
"Unshare" => "Freigabe aufheben",
"Upload too large" => "Der Upload ist zu groß",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index d21fd92324f..3ce3b2a7fb5 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "Sie haben hier keine Schreib-Berechtigungen.",
"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
"Download" => "Herunterladen",
-"Size (MB)" => "Größe (MB)",
"Unshare" => "Freigabe aufheben",
"Upload too large" => "Der Upload ist zu groß",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 2d5ac06ff97..78740d51507 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "No tiene permisos de escritura aquí.",
"Nothing in here. Upload something!" => "No hay nada aquí. ¡Suba algo!",
"Download" => "Descargar",
-"Size (MB)" => "Tamaño (MB)",
"Unshare" => "Dejar de compartir",
"Upload too large" => "Subida demasido grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 6585d074bb8..3fc3be17982 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "No tenés permisos de escritura acá.",
"Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
"Download" => "Descargar",
-"Size (MB)" => "Tamaño (MB)",
"Unshare" => "Dejar de compartir",
"Upload too large" => "El tamaño del archivo que querés subir es demasiado grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 8ba928be94d..c58b066e287 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "Siin puudvad sul kirjutamisõigused.",
"Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
"Download" => "Lae alla",
-"Size (MB)" => "Suurus (MB)",
"Unshare" => "Lõpeta jagamine",
"Upload too large" => "Üleslaadimine on liiga suur",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 3ef27d5cad2..96bfb2d1cc8 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "Ez duzu hemen idazteko baimenik.",
"Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
"Download" => "Deskargatu",
-"Size (MB)" => "Tamaina (MB)",
"Unshare" => "Ez elkarbanatu",
"Upload too large" => "Igoera handiegia da",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 8a6089f635b..73f4b493b4d 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "شما اجازه ی نوشتن در اینجا را ندارید",
"Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
"Download" => "دانلود",
-"Size (MB)" => "اندازه(مگابایت)",
"Unshare" => "لغو اشتراک",
"Upload too large" => "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index c57c0ea898e..40df7b1546e 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -60,7 +60,6 @@
"You don’t have write permissions here." => "Tunnuksellasi ei ole kirjoitusoikeuksia tänne.",
"Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
"Download" => "Lataa",
-"Size (MB)" => "Koko (Mt)",
"Unshare" => "Peru jakaminen",
"Upload too large" => "Lähetettävä tiedosto on liian suuri",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index dc1a33ac65c..b293f85ed42 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "Vous n'avez pas le droit d'écriture ici.",
"Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
"Download" => "Télécharger",
-"Size (MB)" => "Taille (Mo)",
"Unshare" => "Ne plus partager",
"Upload too large" => "Téléversement trop volumineux",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 4a1c7720caf..bba6335ae05 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "Non ten permisos para escribir aquí.",
"Nothing in here. Upload something!" => "Aquí non hai nada. Envíe algo.",
"Download" => "Descargar",
-"Size (MB)" => "Tamaño (MB)",
"Unshare" => "Deixar de compartir",
"Upload too large" => "Envío demasiado grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 21a519ea42b..b0833516958 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "Itt nincs írásjoga.",
"Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!",
"Download" => "Letöltés",
-"Size (MB)" => "Méret (MB)",
"Unshare" => "A megosztás visszavonása",
"Upload too large" => "A feltöltés túl nagy",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 8ea6bb48aba..28b33795aeb 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "Qui non hai i permessi di scrittura.",
"Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
"Download" => "Scarica",
-"Size (MB)" => "Dimensione (MB)",
"Unshare" => "Rimuovi condivisione",
"Upload too large" => "Caricamento troppo grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index cb5480199e2..e4be3133fb0 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "あなたには書き込み権限がありません。",
"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
"Download" => "ダウンロード",
-"Size (MB)" => "サイズ(MB)",
"Unshare" => "共有解除",
"Upload too large" => "アップロードには大きすぎます。",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index e6d0ed41049..d4080a17960 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -66,7 +66,6 @@
"You don’t have write permissions here." => "Du har ikke skrivetilgang her.",
"Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
"Download" => "Last ned",
-"Size (MB)" => "Størrelse (MB)",
"Unshare" => "Avslutt deling",
"Upload too large" => "Filen er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 914d5087af1..0d906cb138b 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -49,6 +49,7 @@
"{count} folders" => "{count} mappen",
"1 file" => "1 bestand",
"{count} files" => "{count} bestanden",
+"%s could not be renamed" => "%s kon niet worden hernoemd",
"Upload" => "Uploaden",
"File handling" => "Bestand",
"Maximum upload size" => "Maximale bestandsgrootte voor uploads",
@@ -72,6 +73,8 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server.",
"Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
"Current scanning" => "Er wordt gescand",
+"directory" => "directory",
+"directories" => "directories",
"file" => "bestand",
"files" => "bestanden",
"Upgrading filesystem cache..." => "Upgraden bestandssysteem cache..."
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index a1e06483b68..3ad679f8764 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "Você não possui permissão de escrita aqui.",
"Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
"Download" => "Baixar",
-"Size (MB)" => "Tamanho (MB)",
"Unshare" => "Descompartilhar",
"Upload too large" => "Upload muito grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 8656edfc16b..8aeb30efbf2 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "Não tem permissões de escrita aqui.",
"Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
"Download" => "Transferir",
-"Size (MB)" => "Tamanho (MB)",
"Unshare" => "Deixar de partilhar",
"Upload too large" => "Upload muito grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 225de32d62e..71742cb4d57 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "У вас нет разрешений на запись здесь.",
"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
"Download" => "Скачать",
-"Size (MB)" => "Размер (Мб)",
"Unshare" => "Закрыть общий доступ",
"Upload too large" => "Файл слишком велик",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 132a014e61f..70f3121a20c 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "Du saknar skrivbehörighet här.",
"Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
"Download" => "Ladda ner",
-"Size (MB)" => "Storlek (MB)",
"Unshare" => "Sluta dela",
"Upload too large" => "För stor uppladdning",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 6778141c386..6b479b580eb 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "Buraya erişim hakkınız yok.",
"Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!",
"Download" => "İndir",
-"Size (MB)" => "Boyut (MB)",
"Unshare" => "Paylaşılmayan",
"Upload too large" => "Yükleme çok büyük",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index a515b8ac1bf..469211ca7f4 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "您没有写入权限。",
"Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
"Download" => "下载",
-"Size (MB)" => "大小 (MB)",
"Unshare" => "取消分享",
"Upload too large" => "上传过大",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 6801b311ae4..63d2bd92365 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -68,7 +68,6 @@
"You don’t have write permissions here." => "您在這裡沒有編輯權。",
"Nothing in here. Upload something!" => "這裡什麼也沒有,上傳一些東西吧!",
"Download" => "下載",
-"Size (MB)" => "大小 (MB)",
"Unshare" => "取消共享",
"Upload too large" => "上傳過大",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。",
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index fa4cda6f6b2..79c283dc336 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -38,9 +38,7 @@
</form>
</div>
<?php if ($_['trash'] ): ?>
- <div id="trash" class="button">
- <a><?php p($l->t('Deleted files'));?></a>
- </div>
+ <input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?>></input>
<?php endif; ?>
<div id="uploadprogresswrapper">
<div id="uploadprogressbar"></div>
@@ -61,7 +59,7 @@
<div id="emptyfolder"><?php p($l->t('Nothing in here. Upload something!'))?></div>
<?php endif; ?>
-<table id="filestable">
+<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>">
<thead>
<tr>
<th id='headerName'>