diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 8433716dec1..dde5d3c50af 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -18,7 +18,6 @@ if (empty($_POST['dirToken'])) {
}
} else {
$linkItem = OCP\Share::getShareByToken($_POST['dirToken']);
-
if ($linkItem === false) {
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Invalid Token')))));
die();
@@ -27,11 +26,18 @@ if (empty($_POST['dirToken'])) {
if (!($linkItem['permissions'] & OCP\PERMISSION_CREATE)) {
OCP\JSON::checkLoggedIn();
} else {
+ // resolve reshares
+ $rootLinkItem = OCP\Share::resolveReShare($linkItem);
+
+ // Setup FS with owner
+ OC_Util::tearDownFS();
+ OC_Util::setupFS($rootLinkItem['uid_owner']);
// The token defines the target directory (security reasons)
+ $path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
$dir = sprintf(
"/%s/%s",
- $linkItem['file_target'],
+ $path,
isset($_POST['subdir']) ? $_POST['subdir'] : ''
);
@@ -39,8 +45,6 @@ if (empty($_POST['dirToken'])) {
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
die();
}
- // Setup FS with owner
- OC_Util::setupFS($linkItem['uid_owner']);
}
}
@@ -76,17 +80,17 @@ $files = $_FILES['files'];
$error = '';
-$maxUploadFilesize = OCP\Util::maxUploadFilesize($dir);
-$maxHumanFilesize = OCP\Util::humanFileSize($maxUploadFilesize);
+$maxUploadFileSize = $storageStats['uploadMaxFilesize'];
+$maxHumanFileSize = OCP\Util::humanFileSize($maxUploadFileSize);
$totalSize = 0;
foreach ($files['size'] as $size) {
$totalSize += $size;
}
-if ($maxUploadFilesize >= 0 and $totalSize > $maxUploadFilesize) {
+if ($maxUploadFileSize >= 0 and $totalSize > $maxUploadFileSize) {
OCP\JSON::error(array('data' => array('message' => $l->t('Not enough storage available'),
- 'uploadMaxFilesize' => $maxUploadFilesize,
- 'maxHumanFilesize' => $maxHumanFilesize)));
+ 'uploadMaxFilesize' => $maxUploadFileSize,
+ 'maxHumanFilesize' => $maxHumanFileSize)));
exit();
}
@@ -108,8 +112,8 @@ if (strpos($dir, '..') === false) {
'id' => $meta['fileid'],
'name' => basename($target),
'originalname' => $files['name'][$i],
- 'uploadMaxFilesize' => $maxUploadFilesize,
- 'maxHumanFilesize' => $maxHumanFilesize
+ 'uploadMaxFilesize' => $maxUploadFileSize,
+ 'maxHumanFilesize' => $maxHumanFileSize
);
}
}
diff --git a/apps/files/index.php b/apps/files/index.php
index 640c28c0075..2338cf439e4 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -137,5 +137,6 @@ if ($needUpgrade) {
$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
+ $tmpl->assign('isPublic', false);
$tmpl->printPage();
}
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index bdc4031008a..f4424f92577 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -36,5 +36,6 @@
"Download" => "Изтегляне",
"Upload too large" => "Файлът който сте избрали за качване е прекалено голям",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",
-"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте."
+"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте.",
+"file" => "файл"
);
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 353997f6ebb..8d5f69f3318 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -49,6 +49,7 @@
"{count} folders" => "{count} carpetes",
"1 file" => "1 fitxer",
"{count} files" => "{count} fitxers",
+"%s could not be renamed" => "%s no es pot canviar el nom",
"Upload" => "Puja",
"File handling" => "Gestió de fitxers",
"Maximum upload size" => "Mida màxima de pujada",
@@ -72,5 +73,9 @@
"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",
"Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu",
"Current scanning" => "Actualment escanejant",
+"directory" => "directori",
+"directories" => "directoris",
+"file" => "fitxer",
+"files" => "fitxers",
"Upgrading filesystem cache..." => "Actualitzant la memòria de cau del sistema de fitxers..."
);
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 29c24e29842..c16d32e9c28 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -72,5 +72,7 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
"Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
"Current scanning" => "Aktuální prohledávání",
+"file" => "soubor",
+"files" => "soubory",
"Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..."
);
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index daa69717aa2..c2f200e476f 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -70,5 +70,7 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
"Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
"Current scanning" => "Indlæser",
+"file" => "fil",
+"files" => "filer",
"Upgrading filesystem cache..." => "Opgraderer filsystems cachen..."
);
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index bf0173ffc0c..98214d6a1b2 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -70,5 +70,7 @@
"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.",
"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
"Current scanning" => "Scanne",
+"file" => "Datei",
+"files" => "Dateien",
"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
);
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 9527b466344..f9c347b45da 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -73,5 +73,9 @@
"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.",
"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
"Current scanning" => "Scanne",
+"directory" => "Verzeichnis",
+"directories" => "Verzeichnisse",
+"file" => "Datei",
+"files" => "Dateien",
"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
);
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 6de00f4591c..7291dbbf156 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -70,5 +70,9 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
"Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
"Current scanning" => "Τρέχουσα ανίχνευση",
+"directory" => "κατάλογος",
+"directories" => "κατάλογοι",
+"file" => "αρχείο",
+"files" => "αρχεία",
"Upgrading filesystem cache..." => "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
);
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 062cf6f57f3..561545ec6ae 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -70,5 +70,7 @@
"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.",
"Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
"Current scanning" => "Nuna skano",
+"file" => "dosiero",
+"files" => "dosieroj",
"Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..."
);
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 8a5375030fc..78740d51507 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -49,6 +49,7 @@
"{count} folders" => "{count} carpetas",
"1 file" => "1 archivo",
"{count} files" => "{count} archivos",
+"%s could not be renamed" => "%s no se pudo renombrar",
"Upload" => "Subir",
"File handling" => "Manejo de archivos",
"Maximum upload size" => "Tamaño máximo de subida",
@@ -72,5 +73,9 @@
"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.",
"Files are being scanned, please wait." => "Los archivos están siendo escaneados, por favor espere.",
"Current scanning" => "Escaneo actual",
+"directory" => "carpeta",
+"directories" => "carpetas",
+"file" => "archivo",
+"files" => "archivos",
"Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos"
);
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 8e7c5a5144a..d5ae7ae53d2 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -70,5 +70,7 @@
"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 ",
"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
"Current scanning" => "Escaneo actual",
+"file" => "archivo",
+"files" => "archivos",
"Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos"
);
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index d4e951544c7..c58b066e287 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -1,6 +1,8 @@
"Ei saa liigutada faili %s - samanimeline fail on juba olemas",
"Could not move %s" => "%s liigutamine ebaõnnestus",
+"Unable to set upload directory." => "Üleslaadimiste kausta määramine ebaõnnestus.",
+"Invalid Token" => "Vigane kontrollkood",
"No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
"There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:",
@@ -47,6 +49,7 @@
"{count} folders" => "{count} kausta",
"1 file" => "1 fail",
"{count} files" => "{count} faili",
+"%s could not be renamed" => "%s ümbernimetamine ebaõnnestus",
"Upload" => "Lae üles",
"File handling" => "Failide käsitlemine",
"Maximum upload size" => "Maksimaalne üleslaadimise suurus",
@@ -70,5 +73,9 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
"Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
"Current scanning" => "Praegune skannimine",
+"directory" => "kaust",
+"directories" => "kaustad",
+"file" => "fail",
+"files" => "faili",
"Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
);
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 13cad2c315e..c87e20b1ff6 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -69,5 +69,7 @@
"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.",
"Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
"Current scanning" => "Orain eskaneatzen ari da",
+"file" => "fitxategia",
+"files" => "fitxategiak",
"Upgrading filesystem cache..." => "Fitxategi sistemaren katxea eguneratzen..."
);
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index b859777f807..73f4b493b4d 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -1,6 +1,8 @@
"%s نمی تواند حرکت کند - در حال حاضر پرونده با این نام وجود دارد. ",
"Could not move %s" => "%s نمی تواند حرکت کند ",
+"Unable to set upload directory." => "قادر به تنظیم پوشه آپلود نمی باشد.",
+"Invalid Token" => "رمز نامعتبر",
"No file was uploaded. Unknown error" => "هیچ فایلی آپلود نشد.خطای ناشناس",
"There is no error, the file uploaded with success" => "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "پرونده آپلود شده بیش ازدستور ماکزیمم_حجم فایل_برای آپلود در php.ini استفاده کرده است.",
@@ -17,6 +19,7 @@
"Upload cancelled." => "بار گذاری لغو شد",
"File upload is in progress. Leaving the page now will cancel the upload." => "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
"URL cannot be empty." => "URL نمی تواند خالی باشد.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "نام پوشه نامعتبر است. استفاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد.",
"Error" => "خطا",
"Share" => "اشتراکگذاری",
"Delete permanently" => "حذف قطعی",
@@ -46,6 +49,7 @@
"{count} folders" => "{ شمار} پوشه ها",
"1 file" => "1 پرونده",
"{count} files" => "{ شمار } فایل ها",
+"%s could not be renamed" => "%s نمیتواند تغییر نام دهد.",
"Upload" => "بارگزاری",
"File handling" => "اداره پرونده ها",
"Maximum upload size" => "حداکثر اندازه بارگزاری",
@@ -69,5 +73,9 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
"Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
"Current scanning" => "بازرسی کنونی",
+"directory" => "پوشه",
+"directories" => "پوشه ها",
+"file" => "پرونده",
+"files" => "پرونده ها",
"Upgrading filesystem cache..." => "بهبود فایل سیستمی ذخیره گاه..."
);
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index dd3c4a5f047..22e448c01db 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -65,5 +65,7 @@
"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.",
"Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.",
"Current scanning" => "Tämänhetkinen tutkinta",
+"file" => "tiedosto",
+"files" => "tiedostoa",
"Upgrading filesystem cache..." => "Päivitetään tiedostojärjestelmän välimuistia..."
);
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index c2306fd7124..646373d4aae 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -73,5 +73,7 @@
"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.",
"Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
"Current scanning" => "Analyse en cours",
+"file" => "fichier",
+"files" => "fichiers",
"Upgrading filesystem cache..." => "Mise à niveau du cache du système de fichier"
);
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 8c8fc7f70be..bba6335ae05 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -1,6 +1,8 @@
"Non se moveu %s - Xa existe un ficheiro con ese nome.",
"Could not move %s" => "Non foi posíbel mover %s",
+"Unable to set upload directory." => "Non é posíbel configurar o directorio de envíos.",
+"Invalid Token" => "Marca incorrecta",
"No file was uploaded. Unknown error" => "Non se enviou ningún ficheiro. Produciuse un erro descoñecido.",
"There is no error, the file uploaded with success" => "Non houbo erros, o ficheiro enviouse correctamente",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede a directiva indicada por upload_max_filesize de php.ini:",
@@ -47,6 +49,7 @@
"{count} folders" => "{count} cartafoles",
"1 file" => "1 ficheiro",
"{count} files" => "{count} ficheiros",
+"%s could not be renamed" => "%s non pode cambiar de nome",
"Upload" => "Enviar",
"File handling" => "Manexo de ficheiro",
"Maximum upload size" => "Tamaño máximo do envío",
@@ -70,5 +73,9 @@
"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",
"Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarde.",
"Current scanning" => "Análise actual",
+"directory" => "directorio",
+"directories" => "directorios",
+"file" => "ficheiro",
+"files" => "ficheiros",
"Upgrading filesystem cache..." => "Anovando a caché do sistema de ficheiros..."
);
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index e49693d3faf..52946bc6d0b 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -59,5 +59,7 @@
"Upload too large" => "העלאה גדולה מידי",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
"Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין.",
-"Current scanning" => "הסריקה הנוכחית"
+"Current scanning" => "הסריקה הנוכחית",
+"file" => "קובץ",
+"files" => "קבצים"
);
diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php
index df57abe28b6..151d1f497c7 100644
--- a/apps/files/l10n/hi.php
+++ b/apps/files/l10n/hi.php
@@ -1,4 +1,5 @@
"त्रुटि",
"Share" => "साझा करें",
"Save" => "सहेजें"
);
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index c0035709071..abe8c40bd53 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -42,5 +42,7 @@
"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.",
"Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.",
-"Current scanning" => "Trenutno skeniranje"
+"Current scanning" => "Trenutno skeniranje",
+"file" => "datoteka",
+"files" => "datoteke"
);
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index a74a3bf11ee..f0e5b1befc5 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -70,5 +70,7 @@
"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.",
"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
"Current scanning" => "Ellenőrzés alatt",
+"file" => "fájl",
+"files" => "fájlok",
"Upgrading filesystem cache..." => "A fájlrendszer gyorsítótárának frissítése zajlik..."
);
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 410f5c628e5..bacdcc8f496 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -69,5 +69,7 @@
"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.",
"Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
"Current scanning" => "Yang sedang dipindai",
+"file" => "berkas",
+"files" => "berkas-berkas",
"Upgrading filesystem cache..." => "Meningkatkan tembolok sistem berkas..."
);
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 24ddcd7aedf..28b33795aeb 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -73,5 +73,9 @@
"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.",
"Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
"Current scanning" => "Scansione corrente",
+"directory" => "cartella",
+"directories" => "cartelle",
+"file" => "file",
+"files" => "file",
"Upgrading filesystem cache..." => "Aggiornamento della cache del filesystem in corso..."
);
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index c03c3da3f17..e4be3133fb0 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -73,5 +73,9 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
"Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
"Current scanning" => "スキャン中",
+"directory" => "ディレクトリ",
+"directories" => "ディレクトリ",
+"file" => "ファイル",
+"files" => "ファイル",
"Upgrading filesystem cache..." => "ファイルシステムキャッシュを更新中..."
);
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index d63285dc00c..069c209ee58 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -69,5 +69,7 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
"Files are being scanned, please wait." => "파일을 검색하고 있습니다. 기다려 주십시오.",
"Current scanning" => "현재 검색",
+"file" => "파일",
+"files" => "파일",
"Upgrading filesystem cache..." => "파일 시스템 캐시 업그레이드 중..."
);
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index f13c3dbb415..9b209a4d5cc 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -37,5 +37,7 @@
"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.",
"Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.",
-"Current scanning" => "Momentane Scan"
+"Current scanning" => "Momentane Scan",
+"file" => "Datei",
+"files" => "Dateien"
);
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 97f11709bab..43fb4657dbb 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -70,5 +70,7 @@
"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",
"Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
"Current scanning" => "Šiuo metu skenuojama",
+"file" => "failas",
+"files" => "failai",
"Upgrading filesystem cache..." => "Atnaujinamas sistemos kešavimas..."
);
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index c7dfb8675f2..b0def1e707d 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -68,5 +68,7 @@
"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",
"Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
"Current scanning" => "Šobrīd tiek caurskatīts",
+"file" => "fails",
+"files" => "faili",
"Upgrading filesystem cache..." => "Uzlabo datņu sistēmas kešatmiņu..."
);
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index d1b82f1872a..2dd75f14338 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -52,5 +52,7 @@
"Upload too large" => "Фајлот кој се вчитува е преголем",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
"Files are being scanned, please wait." => "Се скенираат датотеки, ве молам почекајте.",
-"Current scanning" => "Моментално скенирам"
+"Current scanning" => "Моментално скенирам",
+"file" => "датотека",
+"files" => "датотеки"
);
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 332c0ceaabe..f96d4d48014 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -36,5 +36,7 @@
"Upload too large" => "Muatnaik terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
"Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.",
-"Current scanning" => "Imbasan semasa"
+"Current scanning" => "Imbasan semasa",
+"file" => "fail",
+"files" => "fail"
);
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index ee3f40d7c51..769dfe33ffe 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -70,5 +70,7 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
"Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
"Current scanning" => "Pågående skanning",
+"file" => "fil",
+"files" => "filer",
"Upgrading filesystem cache..." => "Oppgraderer filsystemets mellomlager..."
);
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index cf5fc68bd55..914d5087af1 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -72,5 +72,7 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server.",
"Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
"Current scanning" => "Er wordt gescand",
+"file" => "bestand",
+"files" => "bestanden",
"Upgrading filesystem cache..." => "Upgraden bestandssysteem cache..."
);
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 10f103973e4..703aeb3fbad 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -42,5 +42,7 @@
"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.",
"Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, ",
-"Current scanning" => "Exploracion en cors"
+"Current scanning" => "Exploracion en cors",
+"file" => "fichièr",
+"files" => "fichièrs"
);
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 5c41c8d3c81..a3acfea6618 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -49,6 +49,7 @@
"{count} folders" => "Ilość folderów: {count}",
"1 file" => "1 plik",
"{count} files" => "Ilość plików: {count}",
+"%s could not be renamed" => "%s nie można zmienić nazwy",
"Upload" => "Wyślij",
"File handling" => "Zarządzanie plikami",
"Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
@@ -72,5 +73,9 @@
"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ść.",
"Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
"Current scanning" => "Aktualnie skanowane",
+"directory" => "Katalog",
+"directories" => "Katalogi",
+"file" => "plik",
+"files" => "pliki",
"Upgrading filesystem cache..." => "Uaktualnianie plików pamięci podręcznej..."
);
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 6651adca82a..3ad679f8764 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -73,5 +73,9 @@
"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.",
"Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
"Current scanning" => "Scanning atual",
+"directory" => "diretório",
+"directories" => "diretórios",
+"file" => "arquivo",
+"files" => "arquivos",
"Upgrading filesystem cache..." => "Atualizando cache do sistema de arquivos..."
);
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index ba704b41091..4273de9c478 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -70,5 +70,7 @@
"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.",
"Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
"Current scanning" => "Análise actual",
+"file" => "ficheiro",
+"files" => "ficheiros",
"Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..."
);
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index d6d60e28680..b0cca7d7a82 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -1,6 +1,8 @@
"Nu se poate de mutat %s - Fișier cu acest nume deja există",
+"Could not move %s - File with this name already exists" => "%s nu se poate muta - Fișierul cu acest nume există deja ",
"Could not move %s" => "Nu s-a putut muta %s",
+"Unable to set upload directory." => "Imposibil de a seta directorul pentru incărcare.",
+"Invalid Token" => "Jeton Invalid",
"No file was uploaded. Unknown error" => "Nici un fișier nu a fost încărcat. Eroare necunoscută",
"There is no error, the file uploaded with success" => "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: ",
@@ -47,6 +49,7 @@
"{count} folders" => "{count} foldare",
"1 file" => "1 fisier",
"{count} files" => "{count} fisiere",
+"%s could not be renamed" => "%s nu a putut fi redenumit",
"Upload" => "Încărcare",
"File handling" => "Manipulare fișiere",
"Maximum upload size" => "Dimensiune maximă admisă la încărcare",
@@ -70,5 +73,9 @@
"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.",
"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
"Current scanning" => "În curs de scanare",
+"directory" => "catalog",
+"directories" => "cataloage",
+"file" => "fișier",
+"files" => "fișiere",
"Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.."
);
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 71bda3dc884..2db90413f21 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -70,5 +70,7 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
"Files are being scanned, please wait." => "Подождите, файлы сканируются.",
"Current scanning" => "Текущее сканирование",
+"file" => "файл",
+"files" => "файлы",
"Upgrading filesystem cache..." => "Обновление кэша файловой системы..."
);
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index 50745f0eff7..82fca4bc75d 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -44,5 +44,7 @@
"Upload too large" => "උඩුගත කිරීම විශාල වැඩිය",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",
"Files are being scanned, please wait." => "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න",
-"Current scanning" => "වර්තමාන පරික්ෂාව"
+"Current scanning" => "වර්තමාන පරික්ෂාව",
+"file" => "ගොනුව",
+"files" => "ගොනු"
);
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index b1ec8bccf41..b8382c7b0b4 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -70,5 +70,7 @@
"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.",
"Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
"Current scanning" => "Práve prezerané",
+"file" => "súbor",
+"files" => "súbory",
"Upgrading filesystem cache..." => "Aktualizujem medzipamäť súborového systému..."
);
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 8ba4d784edc..4516be15086 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -72,5 +72,7 @@
"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.",
"Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...",
"Current scanning" => "Trenutno poteka preučevanje",
+"file" => "datoteka",
+"files" => "datoteke",
"Upgrading filesystem cache..." => "Nadgrajevanje predpomnilnika datotečnega sistema ..."
);
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 7868d1cca2b..70f3121a20c 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -73,5 +73,9 @@
"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.",
"Files are being scanned, please wait." => "Filer skannas, var god vänta",
"Current scanning" => "Aktuell skanning",
+"directory" => "mapp",
+"directories" => "mappar",
+"file" => "fil",
+"files" => "filer",
"Upgrading filesystem cache..." => "Uppgraderar filsystemets cache..."
);
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index a71409f99e8..5b2eab6b3a1 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -66,5 +66,7 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
"Files are being scanned, please wait." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
"Current scanning" => "ไฟล์ที่กำลังสแกนอยู่ขณะนี้",
+"file" => "ไฟล์",
+"files" => "ไฟล์",
"Upgrading filesystem cache..." => "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
);
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index b4dc5766389..0b2dbb12dd9 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -70,5 +70,7 @@
"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.",
"Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
"Current scanning" => "Güncel tarama",
+"file" => "dosya",
+"files" => "dosyalar",
"Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor"
);
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index f1a291a901c..261853ef202 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -69,5 +69,7 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
"Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
"Current scanning" => "Поточне сканування",
+"file" => "файл",
+"files" => "файли",
"Upgrading filesystem cache..." => "Оновлення кеша файлової системи..."
);
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index 5ae06522c49..e3c9fd5488a 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -69,5 +69,7 @@
"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ủ .",
"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.",
"Current scanning" => "Hiện tại đang quét",
+"file" => "file",
+"files" => "files",
"Upgrading filesystem cache..." => "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
);
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index a9dd726faa2..4108516cda1 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -51,5 +51,7 @@
"Upload too large" => "上传过大",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.",
"Files are being scanned, please wait." => "正在扫描文件,请稍候.",
-"Current scanning" => "正在扫描"
+"Current scanning" => "正在扫描",
+"file" => "文件",
+"files" => "文件"
);
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 826de79c592..68680676a19 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -73,5 +73,7 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
"Files are being scanned, please wait." => "文件正在被扫描，请稍候。",
"Current scanning" => "当前扫描",
+"file" => "文件",
+"files" => "文件",
"Upgrading filesystem cache..." => "正在更新文件系统缓存..."
);
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 197982010f9..b2a17f6bca5 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -476,10 +476,19 @@ class Hooks {
$util = new Util($view, $userId);
// Format paths to be relative to user files dir
- $oldKeyfilePath = \OC\Files\Filesystem::normalizePath(
- $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['oldpath']);
- $newKeyfilePath = \OC\Files\Filesystem::normalizePath(
- $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['newpath']);
+ if ($util->isSystemWideMountPoint($params['oldpath'])) {
+ $baseDir = 'files_encryption/';
+ $oldKeyfilePath = $baseDir . 'keyfiles/' . $params['oldpath'];
+ } else {
+ $baseDir = $userId . '/' . 'files_encryption/';
+ $oldKeyfilePath = $baseDir . 'keyfiles/' . $params['oldpath'];
+ }
+
+ if ($util->isSystemWideMountPoint($params['newpath'])) {
+ $newKeyfilePath = $baseDir . 'keyfiles/' . $params['newpath'];
+ } else {
+ $newKeyfilePath = $baseDir . 'keyfiles/' . $params['newpath'];
+ }
// add key ext if this is not an folder
if (!$view->is_dir($oldKeyfilePath)) {
@@ -487,8 +496,9 @@ class Hooks {
$newKeyfilePath .= '.key';
// handle share-keys
- $localKeyPath = $view->getLocalFile($userId . '/files_encryption/share-keys/' . $params['oldpath']);
- $matches = glob(preg_quote($localKeyPath) . '*.shareKey');
+ $localKeyPath = $view->getLocalFile($baseDir . 'share-keys/' . $params['oldpath']);
+ $escapedPath = Helper::escapeGlobPattern($localKeyPath);
+ $matches = glob($escapedPath . '*.shareKey');
foreach ($matches as $src) {
$dst = \OC\Files\Filesystem::normalizePath(str_replace($params['oldpath'], $params['newpath'], $src));
@@ -502,10 +512,8 @@ class Hooks {
} else {
// handle share-keys folders
- $oldShareKeyfilePath = \OC\Files\Filesystem::normalizePath(
- $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['oldpath']);
- $newShareKeyfilePath = \OC\Files\Filesystem::normalizePath(
- $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['newpath']);
+ $oldShareKeyfilePath = $baseDir . 'share-keys/' . $params['oldpath'];
+ $newShareKeyfilePath = $baseDir . 'share-keys/' . $params['newpath'];
// create destination folder if not exists
if (!$view->file_exists(dirname($newShareKeyfilePath))) {
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index fd917f654ce..d9d3d7b4fa5 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -7,8 +7,9 @@
"Could not change the password. Maybe the old password was not correct." => "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.",
"Private key password successfully updated." => "La contrasenya de la clau privada s'ha actualitzat.",
"Could not update the private key password. Maybe the old password was not correct." => "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.",
-"PHP module OpenSSL is not installed." => "El mòdul OpenSSL de PHP no està instal·lat.",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Demaneu a l'administrador del servidor que instal·li el mòdul. Per ara, l'aplicació d'encriptació s'ha deshabilitat.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora del sistema ownCloud (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
+"Missing requirements." => "Manca de requisits.",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lada la versió de PHP 5.3.3 o posterior, i que teniu l'extensió OpenSSL PHP activada i configurada correctament. Per ara, l'aplicació de xifrat esta desactivada.",
"Saving..." => "Desant...",
"Your private key is not valid! Maybe the your password was changed from outside." => "La vostra clau privada no és vàlida! Potser la vostra contrasenya ha canviat des de fora.",
"You can unlock your private key in your " => "Podeu desbloquejar la clau privada en el vostre",
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index ff5ca1007fb..2d7512354d5 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -7,10 +7,12 @@
"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
"Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde 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. Vielleicht war das alte Passwort nicht richtig.",
-"PHP module OpenSSL is not installed." => "Das PHP-Modul OpenSSL ist nicht installiert.",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Bitte fragen Sie Ihren Server-Administrator, das entsprechende Modul zu installieren. Bis dahin wurde die Anwendung zur Verschlüsselung deaktiviert.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
+"Missing requirements." => "Fehlende Voraussetzungen",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL 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 die PHP-Erweiterung OpenSSL aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
"Saving..." => "Speichern...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von außerhalb geändert.",
+"You can unlock your private key in your " => "Sie können den privaten Schlüssel ändern und zwar in Ihrem",
"personal settings" => "Persönliche Einstellungen",
"Encryption" => "Verschlüsselung",
"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index f6e0e884f35..997b60f8ac3 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -2,7 +2,6 @@
"Password successfully changed." => "La pasvorto sukcese ŝanĝiĝis.",
"Could not change the password. Maybe the old password was not correct." => "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
"Private key password successfully updated." => "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
-"PHP module OpenSSL is not installed." => "La PHP-modulo OpenSSL ne instalitas.",
"Saving..." => "Konservante...",
"personal settings" => "persona agordo",
"Encryption" => "Ĉifrado",
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index e523a13bb67..0b49edbd2af 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -7,8 +7,9 @@
"Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
"Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
"Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
-"PHP module OpenSSL is not installed." => "El módulo OpenSSL de PHP no está instalado.",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Por favor pida al administrador de su servidor que le instale el módulo. De momento la aplicación de cifrado está deshabilitada.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros.",
+"Missing requirements." => "Requisitos incompletos.",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL 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.",
"Saving..." => "Guardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera.",
"You can unlock your private key in your " => "Puede desbloquear su clave privada en su",
@@ -19,8 +20,8 @@
"Enabled" => "Habilitar",
"Disabled" => "Deshabilitado",
"Change recovery key password:" => "Cambiar la contraseña de la clave de recuperación",
-"Old Recovery key password" => "Contraseña de la antigua clave de recuperación",
-"New Recovery key password" => "Contraseña de la nueva clave de recuperación",
+"Old Recovery key password" => "Antigua clave de recuperación",
+"New Recovery key password" => "Nueva clave de recuperación",
"Change Password" => "Cambiar contraseña",
"Your private key password no longer match your log-in password:" => "Su contraseña de clave privada ya no coincide con su contraseña de acceso:",
"Set your old private key password to your current log-in password." => "Establecer la contraseña de su antigua clave privada a su contraseña actual de acceso.",
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index 82ea3e06a69..b6f3fed8a6a 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -7,8 +7,6 @@
"Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
"Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
"Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseña de la clave privada. Tal vez la contraseña antigua no es correcta.",
-"PHP module OpenSSL is not installed." => "El módulo OpenSSL para PHP no está instalado.",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Pedile al administrador del servidor que instale el módulo. Por ahora la App de encriptación está deshabilitada.",
"Saving..." => "Guardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde afuera.",
"You can unlock your private key in your " => "Podés desbloquear tu clave privada en tu",
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index 94c774636b0..c1c8164b810 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -5,11 +5,32 @@
"Could not disable recovery key. Please check your recovery key password!" => "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
"Password successfully changed." => "Parool edukalt vahetatud.",
"Could not change the password. Maybe the old password was not correct." => "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+"Private key password successfully updated." => "Privaatse võtme parool edukalt uuendatud.",
+"Could not update the private key password. Maybe the old password was not correct." => "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sinu privaatne võti pole toimiv! Tõenäoliselt on sinu parool muutunud väljaspool ownCloud süsteemi (näiteks ettevõtte keskhaldus). Sa saad uuendada oma privaatse võtme parooli seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
+"Missing requirements." => "Nõutavad on puudu.",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veendu, et kasutusel oleks PHP 5.3.3 või uuem versioon ning kasutusel oleks OpenSSL PHP laiendus ja see on korrektselt seadistatud. Hetkel on krüpteerimise rakenduse kasutamine peatatud.",
"Saving..." => "Salvestamine...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Sinu privaatne võti ei ole õige. Võib-olla on parool vahetatud süsteemi väliselt.",
+"You can unlock your private key in your " => "Saad avada oma privaatse võtme oma",
+"personal settings" => "isiklikes seadetes",
"Encryption" => "Krüpteerimine",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Luba taastevõti (võimada kasutaja failide taastamine parooli kaotuse puhul):",
+"Recovery key password" => "Taastevõtme parool",
"Enabled" => "Sisse lülitatud",
"Disabled" => "Väljalülitatud",
+"Change recovery key password:" => "Muuda taastevõtme parooli:",
+"Old Recovery key password" => "Vana taastevõtme parool",
+"New Recovery key password" => "Uus taastevõtme parool",
"Change Password" => "Muuda parooli",
+"Your private key password no longer match your log-in password:" => "Sinu privaatse võtme parool ei ühti enam sinu sisselogimise parooliga:",
+"Set your old private key password to your current log-in password." => "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele.",
+"Old log-in password" => "Vana sisselogimise parool",
+"Current log-in password" => "Praegune sisselogimise parool",
+"Update Private Key Password" => "Uuenda privaatse võtme parooli",
+"Enable password recovery:" => "Luba parooli taaste:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul",
"File recovery settings updated" => "Faili taaste seaded uuendatud",
"Could not update file recovery" => "Ei suuda uuendada taastefaili"
);
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 07d30c7b937..22fe7932688 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -7,7 +7,6 @@
"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.",
-"PHP module OpenSSL is not installed." => "OpenSSL PHP modulua ez dago instalaturik.",
"Saving..." => "Gordetzen...",
"personal settings" => "ezarpen pertsonalak",
"Encryption" => "Enkriptazioa",
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index b52d9bc7f68..a00cc8ab96e 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,7 +1,6 @@
"Salasana vaihdettiin onnistuneesti.",
"Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
-"PHP module OpenSSL is not installed." => "PHP-moduulia OpenSSL ei ole asennettu.",
"Saving..." => "Tallennetaan...",
"Encryption" => "Salaus",
"Enabled" => "Käytössä",
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 5942d840687..44f65436722 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -8,8 +8,6 @@
"Private key password successfully updated." => "Mot de passe de la clé privé mis à jour avec succès.",
"Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte.",
-"PHP module OpenSSL is not installed." => "Le module OpenSSL de PHP n'est pas installé.",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Veuillez demander à l'administrateur du serveur d'installer le module. Pour l'instant l'application de chiffrement a été désactivé.",
"Saving..." => "Enregistrement...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur.",
"You can unlock your private key in your " => "Vous pouvez déverrouiller votre clé privée dans votre",
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 6b89db9e74c..db6f57bb36d 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -8,8 +8,8 @@
"Private key password successfully updated." => "A chave privada foi actualizada correctamente.",
"Could not update the private key password. Maybe the old password was not correct." => "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
-"PHP module OpenSSL is not installed." => "O módulo PHP OpenSSL non está instalado.",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Pregúntelle ao administrador do servidor pola instalación do módulo. Polo de agora o aplicativo de cifrado foi desactivado.",
+"Missing requirements." => "Non se cumpren os requisitos.",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL 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 que a extensión OpenSSL PHP estea activada e configurada correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
"Saving..." => "Gardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. ",
"You can unlock your private key in your " => "Pode desbloquear a chave privada nos seus",
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 6982d2d58d0..5b43d6321ff 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -8,8 +8,6 @@
"Private key password successfully updated." => "Password della chiave privata aggiornata correttamente.",
"Could not update the private key password. Maybe the old password was not correct." => "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La chiave privata non è valida! Forse la password è stata cambiata esternamente al sistema di ownCloud (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file.",
-"PHP module OpenSSL is not installed." => "Il modulo PHP OpenSSL non è installato.",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Chiedi all'amministratore del server di installare il modulo. Per ora la crittografia è disabilitata.",
"Saving..." => "Salvataggio in corso...",
"Your private key is not valid! Maybe the your password was changed from outside." => "La tua chiave privata non è valida! Forse è stata modifica dall'esterno.",
"You can unlock your private key in your " => "Puoi sbloccare la chiave privata nelle tue",
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index ce1e3fd0f31..a1fcbd5c544 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -8,8 +8,8 @@
"Private key password successfully updated." => "秘密鍵のパスワードが正常に更新されました。",
"Could not update the private key password. Maybe the old password was not correct." => "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "秘密鍵が有効ではありません。パスワードがownCloudシステムの外部(例えば、企業ディレクトリ)から変更された恐れがあります。個人設定で秘密鍵のパスワードを更新して、暗号化されたファイルを回復出来ます。",
-"PHP module OpenSSL is not installed." => "PHPのモジュール OpenSSLがインストールされていません。",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "サーバーの管理者にモジュールのインストールを頼んでください。さしあたり暗号化アプリは無効化されました。",
+"Missing requirements." => "必要要件が満たされていません。",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必ず、PHP 5.3.3以上をインストールし、OpenSSLのPHP拡張を有効にして適切に設定してください。現時点では暗号化アプリは無効になっています。",
"Saving..." => "保存中...",
"Your private key is not valid! Maybe the your password was changed from outside." => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。",
"You can unlock your private key in your " => "個人設定で",
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index cac25c8c80a..093ed2c29c8 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -7,8 +7,6 @@
"Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
"Private key password successfully updated." => "Privésleutel succesvol bijgewerkt.",
"Could not update the private key password. Maybe the old password was not correct." => "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
-"PHP module OpenSSL is not installed." => "PHP module OpenSSL is niet geïnstalleerd.",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Vraag uw beheerder deze module te installeren. Tot zolang is de crypto app gedeactiveerd.",
"Saving..." => "Opslaan",
"Your private key is not valid! Maybe the your password was changed from outside." => "Uw privésleutel is niet geldig. Misschien was uw wachtwoord van buitenaf gewijzigd.",
"You can unlock your private key in your " => "U kunt uw privésleutel deblokkeren in uw",
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index fce5abfcaf8..3928afb1d5c 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -7,8 +7,6 @@
"Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
"Private key password successfully updated." => "Pomyślnie zaktualizowano hasło klucza prywatnego.",
"Could not update the private key password. Maybe the old password was not correct." => "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
-"PHP module OpenSSL is not installed." => "Moduł PHP OpenSSL nie jest zainstalowany",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Proszę poproś administratora serwera aby zainstalował ten moduł. Obecnie aplikacja szyfrowanie została wyłączona.",
"Saving..." => "Zapisywanie...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz.",
"You can unlock your private key in your " => "Możesz odblokować swój klucz prywatny w swojej",
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index c8aa26188ad..1563243c993 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -8,8 +8,8 @@
"Private key password successfully updated." => "Senha de chave privada atualizada com sucesso.",
"Could not update the private key password. Maybe the old password was not correct." => "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
-"PHP module OpenSSL is not installed." => "O módulo PHP OpenSSL não está instalado.",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Por favor peça ao administrador do servidor para instalar o módulo. Por enquanto o app de encriptação foi desabilitada.",
+"Missing requirements." => "Requisitos em falta.",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL 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.",
"Saving..." => "Salvando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Sua chave privada não é válida! Talvez sua senha tenha sido mudada.",
"You can unlock your private key in your " => "Você pode desbloquear sua chave privada nas suas",
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 38ee85ad878..19a8287ada7 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -7,8 +7,6 @@
"Could not change the password. Maybe the old password was not correct." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
"Private key password successfully updated." => "Пароль секретного ключа успешно обновлён.",
"Could not update the private key password. Maybe the old password was not correct." => "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
-"PHP module OpenSSL is not installed." => "Модуль OpenSSL для PHP не установлен.",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Попросите администратора сервера установить модуль. Приложение шифрования было временно отключено.",
"Saving..." => "Сохранение...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Секретный ключ недействителен! Возможно, Ваш пароль был изменён в другой программе.",
"You can unlock your private key in your " => "Вы можете разблокировать закрытый ключ в своём ",
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index 9ae64797be6..8b28ba01155 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -8,8 +8,6 @@
"Private key password successfully updated." => "Zasebni ključ za geslo je bil uspešno posodobljen.",
"Could not update the private key password. Maybe the old password was not correct." => "Zasebnega ključa za geslo ni bilo mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno zunaj sistema ownCloud (npr. v skupnem imeniku). Svoj zasebni ključ, ki vam bo omogočil dostop do šifriranih dokumentov, lahko posodobite v osebnih nastavitvah.",
-"PHP module OpenSSL is not installed." => "PHP-modul OpenSSL ni nameščen.",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Obvestite skrbnika strežnika, da namesti manjkajoč modul. Trenutno je šifriranje onemogočeno.",
"Saving..." => "Poteka shranjevanje ...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno.",
"You can unlock your private key in your " => "Svoj zasebni ključ lahko odklenite v",
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 986ddbddf2d..3659e22bb4e 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -8,8 +8,6 @@
"Private key password successfully updated." => "Den privata lösenordsnyckeln uppdaterades utan problem.",
"Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera den privata lösenordsnyckeln. Kanske var det gamla lösenordet fel.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (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 ownCloud (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.",
-"PHP module OpenSSL is not installed." => "PHP-modulen för OpenSSL är inte installerad.",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Be din systemadministratör att installera modulen. För tillfället är appen för kryptering inaktiverad.",
"Saving..." => "Sparar...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan.",
"You can unlock your private key in your " => "Du kan låsa upp din privata nyckel i dina",
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 0896687aa84..a3939165c7a 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -8,8 +8,6 @@
"Private key password successfully updated." => "私钥密码成功更新。",
"Could not update the private key password. Maybe the old password was not correct." => "无法更新私钥密码。可能旧密码不正确。",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "您的私有密钥无效！也许是您在 ownCloud 系统外更改了密码 (比如，在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。",
-"PHP module OpenSSL is not installed." => "PHP 模块 OpenSSL 未安装。",
-"Please ask your server administrator to install the module. For now the encryption app was disabled." => "请请求您的服务器管理员安装该模块。现在加密应用被禁用。",
"Saving..." => "保存中",
"Your private key is not valid! Maybe the your password was changed from outside." => "您的私钥不正确！可能您在别处更改了密码。",
"You can unlock your private key in your " => "您可以在这里解锁您的私钥：",
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 31cf48a0393..6eee8fed6a6 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -218,7 +218,6 @@ class Helper {
exit();
}
-
/**
* check requirements for encryption app.
* @return bool true if requirements are met
@@ -233,4 +232,14 @@ class Helper {
return (bool) $result;
}
+
+ /**
+ * @brief glob uses different pattern than regular expressions, escape glob pattern only
+ * @param unescaped path
+ * @return escaped path
+ */
+ public static function escapeGlobPattern($path) {
+ return preg_replace('/(\*|\?|\[)/', '[$1]', $path);
+ }
}
+
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index e911c1785df..b2fd650f18d 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -126,7 +126,12 @@ class Keymanager {
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($path);
- $basePath = '/' . $owner . '/files_encryption/keyfiles';
+ // in case of system wide mount points the keys are stored directly in the data directory
+ if ($util->isSystemWideMountPoint($filename)) {
+ $basePath = '/files_encryption/keyfiles';
+ } else {
+ $basePath = '/' . $owner . '/files_encryption/keyfiles';
+ }
$targetPath = self::keySetPreparation($view, $filename, $basePath, $owner);
@@ -233,7 +238,12 @@ class Keymanager {
list($owner, $filename) = $util->getUidAndFilename($filePath);
$filePath_f = ltrim($filename, '/');
- $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+ // in case of system wide mount points the keys are stored directly in the data directory
+ if ($util->isSystemWideMountPoint($filename)) {
+ $keyfilePath = '/files_encryption/keyfiles/' . $filePath_f . '.key';
+ } else {
+ $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+ }
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -267,7 +277,14 @@ class Keymanager {
public static function deleteFileKey(\OC_FilesystemView $view, $userId, $path) {
$trimmed = ltrim($path, '/');
- $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
+
+ $util = new Util($view, \OCP\User::getUser());
+
+ if($util->isSystemWideMountPoint($path)) {
+ $keyPath = '/files_encryption/keyfiles/' . $trimmed;
+ } else {
+ $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
+ }
$result = false;
@@ -325,57 +342,26 @@ class Keymanager {
* @brief store share key
*
* @param \OC_FilesystemView $view
- * @param string $path relative path of the file, including filename
- * @param $userId
+ * @param string $path where the share key is stored
* @param $shareKey
- * @internal param string $key
- * @internal param string $dbClassName
* @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 setShareKey(\OC_FilesystemView $view, $path, $userId, $shareKey) {
-
- // 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);
-
- $basePath = '/' . $owner . '/files_encryption/share-keys';
-
- $shareKeyPath = self::keySetPreparation($view, $filename, $basePath, $owner);
-
- // try reusing key file if part file
- if (self::isPartialFilePath($shareKeyPath)) {
-
- $writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
-
- } else {
-
- $writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
-
- }
+ private static function setShareKey(\OC_FilesystemView $view, $path, $shareKey) {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $result = $view->file_put_contents($writePath, $shareKey);
+ $result = $view->file_put_contents($path, $shareKey);
\OC_FileProxy::$enabled = $proxyStatus;
- if (
- is_int($result)
- && $result > 0
- ) {
-
+ if (is_int($result) && $result > 0) {
return true;
-
} else {
-
return false;
-
}
-
}
/**
@@ -389,23 +375,40 @@ class Keymanager {
// $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);
+
+ // in case of system wide mount points the keys are stored directly in the data directory
+ if ($util->isSystemWideMountPoint($filename)) {
+ $basePath = '/files_encryption/share-keys';
+ } else {
+ $basePath = '/' . $owner . '/files_encryption/share-keys';
+ }
+
+ $shareKeyPath = self::keySetPreparation($view, $filename, $basePath, $owner);
$result = true;
foreach ($shareKeys as $userId => $shareKey) {
- if (!self::setShareKey($view, $path, $userId, $shareKey)) {
+ // try reusing key file if part file
+ if (self::isPartialFilePath($shareKeyPath)) {
+ $writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
+ } else {
+ $writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
+ }
+
+ if (!self::setShareKey($view, $writePath, $shareKey)) {
// If any of the keys are not set, flag false
$result = false;
-
}
-
}
// Returns false if any of the keys weren't set
return $result;
-
}
/**
@@ -440,8 +443,13 @@ class Keymanager {
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
- $shareKeyPath = \OC\Files\Filesystem::normalizePath(
- '/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
+
+ // in case of system wide mount points the keys are stored directly in the data directory
+ if ($util->isSystemWideMountPoint($filename)) {
+ $shareKeyPath = '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey';
+ } else {
+ $shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey';
+ }
if ($view->file_exists($shareKeyPath)) {
@@ -467,11 +475,21 @@ class Keymanager {
*/
public static function delAllShareKeys(\OC_FilesystemView $view, $userId, $filePath) {
- if ($view->is_dir($userId . '/files/' . $filePath)) {
- $view->unlink($userId . '/files_encryption/share-keys/' . $filePath);
+ $util = new util($view, $userId);
+
+ if ($util->isSystemWideMountPoint($filePath)) {
+ $baseDir = '/files_encryption/share-keys/';
} else {
- $localKeyPath = $view->getLocalFile($userId . '/files_encryption/share-keys/' . $filePath);
- $matches = glob(preg_quote($localKeyPath) . '*.shareKey');
+ $baseDir = $userId . '/files_encryption/share-keys/';
+ }
+
+
+ if ($view->is_dir($userId . '/files/' . $filePath)) {
+ $view->unlink($baseDir . $filePath);
+ } else {
+ $localKeyPath = $view->getLocalFile($baseDir . $filePath);
+ $escapedPath = Helper::escapeGlobPattern($localKeyPath);
+ $matches = glob($escapedPath . '*.shareKey');
foreach ($matches as $ma) {
$result = unlink($ma);
if (!$result) {
@@ -495,7 +513,11 @@ class Keymanager {
list($owner, $filename) = $util->getUidAndFilename($filePath);
- $shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename);
+ if ($util->isSystemWideMountPoint($filename)) {
+ $shareKeyPath = \OC\Files\Filesystem::normalizePath('/files_encryption/share-keys/' . $filename);
+ } else {
+ $shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename);
+ }
if ($view->is_dir($shareKeyPath)) {
@@ -526,7 +548,10 @@ class Keymanager {
*/
private static function recursiveDelShareKeys($dir, $userIds) {
foreach ($userIds as $userId) {
- $matches = glob(preg_quote($dir) . '/*' . preg_quote('.' . $userId . '.shareKey'));
+ $extension = '.' . $userId . '.shareKey';
+ $escapedDir = Helper::escapeGlobPattern($dir);
+ $escapedExtension = Helper::escapeGlobPattern($extension);
+ $matches = glob($escapedDir . '/*' . $escapedExtension);
}
/** @var $matches array */
foreach ($matches as $ma) {
@@ -535,7 +560,7 @@ class Keymanager {
'Could not delete shareKey; does not exist: "' . $ma . '"', \OCP\Util::ERROR);
}
}
- $subdirs = $directories = glob(preg_quote($dir) . '/*', GLOB_ONLYDIR);
+ $subdirs = $directories = glob($escapedDir . '/*', GLOB_ONLYDIR);
foreach ($subdirs as $subdir) {
self::recursiveDelShareKeys($subdir, $userIds);
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index b3de85254e2..50e823585d7 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -992,13 +992,9 @@ class Util {
\OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled')
&& $this->recoveryEnabledForUser()
) {
-
$recoveryEnabled = true;
-
} else {
-
$recoveryEnabled = false;
-
}
// Make sure that a share key is generated for the owner too
@@ -1019,20 +1015,25 @@ class Util {
// If recovery is enabled, add the
// Admin UID to list of users to share to
if ($recoveryEnabled) {
-
// Find recoveryAdmin user ID
$recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
-
// Add recoveryAdmin to list of users sharing
$userIds[] = $recoveryKeyId;
-
}
// add current user if given
if ($currentUserId !== false) {
-
$userIds[] = $currentUserId;
+ }
+ // check if it is a group mount
+ if (\OCP\App::isEnabled("files_external")) {
+ $mount = \OC_Mount_Config::getSystemMountPoints();
+ foreach ($mount as $mountPoint => $data) {
+ if ($mountPoint == substr($ownerPath, 1, strlen($mountPoint))) {
+ $userIds = array_merge($userIds, $this->getUserWithAccessToMountPoint($data['applicable']['users'], $data['applicable']['groups']));
+ }
+ }
}
// Remove duplicate UIDs
@@ -1042,6 +1043,20 @@ class Util {
}
+ private function getUserWithAccessToMountPoint($users, $groups) {
+ $result = array();
+ if (in_array('all', $users)) {
+ $result = \OCP\User::getUsers();
+ } else {
+ $result = array_merge($result, $users);
+ foreach ($groups as $group) {
+ $result = array_merge($result, \OC_Group::usersInGroup($group));
+ }
+ }
+
+ return $result;
+ }
+
/**
* @brief start migration mode to initially encrypt users data
* @return boolean
@@ -1179,7 +1194,7 @@ class Util {
return array(
$fileOwnerUid,
- $filename
+ \OC_Filesystem::normalizePath($filename)
);
}
@@ -1547,4 +1562,21 @@ class Util {
return $relativePath;
}
+ /**
+ * @brief check if the file is stored on a system wide mount point
+ * @param $path relative to /data/user with leading '/'
+ * @return boolean
+ */
+ public function isSystemWideMountPoint($path) {
+ if (\OCP\App::isEnabled("files_external")) {
+ $mount = \OC_Mount_Config::getSystemMountPoints();
+ foreach ($mount as $mountPoint => $data) {
+ if ($mountPoint == substr($path, 1, strlen($mountPoint))) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
}
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index cb10befc8e4..368b7b3dc3f 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -219,7 +219,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
- $filename = 'tmp-' . time() . '.test';
+ $filename = '/tmp-' . time() . '.test';
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index f83562dd643..d145a176f71 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -1,12 +1,12 @@
"Acceso garantizado",
+"Access granted" => "Acceso concedido",
"Error configuring Dropbox storage" => "Error configurando el almacenamiento de Dropbox",
-"Grant access" => "Garantizar acceso",
-"Please provide a valid Dropbox app key and secret." => "Por favor , proporcione un secreto y una contraseña válida de la app Dropbox.",
+"Grant access" => "Conceder acceso",
+"Please provide a valid Dropbox app key and secret." => "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
"Error configuring Google Drive storage" => "Error configurando el almacenamiento de Google Drive",
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Advertencia: El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale.",
"Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Advertencia: El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale.",
-"Warning: The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "Advertencia: El soporte de Curl en PHP no está activado ni instalado. El montado de ownCloud, WebDAV o GoogleDrive no es posible. Pida al administrador de su sistema que lo instale.",
+"Warning: The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "Advertencia: El soporte de Curl en PHP no está activado ni instalado. El montado de ownCloud, WebDAV o GoogleDrive no es posible. Pida al administrador de su sistema que lo instale.",
"External Storage" => "Almacenamiento externo",
"Folder name" => "Nombre de la carpeta",
"External storage" => "Almacenamiento externo",
@@ -19,8 +19,8 @@
"Groups" => "Grupos",
"Users" => "Usuarios",
"Delete" => "Eliminar",
-"Enable User External Storage" => "Habilitar almacenamiento de usuario externo",
+"Enable User External Storage" => "Habilitar almacenamiento externo de usuario",
"Allow users to mount their own external storage" => "Permitir a los usuarios montar su propio almacenamiento externo",
-"SSL root certificates" => "Raíz de certificados SSL ",
+"SSL root certificates" => "Certificados raíz SSL",
"Import Root Certificate" => "Importar certificado raíz"
);
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 71133145c87..b6511cb57cc 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -23,13 +23,17 @@ body {
#public_upload,
#download {
font-weight:700;
- margin: 0 0.4em 0 2em;
+ margin: 0 0.4em 0 0;
padding: 0 5px;
height: 27px;
float: left;
}
+.header-right #details {
+ margin-right: 2em;
+}
+
#public_upload {
margin-left: 0.3em;
}
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 0244f392a0e..294223aa094 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -11,6 +11,8 @@ var form_data;
$(document).ready(function() {
+ $('#data-upload-form').tipsy({gravity:'ne', fade:true});
+
if (typeof FileActions !== 'undefined') {
var mimetype = $('#mimetype').val();
// Show file preview if previewer is available, images are already handled by the template
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index 5e365746e84..cac7b7591d6 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -1,4 +1,5 @@
"Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
"Password" => "Passwort",
"Submit" => "Bestätigen",
"%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt",
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index 9f7f10f8065..1b65cf0c190 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -1,4 +1,5 @@
"La contraseña introducida es errónea. Inténtelo de nuevo.",
"Password" => "Contraseña",
"Submit" => "Enviar",
"%s shared the folder %s with you" => "%s compartió la carpeta %s contigo",
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index 138628849a2..78fe436398c 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,4 +1,5 @@
"Parool on vale. Proovi uuesti.",
"Password" => "Parool",
"Submit" => "Saada",
"%s shared the folder %s with you" => "%s jagas sinuga kausta %s",
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
index 1a7ae9330ad..7a744c8463d 100644
--- a/apps/files_sharing/l10n/fa.php
+++ b/apps/files_sharing/l10n/fa.php
@@ -1,4 +1,5 @@
"رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
"Password" => "گذرواژه",
"Submit" => "ثبت",
"%s shared the folder %s with you" => "%sپوشه %s را با شما به اشتراک گذاشت",
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
index a7a3cbb9c3b..2d8de8e1019 100644
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@@ -1,4 +1,5 @@
"O contrasinal é incorrecto. Ténteo de novo.",
"Password" => "Contrasinal",
"Submit" => "Enviar",
"%s shared the folder %s with you" => "%s compartiu o cartafol %s con vostede",
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index 3f3cfbfb3b4..d2bc2d11245 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -1,4 +1,5 @@
"パスワードが間違っています。再試行してください。",
"Password" => "パスワード",
"Submit" => "送信",
"%s shared the folder %s with you" => "%s はフォルダー %s をあなたと共有中です",
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index cf1eda94391..c82989857a9 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -1,4 +1,5 @@
"Senha incorreta. Tente novamente.",
"Password" => "Senha",
"Submit" => "Submeter",
"%s shared the folder %s with you" => "%s compartilhou a pasta %s com você",
diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php
index 1f38026daa1..3197068cdd1 100644
--- a/apps/files_sharing/l10n/ro.php
+++ b/apps/files_sharing/l10n/ro.php
@@ -1,4 +1,5 @@
"Parola este incorectă. Încercaţi din nou.",
"Password" => "Parolă",
"Submit" => "Trimite",
"%s shared the folder %s with you" => "%s a partajat directorul %s cu tine",
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index fb18bc26248..9462844a82b 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -27,23 +27,9 @@ if (isset($_GET['t'])) {
$type = $linkItem['item_type'];
$fileSource = $linkItem['file_source'];
$shareOwner = $linkItem['uid_owner'];
- $fileOwner = null;
$path = null;
- if (isset($linkItem['parent'])) {
- $parent = $linkItem['parent'];
- while (isset($parent)) {
- $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
- $item = $query->execute(array($parent))->fetchRow();
- if (isset($item['parent'])) {
- $parent = $item['parent'];
- } else {
- $fileOwner = $item['uid_owner'];
- break;
- }
- }
- } else {
- $fileOwner = $shareOwner;
- }
+ $rootLinkItem = OCP\Share::resolveReShare($linkItem);
+ $fileOwner = $rootLinkItem['uid_owner'];
if (isset($fileOwner)) {
OC_Util::tearDownFS();
OC_Util::setupFS($fileOwner);
@@ -151,6 +137,9 @@ if (isset($path)) {
if (\OCP\App::isEnabled('files_encryption')) {
$allowPublicUploadEnabled = false;
}
+ if ($linkItem['item_type'] !== 'folder') {
+ $allowPublicUploadEnabled = false;
+ }
$tmpl->assign('allowPublicUploadEnabled', $allowPublicUploadEnabled);
$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 56ed4ca168e..e8bf80b8720 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -1,5 +1,5 @@
-
+
@@ -9,88 +9,92 @@
-
-
getLogoClaim()); ?>
-
-
- t('%s shared the folder %s with you',
- array($_['displayName'], $_['fileTarget']))) ?>
-
- t('%s shared the file %s with you',
- array($_['displayName'], $_['fileTarget']))) ?>
-
+
+
+
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 691642811b7..87dfea491e7 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -2,9 +2,9 @@
$(document).ready(function() {
if (typeof FileActions !== 'undefined') {
- FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/undelete.png'), function(filename) {
+ FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) {
var tr=$('tr').filterAttr('data-file', filename);
- var spinner = '';
+ var spinner = '';
var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date");
var files = tr.attr('data-file');
undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
@@ -94,7 +94,7 @@ $(document).ready(function() {
$('.undelete').click('click',function(event) {
event.preventDefault();
- var spinner = '';
+ var spinner = '';
var files=getSelectedFiles('file');
var fileslist = JSON.stringify(files);
var dirlisting=getSelectedFiles('dirlisting')[0];
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index c267db7358a..b2d5a2aed26 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -1,9 +1,9 @@
"No se puede eliminar %s permanentemente",
"Couldn't restore %s" => "No se puede restaurar %s",
-"perform restore operation" => "Restaurar",
+"perform restore operation" => "restaurar",
"Error" => "Error",
-"delete file permanently" => "Eliminar archivo permanentemente",
+"delete file permanently" => "eliminar archivo permanentemente",
"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nombre",
"Deleted" => "Eliminado",
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 1235d9d2ee0..b9d900dfab4 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -171,13 +171,19 @@ class Trashbin {
list($owner, $ownerPath) = self::getUidAndFilename($file_path);
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $user);
// disable proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- // retain key files
- $keyfile = \OC\Files\Filesystem::normalizePath($owner . '/files_encryption/keyfiles/' . $ownerPath);
+ if ($util->isSystemWideMountPoint($ownerPath)) {
+ $baseDir = '/files_encryption/';
+ } else {
+ $baseDir = $owner . '/files_encryption/';
+ }
+
+ $keyfile = \OC\Files\Filesystem::normalizePath($baseDir . '/keyfiles/' . $ownerPath);
if ($rootView->is_dir($keyfile) || $rootView->file_exists($keyfile . '.key')) {
// move keyfiles
@@ -191,7 +197,7 @@ class Trashbin {
}
// retain share keys
- $sharekeys = \OC\Files\Filesystem::normalizePath($owner . '/files_encryption/share-keys/' . $ownerPath);
+ $sharekeys = \OC\Files\Filesystem::normalizePath($baseDir . '/share-keys/' . $ownerPath);
if ($rootView->is_dir($sharekeys)) {
$size += self::calculateSize(new \OC\Files\View($sharekeys));
@@ -403,6 +409,14 @@ class Trashbin {
list($owner, $ownerPath) = self::getUidAndFilename($target);
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $user);
+
+ if ($util->isSystemWideMountPoint($ownerPath)) {
+ $baseDir = '/files_encryption/';
+ } else {
+ $baseDir = $owner . '/files_encryption/';
+ }
+
$path_parts = pathinfo($file);
$source_location = $path_parts['dirname'];
@@ -432,18 +446,18 @@ class Trashbin {
// handle keyfiles
$size += self::calculateSize(new \OC\Files\View($keyfile));
- $rootView->rename($keyfile, $owner . '/files_encryption/keyfiles/' . $ownerPath);
+ $rootView->rename($keyfile, $baseDir . '/keyfiles/' . $ownerPath);
// handle share-keys
if ($timestamp) {
$sharekey .= '.d' . $timestamp;
}
$size += self::calculateSize(new \OC\Files\View($sharekey));
- $rootView->rename($sharekey, $owner . '/files_encryption/share-keys/' . $ownerPath);
+ $rootView->rename($sharekey, $baseDir . '/share-keys/' . $ownerPath);
} else {
// handle keyfiles
$size += $rootView->filesize($keyfile);
- $rootView->rename($keyfile, $owner . '/files_encryption/keyfiles/' . $ownerPath . '.key');
+ $rootView->rename($keyfile, $baseDir . '/keyfiles/' . $ownerPath . '.key');
// handle share-keys
$ownerShareKey = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user . '.shareKey');
@@ -454,7 +468,7 @@ class Trashbin {
$size += $rootView->filesize($ownerShareKey);
// move only owners key
- $rootView->rename($ownerShareKey, $owner . '/files_encryption/share-keys/' . $ownerPath . '.' . $user . '.shareKey');
+ $rootView->rename($ownerShareKey, $baseDir . '/share-keys/' . $ownerPath . '.' . $user . '.shareKey');
// try to re-share if file is shared
$filesystemView = new \OC_FilesystemView('/');
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index cb5edaa2c91..66ec36df867 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -18,7 +18,7 @@
" />
+ src="" />
t('Restore'))?>
diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php
index 4ec6aa1bbb4..43f7d71eb55 100644
--- a/apps/files_versions/l10n/fa.php
+++ b/apps/files_versions/l10n/fa.php
@@ -4,5 +4,6 @@
"failure" => "شکست",
"No old versions available" => "هیچ نسخه قدیمی در دسترس نیست",
"No path specified" => "هیچ مسیری مشخص نشده است",
+"Versions" => "نسخه ها",
"Revert a file to a previous version by clicking on its revert button" => "بازگردانی یک پرورنده به نسخه قدیمی اش از طریق دکمه بازگردانی امکان پذیر است"
);
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 8aa64477e41..605c75f288a 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,4 +1,5 @@
"Löschen der Zuordnung fehlgeschlagen.",
"Failed to delete the server configuration" => "Löschen der Serverkonfiguration fehlgeschlagen",
"The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.",
@@ -7,6 +8,7 @@
"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
"Keep settings?" => "Einstellungen beibehalten?",
"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"mappings cleared" => "Zuordnungen gelöscht",
"Success" => "Erfolg",
"Error" => "Fehler",
"Connection test succeeded" => "Verbindungstest erfolgreich",
@@ -74,8 +76,13 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
"Internal Username" => "Interner Benutzername",
"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Übereinstimmungen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port für Remote-URLs - zum Beispiel für alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich einzig und allein nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
+"Internal Username Attribute:" => "Interne Eigenschaften des Benutzers:",
"Override UUID detection" => "UUID-Erkennung überschreiben",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standardmäßig erkennt OwnCloud die UUID-Eigenschaften des Benutzers selbstständig. Die UUID-Eigenschaften werden genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird ein interner Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie können diese Eigenschaften überschreiben und selbst Eigenschaften nach Wahl vorgeben. Sie müssen allerdings sicherstellen, dass die Eigenschaften zur Identifikation für Benutzer und Gruppen eindeutig sind. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu zugeordnete (neu erstellte) LDAP-Benutzer und -Gruppen aus.",
"UUID Attribute:" => "UUID-Attribut:",
+"Username-LDAP User Mapping" => "LDAP-Benutzernamenzuordnung",
+"Clear Username-LDAP User Mapping" => "Lösche LDAP-Benutzernamenzuordnung",
+"Clear Groupname-LDAP Group Mapping" => "Lösche LDAP-Gruppennamenzuordnung",
"Test Configuration" => "Testkonfiguration",
"Help" => "Hilfe"
);
diff --git a/apps/user_ldap/l10n/hi.php b/apps/user_ldap/l10n/hi.php
index 45166eb0e3e..8e8e4e8ff69 100644
--- a/apps/user_ldap/l10n/hi.php
+++ b/apps/user_ldap/l10n/hi.php
@@ -1,4 +1,5 @@
"त्रुटि",
"Password" => "पासवर्ड",
"Help" => "सहयोग"
);
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index d01e75356c0..cde743f0033 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -1,11 +1,76 @@
"清除映射失敗",
+"Failed to delete the server configuration" => "刪除伺服器設定時失敗",
+"The configuration is valid and the connection could be established!" => "設定有效且連線可建立",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定有效但連線無法建立。請檢查伺服器的設定與認證資料。",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "設定無效。更多細節請參閱ownCloud的記錄檔。",
"Deletion failed" => "移除失敗",
+"Take over settings from recent server configuration?" => "要使用最近一次的伺服器設定嗎?",
+"Keep settings?" => "維持設定嗎?",
+"Cannot add server configuration" => "無法新增伺服器設定",
+"mappings cleared" => "映射已清除",
"Success" => "成功",
"Error" => "錯誤",
+"Connection test succeeded" => "連線測試成功",
+"Connection test failed" => "連線測試失敗",
+"Do you really want to delete the current Server Configuration?" => "您真的確定要刪除現在的伺服器設定嗎?",
+"Confirm Deletion" => "確認已刪除",
+"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "警告: 應用程式user_ldap和user_webdavauth互不相容。可能會造成無法預期的結果。請要求您的系統管理員將兩者其中之一停用。",
+"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "警告:沒有安裝 PHP LDAP 模組，後端系統將無法運作。請要求您的系統管理員安裝模組。",
+"Server configuration" => "伺服器設定",
+"Add Server Configuration" => "新增伺服器設定",
"Host" => "主機",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "若您不需要SSL加密傳輸則可忽略通訊協定。若非如此請從ldaps://開始",
+"One Base DN per line" => "一行一個Base DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "您可以在進階標籤頁裡面指定使用者及群組的Base DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "客戶端使用者的DN與特定字詞的連結需要完善，例如:uid=agent,dc=example,dc=com。若是匿名連接，則將DN與密碼欄位留白。",
"Password" => "密碼",
+"For anonymous access, leave DN and Password empty." => "匿名連接時請將DN與密碼欄位留白",
+"User Login Filter" => "使用者登入過濾器",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "試圖登入時會定義要套用的篩選器。登入過程中%%uid會取代使用者名稱。",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "請使用 %%uid placeholder，例如:\"uid=%%uid\"",
+"User List Filter" => "使用者名單篩選器",
+"Defines the filter to apply, when retrieving users." => "檢索使用者時定義要套用的篩選器",
+"without any placeholder, e.g. \"objectClass=person\"." => "請勿使用任何placeholder，例如:\"objectClass=person\"。",
+"Group Filter" => "群組篩選器",
+"Defines the filter to apply, when retrieving groups." => "檢索群組時，定義要套用的篩選器",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "請勿使用任何placeholder，例如:\"objectClass=posixGroup\"。",
+"Connection Settings" => "連線設定",
+"Configuration Active" => "設定為主動模式",
+"When unchecked, this configuration will be skipped." => "沒有被勾選時，此設定會被略過。",
"Port" => "連接阜",
+"Backup (Replica) Host" => "備用主機",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "請給定一個可選的備用主機。必須是LDAP/AD中央伺服器的複本。",
+"Backup (Replica) Port" => "備用(複本)連接阜",
+"Disable Main Server" => "停用主伺服器",
+"When switched on, ownCloud will only connect to the replica server." => "當開關打開時，ownCloud將只會連接複本伺服器。",
"Use TLS" => "使用TLS",
+"Case insensitve LDAP server (Windows)" => "不區分大小寫的LDAP伺服器(Windows)",
"Turn off SSL certificate validation." => "關閉 SSL 憑證驗證",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "若連線只有在此選項開啟時運作，請匯入LDAP伺服器的SSL認證到您的ownCloud伺服器。",
+"Not recommended, use for testing only." => "不推薦使用，僅供測試用途。",
+"Cache Time-To-Live" => "快取的存活時間",
+"in seconds. A change empties the cache." => "以秒為單位。更變後會清空快取。",
+"Directory Settings" => "目錄選項",
+"User Display Name Field" => "使用者名稱欄位",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "用於產生ownCloud名稱",
+"Base User Tree" => "Base使用者數",
+"One User Base DN per line" => "一行一個使用者Base DN",
+"User Search Attributes" => "使用者搜索屬性",
+"Optional; one attribute per line" => "可選的; 一行一項屬性",
+"Group Display Name Field" => "群組顯示名稱欄位",
+"Base Group Tree" => "Base群組樹",
+"One Group Base DN per line" => "一行一個群組Base DN",
+"Group Search Attributes" => "群組搜索屬性",
+"Group-Member association" => "群組成員的關係",
+"Special Attributes" => "特殊屬性",
+"Quota Field" => "配額欄位",
+"Quota Default" => "預設配額",
+"in bytes" => "以位元組為單位",
+"Email Field" => "電郵欄位",
+"User Home Folder Naming Rule" => "使用者家目錄的命名規則",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。",
+"Internal Username" => "內部使用者名稱",
+"Test Configuration" => "測試此設定",
"Help" => "說明"
);
diff --git a/apps/user_webdavauth/l10n/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
index 470cb2b0f10..f95b5214130 100644
--- a/apps/user_webdavauth/l10n/et_EE.php
+++ b/apps/user_webdavauth/l10n/et_EE.php
@@ -1,4 +1,5 @@
"WebDAV autentimine",
+"URL: " => "URL: ",
"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab HTTP vastuskoodid 401 ja 403 kui vigased, ning kõik teised vastused kui korrektsed kasutajatunnused."
);
diff --git a/core/css/styles.css b/core/css/styles.css
index 40a17a42876..6c9d00114a0 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -416,7 +416,13 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
#oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;}
.ui-dialog {position:fixed !important;}
span.ui-icon {float: left; margin: 3px 7px 30px 0;}
+
.loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; }
+.move2trash { /* decrease spinner size */
+ width: 16px;
+ height: 16px;
+}
+
/* ---- CATEGORIES ---- */
#categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; }
@@ -655,13 +661,13 @@ div.crumb:active {
/* icons */
.folder-icon { background-image: url('../img/places/folder.svg'); }
.delete-icon { background-image: url('../img/actions/delete.svg'); }
-.delete-icon:hover { background-image: url('../img/actions/delete-hover.svg'); }
.edit-icon { background-image: url('../img/actions/rename.svg'); }
/* buttons */
button.loading {
background-image: url('../img/loading.gif');
background-position: right 10px center; background-repeat: no-repeat;
+ background-size: 16px;
padding-right: 30px;
}
diff --git a/core/img/actions/add.png b/core/img/actions/add.png
index 25d472b2dc4..1aac02b8454 100644
Binary files a/core/img/actions/add.png and b/core/img/actions/add.png differ
diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg
index 136d6c4b311..250746e1660 100644
--- a/core/img/actions/add.svg
+++ b/core/img/actions/add.svg
@@ -1,10 +1,6 @@
-
';
- html += '';
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index 4878c75edde..dc78e44c8d7 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -15,7 +15,6 @@
"Admin" => "Admin",
"Help" => "Hulp",
"Cloud not found" => "Wolk nie gevind",
-"web services under your control" => "webdienste onder jou beheer",
"Create an admin account" => "Skep `n admin-rekening",
"Advanced" => "Gevorderd",
"Configure the database" => "Stel databasis op",
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 7ac7a564c35..b18ee712cfa 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -98,7 +98,6 @@
"Help" => "المساعدة",
"Access forbidden" => "التوصّل محظور",
"Cloud not found" => "لم يتم إيجاد",
-"web services under your control" => "خدمات الشبكة تحت سيطرتك",
"Edit categories" => "عدل الفئات",
"Add" => "اضف",
"Security Warning" => "تحذير أمان",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 490bea9b170..608f26bc861 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -50,7 +50,6 @@
"Help" => "Помощ",
"Access forbidden" => "Достъпът е забранен",
"Cloud not found" => "облакът не намерен",
-"web services under your control" => "уеб услуги под Ваш контрол",
"Edit categories" => "Редактиране на категориите",
"Add" => "Добавяне",
"Create an admin account" => "Създаване на админ профил",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index c775d2fb6af..5c171af567c 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -95,7 +95,6 @@
"Help" => "সহায়িকা",
"Access forbidden" => "অধিগমনের অনুমতি নেই",
"Cloud not found" => "ক্লাউড খুঁজে পাওয়া গেল না",
-"web services under your control" => "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
"Edit categories" => "ক্যাটেগরি সম্পাদনা",
"Add" => "যোগ কর",
"Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 9b3b45fdf9d..80f0e558a67 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -106,7 +106,6 @@
"Access forbidden" => "Accés prohibit",
"Cloud not found" => "No s'ha trobat el núvol",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho: %s\n\nSalut!",
-"web services under your control" => "controleu els vostres serveis web",
"Edit categories" => "Edita les categories",
"Add" => "Afegeix",
"Security Warning" => "Avís de seguretat",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 113d0f41ba8..b0e70938d4a 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -106,7 +106,6 @@
"Access forbidden" => "Přístup zakázán",
"Cloud not found" => "Cloud nebyl nalezen",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\njenom vám chci oznámit že %s s vámi sdílí %s.\nPodívat se můžete zde: %s\n\nDíky",
-"web services under your control" => "služby webu pod Vaší kontrolou",
"Edit categories" => "Upravit kategorie",
"Add" => "Přidat",
"Security Warning" => "Bezpečnostní upozornění",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 6158a356dc7..aeb2995e6bd 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -100,7 +100,6 @@
"Help" => "Cymorth",
"Access forbidden" => "Mynediad wedi'i wahardd",
"Cloud not found" => "Methwyd canfod cwmwl",
-"web services under your control" => "gwasanaethau gwe a reolir gennych",
"Edit categories" => "Golygu categorïau",
"Add" => "Ychwanegu",
"Security Warning" => "Rhybudd Diogelwch",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index b3da17ba798..2e84c3ff511 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -101,7 +101,6 @@
"Help" => "Hjælp",
"Access forbidden" => "Adgang forbudt",
"Cloud not found" => "Sky ikke fundet",
-"web services under your control" => "Webtjenester under din kontrol",
"Edit categories" => "Rediger kategorier",
"Add" => "Tilføj",
"Security Warning" => "Sikkerhedsadvarsel",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 897b379a28b..c33045eb7b6 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -105,7 +105,6 @@
"Access forbidden" => "Zugriff verboten",
"Cloud not found" => "Cloud nicht gefunden",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nwollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.\nSchau es dir an: %s\n\nGruß!",
-"web services under your control" => "Web-Services unter Deiner Kontrolle",
"Edit categories" => "Kategorien bearbeiten",
"Add" => "Hinzufügen",
"Security Warning" => "Sicherheitswarnung",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index eca14f7d9a9..9d5a7298e19 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -106,7 +106,6 @@
"Access forbidden" => "Zugriff verboten",
"Cloud not found" => "Cloud wurde nicht gefunden",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele Grüße!",
-"web services under your control" => "Web-Services unter Ihrer Kontrolle",
"Edit categories" => "Kategorien ändern",
"Add" => "Hinzufügen",
"Security Warning" => "Sicherheitshinweis",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 022d9d90039..2dcfa1bb698 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -104,7 +104,6 @@
"Access forbidden" => "Δεν επιτρέπεται η πρόσβαση",
"Cloud not found" => "Δεν βρέθηκε νέφος",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Γεια σας,\n\nσας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το %s.\nΔείτε το: %s\n\nΓεια χαρά!",
-"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας",
"Edit categories" => "Επεξεργασία κατηγοριών",
"Add" => "Προσθήκη",
"Security Warning" => "Προειδοποίηση Ασφαλείας",
diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php
index 0c590d0b758..482632f3fda 100644
--- a/core/l10n/en@pirate.php
+++ b/core/l10n/en@pirate.php
@@ -1,4 +1,3 @@
"Passcode",
-"web services under your control" => "web services under your control"
+"Password" => "Passcode"
);
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 2adf09d3a01..00f925e5274 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -102,7 +102,6 @@
"Access forbidden" => "Aliro estas malpermesata",
"Cloud not found" => "La nubo ne estas trovita",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Saluton:\n\nNi nur sciigas vin, ke %s kunhavigis %s kun vi.\nVidu ĝin: %s\n\nĜis!",
-"web services under your control" => "TTT-servoj regataj de vi",
"Edit categories" => "Redakti kategoriojn",
"Add" => "Aldoni",
"Security Warning" => "Sekureca averto",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 3845f68d24f..ae98a019db1 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -106,7 +106,6 @@
"Access forbidden" => "Acceso prohibido",
"Cloud not found" => "No se encuentra la nube",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!",
-"web services under your control" => "Servicios web bajo su control",
"Edit categories" => "Editar categorías",
"Add" => "Agregar",
"Security Warning" => "Advertencia de seguridad",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 8bef5151163..1fac1c88dad 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -105,7 +105,6 @@
"Access forbidden" => "Acceso prohibido",
"Cloud not found" => "No se encontró ownCloud",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hola,\n\nSimplemente te informo que %s compartió %s con vos.\nMiralo acá: %s\n\n¡Chau!",
-"web services under your control" => "servicios web que controlás",
"Edit categories" => "Editar categorías",
"Add" => "Agregar",
"Security Warning" => "Advertencia de seguridad",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 4c0a41c5087..ec850491b79 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,4 +1,5 @@
"%s jagas sinuga »%s«",
"Category type not provided." => "Kategooria tüüp puudub.",
"No category to add?" => "Pole kategooriat, mida lisada?",
"This category already exists: %s" => "See kategooria on juba olemas: %s",
@@ -61,6 +62,7 @@
"Share with link" => "Jaga lingiga",
"Password protect" => "Parooliga kaitstud",
"Password" => "Parool",
+"Allow Public Upload" => "Luba avalik üleslaadimine",
"Email link to person" => "Saada link isikule e-postiga",
"Send" => "Saada",
"Set expiration date" => "Määra aegumise kuupäev",
@@ -89,6 +91,8 @@
"Request failed! Did you make sure your email/username was right?" => "Päring ebaõnnestus! Oled sa veendunud, et e-post/kasutajanimi on õiged?",
"You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
"Username" => "Kasutajanimi",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
+"Yes, I really want to reset my password now" => "Jah, ma tõesti soovin oma parooli praegu nullida",
"Request reset" => "Päringu taastamine",
"Your password was reset" => "Sinu parool on taastatud",
"To login page" => "Sisselogimise lehele",
@@ -101,7 +105,7 @@
"Help" => "Abiinfo",
"Access forbidden" => "Ligipääs on keelatud",
"Cloud not found" => "Pilve ei leitud",
-"web services under your control" => "veebitenused sinu kontrolli all",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei,\n\nlihtsalt annan sulle teada, et %s jagas sinuga %s.\nVaata seda siin: %s\n\nTervitused!",
"Edit categories" => "Muuda kategooriaid",
"Add" => "Lisa",
"Security Warning" => "Turvahoiatus",
@@ -131,6 +135,7 @@
"remember" => "pea meeles",
"Log in" => "Logi sisse",
"Alternative Logins" => "Alternatiivsed sisselogimisviisid",
+"Hey there,
just letting you know that %s shared »%s« with you. View it!
Cheers!" => "Hei,
lihtsalt annan sulle teada, et %s jagas sinuga »%s«. Vaata seda!
Tervitades!",
"prev" => "eelm",
"next" => "järgm",
"Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta."
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 117c0105756..4242d975f3b 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -98,7 +98,6 @@
"Help" => "Laguntza",
"Access forbidden" => "Sarrera debekatuta",
"Cloud not found" => "Ez da hodeia aurkitu",
-"web services under your control" => "web zerbitzuak zure kontrolpean",
"Edit categories" => "Editatu kategoriak",
"Add" => "Gehitu",
"Security Warning" => "Segurtasun abisua",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 338b3ad4b21..02fe2ce1148 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,4 +1,5 @@
"%s به اشتراک گذاشته شده است »%s« توسط شما",
"Category type not provided." => "نوع دسته بندی ارائه نشده است.",
"No category to add?" => "آیا گروه دیگری برای افزودن ندارید",
"This category already exists: %s" => "این دسته هم اکنون وجود دارد: %s",
@@ -42,6 +43,7 @@
"years ago" => "سالهای قبل",
"Choose" => "انتخاب کردن",
"Cancel" => "منصرف شدن",
+"Error loading file picker template" => "خطا در بارگذاری قالب انتخاب کننده فایل",
"Yes" => "بله",
"No" => "نه",
"Ok" => "قبول",
@@ -60,6 +62,7 @@
"Share with link" => "به اشتراک گذاشتن با پیوند",
"Password protect" => "نگهداری کردن رمز عبور",
"Password" => "گذرواژه",
+"Allow Public Upload" => "اجازه آپلود عمومی",
"Email link to person" => "پیوند ایمیل برای شخص.",
"Send" => "ارسال",
"Set expiration date" => "تنظیم تاریخ انقضا",
@@ -84,8 +87,12 @@
"The update was successful. Redirecting you to ownCloud now." => "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
"ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
"Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
+"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders. If it is not there ask your local administrator ." => "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است. اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید. در صورت نبودن از مدیر خود بپرسید.",
+"Request failed! Did you make sure your email/username was right?" => "درخواست رد شده است ! آیا مطمئن هستید که ایمیل/ نام کاربری شما صحیح میباشد ؟",
"You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
"Username" => "نام کاربری",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
+"Yes, I really want to reset my password now" => "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
"Request reset" => "درخواست دوباره سازی",
"Your password was reset" => "گذرواژه شما تغییرکرد",
"To login page" => "به صفحه ورود",
@@ -98,7 +105,7 @@
"Help" => "راهنما",
"Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
"Cloud not found" => "پیدا نشد",
-"web services under your control" => "سرویس های تحت وب در کنترل شما",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "اینجا,⏎\n فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده %s توسط شما.⏎\nمشاهده آن : %s⏎\n⏎\nبه سلامتی!",
"Edit categories" => "ویرایش گروه",
"Add" => "افزودن",
"Security Warning" => "اخطار امنیتی",
@@ -119,6 +126,7 @@
"Database tablespace" => "جدول پایگاه داده",
"Database host" => "هاست پایگاه داده",
"Finish setup" => "اتمام نصب",
+"%s is available. Get more information on how to update." => "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید.",
"Log out" => "خروج",
"Automatic logon rejected!" => "ورود به سیستم اتوماتیک ردشد!",
"If you did not change your password recently, your account may be compromised!" => "اگر شما اخیرا رمزعبور را تغییر نداده اید، حساب شما در معرض خطر می باشد !",
@@ -127,6 +135,7 @@
"remember" => "بیاد آوری",
"Log in" => "ورود",
"Alternative Logins" => "ورود متناوب",
+"Hey there,
just letting you know that %s shared »%s« with you. View it!
Cheers!" => "اینجا
فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده»%s« توسط شما. مشاهده آن!
به سلامتی!",
"prev" => "بازگشت",
"next" => "بعدی",
"Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد."
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 3e471ad1942..23b697a25c3 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -98,7 +98,6 @@
"Access forbidden" => "Pääsy estetty",
"Cloud not found" => "Pilveä ei löydy",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei!\n\n%s jakoi kohteen %s kanssasi.\nKatso se tästä: %s\n\nNäkemiin!",
-"web services under your control" => "verkkopalvelut hallinnassasi",
"Edit categories" => "Muokkaa luokkia",
"Add" => "Lisää",
"Security Warning" => "Turvallisuusvaroitus",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 079cde5c30c..bc8a0d28153 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -106,7 +106,6 @@
"Access forbidden" => "Accès interdit",
"Cloud not found" => "Introuvable",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Salut,\n\nje veux juste vous signaler %s partagé %s avec vous.\nVoyez-le: %s\n\nBonne continuation!",
-"web services under your control" => "services web sous votre contrôle",
"Edit categories" => "Editer les catégories",
"Add" => "Ajouter",
"Security Warning" => "Avertissement de sécurité",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index db53a3e8a4b..b55daf27c21 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -62,6 +62,7 @@
"Share with link" => "Compartir coa ligazón",
"Password protect" => "Protexido con contrasinais",
"Password" => "Contrasinal",
+"Allow Public Upload" => "Permitir o envío público",
"Email link to person" => "Enviar ligazón por correo",
"Send" => "Enviar",
"Set expiration date" => "Definir a data de caducidade",
@@ -105,7 +106,6 @@
"Access forbidden" => "Acceso denegado",
"Cloud not found" => "Nube non atopada",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\nSaúdos!",
-"web services under your control" => "servizos web baixo o seu control",
"Edit categories" => "Editar as categorías",
"Add" => "Engadir",
"Security Warning" => "Aviso de seguranza",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 1095507673b..ab002ab64e8 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -101,7 +101,6 @@
"Help" => "עזרה",
"Access forbidden" => "הגישה נחסמה",
"Cloud not found" => "ענן לא נמצא",
-"web services under your control" => "שירותי רשת תחת השליטה שלך",
"Edit categories" => "ערוך קטגוריות",
"Add" => "הוספה",
"Security Warning" => "אזהרת אבטחה",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index afdd91d5f83..4285f8ce577 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -12,6 +12,7 @@
"November" => "नवंबर",
"December" => "दिसम्बर",
"Settings" => "सेटिंग्स",
+"Error" => "त्रुटि",
"Share" => "साझा करें",
"Share with" => "के साथ साझा",
"Password" => "पासवर्ड",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 80a34094b27..3eb556e9f63 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -73,7 +73,6 @@
"Help" => "Pomoć",
"Access forbidden" => "Pristup zabranjen",
"Cloud not found" => "Cloud nije pronađen",
-"web services under your control" => "web usluge pod vašom kontrolom",
"Edit categories" => "Uredi kategorije",
"Add" => "Dodaj",
"Create an admin account" => "Stvori administratorski račun",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index a0b6979c4ba..25abd078901 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -104,7 +104,6 @@
"Access forbidden" => "A hozzáférés nem engedélyezett",
"Cloud not found" => "A felhő nem található",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Üdv!\n\nÚj hír: %s megosztotta Önnel ezt: %s.\nItt nézhető meg: %s\n\nMinden jót!",
-"web services under your control" => "webszolgáltatások saját kézben",
"Edit categories" => "Kategóriák szerkesztése",
"Add" => "Hozzáadás",
"Security Warning" => "Biztonsági figyelmeztetés",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 9df7eda1dad..8c9b6b88ef3 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -38,7 +38,6 @@
"Help" => "Adjuta",
"Access forbidden" => "Accesso prohibite",
"Cloud not found" => "Nube non trovate",
-"web services under your control" => "servicios web sub tu controlo",
"Edit categories" => "Modificar categorias",
"Add" => "Adder",
"Create an admin account" => "Crear un conto de administration",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 5fe8b542223..2ee9c37ec2d 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -98,7 +98,6 @@
"Help" => "Bantuan",
"Access forbidden" => "Akses ditolak",
"Cloud not found" => "Cloud tidak ditemukan",
-"web services under your control" => "layanan web dalam kontrol Anda",
"Edit categories" => "Edit kategori",
"Add" => "Tambah",
"Security Warning" => "Peringatan Keamanan",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index b8573b3624a..3d3ce41b27a 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -96,7 +96,6 @@
"Help" => "Hjálp",
"Access forbidden" => "Aðgangur bannaður",
"Cloud not found" => "Ský finnst ekki",
-"web services under your control" => "vefþjónusta undir þinni stjórn",
"Edit categories" => "Breyta flokkum",
"Add" => "Bæta við",
"Security Warning" => "Öryggis aðvörun",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index b053a2a21bb..c1c27cdf54c 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -106,7 +106,6 @@
"Access forbidden" => "Accesso negato",
"Cloud not found" => "Nuvola non trovata",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ehilà,\n\nvolevo solamente farti sapere che %s ha condiviso %s con te.\nGuarda: %s\n\nSaluti!",
-"web services under your control" => "servizi web nelle tue mani",
"Edit categories" => "Modifica categorie",
"Add" => "Aggiungi",
"Security Warning" => "Avviso di sicurezza",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index ccd5e46425c..5f9ca65b627 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -106,7 +106,6 @@
"Access forbidden" => "アクセスが禁止されています",
"Cloud not found" => "見つかりません",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n\nそれでは。",
-"web services under your control" => "管理下のウェブサービス",
"Edit categories" => "カテゴリを編集",
"Add" => "追加",
"Security Warning" => "セキュリティ警告",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 6674106f1d7..877d66a0db3 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -98,7 +98,6 @@
"Help" => "დახმარება",
"Access forbidden" => "წვდომა აკრძალულია",
"Cloud not found" => "ღრუბელი არ არსებობს",
-"web services under your control" => "web services under your control",
"Edit categories" => "კატეგორიების რედაქტირება",
"Add" => "დამატება",
"Security Warning" => "უსაფრთხოების გაფრთხილება",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index d95daaa3a73..2ce4f0fd377 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -98,7 +98,6 @@
"Help" => "도움말",
"Access forbidden" => "접근 금지됨",
"Cloud not found" => "클라우드를 찾을 수 없습니다",
-"web services under your control" => "내가 관리하는 웹 서비스",
"Edit categories" => "분류 수정",
"Add" => "추가",
"Security Warning" => "보안 경고",
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index ab46b13a500..1902e450613 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -10,7 +10,6 @@
"Admin" => "بهڕێوهبهری سهرهكی",
"Help" => "یارمەتی",
"Cloud not found" => "هیچ نهدۆزرایهوه",
-"web services under your control" => "ڕاژهی وێب لهژێر چاودێریت دایه",
"Add" => "زیادکردن",
"Advanced" => "ههڵبژاردنی پیشكهوتوو",
"Data folder" => "زانیاری فۆڵدهر",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index dbe7a34de34..96a3222093f 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -1,13 +1,20 @@
"Den/D' %s huet »%s« mat dir gedeelt",
+"Category type not provided." => "Typ vun der Kategorie net uginn.",
"No category to add?" => "Keng Kategorie fir bäizesetzen?",
+"This category already exists: %s" => "Dës Kategorie existéiert schon: %s",
+"Object type not provided." => "Typ vum Objet net uginn.",
+"%s ID not provided." => "%s ID net uginn.",
+"Error adding %s to favorites." => "Feeler beim dobäisetze vun %s bei d'Favoritten.",
"No categories selected for deletion." => "Keng Kategorien ausgewielt fir ze läschen.",
-"Sunday" => "Sonndes",
-"Monday" => "Méindes",
-"Tuesday" => "Dënschdes",
+"Error removing %s from favorites." => "Feeler beim läsche vun %s aus de Favoritten.",
+"Sunday" => "Sonndeg",
+"Monday" => "Méindeg",
+"Tuesday" => "Dënschdeg",
"Wednesday" => "Mëttwoch",
-"Thursday" => "Donneschdes",
-"Friday" => "Freides",
-"Saturday" => "Samschdes",
+"Thursday" => "Donneschdeg",
+"Friday" => "Freideg",
+"Saturday" => "Samschdeg",
"January" => "Januar",
"February" => "Februar",
"March" => "Mäerz",
@@ -21,60 +28,115 @@
"November" => "November",
"December" => "Dezember",
"Settings" => "Astellungen",
-"1 hour ago" => "vrun 1 Stonn",
-"{hours} hours ago" => "vru {hours} Stonnen",
-"last month" => "Läschte Mount",
-"{months} months ago" => "vru {months} Méint",
-"months ago" => "Méint hier",
-"last year" => "Läscht Joer",
-"years ago" => "Joren hier",
+"seconds ago" => "Sekonnen hir",
+"1 minute ago" => "1 Minutt hir",
+"{minutes} minutes ago" => "virun {minutes} Minutten",
+"1 hour ago" => "virun 1 Stonn",
+"{hours} hours ago" => "virun {hours} Stonnen",
+"today" => "haut",
+"yesterday" => "gëschter",
+"{days} days ago" => "virun {days} Deeg",
+"last month" => "leschte Mount",
+"{months} months ago" => "virun {months} Méint",
+"months ago" => "Méint hir",
+"last year" => "Lescht Joer",
+"years ago" => "Joren hir",
"Choose" => "Auswielen",
"Cancel" => "Ofbriechen",
+"Error loading file picker template" => "Feeler beim Luede vun der Virlag fir d'Fichiers-Selektioun",
"Yes" => "Jo",
"No" => "Nee",
"Ok" => "OK",
-"Error" => "Fehler",
+"The object type is not specified." => "Den Typ vum Object ass net uginn.",
+"Error" => "Feeler",
+"The app name is not specified." => "Den Numm vun der App ass net uginn.",
+"The required file {file} is not installed!" => "De benéidegte Fichier {file} ass net installéiert!",
+"Shared" => "Gedeelt",
"Share" => "Deelen",
+"Error while sharing" => "Feeler beim Deelen",
+"Error while unsharing" => "Feeler beim Annuléiere vum Deelen",
+"Error while changing permissions" => "Feeler beim Ännere vun de Rechter",
+"Shared with you and the group {group} by {owner}" => "Gedeelt mat dir an der Grupp {group} vum {owner}",
+"Shared with you by {owner}" => "Gedeelt mat dir vum {owner}",
+"Share with" => "Deele mat",
+"Share with link" => "Mat Link deelen",
+"Password protect" => "Passwuertgeschützt",
"Password" => "Passwuert",
+"Allow Public Upload" => "Ëffentlechen Upload erlaaben",
+"Email link to person" => "Link enger Persoun mailen",
+"Send" => "Schécken",
+"Set expiration date" => "Verfallsdatum setzen",
+"Expiration date" => "Verfallsdatum",
+"Share via email:" => "Via E-Mail deelen:",
+"No people found" => "Keng Persoune fonnt",
+"Resharing is not allowed" => "Weiderdeelen ass net erlaabt",
+"Shared in {item} with {user}" => "Gedeelt an {item} mat {user}",
"Unshare" => "Net méi deelen",
+"can edit" => "kann änneren",
+"access control" => "Zougrëffskontroll",
"create" => "erstellen",
+"update" => "aktualiséieren",
"delete" => "läschen",
"share" => "deelen",
-"ownCloud password reset" => "ownCloud Passwuert reset",
-"Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert ze reseten: {link}",
-"You will receive a link to reset your password via Email." => "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt.",
+"Password protected" => "Passwuertgeschützt",
+"Error unsetting expiration date" => "Feeler beim Läsche vum Verfallsdatum",
+"Error setting expiration date" => "Feeler beim Setze vum Verfallsdatum",
+"Sending ..." => "Gëtt geschéckt...",
+"Email sent" => "Email geschéckt",
+"The update was unsuccessful. Please report this issue to the ownCloud community." => "Den Update war net erfollegräich. Mell dëse Problem w.e.gl derownCloud-Community.",
+"The update was successful. Redirecting you to ownCloud now." => "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet.",
+"ownCloud password reset" => "Passwuert-Zrécksetzung vun der ownCloud",
+"Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
+"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders. If it is not there ask your local administrator ." => "De Link fir d'Passwuert zréckzesetzen gouf un deng E-Mail-Adress geschéckt. Falls du d'Mail net an den nächste Minutte kriss, kuck w.e.gl. an dengem Spam-Dossier. Wann do och keng Mail ass, fro w.e.gl. däin Adminstrateur.",
+"Request failed! Did you make sure your email/username was right?" => "Ufro feelfeschloen! Hues du séchergestallt dass deng Email respektiv däi Benotzernumm korrekt sinn?",
+"You will receive a link to reset your password via Email." => "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.",
"Username" => "Benotzernumm",
-"Request reset" => "Reset ufroen",
-"Your password was reset" => "Dän Passwuert ass zeréck gesat gin",
-"To login page" => "Op d'Login Säit",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
+"Yes, I really want to reset my password now" => "Jo, ech wëll mäi Passwuert elo zrécksetzen",
+"Request reset" => "Zrécksetzung ufroen",
+"Your password was reset" => "Däi Passwuert ass zréck gesat ginn",
+"To login page" => "Bei d'Login-Säit",
"New password" => "Neit Passwuert",
-"Reset password" => "Passwuert zeréck setzen",
+"Reset password" => "Passwuert zréck setzen",
"Personal" => "Perséinlech",
"Users" => "Benotzer",
-"Apps" => "Applicatiounen",
+"Apps" => "Applikatiounen",
"Admin" => "Admin",
"Help" => "Hëllef",
-"Access forbidden" => "Access net erlaabt",
+"Access forbidden" => "Zougrëff net erlaabt",
"Cloud not found" => "Cloud net fonnt",
-"web services under your control" => "Web Servicer ënnert denger Kontroll",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nech wëll just Bescheed soen dass den/d' %s, »%s« mat dir gedeelt huet.\nKucken: %s\n\nE schéine Bonjour!",
"Edit categories" => "Kategorien editéieren",
"Add" => "Dobäisetzen",
-"Security Warning" => "Sécherheets Warnung",
-"Create an admin account" => "En Admin Account uleeën",
+"Security Warning" => "Sécherheets-Warnung",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Aktualiséier w.e.gl deng PHP-Installatioun fir ownCloud sécher benotzen ze kënnen.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Et ass kee sécheren Zoufallsgenerator verfügbar. Aktivéier w.e.gl d'OpenSSL-Erweiderung vu PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ouni e sécheren Zoufallsgenerator kann en Ugräifer d'Passwuert-Zrécksetzungs-Schlësselen viraussoen an en Account iwwerhuelen.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
+"For information how to properly configure your server, please see the documentation." => "Kuck w.e.gl. an der Dokumentatioun fir Informatiounen iwwert eng uerdentlech Konfiguratioun vum Server.",
+"Create an admin account" => "En Admin-Account uleeën",
"Advanced" => "Avancéiert",
-"Data folder" => "Daten Dossier",
-"Configure the database" => "Datebank konfiguréieren",
+"Data folder" => "Daten-Dossier",
+"Configure the database" => "D'Datebank konfiguréieren",
"will be used" => "wärt benotzt ginn",
-"Database user" => "Datebank Benotzer",
-"Database password" => "Datebank Passwuert",
+"Database user" => "Datebank-Benotzer",
+"Database password" => "Datebank-Passwuert",
"Database name" => "Datebank Numm",
-"Database tablespace" => "Datebank Tabelle-Gréisst",
-"Database host" => "Datebank Server",
+"Database tablespace" => "Tabelle-Plaz vun der Datebank",
+"Database host" => "Datebank-Server",
"Finish setup" => "Installatioun ofschléissen",
-"Log out" => "Ausloggen",
+"%s is available. Get more information on how to update." => "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft.",
+"Log out" => "Ofmellen",
+"Automatic logon rejected!" => "Automatesch Umeldung ofgeleent!",
+"If you did not change your password recently, your account may be compromised!" => "Falls du däi Passwuert net viru kuerzem geännert hues, kéint däin Account kompromittéiert sinn!",
+"Please change your password to secure your account again." => "Änner w.e.gl däi Passwuert fir däin Account nees ofzesécheren.",
"Lost your password?" => "Passwuert vergiess?",
"remember" => "verhalen",
-"Log in" => "Log dech an",
+"Log in" => "Umellen",
+"Alternative Logins" => "Alternativ Umeldungen",
+"Hey there,
just letting you know that %s shared »%s« with you. View it!
Cheers!" => "Hallo,
ech wëll just Bescheed soen dass den/d' %s, »%s« mat dir gedeelt huet. Kucken!
E schéine Bonjour!",
"prev" => "zeréck",
-"next" => "weider"
+"next" => "weider",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud gëtt op d'Versioun %s aktualiséiert, dat kéint e Moment daueren."
);
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 673ee83dca0..4faf7388b23 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -101,7 +101,6 @@
"Help" => "Pagalba",
"Access forbidden" => "Priėjimas draudžiamas",
"Cloud not found" => "Negalima rasti",
-"web services under your control" => "jūsų valdomos web paslaugos",
"Edit categories" => "Redaguoti kategorijas",
"Add" => "Pridėti",
"Security Warning" => "Saugumo pranešimas",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index b8bfe74c377..9552891d7d5 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -98,7 +98,6 @@
"Help" => "Palīdzība",
"Access forbidden" => "Pieeja ir liegta",
"Cloud not found" => "Mākonis netika atrasts",
-"web services under your control" => "tīmekļa servisi tavā varā",
"Edit categories" => "Rediģēt kategoriju",
"Add" => "Pievienot",
"Security Warning" => "Brīdinājums par drošību",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index de89403ee3c..c2b7907aa32 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -94,7 +94,6 @@
"Help" => "Помош",
"Access forbidden" => "Забранет пристап",
"Cloud not found" => "Облакот не е најден",
-"web services under your control" => "веб сервиси под Ваша контрола",
"Edit categories" => "Уреди категории",
"Add" => "Додади",
"Security Warning" => "Безбедносно предупредување",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 7a18acea7cc..4227a317582 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -44,7 +44,6 @@
"Help" => "Bantuan",
"Access forbidden" => "Larangan akses",
"Cloud not found" => "Awan tidak dijumpai",
-"web services under your control" => "Perkhidmatan web di bawah kawalan anda",
"Edit categories" => "Ubah kategori",
"Add" => "Tambah",
"Security Warning" => "Amaran keselamatan",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 614c353929d..bfdff351849 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -46,7 +46,6 @@
"Admin" => "အက်ဒမင်",
"Help" => "အကူအညီ",
"Cloud not found" => "မတွေ့ရှိမိပါ",
-"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
"Add" => "ပေါင်းထည့်",
"Security Warning" => "လုံခြုံရေးသတိပေးချက်",
"Create an admin account" => "အက်ဒမင်အကောင့်တစ်ခုဖန်တီးမည်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index d6d9675d328..dfe0cbaeb81 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -78,7 +78,6 @@
"Help" => "Hjelp",
"Access forbidden" => "Tilgang nektet",
"Cloud not found" => "Sky ikke funnet",
-"web services under your control" => "web tjenester du kontrollerer",
"Edit categories" => "Rediger kategorier",
"Add" => "Legg til",
"Security Warning" => "Sikkerhetsadvarsel",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 7afbdde3535..9352f595e76 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -106,7 +106,6 @@
"Access forbidden" => "Toegang verboden",
"Cloud not found" => "Cloud niet gevonden",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo daar,\n\n%s deelde %s met jou.\nBekijk: %s\n\nVeel plezier!",
-"web services under your control" => "Webdiensten in eigen beheer",
"Edit categories" => "Wijzig categorieën",
"Add" => "Toevoegen",
"Security Warning" => "Beveiligingswaarschuwing",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 67dbe32ff61..2a4902962bd 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -100,7 +100,6 @@
"Help" => "Hjelp",
"Access forbidden" => "Tilgang forbudt",
"Cloud not found" => "Fann ikkje skyen",
-"web services under your control" => "Vev tjenester under din kontroll",
"Edit categories" => "Endra kategoriar",
"Add" => "Legg til",
"Security Warning" => "Tryggleiksåtvaring",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 4440444885d..ad400aa650a 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -74,7 +74,6 @@
"Help" => "Ajuda",
"Access forbidden" => "Acces enebit",
"Cloud not found" => "Nívol pas trobada",
-"web services under your control" => "Services web jos ton contraròtle",
"Edit categories" => "Edita categorias",
"Add" => "Ajusta",
"Security Warning" => "Avertiment de securitat",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 98a2c6b0af2..0d7c9eb21c6 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -104,7 +104,6 @@
"Help" => "Pomoc",
"Access forbidden" => "Dostęp zabroniony",
"Cloud not found" => "Nie odnaleziono chmury",
-"web services under your control" => "Kontrolowane serwisy",
"Edit categories" => "Edytuj kategorie",
"Add" => "Dodaj",
"Security Warning" => "Ostrzeżenie o zabezpieczeniach",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 69a87133ff2..b36511da600 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -106,7 +106,6 @@
"Access forbidden" => "Acesso proibido",
"Cloud not found" => "Cloud não encontrado",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Olá,\n\napenas para você saber que %s compartilhou %s com você.\nVeja: %s\n\nAbraços!",
-"web services under your control" => "serviços web sob seu controle",
"Edit categories" => "Editar categorias",
"Add" => "Adicionar",
"Security Warning" => "Aviso de Segurança",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 77c27b641d1..b0afff1ad24 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -101,7 +101,6 @@
"Help" => "Ajuda",
"Access forbidden" => "Acesso interdito",
"Cloud not found" => "Cloud nao encontrada",
-"web services under your control" => "serviços web sob o seu controlo",
"Edit categories" => "Editar categorias",
"Add" => "Adicionar",
"Security Warning" => "Aviso de Segurança",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 327fb72f430..6f23cea1c26 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -62,6 +62,7 @@
"Share with link" => "Partajare cu legătură",
"Password protect" => "Protejare cu parolă",
"Password" => "Parolă",
+"Allow Public Upload" => "Permiteţi încărcarea publică.",
"Email link to person" => "Expediază legătura prin poșta electronică",
"Send" => "Expediază",
"Set expiration date" => "Specifică data expirării",
@@ -105,7 +106,6 @@
"Access forbidden" => "Acces interzis",
"Cloud not found" => "Nu s-a găsit",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Salutare,\n\nVă aduc la cunoștință că %s a partajat %s cu tine.\nAccesează la: %s\n\nNumai bine!",
-"web services under your control" => "servicii web controlate de tine",
"Edit categories" => "Editează categorii",
"Add" => "Adaugă",
"Security Warning" => "Avertisment de securitate",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index f3acab5be38..c7707949119 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -105,7 +105,6 @@
"Access forbidden" => "Доступ запрещён",
"Cloud not found" => "Облако не найдено",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Приветствую,⏎\n⏎\nпросто даю знать, что %s поделился %s с вами.⏎\nПосмотреть: %s⏎\n⏎\nУдачи!",
-"web services under your control" => "веб-сервисы под вашим управлением",
"Edit categories" => "Редактировать категрии",
"Add" => "Добавить",
"Security Warning" => "Предупреждение безопасности",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index b27f1c6c985..21038a93e88 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -66,7 +66,6 @@
"Help" => "උදව්",
"Access forbidden" => "ඇතුල් වීම තහනම්",
"Cloud not found" => "සොයා ගත නොහැක",
-"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
"Edit categories" => "ප්රභේදයන් සංස්කරණය",
"Add" => "එකතු කරන්න",
"Security Warning" => "ආරක්ෂක නිවේදනයක්",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index ead3842e452..e9876c52eac 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -104,7 +104,6 @@
"Access forbidden" => "Prístup odmietnutý",
"Cloud not found" => "Nenájdené",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\nChcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: %s\n\nVďaka",
-"web services under your control" => "webové služby pod Vašou kontrolou",
"Edit categories" => "Upraviť kategórie",
"Add" => "Pridať",
"Security Warning" => "Bezpečnostné varovanie",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index bbe7554245d..548a5a3f515 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -106,7 +106,6 @@
"Access forbidden" => "Dostop je prepovedan",
"Cloud not found" => "Oblaka ni mogoče najti",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Pozdravljen/a,⏎\n⏎\nsporočam, da je %s delil %s s teboj.⏎\nPoglej na: %s⏎\n⏎\nLep pozdrav!",
-"web services under your control" => "spletne storitve pod vašim nadzorom",
"Edit categories" => "Uredi kategorije",
"Add" => "Dodaj",
"Security Warning" => "Varnostno opozorilo",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index f5d7d933768..4e6c458f4df 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -100,7 +100,6 @@
"Help" => "Ndihmë",
"Access forbidden" => "Ndalohet hyrja",
"Cloud not found" => "Cloud-i nuk u gjet",
-"web services under your control" => "shërbime web nën kontrollin tënd",
"Edit categories" => "Ndrysho kategoritë",
"Add" => "Shto",
"Security Warning" => "Paralajmërim sigurie",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index a85e1bfb7e1..d68012c505f 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -93,7 +93,6 @@
"Help" => "Помоћ",
"Access forbidden" => "Забрањен приступ",
"Cloud not found" => "Облак није нађен",
-"web services under your control" => "веб сервиси под контролом",
"Edit categories" => "Измени категорије",
"Add" => "Додај",
"Security Warning" => "Сигурносно упозорење",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index bb79e67d959..d6d4b0ff323 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -106,7 +106,6 @@
"Access forbidden" => "Åtkomst förbjuden",
"Cloud not found" => "Hittade inget moln",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\nVi hörs!",
-"web services under your control" => "webbtjänster under din kontroll",
"Edit categories" => "Editera kategorier",
"Add" => "Lägg till",
"Security Warning" => "Säkerhetsvarning",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 0770805ddf5..e593018aaad 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -90,7 +90,6 @@
"Help" => "உதவி",
"Access forbidden" => "அணுக தடை",
"Cloud not found" => "Cloud காணப்படவில்லை",
-"web services under your control" => "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது",
"Edit categories" => "வகைகளை தொகுக்க",
"Add" => "சேர்க்க",
"Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 83642ed89cb..392da561bf8 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -97,7 +97,6 @@
"Help" => "ช่วยเหลือ",
"Access forbidden" => "การเข้าถึงถูกหวงห้าม",
"Cloud not found" => "ไม่พบ Cloud",
-"web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้",
"Edit categories" => "แก้ไขหมวดหมู่",
"Add" => "เพิ่ม",
"Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index f6112040c50..0a56af94182 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -101,7 +101,6 @@
"Help" => "Yardım",
"Access forbidden" => "Erişim yasaklı",
"Cloud not found" => "Bulut bulunamadı",
-"web services under your control" => "Bilgileriniz güvenli ve şifreli",
"Edit categories" => "Kategorileri düzenle",
"Add" => "Ekle",
"Security Warning" => "Güvenlik Uyarisi",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 11ebda3af89..8e67a470956 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -98,7 +98,6 @@
"Help" => "Допомога",
"Access forbidden" => "Доступ заборонено",
"Cloud not found" => "Cloud не знайдено",
-"web services under your control" => "підконтрольні Вам веб-сервіси",
"Edit categories" => "Редагувати категорії",
"Add" => "Додати",
"Security Warning" => "Попередження про небезпеку",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 0e0489bf33d..b27033b80e8 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -55,7 +55,6 @@
"Help" => "مدد",
"Access forbidden" => "پہنچ کی اجازت نہیں",
"Cloud not found" => "نہیں مل سکا",
-"web services under your control" => "آپ کے اختیار میں ویب سروسیز",
"Edit categories" => "زمرہ جات کی تدوین کریں",
"Add" => "شامل کریں",
"Create an admin account" => "ایک ایڈمن اکاؤنٹ بنائیں",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index ebe6c7006ff..37ed47de765 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -100,7 +100,6 @@
"Help" => "Giúp đỡ",
"Access forbidden" => "Truy cập bị cấm",
"Cloud not found" => "Không tìm thấy Clound",
-"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
"Edit categories" => "Sửa chuyên mục",
"Add" => "Thêm",
"Security Warning" => "Cảnh bảo bảo mật",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index b4cc129964b..237f0bb14bb 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -97,7 +97,6 @@
"Help" => "帮助",
"Access forbidden" => "禁止访问",
"Cloud not found" => "云 没有被找到",
-"web services under your control" => "您控制的网络服务",
"Edit categories" => "编辑分类",
"Add" => "添加",
"Security Warning" => "安全警告",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 80815b508ce..0c73fe31b3f 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -106,7 +106,6 @@
"Access forbidden" => "访问禁止",
"Cloud not found" => "未找到云",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "您好，\n\n%s 向您分享了 %s。\n查看： %s",
-"web services under your control" => "您控制的web服务",
"Edit categories" => "编辑分类",
"Add" => "增加",
"Security Warning" => "安全警告",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 306ae7acb8c..4afa6ea116f 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -102,7 +102,6 @@
"Help" => "說明",
"Access forbidden" => "存取被拒",
"Cloud not found" => "未發現雲端",
-"web services under your control" => "由您控制的網路服務",
"Edit categories" => "編輯分類",
"Add" => "增加",
"Security Warning" => "安全性警告",
diff --git a/core/templates/altmail.php b/core/templates/altmail.php
index 37dc8eee942..a7df29a2446 100644
--- a/core/templates/altmail.php
+++ b/core/templates/altmail.php
@@ -1,9 +1,9 @@
t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link'])));
?>
--
-ownCloud - t("web services under your control"));
-?>
-http://ownCloud.org
+getName() . ' - ' . $defaults->getSlogan()); ?>
+getBaseUrl());
diff --git a/core/templates/mail.php b/core/templates/mail.php
index ebeefd5c7e8..562ad82e953 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -1,3 +1,4 @@
+
); ?>)
; ?>)
- " - />t('Download'))?> -
-  +' "'+t('files_trashbin', 'perform restore operation')+'")
';
+ var spinner = ' +' "'+t('files_trashbin', 'perform restore operation')+'")
';
var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date");
var files = tr.attr('data-file');
undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
@@ -94,7 +94,7 @@ $(document).ready(function() {
$('.undelete').click('click',function(event) {
event.preventDefault();
- var spinner = '