diff options
Diffstat (limited to 'apps/files_trashbin')
28 files changed, 116 insertions, 108 deletions
diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml index 1e7b5e1849e..0c690c1558e 100644 --- a/apps/files_trashbin/appinfo/info.xml +++ b/apps/files_trashbin/appinfo/info.xml @@ -9,7 +9,7 @@ This application enables users to restore files that were deleted from the syste To prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation. </description> - <version>1.16.0</version> + <version>1.17.0</version> <licence>agpl</licence> <author>Bjoern Schiessle</author> <namespace>Files_Trashbin</namespace> @@ -23,7 +23,7 @@ To prevent a user from running out of disk space, the Deleted files app will not <category>files</category> <bugs>https://github.com/nextcloud/server/issues</bugs> <dependencies> - <nextcloud min-version="26" max-version="26"/> + <nextcloud min-version="27" max-version="27"/> </dependencies> <background-jobs> diff --git a/apps/files_trashbin/composer/composer/ClassLoader.php b/apps/files_trashbin/composer/composer/ClassLoader.php index afef3fa2ad8..fd56bd7d840 100644 --- a/apps/files_trashbin/composer/composer/ClassLoader.php +++ b/apps/files_trashbin/composer/composer/ClassLoader.php @@ -42,6 +42,9 @@ namespace Composer\Autoload; */ class ClassLoader { + /** @var \Closure(string):void */ + private static $includeFile; + /** @var ?string */ private $vendorDir; @@ -106,6 +109,7 @@ class ClassLoader public function __construct($vendorDir = null) { $this->vendorDir = $vendorDir; + self::initializeIncludeClosure(); } /** @@ -425,7 +429,7 @@ class ClassLoader public function loadClass($class) { if ($file = $this->findFile($class)) { - includeFile($file); + (self::$includeFile)($file); return true; } @@ -555,18 +559,23 @@ class ClassLoader return false; } -} -/** - * Scope isolated include. - * - * Prevents access to $this/self from included files. - * - * @param string $file - * @return void - * @private - */ -function includeFile($file) -{ - include $file; + private static function initializeIncludeClosure(): void + { + if (self::$includeFile !== null) { + return; + } + + /** + * Scope isolated include. + * + * Prevents access to $this/self from included files. + * + * @param string $file + * @return void + */ + self::$includeFile = static function($file) { + include $file; + }; + } } diff --git a/apps/files_trashbin/composer/composer/installed.php b/apps/files_trashbin/composer/composer/installed.php index 10f4c04f799..a1f6a8636b4 100644 --- a/apps/files_trashbin/composer/composer/installed.php +++ b/apps/files_trashbin/composer/composer/installed.php @@ -3,7 +3,7 @@ 'name' => '__root__', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'f13629cf4a091f0d7307e4daed15eae31acf1134', + 'reference' => 'd51429a47232bbf46a2be832ecfa711f102da802', 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), @@ -13,7 +13,7 @@ '__root__' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'f13629cf4a091f0d7307e4daed15eae31acf1134', + 'reference' => 'd51429a47232bbf46a2be832ecfa711f102da802', 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), diff --git a/apps/files_trashbin/l10n/cs.js b/apps/files_trashbin/l10n/cs.js index 793b14e7cf5..d077fc1f795 100644 --- a/apps/files_trashbin/l10n/cs.js +++ b/apps/files_trashbin/l10n/cs.js @@ -3,9 +3,9 @@ OC.L10N.register( { "Deleted files" : "Smazané soubory", "restored" : "obnoveno", - "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Smazané soubory a složky v koši (v průběhu exportu může jejich platnost skončit, pokud začne docházet místo na úložišti)", - "This application enables users to restore files that were deleted from the system." : "Tato aplikace umožňuje uživatelům obnovovat soubory, které byly ze systému smazány.", - "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Tato aplikace uživatelům umožňuje obnovovat soubory, které byly ze systému vymazány. Zobrazí seznam smazaných souborů ve webovém rozhraní a má volby pro obnovení těchto smazaných souborů zpět do složek se soubory uživatelů nebo jejich odebrání natrvalo. Obnovení souboru také obnoví související verze souboru, pokud je zapnutá aplikace verzování. Když je soubor smazán ze sdílení, je možné ho obnovit stejným způsobem, ačkoli už není sdílený. Ve výchozím stavu, tyto soubory jsou ponechávány v koši po dobu 30 dnů.\nAby uživatelé nezaplnili celý disk, aplikace Smazané soubory nevyužije více než 50% kvóty pro smazané soubory. Pokud smazané soubory přesahují tento limit, aplikace smaže nejstarší soubory, dokud se nedostane pod limit. Více informací je k dispozici v dokumentaci ke Smazané soubory.", + "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Smazané soubory a složky v Koši (v průběhu exportu může jejich platnost skončit, pokud začne docházet místo na úložišti)", + "This application enables users to restore files that were deleted from the system." : "Tato aplikace umožňuje uživatelům obnovovat soubory, které byly ze systému vymazány.", + "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Tato aplikace umožňuje uživatelům obnovovat soubory, které byly ze systému vymazány. Ve webovém rozhraní zobrazuje seznam smazaných souborů a má volby pro obnovení těchto souborů zpět do složek se soubory uživatelů nebo jejich trvalé odebrání. Obnovení souboru také obnoví jeho související verze (pokud je zapnutá aplikace pro správu verzí). Když je soubor smazán ze sdílení, je možné ho obnovit stejným způsobem, ačkoli už nebude sdílený. Ve výchozím stavu, tyto soubory jsou ponechávány v koši po dobu 30 dnů.\nAby uživatelé nezaplnili celý disk, aplikace Smazané soubory pro ně nevyužije více než 50% kvóty. Pokud smazané soubory přesahují tento limit, aplikace maže nejstarší soubory, dokud se nedostane pod limit. Další informace jsou k dispozici v dokumentaci ke Smazané soubory.", "Restore" : "Obnovit", "Delete permanently" : "Trvale odstranit", "Error while restoring file from trash bin" : "Chyba při obnovování souboru z Koše", @@ -14,9 +14,9 @@ OC.L10N.register( "Error while emptying trash bin" : "Chyba při vyprazdňování Koše", "Error while removing files from trash bin" : "Chyba při odebírání souborů z Koše", "This operation is forbidden" : "Tato operace je zakázána", - "This directory is unavailable, please check the logs or contact the administrator" : "Tento adresář není dostupný, zkontrolujte záznamy událostí nebo se obraťte na správce", + "This directory is unavailable, please check the logs or contact the administrator" : "Tento adresář není dostupný – zkontrolujte záznamy událostí nebo se obraťte na správce", "No deleted files" : "Žádné smazané soubory", - "You will be able to recover deleted files from here" : "Odtud budete moci obnovovat odstraněné soubory", + "You will be able to recover deleted files from here" : "Odtud budete moci obnovovat smazané soubory", "No entries found in this folder" : "V této složce nebylo nic nalezeno", "Select all" : "Vybrat vše", "Name" : "Název", diff --git a/apps/files_trashbin/l10n/cs.json b/apps/files_trashbin/l10n/cs.json index 0c5bd4aae03..5495273ee19 100644 --- a/apps/files_trashbin/l10n/cs.json +++ b/apps/files_trashbin/l10n/cs.json @@ -1,9 +1,9 @@ { "translations": { "Deleted files" : "Smazané soubory", "restored" : "obnoveno", - "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Smazané soubory a složky v koši (v průběhu exportu může jejich platnost skončit, pokud začne docházet místo na úložišti)", - "This application enables users to restore files that were deleted from the system." : "Tato aplikace umožňuje uživatelům obnovovat soubory, které byly ze systému smazány.", - "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Tato aplikace uživatelům umožňuje obnovovat soubory, které byly ze systému vymazány. Zobrazí seznam smazaných souborů ve webovém rozhraní a má volby pro obnovení těchto smazaných souborů zpět do složek se soubory uživatelů nebo jejich odebrání natrvalo. Obnovení souboru také obnoví související verze souboru, pokud je zapnutá aplikace verzování. Když je soubor smazán ze sdílení, je možné ho obnovit stejným způsobem, ačkoli už není sdílený. Ve výchozím stavu, tyto soubory jsou ponechávány v koši po dobu 30 dnů.\nAby uživatelé nezaplnili celý disk, aplikace Smazané soubory nevyužije více než 50% kvóty pro smazané soubory. Pokud smazané soubory přesahují tento limit, aplikace smaže nejstarší soubory, dokud se nedostane pod limit. Více informací je k dispozici v dokumentaci ke Smazané soubory.", + "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Smazané soubory a složky v Koši (v průběhu exportu může jejich platnost skončit, pokud začne docházet místo na úložišti)", + "This application enables users to restore files that were deleted from the system." : "Tato aplikace umožňuje uživatelům obnovovat soubory, které byly ze systému vymazány.", + "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Tato aplikace umožňuje uživatelům obnovovat soubory, které byly ze systému vymazány. Ve webovém rozhraní zobrazuje seznam smazaných souborů a má volby pro obnovení těchto souborů zpět do složek se soubory uživatelů nebo jejich trvalé odebrání. Obnovení souboru také obnoví jeho související verze (pokud je zapnutá aplikace pro správu verzí). Když je soubor smazán ze sdílení, je možné ho obnovit stejným způsobem, ačkoli už nebude sdílený. Ve výchozím stavu, tyto soubory jsou ponechávány v koši po dobu 30 dnů.\nAby uživatelé nezaplnili celý disk, aplikace Smazané soubory pro ně nevyužije více než 50% kvóty. Pokud smazané soubory přesahují tento limit, aplikace maže nejstarší soubory, dokud se nedostane pod limit. Další informace jsou k dispozici v dokumentaci ke Smazané soubory.", "Restore" : "Obnovit", "Delete permanently" : "Trvale odstranit", "Error while restoring file from trash bin" : "Chyba při obnovování souboru z Koše", @@ -12,9 +12,9 @@ "Error while emptying trash bin" : "Chyba při vyprazdňování Koše", "Error while removing files from trash bin" : "Chyba při odebírání souborů z Koše", "This operation is forbidden" : "Tato operace je zakázána", - "This directory is unavailable, please check the logs or contact the administrator" : "Tento adresář není dostupný, zkontrolujte záznamy událostí nebo se obraťte na správce", + "This directory is unavailable, please check the logs or contact the administrator" : "Tento adresář není dostupný – zkontrolujte záznamy událostí nebo se obraťte na správce", "No deleted files" : "Žádné smazané soubory", - "You will be able to recover deleted files from here" : "Odtud budete moci obnovovat odstraněné soubory", + "You will be able to recover deleted files from here" : "Odtud budete moci obnovovat smazané soubory", "No entries found in this folder" : "V této složce nebylo nic nalezeno", "Select all" : "Vybrat vše", "Name" : "Název", diff --git a/apps/files_trashbin/l10n/eu.js b/apps/files_trashbin/l10n/eu.js index 1c460341d27..320e44dbe7f 100644 --- a/apps/files_trashbin/l10n/eu.js +++ b/apps/files_trashbin/l10n/eu.js @@ -2,21 +2,21 @@ OC.L10N.register( "files_trashbin", { "Deleted files" : "Ezabatutako fitxategiak", - "restored" : "Berrezarrita", + "restored" : "Leheneratuta", "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Ezabatutako fitxategiak eta karpetak zakarrontziko edukiontzian (Esportatzean iraungi daitezke biltegiratze-toki gutxi baduzu)", - "This application enables users to restore files that were deleted from the system." : "Aplikazio honek erabiltzaileei sistematik ezabatutako fitxategiak berrezartzeko aukera eskaintzen die.", + "This application enables users to restore files that were deleted from the system." : "Aplikazio honek erabiltzaileei sistematik ezabatutako fitxategiak leheneratzeko aukera ematen die.", "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Aplikazio honek aukera ematen die erabiltzaileei sistematik ezabatutako fitxategiak leheneratzeko. Web interfazean ezabatutako fitxategien zerrenda bistaratzen du, eta ezabatutako fitxategiak erabiltzaileen fitxategi direktorioetara leheneratu edo sistematik betirako kentzeko aukerak ditu. Fitxategia leheneratzeak erlazionatutako fitxategi bertsioak ere leheneratzen ditu, bertsioen aplikazioa gaituta badago. Fitxategia partekatzetik ezabatzen denean, modu berean leheneratu daiteke, jada partekatzen ez bada ere. Modu lehenetsian, fitxategi hauek 30 egunez geratzen dira zakarrontzian.\nErabiltzailea diskoan lekurik gabe geratzea saihesteko, Ezabatutako Fitxategiak aplikazioak ez du ezabatutako fitxategietarako uneko kuota librearen % 50 baino gehiago erabiliko. Ezabatutako fitxategiek muga hori gainditzen badute, aplikazioak fitxategi zaharrenak ezabatuko ditu muga horren azpitik egon arte. Informazio gehiago erabilgarri dago Ezabatutako Fitxategiak ataleko dokumentazioan.", - "Restore" : "Berrezarri", + "Restore" : "Leheneratu", "Delete permanently" : "Ezabatu betirako", - "Error while restoring file from trash bin" : "Errore bat gertatu da fitxategia zakarrontzitik berrezartzean", - "Error while removing file from trash bin" : "Errore bat gertatu da fitxategia zakarrontzitik ezabatzean", - "Error while restoring files from trash bin" : "Errore bat gertatu da fitxategiak zakarrontzitik berrezartzean", - "Error while emptying trash bin" : "Errore bat gertatu da zakarrontzia hustean", - "Error while removing files from trash bin" : "Errore bat gertatu da fitxategiak zakarrontzitik ezabatzean", + "Error while restoring file from trash bin" : "Errorea gertatu da fitxategia zakarrontzitik leheneratzean", + "Error while removing file from trash bin" : "Errorea gertatu da fitxategia zakarrontzitik ezabatzean", + "Error while restoring files from trash bin" : "Errorea gertatu da fitxategiak zakarrontzitik leheneratzean", + "Error while emptying trash bin" : "Errorea gertatu da zakarrontzia hustean", + "Error while removing files from trash bin" : "Errorea gertatu da fitxategiak zakarrontzitik ezabatzean", "This operation is forbidden" : "Eragiketa hau debekatuta dago", - "This directory is unavailable, please check the logs or contact the administrator" : "Direktorio hau ez dago erabilgarri, administratzailearekin harremanetan jarri", + "This directory is unavailable, please check the logs or contact the administrator" : "Direktorio hau ez dago erabilgarri, begiratu egunkariak edo jarri administratzailearekin harremanetan", "No deleted files" : "Ez dago ezabatutako fitxategirik", - "You will be able to recover deleted files from here" : "Hemendik ezabatutako fitxategiak berreskuratu ahal izango duzu", + "You will be able to recover deleted files from here" : "Hemendik ezabatutako fitxategiak berreskuratu ahalko dituzu", "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan", "Select all" : "Hautatu dena", "Name" : "Izena", diff --git a/apps/files_trashbin/l10n/eu.json b/apps/files_trashbin/l10n/eu.json index b139fbbd274..d8c4a9d6b1d 100644 --- a/apps/files_trashbin/l10n/eu.json +++ b/apps/files_trashbin/l10n/eu.json @@ -1,20 +1,20 @@ { "translations": { "Deleted files" : "Ezabatutako fitxategiak", - "restored" : "Berrezarrita", + "restored" : "Leheneratuta", "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Ezabatutako fitxategiak eta karpetak zakarrontziko edukiontzian (Esportatzean iraungi daitezke biltegiratze-toki gutxi baduzu)", - "This application enables users to restore files that were deleted from the system." : "Aplikazio honek erabiltzaileei sistematik ezabatutako fitxategiak berrezartzeko aukera eskaintzen die.", + "This application enables users to restore files that were deleted from the system." : "Aplikazio honek erabiltzaileei sistematik ezabatutako fitxategiak leheneratzeko aukera ematen die.", "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Aplikazio honek aukera ematen die erabiltzaileei sistematik ezabatutako fitxategiak leheneratzeko. Web interfazean ezabatutako fitxategien zerrenda bistaratzen du, eta ezabatutako fitxategiak erabiltzaileen fitxategi direktorioetara leheneratu edo sistematik betirako kentzeko aukerak ditu. Fitxategia leheneratzeak erlazionatutako fitxategi bertsioak ere leheneratzen ditu, bertsioen aplikazioa gaituta badago. Fitxategia partekatzetik ezabatzen denean, modu berean leheneratu daiteke, jada partekatzen ez bada ere. Modu lehenetsian, fitxategi hauek 30 egunez geratzen dira zakarrontzian.\nErabiltzailea diskoan lekurik gabe geratzea saihesteko, Ezabatutako Fitxategiak aplikazioak ez du ezabatutako fitxategietarako uneko kuota librearen % 50 baino gehiago erabiliko. Ezabatutako fitxategiek muga hori gainditzen badute, aplikazioak fitxategi zaharrenak ezabatuko ditu muga horren azpitik egon arte. Informazio gehiago erabilgarri dago Ezabatutako Fitxategiak ataleko dokumentazioan.", - "Restore" : "Berrezarri", + "Restore" : "Leheneratu", "Delete permanently" : "Ezabatu betirako", - "Error while restoring file from trash bin" : "Errore bat gertatu da fitxategia zakarrontzitik berrezartzean", - "Error while removing file from trash bin" : "Errore bat gertatu da fitxategia zakarrontzitik ezabatzean", - "Error while restoring files from trash bin" : "Errore bat gertatu da fitxategiak zakarrontzitik berrezartzean", - "Error while emptying trash bin" : "Errore bat gertatu da zakarrontzia hustean", - "Error while removing files from trash bin" : "Errore bat gertatu da fitxategiak zakarrontzitik ezabatzean", + "Error while restoring file from trash bin" : "Errorea gertatu da fitxategia zakarrontzitik leheneratzean", + "Error while removing file from trash bin" : "Errorea gertatu da fitxategia zakarrontzitik ezabatzean", + "Error while restoring files from trash bin" : "Errorea gertatu da fitxategiak zakarrontzitik leheneratzean", + "Error while emptying trash bin" : "Errorea gertatu da zakarrontzia hustean", + "Error while removing files from trash bin" : "Errorea gertatu da fitxategiak zakarrontzitik ezabatzean", "This operation is forbidden" : "Eragiketa hau debekatuta dago", - "This directory is unavailable, please check the logs or contact the administrator" : "Direktorio hau ez dago erabilgarri, administratzailearekin harremanetan jarri", + "This directory is unavailable, please check the logs or contact the administrator" : "Direktorio hau ez dago erabilgarri, begiratu egunkariak edo jarri administratzailearekin harremanetan", "No deleted files" : "Ez dago ezabatutako fitxategirik", - "You will be able to recover deleted files from here" : "Hemendik ezabatutako fitxategiak berreskuratu ahal izango duzu", + "You will be able to recover deleted files from here" : "Hemendik ezabatutako fitxategiak berreskuratu ahalko dituzu", "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan", "Select all" : "Hautatu dena", "Name" : "Izena", diff --git a/apps/files_trashbin/l10n/gl.js b/apps/files_trashbin/l10n/gl.js index fcc779a8e0a..e7fdc256931 100644 --- a/apps/files_trashbin/l10n/gl.js +++ b/apps/files_trashbin/l10n/gl.js @@ -3,10 +3,16 @@ OC.L10N.register( { "Deleted files" : "Ficheiros eliminados", "restored" : "restaurado", + "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Ficheiros e cartafoles eliminados da papeleira (pode caducar durante a exportación se tes pouco espazo de almacenamento)", "This application enables users to restore files that were deleted from the system." : "Esta aplicación permítelle aos usuarios recuperar ficheiros que foron eliminados do sistema.", "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Esta aplicación permítelle aos usuarios recuperar ficheiros que foron eliminados do sistema. Amosa unha lista dos ficheiros eliminados na interface web e dispón de opcións para restaurar eses ficheiros eliminados cara aos os directorios do usuario ou eliminalos de xeito permanente do sistema. Ao restaurar un ficheiro restauraranse tamén as versións do ficheiro relacionadas. Cando se elimina un ficheiro dunha compartición, non se pode restaurar do mesmo xeito, pois xa non será compartido. Por omisión, estes ficheiros permanecen no lixo durante 30 días.\nPara evitar que un usuario quede sen espazo de disco, a aplicación non empregará máis do 50% do espazo dispoñíbel en cada momento. Se os ficheiros eliminados exceden este límite, a aplicación elimina os ficheiros máis antigos ata volver estar por baixo do límite. Ten máis información dispoñíbel na documentación de Ficheiros eliminados.", "Restore" : "Restaurar", "Delete permanently" : "Eliminar de xeito permanente", + "Error while restoring file from trash bin" : "Produciuse un erro ao restaurar o ficheiro do lixo", + "Error while removing file from trash bin" : "Produciuse un erro ao eliminar o ficheiro da papeleira", + "Error while restoring files from trash bin" : "Produciuse un erro ao restaurar os ficheiros do lixo", + "Error while emptying trash bin" : "Produciuse un erro ao baleirar o lixo", + "Error while removing files from trash bin" : "Produciuse un erro ao eliminar ficheiros do lixo", "This operation is forbidden" : "Esta operación está prohibida", "This directory is unavailable, please check the logs or contact the administrator" : "Este directorio non está dispoñíbel, comprobe os rexistros ou póñase en contacto co administrador", "No deleted files" : "Non hai ficheiros eliminados", diff --git a/apps/files_trashbin/l10n/gl.json b/apps/files_trashbin/l10n/gl.json index 6a87ac7909e..bfb5af5ec38 100644 --- a/apps/files_trashbin/l10n/gl.json +++ b/apps/files_trashbin/l10n/gl.json @@ -1,10 +1,16 @@ { "translations": { "Deleted files" : "Ficheiros eliminados", "restored" : "restaurado", + "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Ficheiros e cartafoles eliminados da papeleira (pode caducar durante a exportación se tes pouco espazo de almacenamento)", "This application enables users to restore files that were deleted from the system." : "Esta aplicación permítelle aos usuarios recuperar ficheiros que foron eliminados do sistema.", "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Esta aplicación permítelle aos usuarios recuperar ficheiros que foron eliminados do sistema. Amosa unha lista dos ficheiros eliminados na interface web e dispón de opcións para restaurar eses ficheiros eliminados cara aos os directorios do usuario ou eliminalos de xeito permanente do sistema. Ao restaurar un ficheiro restauraranse tamén as versións do ficheiro relacionadas. Cando se elimina un ficheiro dunha compartición, non se pode restaurar do mesmo xeito, pois xa non será compartido. Por omisión, estes ficheiros permanecen no lixo durante 30 días.\nPara evitar que un usuario quede sen espazo de disco, a aplicación non empregará máis do 50% do espazo dispoñíbel en cada momento. Se os ficheiros eliminados exceden este límite, a aplicación elimina os ficheiros máis antigos ata volver estar por baixo do límite. Ten máis información dispoñíbel na documentación de Ficheiros eliminados.", "Restore" : "Restaurar", "Delete permanently" : "Eliminar de xeito permanente", + "Error while restoring file from trash bin" : "Produciuse un erro ao restaurar o ficheiro do lixo", + "Error while removing file from trash bin" : "Produciuse un erro ao eliminar o ficheiro da papeleira", + "Error while restoring files from trash bin" : "Produciuse un erro ao restaurar os ficheiros do lixo", + "Error while emptying trash bin" : "Produciuse un erro ao baleirar o lixo", + "Error while removing files from trash bin" : "Produciuse un erro ao eliminar ficheiros do lixo", "This operation is forbidden" : "Esta operación está prohibida", "This directory is unavailable, please check the logs or contact the administrator" : "Este directorio non está dispoñíbel, comprobe os rexistros ou póñase en contacto co administrador", "No deleted files" : "Non hai ficheiros eliminados", diff --git a/apps/files_trashbin/l10n/it.js b/apps/files_trashbin/l10n/it.js index 06b47c61019..56ff891edac 100644 --- a/apps/files_trashbin/l10n/it.js +++ b/apps/files_trashbin/l10n/it.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Deleted files" : "File eliminati", "restored" : "ripristinati", + "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "File e cartelle eliminati nel Cestino (possono scadere durante l'esportazione se lo spazio di archiviazione è insufficiente)", "This application enables users to restore files that were deleted from the system." : "Questa applicazione permette agli utenti di ripristinare i file che sono stati eliminati dal sistema.", "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Questa applicazione consente agli utenti di ripristinare i file che sono stati eliminati dal sistema. Visualizza un elenco dei file eliminati nell'interfaccia web, e ha opzioni per ripristinare tali file nelle cartelle dei file degli utenti o rimuoverli definitivamente dal sistema. Il ripristino di un file ripristina anche le versioni relative, se l'applicazione delle versioni è abilitata. Se un file è eliminato da una condivisione, può essere ripristinato allo stesso modo, nonostante non sia più condiviso. In modo predefinito, questi file restano nel cestino per 30 giorni.\nPer impedire a un utente di rimanere senza spazio sul disco, l'applicazione File eliminati non utilizzerà più del 50% della quota libera attualmente disponibile. Se i file eliminati superano questo limite, l'applicazione elimina i file più datati fino a tornare sotto questo limite. Ulteriori informazioni sono disponibili nella documentazione di File eliminati.", "Restore" : "Ripristina", diff --git a/apps/files_trashbin/l10n/it.json b/apps/files_trashbin/l10n/it.json index f9a066974e5..708ef8deb02 100644 --- a/apps/files_trashbin/l10n/it.json +++ b/apps/files_trashbin/l10n/it.json @@ -1,6 +1,7 @@ { "translations": { "Deleted files" : "File eliminati", "restored" : "ripristinati", + "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "File e cartelle eliminati nel Cestino (possono scadere durante l'esportazione se lo spazio di archiviazione è insufficiente)", "This application enables users to restore files that were deleted from the system." : "Questa applicazione permette agli utenti di ripristinare i file che sono stati eliminati dal sistema.", "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Questa applicazione consente agli utenti di ripristinare i file che sono stati eliminati dal sistema. Visualizza un elenco dei file eliminati nell'interfaccia web, e ha opzioni per ripristinare tali file nelle cartelle dei file degli utenti o rimuoverli definitivamente dal sistema. Il ripristino di un file ripristina anche le versioni relative, se l'applicazione delle versioni è abilitata. Se un file è eliminato da una condivisione, può essere ripristinato allo stesso modo, nonostante non sia più condiviso. In modo predefinito, questi file restano nel cestino per 30 giorni.\nPer impedire a un utente di rimanere senza spazio sul disco, l'applicazione File eliminati non utilizzerà più del 50% della quota libera attualmente disponibile. Se i file eliminati superano questo limite, l'applicazione elimina i file più datati fino a tornare sotto questo limite. Ulteriori informazioni sono disponibili nella documentazione di File eliminati.", "Restore" : "Ripristina", diff --git a/apps/files_trashbin/l10n/nb.js b/apps/files_trashbin/l10n/nb.js index 6595ec705f1..f13bb38f189 100644 --- a/apps/files_trashbin/l10n/nb.js +++ b/apps/files_trashbin/l10n/nb.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Deleted files" : "Slettede filer", "restored" : "gjenopprettet", + "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Slettede filer og mapper i papirkurven (kan utløpe under eksport hvis du har lite lagringsplass)", "This application enables users to restore files that were deleted from the system." : "Denne appen gjør så brukere kan gjenopprette filer som har blitt slettet fra systemet.", "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Denne appen gjør så brukere kan gjenopprette filer som har blitt slettet fra systemet. Den viser en liste med slettede filer i web-grensesnittet hvor man kan gjenopprette de slettede filene tilbake til brukernes mapper, eller fjerne de permanent fra systemet. Gjenoppretting av en fil gjenoppretter også relaterte fil-versjoner, hvis versjonerings-appen er aktivert. Når en fil slettes fra en deling, kan den gjenopprettes på samme måte, men er da ikke lenger delt. Som standard bevares disse filene i søppelbøtten i 30 dager. For å forhindre en bruker fra å fylle opp disken, vil ikke Deleted Files-appen bruke mer enn 50% av den tilgjengelige diskkvoten til slettede filer. Hvis de slettede filene går over denne grensen sletter appen de aldste filene til den kommer under grensen. Mer informasjon er tilgjengelig i Deleted Files' dokumentasjon.", "Restore" : "Gjenopprett", diff --git a/apps/files_trashbin/l10n/nb.json b/apps/files_trashbin/l10n/nb.json index c042cec6fc3..d4704bf0aa4 100644 --- a/apps/files_trashbin/l10n/nb.json +++ b/apps/files_trashbin/l10n/nb.json @@ -1,6 +1,7 @@ { "translations": { "Deleted files" : "Slettede filer", "restored" : "gjenopprettet", + "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Slettede filer og mapper i papirkurven (kan utløpe under eksport hvis du har lite lagringsplass)", "This application enables users to restore files that were deleted from the system." : "Denne appen gjør så brukere kan gjenopprette filer som har blitt slettet fra systemet.", "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Denne appen gjør så brukere kan gjenopprette filer som har blitt slettet fra systemet. Den viser en liste med slettede filer i web-grensesnittet hvor man kan gjenopprette de slettede filene tilbake til brukernes mapper, eller fjerne de permanent fra systemet. Gjenoppretting av en fil gjenoppretter også relaterte fil-versjoner, hvis versjonerings-appen er aktivert. Når en fil slettes fra en deling, kan den gjenopprettes på samme måte, men er da ikke lenger delt. Som standard bevares disse filene i søppelbøtten i 30 dager. For å forhindre en bruker fra å fylle opp disken, vil ikke Deleted Files-appen bruke mer enn 50% av den tilgjengelige diskkvoten til slettede filer. Hvis de slettede filene går over denne grensen sletter appen de aldste filene til den kommer under grensen. Mer informasjon er tilgjengelig i Deleted Files' dokumentasjon.", "Restore" : "Gjenopprett", diff --git a/apps/files_trashbin/l10n/ru.js b/apps/files_trashbin/l10n/ru.js index 70434c2976d..d095d94fc64 100644 --- a/apps/files_trashbin/l10n/ru.js +++ b/apps/files_trashbin/l10n/ru.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Deleted files" : "Корзина", "restored" : "восстановлен", + "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Удаленные файлы и папки в корзине (могут быть исключены во время экспорта, если мало свободного места)", "This application enables users to restore files that were deleted from the system." : "Это приложение позволяет пользователям восстанавливать удалённые файлы.", "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Это приложение позволяет пользователям восстанавливать файлы, которые были удалены из системы. Он отображает список удаленных файлов в веб-интерфейсе и имеет опции для восстановления этих удаленных файлов обратно в каталоги пользователей или их окончательного удаления из системы. Восстановление файла также восстанавливает связанные версии файлов, если приложение версий включено. Когда файл удаляется из общего ресурса, его можно восстановить таким же образом, хотя он больше не используется. По умолчанию эти файлы остаются в Корзине в течение 30 дней.\n\nЧтобы у пользователя не было произошло переполнение доступного места на диске, приложение «Удаленные файлы» не будет использовать более 50% доступного в настоящее время дисковой квоты для удаленных файлов. Если удаленные файлы превышают этот предел, приложение удаляет самые старые файлы, пока свободное место не станет ниже этой отметки. Дополнительная информация доступна в документации Удаленные Файлы.", "Restore" : "Восстановить", diff --git a/apps/files_trashbin/l10n/ru.json b/apps/files_trashbin/l10n/ru.json index b8cfc0dca54..e3cf431a07c 100644 --- a/apps/files_trashbin/l10n/ru.json +++ b/apps/files_trashbin/l10n/ru.json @@ -1,6 +1,7 @@ { "translations": { "Deleted files" : "Корзина", "restored" : "восстановлен", + "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Удаленные файлы и папки в корзине (могут быть исключены во время экспорта, если мало свободного места)", "This application enables users to restore files that were deleted from the system." : "Это приложение позволяет пользователям восстанавливать удалённые файлы.", "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Это приложение позволяет пользователям восстанавливать файлы, которые были удалены из системы. Он отображает список удаленных файлов в веб-интерфейсе и имеет опции для восстановления этих удаленных файлов обратно в каталоги пользователей или их окончательного удаления из системы. Восстановление файла также восстанавливает связанные версии файлов, если приложение версий включено. Когда файл удаляется из общего ресурса, его можно восстановить таким же образом, хотя он больше не используется. По умолчанию эти файлы остаются в Корзине в течение 30 дней.\n\nЧтобы у пользователя не было произошло переполнение доступного места на диске, приложение «Удаленные файлы» не будет использовать более 50% доступного в настоящее время дисковой квоты для удаленных файлов. Если удаленные файлы превышают этот предел, приложение удаляет самые старые файлы, пока свободное место не станет ниже этой отметки. Дополнительная информация доступна в документации Удаленные Файлы.", "Restore" : "Восстановить", diff --git a/apps/files_trashbin/l10n/sr.js b/apps/files_trashbin/l10n/sr.js index 09dbc8d92ca..b028c0689b5 100644 --- a/apps/files_trashbin/l10n/sr.js +++ b/apps/files_trashbin/l10n/sr.js @@ -3,10 +3,16 @@ OC.L10N.register( { "Deleted files" : "Обрисани фајлови", "restored" : "враћено", + "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Обрисани фајлови и фолдери у корпи за отпатке (могу да истекну током извоза ако имате мало простора за складиштење)", "This application enables users to restore files that were deleted from the system." : "Ова апликација омогућава корисницима да поврате избрисане фајлове.", "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Ова апликација омогућава корисницима да поврате избрисане фајлове. Она приказује списак избрисаних фајлова у веб сучељу и има опцију да поврати избрисане фајлове назад у корисничке директоријуме или да их неповратно обрише из система. Враћање фајла враћа и везане верзије фајла, ако је апликација за верзионисање укључена. Када се фајл избрише из дељене фасцикле, може се повратити на исти начин, али више није дељен. Подразумевано, ови фајлови остају у канти 30 дана.\nДа би се спречило да корисник остане без простора на диску, апликација за обрисане фајлове неће користити више од 50% тренутно доступне квоте. Ако обрисани фајлови пређу ову границу, апликација ће брисати најстарије фајлове док величина заузетих фајлова не падне испод ове границе. Више информација је доступно у документацији.", "Restore" : "Врати", "Delete permanently" : "Обриши заувек", + "Error while restoring file from trash bin" : "Грешка током враћања фајла из корпе за отпатке", + "Error while removing file from trash bin" : "Грешка током уклањања фајла из корпе за отпатке", + "Error while restoring files from trash bin" : "Грешка током враћања фајлова из корпе за отпатке", + "Error while emptying trash bin" : "Грешка током пражњења корпе за отпатке", + "Error while removing files from trash bin" : "Грешка током уклањања фајлова из корпе за отпатке", "This operation is forbidden" : "Ова радња је забрањена", "This directory is unavailable, please check the logs or contact the administrator" : "Овај директоријум није доступан. Проверите записнике или контактирајте администратора", "No deleted files" : "Нема обрисаних фајлова", diff --git a/apps/files_trashbin/l10n/sr.json b/apps/files_trashbin/l10n/sr.json index 9165c700ac7..807ebf5c529 100644 --- a/apps/files_trashbin/l10n/sr.json +++ b/apps/files_trashbin/l10n/sr.json @@ -1,10 +1,16 @@ { "translations": { "Deleted files" : "Обрисани фајлови", "restored" : "враћено", + "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Обрисани фајлови и фолдери у корпи за отпатке (могу да истекну током извоза ако имате мало простора за складиштење)", "This application enables users to restore files that were deleted from the system." : "Ова апликација омогућава корисницима да поврате избрисане фајлове.", "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Ова апликација омогућава корисницима да поврате избрисане фајлове. Она приказује списак избрисаних фајлова у веб сучељу и има опцију да поврати избрисане фајлове назад у корисничке директоријуме или да их неповратно обрише из система. Враћање фајла враћа и везане верзије фајла, ако је апликација за верзионисање укључена. Када се фајл избрише из дељене фасцикле, може се повратити на исти начин, али више није дељен. Подразумевано, ови фајлови остају у канти 30 дана.\nДа би се спречило да корисник остане без простора на диску, апликација за обрисане фајлове неће користити више од 50% тренутно доступне квоте. Ако обрисани фајлови пређу ову границу, апликација ће брисати најстарије фајлове док величина заузетих фајлова не падне испод ове границе. Више информација је доступно у документацији.", "Restore" : "Врати", "Delete permanently" : "Обриши заувек", + "Error while restoring file from trash bin" : "Грешка током враћања фајла из корпе за отпатке", + "Error while removing file from trash bin" : "Грешка током уклањања фајла из корпе за отпатке", + "Error while restoring files from trash bin" : "Грешка током враћања фајлова из корпе за отпатке", + "Error while emptying trash bin" : "Грешка током пражњења корпе за отпатке", + "Error while removing files from trash bin" : "Грешка током уклањања фајлова из корпе за отпатке", "This operation is forbidden" : "Ова радња је забрањена", "This directory is unavailable, please check the logs or contact the administrator" : "Овај директоријум није доступан. Проверите записнике или контактирајте администратора", "No deleted files" : "Нема обрисаних фајлова", diff --git a/apps/files_trashbin/l10n/th.js b/apps/files_trashbin/l10n/th.js index 5e275c4275b..a3dea845a7e 100644 --- a/apps/files_trashbin/l10n/th.js +++ b/apps/files_trashbin/l10n/th.js @@ -2,11 +2,11 @@ OC.L10N.register( "files_trashbin", { "Deleted files" : "ไฟล์ที่ถูกลบ", - "restored" : "การเรียกคืน", + "restored" : "เรียกคืนแล้ว", "Restore" : "คืนค่า", "Delete permanently" : "ลบแบบถาวร", "This operation is forbidden" : "การดำเนินการนี้ถูกห้าม", - "This directory is unavailable, please check the logs or contact the administrator" : "ไม่สามารถใช้งานไดเรกทอรีนี้โปรดตรวจสอบบันทึกหรือติดต่อผู้ดูแลระบบ", + "This directory is unavailable, please check the logs or contact the administrator" : "ไม่สามารถใช้งานไดเรกทอรีนี้ โปรดตรวจสอบบันทึกหรือติดต่อผู้ดูแลระบบ", "No deleted files" : "ไม่มีไฟล์ที่ถูกลบ", "You will be able to recover deleted files from here" : "คุณจะสามารถกู้คืนไฟล์ที่ถูกได้ลบจากที่นี่", "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้", diff --git a/apps/files_trashbin/l10n/th.json b/apps/files_trashbin/l10n/th.json index a331dbc5066..657d912535a 100644 --- a/apps/files_trashbin/l10n/th.json +++ b/apps/files_trashbin/l10n/th.json @@ -1,10 +1,10 @@ { "translations": { "Deleted files" : "ไฟล์ที่ถูกลบ", - "restored" : "การเรียกคืน", + "restored" : "เรียกคืนแล้ว", "Restore" : "คืนค่า", "Delete permanently" : "ลบแบบถาวร", "This operation is forbidden" : "การดำเนินการนี้ถูกห้าม", - "This directory is unavailable, please check the logs or contact the administrator" : "ไม่สามารถใช้งานไดเรกทอรีนี้โปรดตรวจสอบบันทึกหรือติดต่อผู้ดูแลระบบ", + "This directory is unavailable, please check the logs or contact the administrator" : "ไม่สามารถใช้งานไดเรกทอรีนี้ โปรดตรวจสอบบันทึกหรือติดต่อผู้ดูแลระบบ", "No deleted files" : "ไม่มีไฟล์ที่ถูกลบ", "You will be able to recover deleted files from here" : "คุณจะสามารถกู้คืนไฟล์ที่ถูกได้ลบจากที่นี่", "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้", diff --git a/apps/files_trashbin/l10n/tr.js b/apps/files_trashbin/l10n/tr.js index 3e3d217dd62..82e7afa221d 100644 --- a/apps/files_trashbin/l10n/tr.js +++ b/apps/files_trashbin/l10n/tr.js @@ -5,7 +5,7 @@ OC.L10N.register( "restored" : "geri yüklendi", "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Çöp kutusundaki silinmiş dosya ve klasörler (depolama alanınız azsa dışa aktarma sırasında tükenebilir)", "This application enables users to restore files that were deleted from the system." : "Bu uygulama kullanıcıların sistem üzerinde sildiği dosyaları geri yükleyebilmesini sağlar.", - "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Bu uygulama kullanıcıların sistem üzerinde sildiği dosyaları geri yükleyebilmesini sağlar. Web arayüzünde silinmiş dosyaların listesini ve kullanıcı klasörlerine geri yükleme ya da kalıcı olarak silme seçeneklerini görüntüler. Sürümler uygulaması etkinleştirilmiş ise, geri yüklenen dosyaların önceki sürümleri de geri yüklenir. Paylaşım üzerinden silinen dosyalar da aynı şekilde ancak paylaşılmamış olarak geri yüklenebilir. Silinmiş dosyalar varsayılan olarak 30 gün boyunca çöp kutusunda tutulur.\nSilinmiş dosyalar uygulaması kullanıcıların disk alanının dolmasını engellemek için, kullanıcı depolama alanının en çok %50 oranındaki bölümünü kullanır. Silinmiş dosyaların boyutu bu sınırın üzerine çıkarsa, sınır değerine geri dönülene kadar en eski silinmiş dosyalar silinir. Ayrıntılı bilgi almak için Silinmiş Dosyalar uygulamasının belgelerine bakabilirsiniz.", + "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Bu uygulama kullanıcıların sistem üzerinde sildiği dosyaları geri yükleyebilmesini sağlar. Site arayüzünde silinmiş dosyaların listesini ve kullanıcı klasörlerine geri yükleme ya da kalıcı olarak silme seçeneklerini görüntüler. Sürümler uygulaması etkinleştirilmiş ise, geri yüklenen dosyaların önceki sürümleri de geri yüklenir. Paylaşım üzerinden silinen dosyalar da aynı şekilde ancak paylaşılmamış olarak geri yüklenebilir. Silinmiş dosyalar varsayılan olarak 30 gün boyunca çöp kutusunda tutulur.\nSilinmiş dosyalar uygulaması kullanıcıların disk alanının dolmasını engellemek için, kullanıcı depolama alanının en çok %50 oranındaki bölümünü kullanır. Silinmiş dosyaların boyutu bu sınırın üzerine çıkarsa, sınır değerine geri dönülene kadar en eski silinmiş dosyalar silinir. Ayrıntılı bilgi almak için Silinmiş Dosyalar uygulamasının belgelerine bakabilirsiniz.", "Restore" : "Geri yükle", "Delete permanently" : "Kalıcı olarak sil", "Error while restoring file from trash bin" : "Dosya çöp kutusundan geri yüklenirken sorun çıktı", diff --git a/apps/files_trashbin/l10n/tr.json b/apps/files_trashbin/l10n/tr.json index acfe999f760..65514a41ec5 100644 --- a/apps/files_trashbin/l10n/tr.json +++ b/apps/files_trashbin/l10n/tr.json @@ -3,7 +3,7 @@ "restored" : "geri yüklendi", "Deleted files and folders in the trash bin (may expire during export if you are low on storage space)" : "Çöp kutusundaki silinmiş dosya ve klasörler (depolama alanınız azsa dışa aktarma sırasında tükenebilir)", "This application enables users to restore files that were deleted from the system." : "Bu uygulama kullanıcıların sistem üzerinde sildiği dosyaları geri yükleyebilmesini sağlar.", - "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Bu uygulama kullanıcıların sistem üzerinde sildiği dosyaları geri yükleyebilmesini sağlar. Web arayüzünde silinmiş dosyaların listesini ve kullanıcı klasörlerine geri yükleme ya da kalıcı olarak silme seçeneklerini görüntüler. Sürümler uygulaması etkinleştirilmiş ise, geri yüklenen dosyaların önceki sürümleri de geri yüklenir. Paylaşım üzerinden silinen dosyalar da aynı şekilde ancak paylaşılmamış olarak geri yüklenebilir. Silinmiş dosyalar varsayılan olarak 30 gün boyunca çöp kutusunda tutulur.\nSilinmiş dosyalar uygulaması kullanıcıların disk alanının dolmasını engellemek için, kullanıcı depolama alanının en çok %50 oranındaki bölümünü kullanır. Silinmiş dosyaların boyutu bu sınırın üzerine çıkarsa, sınır değerine geri dönülene kadar en eski silinmiş dosyalar silinir. Ayrıntılı bilgi almak için Silinmiş Dosyalar uygulamasının belgelerine bakabilirsiniz.", + "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Bu uygulama kullanıcıların sistem üzerinde sildiği dosyaları geri yükleyebilmesini sağlar. Site arayüzünde silinmiş dosyaların listesini ve kullanıcı klasörlerine geri yükleme ya da kalıcı olarak silme seçeneklerini görüntüler. Sürümler uygulaması etkinleştirilmiş ise, geri yüklenen dosyaların önceki sürümleri de geri yüklenir. Paylaşım üzerinden silinen dosyalar da aynı şekilde ancak paylaşılmamış olarak geri yüklenebilir. Silinmiş dosyalar varsayılan olarak 30 gün boyunca çöp kutusunda tutulur.\nSilinmiş dosyalar uygulaması kullanıcıların disk alanının dolmasını engellemek için, kullanıcı depolama alanının en çok %50 oranındaki bölümünü kullanır. Silinmiş dosyaların boyutu bu sınırın üzerine çıkarsa, sınır değerine geri dönülene kadar en eski silinmiş dosyalar silinir. Ayrıntılı bilgi almak için Silinmiş Dosyalar uygulamasının belgelerine bakabilirsiniz.", "Restore" : "Geri yükle", "Delete permanently" : "Kalıcı olarak sil", "Error while restoring file from trash bin" : "Dosya çöp kutusundan geri yüklenirken sorun çıktı", diff --git a/apps/files_trashbin/lib/Sabre/AbstractTrash.php b/apps/files_trashbin/lib/Sabre/AbstractTrash.php index 412e432a19e..e02e4c5b8ba 100644 --- a/apps/files_trashbin/lib/Sabre/AbstractTrash.php +++ b/apps/files_trashbin/lib/Sabre/AbstractTrash.php @@ -57,7 +57,11 @@ abstract class AbstractTrash implements ITrash { return $this->data; } - public function getSize(): int { + /** + * @psalm-suppress ImplementedReturnTypeMismatch \Sabre\DAV\IFile::getSize signature does not support 32bit + * @return int|float + */ + public function getSize(): int|float { return $this->data->getSize(); } diff --git a/apps/files_trashbin/lib/Sabre/ITrash.php b/apps/files_trashbin/lib/Sabre/ITrash.php index dcda1abe259..b6b4e70f3b9 100644 --- a/apps/files_trashbin/lib/Sabre/ITrash.php +++ b/apps/files_trashbin/lib/Sabre/ITrash.php @@ -39,7 +39,7 @@ interface ITrash { public function getDeletionTime(): int; - public function getSize(); + public function getSize(): int|float; public function getFileId(): int; diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index 46a2b07fc07..00e6b35cc62 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -69,13 +69,6 @@ class Trashbin { public const DEFAULTMAXSIZE = 50; /** - * Whether versions have already be rescanned during this PHP request - * - * @var bool - */ - private static $scannedVersions = false; - - /** * Ensure we don't need to scan the file during the move to trash * by triggering the scan in the pre-hook * @@ -980,23 +973,6 @@ class Trashbin { /** @var \OC\Files\Storage\Storage $storage */ [$storage,] = $view->resolvePath('/'); - //force rescan of versions, local storage may not have updated the cache - $waitstart = time(); - while (!self::$scannedVersions) { - try { - $storage->getScanner()->scan('files_trashbin/versions'); - self::$scannedVersions = true; - } catch (LockedException $e) { - /* a concurrent remove/restore from trash occurred, - * retry with a maximum wait time of approx. 15 seconds - */ - if (time() - $waitstart > 15) { - throw $e; - } - usleep(50000 + rand(0, 10000)); - } - } - $pattern = \OC::$server->getDatabaseConnection()->escapeLikeParameter(basename($filename)); if ($timestamp) { // fetch for old versions diff --git a/apps/files_trashbin/src/filelist.js b/apps/files_trashbin/src/filelist.js index 8920dcbf8b9..fcedc9defbe 100644 --- a/apps/files_trashbin/src/filelist.js +++ b/apps/files_trashbin/src/filelist.js @@ -25,6 +25,9 @@ * */ +// eslint-disable-next-line import/no-unresolved, n/no-missing-import +import PQueue from 'p-queue' + /* eslint-disable */ (function() { var DELETED_REGEXP = new RegExp(/^(.+)\.d[0-9]+$/) @@ -61,6 +64,7 @@ var FileList = function($el, options) { this.client = options.client this.initialize($el, options) + this.deleteOperationQueue = new PQueue({ concurrency: 4 }) } FileList.prototype = _.extend({}, OCA.Files.FileList.prototype, /** @lends OCA.Trashbin.FileList.prototype */ { @@ -185,12 +189,10 @@ this.fileMultiSelectMenu.toggleLoading('restore', true) var restorePromises = files.map(function(file) { - return self.client.move(OC.joinPaths('trash', self.getCurrentDirectory(), file), OC.joinPaths('restore', file), true) - .then( - function() { - self._removeCallback([file]) - } - ) + return self.deleteOperationQueue.add(async () => { + self.client.move(OC.joinPaths('trash', self.getCurrentDirectory(), file), OC.joinPaths('restore', file), true) + self._removeCallback([file]) + }) }) return Promise.all(restorePromises).then( function() { @@ -226,12 +228,10 @@ } else { this.fileMultiSelectMenu.toggleLoading('delete', true) var deletePromises = files.map(function(file) { - return self.client.remove(OC.joinPaths('trash', self.getCurrentDirectory(), file)) - .then( - function() { - self._removeCallback([file]) - } - ) + return self.deleteOperationQueue.add(async () => { + await self.client.remove(OC.joinPaths('trash', self.getCurrentDirectory(), file)) + self._removeCallback([file]) + }) }) return Promise.all(deletePromises).then( function() { diff --git a/apps/files_trashbin/src/files_trashbin.js b/apps/files_trashbin/src/files_trashbin.js index 84829341b31..f66e78905f6 100644 --- a/apps/files_trashbin/src/files_trashbin.js +++ b/apps/files_trashbin/src/files_trashbin.js @@ -20,8 +20,8 @@ * */ -import './app' -import './filelist' +import './app.js' +import './filelist.js' import './trash.scss' window.OCA.Trashbin = OCA.Trashbin diff --git a/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php b/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php index bf5d6bc65ae..3264c11f8fa 100644 --- a/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php +++ b/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php @@ -33,7 +33,6 @@ use OCP\IConfig; use OCP\IUserManager; use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; -use Psr\Log\LoggerInterface; class ExpireTrashTest extends TestCase { /** @var IConfig|MockObject */ @@ -61,7 +60,7 @@ class ExpireTrashTest extends TestCase { $this->time = $this->createMock(ITimeFactory::class); $this->time->method('getTime') - ->willReturn(99999999999); + ->willReturn(999999999); $this->jobList->expects($this->once()) ->method('setLastRun'); diff --git a/apps/files_trashbin/tests/StorageTest.php b/apps/files_trashbin/tests/StorageTest.php index 0a7a129ca28..b4892d2deb0 100644 --- a/apps/files_trashbin/tests/StorageTest.php +++ b/apps/files_trashbin/tests/StorageTest.php @@ -92,6 +92,8 @@ class StorageTest extends \Test\TestCase { parent::setUp(); \OC_Hook::clear(); + \OC::$server->boot(); + // register trashbin hooks $trashbinApp = new Application(); $trashbinApp->boot($this->createMock(IBootContext::class)); @@ -224,8 +226,6 @@ class StorageTest extends \Test\TestCase { * Test that deleted versions properly land in the trashbin. */ public function testDeleteVersionsOfFile() { - \OCA\Files_Versions\Hooks::connectHooks(); - // trigger a version (multiple would not work because of the expire logic) $this->userView->file_put_contents('test.txt', 'v1'); @@ -253,8 +253,6 @@ class StorageTest extends \Test\TestCase { * Test that deleted versions properly land in the trashbin. */ public function testDeleteVersionsOfFolder() { - \OCA\Files_Versions\Hooks::connectHooks(); - // trigger a version (multiple would not work because of the expire logic) $this->userView->file_put_contents('folder/inside.txt', 'v1'); @@ -288,8 +286,6 @@ class StorageTest extends \Test\TestCase { * Test that deleted versions properly land in the trashbin when deleting as share recipient. */ public function testDeleteVersionsOfFileAsRecipient() { - \OCA\Files_Versions\Hooks::connectHooks(); - $this->userView->mkdir('share'); // trigger a version (multiple would not work because of the expire logic) $this->userView->file_put_contents('share/test.txt', 'v1'); @@ -341,8 +337,6 @@ class StorageTest extends \Test\TestCase { * Test that deleted versions properly land in the trashbin when deleting as share recipient. */ public function testDeleteVersionsOfFolderAsRecipient() { - \OCA\Files_Versions\Hooks::connectHooks(); - $this->userView->mkdir('share'); $this->userView->mkdir('share/folder'); // trigger a version (multiple would not work because of the expire logic) @@ -410,8 +404,6 @@ class StorageTest extends \Test\TestCase { * unlink() which should NOT trigger the version deletion logic. */ public function testKeepFileAndVersionsWhenMovingFileBetweenStorages() { - \OCA\Files_Versions\Hooks::connectHooks(); - $storage2 = new Temporary([]); \OC\Files\Filesystem::mount($storage2, [], $this->user . '/files/substorage'); @@ -451,8 +443,6 @@ class StorageTest extends \Test\TestCase { * unlink() which should NOT trigger the version deletion logic. */ public function testKeepFileAndVersionsWhenMovingFolderBetweenStorages() { - \OCA\Files_Versions\Hooks::connectHooks(); - $storage2 = new Temporary([]); \OC\Files\Filesystem::mount($storage2, [], $this->user . '/files/substorage'); |