diff options
Diffstat (limited to 'apps/files_trashbin')
87 files changed, 476 insertions, 657 deletions
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 92361b65f63..75d481768ad 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -3,17 +3,36 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); -$files = $_POST['files']; -$dirlisting = $_POST['dirlisting']; -$list = json_decode($files); - +// "empty trash" command +if (isset($_POST['allfiles']) and $_POST['allfiles'] === 'true'){ + $deleteAll = true; + $folder = isset($_POST['dir']) ? $_POST['dir'] : '/'; + if ($folder === '/' || $folder === '') { + OCA\Files_Trashbin\Trashbin::deleteAll(); + $list = array(); + } else { + $dirname = dirname($folder); + if ( $dirname !== '/' && $dirname !== '.' ) { + $dirlisting = '1'; + } else { + $dirlisting = '0'; + } + $list[] = $folder; + } +} +else { + $deleteAll = false; + $files = $_POST['files']; + $dirlisting = $_POST['dirlisting']; + $list = json_decode($files); +} $error = array(); $success = array(); - $i = 0; foreach ($list as $file) { if ( $dirlisting === '0') { + $file = ltrim($file, '/'); $delimiter = strrpos($file, '.d'); $filename = substr($file, 0, $delimiter); $timestamp = substr($file, $delimiter+2); @@ -23,13 +42,15 @@ foreach ($list as $file) { } OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp); - if (!OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) { + if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) { + $error[] = $filename; + OC_Log::write('trashbin','can\'t delete ' . $filename . ' permanently.', OC_Log::ERROR); + } + // only list deleted files if not deleting everything + else if (!$deleteAll) { $success[$i]['filename'] = $file; $success[$i]['timestamp'] = $timestamp; $i++; - } else { - $error[] = $filename; - OC_Log::write('trashbin','can\'t delete ' . $filename . ' permanently.', OC_Log::ERROR); } } diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php index a0846b051c7..ce432f4d14e 100644 --- a/apps/files_trashbin/ajax/preview.php +++ b/apps/files_trashbin/ajax/preview.php @@ -29,8 +29,14 @@ if($maxX === 0 || $maxY === 0) { } try{ - $preview = new \OC\Preview(\OC_User::getUser(), 'files_trashbin/files'); - $preview->setFile($file); + $preview = new \OC\Preview(\OC_User::getUser(), 'files_trashbin/files', $file); + $view = new \OC\Files\View('/'.\OC_User::getUser(). '/files_trashbin/files'); + if ($view->is_dir($file)) { + $mimetype = 'httpd/unix-directory'; + } else { + $mimetype = \OC_Helper::getFileNameMimeType(pathinfo($file, PATHINFO_FILENAME)); + } + $preview->setMimetype($mimetype); $preview->setMaxX($maxX); $preview->setMaxY($maxY); $preview->setScalingUp($scalingUp); diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index e39004cc0d5..876ad269a70 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -13,6 +13,7 @@ $success = array(); $i = 0; foreach ($list as $file) { if ( $dirlisting === '0') { + $file = ltrim($file, '/'); $delimiter = strrpos($file, '.d'); $filename = substr($file, 0, $delimiter); $timestamp = substr($file, $delimiter+2); diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml index e9cbdafc1cd..2cc7d9a7ac3 100644 --- a/apps/files_trashbin/appinfo/info.xml +++ b/apps/files_trashbin/appinfo/info.xml @@ -6,7 +6,7 @@ ownCloud keeps a copy of your deleted files in case you need them again. To make sure that the user doesn't run out of memory the deleted files app manages the size of the deleted files for the user. By default deleted files - stay in the trash bin for 180 days. ownCloud checks the age of the files + stay in the trash bin for 90 days. ownCloud checks the age of the files every time a new files gets moved to the deleted files and remove all files older than 180 days. The user can adjust this value in the config.php by setting the "trashbin_retention_obligation" value. diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css new file mode 100644 index 00000000000..97819f4e80b --- /dev/null +++ b/apps/files_trashbin/css/trash.css @@ -0,0 +1,3 @@ +#fileList td a.file, #fileList td a.file span { + cursor: default; +} diff --git a/apps/files_trashbin/download.php b/apps/files_trashbin/download.php deleted file mode 100644 index 60328e1dddb..00000000000 --- a/apps/files_trashbin/download.php +++ /dev/null @@ -1,51 +0,0 @@ -<?php - -/** -* ownCloud - trash bin -* -* @author Bjoern Schiessle -* @copyright 2013 Bjoern Schiessle schiessle@owncloud.com -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ - -// Check if we are a user -OCP\User::checkLoggedIn(); - -$filename = $_GET["file"]; - -$view = new OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin/files'); - -if(!$view->file_exists($filename)) { - header("HTTP/1.0 404 Not Found"); - $tmpl = new OCP\Template( '', '404', 'guest' ); - $tmpl->assign('file', $filename); - $tmpl->printPage(); - exit; -} - -$ftype=$view->getMimeType( $filename ); - -header('Content-Type:'.$ftype);if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) { - header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' ); -} else { - header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) ) - . '; filename="' . rawurlencode( basename($filename) ) . '"' ); -} -OCP\Response::disableCaching(); -header('Content-Length: '. $view->filesize($filename)); - -OC_Util::obEnd(); -$view->readfile( $filename ); diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index d8661e170a5..93f385dd30b 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -5,16 +5,17 @@ OCP\User::checkLoggedIn(); OCP\App::setActiveNavigationEntry('files_index'); -OCP\Util::addScript('files_trashbin', 'trash'); OCP\Util::addScript('files_trashbin', 'disableDefaultActions'); OCP\Util::addScript('files', 'fileactions'); $tmpl = new OCP\Template('files_trashbin', 'index', 'user'); OCP\Util::addStyle('files', 'files'); +OCP\Util::addStyle('files_trashbin', 'trash'); OCP\Util::addScript('files', 'filelist'); // filelist overrides OCP\Util::addScript('files_trashbin', 'filelist'); OCP\Util::addscript('files', 'files'); +OCP\Util::addScript('files_trashbin', 'trash'); $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : ''; diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js index cd5a67ddfe0..f42abb6d029 100644 --- a/apps/files_trashbin/js/filelist.js +++ b/apps/files_trashbin/js/filelist.js @@ -22,3 +22,10 @@ FileList.reload = function(){ FileList.linkTo = function(dir){ return OC.linkTo('files_trashbin', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/'); } + +FileList.updateEmptyContent = function(){ + var $fileList = $('#fileList'); + var exists = $fileList.find('tr:first').exists(); + $('#emptycontent').toggleClass('hidden', exists); + $('#filestable th').toggleClass('hidden', !exists); +} diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index d73eadb6011..46d8b56308c 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -3,15 +3,40 @@ $(document).ready(function() { if (typeof FileActions !== 'undefined') { FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) { - var tr=$('tr').filterAttr('data-file', filename); - var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>'; - var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date"); - var files = tr.attr('data-file'); - undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner; + var tr = FileList.findFileEl(filename); + var deleteAction = tr.children("td.date").children(".action.delete"); + deleteAction.removeClass('delete-icon').addClass('progress-icon'); disableActions(); - $.post(OC.filePath('files_trashbin','ajax','undelete.php'), - {files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') }, - function(result){ + $.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), + {files: JSON.stringify([$('#dir').val() + '/' + filename]), dirlisting: tr.attr('data-dirlisting')}, + function(result) { + for (var i = 0; i < result.data.success.length; i++) { + var row = document.getElementById(result.data.success[i].filename); + row.parentNode.removeChild(row); + } + if (result.status !== 'success') { + OC.dialogs.alert(result.data.message, t('core', 'Error')); + } + enableActions(); + FileList.updateFileSummary(); + FileList.updateEmptyContent(); + } + ); + + }); + }; + + FileActions.register('all', 'Delete', OC.PERMISSION_READ, function() { + return OC.imagePath('core', 'actions/delete'); + }, function(filename) { + $('.tipsy').remove(); + var tr = FileList.findFileEl(filename); + var deleteAction = tr.children("td.date").children(".action.delete"); + deleteAction.removeClass('delete-icon').addClass('progress-icon'); + disableActions(); + $.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'), + {files: JSON.stringify([$('#dir').val() + '/' +filename]), dirlisting: tr.attr('data-dirlisting')}, + function(result) { for (var i = 0; i < result.data.success.length; i++) { var row = document.getElementById(result.data.success[i].filename); row.parentNode.removeChild(row); @@ -21,26 +46,40 @@ $(document).ready(function() { } enableActions(); FileList.updateFileSummary(); - }); + FileList.updateEmptyContent(); + } + ); - }); - }; + }); + + // Sets the select_all checkbox behaviour : + $('#select_all').click(function() { + if ($(this).attr('checked')) { + // Check all + $('td.filename input:checkbox').attr('checked', true); + $('td.filename input:checkbox').parent().parent().addClass('selected'); + } else { + // Uncheck all + $('td.filename input:checkbox').attr('checked', false); + $('td.filename input:checkbox').parent().parent().removeClass('selected'); + } + procesSelection(); + }); - FileActions.register('all', 'Delete', OC.PERMISSION_READ, function () { - return OC.imagePath('core', 'actions/delete'); - }, function (filename) { - $('.tipsy').remove(); + $('.undelete').click('click', function(event) { + event.preventDefault(); + var files = getSelectedFiles('file'); + var fileslist = JSON.stringify(files); + var dirlisting = getSelectedFiles('dirlisting')[0]; + disableActions(); + for (var i = 0; i < files.length; i++) { + var deleteAction = FileList.findFileEl(files[i]).children("td.date").children(".action.delete"); + deleteAction.removeClass('delete-icon').addClass('progress-icon'); + } - var tr=$('tr').filterAttr('data-file', filename); - var deleteAction = $('tr').filterAttr('data-file',filename).children("td.date").children(".action.delete"); - var oldHTML = deleteAction[0].outerHTML; - var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'delete file permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>'; - var files = tr.attr('data-file'); - deleteAction[0].outerHTML = newHTML; - disableActions(); - $.post(OC.filePath('files_trashbin','ajax','delete.php'), - {files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') }, - function(result){ + $.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), + {files: fileslist, dirlisting: dirlisting}, + function(result) { for (var i = 0; i < result.data.success.length; i++) { var row = document.getElementById(result.data.success[i].filename); row.parentNode.removeChild(row); @@ -50,106 +89,79 @@ $(document).ready(function() { } enableActions(); FileList.updateFileSummary(); - }); - - }); - - // Sets the select_all checkbox behaviour : - $('#select_all').click(function() { - if($(this).attr('checked')){ - // Check all - $('td.filename input:checkbox').attr('checked', true); - $('td.filename input:checkbox').parent().parent().addClass('selected'); - }else{ - // Uncheck all - $('td.filename input:checkbox').attr('checked', false); - $('td.filename input:checkbox').parent().parent().removeClass('selected'); - } - processSelection(); - }); - - $('td.filename input:checkbox').live('change',function(event) { - if (event.shiftKey) { - var last = $(lastChecked).parent().parent().prevAll().length; - var first = $(this).parent().parent().prevAll().length; - var start = Math.min(first, last); - var end = Math.max(first, last); - var rows = $(this).parent().parent().parent().children('tr'); - for (var i = start; i < end; i++) { - $(rows).each(function(index) { - if (index === i) { - var checkbox = $(this).children().children('input:checkbox'); - $(checkbox).attr('checked', 'checked'); - $(checkbox).parent().parent().addClass('selected'); - } - }); + FileList.updateEmptyContent(); } - } - var selectedCount=$('td.filename input:checkbox:checked').length; - $(this).parent().parent().toggleClass('selected'); - if(!$(this).attr('checked')){ - $('#select_all').attr('checked',false); - }else{ - if(selectedCount==$('td.filename input:checkbox').length){ - $('#select_all').attr('checked',true); - } - } - processSelection(); - }); + ); + }); - $('.undelete').click('click',function(event) { - event.preventDefault(); - var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>'; - var files=getSelectedFiles('file'); - var fileslist = JSON.stringify(files); - var dirlisting=getSelectedFiles('dirlisting')[0]; - disableActions(); - for (var i=0; i<files.length; i++) { - var undeleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date"); - undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner; + $('.delete').click('click', function(event) { + event.preventDefault(); + var allFiles = $('#select_all').is(':checked'); + var files = []; + var params = {}; + if (allFiles) { + params = { + allfiles: true, + dir: $('#dir').val() + }; + } + else { + files = getSelectedFiles('file'); + params = { + files: JSON.stringify(files), + dirlisting: getSelectedFiles('dirlisting')[0] + }; + }; + + disableActions(); + if (allFiles) { + FileList.showMask(); + } + else { + for (var i = 0; i < files.length; i++) { + var deleteAction = FileList.findFileEl(files[i]).children("td.date").children(".action.delete"); + deleteAction.removeClass('delete-icon').addClass('progress-icon'); } + } - $.post(OC.filePath('files_trashbin','ajax','undelete.php'), - {files:fileslist, dirlisting:dirlisting}, - function(result){ + $.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'), + params, + function(result) { + if (allFiles) { + FileList.hideMask(); + // simply remove all files + $('#fileList').empty(); + } + else { for (var i = 0; i < result.data.success.length; i++) { var row = document.getElementById(result.data.success[i].filename); row.parentNode.removeChild(row); } - if (result.status !== 'success') { - OC.dialogs.alert(result.data.message, t('core', 'Error')); - } - enableActions(); - }); - }); + } + if (result.status !== 'success') { + OC.dialogs.alert(result.data.message, t('core', 'Error')); + } + enableActions(); + FileList.updateFileSummary(); + FileList.updateEmptyContent(); + } + ); - $('.delete').click('click',function(event) { - event.preventDefault(); - console.log("delete selected"); - var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'Delete permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>'; - var files=getSelectedFiles('file'); - var fileslist = JSON.stringify(files); - var dirlisting=getSelectedFiles('dirlisting')[0]; + }); - disableActions(); - for (var i=0; i<files.length; i++) { - var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date"); - deleteAction[0].innerHTML = deleteAction[0].innerHTML+spinner; + $('#fileList').on('click', 'td.filename input', function() { + var checkbox = $(this).parent().children('input:checkbox'); + $(checkbox).parent().parent().toggleClass('selected'); + if ($(checkbox).is(':checked')) { + var selectedCount = $('td.filename input:checkbox:checked').length; + if (selectedCount === $('td.filename input:checkbox').length) { + $('#select_all').prop('checked', true); } - - $.post(OC.filePath('files_trashbin','ajax','delete.php'), - {files:fileslist, dirlisting:dirlisting}, - function(result){ - for (var i = 0; i < result.data.success.length; i++) { - var row = document.getElementById(result.data.success[i].filename); - row.parentNode.removeChild(row); - } - if (result.status !== 'success') { - OC.dialogs.alert(result.data.message, t('core', 'Error')); - } - enableActions(); - }); - }); + } else { + $('#select_all').prop('checked',false); + } + procesSelection(); + }); $('#fileList').on('click', 'td.filename a', function(event) { var mime = $(this).parent().parent().data('mime'); @@ -157,7 +169,7 @@ $(document).ready(function() { event.preventDefault(); } var filename = $(this).parent().parent().attr('data-file'); - var tr = $('tr').filterAttr('data-file',filename); + var tr = FileList.findFileEl(filename); var renaming = tr.data('renaming'); if(!renaming && !FileList.isLoading(filename)){ if(mime.substr(0, 5) === 'text/'){ //no texteditor for now @@ -182,34 +194,6 @@ $(document).ready(function() { }; }); -function processSelection(){ - var selected=getSelectedFiles(); - var selectedFiles=selected.filter(function(el){return el.type === 'file'}); - var selectedFolders=selected.filter(function(el){return el.type === 'dir'}); - if(selectedFiles.length === 0 && selectedFolders.length === 0) { - $('#headerName>span.name').text(t('files','Name')); - $('#modified').text(t('files','Deleted')); - $('table').removeClass('multiselect'); - $('.selectedActions').hide(); - } - else { - $('.selectedActions').show(); - var selection=''; - if(selectedFolders.length>0){ - selection += n('files', '%n folder', '%n folders', selectedFolders.length); - if(selectedFiles.length>0){ - selection+=' & '; - } - } - if(selectedFiles.length>0){ - selection += n('files', '%n file', '%n files', selectedFiles.length); - } - $('#headerName>span.name').text(selection); - $('#modified').text(''); - $('table').addClass('multiselect'); - } -} - /** * @brief get a list of selected files * @param string property (option) the property of the file requested @@ -225,7 +209,7 @@ function getSelectedFiles(property){ elements.each(function(i,element){ var file={ name:$(element).attr('data-filename'), - file:$(element).attr('data-file'), + file:$('#dir').val() + "/" + $(element).attr('data-file'), timestamp:$(element).attr('data-timestamp'), type:$(element).attr('data-type'), dirlisting:$(element).attr('data-dirlisting') @@ -252,9 +236,4 @@ function disableActions() { $(".action").css("display", "none"); $(":input:checkbox").css("display", "none"); } -function onClickBreadcrumb(e){ - var $el = $(e.target).closest('.crumb'); - e.preventDefault(); - FileList.changeDirectory(decodeURIComponent($el.data('dir'))); -} diff --git a/apps/files_trashbin/l10n/ady.php b/apps/files_trashbin/l10n/ady.php new file mode 100644 index 00000000000..0acad00e8b5 --- /dev/null +++ b/apps/files_trashbin/l10n/ady.php @@ -0,0 +1,6 @@ +<?php +$TRANSLATIONS = array( +"_%n folder_::_%n folders_" => array("",""), +"_%n file_::_%n files_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/ar.php b/apps/files_trashbin/l10n/ar.php index 710a9d14196..9733e6b100e 100644 --- a/apps/files_trashbin/l10n/ar.php +++ b/apps/files_trashbin/l10n/ar.php @@ -2,16 +2,11 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "تعذّر حذف%s بشكل دائم", "Couldn't restore %s" => "تعذّر استرجاع %s ", -"perform restore operation" => "إبدء عملية الإستعادة", "Error" => "خطأ", -"delete file permanently" => "حذف بشكل دائم", -"Delete permanently" => "حذف بشكل دائم", -"Name" => "اسم", -"Deleted" => "تم الحذف", -"_%n folder_::_%n folders_" => array("","","","","",""), -"_%n file_::_%n files_" => array("","","","","",""), "Nothing in here. Your trash bin is empty!" => "لا يوجد شيء هنا. سلة المهملات خاليه.", +"Name" => "اسم", "Restore" => "استعيد", +"Deleted" => "تم الحذف", "Delete" => "إلغاء", "Deleted Files" => "الملفات المحذوفه" ); diff --git a/apps/files_trashbin/l10n/be.php b/apps/files_trashbin/l10n/be.php index 50df7ff5a97..6a34f1fe246 100644 --- a/apps/files_trashbin/l10n/be.php +++ b/apps/files_trashbin/l10n/be.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"_%n folder_::_%n folders_" => array("","","",""), -"_%n file_::_%n files_" => array("","","","") +"Error" => "Памылка" ); $PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php index 3c12e6906ed..2f1521feaa5 100644 --- a/apps/files_trashbin/l10n/bg_BG.php +++ b/apps/files_trashbin/l10n/bg_BG.php @@ -2,16 +2,11 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Невъзможно перманентното изтриване на %s", "Couldn't restore %s" => "Невъзможно възтановяване на %s", -"perform restore operation" => "извършване на действие по възстановяване", "Error" => "Грешка", -"delete file permanently" => "изтриване на файла завинаги", -"Delete permanently" => "Изтриване завинаги", -"Name" => "Име", -"Deleted" => "Изтрито", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Nothing in here. Your trash bin is empty!" => "Няма нищо. Кофата е празна!", +"Name" => "Име", "Restore" => "Възтановяване", +"Deleted" => "Изтрито", "Delete" => "Изтриване", "Deleted Files" => "Изтрити файлове" ); diff --git a/apps/files_trashbin/l10n/bn_BD.php b/apps/files_trashbin/l10n/bn_BD.php index c3741dbd1db..d3a9f23b377 100644 --- a/apps/files_trashbin/l10n/bn_BD.php +++ b/apps/files_trashbin/l10n/bn_BD.php @@ -2,8 +2,6 @@ $TRANSLATIONS = array( "Error" => "সমস্যা", "Name" => "রাম", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Delete" => "মুছে" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/bs.php b/apps/files_trashbin/l10n/bs.php index af7033bd183..08ef9b4fdbb 100644 --- a/apps/files_trashbin/l10n/bs.php +++ b/apps/files_trashbin/l10n/bs.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Name" => "Ime", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","","") +"Name" => "Ime" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php index eb57aa16aa5..fa3f63ddb22 100644 --- a/apps/files_trashbin/l10n/ca.php +++ b/apps/files_trashbin/l10n/ca.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "No s'ha pogut esborrar permanentment %s", "Couldn't restore %s" => "No s'ha pogut restaurar %s", -"perform restore operation" => "executa l'operació de restauració", "Error" => "Error", -"delete file permanently" => "esborra el fitxer permanentment", -"Delete permanently" => "Esborra permanentment", -"Name" => "Nom", -"Deleted" => "Eliminat", -"_%n folder_::_%n folders_" => array("","%n carpetes"), -"_%n file_::_%n files_" => array("","%n fitxers"), "restored" => "restaurat", "Nothing in here. Your trash bin is empty!" => "La paperera està buida!", +"Name" => "Nom", "Restore" => "Recupera", +"Deleted" => "Eliminat", "Delete" => "Esborra", "Deleted Files" => "Fitxers eliminats" ); diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php index f0bebee742f..ff0a69572f5 100644 --- a/apps/files_trashbin/l10n/cs_CZ.php +++ b/apps/files_trashbin/l10n/cs_CZ.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Nelze trvale odstranit %s", "Couldn't restore %s" => "Nelze obnovit %s", -"perform restore operation" => "provést obnovu", "Error" => "Chyba", -"delete file permanently" => "trvale odstranit soubor", -"Delete permanently" => "Trvale odstranit", -"Name" => "Název", -"Deleted" => "Smazáno", -"_%n folder_::_%n folders_" => array("%n adresář","%n adresáře","%n adresářů"), -"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"), "restored" => "obnoveno", "Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.", +"Name" => "Název", "Restore" => "Obnovit", +"Deleted" => "Smazáno", "Delete" => "Smazat", "Deleted Files" => "Smazané soubory" ); diff --git a/apps/files_trashbin/l10n/cy_GB.php b/apps/files_trashbin/l10n/cy_GB.php index 123a445c2c1..f2eb81d67d2 100644 --- a/apps/files_trashbin/l10n/cy_GB.php +++ b/apps/files_trashbin/l10n/cy_GB.php @@ -2,16 +2,11 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Methwyd dileu %s yn barhaol", "Couldn't restore %s" => "Methwyd adfer %s", -"perform restore operation" => "gweithrediad adfer", "Error" => "Gwall", -"delete file permanently" => "dileu ffeil yn barhaol", -"Delete permanently" => "Dileu'n barhaol", -"Name" => "Enw", -"Deleted" => "Wedi dileu", -"_%n folder_::_%n folders_" => array("","","",""), -"_%n file_::_%n files_" => array("","","",""), "Nothing in here. Your trash bin is empty!" => "Does dim byd yma. Mae eich bin sbwriel yn wag!", +"Name" => "Enw", "Restore" => "Adfer", +"Deleted" => "Wedi dileu", "Delete" => "Dileu", "Deleted Files" => "Ffeiliau Ddilewyd" ); diff --git a/apps/files_trashbin/l10n/da.php b/apps/files_trashbin/l10n/da.php index 2fbc0893878..c396706d152 100644 --- a/apps/files_trashbin/l10n/da.php +++ b/apps/files_trashbin/l10n/da.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Kunne ikke slette %s permanent", "Couldn't restore %s" => "Kunne ikke gendanne %s", -"perform restore operation" => "udfør gendannelsesoperation", "Error" => "Fejl", -"delete file permanently" => "slet fil permanent", -"Delete permanently" => "Slet permanent", -"Name" => "Navn", -"Deleted" => "Slettet", -"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), -"_%n file_::_%n files_" => array("%n fil","%n filer"), "restored" => "Gendannet", "Nothing in here. Your trash bin is empty!" => "Intet at se her. Din papirkurv er tom!", +"Name" => "Navn", "Restore" => "Gendan", +"Deleted" => "Slettet", "Delete" => "Slet", "Deleted Files" => "Slettede filer" ); diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php index ad6e0839bd6..2b6703dd058 100644 --- a/apps/files_trashbin/l10n/de.php +++ b/apps/files_trashbin/l10n/de.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen", "Couldn't restore %s" => "Konnte %s nicht wiederherstellen", -"perform restore operation" => "Wiederherstellung ausführen", "Error" => "Fehler", -"delete file permanently" => "Datei dauerhaft löschen", -"Delete permanently" => "Endgültig löschen", -"Name" => "Name", -"Deleted" => "gelöscht", -"_%n folder_::_%n folders_" => array("","%n Ordner"), -"_%n file_::_%n files_" => array("","%n Dateien"), "restored" => "Wiederhergestellt", "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, der Papierkorb ist leer!", +"Name" => "Name", "Restore" => "Wiederherstellen", +"Deleted" => "gelöscht", "Delete" => "Löschen", "Deleted Files" => "Gelöschte Dateien" ); diff --git a/apps/files_trashbin/l10n/de_CH.php b/apps/files_trashbin/l10n/de_CH.php index 92290a0de50..ec9f0b5309d 100644 --- a/apps/files_trashbin/l10n/de_CH.php +++ b/apps/files_trashbin/l10n/de_CH.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen", "Couldn't restore %s" => "Konnte %s nicht wiederherstellen", -"perform restore operation" => "Wiederherstellung ausführen", "Error" => "Fehler", -"delete file permanently" => "Datei dauerhaft löschen", -"Delete permanently" => "Endgültig löschen", -"Name" => "Name", -"Deleted" => "Gelöscht", -"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), -"_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "restored" => "Wiederhergestellt", "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!", +"Name" => "Name", "Restore" => "Wiederherstellen", +"Deleted" => "Gelöscht", "Delete" => "Löschen", "Deleted Files" => "Gelöschte Dateien" ); diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php index 0df69412801..ec9f0b5309d 100644 --- a/apps/files_trashbin/l10n/de_DE.php +++ b/apps/files_trashbin/l10n/de_DE.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen", "Couldn't restore %s" => "Konnte %s nicht wiederherstellen", -"perform restore operation" => "Wiederherstellung ausführen", "Error" => "Fehler", -"delete file permanently" => "Datei dauerhaft löschen", -"Delete permanently" => "Endgültig löschen", -"Name" => "Name", -"Deleted" => "Gelöscht", -"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"), -"_%n file_::_%n files_" => array("%n Dateien","%n Dateien"), "restored" => "Wiederhergestellt", "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!", +"Name" => "Name", "Restore" => "Wiederherstellen", +"Deleted" => "Gelöscht", "Delete" => "Löschen", "Deleted Files" => "Gelöschte Dateien" ); diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php index 939c7fed614..b4ee30c578d 100644 --- a/apps/files_trashbin/l10n/el.php +++ b/apps/files_trashbin/l10n/el.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Αδύνατη η μόνιμη διαγραφή του %s", "Couldn't restore %s" => "Αδυναμία επαναφοράς %s", -"perform restore operation" => "εκτέλεση λειτουργία επαναφοράς", "Error" => "Σφάλμα", -"delete file permanently" => "μόνιμη διαγραφή αρχείου", -"Delete permanently" => "Μόνιμη διαγραφή", -"Name" => "Όνομα", -"Deleted" => "Διαγράφηκε", -"_%n folder_::_%n folders_" => array("","%n φάκελοι"), -"_%n file_::_%n files_" => array("","%n αρχεία"), -"restored" => "έγινε επαναφορά", +"restored" => "επαναφέρθηκαν", "Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!", +"Name" => "Όνομα", "Restore" => "Επαναφορά", +"Deleted" => "Διαγραμμένα", "Delete" => "Διαγραφή", "Deleted Files" => "Διαγραμμένα Αρχεία" ); diff --git a/apps/files_trashbin/l10n/en_GB.php b/apps/files_trashbin/l10n/en_GB.php index be9d8b9f520..6b179c86532 100644 --- a/apps/files_trashbin/l10n/en_GB.php +++ b/apps/files_trashbin/l10n/en_GB.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Couldn't delete %s permanently", "Couldn't restore %s" => "Couldn't restore %s", -"perform restore operation" => "perform restore operation", "Error" => "Error", -"delete file permanently" => "delete file permanently", -"Delete permanently" => "Delete permanently", -"Name" => "Name", -"Deleted" => "Deleted", -"_%n folder_::_%n folders_" => array("%n folder","%n folders"), -"_%n file_::_%n files_" => array("%n file","%n files"), "restored" => "restored", "Nothing in here. Your trash bin is empty!" => "Nothing in here. Your recycle bin is empty!", +"Name" => "Name", "Restore" => "Restore", +"Deleted" => "Deleted", "Delete" => "Delete", "Deleted Files" => "Deleted Files" ); diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php index d1e30cba588..b8f999eaafa 100644 --- a/apps/files_trashbin/l10n/eo.php +++ b/apps/files_trashbin/l10n/eo.php @@ -1,11 +1,13 @@ <?php $TRANSLATIONS = array( +"Couldn't delete %s permanently" => "Ne povis foriĝi %s por ĉiam", +"Couldn't restore %s" => "Ne povis restaŭriĝi %s", "Error" => "Eraro", -"Delete permanently" => "Forigi por ĉiam", +"restored" => "restaŭrita", +"Nothing in here. Your trash bin is empty!" => "Nenio estas ĉi tie. Via rubujo malplenas!", "Name" => "Nomo", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Restore" => "Restaŭri", +"Deleted" => "Forigita", "Delete" => "Forigi", "Deleted Files" => "Forigitaj dosieroj" ); diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php index a5639c2c714..db7a617729b 100644 --- a/apps/files_trashbin/l10n/es.php +++ b/apps/files_trashbin/l10n/es.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente", "Couldn't restore %s" => "No se puede restaurar %s", -"perform restore operation" => "restaurar", "Error" => "Error", -"delete file permanently" => "eliminar archivo permanentemente", -"Delete permanently" => "Eliminar permanentemente", -"Name" => "Nombre", -"Deleted" => "Eliminado", -"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"), -"_%n file_::_%n files_" => array("%n archivo","%n archivos"), "restored" => "recuperado", "Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!", +"Name" => "Nombre", "Restore" => "Recuperar", +"Deleted" => "Eliminado", "Delete" => "Eliminar", "Deleted Files" => "Archivos Eliminados" ); diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php index 0cb969a3483..842101d33be 100644 --- a/apps/files_trashbin/l10n/es_AR.php +++ b/apps/files_trashbin/l10n/es_AR.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "No fue posible borrar %s de manera permanente", "Couldn't restore %s" => "No se pudo restaurar %s", -"perform restore operation" => "Restaurar", "Error" => "Error", -"delete file permanently" => "Borrar archivo de manera permanente", -"Delete permanently" => "Borrar de manera permanente", -"Name" => "Nombre", -"Deleted" => "Borrado", -"_%n folder_::_%n folders_" => array("%n directorio","%n directorios"), -"_%n file_::_%n files_" => array("%n archivo","%n archivos"), "restored" => "recuperado", "Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!", +"Name" => "Nombre", "Restore" => "Recuperar", +"Deleted" => "Borrado", "Delete" => "Borrar", "Deleted Files" => "Archivos eliminados" ); diff --git a/apps/files_trashbin/l10n/es_MX.php b/apps/files_trashbin/l10n/es_MX.php index 0acad00e8b5..db7a617729b 100644 --- a/apps/files_trashbin/l10n/es_MX.php +++ b/apps/files_trashbin/l10n/es_MX.php @@ -1,6 +1,14 @@ <?php $TRANSLATIONS = array( -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("","") +"Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente", +"Couldn't restore %s" => "No se puede restaurar %s", +"Error" => "Error", +"restored" => "recuperado", +"Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!", +"Name" => "Nombre", +"Restore" => "Recuperar", +"Deleted" => "Eliminado", +"Delete" => "Eliminar", +"Deleted Files" => "Archivos Eliminados" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/et_EE.php b/apps/files_trashbin/l10n/et_EE.php index 43c182ea7b3..56eebc79f0b 100644 --- a/apps/files_trashbin/l10n/et_EE.php +++ b/apps/files_trashbin/l10n/et_EE.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "%s jäädavalt kustutamine ebaõnnestus", "Couldn't restore %s" => "%s ei saa taastada", -"perform restore operation" => "soorita taastamine", "Error" => "Viga", -"delete file permanently" => "kustuta fail jäädavalt", -"Delete permanently" => "Kustuta jäädavalt", -"Name" => "Nimi", -"Deleted" => "Kustutatud", -"_%n folder_::_%n folders_" => array("","%n kataloogi"), -"_%n file_::_%n files_" => array("%n fail","%n faili"), "restored" => "taastatud", "Nothing in here. Your trash bin is empty!" => "Siin pole midagi. Sinu prügikast on tühi!", +"Name" => "Nimi", "Restore" => "Taasta", +"Deleted" => "Kustutatud", "Delete" => "Kustuta", "Deleted Files" => "Kustutatud failid" ); diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php index 240582a7ea6..04d92e01b36 100644 --- a/apps/files_trashbin/l10n/eu.php +++ b/apps/files_trashbin/l10n/eu.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Ezin izan da %s betirako ezabatu", "Couldn't restore %s" => "Ezin izan da %s berreskuratu", -"perform restore operation" => "berreskuratu", "Error" => "Errorea", -"delete file permanently" => "ezabatu fitxategia betirako", -"Delete permanently" => "Ezabatu betirako", -"Name" => "Izena", -"Deleted" => "Ezabatuta", -"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"), -"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"), "restored" => "Berrezarrita", "Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!", +"Name" => "Izena", "Restore" => "Berrezarri", +"Deleted" => "Ezabatuta", "Delete" => "Ezabatu", "Deleted Files" => "Ezabatutako Fitxategiak" ); diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php index 654f20a5f1c..8409987b897 100644 --- a/apps/files_trashbin/l10n/fa.php +++ b/apps/files_trashbin/l10n/fa.php @@ -2,16 +2,11 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "%s را نمی توان برای همیشه حذف کرد", "Couldn't restore %s" => "%s را نمی توان بازگرداند", -"perform restore operation" => "انجام عمل بازگرداندن", "Error" => "خطا", -"delete file permanently" => "حذف فایل برای همیشه", -"Delete permanently" => "حذف قطعی", -"Name" => "نام", -"Deleted" => "حذف شده", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Nothing in here. Your trash bin is empty!" => "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است.", +"Name" => "نام", "Restore" => "بازیابی", +"Deleted" => "حذف شده", "Delete" => "حذف", "Deleted Files" => "فایلهای حذف شده" ); diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php index f03950981c0..b956c1c1e4c 100644 --- a/apps/files_trashbin/l10n/fi_FI.php +++ b/apps/files_trashbin/l10n/fi_FI.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Kohdetta %s ei voitu poistaa pysyvästi", "Couldn't restore %s" => "Kohteen %s palautus epäonnistui", -"perform restore operation" => "suorita palautustoiminto", "Error" => "Virhe", -"delete file permanently" => "poista tiedosto pysyvästi", -"Delete permanently" => "Poista pysyvästi", -"Name" => "Nimi", -"Deleted" => "Poistettu", -"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"), -"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"), "restored" => "palautettu", "Nothing in here. Your trash bin is empty!" => "Tyhjää täynnä! Roskakorissa ei ole mitään.", +"Name" => "Nimi", "Restore" => "Palauta", +"Deleted" => "Poistettu", "Delete" => "Poista", "Deleted Files" => "Poistetut tiedostot" ); diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php index 45527805ce1..593310e2c32 100644 --- a/apps/files_trashbin/l10n/fr.php +++ b/apps/files_trashbin/l10n/fr.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Impossible d'effacer %s de façon permanente", "Couldn't restore %s" => "Impossible de restaurer %s", -"perform restore operation" => "effectuer l'opération de restauration", "Error" => "Erreur", -"delete file permanently" => "effacer définitivement le fichier", -"Delete permanently" => "Supprimer de façon définitive", -"Name" => "Nom", -"Deleted" => "Effacé", -"_%n folder_::_%n folders_" => array("","%n dossiers"), -"_%n file_::_%n files_" => array("","%n fichiers"), "restored" => "restauré", "Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !", +"Name" => "Nom", "Restore" => "Restaurer", +"Deleted" => "Effacé", "Delete" => "Supprimer", "Deleted Files" => "Fichiers effacés" ); diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php index 568c17607fe..ae7ef8b319b 100644 --- a/apps/files_trashbin/l10n/gl.php +++ b/apps/files_trashbin/l10n/gl.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Non foi posíbel eliminar %s permanente", "Couldn't restore %s" => "Non foi posíbel restaurar %s", -"perform restore operation" => "realizar a operación de restauración", "Error" => "Erro", -"delete file permanently" => "eliminar o ficheiro permanentemente", -"Delete permanently" => "Eliminar permanentemente", -"Name" => "Nome", -"Deleted" => "Eliminado", -"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"), -"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), "restored" => "restaurado", "Nothing in here. Your trash bin is empty!" => "Aquí non hai nada. O cesto do lixo está baleiro!", +"Name" => "Nome", "Restore" => "Restablecer", +"Deleted" => "Eliminado", "Delete" => "Eliminar", "Deleted Files" => "Ficheiros eliminados" ); diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php index 6aa6264a315..d0bcb327d4a 100644 --- a/apps/files_trashbin/l10n/he.php +++ b/apps/files_trashbin/l10n/he.php @@ -2,16 +2,11 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "לא ניתן למחוק את %s לצמיתות", "Couldn't restore %s" => "לא ניתן לשחזר את %s", -"perform restore operation" => "ביצוע פעולת שחזור", "Error" => "שגיאה", -"delete file permanently" => "מחיקת קובץ לצמיתות", -"Delete permanently" => "מחיקה לצמיתות", -"Name" => "שם", -"Deleted" => "נמחק", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Nothing in here. Your trash bin is empty!" => "אין כאן שום דבר. סל המיחזור שלך ריק!", +"Name" => "שם", "Restore" => "שחזור", +"Deleted" => "נמחק", "Delete" => "מחיקה", "Deleted Files" => "קבצים שנמחקו" ); diff --git a/apps/files_trashbin/l10n/hi.php b/apps/files_trashbin/l10n/hi.php index 71711218b14..d4a26011b58 100644 --- a/apps/files_trashbin/l10n/hi.php +++ b/apps/files_trashbin/l10n/hi.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Error" => "त्रुटि", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("","") +"Error" => "त्रुटि" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/hr.php b/apps/files_trashbin/l10n/hr.php index d227b4979aa..8e8fd22f8ef 100644 --- a/apps/files_trashbin/l10n/hr.php +++ b/apps/files_trashbin/l10n/hr.php @@ -2,8 +2,6 @@ $TRANSLATIONS = array( "Error" => "Greška", "Name" => "Ime", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "Delete" => "Obriši" ); $PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"; diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php index 766ddcbce4d..aa8b45a7d65 100644 --- a/apps/files_trashbin/l10n/hu_HU.php +++ b/apps/files_trashbin/l10n/hu_HU.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Nem sikerült %s végleges törlése", "Couldn't restore %s" => "Nem sikerült %s visszaállítása", -"perform restore operation" => "a visszaállítás végrehajtása", "Error" => "Hiba", -"delete file permanently" => "az állomány végleges törlése", -"Delete permanently" => "Végleges törlés", -"Name" => "Név", -"Deleted" => "Törölve", -"_%n folder_::_%n folders_" => array("","%n mappa"), -"_%n file_::_%n files_" => array("","%n állomány"), "restored" => "visszaállítva", "Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!", +"Name" => "Név", "Restore" => "Visszaállítás", +"Deleted" => "Törölve", "Delete" => "Törlés", "Deleted Files" => "Törölt fájlok" ); diff --git a/apps/files_trashbin/l10n/hy.php b/apps/files_trashbin/l10n/hy.php index 6ff58b56202..f933bec8feb 100644 --- a/apps/files_trashbin/l10n/hy.php +++ b/apps/files_trashbin/l10n/hy.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Delete" => "Ջնջել" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/ia.php b/apps/files_trashbin/l10n/ia.php index c583344a81e..7709ef030e3 100644 --- a/apps/files_trashbin/l10n/ia.php +++ b/apps/files_trashbin/l10n/ia.php @@ -2,8 +2,6 @@ $TRANSLATIONS = array( "Error" => "Error", "Name" => "Nomine", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Delete" => "Deler" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php index 6aad1302f43..a55520fc117 100644 --- a/apps/files_trashbin/l10n/id.php +++ b/apps/files_trashbin/l10n/id.php @@ -2,16 +2,11 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s", "Couldn't restore %s" => "Tidak dapat memulihkan %s", -"perform restore operation" => "jalankan operasi pemulihan", "Error" => "Galat", -"delete file permanently" => "hapus berkas secara permanen", -"Delete permanently" => "Hapus secara permanen", -"Name" => "Nama", -"Deleted" => "Dihapus", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!", +"Name" => "Nama", "Restore" => "Pulihkan", +"Deleted" => "Dihapus", "Delete" => "Hapus", "Deleted Files" => "Berkas yang Dihapus" ); diff --git a/apps/files_trashbin/l10n/is.php b/apps/files_trashbin/l10n/is.php index 55ae4336461..8ccf89739fc 100644 --- a/apps/files_trashbin/l10n/is.php +++ b/apps/files_trashbin/l10n/is.php @@ -2,8 +2,6 @@ $TRANSLATIONS = array( "Error" => "Villa", "Name" => "Nafn", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Delete" => "Eyða" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php index e4b39c4a6d5..b631e0c9e4f 100644 --- a/apps/files_trashbin/l10n/it.php +++ b/apps/files_trashbin/l10n/it.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Impossibile eliminare %s definitivamente", "Couldn't restore %s" => "Impossibile ripristinare %s", -"perform restore operation" => "esegui operazione di ripristino", "Error" => "Errore", -"delete file permanently" => "elimina il file definitivamente", -"Delete permanently" => "Elimina definitivamente", -"Name" => "Nome", -"Deleted" => "Eliminati", -"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"), -"_%n file_::_%n files_" => array("%n file","%n file"), "restored" => "ripristinati", "Nothing in here. Your trash bin is empty!" => "Qui non c'è niente. Il tuo cestino è vuoto.", +"Name" => "Nome", "Restore" => "Ripristina", +"Deleted" => "Eliminati", "Delete" => "Elimina", "Deleted Files" => "File eliminati" ); diff --git a/apps/files_trashbin/l10n/ja_JP.php b/apps/files_trashbin/l10n/ja_JP.php index eb9748d57c0..8d896625b52 100644 --- a/apps/files_trashbin/l10n/ja_JP.php +++ b/apps/files_trashbin/l10n/ja_JP.php @@ -2,18 +2,13 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "%s を完全に削除出来ませんでした", "Couldn't restore %s" => "%s を復元出来ませんでした", -"perform restore operation" => "復元操作を実行する", "Error" => "エラー", -"delete file permanently" => "ファイルを完全に削除する", -"Delete permanently" => "完全に削除する", -"Name" => "名前", -"Deleted" => "削除済み", -"_%n folder_::_%n folders_" => array("%n個のフォルダ"), -"_%n file_::_%n files_" => array("%n個のファイル"), "restored" => "復元済", "Nothing in here. Your trash bin is empty!" => "ここには何もありません。ゴミ箱は空です！", +"Name" => "名前", "Restore" => "復元", +"Deleted" => "削除済み", "Delete" => "削除", -"Deleted Files" => "削除されたファイル" +"Deleted Files" => "ゴミ箱" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/ka_GE.php b/apps/files_trashbin/l10n/ka_GE.php index 236d8951e9d..7440171deef 100644 --- a/apps/files_trashbin/l10n/ka_GE.php +++ b/apps/files_trashbin/l10n/ka_GE.php @@ -2,16 +2,11 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "ფაილი %s–ის სრულად წაშლა ვერ მოხერხდა", "Couldn't restore %s" => "%s–ის აღდგენა ვერ მოხერხდა", -"perform restore operation" => "მიმდინარეობს აღდგენის ოპერაცია", "Error" => "შეცდომა", -"delete file permanently" => "ფაილის სრულად წაშლა", -"Delete permanently" => "სრულად წაშლა", -"Name" => "სახელი", -"Deleted" => "წაშლილი", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Nothing in here. Your trash bin is empty!" => "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!", +"Name" => "სახელი", "Restore" => "აღდგენა", +"Deleted" => "წაშლილი", "Delete" => "წაშლა", "Deleted Files" => "წაშლილი ფაილები" ); diff --git a/apps/files_trashbin/l10n/km.php b/apps/files_trashbin/l10n/km.php index 70f10d7c0bf..f7d9faa38c5 100644 --- a/apps/files_trashbin/l10n/km.php +++ b/apps/files_trashbin/l10n/km.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array("") +"Delete" => "លុប" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php index 9ac5f9802c6..9c3cd2de15f 100644 --- a/apps/files_trashbin/l10n/ko.php +++ b/apps/files_trashbin/l10n/ko.php @@ -1,19 +1,14 @@ <?php $TRANSLATIONS = array( -"Couldn't delete %s permanently" => "%s를 영구적으로 삭제할수 없습니다", -"Couldn't restore %s" => "%s를 복원할수 없습니다", -"perform restore operation" => "복원 작업중", +"Couldn't delete %s permanently" => "%s을(를_ 영구적으로 삭제할 수 없습니다", +"Couldn't restore %s" => "%s을(를) 복원할 수 없습니다", "Error" => "오류", -"delete file permanently" => "영구적으로 파일 삭제하기", -"Delete permanently" => "영원히 삭제", -"Name" => "이름", -"Deleted" => "삭제됨", -"_%n folder_::_%n folders_" => array("폴더 %n개"), -"_%n file_::_%n files_" => array("파일 %n개 "), "restored" => "복원됨", -"Nothing in here. Your trash bin is empty!" => "현재 휴지통은 비어있습니다!", +"Nothing in here. Your trash bin is empty!" => "휴지통이 비어 있습니다!", +"Name" => "이름", "Restore" => "복원", +"Deleted" => "삭제됨", "Delete" => "삭제", -"Deleted Files" => "삭제된 파일들" +"Deleted Files" => "삭제된 파일" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/ku_IQ.php b/apps/files_trashbin/l10n/ku_IQ.php index 3f110f06002..c1962a4075d 100644 --- a/apps/files_trashbin/l10n/ku_IQ.php +++ b/apps/files_trashbin/l10n/ku_IQ.php @@ -1,8 +1,6 @@ <?php $TRANSLATIONS = array( "Error" => "ههڵه", -"Name" => "ناو", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("","") +"Name" => "ناو" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/lb.php b/apps/files_trashbin/l10n/lb.php index cbfd515a8b3..b434ae72176 100644 --- a/apps/files_trashbin/l10n/lb.php +++ b/apps/files_trashbin/l10n/lb.php @@ -2,8 +2,6 @@ $TRANSLATIONS = array( "Error" => "Fehler", "Name" => "Numm", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Delete" => "Läschen" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php index 0a51290f4d9..c4a8463fd0e 100644 --- a/apps/files_trashbin/l10n/lt_LT.php +++ b/apps/files_trashbin/l10n/lt_LT.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Nepavyko negrįžtamai ištrinti %s", "Couldn't restore %s" => "Nepavyko atkurti %s", -"perform restore operation" => "atkurti", "Error" => "Klaida", -"delete file permanently" => "failą ištrinti negrįžtamai", -"Delete permanently" => "Ištrinti negrįžtamai", -"Name" => "Pavadinimas", -"Deleted" => "Ištrinti", -"_%n folder_::_%n folders_" => array("","","%n aplankų"), -"_%n file_::_%n files_" => array("","","%n failų"), "restored" => "atstatyta", "Nothing in here. Your trash bin is empty!" => "Nieko nėra. Jūsų šiukšliadėžė tuščia!", +"Name" => "Pavadinimas", "Restore" => "Atstatyti", +"Deleted" => "Ištrinti", "Delete" => "Ištrinti", "Deleted Files" => "Ištrinti failai" ); diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php index ca833b24208..5c04a0c97d1 100644 --- a/apps/files_trashbin/l10n/lv.php +++ b/apps/files_trashbin/l10n/lv.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Nevarēja pilnībā izdzēst %s", "Couldn't restore %s" => "Nevarēja atjaunot %s", -"perform restore operation" => "veikt atjaunošanu", "Error" => "Kļūda", -"delete file permanently" => "dzēst datni pavisam", -"Delete permanently" => "Dzēst pavisam", -"Name" => "Nosaukums", -"Deleted" => "Dzēsts", -"_%n folder_::_%n folders_" => array("Nekas, %n mapes","%n mape","%n mapes"), -"_%n file_::_%n files_" => array("Neviens! %n faaili","%n fails","%n faili"), "restored" => "atjaunots", "Nothing in here. Your trash bin is empty!" => "Šeit nekā nav. Jūsu miskaste ir tukša!", +"Name" => "Nosaukums", "Restore" => "Atjaunot", +"Deleted" => "Dzēsts", "Delete" => "Dzēst", "Deleted Files" => "Dzēstās datnes" ); diff --git a/apps/files_trashbin/l10n/mk.php b/apps/files_trashbin/l10n/mk.php index 965518dbc86..06a9dcfb241 100644 --- a/apps/files_trashbin/l10n/mk.php +++ b/apps/files_trashbin/l10n/mk.php @@ -1,9 +1,14 @@ <?php $TRANSLATIONS = array( +"Couldn't delete %s permanently" => "Не можеше трајно да се избрише %s", +"Couldn't restore %s" => "Не можеше да се поврати %s", "Error" => "Грешка", +"restored" => "повратени", +"Nothing in here. Your trash bin is empty!" => "Тука нема ништо. Вашата корпа за отпадоци е празна!", "Name" => "Име", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), -"Delete" => "Избриши" +"Restore" => "Поврати", +"Deleted" => "Избришан", +"Delete" => "Избриши", +"Deleted Files" => "Избришани датотеки" ); $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"; diff --git a/apps/files_trashbin/l10n/ms_MY.php b/apps/files_trashbin/l10n/ms_MY.php index 1b5ca07c70c..e7721313918 100644 --- a/apps/files_trashbin/l10n/ms_MY.php +++ b/apps/files_trashbin/l10n/ms_MY.php @@ -1,9 +1,14 @@ <?php $TRANSLATIONS = array( +"Couldn't delete %s permanently" => "Tidak dapat menghapuskan %s secara kekal", +"Couldn't restore %s" => "Tidak dapat memulihkan %s", "Error" => "Ralat", +"restored" => "dipulihkan", +"Nothing in here. Your trash bin is empty!" => "Tiada apa disini. Tong sampah anda kosong!", "Name" => "Nama", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), -"Delete" => "Padam" +"Restore" => "Pulihkan", +"Deleted" => "Dihapuskan", +"Delete" => "Padam", +"Deleted Files" => "Fail Dihapus" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php index 8eb3bc1846f..eb917e3dde6 100644 --- a/apps/files_trashbin/l10n/nb_NO.php +++ b/apps/files_trashbin/l10n/nb_NO.php @@ -2,16 +2,11 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Kunne ikke slette %s fullstendig", "Couldn't restore %s" => "Kunne ikke gjenopprette %s", -"perform restore operation" => "utfør gjenopprettings operasjon", "Error" => "Feil", -"delete file permanently" => "slett filer permanent", -"Delete permanently" => "Slett permanent", -"Name" => "Navn", -"Deleted" => "Slettet", -"_%n folder_::_%n folders_" => array("","%n mapper"), -"_%n file_::_%n files_" => array("","%n filer"), "Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!", +"Name" => "Navn", "Restore" => "Gjenopprett", +"Deleted" => "Slettet", "Delete" => "Slett", "Deleted Files" => "Slettet filer" ); diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php index b3ae57da563..37a8ca65409 100644 --- a/apps/files_trashbin/l10n/nl.php +++ b/apps/files_trashbin/l10n/nl.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Kon %s niet permanent verwijderen", "Couldn't restore %s" => "Kon %s niet herstellen", -"perform restore operation" => "uitvoeren restore operatie", "Error" => "Fout", -"delete file permanently" => "verwijder bestanden definitief", -"Delete permanently" => "Verwijder definitief", -"Name" => "Naam", -"Deleted" => "Verwijderd", -"_%n folder_::_%n folders_" => array("%n map","%n mappen"), -"_%n file_::_%n files_" => array("%n bestand","%n bestanden"), "restored" => "hersteld", "Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!", +"Name" => "Naam", "Restore" => "Herstellen", +"Deleted" => "Verwijderd", "Delete" => "Verwijder", "Deleted Files" => "Verwijderde bestanden" ); diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php index 73fe48211c2..39e2d5cda91 100644 --- a/apps/files_trashbin/l10n/nn_NO.php +++ b/apps/files_trashbin/l10n/nn_NO.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt", "Couldn't restore %s" => "Klarte ikkje gjenoppretta %s", -"perform restore operation" => "utfør gjenoppretting", "Error" => "Feil", -"delete file permanently" => "slett fila for godt", -"Delete permanently" => "Slett for godt", -"Name" => "Namn", -"Deleted" => "Sletta", -"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), -"_%n file_::_%n files_" => array("%n fil","%n filer"), "restored" => "gjenoppretta", "Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!", +"Name" => "Namn", "Restore" => "Gjenopprett", +"Deleted" => "Sletta", "Delete" => "Slett", "Deleted Files" => "Sletta filer" ); diff --git a/apps/files_trashbin/l10n/oc.php b/apps/files_trashbin/l10n/oc.php index a62902c3b7e..b472683f08d 100644 --- a/apps/files_trashbin/l10n/oc.php +++ b/apps/files_trashbin/l10n/oc.php @@ -2,8 +2,6 @@ $TRANSLATIONS = array( "Error" => "Error", "Name" => "Nom", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Delete" => "Escafa" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files_trashbin/l10n/pa.php b/apps/files_trashbin/l10n/pa.php index e53707fd707..825a49aaea4 100644 --- a/apps/files_trashbin/l10n/pa.php +++ b/apps/files_trashbin/l10n/pa.php @@ -1,8 +1,6 @@ <?php $TRANSLATIONS = array( "Error" => "ਗਲਤੀ", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Delete" => "ਹਟਾਓ" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php index c838a6b956c..961b7727824 100644 --- a/apps/files_trashbin/l10n/pl.php +++ b/apps/files_trashbin/l10n/pl.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Nie można trwale usunąć %s", "Couldn't restore %s" => "Nie można przywrócić %s", -"perform restore operation" => "wykonywanie operacji przywracania", "Error" => "Błąd", -"delete file permanently" => "trwale usuń plik", -"Delete permanently" => "Trwale usuń", -"Name" => "Nazwa", -"Deleted" => "Usunięte", -"_%n folder_::_%n folders_" => array("","","%n katalogów"), -"_%n file_::_%n files_" => array("","","%n plików"), "restored" => "przywrócony", "Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!", +"Name" => "Nazwa", "Restore" => "Przywróć", +"Deleted" => "Usunięte", "Delete" => "Usuń", "Deleted Files" => "Usunięte pliki" ); diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php index e0e8c8faec6..c2100efe96e 100644 --- a/apps/files_trashbin/l10n/pt_BR.php +++ b/apps/files_trashbin/l10n/pt_BR.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Não foi possível excluir %s permanentemente", "Couldn't restore %s" => "Não foi possível restaurar %s", -"perform restore operation" => "realizar operação de restauração", "Error" => "Erro", -"delete file permanently" => "excluir arquivo permanentemente", -"Delete permanently" => "Excluir permanentemente", -"Name" => "Nome", -"Deleted" => "Excluído", -"_%n folder_::_%n folders_" => array("","%n pastas"), -"_%n file_::_%n files_" => array("%n arquivo","%n arquivos"), "restored" => "restaurado", "Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!", +"Name" => "Nome", "Restore" => "Restaurar", +"Deleted" => "Excluído", "Delete" => "Excluir", "Deleted Files" => "Arquivos Apagados" ); diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php index 9dccc773cb1..89e84a84d28 100644 --- a/apps/files_trashbin/l10n/pt_PT.php +++ b/apps/files_trashbin/l10n/pt_PT.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Não foi possível eliminar %s de forma permanente", "Couldn't restore %s" => "Não foi possível restaurar %s", -"perform restore operation" => "executar a operação de restauro", "Error" => "Erro", -"delete file permanently" => "Eliminar permanentemente o(s) ficheiro(s)", -"Delete permanently" => "Eliminar permanentemente", -"Name" => "Nome", -"Deleted" => "Apagado", -"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"), -"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), "restored" => "Restaurado", "Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!", +"Name" => "Nome", "Restore" => "Restaurar", +"Deleted" => "Apagado", "Delete" => "Eliminar", "Deleted Files" => "Ficheiros Apagados" ); diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php index 12377bb0652..f285dcc164e 100644 --- a/apps/files_trashbin/l10n/ro.php +++ b/apps/files_trashbin/l10n/ro.php @@ -1,10 +1,7 @@ <?php $TRANSLATIONS = array( "Error" => "Eroare", -"Delete permanently" => "Stergere permanenta", "Name" => "Nume", -"_%n folder_::_%n folders_" => array("","","%n directoare"), -"_%n file_::_%n files_" => array("","","%n fișiere"), "Delete" => "Șterge" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"; diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php index 5f52263a118..06a4f864c67 100644 --- a/apps/files_trashbin/l10n/ru.php +++ b/apps/files_trashbin/l10n/ru.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "%s не может быть удалён навсегда", "Couldn't restore %s" => "%s не может быть восстановлен", -"perform restore operation" => "выполнить операцию восстановления", "Error" => "Ошибка", -"delete file permanently" => "удалить файл навсегда", -"Delete permanently" => "Удалено навсегда", -"Name" => "Имя", -"Deleted" => "Удалён", -"_%n folder_::_%n folders_" => array("","","%n папок"), -"_%n file_::_%n files_" => array("","","%n файлов"), "restored" => "восстановлен", "Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!", +"Name" => "Имя", "Restore" => "Восстановить", +"Deleted" => "Удалён", "Delete" => "Удалить", "Deleted Files" => "Удаленные файлы" ); diff --git a/apps/files_trashbin/l10n/si_LK.php b/apps/files_trashbin/l10n/si_LK.php index 6dad84437cf..87e928989e4 100644 --- a/apps/files_trashbin/l10n/si_LK.php +++ b/apps/files_trashbin/l10n/si_LK.php @@ -2,8 +2,6 @@ $TRANSLATIONS = array( "Error" => "දෝෂයක්", "Name" => "නම", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Delete" => "මකා දමන්න" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/sk.php b/apps/files_trashbin/l10n/sk.php index 94aaf9b3a94..3129cf5c411 100644 --- a/apps/files_trashbin/l10n/sk.php +++ b/apps/files_trashbin/l10n/sk.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","","") +"Delete" => "Odstrániť" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php index 50fb58a44e2..b23383c1214 100644 --- a/apps/files_trashbin/l10n/sk_SK.php +++ b/apps/files_trashbin/l10n/sk_SK.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Nemožno zmazať %s navždy", "Couldn't restore %s" => "Nemožno obnoviť %s", -"perform restore operation" => "vykonať obnovu", "Error" => "Chyba", -"delete file permanently" => "trvalo zmazať súbor", -"Delete permanently" => "Zmazať trvalo", -"Name" => "Názov", -"Deleted" => "Zmazané", -"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"), -"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"), "restored" => "obnovené", "Nothing in here. Your trash bin is empty!" => "Žiadny obsah. Kôš je prázdny!", +"Name" => "Názov", "Restore" => "Obnoviť", +"Deleted" => "Zmazané", "Delete" => "Zmazať", "Deleted Files" => "Zmazané súbory" ); diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php index eb2d42a18ff..9f164ae709c 100644 --- a/apps/files_trashbin/l10n/sl.php +++ b/apps/files_trashbin/l10n/sl.php @@ -1,17 +1,13 @@ <?php $TRANSLATIONS = array( -"Couldn't delete %s permanently" => "Datoteke %s ni mogoče dokončno izbrisati.", +"Couldn't delete %s permanently" => "Datoteke %s ni mogoče trajno izbrisati.", "Couldn't restore %s" => "Ni mogoče obnoviti %s", -"perform restore operation" => "izvedi opravilo obnavljanja", "Error" => "Napaka", -"delete file permanently" => "dokončno izbriši datoteko", -"Delete permanently" => "Izbriši dokončno", -"Name" => "Ime", -"Deleted" => "Izbrisano", -"_%n folder_::_%n folders_" => array("","","",""), -"_%n file_::_%n files_" => array("","","",""), +"restored" => "obnovljeno", "Nothing in here. Your trash bin is empty!" => "Mapa smeti je prazna.", +"Name" => "Ime", "Restore" => "Obnovi", +"Deleted" => "Izbrisano", "Delete" => "Izbriši", "Deleted Files" => "Izbrisane datoteke" ); diff --git a/apps/files_trashbin/l10n/sq.php b/apps/files_trashbin/l10n/sq.php index 50ca7d901b5..63957080f37 100644 --- a/apps/files_trashbin/l10n/sq.php +++ b/apps/files_trashbin/l10n/sq.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Nuk munda ta eliminoj përfundimisht %s", "Couldn't restore %s" => "Nuk munda ta rivendos %s", -"perform restore operation" => "ekzekuto operacionin e rivendosjes", "Error" => "Veprim i gabuar", -"delete file permanently" => "eliminoje përfundimisht skedarin", -"Delete permanently" => "Elimino përfundimisht", -"Name" => "Emri", -"Deleted" => "Eliminuar", -"_%n folder_::_%n folders_" => array("%n dosje","%n dosje"), -"_%n file_::_%n files_" => array("%n skedar","%n skedarë"), "restored" => "rivendosur", "Nothing in here. Your trash bin is empty!" => "Këtu nuk ka asgjë. Koshi juaj është bosh!", +"Name" => "Emri", "Restore" => "Rivendos", +"Deleted" => "Eliminuar", "Delete" => "Elimino", "Deleted Files" => "Skedarë të eliminuar" ); diff --git a/apps/files_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php index 7311e759f98..c893dba118b 100644 --- a/apps/files_trashbin/l10n/sr.php +++ b/apps/files_trashbin/l10n/sr.php @@ -1,14 +1,10 @@ <?php $TRANSLATIONS = array( -"perform restore operation" => "врати у претходно стање", "Error" => "Грешка", -"Delete permanently" => "Обриши за стално", -"Name" => "Име", -"Deleted" => "Обрисано", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "Nothing in here. Your trash bin is empty!" => "Овде нема ништа. Корпа за отпатке је празна.", +"Name" => "Име", "Restore" => "Врати", +"Deleted" => "Обрисано", "Delete" => "Обриши" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files_trashbin/l10n/sr@latin.php b/apps/files_trashbin/l10n/sr@latin.php index fa30afcf4bf..9f18ac8be7d 100644 --- a/apps/files_trashbin/l10n/sr@latin.php +++ b/apps/files_trashbin/l10n/sr@latin.php @@ -2,8 +2,6 @@ $TRANSLATIONS = array( "Error" => "Greška", "Name" => "Ime", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "Delete" => "Obriši" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php index 47a52f25736..21d4d15e9cc 100644 --- a/apps/files_trashbin/l10n/sv.php +++ b/apps/files_trashbin/l10n/sv.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Kunde inte radera %s permanent", "Couldn't restore %s" => "Kunde inte återställa %s", -"perform restore operation" => "utför återställning", "Error" => "Fel", -"delete file permanently" => "radera filen permanent", -"Delete permanently" => "Radera permanent", -"Name" => "Namn", -"Deleted" => "Raderad", -"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"), -"_%n file_::_%n files_" => array("%n fil","%n filer"), "restored" => "återställd", "Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!", +"Name" => "Namn", "Restore" => "Återskapa", +"Deleted" => "Raderad", "Delete" => "Radera", "Deleted Files" => "Raderade filer" ); diff --git a/apps/files_trashbin/l10n/ta_LK.php b/apps/files_trashbin/l10n/ta_LK.php index ed93b459c7d..79349919b52 100644 --- a/apps/files_trashbin/l10n/ta_LK.php +++ b/apps/files_trashbin/l10n/ta_LK.php @@ -2,8 +2,6 @@ $TRANSLATIONS = array( "Error" => "வழு", "Name" => "பெயர்", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Delete" => "நீக்குக" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/te.php b/apps/files_trashbin/l10n/te.php index 0d803a8e648..01262b78232 100644 --- a/apps/files_trashbin/l10n/te.php +++ b/apps/files_trashbin/l10n/te.php @@ -1,10 +1,7 @@ <?php $TRANSLATIONS = array( "Error" => "పొరపాటు", -"Delete permanently" => "శాశ్వతంగా తొలగించు", "Name" => "పేరు", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), "Delete" => "తొలగించు" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/th_TH.php b/apps/files_trashbin/l10n/th_TH.php index 31caa11aac3..65fd081a952 100644 --- a/apps/files_trashbin/l10n/th_TH.php +++ b/apps/files_trashbin/l10n/th_TH.php @@ -1,13 +1,10 @@ <?php $TRANSLATIONS = array( -"perform restore operation" => "ดำเนินการคืนค่า", "Error" => "ข้อผิดพลาด", -"Name" => "ชื่อ", -"Deleted" => "ลบแล้ว", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Nothing in here. Your trash bin is empty!" => "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่", +"Name" => "ชื่อ", "Restore" => "คืนค่า", +"Deleted" => "ลบแล้ว", "Delete" => "ลบ", "Deleted Files" => "ไฟล์ที่ลบทิ้ง" ); diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php index f25b179bc1e..00a3b4d32a5 100644 --- a/apps/files_trashbin/l10n/tr.php +++ b/apps/files_trashbin/l10n/tr.php @@ -1,18 +1,13 @@ <?php $TRANSLATIONS = array( -"Couldn't delete %s permanently" => "%s Kalıcı olarak silinemedi", -"Couldn't restore %s" => "%s Geri yüklenemedi", -"perform restore operation" => "Geri yükleme işlemini gerçekleştir", +"Couldn't delete %s permanently" => "%s alıcı olarak silinemedi", +"Couldn't restore %s" => "%s eri yüklenemedi", "Error" => "Hata", -"delete file permanently" => "Dosyayı kalıcı olarak sil", -"Delete permanently" => "Kalıcı olarak sil", -"Name" => "İsim", -"Deleted" => "Silindi", -"_%n folder_::_%n folders_" => array("","%n dizin"), -"_%n file_::_%n files_" => array("","%n dosya"), "restored" => "geri yüklendi", -"Nothing in here. Your trash bin is empty!" => "Burası boş. Çöp kutun tamamen boş.", +"Nothing in here. Your trash bin is empty!" => "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!", +"Name" => "İsim", "Restore" => "Geri yükle", +"Deleted" => "Silindi", "Delete" => "Sil", "Deleted Files" => "Silinen Dosyalar" ); diff --git a/apps/files_trashbin/l10n/ug.php b/apps/files_trashbin/l10n/ug.php index ad983aee18b..54c040c88a7 100644 --- a/apps/files_trashbin/l10n/ug.php +++ b/apps/files_trashbin/l10n/ug.php @@ -1,12 +1,9 @@ <?php $TRANSLATIONS = array( "Error" => "خاتالىق", -"Delete permanently" => "مەڭگۈلۈك ئۆچۈر", +"Nothing in here. Your trash bin is empty!" => "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!", "Name" => "ئاتى", "Deleted" => "ئۆچۈرۈلدى", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), -"Nothing in here. Your trash bin is empty!" => "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!", "Delete" => "ئۆچۈر" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php index aa4b6595032..c54d45aaa82 100644 --- a/apps/files_trashbin/l10n/uk.php +++ b/apps/files_trashbin/l10n/uk.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Неможливо видалити %s назавжди", "Couldn't restore %s" => "Неможливо відновити %s", -"perform restore operation" => "виконати операцію відновлення", "Error" => "Помилка", -"delete file permanently" => "видалити файл назавжди", -"Delete permanently" => "Видалити назавжди", -"Name" => "Ім'я", -"Deleted" => "Видалено", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), "restored" => "відновлено", "Nothing in here. Your trash bin is empty!" => "Нічого немає. Ваший кошик для сміття пустий!", +"Name" => "Ім'я", "Restore" => "Відновити", +"Deleted" => "Видалено", "Delete" => "Видалити", "Deleted Files" => "Видалено Файлів" ); diff --git a/apps/files_trashbin/l10n/ur_PK.php b/apps/files_trashbin/l10n/ur_PK.php index f6c6a3da3c8..49c82f53872 100644 --- a/apps/files_trashbin/l10n/ur_PK.php +++ b/apps/files_trashbin/l10n/ur_PK.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Error" => "ایرر", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("","") +"Error" => "ایرر" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php index 072d799fa68..c5e899392bf 100644 --- a/apps/files_trashbin/l10n/vi.php +++ b/apps/files_trashbin/l10n/vi.php @@ -2,16 +2,11 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "Không thể óa %s vĩnh viễn", "Couldn't restore %s" => "Không thể khôi phục %s", -"perform restore operation" => "thực hiện phục hồi", "Error" => "Lỗi", -"delete file permanently" => "xóa file vĩnh viễn", -"Delete permanently" => "Xóa vĩnh vễn", -"Name" => "Tên", -"Deleted" => "Đã xóa", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Nothing in here. Your trash bin is empty!" => "Không có gì ở đây. Thùng rác của bạn rỗng!", +"Name" => "Tên", "Restore" => "Khôi phục", +"Deleted" => "Đã xóa", "Delete" => "Xóa", "Deleted Files" => "File đã xóa" ); diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php index dc2d5b4c00e..24d9002adcb 100644 --- a/apps/files_trashbin/l10n/zh_CN.php +++ b/apps/files_trashbin/l10n/zh_CN.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "无法彻底删除文件%s", "Couldn't restore %s" => "无法恢复%s", -"perform restore operation" => "执行恢复操作", "Error" => "错误", -"delete file permanently" => "彻底删除文件", -"Delete permanently" => "永久删除", -"Name" => "名称", -"Deleted" => "已删除", -"_%n folder_::_%n folders_" => array("%n 文件夹"), -"_%n file_::_%n files_" => array("%n个文件"), "restored" => "已恢复", "Nothing in here. Your trash bin is empty!" => "这里没有东西. 你的回收站是空的!", +"Name" => "名称", "Restore" => "恢复", +"Deleted" => "已删除", "Delete" => "删除", "Deleted Files" => "已删除文件" ); diff --git a/apps/files_trashbin/l10n/zh_HK.php b/apps/files_trashbin/l10n/zh_HK.php index 3f0d663baeb..877912e9c42 100644 --- a/apps/files_trashbin/l10n/zh_HK.php +++ b/apps/files_trashbin/l10n/zh_HK.php @@ -2,8 +2,6 @@ $TRANSLATIONS = array( "Error" => "錯誤", "Name" => "名稱", -"_%n folder_::_%n folders_" => array(""), -"_%n file_::_%n files_" => array(""), "Delete" => "刪除" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php index bfc2fc659de..1f05a2687b6 100644 --- a/apps/files_trashbin/l10n/zh_TW.php +++ b/apps/files_trashbin/l10n/zh_TW.php @@ -2,17 +2,12 @@ $TRANSLATIONS = array( "Couldn't delete %s permanently" => "無法永久刪除 %s", "Couldn't restore %s" => "無法還原 %s", -"perform restore operation" => "進行還原動作", "Error" => "錯誤", -"delete file permanently" => "永久刪除檔案", -"Delete permanently" => "永久刪除", -"Name" => "名稱", -"Deleted" => "已刪除", -"_%n folder_::_%n folders_" => array("%n 個資料夾"), -"_%n file_::_%n files_" => array("%n 個檔案"), "restored" => "已還原", "Nothing in here. Your trash bin is empty!" => "您的回收桶是空的！", +"Name" => "名稱", "Restore" => "還原", +"Deleted" => "已刪除", "Delete" => "刪除", "Deleted Files" => "已刪除的檔案" ); diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php index 4f442ee9304..c454b35a5f2 100644 --- a/apps/files_trashbin/lib/helper.php +++ b/apps/files_trashbin/lib/helper.php @@ -44,8 +44,10 @@ class Helper } $files = array(); + $id = 0; foreach ($result as $r) { $i = array(); + $i['id'] = $id++; $i['name'] = $r['id']; $i['date'] = \OCP\Util::formatDate($r['timestamp']); $i['timestamp'] = $r['timestamp']; diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index c79afdc0c2e..769fd8d8990 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -41,13 +41,7 @@ class Trashbin { return array($uid, $filename); } - /** - * move file to the trash bin - * - * @param $file_path path to the deleted file/directory relative to the files root directory - */ - public static function move2trash($file_path) { - $user = \OCP\User::getUser(); + private static function setUpTrash($user) { $view = new \OC\Files\View('/' . $user); if (!$view->is_dir('files_trashbin')) { $view->mkdir('files_trashbin'); @@ -64,6 +58,48 @@ class Trashbin { if (!$view->is_dir('files_trashbin/share-keys')) { $view->mkdir('files_trashbin/share-keys'); } + } + + + private static function copyFilesToOwner($sourcePath, $owner, $ownerPath, $timestamp, $type, $mime) { + self::setUpTrash($owner); + + $ownerFilename = basename($ownerPath); + $ownerLocation = dirname($ownerPath); + + $sourceFilename = basename($sourcePath); + + $view = new \OC\Files\View('/'); + + $source = \OCP\User::getUser().'/files_trashbin/files/' . $sourceFilename . '.d' . $timestamp; + $target = $owner.'/files_trashbin/files/' . $ownerFilename . '.d' . $timestamp; + self::copy_recursive($source, $target, $view); + + + if ($view->file_exists($target)) { + $query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)"); + $result = $query->execute(array($ownerFilename, $timestamp, $ownerLocation, $type, $mime, $owner)); + if (!$result) { // if file couldn't be added to the database than also don't store it in the trash bin. + $view->deleteAll($owner.'/files_trashbin/files/' . $ownerFilename . '.d' . $timestamp); + \OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated for the files owner', \OC_log::ERROR); + return; + } + } + } + + + /** + * move file to the trash bin + * + * @param $file_path path to the deleted file/directory relative to the files root directory + */ + public static function move2trash($file_path) { + $user = \OCP\User::getUser(); + $size = 0; + list($owner, $ownerPath) = self::getUidAndFilename($file_path); + self::setUpTrash($user); + + $view = new \OC\Files\View('/' . $user); $path_parts = pathinfo($file_path); $filename = $path_parts['basename']; @@ -77,19 +113,20 @@ class Trashbin { $type = 'file'; } - $trashbinSize = self::getTrashbinSize($user); - if ($trashbinSize === false || $trashbinSize < 0) { - $trashbinSize = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin')); + $userTrashSize = self::getTrashbinSize($user); + if ($userTrashSize === false || $userTrashSize < 0) { + $userTrashSize = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin')); } // disable proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; - $sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/' . $filename . '.d' . $timestamp, $view); + $trashPath = '/files_trashbin/files/' . $filename . '.d' . $timestamp; + $sizeOfAddedFiles = self::copy_recursive('/files/'.$file_path, $trashPath, $view); \OC_FileProxy::$enabled = $proxyStatus; if ($view->file_exists('files_trashbin/files/' . $filename . '.d' . $timestamp)) { - $trashbinSize += $sizeOfAddedFiles; + $size = $sizeOfAddedFiles; $query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)"); $result = $query->execute(array($filename, $timestamp, $location, $type, $mime, $user)); if (!$result) { // if file couldn't be added to the database than also don't store it in the trash bin. @@ -100,15 +137,31 @@ class Trashbin { \OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', array('filePath' => \OC\Files\Filesystem::normalizePath($file_path), 'trashPath' => \OC\Files\Filesystem::normalizePath($filename . '.d' . $timestamp))); - $trashbinSize += self::retainVersions($file_path, $filename, $timestamp); - $trashbinSize += self::retainEncryptionKeys($file_path, $filename, $timestamp); + $size += self::retainVersions($file_path, $filename, $timestamp); + $size += self::retainEncryptionKeys($file_path, $filename, $timestamp); + + // if owner !== user we need to also add a copy to the owners trash + if ($user !== $owner) { + self::copyFilesToOwner($file_path, $owner, $ownerPath, $timestamp, $type, $mime); + } } else { \OC_Log::write('files_trashbin', 'Couldn\'t move ' . $file_path . ' to the trash bin', \OC_log::ERROR); } - $trashbinSize -= self::expire($trashbinSize); + $userTrashSize += $size; + $userTrashSize -= self::expire($userTrashSize, $user); + self::setTrashbinSize($user, $userTrashSize); - self::setTrashbinSize($user, $trashbinSize); + // if owner !== user we also need to update the owners trash size + if($owner !== $user) { + $ownerTrashSize = self::getTrashbinSize($owner); + if ($ownerTrashSize === false || $ownerTrashSize < 0) { + $ownerTrashSize = self::calculateSize(new \OC\Files\View('/' . $owner . '/files_trashbin')); + } + $ownerTrashSize += $size; + $ownerTrashSize -= self::expire($ownerTrashSize, $owner); + self::setTrashbinSize($owner, $ownerTrashSize); + } } /** @@ -135,10 +188,16 @@ class Trashbin { if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) { $size += self::calculateSize(new \OC\Files\View('/' . $owner . '/files_versions/' . $ownerPath)); + if ($owner !== $user) { + self::copy_recursive($owner . '/files_versions/' . $ownerPath, $owner . '/files_trashbin/versions/' . basename($ownerPath) . '.d' . $timestamp, $rootView); + } $rootView->rename($owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . $filename . '.d' . $timestamp); } else if ($versions = \OCA\Files_Versions\Storage::getVersions($owner, $ownerPath)) { foreach ($versions as $v) { $size += $rootView->filesize($owner . '/files_versions' . $v['path'] . '.v' . $v['version']); + if ($owner !== $user) { + $rootView->copy($owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $owner . '/files_trashbin/versions/' . $v['name'] . '.v' . $v['version'] . '.d' . $timestamp); + } $rootView->rename($owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp); } } @@ -187,9 +246,15 @@ class Trashbin { // move keyfiles if ($rootView->is_dir($keyfile)) { $size += self::calculateSize(new \OC\Files\View($keyfile)); + if ($owner !== $user) { + self::copy_recursive($keyfile, $owner . '/files_trashbin/keyfiles/' . basename($ownerPath) . '.d' . $timestamp, $rootView); + } $rootView->rename($keyfile, $user . '/files_trashbin/keyfiles/' . $filename . '.d' . $timestamp); } else { $size += $rootView->filesize($keyfile . '.key'); + if ($owner !== $user) { + $rootView->copy($keyfile . '.key', $owner . '/files_trashbin/keyfiles/' . basename($ownerPath) . '.key.d' . $timestamp); + } $rootView->rename($keyfile . '.key', $user . '/files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp); } } @@ -199,6 +264,9 @@ class Trashbin { if ($rootView->is_dir($sharekeys)) { $size += self::calculateSize(new \OC\Files\View($sharekeys)); + if ($owner !== $user) { + self::copy_recursive($sharekeys, $owner . '/files_trashbin/share-keys/' . basename($ownerPath) . '.d' . $timestamp, $rootView); + } $rootView->rename($sharekeys, $user . '/files_trashbin/share-keys/' . $filename . '.d' . $timestamp); } else { // get local path to share-keys @@ -211,22 +279,23 @@ class Trashbin { // get source file parts $pathinfo = pathinfo($src); - // we only want to keep the owners key so we can access the private key - $ownerShareKey = $filename . '.' . $user . '.shareKey'; + // we only want to keep the users key so we can access the private key + $userShareKey = $filename . '.' . $user . '.shareKey'; // if we found the share-key for the owner, we need to move it to files_trashbin - if ($pathinfo['basename'] == $ownerShareKey) { + if ($pathinfo['basename'] == $userShareKey) { // calculate size $size += $rootView->filesize($sharekeys . '.' . $user . '.shareKey'); // move file - $rootView->rename($sharekeys . '.' . $user . '.shareKey', $user . '/files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp); + $rootView->rename($sharekeys . '.' . $user . '.shareKey', $user . '/files_trashbin/share-keys/' . $userShareKey . '.d' . $timestamp); + } elseif ($owner !== $user) { + $ownerShareKey = basename($ownerPath) . '.' . $owner . '.shareKey'; + if ($pathinfo['basename'] == $ownerShareKey) { + $rootView->rename($sharekeys . '.' . $owner . '.shareKey', $owner . '/files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp); + } } else { - - // calculate size - $size += filesize($src); - // don't keep other share-keys unlink($src); } @@ -496,6 +565,21 @@ class Trashbin { } /** + * @brief delete all files from the trash + */ + public static function deleteAll() { + $user = \OCP\User::getUser(); + $view = new \OC\Files\View('/' . $user); + $view->deleteAll('files_trashbin'); + self::setTrashbinSize($user, 0); + $query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?'); + $query->execute(array($user)); + + return true; + } + + + /** * @brief delete file from trash bin permanently * * @param $filename path to the file @@ -530,6 +614,7 @@ class Trashbin { $size += $view->filesize('/files_trashbin/files/' . $file); } $view->unlink('/files_trashbin/files/' . $file); + \OC_Hook::emit('\OCP\Trashbin', 'delete', array('path' => '/files_trashbin/files/' . $file)); $trashbinSize -= $size; self::setTrashbinSize($user, $trashbinSize); @@ -678,7 +763,7 @@ class Trashbin { $freeSpace = self::calculateFreeSpace($size); if ($freeSpace < 0) { - $newSize = $size - self::expire($size); + $newSize = $size - self::expire($size, $user); if ($newSize !== $size) { self::setTrashbinSize($user, $newSize); } @@ -687,13 +772,19 @@ class Trashbin { /** * clean up the trash bin - * @param current size of the trash bin - * @return size of expired files + * @param int $trashbinSize current size of the trash bin + * @param string $user + * @return int size of expired files */ - private static function expire($trashbinSize) { + private static function expire($trashbinSize, $user) { + + // let the admin disable auto expire + $autoExpire = \OC_Config::getValue('trashbin_auto_expire', true); + if ($autoExpire === false) { + return 0; + } $user = \OCP\User::getUser(); - $view = new \OC\Files\View('/' . $user); $availableSpace = self::calculateFreeSpace($trashbinSize); $size = 0; @@ -741,23 +832,23 @@ class Trashbin { */ private static function copy_recursive($source, $destination, $view) { $size = 0; - if ($view->is_dir('files' . $source)) { + if ($view->is_dir($source)) { $view->mkdir($destination); - $view->touch($destination, $view->filemtime('files' . $source)); - foreach (\OC_Files::getDirectoryContent($source) as $i) { + $view->touch($destination, $view->filemtime($source)); + foreach ($view->getDirectoryContent($source) as $i) { $pathDir = $source . '/' . $i['name']; - if ($view->is_dir('files' . $pathDir)) { + if ($view->is_dir($pathDir)) { $size += self::copy_recursive($pathDir, $destination . '/' . $i['name'], $view); } else { - $size += $view->filesize('files' . $pathDir); - $view->copy('files' . $pathDir, $destination . '/' . $i['name']); - $view->touch($destination . '/' . $i['name'], $view->filemtime('files' . $pathDir)); + $size += $view->filesize($pathDir); + $view->copy($pathDir, $destination . '/' . $i['name']); + $view->touch($destination . '/' . $i['name'], $view->filemtime($pathDir)); } } } else { - $size += $view->filesize('files' . $source); - $view->copy('files' . $source, $destination); - $view->touch($destination, $view->filemtime('files' . $source)); + $size += $view->filesize($source); + $view->copy($source, $destination); + $view->touch($destination, $view->filemtime($source)); } return $size; } diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index 82ba0608834..f9264d4352c 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -1,13 +1,10 @@ -<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}table td{position:static !important;}</style><![endif]--> <div id="controls"> <?php print_unescaped($_['breadcrumb']); ?> <div id="file_action_panel"></div> </div> <div id='notification'></div> -<?php if (isset($_['files']) && count($_['files']) === 0 && $_['dirlisting'] === false && !$_['ajaxLoad']):?> - <div id="emptycontent"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div> -<?php endif; ?> +<div id="emptycontent" <?php if (!(isset($_['files']) && count($_['files']) === 0 && $_['dirlisting'] === false && !$_['ajaxLoad'])):?>class="hidden"<?php endif; ?>><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div> <input type="hidden" name="ajaxLoad" id="ajaxLoad" value="<?php p($_['ajaxLoad']); ?>" /> <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>"></input> @@ -17,7 +14,9 @@ <thead> <tr> <th id='headerName'> + <div id="headerName-container"> <input type="checkbox" id="select_all" /> + <label for="select_all"></label> <span class='name'><?php p($l->t( 'Name' )); ?></span> <span class='selectedActions'> <a href="" class="undelete"> @@ -26,6 +25,7 @@ <?php p($l->t('Restore'))?> </a> </span> + </div> </th> <th id="headerDate"> <span id="modified"><?php p($l->t( 'Deleted' )); ?></span> diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php index 4acc298adbe..fdf78c190d0 100644 --- a/apps/files_trashbin/templates/part.breadcrumb.php +++ b/apps/files_trashbin/templates/part.breadcrumb.php @@ -3,11 +3,11 @@ <img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" /> </a> </div> -<?php if(count($_["breadcrumb"])):?> - <div class="crumb svg" - data-dir='/'> +<div class="crumb svg" + data-dir='/'> <a href="<?php p($_['baseURL']); ?>"><?php p($l->t("Deleted Files")); ?></a> - </div> +</div> +<?php if(count($_["breadcrumb"])):?> <?php endif;?> <?php for($i=0; $i<count($_["breadcrumb"]); $i++): $crumb = $_["breadcrumb"][$i]; diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php index 78709d986ae..c32d9fd54da 100644 --- a/apps/files_trashbin/templates/part.list.php +++ b/apps/files_trashbin/templates/part.list.php @@ -35,18 +35,21 @@ <?php endif; ?> <?php endif; ?> > - <?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?> + <?php if(!isset($_['readonly']) || !$_['readonly']): ?> + <input id="select-<?php p($file['id']); ?>" type="checkbox" /> + <label for="select-<?php p($file['id']); ?>"></label> + <?php endif; ?> <?php if($file['type'] === 'dir'): ?> <?php if( $_['dirlisting'] ): ?> - <a class="name" href="<?php p($_['baseURL'].'/'.$name); ?>" title=""> + <a class="name dir" href="<?php p($_['baseURL'].'/'.$name); ?>" title=""> <?php else: ?> - <a class="name" href="<?php p($_['baseURL'].'/'.$name.'.d'.$file['timestamp']); ?>" title=""> + <a class="name dir" href="<?php p($_['baseURL'].'/'.$name.'.d'.$file['timestamp']); ?>" title=""> <?php endif; ?> <?php else: ?> <?php if( $_['dirlisting'] ): ?> - <a class="name" href="<?php p($_['downloadURL'].'/'.$name); ?>" title=""> + <a class="name file" href="<?php p($_['downloadURL'].'/'.$name); ?>" title=""> <?php else: ?> - <a class="name" href="<?php p($_['downloadURL'].'/'.$name.'.d'.$file['timestamp']);?>" title=""> + <a class="name file" href="<?php p($_['downloadURL'].'/'.$name.'.d'.$file['timestamp']);?>" title=""> <?php endif; ?> <?php endif; ?> <span class="nametext"> |