mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into fix-5388-master

This commit is contained in:
tomneedham 2013-12-11 09:12:47 +00:00
parent 37b07fe6a9 28180485d9
commit 7afe6b3493
900 changed files with 33358 additions and 19910 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/css/files.css
View File

@ -14,7 +14,7 @@
padding: 0 !important; /* override default control bar button padding */
}
#trash {
margin-right: 12px;
margin-right: 8px;
float: right;
z-index: 1010;
padding: 10px;

1
apps/files/index.php
View File

@ -108,7 +108,6 @@ if ($needUpgrade) {
// if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
$encryptionInitStatus = 2;
if (OC_App::isEnabled('files_encryption')) {
$publicUploadEnabled = 'no';
$session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
$encryptionInitStatus = $session->getInitialized();
}

16
apps/files/js/file-upload.js
View File

@ -508,11 +508,15 @@ $(document).ready(function() {
$(this).children('p').remove();
// add input field
var form=$('<form></form>');
var input=$('<input type="text">');
var form = $('<form></form>');
var input = $('<input type="text">');
var newName = $(this).attr('data-newname') || '';
if (newName) {
input.val(newName);
}
form.append(input);
$(this).append(form);
var lastPos;
var checkInput = function () {
var filename = input.val();
if (type === 'web' && filename.length === 0) {
@ -543,6 +547,12 @@ $(document).ready(function() {
});
input.focus();
// pre select name up to the extension
lastPos = newName.lastIndexOf('.');
if (lastPos === -1) {
lastPos = newName.length;
}
input.selectRange(0, lastPos);
form.submit(function(event) {
event.stopPropagation();
event.preventDefault();

26
apps/files/js/filelist.js
View File

@ -422,12 +422,27 @@ var FileList={
}
tr.find('.fileactions').effect('highlight', {}, 5000);
tr.effect('highlight', {}, 5000);
// remove loading mark and recover old image
td.css('background-image', oldBackgroundImage);
}
else {
var fileInfo = result.data;
tr.attr('data-mime', fileInfo.mime);
tr.attr('data-etag', fileInfo.etag);
if (fileInfo.isPreviewAvailable) {
Files.lazyLoadPreview(fileInfo.directory + '/' + fileInfo.name, result.data.mime, function(previewpath) {
tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
}, null, null, result.data.etag);
}
else {
tr.find('td.filename').removeClass('preview').attr('style','background-image:url('+fileInfo.icon+')');
}
}
// reinsert row
tr.detach();
FileList.insertElement( tr.attr('data-file'), tr.attr('data-type'),tr );
// remove loading mark and recover old image
td.css('background-image', oldBackgroundImage);
// update file actions in case the extension changed
FileActions.display( tr.find('td.filename'), true);
}
});
}
@ -608,7 +623,7 @@ var FileList={
var fileSize = '<td class="filesize">'+humanFileSize(summary.totalSize)+'</td>';
}
var $summary = $('<tr class="summary"><td><span class="info">'+info+'</span></td>'+fileSize+'<td></td></tr>');
var $summary = $('<tr class="summary" data-file="undefined"><td><span class="info">'+info+'</span></td>'+fileSize+'<td></td></tr>');
$('#fileList').append($summary);
var $dirInfo = $summary.find('.dirinfo');
@ -691,8 +706,9 @@ var FileList={
var $fileList = $('#fileList');
var permissions = $('#permissions').val();
var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
$('#emptycontent').toggleClass('hidden', !isCreatable || $fileList.find('tr').exists());
$('#filestable th').toggleClass('hidden', $fileList.find('tr').exists() === false);
var exists = $fileList.find('tr:first').exists();
$('#emptycontent').toggleClass('hidden', !isCreatable || exists);
$('#filestable th').toggleClass('hidden', !exists);
},
showMask: function() {
// in case one was shown before

1
apps/files/l10n/ar.php
View File

@ -65,7 +65,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "إلغاء رفع الملفات",
"Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!",
"Download" => "تحميل",
"Unshare" => "إلغاء مشاركة",
"Delete" => "إلغاء",
"Upload too large" => "حجم الترفيع أعلى من المسموح",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.",

7
apps/files/l10n/az.php Normal file
View File

@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array("")
);
$PLURAL_FORMS = "nplurals=1; plural=0;";

1
apps/files/l10n/bg_BG.php
View File

@ -27,6 +27,7 @@ $TRANSLATIONS = array(
"Save" => "Запис",
"New" => "Ново",
"Text file" => "Текстов файл",
"New folder" => "Нова папка",
"Folder" => "Папка",
"Cancel upload" => "Спри качването",
"Nothing in here. Upload something!" => "Няма нищо тук. Качете нещо.",

1
apps/files/l10n/bn_BD.php
View File

@ -47,7 +47,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "আপলোড বাতিল কর",
"Nothing in here. Upload something!" => "এখানে কিছুই নেই। কিছু আপলোড করুন !",
"Download" => "ডাউনলোড",
"Unshare" => "ভাগাভাগি বাতিল ",
"Delete" => "মুছে",
"Upload too large" => "আপলোডের আকারটি অনেক বড়",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ",

1
apps/files/l10n/bs.php
View File

@ -7,6 +7,7 @@ $TRANSLATIONS = array(
"Name" => "Ime",
"Size" => "Veličina",
"Save" => "Spasi",
"New folder" => "Nova fascikla",
"Folder" => "Fasikla"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";

4
apps/files/l10n/ca.php
View File

@ -43,6 +43,7 @@ $TRANSLATIONS = array(
"Could not rename file" => "No es pot canviar el nom de fitxer",
"replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}",
"undo" => "desfés",
"Error deleting file." => "Error en esborrar el fitxer.",
"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
"{dirs} and {files}" => "{dirs} i {files}",
@ -72,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Mida màxima d'entrada per fitxers ZIP",
"Save" => "Desa",
"New" => "Nou",
"New text file" => "Nou fitxer de text",
"Text file" => "Fitxer de text",
"New folder" => "Carpeta nova",
"Folder" => "Carpeta",
"From link" => "Des d'enllaç",
"Deleted files" => "Fitxers esborrats",
@ -80,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "No teniu permisos per a pujar o crear els fitxers aquí",
"Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
"Download" => "Baixa",
"Unshare" => "Deixa de compartir",
"Delete" => "Esborra",
"Upload too large" => "La pujada és massa gran",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",

6
apps/files/l10n/cs_CZ.php
View File

@ -43,6 +43,7 @@ $TRANSLATIONS = array(
"Could not rename file" => "Nepodařilo se přejmenovat soubor",
"replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
"undo" => "vrátit zpět",
"Error deleting file." => "Chyba při mazání souboru.",
"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
"{dirs} and {files}" => "{dirs} a {files}",
@ -72,15 +73,16 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Maximální velikost vstupu pro ZIP soubory",
"Save" => "Uložit",
"New" => "Nový",
"New text file" => "Nový textový soubor",
"Text file" => "Textový soubor",
"New folder" => "Nová složka",
"Folder" => "Složka",
"From link" => "Z odkazu",
"Deleted files" => "Odstraněné soubory",
"Cancel upload" => "Zrušit odesílání",
"You don’t have permission to upload or create files here" => "Nemáte oprávnění zde nahrávat a vytvářet soubory.",
"You don’t have permission to upload or create files here" => "Nemáte oprávnění zde nahrávat či vytvářet soubory",
"Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
"Download" => "Stáhnout",
"Unshare" => "Zrušit sdílení",
"Delete" => "Smazat",
"Upload too large" => "Odesílaný soubor je příliš velký",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",

1
apps/files/l10n/cy_GB.php
View File

@ -53,7 +53,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "Diddymu llwytho i fyny",
"Nothing in here. Upload something!" => "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!",
"Download" => "Llwytho i lawr",
"Unshare" => "Dad-rannu",
"Delete" => "Dileu",
"Upload too large" => "Maint llwytho i fyny'n rhy fawr",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.",

2
apps/files/l10n/da.php
View File

@ -57,13 +57,13 @@ $TRANSLATIONS = array(
"Save" => "Gem",
"New" => "Ny",
"Text file" => "Tekstfil",
"New folder" => "Ny Mappe",
"Folder" => "Mappe",
"From link" => "Fra link",
"Deleted files" => "Slettede filer",
"Cancel upload" => "Fortryd upload",
"Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
"Download" => "Download",
"Unshare" => "Fjern deling",
"Delete" => "Slet",
"Upload too large" => "Upload er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",

3
apps/files/l10n/de.php
View File

@ -73,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Maximale Größe für ZIP-Dateien",
"Save" => "Speichern",
"New" => "Neu",
"New text file" => "Neue Textdatei",
"Text file" => "Textdatei",
"New folder" => "Neuer Ordner",
"Folder" => "Ordner",
"From link" => "Von einem Link",
"Deleted files" => "Gelöschte Dateien",
@ -81,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen",
"Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
"Download" => "Herunterladen",
"Unshare" => "Freigabe aufheben",
"Delete" => "Löschen",
"Upload too large" => "Der Upload ist zu groß",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",

2
apps/files/l10n/de_CH.php
View File

@ -51,13 +51,13 @@ $TRANSLATIONS = array(
"Save" => "Speichern",
"New" => "Neu",
"Text file" => "Textdatei",
"New folder" => "Neues Verzeichnis",
"Folder" => "Ordner",
"From link" => "Von einem Link",
"Deleted files" => "Gelöschte Dateien",
"Cancel upload" => "Upload abbrechen",
"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
"Download" => "Herunterladen",
"Unshare" => "Freigabe aufheben",
"Delete" => "Löschen",
"Upload too large" => "Der Upload ist zu gross",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.",

3
apps/files/l10n/de_DE.php
View File

@ -73,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Maximale Größe für ZIP-Dateien",
"Save" => "Speichern",
"New" => "Neu",
"New text file" => "Neue Textdatei",
"Text file" => "Textdatei",
"New folder" => "Neues Verzeichnis",
"Folder" => "Ordner",
"From link" => "Von einem Link",
"Deleted files" => "Gelöschte Dateien",
@ -81,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen",
"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
"Download" => "Herunterladen",
"Unshare" => "Freigabe aufheben",
"Delete" => "Löschen",
"Upload too large" => "Der Upload ist zu groß",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",

2
apps/files/l10n/el.php
View File

@ -52,13 +52,13 @@ $TRANSLATIONS = array(
"Save" => "Αποθήκευση",
"New" => "Νέο",
"Text file" => "Αρχείο κειμένου",
"New folder" => "Νέος κατάλογος",
"Folder" => "Φάκελος",
"From link" => "Από σύνδεσμο",
"Deleted files" => "Διαγραμμένα αρχεία",
"Cancel upload" => "Ακύρωση αποστολής",
"Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!",
"Download" => "Λήψη",
"Unshare" => "Σταμάτημα διαμοιρασμού",
"Delete" => "Διαγραφή",
"Upload too large" => "Πολύ μεγάλο αρχείο προς αποστολή",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",

3
apps/files/l10n/en_GB.php
View File

@ -73,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Maximum input size for ZIP files",
"Save" => "Save",
"New" => "New",
"New text file" => "New text file",
"Text file" => "Text file",
"New folder" => "New folder",
"Folder" => "Folder",
"From link" => "From link",
"Deleted files" => "Deleted files",
@ -81,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "You don’t have permission to upload or create files here",
"Nothing in here. Upload something!" => "Nothing in here. Upload something!",
"Download" => "Download",
"Unshare" => "Unshare",
"Delete" => "Delete",
"Upload too large" => "Upload too large",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "The files you are trying to upload exceed the maximum size for file uploads on this server.",

2
apps/files/l10n/eo.php
View File

@ -67,6 +67,7 @@ $TRANSLATIONS = array(
"Save" => "Konservi",
"New" => "Nova",
"Text file" => "Tekstodosiero",
"New folder" => "Nova dosierujo",
"Folder" => "Dosierujo",
"From link" => "El ligilo",
"Deleted files" => "Forigitaj dosieroj",
@ -74,7 +75,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Vi ne havas permeson alŝuti aŭ krei dosierojn ĉi tie",
"Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
"Download" => "Elŝuti",
"Unshare" => "Malkunhavigi",
"Delete" => "Forigi",
"Upload too large" => "Alŝuto tro larĝa",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",

4
apps/files/l10n/es.php
View File

@ -43,6 +43,7 @@ $TRANSLATIONS = array(
"Could not rename file" => "No se pudo renombrar el archivo",
"replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
"undo" => "deshacer",
"Error deleting file." => "Error borrando el archivo.",
"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
"{dirs} and {files}" => "{dirs} y {files}",
@ -72,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
"Save" => "Guardar",
"New" => "Nuevo",
"New text file" => "Nuevo archivo de texto",
"Text file" => "Archivo de texto",
"New folder" => "Nueva carpeta",
"Folder" => "Carpeta",
"From link" => "Desde enlace",
"Deleted files" => "Archivos eliminados",
@ -80,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "No tienes permisos para subir o crear archivos aquí.",
"Nothing in here. Upload something!" => "No hay nada aquí. ¡Suba algo!",
"Download" => "Descargar",
"Unshare" => "Dejar de compartir",
"Delete" => "Eliminar",
"Upload too large" => "Subida demasido grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",

2
apps/files/l10n/es_AR.php
View File

@ -52,13 +52,13 @@ $TRANSLATIONS = array(
"Save" => "Guardar",
"New" => "Nuevo",
"Text file" => "Archivo de texto",
"New folder" => "Nueva Carpeta",
"Folder" => "Carpeta",
"From link" => "Desde enlace",
"Deleted files" => "Archivos borrados",
"Cancel upload" => "Cancelar subida",
"Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
"Download" => "Descargar",
"Unshare" => "Dejar de compartir",
"Delete" => "Borrar",
"Upload too large" => "El tamaño del archivo que querés subir es demasiado grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",

3
apps/files/l10n/et_EE.php
View File

@ -73,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Maksimaalne ZIP-faili sisestatava faili suurus",
"Save" => "Salvesta",
"New" => "Uus",
"New text file" => "Uus tekstifail",
"Text file" => "Tekstifail",
"New folder" => "Uus kaust",
"Folder" => "Kaust",
"From link" => "Allikast",
"Deleted files" => "Kustutatud failid",
@ -81,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Sul puuduvad õigused siia failide üleslaadimiseks või tekitamiseks",
"Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
"Download" => "Lae alla",
"Unshare" => "Lõpeta jagamine",
"Delete" => "Kustuta",
"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.",

2
apps/files/l10n/eu.php
View File

@ -59,13 +59,13 @@ $TRANSLATIONS = array(
"Save" => "Gorde",
"New" => "Berria",
"Text file" => "Testu fitxategia",
"New folder" => "Karpeta berria",
"Folder" => "Karpeta",
"From link" => "Estekatik",
"Deleted files" => "Ezabatutako fitxategiak",
"Cancel upload" => "Ezeztatu igoera",
"Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
"Download" => "Deskargatu",
"Unshare" => "Ez elkarbanatu",
"Delete" => "Ezabatu",
"Upload too large" => "Igoera handiegia da",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",

2
apps/files/l10n/fa.php
View File

@ -50,13 +50,13 @@ $TRANSLATIONS = array(
"Save" => "ذخیره",
"New" => "جدید",
"Text file" => "فایل متنی",
"New folder" => "پوشه جدید",
"Folder" => "پوشه",
"From link" => "از پیوند",
"Deleted files" => "فایل های حذف شده",
"Cancel upload" => "متوقف کردن بار گذاری",
"Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
"Download" => "دانلود",
"Unshare" => "لغو اشتراک",
"Delete" => "حذف",
"Upload too large" => "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",

10
apps/files/l10n/fi_FI.php
View File

@ -14,12 +14,13 @@ $TRANSLATIONS = array(
"No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
"There is no error, the file uploaded with success" => "Ei virheitä, tiedosto lähetettiin onnistuneesti",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ladattavan tiedoston maksimikoko ylittää MAX_FILE_SIZE dirketiivin, joka on määritelty HTML-lomakkeessa",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lähetettävän tiedoston enimmäiskoko ylittää HTML-lomakkeessa määritellyn MAX_FILE_SIZE-säännön",
"The uploaded file was only partially uploaded" => "Tiedoston lähetys onnistui vain osittain",
"No file was uploaded" => "Yhtäkään tiedostoa ei lähetetty",
"Missing a temporary folder" => "Tilapäiskansio puuttuu",
"Failed to write to disk" => "Levylle kirjoitus epäonnistui",
"Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä",
"Upload failed. Could not find uploaded file" => "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
"Invalid directory." => "Virheellinen kansio.",
"Files" => "Tiedostot",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua",
@ -46,13 +47,15 @@ $TRANSLATIONS = array(
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.",
"Your storage is full, files can not be updated or synced anymore!" => "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
"Your storage is almost full ({usedSpacePercent}%)" => "Tallennustila on melkein loppu ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattu. Siirry henkilökohtaisiin asetuksiisi avataksesi tiedostojesi salauksen.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattuina. Siirry henkilökohtaisiin asetuksiin avataksesi tiedostojesi salauksen.",
"Your download is being prepared. This might take some time if the files are big." => "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan.",
"Error moving file" => "Virhe tiedostoa siirrettäessä",
"Error" => "Virhe",
"Name" => "Nimi",
"Size" => "Koko",
"Modified" => "Muokattu",
"Invalid folder name. Usage of 'Shared' is reserved." => "Virheellinen kansion nimi. 'Shared':n käyttö on varattu.",
"%s could not be renamed" => "kohteen %s nimeäminen uudelleen epäonnistui",
"Upload" => "Lähetä",
"File handling" => "Tiedostonhallinta",
"Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
@ -63,7 +66,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "ZIP-tiedostojen enimmäiskoko",
"Save" => "Tallenna",
"New" => "Uusi",
"New text file" => "Uusi tekstitiedosto",
"Text file" => "Tekstitiedosto",
"New folder" => "Uusi kansio",
"Folder" => "Kansio",
"From link" => "Linkistä",
"Deleted files" => "Poistetut tiedostot",
@ -71,7 +76,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai kansioiden luomiseen tähän sijaintiin",
"Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
"Download" => "Lataa",
"Unshare" => "Peru jakaminen",
"Delete" => "Poista",
"Upload too large" => "Lähetettävä tiedosto on liian suuri",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",

4
apps/files/l10n/fr.php
View File

@ -43,6 +43,7 @@ $TRANSLATIONS = array(
"Could not rename file" => "Impossible de renommer le fichier",
"replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
"undo" => "annuler",
"Error deleting file." => "Erreur pendant la suppression du fichier.",
"_%n folder_::_%n folders_" => array("%n dossier","%n dossiers"),
"_%n file_::_%n files_" => array("%n fichier","%n fichiers"),
"{dirs} and {files}" => "{dirs} et {files}",
@ -72,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Taille maximale pour les fichiers ZIP",
"Save" => "Sauvegarder",
"New" => "Nouveau",
"New text file" => "Nouveau fichier texte",
"Text file" => "Fichier texte",
"New folder" => "Nouveau dossier",
"Folder" => "Dossier",
"From link" => "Depuis le lien",
"Deleted files" => "Fichiers supprimés",
@ -80,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici",
"Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
"Download" => "Télécharger",
"Unshare" => "Ne plus partager",
"Delete" => "Supprimer",
"Upload too large" => "Téléversement trop volumineux",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",

7
apps/files/l10n/fr_CA.php Normal file
View File

@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";

3
apps/files/l10n/gl.php
View File

@ -73,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Tamaño máximo de descarga para os ficheiros ZIP",
"Save" => "Gardar",
"New" => "Novo",
"New text file" => "Ficheiro novo de texto",
"Text file" => "Ficheiro de texto",
"New folder" => "Novo cartafol",
"Folder" => "Cartafol",
"From link" => "Desde a ligazón",
"Deleted files" => "Ficheiros eliminados",
@ -81,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Non ten permisos para enviar ou crear ficheiros aquí.",
"Nothing in here. Upload something!" => "Aquí non hai nada. Envíe algo.",
"Download" => "Descargar",
"Unshare" => "Deixar de compartir",
"Delete" => "Eliminar",
"Upload too large" => "Envío demasiado grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",

1
apps/files/l10n/he.php
View File

@ -51,7 +51,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "ביטול ההעלאה",
"Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
"Download" => "הורדה",
"Unshare" => "הסר שיתוף",
"Delete" => "מחיקה",
"Upload too large" => "העלאה גדולה מידי",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",

1
apps/files/l10n/hr.php
View File

@ -35,7 +35,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "Prekini upload",
"Nothing in here. Upload something!" => "Nema ničega u ovoj mapi. Pošalji nešto!",
"Download" => "Preuzimanje",
"Unshare" => "Makni djeljenje",
"Delete" => "Obriši",
"Upload too large" => "Prijenos je preobiman",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",

2
apps/files/l10n/hu_HU.php
View File

@ -73,6 +73,7 @@ $TRANSLATIONS = array(
"Save" => "Mentés",
"New" => "Új",
"Text file" => "Szövegfájl",
"New folder" => "Új mappa",
"Folder" => "Mappa",
"From link" => "Feltöltés linkről",
"Deleted files" => "Törölt fájlok",
@ -80,7 +81,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Önnek nincs jogosultsága ahhoz, hogy ide állományokat töltsön föl, vagy itt újakat hozzon létre",
"Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!",
"Download" => "Letöltés",
"Unshare" => "A megosztás visszavonása",
"Delete" => "Törlés",
"Upload too large" => "A feltöltés túl nagy",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",

2
apps/files/l10n/id.php
View File

@ -47,13 +47,13 @@ $TRANSLATIONS = array(
"Save" => "Simpan",
"New" => "Baru",
"Text file" => "Berkas teks",
"New folder" => "Map baru",
"Folder" => "Folder",
"From link" => "Dari tautan",
"Deleted files" => "Berkas yang dihapus",
"Cancel upload" => "Batal pengunggahan",
"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
"Download" => "Unduh",
"Unshare" => "Batalkan berbagi",
"Delete" => "Hapus",
"Upload too large" => "Yang diunggah terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",

1
apps/files/l10n/is.php
View File

@ -47,7 +47,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "Hætta við innsendingu",
"Nothing in here. Upload something!" => "Ekkert hér. Settu eitthvað inn!",
"Download" => "Niðurhal",
"Unshare" => "Hætta deilingu",
"Delete" => "Eyða",
"Upload too large" => "Innsend skrá er of stór",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",

3
apps/files/l10n/it.php
View File

@ -73,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Dimensione massima per i file ZIP",
"Save" => "Salva",
"New" => "Nuovo",
"New text file" => "Nuovo file di testo",
"Text file" => "File di testo",
"New folder" => "Nuova cartella",
"Folder" => "Cartella",
"From link" => "Da collegamento",
"Deleted files" => "File eliminati",
@ -81,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Qui non hai i permessi di caricare o creare file",
"Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
"Download" => "Scarica",
"Unshare" => "Rimuovi condivisione",
"Delete" => "Elimina",
"Upload too large" => "Caricamento troppo grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",

3
apps/files/l10n/ja_JP.php
View File

@ -43,6 +43,7 @@ $TRANSLATIONS = array(
"Could not rename file" => "ファイルの名前変更ができませんでした",
"replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
"undo" => "元に戻す",
"Error deleting file." => "ファイルの削除エラー。",
"_%n folder_::_%n folders_" => array("%n 個のフォルダ"),
"_%n file_::_%n files_" => array("%n 個のファイル"),
"{dirs} and {files}" => "{dirs} と {files}",
@ -73,6 +74,7 @@ $TRANSLATIONS = array(
"Save" => "保存",
"New" => "新規作成",
"Text file" => "テキストファイル",
"New folder" => "新しいフォルダ",
"Folder" => "フォルダ",
"From link" => "リンク",
"Deleted files" => "ゴミ箱",
@ -80,7 +82,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "ここにファイルをアップロードもしくは作成する権限がありません",
"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
"Download" => "ダウンロード",
"Unshare" => "共有解除",
"Delete" => "削除",
"Upload too large" => "アップロードには大きすぎます。",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",

2
apps/files/l10n/ka_GE.php
View File

@ -47,13 +47,13 @@ $TRANSLATIONS = array(
"Save" => "შენახვა",
"New" => "ახალი",
"Text file" => "ტექსტური ფაილი",
"New folder" => "ახალი ფოლდერი",
"Folder" => "საქაღალდე",
"From link" => "მისამართიდან",
"Deleted files" => "წაშლილი ფაილები",
"Cancel upload" => "ატვირთვის გაუქმება",
"Nothing in here. Upload something!" => "აქ არაფერი არ არის. ატვირთე რამე!",
"Download" => "ჩამოტვირთვა",
"Unshare" => "გაუზიარებადი",
"Delete" => "წაშლა",
"Upload too large" => "ასატვირთი ფაილი ძალიან დიდია",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.",

2
apps/files/l10n/ko.php
View File

@ -57,13 +57,13 @@ $TRANSLATIONS = array(
"Save" => "저장",
"New" => "새로 만들기",
"Text file" => "텍스트 파일",
"New folder" => "새 폴더",
"Folder" => "폴더",
"From link" => "링크에서",
"Deleted files" => "파일 삭제됨",
"Cancel upload" => "업로드 취소",
"Nothing in here. Upload something!" => "내용이 없습니다. 업로드할 수 있습니다!",
"Download" => "다운로드",
"Unshare" => "공유 해제",
"Delete" => "삭제",
"Upload too large" => "업로드한 파일이 너무 큼",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",

1
apps/files/l10n/lb.php
View File

@ -34,7 +34,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "Upload ofbriechen",
"Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
"Download" => "Download",
"Unshare" => "Net méi deelen",
"Delete" => "Läschen",
"Upload too large" => "Upload ze grouss",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",

5
apps/files/l10n/lt_LT.php
View File

@ -4,6 +4,8 @@ $TRANSLATIONS = array(
"Could not move %s" => "Nepavyko perkelti %s",
"File name cannot be empty." => "Failo pavadinimas negali būti tuščias.",
"File name must not contain \"/\". Please choose a different name." => "Failo pavadinime negali būti simbolio \"/\". Prašome pasirinkti kitokį pavadinimą.",
"The name %s is already used in the folder %s. Please choose a different name." => "Pavadinimas %s jau naudojamas aplanke %s. Prašome pasirinkti kitokį pavadinimą.",
"Not a valid source" => "Netinkamas šaltinis",
"Error while downloading %s to %s" => "Klaida siunčiant %s į %s",
"Error when creating the file" => "Klaida kuriant failą",
"Folder name cannot be empty." => "Aplanko pavadinimas negali būti tuščias.",
@ -40,6 +42,7 @@ $TRANSLATIONS = array(
"Could not rename file" => "Neįmanoma pervadinti failo",
"replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}",
"undo" => "anuliuoti",
"Error deleting file." => "Klaida trinant failą.",
"_%n folder_::_%n folders_" => array("%n aplankas","%n aplankai","%n aplankų"),
"_%n file_::_%n files_" => array("%n failas","%n failai","%n failų"),
"{dirs} and {files}" => "{dirs} ir {files}",
@ -69,6 +72,7 @@ $TRANSLATIONS = array(
"Save" => "Išsaugoti",
"New" => "Naujas",
"Text file" => "Teksto failas",
"New folder" => "Naujas aplankas",
"Folder" => "Katalogas",
"From link" => "Iš nuorodos",
"Deleted files" => "Ištrinti failai",
@ -76,7 +80,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Jūs neturite leidimo čia įkelti arba kurti failus",
"Nothing in here. Upload something!" => "Čia tuščia. Įkelkite ką nors!",
"Download" => "Atsisiųsti",
"Unshare" => "Nebesidalinti",
"Delete" => "Ištrinti",
"Upload too large" => "Įkėlimui failas per didelis",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",

2
apps/files/l10n/lv.php
View File

@ -51,13 +51,13 @@ $TRANSLATIONS = array(
"Save" => "Saglabāt",
"New" => "Jauna",
"Text file" => "Teksta datne",
"New folder" => "Jauna mape",
"Folder" => "Mape",
"From link" => "No saites",
"Deleted files" => "Dzēstās datnes",
"Cancel upload" => "Atcelt augšupielādi",
"Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!",
"Download" => "Lejupielādēt",
"Unshare" => "Pārtraukt dalīšanos",
"Delete" => "Dzēst",
"Upload too large" => "Datne ir par lielu, lai to augšupielādētu",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",

1
apps/files/l10n/mk.php
View File

@ -71,7 +71,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "Откажи прикачување",
"Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
"Download" => "Преземи",
"Unshare" => "Не споделувај",
"Delete" => "Избриши",
"Upload too large" => "Фајлот кој се вчитува е преголем",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",

2
apps/files/l10n/nb_NO.php
View File

@ -50,13 +50,13 @@ $TRANSLATIONS = array(
"Save" => "Lagre",
"New" => "Ny",
"Text file" => "Tekstfil",
"New folder" => "Ny mappe",
"Folder" => "Mappe",
"From link" => "Fra link",
"Deleted files" => "Slettet filer",
"Cancel upload" => "Avbryt opplasting",
"Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
"Download" => "Last ned",
"Unshare" => "Avslutt deling",
"Delete" => "Slett",
"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.",

4
apps/files/l10n/nl.php
View File

@ -43,6 +43,7 @@ $TRANSLATIONS = array(
"Could not rename file" => "Kon niet hernoemen bestand",
"replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
"undo" => "ongedaan maken",
"Error deleting file." => "Fout bij verwijderen bestand.",
"_%n folder_::_%n folders_" => array("","%n mappen"),
"_%n file_::_%n files_" => array("","%n bestanden"),
"{dirs} and {files}" => "{dirs} en {files}",
@ -72,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Maximale grootte voor ZIP bestanden",
"Save" => "Bewaren",
"New" => "Nieuw",
"New text file" => "Nieuw tekstbestand",
"Text file" => "Tekstbestand",
"New folder" => "Nieuwe map",
"Folder" => "Map",
"From link" => "Vanaf link",
"Deleted files" => "Verwijderde bestanden",
@ -80,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "U hebt geen toestemming om hier te uploaden of bestanden te maken",
"Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
"Download" => "Downloaden",
"Unshare" => "Stop met delen",
"Delete" => "Verwijder",
"Upload too large" => "Upload is te groot",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server.",

1
apps/files/l10n/nn_NO.php
View File

@ -63,7 +63,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "Avbryt opplasting",
"Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
"Download" => "Last ned",
"Unshare" => "Udel",
"Delete" => "Slett",
"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 å lasta opp er større enn maksgrensa til denne tenaren.",

1
apps/files/l10n/oc.php
View File

@ -35,7 +35,6 @@ $TRANSLATIONS = array(
"Cancel upload" => " Anulla l'amontcargar",
"Nothing in here. Upload something!" => "Pas res dedins. Amontcarga qualquaren",
"Download" => "Avalcarga",
"Unshare" => "Pas partejador",
"Delete" => "Escafa",
"Upload too large" => "Amontcargament tròp gròs",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",

2
apps/files/l10n/pl.php
View File

@ -73,6 +73,7 @@ $TRANSLATIONS = array(
"Save" => "Zapisz",
"New" => "Nowy",
"Text file" => "Plik tekstowy",
"New folder" => "Nowy folder",
"Folder" => "Folder",
"From link" => "Z odnośnika",
"Deleted files" => "Pliki usunięte",
@ -80,7 +81,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Nie masz uprawnień do wczytywania lub tworzenia plików w tym miejscu",
"Nothing in here. Upload something!" => "Pusto. Wyślij coś!",
"Download" => "Pobierz",
"Unshare" => "Zatrzymaj współdzielenie",
"Delete" => "Usuń",
"Upload too large" => "Ładowany plik jest za duży",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",

3
apps/files/l10n/pt_BR.php
View File

@ -73,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Tamanho máximo para arquivo ZIP",
"Save" => "Guardar",
"New" => "Novo",
"New text file" => "Novo arquivo texto",
"Text file" => "Arquivo texto",
"New folder" => "Nova pasta",
"Folder" => "Pasta",
"From link" => "Do link",
"Deleted files" => "Arquivos apagados",
@ -81,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Você não tem permissão para carregar ou criar arquivos aqui",
"Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
"Download" => "Baixar",
"Unshare" => "Descompartilhar",
"Delete" => "Excluir",
"Upload too large" => "Upload muito grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",

2
apps/files/l10n/pt_PT.php
View File

@ -55,13 +55,13 @@ $TRANSLATIONS = array(
"Save" => "Guardar",
"New" => "Novo",
"Text file" => "Ficheiro de texto",
"New folder" => "Nova Pasta",
"Folder" => "Pasta",
"From link" => "Da ligação",
"Deleted files" => "Ficheiros eliminados",
"Cancel upload" => "Cancelar envio",
"Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
"Download" => "Transferir",
"Unshare" => "Deixar de partilhar",
"Delete" => "Eliminar",
"Upload too large" => "Upload muito grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",

1
apps/files/l10n/ro.php
View File

@ -63,7 +63,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "Anulează încărcarea",
"Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
"Download" => "Descarcă",
"Unshare" => "Anulare",
"Delete" => "Șterge",
"Upload too large" => "Fișierul încărcat este prea mare",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",

4
apps/files/l10n/ru.php
View File

@ -43,6 +43,7 @@ $TRANSLATIONS = array(
"Could not rename file" => "Не удалось переименовать файл",
"replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
"undo" => "отмена",
"Error deleting file." => "Ошибка при удалении файла.",
"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"),
"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
"{dirs} and {files}" => "{dirs} и {files}",
@ -72,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Максимальный исходный размер для ZIP файлов",
"Save" => "Сохранить",
"New" => "Новый",
"New text file" => "Новый текстовый файл",
"Text file" => "Текстовый файл",
"New folder" => "Новая папка",
"Folder" => "Папка",
"From link" => "Из ссылки",
"Deleted files" => "Удалённые файлы",
@ -80,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "У вас недостаточно прав для загрузки или создания файлов отсюда.",
"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
"Download" => "Скачать",
"Unshare" => "Закрыть общий доступ",
"Delete" => "Удалить",
"Upload too large" => "Файл слишком велик",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",

3
apps/files/l10n/ru_RU.php
View File

@ -1,11 +1,14 @@
<?php
$TRANSLATIONS = array(
"File name cannot be empty." => "Имя файла не может быть пустым.",
"Files" => "Файлы",
"Share" => "Сделать общим",
"Rename" => "Переименовать",
"_%n folder_::_%n folders_" => array("","",""),
"_%n file_::_%n files_" => array("","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","",""),
"'.' is an invalid file name." => "'.' является неверным именем файла.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы.",
"Error" => "Ошибка",
"Size" => "Размер",
"Upload" => "Загрузка",

1
apps/files/l10n/si_LK.php
View File

@ -36,7 +36,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "උඩුගත කිරීම අත් හරින්න",
"Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
"Download" => "බාන්න",
"Unshare" => "නොබෙදු",
"Delete" => "මකා දමන්න",
"Upload too large" => "උඩුගත කිරීම විශාල වැඩිය",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",

10
apps/files/l10n/sk_SK.php
View File

@ -8,7 +8,7 @@ $TRANSLATIONS = array(
"Not a valid source" => "Neplatný zdroj",
"Error while downloading %s to %s" => "Chyba pri sťahovaní súboru %s do %s",
"Error when creating the file" => "Chyba pri vytváraní súboru",
"Folder name cannot be empty." => "Názov súboru nemôže byť prázdny.",
"Folder name cannot be empty." => "Názov priečinka nemôže byť prázdny.",
"Folder name must not contain \"/\". Please choose a different name." => "Názov priečinka nesmie obsahovať \"/\". Prosím zvoľte iný názov.",
"Error when creating the folder" => "Chyba pri vytváraní priečinka",
"Unable to set upload directory." => "Nemožno nastaviť priečinok pre nahrané súbory.",
@ -32,7 +32,7 @@ $TRANSLATIONS = array(
"Could not get result from server." => "Nepodarilo sa dostať výsledky zo servera.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
"URL cannot be empty" => "URL nemôže byť prázdna",
"In the home folder 'Shared' is a reserved filename" => "V domovskej zložke je názov \"Shared\" vyhradený názov súboru",
"In the home folder 'Shared' is a reserved filename" => "V domovskom priečinku je názov \"Shared\" vyhradený názov súboru",
"{new_name} already exists" => "{new_name} už existuje",
"Could not create file" => "Nemožno vytvoriť súbor",
"Could not create folder" => "Nemožno vytvoriť priečinok",
@ -43,6 +43,7 @@ $TRANSLATIONS = array(
"Could not rename file" => "Nemožno premenovať súbor",
"replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}",
"undo" => "vrátiť",
"Error deleting file." => "Chyba pri mazaní súboru.",
"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"),
"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
"{dirs} and {files}" => "{dirs} a {files}",
@ -71,8 +72,10 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 znamená neobmedzené",
"Maximum input size for ZIP files" => "Najväčšia veľkosť ZIP súborov",
"Save" => "Uložiť",
"New" => "Nová",
"New" => "Nový",
"New text file" => "Nový textový súbor",
"Text file" => "Textový súbor",
"New folder" => "Nový priečinok",
"Folder" => "Priečinok",
"From link" => "Z odkazu",
"Deleted files" => "Zmazané súbory",
@ -80,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Nemáte oprávnenie sem nahrávať alebo vytvoriť súbory",
"Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
"Download" => "Sťahovanie",
"Unshare" => "Zrušiť zdieľanie",
"Delete" => "Zmazať",
"Upload too large" => "Nahrávanie je príliš veľké",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",

3
apps/files/l10n/sl.php
View File

@ -73,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "Največja vhodna velikost za datoteke ZIP",
"Save" => "Shrani",
"New" => "Novo",
"New text file" => "Nova besedilna datoteka",
"Text file" => "Besedilna datoteka",
"New folder" => "Nova mapa",
"Folder" => "Mapa",
"From link" => "Iz povezave",
"Deleted files" => "Izbrisane datoteke",
@ -81,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Ni ustreznih dovoljenj za pošiljanje ali ustvarjanje datotek na tem mestu.",
"Nothing in here. Upload something!" => "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!",
"Download" => "Prejmi",
"Unshare" => "Prekliči souporabo",
"Delete" => "Izbriši",
"Upload too large" => "Prekoračenje omejitve velikosti",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",

1
apps/files/l10n/sq.php
View File

@ -58,7 +58,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "Anullo ngarkimin",
"Nothing in here. Upload something!" => "Këtu nuk ka asgje. Ngarko dicka",
"Download" => "Shkarko",
"Unshare" => "Hiq ndarjen",
"Delete" => "Fshi",
"Upload too large" => "Ngarkimi shumë i madh",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Skedarët që po mundoheni të ngarkoni e tejkalojnë madhësinë maksimale të lejuar nga serveri.",

1
apps/files/l10n/sr.php
View File

@ -53,7 +53,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "Прекини отпремање",
"Nothing in here. Upload something!" => "Овде нема ничег. Отпремите нешто!",
"Download" => "Преузми",
"Unshare" => "Укини дељење",
"Delete" => "Обриши",
"Upload too large" => "Датотека је превелика",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеке које желите да отпремите прелазе ограничење у величини.",

1
apps/files/l10n/sr@latin.php
View File

@ -19,7 +19,6 @@ $TRANSLATIONS = array(
"Save" => "Snimi",
"Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!",
"Download" => "Preuzmi",
"Unshare" => "Ukljoni deljenje",
"Delete" => "Obriši",
"Upload too large" => "Pošiljka je prevelika",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."

4
apps/files/l10n/sv.php
View File

@ -43,6 +43,7 @@ $TRANSLATIONS = array(
"Could not rename file" => "Kan ej byta filnamn",
"replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
"undo" => "ångra",
"Error deleting file." => "Kunde inte ta bort filen.",
"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
"_%n file_::_%n files_" => array("%n fil","%n filer"),
"{dirs} and {files}" => "{dirs} och {files}",
@ -60,6 +61,7 @@ $TRANSLATIONS = array(
"Name" => "Namn",
"Size" => "Storlek",
"Modified" => "Ändrad",
"Invalid folder name. Usage of 'Shared' is reserved." => "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud",
"%s could not be renamed" => "%s kunde inte namnändras",
"Upload" => "Ladda upp",
"File handling" => "Filhantering",
@ -72,6 +74,7 @@ $TRANSLATIONS = array(
"Save" => "Spara",
"New" => "Ny",
"Text file" => "Textfil",
"New folder" => "Ny mapp",
"Folder" => "Mapp",
"From link" => "Från länk",
"Deleted files" => "Raderade filer",
@ -79,7 +82,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Du har ej tillåtelse att ladda upp eller skapa filer här",
"Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
"Download" => "Ladda ner",
"Unshare" => "Sluta dela",
"Delete" => "Radera",
"Upload too large" => "För stor uppladdning",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",

1
apps/files/l10n/ta_LK.php
View File

@ -40,7 +40,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "பதிவேற்றலை இரத்து செய்க",
"Nothing in here. Upload something!" => "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!",
"Download" => "பதிவிறக்குக",
"Unshare" => "பகிரப்படாதது",
"Delete" => "நீக்குக",
"Upload too large" => "பதிவேற்றல் மிகப்பெரியது",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.",

1
apps/files/l10n/te.php
View File

@ -8,6 +8,7 @@ $TRANSLATIONS = array(
"Name" => "పేరు",
"Size" => "పరిమాణం",
"Save" => "భద్రపరచు",
"New folder" => "కొత్త సంచయం",
"Folder" => "సంచయం",
"Delete" => "తొలగించు"
);

1
apps/files/l10n/th_TH.php
View File

@ -51,7 +51,6 @@ $TRANSLATIONS = array(
"Cancel upload" => "ยกเลิกการอัพโหลด",
"Nothing in here. Upload something!" => "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!",
"Download" => "ดาวน์โหลด",
"Unshare" => "ยกเลิกการแชร์",
"Delete" => "ลบ",
"Upload too large" => "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",

9
apps/files/l10n/tr.php
View File

@ -12,7 +12,7 @@ $TRANSLATIONS = array(
"Folder name must not contain \"/\". Please choose a different name." => "Klasör adı \"/\" içermemelidir. Lütfen farklı bir isim seçin.",
"Error when creating the folder" => "Klasör oluşturulurken hata",
"Unable to set upload directory." => "Yükleme dizini tanımlanamadı.",
"Invalid Token" => "Geçeriz simge",
"Invalid Token" => "Geçersiz Simge",
"No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
"There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.",
@ -48,7 +48,7 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n dosya","%n dosya"),
"{dirs} and {files}" => "{dirs} ve {files}",
"_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"),
"'.' is an invalid file name." => "'.' geçersiz dosya adı.",
"'.' is an invalid file name." => "'.' geçersiz bir dosya adı.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
"Your storage is full, files can not be updated or synced anymore!" => "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkronizasyon edilmeyecek.",
"Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)",
@ -61,7 +61,7 @@ $TRANSLATIONS = array(
"Name" => "İsim",
"Size" => "Boyut",
"Modified" => "Değiştirilme",
"Invalid folder name. Usage of 'Shared' is reserved." => "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerve edilmiştir.",
"Invalid folder name. Usage of 'Shared' is reserved." => "Geçersiz dizin adı. 'Shared' ismi ayrılmıştır.",
"%s could not be renamed" => "%s yeniden adlandırılamadı",
"Upload" => "Yükle",
"File handling" => "Dosya taşıma",
@ -73,7 +73,9 @@ $TRANSLATIONS = array(
"Maximum input size for ZIP files" => "ZIP dosyaları için en fazla girdi sayısı",
"Save" => "Kaydet",
"New" => "Yeni",
"New text file" => "Yeni metin dosyası",
"Text file" => "Metin dosyası",
"New folder" => "Yeni klasör",
"Folder" => "Klasör",
"From link" => "Bağlantıdan",
"Deleted files" => "Silinmiş dosyalar",
@ -81,7 +83,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "Buraya dosya yükleme veya oluşturma izniniz yok",
"Nothing in here. Upload something!" => "Burada hiçbir şey yok. Bir şeyler yükleyin!",
"Download" => "İndir",
"Unshare" => "Paylaşılmayan",
"Delete" => "Sil",
"Upload too large" => "Yükleme çok büyük",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",

2
apps/files/l10n/ug.php
View File

@ -27,12 +27,12 @@ $TRANSLATIONS = array(
"Save" => "ساقلا",
"New" => "يېڭى",
"Text file" => "تېكىست ھۆججەت",
"New folder" => "يېڭى قىسقۇچ",
"Folder" => "قىسقۇچ",
"Deleted files" => "ئۆچۈرۈلگەن ھۆججەتلەر",
"Cancel upload" => "يۈكلەشتىن ۋاز كەچ",
"Nothing in here. Upload something!" => "بۇ جايدا ھېچنېمە يوق. Upload something!",
"Download" => "چۈشۈر",
"Unshare" => "ھەمبەھىرلىمە",
"Delete" => "ئۆچۈر",
"Upload too large" => "يۈكلەندىغىنى بەك چوڭ",
"Upgrading filesystem cache..." => "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"

2
apps/files/l10n/uk.php
View File

@ -55,13 +55,13 @@ $TRANSLATIONS = array(
"Save" => "Зберегти",
"New" => "Створити",
"Text file" => "Текстовий файл",
"New folder" => "Нова тека",
"Folder" => "Тека",
"From link" => "З посилання",
"Deleted files" => "Видалено файлів",
"Cancel upload" => "Перервати завантаження",
"Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
"Download" => "Завантажити",
"Unshare" => "Закрити доступ",
"Delete" => "Видалити",
"Upload too large" => "Файл занадто великий",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",

3
apps/files/l10n/ur_PK.php
View File

@ -3,7 +3,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Error" => "ایرر",
"Unshare" => "شئیرنگ ختم کریں"
"Error" => "ایرر"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";

2
apps/files/l10n/vi.php
View File

@ -47,13 +47,13 @@ $TRANSLATIONS = array(
"Save" => "Lưu",
"New" => "Mới",
"Text file" => "Tập tin văn bản",
"New folder" => "Tạo thư mục",
"Folder" => "Thư mục",
"From link" => "Từ liên kết",
"Deleted files" => "File đã bị xóa",
"Cancel upload" => "Hủy upload",
"Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
"Download" => "Tải về",
"Unshare" => "Bỏ chia sẻ",
"Delete" => "Xóa",
"Upload too large" => "Tập tin tải lên quá lớn",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",

2
apps/files/l10n/zh_CN.php
View File

@ -50,13 +50,13 @@ $TRANSLATIONS = array(
"Save" => "保存",
"New" => "新建",
"Text file" => "文本文件",
"New folder" => "添加文件夹",
"Folder" => "文件夹",
"From link" => "来自链接",
"Deleted files" => "已删除文件",
"Cancel upload" => "取消上传",
"Nothing in here. Upload something!" => "这里还什么都没有。上传些东西吧！",
"Download" => "下载",
"Unshare" => "取消共享",
"Delete" => "删除",
"Upload too large" => "上传文件过大",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",

1
apps/files/l10n/zh_HK.php
View File

@ -10,7 +10,6 @@ $TRANSLATIONS = array(
"Upload" => "上傳",
"Save" => "儲存",
"Download" => "下載",
"Unshare" => "取消分享",
"Delete" => "刪除"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";

2
apps/files/l10n/zh_TW.php
View File

@ -72,6 +72,7 @@ $TRANSLATIONS = array(
"Save" => "儲存",
"New" => "新增",
"Text file" => "文字檔",
"New folder" => "新資料夾",
"Folder" => "資料夾",
"From link" => "從連結",
"Deleted files" => "回收桶",
@ -79,7 +80,6 @@ $TRANSLATIONS = array(
"You don’t have permission to upload or create files here" => "您沒有權限在這裡上傳或建立檔案",
"Nothing in here. Upload something!" => "這裡還沒有東西，上傳一些吧！",
"Download" => "下載",
"Unshare" => "取消分享",
"Delete" => "刪除",
"Upload too large" => "上傳過大",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案大小超過伺服器的限制。",

23
apps/files/lib/app.php
View File

@ -76,12 +76,25 @@ class App {
$this->view->rename($dir . '/' . $oldname, $dir . '/' . $newname)
) {
// successful rename
$result['success'] = true;
$result['data'] = array(
'dir' => $dir,
'file' => $oldname,
'newname' => $newname
$meta = $this->view->getFileInfo($dir . '/' . $newname);
if ($meta['mimetype'] === 'httpd/unix-directory') {
$meta['type'] = 'dir';
}
else {
$meta['type'] = 'file';
}
$fileinfo = array(
'id' => $meta['fileid'],
'mime' => $meta['mimetype'],
'size' => $meta['size'],
'etag' => $meta['etag'],
'directory' => $dir,
'name' => $newname,
'isPreviewAvailable' => \OC::$server->getPreviewManager()->isMimeSupported($meta['mimetype']),
'icon' => \OCA\Files\Helper::determineIcon($meta)
);
$result['success'] = true;
$result['data'] = $fileinfo;
} else {
// rename failed
$result['data'] = array(

23
apps/files/templates/index.php
View File

@ -5,9 +5,9 @@
<a><?php p($l->t('New'));?></a>
<ul>
<li style="background-image:url('<?php p(OCP\mimetype_icon('text/plain')) ?>')"
data-type='file'><p><?php p($l->t('Text file'));?></p></li>
data-type='file' data-newname='<?php p($l->t('New text file')) ?>.txt'><p><?php p($l->t('Text file'));?></p></li>
<li style="background-image:url('<?php p(OCP\mimetype_icon('dir')) ?>')"
data-type='folder'><p><?php p($l->t('Folder'));?></p></li>
data-type='folder' data-newname='<?php p($l->t('New folder')) ?>'><p><?php p($l->t('Folder'));?></p></li>
<li style="background-image:url('<?php p(OCP\image_path('core', 'places/link.svg')) ?>')"
data-type='web'><p><?php p($l->t('From link'));?></p></li>
</ul>
@ -69,20 +69,11 @@
<th <?php if (!$_['fileHeader']):?>class="hidden"<?php endif; ?> id="headerDate">
<span id="modified"><?php p($l->t( 'Modified' )); ?></span>
<?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
<!-- NOTE: Temporary fix to allow unsharing of files in root of Shared folder -->
<?php if ($_['dir'] == '/Shared'): ?>
<span class="selectedActions"><a href="" class="delete-selected">
<?php p($l->t('Unshare'))?>
<img class="svg" alt="<?php p($l->t('Unshare'))?>"
src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
</a></span>
<?php else: ?>
<span class="selectedActions"><a href="" class="delete-selected">
<?php p($l->t('Delete'))?>
<img class="svg" alt="<?php p($l->t('Delete'))?>"
src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
</a></span>
<?php endif; ?>
<span class="selectedActions"><a href="" class="delete-selected">
<?php p($l->t('Delete'))?>
<img class="svg" alt="<?php p($l->t('Delete'))?>"
src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
</a></span>
<?php endif; ?>
</th>
</tr>

67
apps/files/tests/ajax_rename.php
View File

@ -38,13 +38,14 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
$l10nMock->expects($this->any())
->method('t')
->will($this->returnArgument(0));
$viewMock = $this->getMock('\OC\Files\View', array('rename', 'normalizePath'), array(), '', false);
$viewMock = $this->getMock('\OC\Files\View', array('rename', 'normalizePath', 'getFileInfo'), array(), '', false);
$viewMock->expects($this->any())
->method('normalizePath')
->will($this->returnArgument(0));
$viewMock->expects($this->any())
->method('rename')
->will($this->returnValue(true));
$this->viewMock = $viewMock;
$this->files = new \OCA\Files\App($viewMock, $l10nMock);
}
@ -79,17 +80,28 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
$oldname = 'Shared';
$newname = 'new_name';
$result = $this->files->rename($dir, $oldname, $newname);
$expected = array(
'success' => true,
'data' => array(
'dir' => $dir,
'file' => $oldname,
'newname' => $newname
)
);
$this->viewMock->expects($this->any())
->method('getFileInfo')
->will($this->returnValue(array(
'fileid' => 123,
'type' => 'dir',
'mimetype' => 'httpd/unix-directory',
'size' => 18,
'etag' => 'abcdef',
'directory' => '/',
'name' => 'new_name',
)));
$this->assertEquals($expected, $result);
$result = $this->files->rename($dir, $oldname, $newname);
$this->assertTrue($result['success']);
$this->assertEquals(123, $result['data']['id']);
$this->assertEquals('new_name', $result['data']['name']);
$this->assertEquals('/test', $result['data']['directory']);
$this->assertEquals(18, $result['data']['size']);
$this->assertEquals('httpd/unix-directory', $result['data']['mime']);
$this->assertEquals(\OC_Helper::mimetypeIcon('dir'), $result['data']['icon']);
$this->assertFalse($result['data']['isPreviewAvailable']);
}
/**
@ -117,16 +129,29 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
$oldname = 'oldname';
$newname = 'newname';
$result = $this->files->rename($dir, $oldname, $newname);
$expected = array(
'success' => true,
'data' => array(
'dir' => $dir,
'file' => $oldname,
'newname' => $newname
)
);
$this->viewMock->expects($this->any())
->method('getFileInfo')
->will($this->returnValue(array(
'fileid' => 123,
'type' => 'dir',
'mimetype' => 'httpd/unix-directory',
'size' => 18,
'etag' => 'abcdef',
'directory' => '/',
'name' => 'new_name',
)));
$this->assertEquals($expected, $result);
$result = $this->files->rename($dir, $oldname, $newname);
$this->assertTrue($result['success']);
$this->assertEquals(123, $result['data']['id']);
$this->assertEquals('newname', $result['data']['name']);
$this->assertEquals('/', $result['data']['directory']);
$this->assertEquals(18, $result['data']['size']);
$this->assertEquals('httpd/unix-directory', $result['data']['mime']);
$this->assertEquals('abcdef', $result['data']['etag']);
$this->assertEquals(\OC_Helper::mimetypeIcon('dir'), $result['data']['icon']);
$this->assertFalse($result['data']['isPreviewAvailable']);
}
}

28
apps/files_encryption/ajax/getMigrationStatus.php Normal file
View File

@ -0,0 +1,28 @@
<?php
/**
* Copyright (c) 2013, Bjoern Schiessle <schiessle@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*
* @brief check migration status
*/
use OCA\Encryption\Util;
\OCP\JSON::checkAppEnabled('files_encryption');
$loginname = isset($_POST['user']) ? $_POST['user'] : '';
$password = isset($_POST['password']) ? $_POST['password'] : '';
$migrationCompleted = true;
if ($loginname !== '' && $password !== '') {
$username = \OCP\User::checkPassword($loginname, $password);
if ($username) {
$util = new Util(new \OC_FilesystemView('/'), $username);
if ($util->getMigrationStatus() !== Util::MIGRATION_COMPLETED) {
$migrationCompleted = false;
}
}
}
\OCP\JSON::success(array('data' => array('migrationCompleted' => $migrationCompleted)));

3
apps/files_encryption/appinfo/app.php
View File

@ -10,6 +10,8 @@ OC::$CLASSPATH['OCA\Encryption\Session'] = 'files_encryption/lib/session.php';
OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
\OCP\Util::addscript('files_encryption', 'detect-migration');
if (!OC_Config::getValue('maintenance', false)) {
OC_FileProxy::register(new OCA\Encryption\Proxy());
@ -52,4 +54,3 @@ if (!OC_Config::getValue('maintenance', false)) {
// Register settings scripts
OCP\App::registerAdmin('files_encryption', 'settings-admin');
OCP\App::registerPersonal('files_encryption', 'settings-personal');

55
apps/files_encryption/hooks/hooks.php
View File

@ -179,9 +179,9 @@ class Hooks {
// the necessary keys)
if (Crypt::mode() === 'server') {
if ($params['uid'] === \OCP\User::getUser()) {
$view = new \OC_FilesystemView('/');
$view = new \OC_FilesystemView('/');
if ($params['uid'] === \OCP\User::getUser()) {
$session = new \OCA\Encryption\Session($view);
@ -202,36 +202,41 @@ class Hooks {
} else { // admin changed the password for a different user, create new keys and reencrypt file keys
$user = $params['uid'];
$recoveryPassword = $params['recoveryPassword'];
$newUserPassword = $params['password'];
$util = new Util($view, $user);
$recoveryPassword = isset($params['recoveryPassword']) ? $params['recoveryPassword'] : null;
$view = new \OC_FilesystemView('/');
if (($util->recoveryEnabledForUser() && $recoveryPassword)
|| !$util->userKeysExists()) {
// make sure that the users home is mounted
\OC\Files\Filesystem::initMountPoints($user);
$recoveryPassword = $params['recoveryPassword'];
$newUserPassword = $params['password'];
$keypair = Crypt::createKeypair();
// make sure that the users home is mounted
\OC\Files\Filesystem::initMountPoints($user);
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$keypair = Crypt::createKeypair();
// Save public key
$view->file_put_contents('/public-keys/' . $user . '.public.key', $keypair['publicKey']);
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
// Encrypt private key empty passphrase
$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $newUserPassword);
// Save public key
$view->file_put_contents('/public-keys/' . $user . '.public.key', $keypair['publicKey']);
// Save private key
$view->file_put_contents(
'/' . $user . '/files_encryption/' . $user . '.private.key', $encryptedPrivateKey);
// Encrypt private key empty passphrase
$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $newUserPassword);
if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files
$util = new Util($view, $user);
$util->recoverUsersFiles($recoveryPassword);
// Save private key
$view->file_put_contents(
'/' . $user . '/files_encryption/' . $user . '.private.key', $encryptedPrivateKey);
if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files
$util = new Util($view, $user);
$util->recoverUsersFiles($recoveryPassword);
}
\OC_FileProxy::$enabled = $proxyStatus;
}
\OC_FileProxy::$enabled = $proxyStatus;
}
}
}
@ -318,8 +323,8 @@ class Hooks {
// get the parent from current share
$parent = $util->getShareParent($params['parent']);
// if parent is file the it is an 1:1 share
if ($parent['item_type'] === 'file') {
// if parent has the same type than the child it is a 1:1 share
if ($parent['item_type'] === $params['itemType']) {
// prefix path with Shared
$path = '/Shared' . $parent['file_target'];

29
apps/files_encryption/js/detect-migration.js Normal file
View File

@ -0,0 +1,29 @@
/**
* Copyright (c) 2013
* Bjoern Schiessle <schiessle@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*/
$(document).ready(function(){
$('form[name="login"]').on('submit', function() {
var user = $('#user').val();
var password = $('#password').val();
$.ajax({
type: 'POST',
url: OC.linkTo('files_encryption', 'ajax/getMigrationStatus.php'),
dataType: 'json',
data: {user: user, password: password},
async: false,
success: function(response) {
if (response.data.migrationCompleted === false) {
var message = t('files_encryption', 'Initial encryption started... This can take some time. Please wait.');
$('#messageText').text(message);
$('#message').removeClass('hidden').addClass('update');
}
}
});
});
});

1
apps/files_encryption/l10n/ca.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Manca de requisits.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat.",
"Following users are not set up for encryption:" => "Els usuaris següents no estan configurats per a l'encriptació:",
"Initial encryption started... This can take some time. Please wait." => "La encriptació inicial ha començat... Pot trigar una estona, espereu.",
"Saving..." => "Desant...",
"Go directly to your " => "Vés directament a",
"personal settings" => "arranjament personal",

2
apps/files_encryption/l10n/cs_CZ.php
View File

@ -9,11 +9,13 @@ $TRANSLATIONS = array(
"Private key password successfully updated." => "Heslo soukromého klíče úspěšně aktualizováno.",
"Could not update the private key password. Maybe the old password was not correct." => "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš soukromý klíč není platný! Pravděpodobně bylo vaše heslo změněno vně systému %s (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
"Unknown error please check your system settings or contact your administrator" => "Neznámá chyba, zkontrolujte vaše systémová nastavení nebo kontaktujte vašeho správce",
"Missing requirements." => "Nesplněné závislosti.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta.",
"Following users are not set up for encryption:" => "Následující uživatelé nemají nastavené šifrování:",
"Initial encryption started... This can take some time. Please wait." => "Počáteční šifrování zahájeno... Toto může chvíli trvat. Počkejte prosím.",
"Saving..." => "Ukládám...",
"Go directly to your " => "Běžte přímo do vašeho",
"personal settings" => "osobní nastavení",

21
apps/files_encryption/l10n/de.php
View File

@ -1,20 +1,21 @@
<?php
$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!",
"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
"Recovery key successfully disabled" => "Wiederherstellungsschlüssel deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!",
"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
"Password successfully changed." => "Dein Passwort wurde geändert.",
"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
"Private key password successfully updated." => "Passwort des privaten Schlüssels erfolgreich aktualisiert",
"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von%s Dein Passwort geändert (z.B. in deinem gemeinsamen Verzeichnis). Du kannst das Passwort deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an deine Dateien zu gelangen.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Datei-Besitzer, dass er die Datei nochmals mit Dir teilt.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.",
"Unknown error please check your system settings or contact your administrator" => "Unbekannter Fehler, bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator",
"Missing requirements." => "Fehlende Vorraussetzungen",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
"Initial encryption started... This can take some time. Please wait." => "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
"Saving..." => "Speichern...",
"Go directly to your " => "Direkt wechseln zu Deinem",
"personal settings" => "Private Einstellungen",
@ -29,14 +30,14 @@ $TRANSLATIONS = array(
"New Recovery key password" => "Neues Wiederherstellungsschlüssel-Passwort",
"Repeat New Recovery key password" => "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
"Change Password" => "Passwort ändern",
"Your private key password no longer match your log-in password:" => "Ihr Passwort für ihren privaten Schlüssel stimmt nicht mehr mit ihrem Loginpasswort überein.",
"Set your old private key password to your current log-in password." => "Setzen Sie ihr altes Passwort für ihren privaten Schlüssel auf ihr aktuelles Login-Passwort",
" If you don't remember your old password you can ask your administrator to recover your files." => "Wenn Sie Ihr altes Passwort vergessen haben, können Sie den Administrator bitten, Ihre Daten wiederherzustellen.",
"Old log-in password" => "Altes login Passwort",
"Your private key password no longer match your log-in password:" => "Das Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Loginpasswort überein.",
"Set your old private key password to your current log-in password." => "Setze Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Login-Passwort",
" If you don't remember your old password you can ask your administrator to recover your files." => "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
"Old log-in password" => "Altes Login Passwort",
"Current log-in password" => "Aktuelles Passwort",
"Update Private Key Password" => "Passwort für den privaten Schlüssel aktualisieren",
"Enable password recovery:" => "Passwortwiederherstellung aktivvieren:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Wenn Sie diese Option aktivieren, können Sie Ihre verschlüsselten Dateien wiederherstellen, falls Sie Ihr Passwort vergessen",
"Enable password recovery:" => "Passwortwiederherstellung aktivieren:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst",
"File recovery settings updated" => "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
"Could not update file recovery" => "Dateiwiederherstellung konnte nicht aktualisiert werden"
);

1
apps/files_encryption/l10n/de_DE.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Fehlende Voraussetzungen",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
"Initial encryption started... This can take some time. Please wait." => "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
"Saving..." => "Speichern...",
"Go directly to your " => "Direkt wechseln zu Ihrem",
"personal settings" => "Persönliche Einstellungen",

1
apps/files_encryption/l10n/en_GB.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Missing requirements.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.",
"Following users are not set up for encryption:" => "Following users are not set up for encryption:",
"Initial encryption started... This can take some time. Please wait." => "Initial encryption started... This can take some time. Please wait.",
"Saving..." => "Saving...",
"Go directly to your " => "Go directly to your ",
"personal settings" => "personal settings",

1
apps/files_encryption/l10n/es.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Requisitos incompletos.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
"Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:",
"Initial encryption started... This can take some time. Please wait." => "Encriptación iniciada..... Esto puede tomar un tiempo. Por favor espere.",
"Saving..." => "Guardando...",
"Go directly to your " => "Ir directamente a su",
"personal settings" => "opciones personales",

1
apps/files_encryption/l10n/et_EE.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Nõutavad on puudu.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud.",
"Following users are not set up for encryption:" => "Järgmised kasutajad pole seadistatud krüpteeringuks:",
"Initial encryption started... This can take some time. Please wait." => "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun oota.",
"Saving..." => "Salvestamine...",
"Go directly to your " => "Liigu otse oma",
"personal settings" => "isiklikes seadetes",

8
apps/files_encryption/l10n/eu.php
View File

@ -8,19 +8,27 @@ $TRANSLATIONS = array(
"Could not change the password. Maybe the old password was not correct." => "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
"Private key password successfully updated." => "Gako pasahitz pribatu behar bezala eguneratu da.",
"Could not update the private key password. Maybe the old password was not correct." => "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza %s-tik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.",
"Unknown error please check your system settings or contact your administrator" => "Errore ezezaguna mesedez egiaztatu zure sistemaren ezarpenak edo harremanetan jarri zure administradorearekin",
"Missing requirements." => "Eskakizun batzuk ez dira betetzen.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Mesedez ziurtatu PHP 5.3.3 edo berriago bat instalatuta dagoela eta OpenSSL PHP hedapenarekin gaitua eta ongi konfiguratuta dagoela. Oraingoz, enkriptazio aplikazioa desgaituta dago.",
"Following users are not set up for encryption:" => "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
"Initial encryption started... This can take some time. Please wait." => "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.",
"Saving..." => "Gordetzen...",
"Go directly to your " => "Joan zuzenean zure",
"personal settings" => "ezarpen pertsonalak",
"Encryption" => "Enkriptazioa",
"Enable recovery key (allow to recover users files in case of password loss):" => "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
"Recovery key password" => "Berreskuratze gako pasahitza",
"Repeat Recovery key password" => "Errepikatu berreskuratze gakoaren pasahitza",
"Enabled" => "Gaitua",
"Disabled" => "Ez-gaitua",
"Change recovery key password:" => "Aldatu berreskuratze gako pasahitza:",
"Old Recovery key password" => "Berreskuratze gako pasahitz zaharra",
"New Recovery key password" => "Berreskuratze gako pasahitz berria",
"Repeat New Recovery key password" => "Errepikatu berreskuratze gako berriaren pasahitza",
"Change Password" => "Aldatu Pasahitza",
"Your private key password no longer match your log-in password:" => "Zure gako pribatuaren pasahitza ez da dagoeneko zure sarrera pasahitza:",
"Set your old private key password to your current log-in password." => "Ezarri zure gako pribatu zaharraren pasahitza zure oraingo sarrerako psahitzara.",

1
apps/files_encryption/l10n/fr.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Système minimum requis non respecté.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée.",
"Following users are not set up for encryption:" => "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
"Initial encryption started... This can take some time. Please wait." => "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter.",
"Saving..." => "Enregistrement...",
"Go directly to your " => "Allez directement à votre",
"personal settings" => "paramètres personnel",

1
apps/files_encryption/l10n/gl.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Non se cumpren os requisitos.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
"Following users are not set up for encryption:" => "Os seguintes usuarios non teñen configuración para o cifrado:",
"Initial encryption started... This can take some time. Please wait." => "Comezou o cifrado inicial... Isto pode levar bastante tempo. Agarde.",
"Saving..." => "Gardando...",
"Go directly to your " => "Vaia directamente ao seu",
"personal settings" => "axustes persoais",

22
apps/files_encryption/l10n/hu_HU.php
View File

@ -1,18 +1,38 @@
<?php
$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Visszaállítási kulcs sikeresen bekapcsolva",
"Could not enable recovery key. Please check your recovery key password!" => "Visszaállítási kulcsot nem lehetett engedélyezni. Ellenörizd a visszaállítási kulcsod jelszavát!",
"Recovery key successfully disabled" => "Visszaállítási kulcs sikeresen kikapcsolva",
"Could not disable recovery key. Please check your recovery key password!" => "Visszaállítási kulcsot nem lehetett kikapcsolni. Ellenörizd a visszaállítási kulcsod jelszavát!",
"Password successfully changed." => "Jelszó sikeresen megváltoztatva.",
"Could not change the password. Maybe the old password was not correct." => "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.",
"Private key password successfully updated." => "Privát kulcs jelszava sikeresen frissült.",
"Could not update the private key password. Maybe the old password was not correct." => "A privát kulcs jelszavát nem lehetet frissiteni. Lehet, hogy hibás volt a régi jelszó.",
"Unknown error please check your system settings or contact your administrator" => "Ismeretlen hiba. Ellenörizd a rendszer beállításokat vagy keresd meg az adminisztrátort",
"Missing requirements." => "Hiányzó követelmények.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kérlek győződj meg arról, hogy PHP 5.3.3 vagy annál frissebb van telepítve, valamint a PHP-hez tartozó OpenSSL bővítmény be van-e kapcsolva és az helyesen van-e konfigurálva! Ki lett kapcsolva ideiglenesen a titkosító alkalmazás.",
"Following users are not set up for encryption:" => "A következő felhasználók nem állították be a titkosítást:",
"Initial encryption started... This can take some time. Please wait." => "Első titkosítás elkezdődött... Ez eltarhat hosszabb ideig. Kérlek várj.",
"Saving..." => "Mentés...",
"Go directly to your " => "Rövid úton a dolgaidhoz",
"personal settings" => "személyes beállítások",
"Encryption" => "Titkosítás",
"Recovery key password" => "A helyreállítási kulcs jelszava",
"Repeat Recovery key password" => "Ismételd a Helyreállítási kulcs jelszavát",
"Enabled" => "Bekapcsolva",
"Disabled" => "Kikapcsolva",
"Change recovery key password:" => "A helyreállítási kulcs jelszavának módosítása:",
"Old Recovery key password" => "Régi Helyreállítási Kulcs Jelszava",
"New Recovery key password" => "Új Helyreállítási kulcs jelszava",
"Repeat New Recovery key password" => "Ismételd az Új Helyreállítási kulcs jelszavát",
"Change Password" => "Jelszó megváltoztatása",
"Your private key password no longer match your log-in password:" => "A privát kulcs jelszavad mostantól nem azonos a belépési jelszavaddal:",
"Set your old private key password to your current log-in password." => "Állítsd vissza a régi privát kulcs jelszavát a jelenlegi bejelentkezési jelszavadra.",
" If you don't remember your old password you can ask your administrator to recover your files." => "Ha nem emlékszel a régi jelszavadra akkor keresed meg a rendszeradminisztátort a file-jaid visszaállításával kapcsolatban.",
"Old log-in password" => "Régi bejelentkezési jelszó",
"Current log-in password" => "Jelenlegi bejelentkezési jelszó",
"Update Private Key Password" => "Privát kulcs jelszó frissítése",
"Enable password recovery:" => "Jelszó-visszaállítás bekapcsolása"
"Enable password recovery:" => "Jelszó-visszaállítás bekapcsolása",
"File recovery settings updated" => "File helyreállítási beállításai frissültek"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";

1
apps/files_encryption/l10n/it.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Requisiti mancanti.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
"Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:",
"Initial encryption started... This can take some time. Please wait." => "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.",
"Saving..." => "Salvataggio in corso...",
"Go directly to your " => "Passa direttamente a",
"personal settings" => "impostazioni personali",

1
apps/files_encryption/l10n/ja_JP.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "必要要件が満たされていません。",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。",
"Following users are not set up for encryption:" => "以下のユーザーは、暗号化設定がされていません：",
"Initial encryption started... This can take some time. Please wait." => "暗号化の初期化作業を開始しました... この処理にはしばらく時間がかかります。今しばらくお待ちください。",
"Saving..." => "保存中...",
"Go directly to your " => "あなたのディレクトリへ",
"personal settings" => "秘密鍵をアンロックできます",

6
apps/files_encryption/l10n/ko.php
View File

@ -1,5 +1,9 @@
<?php
$TRANSLATIONS = array(
"Recovery key successfully enabled" => "복구키가 성공적으로 활성화 되었습니다",
"Could not enable recovery key. Please check your recovery key password!" => "복구키를 활성화 할수 없습니다. 복구키의 비밀번호를 확인해주세요!",
"Recovery key successfully disabled" => "복구키가 성공적으로 비활성화 되었습니다",
"Could not disable recovery key. Please check your recovery key password!" => "복구키를 비활성화 할수 없습니다. 복구키의 비밀번호를 확인해주세요!",
"Password successfully changed." => "암호가 성공적으로 변경되었습니다",
"Could not change the password. Maybe the old password was not correct." => "암호를 변경할수 없습니다. 아마도 예전 암호가 정확하지 않은것 같습니다.",
"Private key password successfully updated." => "개인키 암호가 성공적으로 업데이트 됨.",
@ -7,6 +11,8 @@ $TRANSLATIONS = array(
"personal settings" => "개인 설정",
"Encryption" => "암호화",
"Recovery key password" => "키 비밀번호 복구",
"Enabled" => "활성화",
"Disabled" => "비활성화",
"Change recovery key password:" => "복구 키 비밀번호 변경",
"Old Recovery key password" => "예전 복구 키 비밀번호",
"New Recovery key password" => "새 복구 키 비밀번호",

1
apps/files_encryption/l10n/nl.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Missende benodigdheden.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
"Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:",
"Initial encryption started... This can take some time. Please wait." => "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b.",
"Saving..." => "Opslaan",
"Go directly to your " => "Ga meteen naar uw",
"personal settings" => "persoonlijke instellingen",

1
apps/files_encryption/l10n/pt_BR.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Requisitos não encontrados.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
"Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:",
"Initial encryption started... This can take some time. Please wait." => "Criptografia inicial inicializada... Isto pode tomar algum tempo. Por favor espere.",
"Saving..." => "Salvando...",
"Go directly to your " => "Ir diretamente para o seu",
"personal settings" => "configurações pessoais.",

1
apps/files_encryption/l10n/ru.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Требования отсутствуют.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено.",
"Following users are not set up for encryption:" => "Для следующих пользователей шифрование не настроено:",
"Initial encryption started... This can take some time. Please wait." => "Начато начальное шифрование... Это может занять какое-то время. Пожалуйста, подождите.",
"Saving..." => "Сохранение...",
"Go directly to your " => "Перейти прямо в",
"personal settings" => "персональные настройки",

1
apps/files_encryption/l10n/sk_SK.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Chýbajúce požiadavky.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná.",
"Following users are not set up for encryption:" => "Nasledujúci používatelia nie sú nastavení pre šifrovanie:",
"Initial encryption started... This can take some time. Please wait." => "Počiatočné šifrovanie započalo ... To môže nejakú dobu trvať. Čakajte prosím.",
"Saving..." => "Ukladám...",
"Go directly to your " => "Choďte priamo do vášho",
"personal settings" => "osobné nastavenia",

1
apps/files_encryption/l10n/sl.php
View File

@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Manjkajoče zahteve",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Preverite, ali je na strežniku nameščen paket PHP 5.3.3 ali novejši, da je omogočen in pravilno nastavljen PHP OpenSSL. Z obstoječimi možnostmi šifriranje ni mogoče.",
"Following users are not set up for encryption:" => "Navedeni uporabniki še nimajo nastavljenega šifriranja:",
"Initial encryption started... This can take some time. Please wait." => "Začetno šifriranje je začeto ... Opravilo je lahko dolgotrajno.",
"Saving..." => "Poteka shranjevanje ...",
"Go directly to your " => "Skočite neposredno na",
"personal settings" => "osebne nastavitve",

1
apps/files_encryption/l10n/sv.php
View File

@ -9,6 +9,7 @@ $TRANSLATIONS = array(
"Private key password successfully updated." => "Den privata nyckelns lösenord uppdaterades utan problem.",
"Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför %s (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Kan ej dekryptera denna fil, förmodligen är det en delad fil. Be ägaren av filen att dela den med dig.",
"Unknown error please check your system settings or contact your administrator" => "Oväntat fel, kolla dina system inställningar eller kontakta din administratör",
"Missing requirements." => "Krav som saknas",

7
apps/files_encryption/l10n/tr.php
View File

@ -4,8 +4,8 @@ $TRANSLATIONS = array(
"Could not enable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı etkinleştirilemedi. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
"Recovery key successfully disabled" => "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
"Could not disable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
"Password successfully changed." => "Şifreniz başarıyla değiştirildi.",
"Could not change the password. Maybe the old password was not correct." => "Parola değiştirilemedi. Eski parolanız doğru olmayabilir",
"Password successfully changed." => "Parola başarıyla değiştirildi.",
"Could not change the password. Maybe the old password was not correct." => "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
"Private key password successfully updated." => "Gizli anahtar parolası başarıyla güncellendi",
"Could not update the private key password. Maybe the old password was not correct." => "Gizli anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.",
@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Gereklilikler eksik.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğunu ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı",
"Following users are not set up for encryption:" => "Aşağıdaki kullanıcılar şifreleme için ayarlanmadılar:",
"Initial encryption started... This can take some time. Please wait." => "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.",
"Saving..." => "Kaydediliyor...",
"Go directly to your " => "Doğrudan şuraya gidin:",
"personal settings" => "kişisel ayarlar",
@ -28,7 +29,7 @@ $TRANSLATIONS = array(
"Old Recovery key password" => "Eski Kurtarma anahtar parolası",
"New Recovery key password" => "Yeni Kurtarma anahtar parolası",
"Repeat New Recovery key password" => "Yeni Kurtarma anahtarı parolasını yenileyin",
"Change Password" => "Parola değiştir",
"Change Password" => "Parola Değiştir",
"Your private key password no longer match your log-in password:" => "Özel anahtar parolanız artık oturum açma parolanızla eşleşmiyor:",
"Set your old private key password to your current log-in password." => "Eski özel anahtar parolanızı geçerli oturum açma parolanız olarak ayarlayın.",
" If you don't remember your old password you can ask your administrator to recover your files." => "Eğer eski parolanızı hatırlamıyorsanız, yöneticinizden dosyalarınızı kurtarmasını talep edebilirsiniz.",

44
apps/files_encryption/lib/helper.php
View File

@ -225,10 +225,7 @@ class Helper {
* @return bool
*/
public static function isPublicAccess() {
if (\OCP\USER::getUser() === false
|| (isset($_GET['service']) && $_GET['service'] == 'files'
&& isset($_GET['t']))
) {
if (\OCP\User::getUser() === false) {
return true;
} else {
return false;
@ -256,10 +253,45 @@ class Helper {
}
/**
* @brief get path to the correspondig file in data/user/files if path points
* @brief try to get the user from the path if no user is logged in
* @param string $path
* @return mixed user or false if we couldn't determine a user
*/
public static function getUser($path) {
$user = \OCP\User::getUser();
// if we are logged in, then we return the userid
if ($user) {
return $user;
}
// if no user is logged in we try to access a publicly shared files.
// In this case we need to try to get the user from the path
$trimmed = ltrim($path, '/');
$split = explode('/', $trimmed);
// it is not a file relative to data/user/files
if (count($split) < 2 || $split[1] !== 'files') {
return false;
}
$user = $split[0];
if (\OCP\User::userExists($user)) {
return $user;
}
return false;
}
/**
* @brief get path to the corresponding file in data/user/files if path points
* to a version or to a file in cache
* @param string $path path to a version or a file in the trash
* @return string path to correspondig file relative to data/user/files
* @return string path to corresponding file relative to data/user/files
*/
public static function getPathToRealFile($path) {
$trimmed = ltrim($path, '/');

38
apps/files_encryption/lib/keymanager.php
View File

@ -112,21 +112,18 @@ class Keymanager {
* @brief store file encryption key
*
* @param \OC_FilesystemView $view
* @param \OCA\Encryption\Util $util
* @param string $path relative path of the file, including filename
* @param $userId
* @param $catfile
* @internal param string $key
* @param string $catfile keyfile content
* @return bool true/false
* @note The keyfile is not encrypted here. Client code must
* asymmetrically encrypt the keyfile before passing it to this method
*/
public static function setFileKey(\OC_FilesystemView $view, $path, $userId, $catfile) {
public static function setFileKey(\OC_FilesystemView $view, $util, $path, $catfile) {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($path);
// in case of system wide mount points the keys are stored directly in the data directory
@ -172,15 +169,15 @@ class Keymanager {
/**
* @brief retrieve keyfile for an encrypted file
* @param \OC_FilesystemView $view
* @param \OCA\Encryption\Util $util
* @param $filePath
* @internal param \OCA\Encryption\file $string name
* @return string file key or false
* @note The keyfile returned is asymmetrically encrypted. Decryption
* of the keyfile must be performed by client code
*/
public static function getFileKey(\OC_FilesystemView $view, $filePath) {
public static function getFileKey($view, $util, $filePath) {
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
$filename = Helper::stripPartialFileExtension($filename);
@ -216,17 +213,17 @@ class Keymanager {
* @brief Delete a keyfile
*
* @param \OC_FilesystemView $view
* @param string $userId username
* @param string $path path of the file the key belongs to
* @return bool Outcome of unlink operation
* @note $path must be relative to data/user/files. e.g. mydoc.txt NOT
* /data/admin/files/mydoc.txt
*/
public static function deleteFileKey(\OC_FilesystemView $view, $userId, $path) {
public static function deleteFileKey(\OC_FilesystemView $view, $path) {
$trimmed = ltrim($path, '/');
$util = new Util($view, \OCP\User::getUser());
$userId = Helper::getUser($path);
$util = new Util($view, $userId);
if($util->isSystemWideMountPoint($path)) {
$keyPath = '/files_encryption/keyfiles/' . $trimmed;
@ -315,16 +312,15 @@ class Keymanager {
/**
* @brief store multiple share keys for a single file
* @param \OC_FilesystemView $view
* @param $path
* @param \OCA\Encryption\Util $util
* @param string $path
* @param array $shareKeys
* @return bool
*/
public static function setShareKeys(\OC_FilesystemView $view, $path, array $shareKeys) {
public static function setShareKeys(\OC_FilesystemView $view, $util, $path, array $shareKeys) {
// $shareKeys must be an array with the following format:
// [userId] => [encrypted key]
// Here we need the currently logged in user, while userId can be a different user
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($path);
@ -363,21 +359,18 @@ class Keymanager {
* @brief retrieve shareKey for an encrypted file
* @param \OC_FilesystemView $view
* @param string $userId
* @param \OCA\Encryption\Util $util
* @param string $filePath
* @internal param \OCA\Encryption\file $string name
* @return string file key or false
* @note The sharekey returned is encrypted. Decryption
* of the keyfile must be performed by client code
*/
public static function getShareKey(\OC_FilesystemView $view, $userId, $filePath) {
public static function getShareKey(\OC_FilesystemView $view, $userId, $util, $filePath) {
// try reusing key file if part file
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
$filename = Helper::stripPartialFileExtension($filename);
// in case of system wide mount points the keys are stored directly in the data directory
@ -444,8 +437,9 @@ class Keymanager {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
$util = new Util($view, \OCP\User::getUser());
$userId = Helper::getUser($filePath);
$util = new Util($view, $userId);
list($owner, $filename) = $util->getUidAndFilename($filePath);

16
apps/files_encryption/lib/proxy.php
View File

@ -47,8 +47,10 @@ class Proxy extends \OC_FileProxy {
*/
private static function shouldEncrypt($path) {
$userId = Helper::getUser($path);
if (\OCP\App::isEnabled('files_encryption') === false || Crypt::mode() !== 'server' ||
strpos($path, '/' . \OCP\User::getUser() . '/files') !== 0) {
strpos($path, '/' . $userId . '/files') !== 0) {
return false;
}
@ -201,7 +203,7 @@ class Proxy extends \OC_FileProxy {
list($owner, $ownerPath) = $util->getUidAndFilename($relativePath);
// Delete keyfile & shareKey so it isn't orphaned
if (!Keymanager::deleteFileKey($view, $owner, $ownerPath)) {
if (!Keymanager::deleteFileKey($view, $ownerPath)) {
\OCP\Util::writeLog('Encryption library',
'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OCP\Util::ERROR);
}
@ -244,9 +246,6 @@ class Proxy extends \OC_FileProxy {
// split the path parts
$pathParts = explode('/', $path);
// get relative path
$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
// FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
if (isset($pathParts[2]) && $pathParts[2] === 'cache') {
return $result;
@ -260,7 +259,8 @@ class Proxy extends \OC_FileProxy {
$view = new \OC_FilesystemView('');
$util = new Util($view, \OCP\USER::getUser());
$userId = Helper::getUser($path);
$util = new Util($view, $userId);
// If file is already encrypted, decrypt using crypto protocol
if (
@ -323,7 +323,7 @@ class Proxy extends \OC_FileProxy {
$view = new \OC_FilesystemView('/');
$userId = \OCP\User::getUser();
$userId = Helper::getUser($path);
$util = new Util($view, $userId);
// if encryption is no longer enabled or if the files aren't migrated yet
@ -401,7 +401,7 @@ class Proxy extends \OC_FileProxy {
$view = new \OC_FilesystemView('/');
$session = new \OCA\Encryption\Session($view);
$userId = \OCP\User::getUser();
$userId = Helper::getUser($path);
$util = new Util($view, $userId);
// split the path parts

Some files were not shown because too many files have changed in this diff Show More