diff --git a/.gitignore b/.gitignore index b57dd3d2058063ba2afabfaeae4dcf51ac19b7b2..fe89c74ab38864939d737fa40f8ff0671e5c6372 100644 --- a/.gitignore +++ b/.gitignore @@ -76,4 +76,4 @@ nbproject data-autotest /tests/coverage* /tests/autoconfig* -/tests/autotest* +/tests/autotest* \ No newline at end of file diff --git a/3rdparty b/3rdparty index a13af72fbe8983686fc47489a750e60319f68ac2..e312294ef62873df2b8c02e774f9dfe1b7fbc38d 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit a13af72fbe8983686fc47489a750e60319f68ac2 +Subproject commit e312294ef62873df2b8c02e774f9dfe1b7fbc38d diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php index 1cd2944483cb337e547296224881252ebd4fc9d2..f568afad4da44f87f4d74cd301cee93202c8aa9b 100644 --- a/apps/files/ajax/rawlist.php +++ b/apps/files/ajax/rawlist.php @@ -15,6 +15,14 @@ $mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : ''; // make filelist $files = array(); +// If a type other than directory is requested first load them. +if($mimetype && strpos($mimetype, 'httpd/unix-directory') === false) { + foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, 'httpd/unix-directory' ) as $i ) { + $i["date"] = OCP\Util::formatDate($i["mtime"] ); + $i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']); + $files[] = $i; + } +} foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, $mimetype ) as $i ) { $i["date"] = OCP\Util::formatDate($i["mtime"] ); $i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']); diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php index 05ab1722b3e4f5411bb32671bb69dd03582ecd86..99739cb4cee71461bf43d1a6f0e8143b7e8939a4 100644 --- a/apps/files/appinfo/app.php +++ b/apps/files/appinfo/app.php @@ -20,4 +20,4 @@ OC_Search::registerProvider('OC_Search_Provider_File'); \OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook'); \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook'); -\OC_BackgroundJob_RegularTask::register('\OC\Files\Cache\BackgroundWatcher', 'checkNext'); +\OCP\BackgroundJob::addRegularTask('\OC\Files\Cache\BackgroundWatcher', 'checkNext'); diff --git a/apps/files/js/files.js b/apps/files/js/files.js index a15f0588f9f3cec5ac8e589772e0809b132f7341..a79d34c9b23545ce3b9d042b0ebd529bd99a19a3 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -708,14 +708,14 @@ function scanFiles(force, dir){ var scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir}); scanFiles.cancel = scannerEventSource.close.bind(scannerEventSource); scannerEventSource.listen('count',function(count){ - console.log(count + 'files scanned') + console.log(count + ' files scanned') }); scannerEventSource.listen('folder',function(path){ console.log('now scanning ' + path) }); scannerEventSource.listen('done',function(count){ scanFiles.scanning=false; - console.log('done after ' + count + 'files'); + console.log('done after ' + count + ' files'); }); } scanFiles.scanning=false; diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index 6da312ae75b4869c5cad297c5f32eda46f20d5ae..c1c94b99003f6d52dbf5bbb3736af9ed7bbf5c26 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} carpetes", "1 file" => "1 fitxer", "{count} files" => "{count} fitxers", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud", "Unable to rename file" => "No es pot canviar el nom del fitxer", "Upload" => "Puja", "File handling" => "Gestió de fitxers", @@ -56,7 +57,7 @@ "0 is unlimited" => "0 és sense límit", "Maximum input size for ZIP files" => "Mida màxima d'entrada per fitxers ZIP", "Save" => "Desa", -"New" => "Nova", +"New" => "Nou", "Text file" => "Fitxer de text", "Folder" => "Carpeta", "From link" => "Des d'enllaç", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index 626af36c2b60f9bf8a64cfd522623e5e48b5ef87..3c06c1ac83de1c42c3b3bf7be0dff05761723656 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} Ordner", "1 file" => "1 Datei", "{count} files" => "{count} Dateien", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.", "Unable to rename file" => "Konnte Datei nicht umbenennen", "Upload" => "Hochladen", "File handling" => "Dateibehandlung", diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index a8bb96cdfc8cf818b84784c65d776746c98222af..b273f6b522dde74280b8fdf35be2ba7bb094b7da 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} φάκελοι", "1 file" => "1 αρχείο", "{count} files" => "{count} αρχεία", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud", "Unable to rename file" => "Αδυναμία μετονομασίας αρχείου", "Upload" => "Μεταφόρτωση", "File handling" => "Διαχείριση αρχείων", diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php index 2aee432b10bcc69d1c84422f5fc103fd82a18691..b11adfabeb3e0b67204d02f38ac274bd54f2adf0 100644 --- a/apps/files/l10n/es.php +++ b/apps/files/l10n/es.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} carpetas", "1 file" => "1 archivo", "{count} files" => "{count} archivos", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para ownCloud", "Unable to rename file" => "No se puede renombrar el archivo", "Upload" => "Subir", "File handling" => "Tratamiento de archivos", diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index af6cf96161269ac8d77809e80876a50aba04bd6a..0ae47302edf7f020ab8e603e88178b5ff7bf602d 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} directorios", "1 file" => "1 archivo", "{count} files" => "{count} archivos", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud", "Unable to rename file" => "No fue posible cambiar el nombre al archivo", "Upload" => "Subir", "File handling" => "Tratamiento de archivos", diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index 2214c4d3370f7477e861926c0381f60a55068e48..d3fab4b0bd167e59a03f3f9e0f1f620a155b850c 100644 --- a/apps/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php @@ -3,7 +3,7 @@ "Could not move %s" => "%s liigutamine ebaõnnestus", "No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga", "There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud", -"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud", "The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt", "No file was uploaded" => "Ühtegi faili ei laetud üles", @@ -24,18 +24,18 @@ "replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}", "undo" => "tagasi", "perform delete operation" => "teosta kustutamine", -"1 file uploading" => "1 faili üleslaadimisel", -"files uploading" => "failide üleslaadimine", +"1 file uploading" => "1 fail üleslaadimisel", +"files uploading" => "faili üleslaadimisel", "'.' is an invalid file name." => "'.' on vigane failinimi.", "File name cannot be empty." => "Faili nimi ei saa olla tühi.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.", -"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ja sünkroniseerimist ei toimu!", +"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!", "Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)", -"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega kui on tegu suurte failidega. ", +"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ", "Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti", "Not enough space available" => "Pole piisavalt ruumi", "Upload cancelled." => "Üleslaadimine tühistati.", -"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.", "URL cannot be empty." => "URL ei saa olla tühi.", "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.", "Error" => "Viga", @@ -46,6 +46,7 @@ "{count} folders" => "{count} kausta", "1 file" => "1 fail", "{count} files" => "{count} faili", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.", "Unable to rename file" => "Faili ümbernimetamine ebaõnnestus", "Upload" => "Lae üles", "File handling" => "Failide käsitlemine", @@ -68,7 +69,7 @@ "Unshare" => "Lõpeta jagamine", "Upload too large" => "Üleslaadimine on liiga suur", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.", -"Files are being scanned, please wait." => "Faile skannitakse, palun oota", +"Files are being scanned, please wait." => "Faile skannitakse, palun oota.", "Current scanning" => "Praegune skannimine", -"Upgrading filesystem cache..." => "Uuendan failisüsteemi puhvrit..." +"Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..." ); diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 5620d86e48d0ba248920cfd2cfe781e0135185c0..39c697396c919c69a6349ae94f44b2f47c8f2882 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} dossiers", "1 file" => "1 fichier", "{count} files" => "{count} fichiers", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud", "Unable to rename file" => "Impossible de renommer le fichier", "Upload" => "Envoyer", "File handling" => "Gestion des fichiers", diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index 2352d9e15c4649af895cc7b00d92db22819f0f01..d22ed4b87215d156509866f3a81ac712d2c9b02f 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} cartafoles", "1 file" => "1 ficheiro", "{count} files" => "{count} ficheiros", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod", "Unable to rename file" => "Non é posíbel renomear o ficheiro", "Upload" => "Enviar", "File handling" => "Manexo de ficheiro", diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index 4520bfdd085dd934fee131f490e5e3a19ebaf5c9..76b8bd420da8d84bb4813da057b27f7da3c7bcd1 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} mappa", "1 file" => "1 fájl", "{count} files" => "{count} fájl", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés", "Unable to rename file" => "Nem lehet átnevezni a fájlt", "Upload" => "Feltöltés", "File handling" => "Fájlkezelés", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index d5eca524d8a7d3cf52570b6f04e3d7483c759570..c588285aacabab0d61dc185d882b4017fd224af2 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} cartelle", "1 file" => "1 file", "{count} files" => "{count} file", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud", "Unable to rename file" => "Impossibile rinominare il file", "Upload" => "Carica", "File handling" => "Gestione file", diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 021a21048704d69a27523fc98f215e1bdd0898e4..55dcf3640e7746d8d23a7cd00873474604fa32e9 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} フォルダ", "1 file" => "1 ファイル", "{count} files" => "{count} ファイル", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです", "Unable to rename file" => "ファイル名の変更ができません", "Upload" => "アップロード", "File handling" => "ファイル操作", diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php index 1ff21b1f0e23faf454b7759f120bc657de52fd7a..d5710a4927a07f438afa6531298606fdbd8a3593 100644 --- a/apps/files/l10n/nb_NO.php +++ b/apps/files/l10n/nb_NO.php @@ -1,11 +1,16 @@ "Kan ikke flytte %s - En fil med samme navn finnes allerede", +"Could not move %s" => "Kunne ikke flytte %s", "No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.", "There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.", "The uploaded file was only partially uploaded" => "Filen du prøvde å laste opp ble kun delvis lastet opp", "No file was uploaded" => "Ingen filer ble lastet opp", "Missing a temporary folder" => "Mangler midlertidig mappe", "Failed to write to disk" => "Klarte ikke å skrive til disk", +"Not enough storage available" => "Ikke nok lagringsplass", +"Invalid directory." => "Ugyldig katalog.", "Files" => "Filer", "Share" => "Del", "Delete permanently" => "Slett permanent", @@ -18,13 +23,21 @@ "cancel" => "avbryt", "replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}", "undo" => "angre", +"perform delete operation" => "utfør sletting", "1 file uploading" => "1 fil lastes opp", "files uploading" => "filer lastes opp", +"'.' is an invalid file name." => "'.' er et ugyldig filnavn.", +"File name cannot be empty." => "Filnavn kan ikke være tomt.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.", +"Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!", +"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)", +"Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.", "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes", +"Not enough space available" => "Ikke nok lagringsplass", "Upload cancelled." => "Opplasting avbrutt.", "File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.", "URL cannot be empty." => "URL-en kan ikke være tom.", +"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.", "Error" => "Feil", "Name" => "Navn", "Size" => "Størrelse", @@ -33,6 +46,8 @@ "{count} folders" => "{count} mapper", "1 file" => "1 fil", "{count} files" => "{count} filer", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.", +"Unable to rename file" => "Kan ikke gi nytt navn", "Upload" => "Last opp", "File handling" => "Filhåndtering", "Maximum upload size" => "Maksimum opplastingsstørrelse", @@ -46,12 +61,15 @@ "Text file" => "Tekstfil", "Folder" => "Mappe", "From link" => "Fra link", +"Deleted files" => "Slettet filer", "Cancel upload" => "Avbryt opplasting", +"You don’t have write permissions here." => "Du har ikke skrivetilgang her.", "Nothing in here. Upload something!" => "Ingenting her. Last opp noe!", "Download" => "Last ned", "Unshare" => "Avslutt deling", "Upload too large" => "Filen er for stor", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.", "Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.", -"Current scanning" => "Pågående skanning" +"Current scanning" => "Pågående skanning", +"Upgrading filesystem cache..." => "Oppgraderer filsystemets mellomlager..." ); diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index 430af50072f9d2d9046c360af129849f9c5abaa8..bc4158df3b3928befe482bbd8d5692f677d7de0a 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} mappen", "1 file" => "1 bestand", "{count} files" => "{count} bestanden", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf", "Unable to rename file" => "Kan bestand niet hernoemen", "Upload" => "Uploaden", "File handling" => "Bestand", diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index 6d5c4c56425219ff9c63075765bc728e4f64237a..29593b6f2def50a7d86a473355100ec45ba099ad 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -1,6 +1,6 @@ "Klarte ikkje å flytta %s – det finst allereie ei fil med dette namnet", -"Could not move %s" => "Klarte ikkje å flytta %s", +"Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet", +"Could not move %s" => "Klarte ikkje flytta %s", "No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil", "There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ", @@ -8,7 +8,7 @@ "The uploaded file was only partially uploaded" => "Fila vart berre delvis lasta opp", "No file was uploaded" => "Ingen filer vart lasta opp", "Missing a temporary folder" => "Manglar ei mellombels mappe", -"Failed to write to disk" => "Klarte ikkje å skriva til disk", +"Failed to write to disk" => "Klarte ikkje skriva til disk", "Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg", "Invalid directory." => "Ugyldig mappe.", "Files" => "Filer", @@ -32,11 +32,11 @@ "Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!", "Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)", "Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.", -"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje å lasta opp fila sidan ho er ei mappe eller er på 0 byte", +"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte", "Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg", "Upload cancelled." => "Opplasting avbroten.", -"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga bli avbroten.", -"URL cannot be empty." => "URL-en kan ikkje vera tom.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.", +"URL cannot be empty." => "Nettadressa kan ikkje vera tom.", "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud", "Error" => "Feil", "Name" => "Namn", @@ -46,13 +46,14 @@ "{count} folders" => "{count} mapper", "1 file" => "1 fil", "{count} files" => "{count} filer", -"Unable to rename file" => "Klarte ikkje å endra filnamnet", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud", +"Unable to rename file" => "Klarte ikkje endra filnamnet", "Upload" => "Last opp", "File handling" => "Filhandtering", "Maximum upload size" => "Maksimal opplastingsstorleik", "max. possible: " => "maks. moglege:", -"Needed for multi-file and folder downloads." => "Naudsynt for fleirfils- og mappenedlastingar.", -"Enable ZIP-download" => "Skru på ZIP-nedlasting", +"Needed for multi-file and folder downloads." => "Nødvendig for fleirfils- og mappenedlastingar.", +"Enable ZIP-download" => "Slå på ZIP-nedlasting", "0 is unlimited" => "0 er ubegrensa", "Maximum input size for ZIP files" => "Maksimal storleik for ZIP-filer", "Save" => "Lagre", @@ -67,7 +68,7 @@ "Download" => "Last ned", "Unshare" => "Udel", "Upload too large" => "For stor opplasting", -"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren.", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.", "Files are being scanned, please wait." => "Skannar filer, ver venleg og vent.", "Current scanning" => "Køyrande skanning", "Upgrading filesystem cache..." => "Oppgraderer mellomlageret av filsystemet …" diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index 65d9a4e4be249a2dd50745af4acd072510606342..4bdac05578189551de8da55cd84b5631ed25256c 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -46,6 +46,7 @@ "{count} folders" => "Ilość folderów: {count}", "1 file" => "1 plik", "{count} files" => "Ilość plików: {count}", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud", "Unable to rename file" => "Nie można zmienić nazwy pliku", "Upload" => "Wyślij", "File handling" => "Zarządzanie plikami", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index 7c68987652cfcaea66ad285773392b53bc660221..0f349b694812830acc2dec8a4a813cccfc419443 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} pastas", "1 file" => "1 arquivo", "{count} files" => "{count} arquivos", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud", "Unable to rename file" => "Impossível renomear arquivo", "Upload" => "Upload", "File handling" => "Tratamento de Arquivo", diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php index 15d6fc80bd36cec03e9c89bb6b5cd83653f1ebfb..d90e29997020968bf8a4333c62072af2258bd3ba 100644 --- a/apps/files/l10n/pt_PT.php +++ b/apps/files/l10n/pt_PT.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} pastas", "1 file" => "1 ficheiro", "{count} files" => "{count} ficheiros", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud", "Unable to rename file" => "Não foi possível renomear o ficheiro", "Upload" => "Carregar", "File handling" => "Manuseamento de ficheiros", diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php index 400a0dc8de710ee60b14f6e718b45c97719ee2e3..e0bfab33215ff8036017e3b024630f40c148fe63 100644 --- a/apps/files/l10n/ru_RU.php +++ b/apps/files/l10n/ru_RU.php @@ -1,71 +1,16 @@ "Неполучается перенести %s - Файл с таким именем уже существует", -"Could not move %s" => "Неполучается перенести %s ", -"Unable to rename file" => "Невозможно переименовать файл", "No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка", -"There is no error, the file uploaded with success" => "Ошибка отсутствует, файл загружен успешно.", -"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:", -"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного", -"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично", +"There is no error, the file uploaded with success" => "Ошибки нет, файл успешно загружен", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загружаемого файла превысил максимально допустимый в директиве MAX_FILE_SIZE, специфицированной в HTML-форме", +"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен лишь частично", "No file was uploaded" => "Файл не был загружен", -"Missing a temporary folder" => "Отсутствует временная папка", +"Missing a temporary folder" => "Отсутствие временной папки", "Failed to write to disk" => "Не удалось записать на диск", "Not enough storage available" => "Недостаточно места в хранилище", -"Invalid directory." => "Неверный каталог.", -"Files" => "Файлы", "Share" => "Сделать общим", -"Delete permanently" => "Удалить навсегда", "Delete" => "Удалить", -"Rename" => "Переименовать", -"Pending" => "Ожидающий решения", -"{new_name} already exists" => "{новое_имя} уже существует", -"replace" => "отмена", -"suggest name" => "подобрать название", -"cancel" => "отменить", -"replaced {new_name} with {old_name}" => "заменено {новое_имя} с {старое_имя}", -"undo" => "отменить действие", -"perform delete operation" => "выполняется процесс удаления", -"1 file uploading" => "загрузка 1 файла", -"'.' is an invalid file name." => "'.' является неверным именем файла.", -"File name cannot be empty." => "Имя файла не может быть пустым.", -"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы.", -"Your storage is full, files can not be updated or synced anymore!" => "Ваше хранилище переполнено, фалы больше не могут быть обновлены или синхронизированы!", -"Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти полно ({usedSpacePercent}%)", -"Your download is being prepared. This might take some time if the files are big." => "Идёт подготовка к скачке Вашего файла. Это может занять некоторое время, если фалы большие.", -"Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией", -"Not enough space available" => "Не достаточно свободного места", -"Upload cancelled." => "Загрузка отменена", -"File upload is in progress. Leaving the page now will cancel the upload." => "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена.", -"URL cannot be empty." => "URL не должен быть пустым.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неверное имя папки. Использование наименования 'Опубликовано' зарезервировано Owncloud", "Error" => "Ошибка", "Name" => "Имя", -"Size" => "Размер", -"Modified" => "Изменен", -"1 folder" => "1 папка", -"{count} folders" => "{количество} папок", -"1 file" => "1 файл", -"{count} files" => "{количество} файлов", -"Upload" => "Загрузить ", -"File handling" => "Работа с файлами", -"Maximum upload size" => "Максимальный размер загружаемого файла", -"max. possible: " => "Максимально возможный", -"Needed for multi-file and folder downloads." => "Необходимо для множественной загрузки.", -"Enable ZIP-download" => "Включение ZIP-загрузки", -"0 is unlimited" => "0 без ограничений", -"Maximum input size for ZIP files" => "Максимальный размер входящих ZIP-файлов ", "Save" => "Сохранить", -"New" => "Новый", -"Text file" => "Текстовый файл", -"Folder" => "Папка", -"From link" => "По ссылке", -"Cancel upload" => "Отмена загрузки", -"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!", -"Download" => "Загрузить", -"Unshare" => "Скрыть", -"Upload too large" => "Загрузка слишком велика", -"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер.", -"Files are being scanned, please wait." => "Файлы сканируются, пожалуйста, подождите.", -"Current scanning" => "Текущее сканирование", -"Upgrading filesystem cache..." => "Обновление кэша файловой системы... " +"Download" => "Загрузка" ); diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php index b7f329c3626dbfc59603487210cf1ec1668c3eaa..ad33c9b4eeedcbda5a008fbe6d6ea498bf882878 100644 --- a/apps/files/l10n/sk_SK.php +++ b/apps/files/l10n/sk_SK.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} priečinkov", "1 file" => "1 súbor", "{count} files" => "{count} súborov", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud", "Unable to rename file" => "Nemožno premenovať súbor", "Upload" => "Odoslať", "File handling" => "Nastavenie správania sa k súborom", diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index fd5c6bc6f09faccf190e7c14b25c215aaeb303f5..6a096d270391fb5947399848f0d6b8c5b81a33e8 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} dizin", "1 file" => "1 dosya", "{count} files" => "{count} dosya", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir.", "Unable to rename file" => "Dosya adı değiştirilemedi", "Upload" => "Yükle", "File handling" => "Dosya taşıma", diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index d5d2b84d123fff3a66b71468f1d615689cac8b07..c883670e8485f22440438ae3580e36512d4b231c 100644 --- a/apps/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} 个文件夹", "1 file" => "1 个文件", "{count} files" => "{count} 个文件", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹", "Unable to rename file" => "无法重命名文件", "Upload" => "上传", "File handling" => "文件处理", diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php index 600048a321c41172531177aa52360b9e1d11957e..0bd207888dc9420479098f7e982e407ef7c96543 100644 --- a/apps/files/l10n/zh_TW.php +++ b/apps/files/l10n/zh_TW.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} 個資料夾", "1 file" => "1 個檔案", "{count} files" => "{count} 個檔案", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無效的資料夾名稱,'Shared' 的使用被 ownCloud 保留", "Unable to rename file" => "無法重新命名檔案", "Upload" => "上傳", "File handling" => "檔案處理", diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php index 7ea1755d1d7459c8ac8ce2d01c8013328e876671..9886b42e42463f5b34057ebb9677831bbdcceb50 100644 --- a/apps/files/templates/part.breadcrumb.php +++ b/apps/files/templates/part.breadcrumb.php @@ -1,5 +1,5 @@ -